diff options
Diffstat (limited to 'templates/web/base')
28 files changed, 242 insertions, 199 deletions
diff --git a/templates/web/base/admin/body-form.html b/templates/web/base/admin/body-form.html index 13e688097..303afb682 100644 --- a/templates/web/base/admin/body-form.html +++ b/templates/web/base/admin/body-form.html @@ -22,7 +22,7 @@ </div> <p> <label for="name">[% loc('Name') %]</label> - <input type="text" name="name" id="name" value="[% body.name | html %]" size="50"> + <input type="text" class="form-control" name="name" id="name" value="[% body.name | html %]" size="50"> </p> <div class="admin-hint"> @@ -35,7 +35,7 @@ </div> <p> <label for="parent">[% loc('Parent') %]</label> - <select name="parent" id="parent"> + <select class="form-control" name="parent" id="parent"> <option value=""> -- [% loc('Select a body') %] -- </option> [% FOR b IN bodies %] <option value="[% b.id %]"[% ' selected' IF body.parent.id == b.id %]>[% b.name %]</option> @@ -73,7 +73,7 @@ </div> <p> <label for="area_ids">[% loc('Area covered') %]</label> - <select name="area_ids" id="area_ids" multiple> + <select class="form-control" name="area_ids" id="area_ids" multiple> <option value=""> -- [% loc('Select an area') %] -- </option> [% SET body_areas = body.areas %] [% FOR area IN areas %] @@ -85,7 +85,7 @@ <p> <label for="external_url">[% loc('External URL') %]</label> - <input type="text" name="external_url" id="external_url" value="[% body.external_url | html %]" size="50"> + <input type="text" class="form-control" name="external_url" id="external_url" value="[% body.external_url | html %]" size="50"> </p> <div class="admin-hint"> <p>[% loc( "You can mark a body as deleted if you do not want it to be active on the site." ) %]</p> @@ -105,7 +105,7 @@ </div> <p> <label for="send_method">Send Method</label> - <select name="send_method" id="send_method"> + <select class="form-control" name="send_method" id="send_method"> <option value=""> -- Select a method -- </option> [% FOR method IN send_methods %] <option value="[% method %]"[% ' selected' IF body.send_method == method %]>[% method %]</option> @@ -118,7 +118,7 @@ [% loc( "These settings are for bodies that use Open311 (or other back-end integration) to receive problem reports.<br> <strong>You don't need to set them if the Send Method is email.</strong>. - For more information on Open311, see + For more information on Open311, see <a href='https://www.mysociety.org/2013/01/17/open311-explained/' class='admin-offsite-link'>this article</a>. " ) %] @@ -127,14 +127,14 @@ <div class="admin-hint"> <p> [% loc( - "The <strong>endpoint</strong> is the URL of the service that FixMyStreet will connect to + "The <strong>endpoint</strong> is the URL of the service that FixMyStreet will connect to when sending reports to this body." ) %] </p> </div> <p> <label for="endpoint">[% loc('Endpoint') %]</label> - <input type="text" name="endpoint" id="endpoint" value="[% body.endpoint | html %]" size="50"> + <input type="text" class="form-control" name="endpoint" id="endpoint" value="[% body.endpoint | html %]" size="50"> </p> <div class="admin-hint"> @@ -147,7 +147,7 @@ </div> <p> <label for="jurisdiction">Open311 Jurisdiction</label> - <input type="text" name="jurisdiction" id="jurisdiction" value="[% body.jurisdiction | html %]" size="50"> + <input type="text" class="form-control" name="jurisdiction" id="jurisdiction" value="[% body.jurisdiction | html %]" size="50"> </p> <div class="admin-hint"> @@ -160,7 +160,7 @@ </div> <p> <label for="api_key">Open311 API Key</label> - <input type="text" name="api_key" id="api_key" value="[% body.api_key | html %]" size="25"> + <input type="text" class="form-control" name="api_key" id="api_key" value="[% body.api_key | html %]" size="25"> </p> <div class="admin-hint"> @@ -168,7 +168,7 @@ [% loc( "Enable <strong>Open311 update-sending</strong> if the endpoint will send and receive updates to existing reports. If you're not sure, it probably does not, so leave this unchecked. - For more information, see + For more information, see <a href='https://www.mysociety.org/2013/02/20/open311-extended/' class='admin-offsite-link'>this article</a>." ) %] </p> @@ -181,7 +181,7 @@ <div class="admin-hint"> <p> [% loc( - "If you've enabled Open311 update-sending above, you must identify which + "If you've enabled Open311 update-sending above, you must identify which FixMyStreet <strong>user</strong> will be attributed as the creator of those updates when they are shown on the site. Enter the ID (number) of that user." ) %] @@ -198,7 +198,7 @@ <div class="admin-hint"> <p> [% loc( - "If you've enabled Open311 update-sending above, enable <strong>suppression of alerts</strong> + "If you've enabled Open311 update-sending above, enable <strong>suppression of alerts</strong> if you do <strong>not</strong> want that user to be notified whenever these updates are created." ) %] </p> @@ -211,7 +211,7 @@ <div class="admin-hint"> <p> [% loc( - "If you've enabled Open311 update-sending above, Open311 usually only accepts OPEN or CLOSED status in + "If you've enabled Open311 update-sending above, Open311 usually only accepts OPEN or CLOSED status in its updates. Enable <strong>extended Open311 stauses</strong> if you want to allow extra states to be passed. Check that your cobrand supports this feature before switching it on." ) %] @@ -222,11 +222,11 @@ <label for="send_extended_statuses" class="inline">Send extended Open311 statuses with service request updates</label> </p> </div> - + <div class="admin-hint"> <p> [% loc( - "Enable this <strong>can be devolved</strong> setting if one or more contacts have a + "Enable this <strong>can be devolved</strong> setting if one or more contacts have a different endpoint (and send method) from the body's. For example, if reports for some categories of problem must be emailed, while others can be sent over Open311." ) %] @@ -239,11 +239,11 @@ <input type="checkbox" id="can_be_devolved" name="can_be_devolved"[% ' checked' IF body.can_be_devolved %]> <label for="can_be_devolved" class="inline">Send method or endpoints can be devolved to contacts (i.e, can be different from the body's)</label> </p> - + <p> <input type="hidden" name="posted" value="body"> <input type="hidden" name="token" value="[% csrf_token %]"> - <input type="submit" value="[% body ? loc('Update body') : loc('Add body') %]"> + <input type="submit" class="btn" value="[% body ? loc('Update body') : loc('Add body') %]"> </p> </form> diff --git a/templates/web/base/admin/body.html b/templates/web/base/admin/body.html index 6d23c1458..065cafe2d 100644 --- a/templates/web/base/admin/body.html +++ b/templates/web/base/admin/body.html @@ -102,12 +102,12 @@ <p> <input type="hidden" name="posted" value="update"> <input type="hidden" name="token" value="[% csrf_token %]"> - <input type="submit" name="Update statuses" value="[% loc('Update statuses') %]"> + <input type="submit" class="btn" name="Update statuses" value="[% loc('Update statuses') %]"> </p> </form> <p class="fms-admin-info"> - [% loc("Each contact for the body has a category, which is displayed to the public. + [% loc("Each contact for the body has a category, which is displayed to the public. Different categories <strong>can have the same contact</strong> (email address). This means you can add many categories even if you only have one contact for the body. ") %] @@ -138,12 +138,12 @@ </p> </div> <p> - <strong>[% loc('Category:') %] </strong><input type="text" name="category" size="30" value="[% contact.category | html %]"> + <strong>[% loc('Category:') %] </strong><input type="text" class="form-control" name="category" size="30" value="[% contact.category | html %]"> </p> <div class="admin-hint"> <p> - [% loc("The <strong>email address</strong> is the destination to which reports about this category will be sent. + [% loc("The <strong>email address</strong> is the destination to which reports about this category will be sent. Other categories for this body may have the same email address.") %] </p> [% IF (body.send_method AND body.send_method != 'Email') OR body.can_be_devolved %] @@ -154,7 +154,7 @@ </div> <p> - <strong>[% loc('Email address:') %] </strong><input type="text" name="email" size="30" value="[% contact.email | html %]"> + <strong>[% loc('Email address:') %] </strong><input type="text" class="form-control" name="email" size="30" value="[% contact.email | html %]"> </p> <div class="admin-hint"> @@ -170,7 +170,7 @@ <div class="admin-hint"> <p> - [% loc("Check <strong>deleted</strong> to remove the category from use. + [% loc("Check <strong>deleted</strong> to remove the category from use. It will not appear as an available category in the drop-down menu on the report-a-problem page.") %] </p> </div> @@ -217,7 +217,7 @@ <p> <input type="hidden" name="posted" value="new" > <input type="hidden" name="token" value="[% csrf_token %]" > - <input type="submit" name="Create category" value="[% errors ? loc('Save changes') : loc('Create category') %]" > + <input type="submit" class="btn" name="Create category" value="[% errors ? loc('Save changes') : loc('Create category') %]" > </p> <div> diff --git a/templates/web/base/admin/category_edit.html b/templates/web/base/admin/category_edit.html index 05fa2ca4e..7cc45f80f 100644 --- a/templates/web/base/admin/category_edit.html +++ b/templates/web/base/admin/category_edit.html @@ -25,12 +25,12 @@ <input type="hidden" name="token" value="[% csrf_token %]" > <p><strong>[% loc('Email:') %] </strong> - <input type="text" name="email" value="[% contact.email | html %]" size="30"> + <input type="text" class="form-control" name="email" value="[% contact.email | html %]" size="30"> <p> [% IF c.cobrand.moniker != 'zurich' %] <input type="checkbox" name="confirmed" value="1" id="confirmed"[% ' checked' IF contact.confirmed %]> - <label class="inline" for="confirmed">[% loc('Confirmed' ) %]</label> + <label class="inline" for="confirmed">[% loc('Confirmed' ) %]</label> [% ELSE %] <input type="hidden" name="confirmed" value="1"> [% END %] @@ -63,22 +63,22 @@ <form method="post" action="[% c.uri_for('body', body_id ) %]" enctype="application/x-www-form-urlencoded" accept-charset="utf-8"> <p> <label for="endpoint">Endpoint</label> - <input type="text" name="endpoint" id="endpoint" value="[% contact.endpoint | html %]" size="50"> + <input type="text" class="form-control" name="endpoint" id="endpoint" value="[% contact.endpoint | html %]" size="50"> </p> <p> <label for="jurisdiction">Jurisdiction</label> - <input type="text" name="jurisdiction" id="jurisdiction" value="[% contact.jurisdiction | html %]" size="50"> + <input type="text" class="form-control" name="jurisdiction" id="jurisdiction" value="[% contact.jurisdiction | html %]" size="50"> </p> <p> <label for="api_key">Api Key</label> - <input type="text" name="api_key" id="api_key" value="[% contact.api_key | html %]" size="25"> + <input type="text" class="form-control" name="api_key" id="api_key" value="[% contact.api_key | html %]" size="25"> </p> <p> <label for="send_method">Send Method</label> - <select name="send_method"> + <select class="form-control" name="send_method"> <option value=""> -- Select a method -- </option> [% FOR method IN send_methods %] <option value="[% method %]"[% ' selected' IF contact.send_method == method %]>[% method %]</option> @@ -88,7 +88,7 @@ [% END %] <input type="hidden" name="posted" value="new"> - <p><input type="submit" name="Save changes" value="[% loc('Save changes') %]"> + <p><input type="submit" class="btn" name="Save changes" value="[% loc('Save changes') %]"> </form> [% IF contact.extra %] diff --git a/templates/web/base/admin/index.html b/templates/web/base/admin/index.html index beb4dad7f..f573f0e7a 100644 --- a/templates/web/base/admin/index.html +++ b/templates/web/base/admin/index.html @@ -22,18 +22,18 @@ and to receive notices of updates. <form method="get" action="[% c.uri_for('reports') %]" accept-charset="utf-8"> <p><label for="search_reports">[% loc('Search Reports') %]</label> - <input type="text" name="search" size="30" id="search_reports" value="[% searched | html %]"> + <input type="text" class="form-control" name="search" size="30" id="search_reports" value="[% searched | html %]"> </form> <form method="get" action="[% c.uri_for('users') %]" accept-charset="utf-8"> <p><label for="search_users">[% loc('Search Users') %]</label> - <input type="text" name="search" size="30" id="search_users" value="[% searched | html %]"> + <input type="text" class="form-control" name="search" size="30" id="search_users" value="[% searched | html %]"> </form> [% IF c.user.is_superuser %] <form method="get" action="[% c.uri_for('bodies') %]"> <label for="search_body">[% loc('Edit body details') %]</label> - <select id="search_body" name="body"> + <select class="form-control" id="search_body" name="body"> [% FOREACH body IN bodies %] [%- SET id = body.id %] <option[% IF body.deleted %] class="adminhidden"[% END %] value="[% body.id %]"> @@ -42,7 +42,7 @@ and to receive notices of updates. </option> [% END %] </select> - <input type="submit" value="[% loc('Go') %]"> + <input type="submit" class="btn" value="[% loc('Go') %]"> </form> [% END %] diff --git a/templates/web/base/admin/report_blocks.html b/templates/web/base/admin/report_blocks.html index 941bff821..3561d865d 100644 --- a/templates/web/base/admin/report_blocks.html +++ b/templates/web/base/admin/report_blocks.html @@ -38,12 +38,12 @@ SET state_groups = [ [% BLOCK abuse_button -%] [% IF allowed_pages.abuse_edit -%] -[% IF email_in_abuse %]<small>[% loc('(Email in abuse table)') %]</small>[% ELSE %]<input type="submit" name="banuser" value="[% loc('Ban email address') %]" />[% END %] +[% IF email_in_abuse %]<small>[% loc('(Email in abuse table)') %]</small>[% ELSE %]<input type="submit" class="btn" name="banuser" value="[% loc('Ban email address') %]" />[% END %] [%- END %] [%- END %] [% BLOCK flag_button -%] -[% IF user.flagged || user_flagged %]<input type="submit" name="removeuserflag" value="[% loc('Remove flag') %]">[% ELSE %]<input type="submit" name="flaguser" value="[% loc('Flag user') %]" />[% END %] +[% IF user.flagged || user_flagged %]<input type="submit" class="btn" name="removeuserflag" value="[% loc('Remove flag') %]">[% ELSE %]<input type="submit" class="btn" name="flaguser" value="[% loc('Flag user') %]" />[% END %] [%- END %] [%# note: date format here (i.e., dd.mm.YYYY) currently used by Zurich %] diff --git a/templates/web/base/admin/report_edit.html b/templates/web/base/admin/report_edit.html index 96e59d1c4..02e75563c 100644 --- a/templates/web/base/admin/report_edit.html +++ b/templates/web/base/admin/report_edit.html @@ -21,7 +21,7 @@ <div class="sidebar"> - <p align="center"><input type="submit" name="Submit changes" value="[% loc('Submit changes') %]"></p> + <p align="center"><input type="submit" class="btn" name="Submit changes" value="[% loc('Submit changes') %]"></p> <ul> [%- cobrand_data = problem.cobrand_data; @@ -81,9 +81,9 @@ class="admin-offsite-link">[% problem.latitude %], [% problem.longitude %]</a> ([% problem.send_method_used %]) [% END %] [% IF problem.state == 'confirmed' AND problem.whensent %] - <input data-confirm="[% loc('Are you sure?') %]" type="submit" name="resend" value="[% loc('Resend report') %]"> + <input data-confirm="[% loc('Are you sure?') %]" class="btn" type="submit" name="resend" value="[% loc('Resend report') %]"> [% ELSIF NOT problem.whensent %] - <input type="submit" name="mark_sent" value="[% loc('Mark as sent') %]"> + <input type="submit" class="btn" name="mark_sent" value="[% loc('Mark as sent') %]"> [% END %] </li> <li class="sm">[% loc('Last update:') %] [% PROCESS format_time time=problem.lastupdate %]</li> @@ -95,11 +95,11 @@ class="admin-offsite-link">[% problem.latitude %], [% problem.longitude %]</a> <li>[% loc('Going to send questionnaire?') %] [% IF problem.send_questionnaire %][% loc('Yes') %][% ELSE %][% loc('No') %][% END %]</li> <li><label for="external_id">[% loc('External ID') %]:</label> - <input type="text" name="external_id" id="external_id" value="[% problem.external_id | html %]"> + <input type="text" class="form-control" name="external_id" id="external_id" value="[% problem.external_id | html %]"> <li><label for="external_body">[% loc('External body') %]:</label> - <input type="text" name="external_body" body="external_body" value="[% problem.external_body | html %]"> + <input type="text" class="form-control" name="external_body" body="external_body" value="[% problem.external_body | html %]"> <li><label for="external_team">[% loc('External team') %]:</label> - <input type="text" name="external_team" team="external_team" value="[% problem.external_team | html %]"> + <input type="text" class="form-control" name="external_team" team="external_team" value="[% problem.external_team | html %]"> </ul> </div> @@ -108,12 +108,12 @@ class="admin-offsite-link">[% problem.latitude %], [% problem.longitude %]</a> <ul class="plain-list"> <li><label for='title'>[% loc('Subject:') %]</label> - <input size=60 type='text' id='title' name='title' value='[% problem.title | html %]'></li> + <input size=60 type='text' class="form-control" id='title' name='title' value='[% problem.title | html %]'></li> <li><label for='detail'>[% loc('Details:') %]</label> -<textarea name='detail' id='detail' cols=60 rows=10>[% problem.detail | html %]</textarea></li> +<textarea class="form-control" name='detail' id='detail' cols=60 rows=10>[% problem.detail | html %]</textarea></li> <li><label class="inline-text" for="state">[% loc('State:') %]</label> -<select name="state" id="state"> +<select class="form-control" name="state" id="state"> [% FOREACH group IN state_groups %] <optgroup label="[% group.0 %]"> [% FOREACH state IN group.1 %] @@ -123,7 +123,7 @@ class="admin-offsite-link">[% problem.latitude %], [% problem.longitude %]</a> [% END %] </select></li> <li><label class="inline-text" for="category">[% loc('Category:') %]</label> -<select name="category" id="category"> +<select class="form-control" name="category" id="category"> [% IF NOT problem.category OR NOT categories.grep(problem.category).size %] <optgroup label="[% loc('Existing category') %]"> <option selected value="[% problem.category | html %]">[% (problem.category OR '-') | html %]</option> @@ -138,14 +138,14 @@ class="admin-offsite-link">[% problem.latitude %], [% problem.longitude %]</a> [% END %] </select></li> <li><label class="inline-text" for="anonymous">[% loc('Anonymous:') %]</label> -<select name="anonymous" id="anonymous"> +<select class="form-control" name="anonymous" id="anonymous"> <option [% 'selected ' IF problem.anonymous %]value="1">[% loc('Yes') %]</option> <option [% 'selected ' IF !problem.anonymous %]value="0">[% loc('No') %]</option> </select></li> <li><label for="name">[% loc('Name:') %]</label> - <input type='text' name='name' id='name' value='[% problem.name | html %]'></li> + <input type='text' class="form-control" name='name' id='name' value='[% problem.name | html %]'></li> <li><label for="email">[% loc('Email:') %]</label> - <input type='text' id='email' name='email' value='[% problem.user.email | html %]'> + <input type='text' class="form-control" id='email' name='email' value='[% problem.user.email | html %]'> [% PROCESS abuse_button %] [% PROCESS flag_button user=problem.user %] </li> @@ -177,7 +177,7 @@ class="admin-offsite-link">[% problem.latitude %], [% problem.longitude %]</a> [% END %] </ul> -<input type="submit" name="Submit changes" value="[% loc('Submit changes') %]"> +<input type="submit" class="btn" name="Submit changes" value="[% loc('Submit changes') %]"> </form> </div> diff --git a/templates/web/base/admin/responsepriorities/edit.html b/templates/web/base/admin/responsepriorities/edit.html index b05ebfaf9..89f41a069 100644 --- a/templates/web/base/admin/responsepriorities/edit.html +++ b/templates/web/base/admin/responsepriorities/edit.html @@ -11,7 +11,7 @@ <p> <strong>[% loc('Name:') %] </strong> - <input type="text" name="name" class="required" size="30" value="[% rp.name | html %]"> + <input type="text" name="name" class="required form-control" size="30" value="[% rp.name | html %]"> </p> <p> <strong>[% loc('Categories:') %]</strong> @@ -34,7 +34,7 @@ </p> <p> <input type="hidden" name="token" value="[% csrf_token %]" > - <input type="submit" name="Edit priorities" value="[% rp.id ? loc('Save changes') : loc('Create priority') %]" > + <input type="submit" class="btn" name="Edit priorities" value="[% rp.id ? loc('Save changes') : loc('Create priority') %]" > </p> </form> diff --git a/templates/web/base/admin/stats.html b/templates/web/base/admin/stats.html index 897e2fc44..535f04d18 100644 --- a/templates/web/base/admin/stats.html +++ b/templates/web/base/admin/stats.html @@ -68,13 +68,13 @@ <form method="post" action="[% c.uri_for('stats') %]" enctype="application/x-www-form-urlencoded" accept-charset="utf-8"> <p> - <label for="start_date">[% loc('Start Date:') %]</label><input type="text" + <label for="start_date">[% loc('Start Date:') %]</label><input type="text" class="form-control" placeholder="[% loc('Click here or enter as dd/mm/yyyy') %]" name="start_date" id="start_date" value="[% start_date ? start_date.strftime( '%d/%m/%Y') : '' | html %]" /> </p> <p> - <label for="end_date">[% loc('End Date:') %]</label><input type="text" + <label for="end_date">[% loc('End Date:') %]</label><input type="text" class="form-control" placeholder="[% loc('Click here or enter as dd/mm/yyyy') %]" name="end_date" id="end_date" size="5" value="[% end_date ? end_date.strftime( '%d/%m/%Y') : '' | html %]" /> </p> @@ -89,7 +89,7 @@ [% IF c.user.is_superuser %] <p> - [% loc('Council:') %] <select id='body' name='body'> + [% loc('Council:') %] <select class="form-control" id='body' name='body'> <option value=''>[% loc('No council') %]</option> [% FOR body IN bodies %] <option value="[% body.id %]"[% ' selected' IF body.id == selected_body %]>[% body.name %]</option> @@ -99,7 +99,7 @@ [% END %] <p> - <input type="submit" name="getcounts" size="30" id="getcounts" value="Get Count" /> + <input type="submit" class="btn" name="getcounts" size="30" id="getcounts" value="Get Count" /> </p> </form> diff --git a/templates/web/base/admin/template_edit.html b/templates/web/base/admin/template_edit.html index 54058a04c..8ce3c28dd 100644 --- a/templates/web/base/admin/template_edit.html +++ b/templates/web/base/admin/template_edit.html @@ -11,11 +11,11 @@ <p> <strong>[% loc('Title:') %] </strong> - <input type="text" name="title" class="required" size="30" value="[% rt.title| html %]"> + <input type="text" name="title" class="required form-control" size="30" value="[% rt.title| html %]"> </p> <p> <strong>[% loc('Text:') %] </strong> - <textarea name="text" class="required">[% rt.text |html %]</textarea> + <textarea class="form-control" name="text" class="required">[% rt.text |html %]</textarea> </p> <p> <label> @@ -38,11 +38,11 @@ </p> <p> <input type="hidden" name="token" value="[% csrf_token %]" > - <input type="submit" name="Edit templates" value="[% rt.id ? loc('Save changes') : loc('Create template') %]" > + <input type="submit" class="btn" name="Edit templates" value="[% rt.id ? loc('Save changes') : loc('Create template') %]" > </p> [% IF rt.id %] <p> - <input class="delete" type="submit" name="delete_template" value="[% loc('Delete template') %]"> + <input class="delete btn-danger" type="submit" name="delete_template" value="[% loc('Delete template') %]"> </p> [% END %] </form> diff --git a/templates/web/base/admin/update_edit.html b/templates/web/base/admin/update_edit.html index 06bee6010..2b20c50b3 100644 --- a/templates/web/base/admin/update_edit.html +++ b/templates/web/base/admin/update_edit.html @@ -18,19 +18,21 @@ <li><a href="[% uri %]#update_[% update.id %]" class="admin-offsite-link">[% loc('View report on site' )%]</a></li> <li><label for='detail'>[% loc('Text:') %]</label> -<textarea name='text' id='text' cols=60 rows=10>[% update.text | html %]</textarea></li> +<textarea class="form-control" name='text' id='text' cols=60 rows=10>[% update.text | html %]</textarea></li> -<li><label for="anonymous">[% loc('Anonymous:') %]</label> <select name="anonymous" id="anonymous"> +<li><label for="anonymous">[% loc('Anonymous:') %]</label> +<select class="form-control" name="anonymous" id="anonymous"> <option [% 'selected ' IF update.anonymous %]value="1">[% loc('Yes') %]</option> <option [% 'selected ' IF !update.anonymous %]value="0">[% loc('No') %]</option> </select></li> -<li><label for="state">[% loc('State:') %]</label> <select name="state" id="state"> +<li><label for="state">[% loc('State:') %]</label> +<select class="form-control" name="state" id="state"> [% FOREACH state IN [ ['confirmed', loc('Open')], ['hidden', loc('Hidden')], ['unconfirmed',loc('Unconfirmed')] ] %] <option [% 'selected ' IF state.0 == update.state %] value="[% state.0 %]">[% state.1 %]</option> [% END %] </select></li> -<li>[% loc('Name:') %] <input type='text' name='name' id='name' value='[% update.name | html %]'></li> -<li>[% loc('Email:') %] <input type='text' id='email' name='email' value='[% update.user.email | html %]'> +<li>[% loc('Name:') %] <input type='text' class="form-control" name='name' id='name' value='[% update.name | html %]'></li> +<li>[% loc('Email:') %] <input type='text' class="form-control" id='email' name='email' value='[% update.user.email | html %]'> [%- IF update.user.from_body && update.user.from_body.id == update.problem.bodies_str %] [% ' (' _ tprintf(loc('user is from same council as problem - %d'), update.user.from_body.id ) _')' %] [% END -%] @@ -72,6 +74,6 @@ [% END %] </ul> -<input type="submit" name="Submit changes" value="[% loc('Submit changes') %]" ></form> +<input type="submit" class="btn" name="Submit changes" value="[% loc('Submit changes') %]" ></form> [% INCLUDE 'admin/footer.html' %] diff --git a/templates/web/base/admin/user-form.html b/templates/web/base/admin/user-form.html index 87324666d..5adc200a1 100644 --- a/templates/web/base/admin/user-form.html +++ b/templates/web/base/admin/user-form.html @@ -16,12 +16,12 @@ </p> </div> <label for="name">[% loc('Name:') %]</label> - <input type='text' name='name' id='name' value='[% user.name | html %]'> + <input type='text' class="form-control" name='name' id='name' value='[% user.name | html %]'> </li> <li><label for="email">[% loc('Email:') %]</label> - <input type='text' id='email' name='email' value='[% user.email | html %]'></li> + <input type='text' class="form-control" id='email' name='email' value='[% user.email | html %]'></li> <li><label for="phone">[% loc('Phone:') %]</label> - <input type='text' id='phone' name='phone' value='[% user.phone | html %]'></li> + <input type='text' class="form-control" id='phone' name='phone' value='[% user.phone | html %]'></li> [% IF c.user.is_superuser || c.cobrand.moniker == 'zurich' %] <li> @@ -35,7 +35,7 @@ %] </p> </div> - [% loc('Body:') %] <select id='body' name='body'> + [% loc('Body:') %] <select class="form-control" id='body' name='body'> <option value=''>[% loc('No body') %]</option> [% FOR body IN bodies %] <option value="[% body.id %]"[% ' selected data-originally-selected' IF body.id == user.from_body.id %]>[% body.name %]</option> @@ -64,7 +64,7 @@ </p> </div> [% loc('Area:') %] - <select id='area_id' name='area_id' [% 'disabled' UNLESS c.user.has_permission_to('user_assign_areas', user.from_body.id) %]> + <select class="form-control" id='area_id' name='area_id' [% 'disabled' UNLESS c.user.has_permission_to('user_assign_areas', user.from_body.id) %]> <option value=''>[% loc('No area') %]</option> [% FOREACH area IN areas %] <option value="[% area.id %]"[% ' selected' IF area.id == user.area_id %]>[% area.name | html %]</option> @@ -98,7 +98,7 @@ </div> [% IF c.user.is_superuser %] [% loc('Trusted by bodies:') %]<br /> - <select id='body' name='trusted_bodies' multiple> + <select class="form-control" id='body' name='trusted_bodies' multiple> [% FOR body IN bodies %] <option value="[% body.id %]"[% ' selected' IF user.has_permission_to('trusted', body.id) %]>[% body.name %]</option> [% END %] @@ -159,5 +159,5 @@ [% END %] [% END %] </ul> - <input type="submit" name="Submit changes" value="[% loc('Submit changes') %]" > + <input type="submit" class="btn" name="Submit changes" value="[% loc('Submit changes') %]" > </form> diff --git a/templates/web/base/auth/change_email.html b/templates/web/base/auth/change_email.html index 471782e42..a444b8c31 100644 --- a/templates/web/base/auth/change_email.html +++ b/templates/web/base/auth/change_email.html @@ -27,7 +27,7 @@ <input class="form-control" type="email" name="email" id="email" value="[% email | html %]"> </div> <div class="final-submit"> - <input type="submit" value="[% loc('Change email address') %]"> + <input type="submit" class="btn" value="[% loc('Change email address') %]"> </div> </fieldset> diff --git a/templates/web/base/auth/change_password.html b/templates/web/base/auth/change_password.html index 50ecc93a2..094d131eb 100644 --- a/templates/web/base/auth/change_password.html +++ b/templates/web/base/auth/change_password.html @@ -40,7 +40,7 @@ INCLUDE 'header.html', title = loc('Change password'), bodyclass = bclass <input class="form-control" type="password" name="confirm" value="[% confirm | html %]"> </div> <div class="final-submit"> - <input type="submit" value="[% loc('Change password') %]"> + <input type="submit" class="btn" value="[% loc('Change password') %]"> </div> </fieldset> diff --git a/templates/web/base/dashboard/index.html b/templates/web/base/dashboard/index.html index c0f94ce56..1af507569 100644 --- a/templates/web/base/dashboard/index.html +++ b/templates/web/base/dashboard/index.html @@ -19,7 +19,7 @@ <div class="filters"> <p> <label for="ward">Ward:</label> - <select name="ward"><option value=''>All</option> + <select class="form-control" name="ward"><option value=''>All</option> [% FOR w IN children.values.sort('name') %] <option value="[% w.id %]"[% ' selected' IF w.id == ward %]>[% w.name %]</option> [% END %] @@ -28,7 +28,7 @@ <p> <label for="category">Report category:</label> - <select name="category"><option value=''>All</option> + <select class="form-control" name="category"><option value=''>All</option> [% FOR cat_op IN category_options %] <option value='[% cat_op | html %]'[% ' selected' IF category == cat_op %]>[% cat_op | html %]</option> [% END %] @@ -36,7 +36,7 @@ </p> <p> - <input type="submit" value="Look up"> + <input type="submit" class="btn" value="Look up"> </p> <br clear="all" /> @@ -135,7 +135,7 @@ <h2>Reports</h2> </select> -<p>Report state: <select name="state"> +<p>Report state: <select class="form-control" name="state"> <option value=''>All</option> [% FOREACH state IN [ ['confirmed', loc('Open')], ['investigating', loc('Investigating')], ['action scheduled', loc('Planned')], ['in progress', @@ -143,7 +143,7 @@ <option [% 'selected ' IF state.0 == q_state %] value="[% state.0 %]">[% state.1 %]</option> [% END %] </select> -<input type="submit" value="Look up"> +<input type="submit" class="btn" value="Look up"> <a class="export_as_csv" href="[% c.req.uri_with({ export => 1 }) %]">Export as CSV</a> <table width="100%" id="reports"> diff --git a/templates/web/base/questionnaire/creator_fixed.html b/templates/web/base/questionnaire/creator_fixed.html index 5b6d1254a..bcd9a9514 100644 --- a/templates/web/base/questionnaire/creator_fixed.html +++ b/templates/web/base/questionnaire/creator_fixed.html @@ -16,7 +16,7 @@ <label class="inline" for="reported_no">[% loc('No') %]</label> </p> -<p><input type="submit" name="submit" value="[% loc('Submit') %]"></p> +<p><input type="submit" class="btn" name="submit" value="[% loc('Submit') %]"></p> </form> diff --git a/templates/web/base/questionnaire/index.html b/templates/web/base/questionnaire/index.html index 217bd827e..5e6cef3b7 100644 --- a/templates/web/base/questionnaire/index.html +++ b/templates/web/base/questionnaire/index.html @@ -107,7 +107,7 @@ </p> </div> -<p><input type="submit" name="submit" value="[% loc('Submit questionnaire') %]"></p> +<p><input type="submit" class="btn" name="submit" value="[% loc('Submit questionnaire') %]"></p> </form> diff --git a/templates/web/base/report/_inspect.html b/templates/web/base/report/_inspect.html index 31a8cd9ad..34a7ea96c 100644 --- a/templates/web/base/report/_inspect.html +++ b/templates/web/base/report/_inspect.html @@ -1,49 +1,38 @@ [% PROCESS 'admin/report_blocks.html'; # For the report state dropdown %] [% permissions = c.user.permissions(c, problem.bodies_str) %] [% second_column = BLOCK -%] - <div id="side-report-secondary"> - <div class="problem-inspector-fields clearfix"> - [% INCLUDE 'errors.html' %] + <div id="side-inspect"> + [% INCLUDE 'errors.html' %] - <form id="report_inspect_form" method="post" action="[% c.uri_for( '/report', problem.id, 'inspect' ) %]"> - <p class="left"> - <label for="problem_id">[% loc('Report ID:') %]</label> - <input type="text" readonly id="problem_id" value="[% problem.id %]"> - </p> + <form id="report_inspect_form" method="post" action="[% c.uri_for( '/report', problem.id, 'inspect' ) %]"> -[% IF permissions.report_edit_priority OR permissions.report_inspect %] - <p class="right"> - <label for="problem_priority">[% loc('Priority:') %]</label> - <select name="priority" id="problem_priority"> - <option value="" [% 'selected' UNLESS problem.response_priority_id %]>-</option> - [% FOREACH priority IN problem.response_priorities %] - <option value="[% priority.id %]" [% 'selected' IF problem.response_priority_id == priority.id %] [% 'disabled' IF priority.deleted %]>[% priority.name %]</option> - [% END %] - </select> + <div class="inspect-section"> + <p> + <strong>[% loc('Report ID:') %]</strong> + [% problem.id %] </p> -[% END %] - -[% IF permissions.report_inspect %] - <p class="left"> - <label for="state">[% loc('State:') %]</label> - [%# XXX this is duplicated from admin/report_edit.html, should be refactored %] - <select name="state" id="state"> - [% FOREACH group IN state_groups %] - <optgroup label="[% group.0 %]"> - [% FOREACH state IN group.1 %] - <option [% 'selected ' IF state == problem.state %] value="[% state %]">[% state_pretty.$state %]</option> - [% END %] - </optgroup> - [% END %] - </select> + <p> + [% SET local_coords = problem.local_coords; %] + <strong>[% loc('Easting/Northing:') %]</strong> + <span id="problem_easting">[% local_coords.0 IF local_coords %]</span>, + <span id="problem_northing">[% local_coords.1 IF local_coords %]</span> + <input type="hidden" name="longitude" value="[% problem.longitude %]"> + <input type="hidden" name="latitude" value="[% problem.latitude %]"> </p> -[% END %] + <p> + <a href="https://www.google.com/maps/dir/Current+Location/[% problem.latitude %],[% problem.longitude %]" class="btn btn--block btn--navigate">[% loc('Navigate to this problem') %]</a> + </p> + <p> + <a href="#" class="btn btn--block btn--geolocate" id="geolocate_link">[% loc('Set to my current location') %]</a> + </p> + </div> -[% IF permissions.report_edit_category OR permissions.report_inspect %] - <p class="right"> - <label for="category">[% loc('Category:') %]</label> + [% IF permissions.report_edit_category OR permissions.report_inspect %] + <div class="inspect-section"> + <p> + <label for="category">[% loc('Category') %]</label> [%# XXX this is duplicated from admin/report_edit.html, should be refactored %] - <select name="category" id="category"> + <select name="category" id="category" class="form-control"> [% IF NOT problem.category OR NOT categories.grep(problem.category).size %] <optgroup label="[% loc('Existing category') %]"> <option selected value="[% problem.category | html %]">[% (problem.category OR '-') | html %]</option> @@ -58,62 +47,102 @@ [% END %] </select> </p> -[% END %] + [% FOREACH category IN categories %] + [% cat_prefix = category | lower | replace('[^a-z]', '') %] + [% cat_prefix = "category_" _ cat_prefix _ "_" %] + [% IF category == problem.category %] + <p data-category="[% category | html %]"> + [% INCLUDE 'report/new/category_extras_fields.html' %] + </p> + [% ELSIF category_extras.$category.size %] + <p data-category="[% category | html %]" class="hidden"> + [% INCLUDE 'report/new/category_extras_fields.html' report_meta='' %] + </p> + [% END %] + [% END %] + + [% IF permissions.report_inspect %] <p> - [% SET local_coords = problem.local_coords; %] - <strong>[% loc('Easting/Northing:') %]</strong> - <span id="problem_easting">[% local_coords.0 IF local_coords %]</span>, - <span id="problem_northing">[% local_coords.1 IF local_coords %]</span> - <input type="hidden" name="longitude" value="[% problem.longitude %]"> - <input type="hidden" name="latitude" value="[% problem.latitude %]"> - </p> - <p style="clear:both;"> - <a href="#" id="geolocate_link">[% loc('Use my current location') %]</a>, - [% loc('or drag the pin on the map') %] » + <label for="state">[% loc('State') %]</label> + [%# XXX this is duplicated from admin/report_edit.html, should be refactored %] + <select name="state" id="state" class="form-control"> + [% FOREACH group IN state_groups %] + <optgroup label="[% group.0 %]"> + [% FOREACH state IN group.1 %] + <option [% 'selected ' IF state == problem.state %] value="[% state %]">[% state_pretty.$state %]</option> + [% END %] + </optgroup> + [% END %] + </select> </p> + [% END %] -[% IF permissions.report_inspect %] + </div> + [% END %] + + [% IF permissions.report_edit_priority OR permissions.report_inspect %] + <div class="inspect-section"> <p> - <label for="detailed_information">[% loc('Detailed problem location:') %]</label> - <textarea rows="2" name="detailed_location">[% problem.get_extra_metadata('detailed_location') | html %]</textarea> + <label for="problem_priority">[% loc('Priority') %]</label> + <select name="priority" id="problem_priority" class="form-control"> + <option value="" [% 'selected' UNLESS problem.response_priority_id %]>-</option> + [% FOREACH priority IN problem.response_priorities %] + <option value="[% priority.id %]" [% 'selected' IF problem.response_priority_id == priority.id %] [% 'disabled' IF priority.deleted %]>[% priority.name %]</option> + [% END %] + </select> </p> + + [% IF permissions.report_inspect %] <p> - <label for="detailed_information">[% loc('Detailed problem information:') %]</label> - <textarea rows="2" name="detailed_information">[% problem.get_extra_metadata('detailed_information') | html %]</textarea> + <label for="traffic_information">[% loc('Traffic management required?') %]</label> + [% traffic_info = problem.get_extra_metadata('traffic_information') %] + <select id="traffic_information" name="traffic_information" class="form-control"> + <option value=""[% ' selected' IF NOT traffic_info %]>-</option> + <option[% ' selected' IF traffic_info == "Yes" %]>Yes</option> + <option[% ' selected' IF traffic_info == "No" %]>No</option> + </select> </p> <p> - <label for="traffic_information">[% loc('Traffic management information:') %]</label> - <textarea rows="2" name="traffic_information">[% problem.get_extra_metadata('traffic_information') | html %]</textarea> + <label for="detailed_information">[% loc('Extra details') %]</label> + <textarea rows="2" name="detailed_information" id="detailed_information" class="form-control">[% problem.get_extra_metadata('detailed_information') | html %]</textarea> </p> -[% END %] + [% END %] - <p> - <input type="hidden" name="token" value="[% csrf_token %]"> - <a href="[% c.uri_for( '/report', problem.id ) %]" class="btn">[% loc('Cancel') %]</a> - <input type="submit" value="[% loc('Save changes') %]" name="save" /> - </p> -[% IF permissions.report_inspect %] - [% UNLESS problem.get_extra_metadata('inspected') %] - <p> - <label for="public_update">[% loc('Public update:') %]</label> - [% INCLUDE 'admin/response_templates_select.html' for='public_update' %] - <textarea rows="2" name="public_update" id="public_update" required>[% public_update | html %]</textarea> - </p> + </div> + [% END %] + + <div class="inspect-section"> + + [% IF permissions.report_inspect %] <p> - <input type="submit" value="[% loc('Save changes + send') %]" name="save_inspected" /> + <label class="label-containing-checkbox"> + <input type="checkbox" name="save_inspected" value="1" class="js-toggle-public-update" [% 'checked' IF save_inspected %]> + [% loc('Save with a public update') %] + </label> </p> - [% ELSE %] <p> - [% IF problem.whensent %] - [% loc("<strong>Note:</strong> This report has been sent onwards for action. Any changes made won't be passed on.") %] - [% ELSE %] - [% loc("<strong>Note:</strong> This report hasn't yet been sent onwards for action. Any changes made may not be passed on.") %] - [% END %] + <label for="public_update">[% loc('Public update:') %]</label> + [% INCLUDE 'admin/response_templates_select.html' for='public_update' %] + <textarea rows="2" name="public_update" id="public_update" class="form-control">[% public_update | html %]</textarea> </p> [% END %] -[% END %] - </form> - </div> + + [% IF problem.get_extra_metadata('inspected') %] + [% IF problem.whensent %] + <p>[% loc("<strong>Note:</strong> This report has been sent onwards for action. Any changes made won't be passed on.") %]</p> + [% ELSE %] + <p>[% loc("<strong>Note:</strong> This report hasn't yet been sent onwards for action. Any changes made may not be passed on.") %]</p> + [% END %] + [% END %] + + <p> + <input type="hidden" name="token" value="[% csrf_token %]"> + <a class="btn" href="[% c.uri_for( '/report', problem.id ) %]">[% loc('Cancel') %]</a> + <input class="btn btn-primary" type="submit" value="[% loc('Save changes') %]" name="save" /> + </p> + </div> + + </form> </div> [%- END %] diff --git a/templates/web/base/report/_main.html b/templates/web/base/report/_main.html index 7dfaf979e..469ee5bc5 100644 --- a/templates/web/base/report/_main.html +++ b/templates/web/base/report/_main.html @@ -46,7 +46,7 @@ Revert to original title </label> [% END %] - <h1><input type="text" name="problem_title" value="[% problem.title | html %]" data-original-value="[% original.title | html %]"></h1> + <h1><input class="form-control" type="text" name="problem_title" value="[% problem.title | html %]" data-original-value="[% original.title | html %]"></h1> </div> [% END %] @@ -91,7 +91,7 @@ Revert to original text </label> [% END %] - <textarea name="problem_detail" data-original-value="[% original.detail | html %]">[% problem.detail | html %]</textarea> + <textarea class="form-control" name="problem_detail" data-original-value="[% original.detail | html %]">[% problem.detail | html %]</textarea> </p> <div class="moderate-edit"> @@ -103,7 +103,7 @@ </p> <p> <label for="moderation_reason">Moderation reason:</label> - <input type="text" name="moderation_reason" placeholder="Describe why you are moderating this"> + <input type="text" class="form-control" name="moderation_reason" placeholder="Describe why you are moderating this"> </p> <p> <input type="submit" class="green-btn" value="Save changes"> @@ -126,10 +126,10 @@ %] <div class="moderate-display segmented-control" role="menu"> [% IF permissions.moderate %] - <a class="js-moderate" role="menuitem" aria-label="[% loc('Moderate this report') %]">[% loc('Moderate') %]</a> + <a class="js-moderate btn" role="menuitem" aria-label="[% loc('Moderate this report') %]">[% loc('Moderate') %]</a> [% END %] [% IF !hide_inspect_button AND permissions.keys.grep('report_inspect|report_edit_category|report_edit_priority').size %] - <a href="/report/[% problem.id %]/inspect" role="menuitem"> + <a class="btn" href="/report/[% problem.id %]/inspect#side-inspect" role="menuitem"> [%~ IF permissions.report_inspect ~%] [%~ loc('Inspect') ~%] [%~ ELSE ~%] @@ -139,9 +139,9 @@ [% END %] [% IF c.user.has_permission_to('planned_reports', problem.bodies_str_ids) %] [%~ IF c.user.is_planned_report(problem) ~%] - <label for="shortlist-report" role="menuitem" aria-label="[% loc('Remove from shortlist') %]">[% loc('Shortlisted') %]</label> + <label class="btn" for="shortlist-report" role="menuitem" aria-label="[% loc('Remove from shortlist') %]">[% loc('Shortlisted') %]</label> [%~ ELSE ~%] - <label for="shortlist-report" role="menuitem" aria-label="[% loc('Add to shortlist') %]">[% loc('Shortlist') %]</label> + <label class="btn" for="shortlist-report" role="menuitem" aria-label="[% loc('Add to shortlist') %]">[% loc('Shortlist') %]</label> [%~ END ~%] [% END %] </div> diff --git a/templates/web/base/report/display.html b/templates/web/base/report/display.html index fb8cd8191..1ee5c4636 100644 --- a/templates/web/base/report/display.html +++ b/templates/web/base/report/display.html @@ -14,6 +14,11 @@ </div> <div id="map_sidebar"> + +[% IF two_column_sidebar %] + <div class="two_column_sidebar"> +[% END %] + <div id="side-report"> [% IF login_success %] @@ -47,6 +52,11 @@ </div> [% second_column %] + +[% IF two_column_sidebar %] + </div> +[% END %] + </div> [% INCLUDE 'footer.html' %] diff --git a/templates/web/base/report/display_tools.html b/templates/web/base/report/display_tools.html index f12e9dbc7..f27ed8da5 100644 --- a/templates/web/base/report/display_tools.html +++ b/templates/web/base/report/display_tools.html @@ -3,7 +3,7 @@ [% IF c.user_exists AND c.cobrand.users_can_hide AND c.user.belongs_to_body( problem.bodies_str ) %] <li><form method="post" action="/report/delete/[% problem.id %]" id="remove-from-site-form"> <input type="hidden" name="token" value="[% csrf_token %]"> - <input type="submit" id="key-tool-report-abuse" class="abuse" data-confirm="[% loc('Are you sure?') %]" name="remove_from_site" value="[% loc('Remove from site') %]"> + <input type="submit" id="key-tool-report-abuse" class="abuse btn" data-confirm="[% loc('Are you sure?') %]" name="remove_from_site" value="[% loc('Remove from site') %]"> </form></li> [% ELSIF c.cobrand.moniker != 'zurich' %] <li><a rel="nofollow" id="key-tool-report-abuse" class="abuse" href="[% c.uri_for( '/contact', { id => problem.id } ) %]">[% loc('Report abuse' ) %]</a></li> @@ -44,7 +44,7 @@ <label class="hidden n" for="alert_rznvy">[% loc('Your email') %]</label> <div class="form-txt-submit-box"> [% IF NOT c.user_exists %] - <input type="email" name="rznvy" id="alert_rznvy" value="[% email | html %]" size="30" placeholder="[% loc('Your email') %]"> + <input type="email" class="form-control" name="rznvy" id="alert_rznvy" value="[% email | html %]" size="30" placeholder="[% loc('Your email') %]"> [% END %] <input class="green-btn" type="submit" value="[% loc('Subscribe') %]"> </div> diff --git a/templates/web/base/report/inspect.html b/templates/web/base/report/inspect.html index 0a3fdcbb2..f4a9e4c46 100644 --- a/templates/web/base/report/inspect.html +++ b/templates/web/base/report/inspect.html @@ -1,5 +1,6 @@ [% SET bodyclass = 'mappage with-actions'; + SET two_column_sidebar = 1; PROCESS 'report/_inspect.html'; SET shown_form = 1 UNLESS problem.get_extra_metadata('inspected'); INCLUDE 'report/display.html', hide_inspect_button = 1; diff --git a/templates/web/base/report/new/category_extras.html b/templates/web/base/report/new/category_extras.html index 6b01f93e0..084dd2d93 100644 --- a/templates/web/base/report/new/category_extras.html +++ b/templates/web/base/report/new/category_extras.html @@ -15,25 +15,7 @@ list_of_names.join( '</strong>' _ loc(' or ') _ '<strong>' ) ); %] </p> - [%- FOR meta IN category_extras.$category %] - [%- meta_name = meta.code -%] - - <label for="form_[% meta_name %]">[% meta.description %]</label> - [% IF field_errors.$meta_name %] - <p class='form-error'>[% field_errors.$meta_name %]</p> - [% END -%] - [% IF meta.variable != 'false' %] - [% IF meta.exists('values') %] - <select class="form-control" name="[% meta_name %]" id="form_[% meta_name %]"[% meta.required == 'true' ? ' required' : '' %]> - [% FOR option IN meta.values %] - <option value="[% option.key %]"[% IF option.key == report_meta.$meta_name.value %] selected[% END %]>[% option.name %]</option> - [% END %] - </select> - [% ELSE %] - <input class="form-control" type="text" value="[% report_meta.$meta_name.value | html %]" name="[% meta_name %]" id="form_[% meta_name %]"[% meta.required == 'true' ? ' required' : '' %]> - [% END %] - [% END %] - [%- END %] + [% INCLUDE 'report/new/category_extras_fields.html' %] </div> [%- END %] </div> diff --git a/templates/web/base/report/new/category_extras_fields.html b/templates/web/base/report/new/category_extras_fields.html new file mode 100644 index 000000000..ec72ee7f3 --- /dev/null +++ b/templates/web/base/report/new/category_extras_fields.html @@ -0,0 +1,19 @@ +[%- FOR meta IN category_extras.$category %] + [%- meta_name = meta.code -%] + + <label for="[% cat_prefix %]form_[% meta_name %]">[% meta.description %]</label> + [% IF field_errors.$meta_name %] + <p class='form-error'>[% field_errors.$meta_name %]</p> + [% END -%] + [% IF meta.variable != 'false' %] + [% IF meta.exists('values') %] + <select class="form-control" name="[% cat_prefix %][% meta_name %]" id="[% cat_prefix %]form_[% meta_name %]"[% meta.required == 'true' ? ' required' : '' %]> + [% FOR option IN meta.values %] + <option value="[% option.key %]"[% IF option.key == report_meta.$meta_name.value %] selected[% END %]>[% option.name %]</option> + [% END %] + </select> + [% ELSE %] + <input class="form-control" type="text" value="[% report_meta.$meta_name.value | html %]" name="[% cat_prefix %][% meta_name %]" id="[% cat_prefix %]form_[% meta_name %]"[% meta.required == 'true' ? ' required' : '' %]> + [% END %] + [% END %] +[%- END %] diff --git a/templates/web/base/report/update.html b/templates/web/base/report/update.html index 1a30a48f1..7c2c39eb2 100644 --- a/templates/web/base/report/update.html +++ b/templates/web/base/report/update.html @@ -39,7 +39,7 @@ <label><input type="checkbox" name="update_revert_detail" class="revert-textarea"> Revert to original</label> [% END %] - <textarea name="update_detail">[% update.text | add_links %]</textarea> + <textarea class="form-control" name="update_detail">[% update.text | add_links %]</textarea> </div> [% END %] @@ -55,7 +55,7 @@ [% IF moderating %] <div class="moderate-edit"> <label for="moderation_reason">Moderation reason:</label> - <input type="text" name="moderation_reason" + <input type="text" class="form-control" name="moderation_reason" placeholder="Describe why you are moderating this"> <input type="submit" class="red-btn" value="Save changes"> <input type="button" class="btn cancel" value="Discard changes"> diff --git a/templates/web/base/report/update/form_update.html b/templates/web/base/report/update/form_update.html index 55125ba4b..a3d4615e1 100644 --- a/templates/web/base/report/update/form_update.html +++ b/templates/web/base/report/update/form_update.html @@ -33,11 +33,11 @@ [% IF field_errors.update %] <div class='form-error'>[% field_errors.update %]</div> [% END %] -<textarea rows="7" cols="30" name="update" id="form_update" placeholder="[% loc('Please write your update here') %]" required>[% update.text | html %]</textarea> +<textarea rows="7" cols="30" name="update" class="form-control" id="form_update" placeholder="[% loc('Please write your update here') %]" required>[% update.text | html %]</textarea> [% IF c.user && c.user.belongs_to_body( problem.bodies_str ) %] <label for="form_state">[% loc( 'State' ) %]</label> - <select name="state" id="form_state"> + <select name="state" id="form_state" class="form-control"> [% FOREACH state IN [ ['confirmed', loc('Open')], ['investigating', loc('Investigating')], ['action scheduled', loc('Action Scheduled')], ['in progress', loc('In Progress')], ['duplicate', loc('Duplicate')], diff --git a/templates/web/base/report/update/form_user_loggedout_by_email.html b/templates/web/base/report/update/form_user_loggedout_by_email.html index aae37502b..04a842bef 100644 --- a/templates/web/base/report/update/form_user_loggedout_by_email.html +++ b/templates/web/base/report/update/form_user_loggedout_by_email.html @@ -2,7 +2,7 @@ <h5>[% loc('<strong>No</strong> Let me confirm my update by email') %]</h5> [% INCLUDE 'report/update/form_name.html' %] - + <label for="password_register">[% loc('Password (optional)') %]</label> <div class="general-notes"> @@ -10,7 +10,7 @@ </div> <div class="form-txt-submit-box"> - <input type="password" name="password_register" id="password_register" value="" placeholder="[% loc('Enter a password') %]"> + <input type="password" class="form-control" name="password_register" id="password_register" value="" placeholder="[% loc('Enter a password') %]"> <input class="green-btn js-submit_register" type="submit" name="submit_register" value="[% loc('Post') %]"> </div> diff --git a/templates/web/base/report/update/form_user_loggedout_password.html b/templates/web/base/report/update/form_user_loggedout_password.html index 593ccf3de..d24f8bd15 100644 --- a/templates/web/base/report/update/form_user_loggedout_password.html +++ b/templates/web/base/report/update/form_user_loggedout_password.html @@ -6,7 +6,7 @@ <p class='form-error'>[% field_errors.password %]</p> [% END %] <div class="form-txt-submit-box"> - <input type="password" name="password_sign_in" id="password_sign_in" value="" placeholder="[% loc('Your password') %]"> + <input type="password" class="form-control" name="password_sign_in" id="password_sign_in" value="" placeholder="[% loc('Your password') %]"> <input class="green-btn js-submit_sign_in" type="submit" name="submit_sign_in" value="[% loc('Post') %]"> </div> diff --git a/templates/web/base/reports/_list-filters.html b/templates/web/base/reports/_list-filters.html index 0a36d8486..e0452eb08 100644 --- a/templates/web/base/reports/_list-filters.html +++ b/templates/web/base/reports/_list-filters.html @@ -1,5 +1,5 @@ [% select_status = BLOCK %] - <select name="status" id="statuses"> + <select class="form-control" name="status" id="statuses"> <option value="all"[% ' selected' IF filter_status == 'all' %]>[% loc('all reports') %]</option> <option value="open"[% ' selected' IF filter_status == 'open' %]>[% loc('unfixed reports') %]</option> <option value="closed"[% ' selected' IF filter_status == 'closed' %]>[% loc('closed reports') %]</option> @@ -8,7 +8,7 @@ [% END %] [% select_category = BLOCK %] - <select name="filter_category" id="filter_categories"> + <select class="form-control" name="filter_category" id="filter_categories"> <option value="">[% loc('Everything') %]</option> [% FOR category IN filter_categories %] <option value="[% category | html %]"[% ' selected' IF filter_category == category %]> |