diff options
Diffstat (limited to 'templates')
| -rw-r--r-- | templates/web/angus/maps/fms.html | 3 | ||||
| -rw-r--r-- | templates/web/base/admin/category_edit.html | 2 | ||||
| -rw-r--r-- | templates/web/base/report/new/category_extras_fields.html | 34 | ||||
| -rw-r--r-- | templates/web/base/report/new/category_wrapper.html | 8 | ||||
| -rwxr-xr-x | templates/web/base/reports/body.html | 7 | ||||
| -rw-r--r-- | templates/web/bristol/footer_extra_js.html | 4 | ||||
| -rw-r--r-- | templates/web/bristol/maps/bristol.html | 2 |
7 files changed, 33 insertions, 27 deletions
diff --git a/templates/web/angus/maps/fms.html b/templates/web/angus/maps/fms.html index a47a5a6e3..aed4d1764 100644 --- a/templates/web/angus/maps/fms.html +++ b/templates/web/angus/maps/fms.html @@ -4,7 +4,8 @@ <script type="text/javascript" src="[% version('/js/map-OpenLayers.js') %]"></script> <script type="text/javascript" src="[% version('/js/map-bing-ol.js') %]"></script> <script type="text/javascript" src="[% version('/js/map-fms.js') %]"></script> -<script src="[% version('/cobrands/angus/position_map.js') %]" charset="utf-8"></script> +<script src="[% version('/cobrands/fixmystreet/assets.js') %]"></script> +<script src="[% version('/cobrands/angus/js.js') %]"></script> [% END %] [% map_html = INCLUDE maps/openlayers.html include_key = 1 %] diff --git a/templates/web/base/admin/category_edit.html b/templates/web/base/admin/category_edit.html index d1a323819..5eb3c943e 100644 --- a/templates/web/base/admin/category_edit.html +++ b/templates/web/base/admin/category_edit.html @@ -32,7 +32,7 @@ [% FOR meta IN contact.get_metadata_for_input %] <li> [% meta.order %], <code>[% meta.code %]</code>, [% meta.datatype %], - [% meta.required ? loc('required') : loc('optional') %] + [% meta.required == 'true' ? loc('required') : loc('optional') %] <br><small>[% meta.description %]</small> [% IF meta.variable != 'false' AND meta.exists('values') %] <ul> diff --git a/templates/web/base/report/new/category_extras_fields.html b/templates/web/base/report/new/category_extras_fields.html index ec72ee7f3..012007e06 100644 --- a/templates/web/base/report/new/category_extras_fields.html +++ b/templates/web/base/report/new/category_extras_fields.html @@ -1,19 +1,27 @@ [%- 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> + [% IF c.cobrand.category_extra_hidden(meta_name) %] + + <input type="hidden" value="" name="[% cat_prefix %][% meta_name %]" id="[% cat_prefix %]form_[% meta_name %]"> + + [% ELSE %] + + <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 %] - </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 %] [%- END %] diff --git a/templates/web/base/report/new/category_wrapper.html b/templates/web/base/report/new/category_wrapper.html index 85b085999..9f628c44e 100644 --- a/templates/web/base/report/new/category_wrapper.html +++ b/templates/web/base/report/new/category_wrapper.html @@ -1,8 +1,7 @@ +<div id="form_category_row"> [% IF js %] - <div id="form_category_row"> - <label for="form_category">[% loc('Category') %]</label> - <select class="form-control" name="category" id="form_category" required><option>[% loc('Loading...') %]</option></select> - </div> + <label for="form_category">[% loc('Category') %]</label> + <select class="form-control" name="category" id="form_category" required><option>[% loc('Loading...') %]</option></select> [% ELSE %] [% IF category_options.size %] [% IF field_errors.category %] @@ -11,6 +10,7 @@ [% PROCESS "report/new/category.html" %] [% END %] [% END %] +</div> [%- IF category_extras %] [% PROCESS "report/new/category_extras.html" %] diff --git a/templates/web/base/reports/body.html b/templates/web/base/reports/body.html index 929a4a527..14ecec0f1 100755 --- a/templates/web/base/reports/body.html +++ b/templates/web/base/reports/body.html @@ -53,13 +53,6 @@ [% INCLUDE 'reports/_ward-list.html' %] -[% IF c.cobrand.moniker == 'fixmystreet' %] -<p class="promo"> - FixMyStreet is now available for local council websites. - <a href="https://www.fixmystreet.com/council">Find out more</a>. -</p> -[% END %] - <section class="full-width"> [% INCLUDE "reports/_list-filters.html", use_form_wrapper = 1 %] <div class="js-pagination"> diff --git a/templates/web/bristol/footer_extra_js.html b/templates/web/bristol/footer_extra_js.html new file mode 100644 index 000000000..6ba5e3100 --- /dev/null +++ b/templates/web/bristol/footer_extra_js.html @@ -0,0 +1,4 @@ +<script src="[% version('/js/OpenLayers.Projection.OrdnanceSurvey.js') %]"></script> +<script src="[% version('/cobrands/fixmystreet-uk-councils/js.js') %]"></script> +<script src="[% version('/cobrands/fixmystreet/assets.js') %]"></script> +<script src="[% version('/cobrands/bristol/js.js') %]"></script> diff --git a/templates/web/bristol/maps/bristol.html b/templates/web/bristol/maps/bristol.html index 7a4a5fbcf..f49571a1d 100644 --- a/templates/web/bristol/maps/bristol.html +++ b/templates/web/bristol/maps/bristol.html @@ -1,5 +1,5 @@ [% map_js = BLOCK %] -<script type="text/javascript" src="[% version('/js/OpenLayers.2.11.zurich.js') %]"></script> +<script type="text/javascript" src="[% version('/js/OpenLayers/OpenLayers.bristol.js') %]"></script> <script type="text/javascript" src="[% version('/js/map-OpenLayers.js') %]"></script> <script type="text/javascript" src="[% version('/js/map-wmts-base.js') %]"></script> <script type="text/javascript" src="[% version('/js/map-wmts-bristol.js') %]"></script> |