diff options
| -rw-r--r-- | perllib/FixMyStreet/Cobrand/Oxfordshire.pm | 2 | ||||
| -rw-r--r-- | templates/web/oxfordshire/report/_council_sent_info.html | 27 | ||||
| -rw-r--r-- | web/cobrands/oxfordshire/assets.js | 10 | ||||
| -rw-r--r-- | web/cobrands/oxfordshire/base.scss | 8 |
4 files changed, 24 insertions, 23 deletions
diff --git a/perllib/FixMyStreet/Cobrand/Oxfordshire.pm b/perllib/FixMyStreet/Cobrand/Oxfordshire.pm index 91c2efdfe..63f114c27 100644 --- a/perllib/FixMyStreet/Cobrand/Oxfordshire.pm +++ b/perllib/FixMyStreet/Cobrand/Oxfordshire.pm @@ -144,7 +144,7 @@ sub open311_pre_send { $self->{ox_original_detail} = $row->detail; if (my $fid = $row->get_extra_field_value('feature_id')) { - my $text = $row->detail . "\n\nAsset Id: $fid\n"; + my $text = "Asset Id: $fid\n\n" . $row->detail; $row->detail($text); } } diff --git a/templates/web/oxfordshire/report/_council_sent_info.html b/templates/web/oxfordshire/report/_council_sent_info.html index 8b742cb2e..1dd86c918 100644 --- a/templates/web/oxfordshire/report/_council_sent_info.html +++ b/templates/web/oxfordshire/report/_council_sent_info.html @@ -1,13 +1,16 @@ -[% IF problem.whensent || problem.can_display_external_id %] - <div class="council_info_box"> - [% IF problem.can_display_external_id %] - [% reference = problem.get_extra_metadata('customer_reference') %] - <h3> - [% IF reference %] - [% problem.external_body %] Council ref: [% reference %] - [% END %] - </h3> - [% END %] +[% reference = problem.get_extra_metadata('customer_reference') ~%] +[% feature_id = problem.get_extra_field_value('feature_id') ~%] +[% column_no = problem.get_extra_field_value('column_no') ~%] +[% RETURN UNLESS reference OR feature_id OR column_no %] - </div> -[% END %] +<div class="council_info_box"> + [% IF reference %] + <p><strong>Council ref:</strong> [% reference %]</p> + [% END %] + [% IF feature_id %] + <p><strong>Asset ID:</strong> [% feature_id %]</p> + [% END %] + [% IF column_no %] + <p><strong>Column number:</strong> [% column_no %]</p> + [% END %] +</div> diff --git a/web/cobrands/oxfordshire/assets.js b/web/cobrands/oxfordshire/assets.js index fc9f87064..1e00bccc4 100644 --- a/web/cobrands/oxfordshire/assets.js +++ b/web/cobrands/oxfordshire/assets.js @@ -97,6 +97,7 @@ fixmystreet.assets.add(defaults, { }); fixmystreet.assets.add(defaults, { + select_action: true, stylemap: occ_stylemap, wfs_feature: "Traffic_Lights", asset_id_field: 'Site', @@ -104,7 +105,12 @@ fixmystreet.assets.add(defaults, { feature_id: 'Site' }, asset_category: ["Traffic Lights (permanent only)"], - asset_item: 'traffic light' + asset_item: 'traffic light', + feature_code: 'Site', + actions: { + asset_found: fixmystreet.assets.named_select_action_found, + asset_not_found: fixmystreet.assets.named_select_action_not_found + } }); var streetlight_select = $.extend({ @@ -185,7 +191,7 @@ fixmystreet.assets.add(owned_defaults, { TYPENAME: "junctions" } }, - asset_category: ["Gully and Catchpits"], + asset_category: ["Gully and Catchpits", 'Drainage'], asset_item: 'drain' }); diff --git a/web/cobrands/oxfordshire/base.scss b/web/cobrands/oxfordshire/base.scss index a5f7a43d6..fefbc619e 100644 --- a/web/cobrands/oxfordshire/base.scss +++ b/web/cobrands/oxfordshire/base.scss @@ -152,16 +152,8 @@ dd, p { padding: 1em; margin: 0 -1em -1em -1em; // counteract 1em padding on sidebar without using .full-width which sets an explicit width - h3 { - font-weight: bold; - font-size: 1em; - margin: 0 0 0.5em 0; - } - p { - color: #666; margin: 0 0 0.5em 0; - font-size: 0.9em; } & > :last-child { |