diff options
Diffstat (limited to 'templates')
| -rw-r--r-- | templates/web/bromley/report/new/fill_in_details_form.html | 31 | ||||
| -rw-r--r-- | templates/web/default/js/validation_strings.html | 5 | ||||
| -rw-r--r-- | templates/web/default/report/new/extra_name.html | 12 |
3 files changed, 33 insertions, 15 deletions
diff --git a/templates/web/bromley/report/new/fill_in_details_form.html b/templates/web/bromley/report/new/fill_in_details_form.html index ac08de5a9..5729f1637 100644 --- a/templates/web/bromley/report/new/fill_in_details_form.html +++ b/templates/web/bromley/report/new/fill_in_details_form.html @@ -111,11 +111,21 @@ [% IF c.user_exists %] <div class="form-box"> - <label for="form_may_show_nameme">[% loc('Name') %]</label> - [% IF field_errors.name %] - <p class='form-error'>[% field_errors.name %]</p> + [% INCLUDE 'report/new/extra_name.html' %] + + [% names = c.user.split_name %] + <label for="form_first_name">[% loc('First Name') %]</label> + [% IF field_errors.first_name %] + <p class='form-error'>[% field_errors.first_name %]</p> + [% END %] + <input type="text" value="[% ( first_name || names.first ) | html %]" name="first_name" id="form_first_name" placeholder="[% loc('Your first name') %]"> + + <label for="form_last_name">[% loc('Last Name') %]</label> + [% IF field_errors.last_name %] + <p class='form-error'>[% field_errors.last_name %]</p> [% END %] - <input type="text" class="validName" value="[% report.name | html %]" name="name" id="form_name" placeholder="[% loc('Your name') %]"> + <input type="text" value="[% ( last_name || names.last ) | html %]" name="last_name" id="form_last_name" placeholder="[% loc('Your last name') %]"> + [%# if there is nothing in the name field then set check box as default on form %] <div class="checkbox-group"> @@ -151,12 +161,17 @@ [% INCLUDE 'report/new/extra_name.html' %] - <label for="form_may_show_nameme">[% loc('Name') %]</label> - [% IF field_errors.name %] - <p class='form-error'>[% field_errors.name %]</p> + <label for="form_first_name">[% loc('First Name') %]</label> + [% IF field_errors.first_name %] + <p class='form-error'>[% field_errors.first_name %]</p> [% END %] + <input type="text" class="form-focus-trigger" value="[% first_name | html %]" name="first_name" id="form_first_name" placeholder="[% loc('Your first name') %]"> - <input type="text" class="form-focus-trigger validName" value="[% report.name | html %]" name="name" id="form_name" placeholder="[% loc('Your name') %]"> + <label for="form_last_name">[% loc('Last Name') %]</label> + [% IF field_errors.last_name %] + <p class='form-error'>[% field_errors.last_name %]</p> + [% END %] + <input type="text" class="form-focus-trigger" value="[% last_name | html %]" name="last_name" id="form_last_name" placeholder="[% loc('Your last name') %]"> [%# if there is nothing in the name field then set check box as default on form %] <div class="checkbox-group"> diff --git a/templates/web/default/js/validation_strings.html b/templates/web/default/js/validation_strings.html index 70a0ed41c..71637877a 100644 --- a/templates/web/default/js/validation_strings.html +++ b/templates/web/default/js/validation_strings.html @@ -14,5 +14,8 @@ email: { required: '[% loc('Please enter your email') %]', email: '[% loc('Please enter a valid email') %]' - } + }, + fms_extra_title: '[% loc('Please enter your title') %]', + first_name: '[% loc('Please enter your first name') %]', + last_name: '[% loc('Please enter your second name') %]' }; diff --git a/templates/web/default/report/new/extra_name.html b/templates/web/default/report/new/extra_name.html index 7b057a831..ea523410b 100644 --- a/templates/web/default/report/new/extra_name.html +++ b/templates/web/default/report/new/extra_name.html @@ -4,12 +4,12 @@ <p class='form-error'>[% field_errors.fms_extra_title %]</p> [% END %] <select class="form-focus-trigger" id="form_fms_extra_title" - name="fms_extra_title" required> + name="fms_extra_title"> <option></option> - <option value="Mr">Mr</option> - <option value="Miss">Miss</option> - <option value="Mrs">Mrs</option> - <option value="Ms">Ms</option> - <option value="Dr">Dr</option> + <option value="Mr"[% ' selected' IF fms_extra_title == 'Mr' %]>Mr</option> + <option value="Miss"[% ' selected' IF fms_extra_title == 'Miss' %]>Miss</option> + <option value="Mrs"[% ' selected' IF fms_extra_title == 'Mrs' %]>Mrs</option> + <option value="Ms"[% ' selected' IF fms_extra_title == 'Ms' %]>Ms</option> + <option value="Dr"[% ' selected' IF fms_extra_title == 'Dr' %]>Dr</option> </select> [% END %] |