Revize 1358
Přidáno uživatelem Ondřej Fibich před více než 12 roky(ů)
| freenetis/branches/testing/media/css/installation.css | ||
|---|---|---|
|
margin-bottom: 20px;
|
||
|
}
|
||
|
|
||
|
textarea.comment_ta {
|
||
|
height: 150px;
|
||
|
font-size: 15px;
|
||
|
font-family: Verdana, Arial, Helvetica, sans-serif;
|
||
|
padding: 2px;
|
||
|
line-height: 20px;
|
||
|
border: 1px solid #CCC;
|
||
|
}
|
||
|
|
||
|
div.flags {
|
||
|
text-align:right;
|
||
|
float:right;
|
||
| ... | ... | |
|
|
||
|
div#login_div {
|
||
|
float: right;
|
||
|
/* margin-left: 20px;*/
|
||
|
}
|
||
|
|
||
|
p.registration {
|
||
| freenetis/branches/testing/application/models/member.php | ||
|---|---|---|
|
return $this->db->query("
|
||
|
SELECT id, id AS member_id, registration, name, street, street_number,
|
||
|
town, quarter, variable_symbol, aid, balance, applicant_registration_datetime,
|
||
|
GROUP_CONCAT(a_comment SEPARATOR ', \n\n') AS a_comment,
|
||
|
GROUP_CONCAT(a_comment SEPARATOR ', \n\n') AS a_comment, comment,
|
||
|
a_comments_thread_id, type, entrance_date, leaving_date
|
||
|
FROM
|
||
|
(
|
||
| ... | ... | |
|
a.balance, m.applicant_registration_datetime,
|
||
|
CONCAT(u.surname,' ',u.name,' (',SUBSTRING(c.datetime,1,10),'):\n',c.text) AS a_comment,
|
||
|
a.comments_thread_id AS a_comments_thread_id,
|
||
|
m.type, m.entrance_date, m.leaving_date
|
||
|
m.type, m.entrance_date, m.leaving_date, m.comment
|
||
|
FROM members m
|
||
|
LEFT JOIN address_points ap ON m.address_point_id = ap.id
|
||
|
LEFT JOIN streets s ON ap.street_id = s.id
|
||
| freenetis/branches/testing/application/controllers/registration.php | ||
|---|---|---|
|
->selected(Settings::get('default_country'));
|
||
|
|
||
|
$form->input('phone')
|
||
|
->label(__('phone') . ':')
|
||
|
->label(__('Phone') . ':')
|
||
|
->rules('required|length[9,40]')
|
||
|
->callback(array($this, 'valid_phone'));
|
||
|
|
||
|
$form->input('email')
|
||
|
->label(__('email') . ':')
|
||
|
->label(__('Email') . ':')
|
||
|
->rules('required|length[3,50]|valid_email')
|
||
|
->callback(array($this, 'valid_email'));
|
||
|
|
||
|
$form->group('Additional information');
|
||
|
|
||
|
$form->textarea('comment')
|
||
|
->class('comment_ta')
|
||
|
->label(__('Comment') . ':');
|
||
|
|
||
|
$form->submit('Register');
|
||
|
|
||
| ... | ... | |
|
$member->organization_identifier = $form_data['organization_identifier'];
|
||
|
$member->entrance_fee = $entrance_fee;
|
||
|
$member->applicant_registration_datetime = date('Y-m-d H:i:s');
|
||
|
$member->comment = $form_data['comment'];
|
||
|
$member->save_throwable();
|
||
|
|
||
|
$user->member_id = $member->id;
|
||
| freenetis/branches/testing/application/controllers/members.php | ||
|---|---|---|
|
$grid->field('applicant_registration_datetime')
|
||
|
->label('Registration time');
|
||
|
|
||
|
$grid->field('comment');
|
||
|
|
||
|
$actions = $grid->grouped_action_field();
|
||
|
|
||
|
// action fields
|
||
| freenetis/branches/testing/application/controllers/login.php | ||
|---|---|---|
|
|
||
|
$login = new View('login/index');
|
||
|
$login->title = __('Login to');
|
||
|
$login->error = (!$error) ? $this->session->get_once('err_message') : $error;
|
||
|
$login->registration = html::anchor('registration', __('New member'));
|
||
|
$login->forgotten_password = html::anchor('forgotten_password', __('Forgotten password'));
|
||
|
$login->error = (!$error) ? $this->session->get_once('err_message') : $error;
|
||
|
$login->render(TRUE);
|
||
|
}
|
||
|
|
||
Také k dispozici: Unified diff
Implementace #106 (Komentar k samoregistraci).