diff options
| -rw-r--r-- | CHANGELOG.md | 1 | ||||
| -rw-r--r-- | templates/web/base/js/translation_strings.html | 3 | ||||
| -rw-r--r-- | templates/web/base/report/display_tools.html | 2 | ||||
| -rw-r--r-- | templates/web/base/report/update-form.html | 1 | ||||
| -rw-r--r-- | templates/web/northamptonshire/index-steps.html | 18 | ||||
| -rw-r--r-- | web/cobrands/fixmystreet/fixmystreet.js | 12 | ||||
| -rw-r--r-- | web/cobrands/sass/_base.scss | 1 | ||||
| -rw-r--r-- | web/cobrands/tfl/js.js | 1 |
8 files changed, 30 insertions, 9 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index 4645fad51..7528ee46a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -23,6 +23,7 @@ - Add XSL to RSS feeds so they look nicer in browsers. - Add per-report OpenGraph images. #2394 - Display GPS marker on /around map. #2359 + - Use nicer default photo upload message. #2358 - Remove pan control from mobile widths. #2865 - Admin improvements: - Add new roles system, to group permissions and apply to users. #2483 diff --git a/templates/web/base/js/translation_strings.html b/templates/web/base/js/translation_strings.html index 5ccd9863e..d6e7051b5 100644 --- a/templates/web/base/js/translation_strings.html +++ b/templates/web/base/js/translation_strings.html @@ -74,7 +74,8 @@ fixmystreet.password_minimum_length = [% c.cobrand.password_minimum_length %]; hide_pins: '[% loc('Hide pins') | replace("'", "\\'") %]', upload_max_files_exceeded: '[% loc ('Sorry! You’ve hit the limit of images that can be attached to one report.') | replace("'", "\\'") %]', - upload_default_message: '[% loc ('Drag and drop photos here or <u>click to upload</u>') | replace("'", "\\'") %]', + upload_default_message: '[% loc('Drag photos here or <u>browse photos</u>') | replace("'", "\\'") %]', + upload_default_message_mobile: '[% loc('<u>Take or choose existing photo</u>') | replace("'", "\\'") %]', upload_cancel_confirmation: '[% loc ('Are you sure you want to cancel this upload?') | replace("'", "\\'") %]', upload_invalid_file_type: '[% loc ('Please upload an image only') | replace("'", "\\'") %]', diff --git a/templates/web/base/report/display_tools.html b/templates/web/base/report/display_tools.html index 4be1bca3c..b65320394 100644 --- a/templates/web/base/report/display_tools.html +++ b/templates/web/base/report/display_tools.html @@ -11,7 +11,7 @@ %]</a></li> [% END %] [% IF c.cobrand.moniker != 'zurich' %] - <li><a rel="nofollow" id="key-tool-report-updates" class="feed js-feed" href="[% c.uri_for( '/alert/subscribe', { id => problem.id } ) %]">[% loc('Get updates' ) %]</a></li> + <li><a rel="nofollow" id="key-tool-report-updates" class="feed" href="[% c.uri_for( '/alert/subscribe', { id => problem.id } ) %]">[% loc('Get updates' ) %]</a></li> [% END %] [% IF c.cobrand.moniker == 'fixmystreet' %] <li><a rel="nofollow" id="key-tool-report-share" class="share" href="#report-share">[% loc('Share') %]</a></li> diff --git a/templates/web/base/report/update-form.html b/templates/web/base/report/update-form.html index 4c631d5e7..d235455ed 100644 --- a/templates/web/base/report/update-form.html +++ b/templates/web/base/report/update-form.html @@ -24,6 +24,7 @@ [% IF login_success %] [% PROCESS "report/update/form_user_loggedin.html" %] [% INCLUDE 'report/update/form_update.html' %] + <hr> [% ELSIF oauth_need_email %] <div id="form_sign_in"> [% PROCESS "report/form/user_loggedout_by_email.html" object=update type='update' valid_class='validNameU' email_required=1 %] diff --git a/templates/web/northamptonshire/index-steps.html b/templates/web/northamptonshire/index-steps.html new file mode 100644 index 000000000..99d11f7e8 --- /dev/null +++ b/templates/web/northamptonshire/index-steps.html @@ -0,0 +1,18 @@ +<h2>[% loc('How to report a problem') %]</h2> + +<ol class="big-numbers"> + <li>[% question %]</li> + <li>[% loc('Locate the problem on a map of the area') %]</li> + <li>[% loc('Enter details of the problem') %]</li> + <li>Confirm the report and [% c.cobrand.council_name %] will investigate</li> + <li> + Please enter a single problem per enquiry.<br> + The first item described will be taken as the enquiry + </li> +</ol> + +<section class="full-width"> +[% INCLUDE "front/stats.html" %] +[% TRY %][% INCLUDE "front/tips.html" %][% CATCH file %][% END %] +</section> + diff --git a/web/cobrands/fixmystreet/fixmystreet.js b/web/cobrands/fixmystreet/fixmystreet.js index 68b12c323..48ae83103 100644 --- a/web/cobrands/fixmystreet/fixmystreet.js +++ b/web/cobrands/fixmystreet/fixmystreet.js @@ -684,6 +684,10 @@ $.extend(fixmystreet.set_up, { $originalInput.hide(); $dropzone.insertAfter($originalInput); + var default_message = translation_strings.upload_default_message; + if ($("html").hasClass("mobile")) { + default_message = translation_strings.upload_default_message_mobile; + } var photodrop = new Dropzone($dropzone[0], { url: '/photo/upload', paramName: 'photo', @@ -695,7 +699,7 @@ $.extend(fixmystreet.set_up, { resizeHeight: 2048, resizeQuality: 0.6, acceptedFiles: 'image/jpeg,image/pjpeg,image/gif,image/tiff,image/png', - dictDefaultMessage: translation_strings.upload_default_message, + dictDefaultMessage: default_message, dictCancelUploadConfirmation: translation_strings.upload_cancel_confirmation, dictInvalidFileType: translation_strings.upload_invalid_file_type, dictMaxFilesExceeded: translation_strings.upload_max_files_exceeded, @@ -833,10 +837,8 @@ $.extend(fixmystreet.set_up, { map_controls: function() { //add links container (if its not there) - if (fixmystreet.cobrand != 'zurich') { - if ($('#sub_map_links').length === 0) { - $('<p class="sub-map-links" id="sub_map_links" />').insertAfter($('#map')); - } + if ($('#sub_map_links').length === 0) { + $('<p class="sub-map-links" id="sub_map_links" />').insertAfter($('#map')); } if ($('.mobile').length) { diff --git a/web/cobrands/sass/_base.scss b/web/cobrands/sass/_base.scss index 5e3e48ff0..a9e0da128 100644 --- a/web/cobrands/sass/_base.scss +++ b/web/cobrands/sass/_base.scss @@ -810,7 +810,6 @@ ul.error { background-repeat: no-repeat; color: #333 !important; padding: 1em; - text-transform: uppercase; font-size: 0.6875em; font-family: $meta-font; font-weight: normal; diff --git a/web/cobrands/tfl/js.js b/web/cobrands/tfl/js.js index a217d3984..248162597 100644 --- a/web/cobrands/tfl/js.js +++ b/web/cobrands/tfl/js.js @@ -1,7 +1,6 @@ (function(){ translation_strings.name.validName = 'Please enter your full name, Transport for London needs this information – if you do not wish your name to be shown on the site, untick the box below'; -translation_strings.upload_default_message = 'Drag photo here to upload or <u>browse files</u>'; translation_strings.incident_date = { date: 'Enter a date in the format dd/mm/yyyy' }; translation_strings.time = 'Enter a time in the format hh:mm'; |