diff options
Diffstat (limited to 'templates/web')
38 files changed, 1024 insertions, 321 deletions
diff --git a/templates/web/bromley/auth/sign_out.html b/templates/web/bromley/auth/sign_out.html new file mode 100644 index 000000000..63749b233 --- /dev/null +++ b/templates/web/bromley/auth/sign_out.html @@ -0,0 +1,8 @@ +[% INCLUDE 'header.html', title = loc('Sign out'), bodyclass = 'fullwidthpage' %] + +<p>You have been signed out of Bromley’s street and parks problem reporting system.</p> + +<p>Please feel free to <a href="[% c.uri_for('/auth') %]">sign in again</a>, or +go back to the <a href="/">main street and parks reporting page</a>.</p> + +[% INCLUDE 'footer.html' %] diff --git a/templates/web/fixmystreet/report/new/form_heading.html b/templates/web/bromley/contact/address.html index e69de29bb..e69de29bb 100644 --- a/templates/web/fixmystreet/report/new/form_heading.html +++ b/templates/web/bromley/contact/address.html diff --git a/templates/web/bromley/contact/submit.html b/templates/web/bromley/contact/submit.html new file mode 100644 index 000000000..781862866 --- /dev/null +++ b/templates/web/bromley/contact/submit.html @@ -0,0 +1,19 @@ +[% INCLUDE 'header.html', title = loc('Contact Us') %] + +<h1>[% loc('Contact the team') %]</h1> + +[% IF success %] + +<p>Thank you for letting us know about this report. We will review, and if +necessary, edit the report, or remove it from the site. You can contact us at +<a href="mailto:[% contact_email %]">[% contact_email %]</a>. + +[% ELSE %] + + <p> + [% tprintf( loc('Failed to send message. Please try again, or <a href="mailto:%s">email us</a>.'), contact_email ) %] + </p> + +[% END %] + +[% INCLUDE 'footer.html' %] diff --git a/templates/web/bromley/faq/faq-en-gb.html b/templates/web/bromley/faq/faq-en-gb.html new file mode 100755 index 000000000..ae418de37 --- /dev/null +++ b/templates/web/bromley/faq/faq-en-gb.html @@ -0,0 +1,111 @@ +[% INCLUDE 'header.html', title = 'Help', bodyclass = 'fullwidthpage' %] + +<p>These pages are for reporting things which are broken, dirty, damaged or dumped, and need fixing, cleaning or clearing, such as:</p> + <ul><li>abandoned vehicles + <li>graffiti + <li>flytipping and dumped rubbish + <li>street cleaning, such as dog fouling and street sweeping + <li>unlit lamp posts + <li>park repairs, such as broken fences or playground equipment + <li>potholes + </ul> + +<dl> + <dt>What issues can’t be reported here?</dt> + <dd><p>The following problems should be reported via + <a href="http://www.bromley.gov.uk/report">http://www.bromley.gov.uk/report</a>:</p> + <ul> + <li>missed rubbish or recycling collections + <li>anti-social behaviour + <li>noise pollution or barking dogs + <li>fires and smoke/smell pollution + <li>proposals for speed bumps/ CCTV/ pedestrian crossings/ new road layouts/ etc. + <li>complaining about your neighbours + <li>complaining or commenting about the council + </ul> + <p>Do not use this to report urgent or emergency problems because reports are not always dealt with immediately outside of working hours.</p> + <p>Note, the council does not maintain responsibility for problems on private land or TFL roads (A21 and part of the A232, West Wickham to Locksbottom). TFL road enquiries should be directed to <a href="http://reportit.tfl.gov.uk/">http://reportit.tfl.gov.uk/</a>. + + </dd> + + <dt>How do I report a problem here?</dt> + <dd>After entering a postcode or location, you are shown +a map of that area. You can view problems already reported in that area, +or report ones of your own by clicking on the map at the location of +the problem.</dd> + <dt>How are the problems solved?</dt> + <dd>They are reported directly to us so we can then resolve the problem. + You can also discuss the problem on the website with others if you wish.</dd> + + <dt>Do you remove silly or illegal content?</dt> + <dd>Bromley Council and FixMyStreet are not responsible for the content and accuracy +of material submitted by its users. We reserve the right to edit or remove any +problems or updates which we consider to be inappropriate upon being informed +by a user of the site.</dd> + + <dt>Can I use FixMyStreet on my mobile?</dt> + <dd>Yes a special mobile friendly version is available to report problem in Bromley’s streets or parks. + </dd> + + <dt>Can I use these pages to report problems outside of the London Borough of Bromley?</dd> + <dd>Yes, if you enter a postcode or address outside the borough you will be re-directed to the main FixMyStreet site that will enable you to report problems elsewhere. FixMyStreet will forward these on to the relevant council.</dd> + + <dt>The site is powered by FixMyStreet, who are they?</dt> + <dd>FixMyStreet was built by <a href="http://www.mysociety.org/">mySociety</a>, in conjunction with the <a href="http://www.youngfoundation.org.uk/">Young Foundation</a>. +mySociety is the project of a registered charity which has grown out of the community of +volunteers who built sites like <a href="http://www.theyworkforyou.com/">TheyWorkForYou</a>. +mySociety’s primary mission is to build Internet projects which give people simple, tangible +benefits in the civic and community aspects of their lives. +The charity is called UK Citizens Online Democracy and is charity number 1076346. mySociety +can be contacted by email at <a href="mailto:hello@mysociety.org">hello@mysociety.org</a>, +or by post at mySociety, 483 Green Lanes, London, N13 4BS.</dd> + + <dt>Why does the site use kilometres for measurements?</dt> + <dd>The British national + grid reference system, devised by Ordnance Survey (the British national + mapping agency) around the time of the second world war, uses eastings and + northings measured in metres and kilometres; the maps we use are from + Ordnance Survey and so this is what we use to display distances. + There you have it: not everything British is in miles!</dd> + + <dt>Why can’t I zoom out more on the reporting map?</dt> + <dd>We want to keep reports locally focused, so we restrict the ability to + move radically between areas. The map on <a href="/my">Your Reports</a> will let you see all + the reports you’ve made, wherever they are.</dd> + + <dt>I’d like a site like this for my own location/ where’s the "source code" to this site?</dt> + <dd> +The mySociety software behind this site is open source, and available +under the GNU Affero GPL software license. You can <a +href="http://github.com/mysociety/fixmystreet">download the +source code</a> and help mySociety develop it. +You’re welcome to use it in your own projects, although you must also +make available the source code to any such projects. +<a href="http://www.fiksgatami.no/">Fiksgatami</a> is an example of our code +being used in a Norwegian version of this site. +</dd> + +</dl> + + <h2>Privacy Questions</h2> + + <dl> + <dt>Who gets to see my email address?</dt> + <dd> +<p>If you submit a problem, your details, and details of the problem, will be +submitted to Bromley Council. Other than the council, only people we authorise +to view the FixMyStreet administration interface will be able to see your email +address and they will never use it for anything other than to help administer +FixMyStreet.</p> +<p>We will never give or sell your email address to anyone else, unless we are +obliged to by law. Your name will not be published anywhere unless you let us.</p> +</dd> + + <dt>What emails will you send to me?</dt> + <dd>We will email you when we have received your report, and when it has + been investigated and actioned. We will only send you emails that + relate to an issue you have reported.</dd> + + </dl> + +[% INCLUDE 'footer.html' pagefooter = 'yes' %] diff --git a/templates/web/bromley/footer.html b/templates/web/bromley/footer.html index 9be0741bf..d60854daa 100644 --- a/templates/web/bromley/footer.html +++ b/templates/web/bromley/footer.html @@ -1,23 +1,8 @@ - [% IF pagefooter %] - <footer role="content-info"> - <div class="tablewrapper bordered"> - <div id="footer-mobileapps"> - <h4>Mobile apps</h4> - - <ul> - <li><a class="m-app-iphone" href="http://itunes.apple.com/gb/app/fixmystreet/id297456545">iPhone</a></li> - <li><a class="m-app-droid" href="https://market.android.com/details?id=com.android.fixmystreet">Android</a></li> - <li><a class="m-app-nokia" href="http://store.ovi.com/content/107557">Nokia</a></li> - <li><a class="m-app-iphone-streetreport" href="http://itunes.apple.com/gb/app/streetreport/id371891859">iPhone Street Report</a></li> - </ul> - </div> - - <div id="footer-help"> - </div> - </div> - </footer> - [% END %] </div><!-- .content role=main --> + <p id="bromley-powered-by" class="desk-only"> + <a href="http://www.fixmystreet.com/">Powered by <img src="/cobrands/bromley/fms-logo.png" alt="FixMyStreet" style="height:20px;"></a> + </p> + </div><!-- .container --> </div><!-- .table-cell --> @@ -25,9 +10,8 @@ <div class="nav-wrapper-2"> <div id="main-nav" role="navigation"> <ul id="mysoc-menu"> - <li><a href="http://www.fixmystreet.com/">Powered by FixMyStreet</a></li> + <li><a href="http://www.fixmystreet.com/">Powered by <img src="/cobrands/bromley/fms-logo.png" alt="FixMyStreet" style="height:20px;"></a></li> </ul> - <ul id="main-menu"> <li><[% IF c.req.uri.path == '/' %]span[% ELSE %]a href="/"[% END %] class="report-a-problem-btn" >[% loc("Report a problem") %]</[% c.req.uri.path == '/' ? 'span' : 'a' %]></li>[% @@ -44,7 +28,22 @@ </div> </div> -<!-- [% INCLUDE 'debug_footer.html' %] --> </div> <!-- .wrapper --> + +<div id="bromley-footer" class="desk-only"> + <p class="copy">© 2012 London Borough of Bromley</p> + + <a href="http://www.direct.gov.uk/"><img src="https://www.bromley.gov.uk/site/images/directgov.jpg" alt="Directgov website link - Public services all in one place" /></a> + + <ul class="footer-nav"> + <li><a href="#bromley-header">To the top</a></li> + <li><a href="http://www.bromley.gov.uk/terms">Disclaimer</a></li> + <li><a href="http://www.bromley.gov.uk/privacy" rel="nofollow">Privacy and cookies</a></li> + <li><a href="http://www.bromley.gov.uk/accesstoinfo">Access to information</a></li> + </ul> + +</div> + + </div></div> </body> </html> diff --git a/templates/web/bromley/header.html b/templates/web/bromley/header.html index f7beabd8c..eea690c7d 100644 --- a/templates/web/bromley/header.html +++ b/templates/web/bromley/header.html @@ -6,39 +6,76 @@ <!--[if gt IE 9]><!--><html class="no-js" lang="[% lang_code %]"><!--<![endif]--> <head> <meta name="viewport" content="initial-scale=1.0"> - <meta http-equiv="X-UA-Compatible" content="IE=Edge,chrome=1"> <meta name="HandHeldFriendly" content="true"> <meta name="mobileoptimized" content="0"> <link rel="stylesheet" href="[% version('/cobrands/bromley/base.css') %]"> - <!-- <link rel="stylesheet" href="[% version('/cobrands/fixmystreet/layout.css') %]" media="(min-width:48em)"> --> + <link rel="stylesheet" href="[% version('/cobrands/bromley/layout.css') %]" media="(min-width:48em)"> <link rel="stylesheet" href="[% version('/js/fancybox/jquery.fancybox-1.3.4.css') %]"> + <link rel="stylesheet" href="[% version('/cobrands/bromley/bromley.css') %]"> <!--[if (lt IE 9) & (!IEMobile)]> - <!-- <link rel="stylesheet" href="[% version('/cobrands/fixmystreet/layout.css') %]"> --> + <link rel="stylesheet" href="[% version('/cobrands/bromley/layout.css') %]"> <![endif]--> - <script src="[% version('/js/modernizr.custom.76759.js') %]" charset="utf-8"></script> + <script src="[% version('/js/modernizr.custom.js') %]" charset="utf-8"></script> [% INCLUDE 'common_header_tags.html', js_override = '/cobrands/fixmystreet/fixmystreet.js' %] <script src="[% version('/js/fancybox/jquery.fancybox-1.3.4.pack.js') %]" charset="utf-8"></script> - [% IF c.req.uri.host == 'osm.fixmystreet.com' %] - <link rel="canonical" href="http://www.fixmystreet.com[% c.req.uri.path_query %]"> - [% END %] - - [% INCLUDE 'tracking_code.html' %] + <link rel="Shortcut Icon" type="image/x-icon" href="/cobrands/bromley/favicon.ico"> </head> <body class="[% bodyclass | html IF bodyclass %]"> + [%# ie_wrapper is to prevent a horizontal scrollbar in IE7, it appears (from Bromley site) %] + <div id="bromley-wrapper"><div id="bromley-ie_wrapper"> + +<div id="bromley-header" class="desk-only"> + <ul class="header-nav"> + <li><a href="http://www.bromley.gov.uk/accessibility">Accessibility</a></li> + <li><a class="skiplink" href="http://www.bromley.gov.uk/#user-meta" rel="nofollow">Skip to content</a></li> + <!-- <li><a rel="nofollow" href="http://www.bromley.gov.uk/a_to_z?previewstyle=generic/print.css">Printer friendly</a></li> --> + <!-- <li><a href="http://www.bromley.gov.uk/accessibility/settings">Text size: AAA</a></li> --> + <li><div id="google_translate_element"></div></li> + </ul> + + <div class="logo"> + <a href="http://www.bromley.gov.uk"><img src="/cobrands/bromley/bromley-logo.jpg" alt="London Borough of Bromley logo" width="159" height="114" style="width:159px; height:114px;" /></a> + </div> + + <div class="sign-in"> + [% IF c.user_exists %] + <p> + [% tprintf(loc('Hi %s'), c.user.name || c.user.email) %] + <a href="/auth/sign_out">[% loc('sign out') %]</a> + </p> + [% END %] + </div> + + <div class="main-menu"> + <ul> + <li class="home"><[% IF c.req.uri.path == '/' %]span[% ELSE %]a href="/"[% END %] class="report-a-problem-btn" + >[% "Report" %]</[% c.req.uri.path == '/' ? 'span' : 'a' %]></li>[% + %]<li><[% IF c.req.uri.path == '/my' OR ( c.req.uri.path == '/auth' AND c.req.params.r == 'my' ) %]span[% ELSE %]a href="/my"[% END + %]>[% loc("Your reports") %]</[% ( c.req.uri.path == '/my' OR ( c.req.uri.path == '/auth' AND c.req.params.r == 'my' ) ) ? 'span' : 'a' %]></li>[% + %]<li><[% IF c.req.uri.path == '/reports/Bromley' %]span[% ELSE %]a href="/reports/Bromley"[% END + %]>[% loc("All reports") %]</[% c.req.uri.path == '/reports' ? 'span' : 'a' %]></li>[% + %]<li><[% IF c.req.uri.path == '/alert' %]span[% ELSE %]a href="/alert[% pc ? '/list?pc=' : '' %][% pc | uri %]"[% END + %]>[% loc("Local alerts") %]</[% c.req.uri.path == '/alert' ? 'span' : 'a' %]></li>[% + %]<li class="last"><[% IF c.req.uri.path == '/faq' %]span[% ELSE %]a href="/faq"[% END + %]>[% loc("Help") %]</[% c.req.uri.path == '/faq' ? 'span' : 'a' %]></li> + </ul> + </div> +</div> + <div class="wrapper"> <div class="table-cell"> - <header id="site-header" role="banner"> + <div id="site-header" role="banner"> <div class="container"> <a href="/" id="site-logo">FixMyStreet</a> <a href="#main-nav" id="nav-link">Main Navigation</a> </div> - </header> + </div> <div id="user-meta"> [% IF c.user_exists %] @@ -46,12 +83,14 @@ [% tprintf(loc('Hi %s'), c.user.name || c.user.email) %] <a href="/auth/sign_out">[% loc('sign out') %]</a> </p> - [% ELSE %] - <!-- <a href="/auth">[% loc('Sign in') %]</a> --> [% END %] </div> + <h1 class="main desk-only">Reporting a problem in Bromley’s streets or parks</h1> + + [% pre_container_extra %] + <div class="container"> <div class="content[% " $mainclass" | html IF mainclass %]" role="main"> - <!-- [% INCLUDE 'debug_header.html' %] --> + diff --git a/templates/web/bromley/report/display.html b/templates/web/bromley/report/display.html new file mode 100644 index 000000000..131416bb2 --- /dev/null +++ b/templates/web/bromley/report/display.html @@ -0,0 +1,216 @@ +[% + PROCESS "maps/${map.type}.html"; + + problem_title = problem.title _ ' - ' _ loc('Viewing a problem'); + INCLUDE 'header.html' + title = problem_title + rss = [ loc('Updates to this problem, FixMyStreet'), "/rss/$problem.id" ] + robots = 'index, nofollow' + bodyclass = 'mappage' +%] + +[% map_html %] + +</div> + + +[% IF banner.id %] + <div class="banner"> + <p id="[% banner.id %]">[% banner.text %]</p> + </div> +[% END %] + +[% INCLUDE 'report/_main.html' %] + +<div class="shadow-wrap"> + <ul id="key-tools"> + [% IF c.user_exists AND c.user.council == 'Bromley Council' %] + <li><form method="post" action="/report/delete/[% problem.id %]"> + <input type="submit" class="abuse" value="Remove from site"> + </form></li> + [% ELSE %] + <li><a rel="nofollow" id="key-tool-report-abuse" class="abuse" href="[% c.uri_for( '/contact', { id => problem.id } ) %]">[% loc('Report abuse') %]</a></li> + [% END %] + <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> + <li><a class="chevron" id="key-tool-problems-nearby" href="[% c.uri_for( '/around', { lat => short_latitude, lon => short_longitude } ) %]">[% loc( 'Problems nearby' ) %]</a></li> + </ul> + +<div id="report-updates-data" class="hidden-js"> + <form action="[% c.uri_for( '/alert/subscribe' ) %]" method="post"> + <p><a href="[% c.uri_for( '/rss', problem.id ) %]"> + <img src="/i/feed.png" width="16" height="16" title="[% loc('RSS feed') %]" alt="[% loc('RSS feed of updates to this problem' ) %]" border="0" style="float: right"> + </a></p> + <p>[% loc('Receive email when updates are left on this problem.' ) %]</p> + <fieldset> + <label class="hidden n" for="alert_rznvy">[% loc('Your email') %]</label> + <div class="form-txt-submit-box"> + <input type="email" name="rznvy" id="alert_rznvy" value="[% email | html %]" size="30" placeholder="[% loc('Your email') %]"> + <input class="green-btn" type="submit" value="[% loc('Subscribe') %]"> + </div> + <input type="hidden" name="id" value="[% problem.id %]"> + <input type="hidden" name="type" value="updates"> + </fieldset> + </form> +</div> + +</div> + +[% INCLUDE 'report/updates.html' %] + +<div id="update_form"> + <h2>[% loc( 'Provide an update') %]</h2> + + [% INCLUDE 'errors.html' %] + + <form method="post" action="[% c.uri_for( '/report/update' ) %]" name="updateForm" class="validate"[% IF c.cobrand.allow_photo_upload %] enctype="multipart/form-data"[% END %]> + <fieldset> + <input type="hidden" name="submit_update" value="1"> + <input type="hidden" name="id" value="[% problem.id | html %]"> + + <label for="form_update">[% loc( 'Update' ) %]</label> + [% 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> + + <div class="general-sidebar-notes"> + <p>Please note this comments box can only be used for this report. + <br><a href="http://www.bromley.gov.uk/report">Report a different issue</a> + </div> + + [% IF c.user && c.user.belongs_to_council( problem.council ) %] + <label for="form_state">[% loc( 'State' ) %]</label> + <select name="state" id="form_state"> + [% FOREACH state IN [ ['confirmed', loc('Open')], ['investigating', + loc('Investigating')], ['planned', loc('Planned')], ['in progress', + loc('In Progress')], ['closed', loc('Closed')], ['fixed', loc('Fixed')] ] %] + <option [% 'selected ' IF state.0 == problem.state %] value="[% state.0 %]">[% state.1 %]</option> + [% END %] + </select> + [% ELSE %] + [% IF problem.is_fixed AND c.user_exists AND c.user.id == problem.user_id %] + + <input type="checkbox" name="reopen" id="form_reopen" value="1"[% ' checked' IF update.mark_open %]> + <label class="inline" for="form_reopen">[% loc('This problem has not been fixed') %]</label> + + [% ELSIF !problem.is_fixed %] + + <div class="checkbox-group"> + <input type="checkbox" name="fixed" id="form_fixed" value="1"[% ' checked' IF update.mark_fixed %]> + <label class="inline" for="form_fixed">[% loc('This problem has been fixed') %]</label> + </div> + + [% END %] + [% END %] + + [% IF c.cobrand.allow_photo_upload %] + <div id="fileupload_normalUI"> + [% IF upload_fileid %] + <img align="right" src="/photo/[% upload_fileid %].temp.jpeg" alt=""> + <p>[% loc('You have already attached a photo to this update, attaching another one will replace it.') %]</p> + <input type="hidden" name="upload_fileid" value="[% upload_fileid %]"> + [% END %] + <label for="form_photo">[% loc('Photo') %]</label> + [% IF field_errors.photo %] + <p class='form-error'>[% field_errors.photo %]</p> + [% END %] + <input type="file" name="photo" id="form_photo"> + </div> + [% END %] + + [% IF c.user_exists %] + + [% INCLUDE name %] + + <input class="final-submit green-btn" type="submit" id="update_post" value="[% loc('Post') %]"> + + + [% ELSE %] + + <label for="form_rznvy">[% loc('Email' ) %]</label> + [% IF field_errors.email %] + <p class='form-error'>[% field_errors.email %]</p> + [% END %] + <input type="email" name="rznvy" id="form_rznvy" value="[% update.user.email | html %]" placeholder="[% loc('Your email address' ) %]" required> + + <div id="form_sign_in"> + <p>To submit your update you now need to confirm it either by email or by using a FixMyStreet password.</p> + + <div id="form_sign_in_no" class="form-box"> + <h5>Confirm my report by email</h5> + + [% INCLUDE name %] + + <div class="general-sidebar-notes"> + <p class="dark">[% loc('We never show your email') %]</p> + <p>[% loc('Providing a password is optional, but doing so will allow you to more easily report problems, leave updates and manage your reports.') %]</p> + </div> + + <label for="password_register">[% loc('Password (optional)') %]</label> + + <div class="form-txt-submit-box"> + <input type="password" name="password_register" id="password_register" value="" placeholder="[% loc('Enter a password') %]"> + <input class="green-btn" type="submit" name="submit_register" id="submit_register" value="[% loc('Post') %]"> + </div> + </div> + <div id="form_sign_in_yes" class="form-box"> + <h5>Confirm my report with my FixMyStreet password</h5> + + <label class="hidden-js n" for="password_sign_in">[% loc('Yes I have a password') %]</label> + [% IF field_errors.password %] + <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 class="green-btn" type="submit" name="submit_sign_in" id="submit_sign_in" value="[% loc('Post') %]"> + </div> + + <div class="checkbox-group"> + <input type="checkbox" id="remember_me" name="remember_me" value='1'[% ' checked' IF remember_me %]> + <label class="inline n" for="remember_me">[% loc('Keep me signed in on this computer') %]</label> + </div> + </div> + </div> + + [% END %] + + <p>Your information will only be used in accordance with our <a href="/faq#privacy">privacy policy</a>.</p> + + </fieldset> + </form> +</div> + + + +[% INCLUDE 'footer.html' %] + +[% BLOCK name %] + [% IF problem.council == '2482' %] + [% extra_name_info = 1 %] + [% INCLUDE 'report/new/extra_name.html' %] + [% END %] + + [% IF c.user_exists %] + [% names = c.user.split_name %] + [% END %] + <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="[% names.first || first_name | 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" value="[% names.last || last_name | html %]" name="last_name" id="form_last_name" placeholder="[% loc('Your last name') %]"> + + <div class="checkbox-group"> + <input type="checkbox" name="may_show_name" id="form_may_show_name" value="1"[% ' checked' IF update AND NOT update.anonymous %]> + <label class="inline" for="form_may_show_name">[% loc('Show my name publicly') %]</label> + </div> + <div class="checkbox-group"> + <input type="checkbox" name="add_alert" id="form_add_alert" value="1"[% ' checked' IF add_alert %]> + <label class="inline" for="form_add_alert">[% loc( 'Alert me to future updates' ) %]</label> + </div> +[% END %] diff --git a/templates/web/bromley/report/new/fill_in_details_form.html b/templates/web/bromley/report/new/fill_in_details_form.html new file mode 100644 index 000000000..1ceb0ac10 --- /dev/null +++ b/templates/web/bromley/report/new/fill_in_details_form.html @@ -0,0 +1,228 @@ +<div id="report-a-problem-main"> + [% IF js %] + <p id="councils_text"> + [% + tprintf( + loc('All the information you provide here will be sent to <strong>%s</strong>.'), + loc('the local council') + ); + %] + Details of the problem will be public, plus your name if you give us permission. + </p> + [% ELSE %] + [% PROCESS 'report/new/councils_text.html' %] + [% END %] + + <div id="report-a-problem-sidebar"> + <!-- + The text for this section needs checking, but I can't work out which bit comes from where + --> + <div class="sidebar-tips"> + [% IF report.used_map %] + [% IF partial_token %] + <p id="unknown">[% loc('Please note your report has <strong>not yet been sent</strong>. Choose a category and add further information below, then submit.') %]</p> + [% END %] + <p>[% loc('You have located the problem at the point marked with a green pin on the map. If this is not the correct location, simply click on the map again. ') %]</p> + [% ELSE %] + <p> + [% loc('Please fill in the form below with details of the problem, and describe the location as precisely as possible in the details box.') %] + </p> + [% END %] + </div> + + </div> + + [% INCLUDE 'errors.html' %] + <fieldset> + <div id="problem_form"> + + [% INCLUDE 'report/new/form_heading.html' %] + + + [% IF field_errors.council %] + <p class='form-error'>[% field_errors.council %]</p> + [% END %] + + + + <label for="form_title">[% loc('Subject') %]</label> + [% IF field_errors.title %] + <p class='form-error'>[% field_errors.title %]</p> + [% END %] + <input type="text" value="[% report.title | html %]" name="title" id="form_title" placeholder="[% loc('Provide a title') %]" required> + + <label for="form_detail">[% loc('Details') %]</label> + [% IF report.used_map %] + <p> + We won’t be able to help unless you leave as much +detail as you can. Please describe the exact location of the problem (e.g. on a +wall). + </p> + [% END %] + [% IF field_errors.detail %] + <p class='form-error'>[% field_errors.detail %]</p> + [% END %] + <textarea rows="7" cols="26" name="detail" id="form_detail" placeholder="[% loc('Please fill in details of the problem.') %]" required>[% report.detail | html %]</textarea> + + [% IF js %] + <div id="form_category_row"> + <label for="form_category">[% loc('Category') %]</label> + <select name="category" id="form_category" required><option>[% loc('Loading...') %]</option></select> + </div> + [% ELSE %] + [% IF category_options.size %] + [% IF field_errors.category %] + <p class='form-error'>[% field_errors.category %]</p> + [% END %] + + [% PROCESS "report/new/category.html" %] + [% END %] + [% END %] + + [%- IF category_extras %] + [% PROCESS "report/new/category_extras.html" %] + [%- END %] + + [% IF c.cobrand.allow_photo_upload %] + [% IF field_errors.photo %] + <p class='form-error'>[% field_errors.photo %]</p> + [% END %] + + + [% IF upload_fileid || report.photo %] + [% IF upload_fileid %] + <img align="right" src="/photo/[% upload_fileid %].temp.jpeg" alt=""> + <input type="hidden" name="upload_fileid" value="[% upload_fileid %]"> + [% END %] + + <p>[% loc('You have already attached a photo to this report, attaching another one will replace it.') %]</p> + + [% IF report.photo %] + <img align="right" src="/photo/[% report.id %].jpeg"> + [% END %] + [% END %] + + <label for="form_photo">[% loc('Photo') %]</label> + <input type="file" name="photo" id="form_photo"> + [% END %] + + [% IF c.user_exists %] + <div class="form-box"> + [% 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" 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"> + <input type="checkbox" name="may_show_name" id="form_may_show_name" value="1"[% ' checked' IF !report.anonymous %]> + <label class="inline" for="form_may_show_name">[% loc('Show my name publicly') %]</label> + </div> + + <div class="general-sidebar-notes"> + <p>[% loc('We never show your email address or phone number.') %]</p> + </div> + + <label for="form_phone">[% loc('Phone number (optional)') %]</label> + <input class="" type="text" value="[% report.user.phone | html %]" name="phone" id="form_phone" placeholder="[% loc('Your phone number') %]"> + + <div class="form-txt-submit-box"> + <input class="green-btn" type="submit" id="submit_register" name="submit_register" value="[% loc('Submit') %]"> + </div> + </div> + [% ELSE %] + + <label for="form_email">[% loc('Your email') %]</label> + [% IF field_errors.email %] + <p class='form-error'>[% field_errors.email %]</p> + [% END %] + <input type="email" value="[% report.user.email | html %]" name="email" id="form_email" placeholder="[% loc('Please enter your email address') %]" required> + + <div id="form_sign_in"> + + <p>To submit your report you now need to confirm it either by email or by using a FixMyStreet password.</p> + + <div id="form_sign_in_no" class="form-box"> + <h5>Confirm my report by email</h5> + + [% INCLUDE 'report/new/extra_name.html' %] + + <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') %]"> + + <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"> + <input type="checkbox" name="may_show_name" id="form_may_show_name" value="1"[% ' checked' IF !report.anonymous %]> + <label class="inline" for="form_may_show_name">[% loc('Show my name publicly') %]</label> + </div> + + <div class="general-sidebar-notes form-focus-hidden"> + <p class="dark">[% loc('We never show your email address or phone number.') %]</p> + <p>[% loc('Providing a password is optional, but doing so will allow you to more easily report future problems, leave updates and manage your reports.') %]</p> + </div> + + <label class="form-focus-hidden" for="form_phone">[% loc('Phone number (optional)') %]</label> + <input class="form-focus-hidden" type="text" value="[% report.user.phone | html %]" name="phone" id="form_phone" placeholder="[% loc('Your phone number') %]"> + + <label class="form-focus-hidden" for="password_register">[% loc('Password (optional)') %]</label> + + <div class="form-txt-submit-box form-focus-hidden"> + <input type="password" name="password_register" id="password_register" value="" placeholder="[% loc('Enter a password') %]"> + <input class="green-btn" type="submit" id="submit_register" name="submit_register" value="[% loc('Submit') %]"> + </div> + </div> + + <div id="form_sign_in_yes" class="form-box"> + + <h5>Confirm my report with my FixMyStreet password</h5> + + <label class="hidden-js n" for="password_sign_in">[% loc('Yes I have a password') %]</label> + <div class="form-txt-submit-box"> + [% IF field_errors.password %] + <p class='form-error'>[% field_errors.password %]</p> + [% END %] + <input type="password" name="password_sign_in" id="password_sign_in" placeholder="[% loc('Your password') %]" value=""> + <input class="green-btn" type="submit" id="submit_sign_in" name="submit_sign_in" value="[% loc('Submit') %]"> + </div> + + <div class="checkbox-group"> + <input type="checkbox" id="remember_me" name="remember_me" value='1'[% ' checked' IF remember_me %]> + <label class="n inline" for="remember_me">[% loc('Keep me signed in on this computer') %]</label> + </div> + </div> + + </div> + + [% END %] + + <p>[% loc("We will only use your personal information in accordance with our <a href=\"/faq#privacy\">privacy policy.</a>") %]</p> + + </div> + </fieldset> + + [% IF partial_token %] + <input type="hidden" name="partial" value="[% partial_token.token %]"> + [% END %] + + <input type="hidden" name="submit_problem" value="1"> +</div> diff --git a/templates/web/bromley/tokens/confirm_problem.html b/templates/web/bromley/tokens/confirm_problem.html new file mode 100644 index 000000000..d002cc262 --- /dev/null +++ b/templates/web/bromley/tokens/confirm_problem.html @@ -0,0 +1,13 @@ +[% INCLUDE 'header.html', title = loc('Confirmation') %] + +<h1>[% loc('Confirmation') %]</h1> + +<p class="confirmed"> +Thank you. You have successfully confirmed your report +and this will now be investigated by the council. +You can <a href="[% c.uri_for( '/report', problem.id ) %]">view the problem on this site</a>. +</p> + +<p>Your reference for this problem is [% problem.id %], please quote it in any enquiries.</p> + +[% INCLUDE 'footer.html' %] diff --git a/templates/web/default/admin/council_contacts.html b/templates/web/default/admin/council_contacts.html index da7223aa6..e35c8cda2 100644 --- a/templates/web/default/admin/council_contacts.html +++ b/templates/web/default/admin/council_contacts.html @@ -121,6 +121,31 @@ </p> <p> + <label for="send_method">Send Method</label>: + <select name="send_method"> + <option value=""> -- Select a method -- </option> + [% FOR method IN send_methods %] + <option value="[% method %]"[% ' selected' IF conf.send_method == method %]>[% method %]</option> + [% END %] + </select> + </p> + + <p> + <label for="send_comments">Use Open311 comment sending extension</label>: + <input type="checkbox" name="send_comments"[% ' checked' IF conf.send_comments %]> + </p> + + <p> + <label for"comment_user_id">User to attribute fetched comments to</label>: + <input type="text" name="comment_user_id" value="[% conf.comment_user_id %]"> + </p> + + <p> + <label for="suppress_alerts">Do not send email alerts on fetched comments to problem creator</label>: + <input type="checkbox" name="suppress_alerts"[% ' checked' IF conf.suppress_alerts %]> + </p> + + <p> <input type="hidden" name="open311_id" value="[% conf.id %]"> <input type="hidden" name="area_id" value="[% area_id %]"> <input type="hidden" name="posted" value="open311"> diff --git a/templates/web/default/admin/report_edit.html b/templates/web/default/admin/report_edit.html index cbba1b3b0..9ef7e8248 100644 --- a/templates/web/default/admin/report_edit.html +++ b/templates/web/default/admin/report_edit.html @@ -37,6 +37,7 @@ <li>[% loc('Service:') %] [% problem.service %]</li> <li>[% loc('Cobrand:') %] [% problem.cobrand %]</li> <li>[% loc('Cobrand data:') %] [% problem.cobrand_data %]</li> +<li>[% loc('Extra data:') %] [% problem.extra ? 'Yes' : 'No' %]</li> <li>[% loc('Going to send questionnaire?') %] [% IF problem.send_questionnaire %][% loc('Yes') %][% ELSE %][% loc('No') %][% END %]</li> <li><label for="flagged">[% loc('Flagged:') %]</label> <input type="checkbox" name="flagged"[% ' checked' IF problem.flagged %]></li> diff --git a/templates/web/default/auth/sign_out.html b/templates/web/default/auth/sign_out.html index 3d8df60e4..23d39aa2d 100644 --- a/templates/web/default/auth/sign_out.html +++ b/templates/web/default/auth/sign_out.html @@ -1,8 +1,8 @@ -[% INCLUDE 'header.html', title => loc('Sign out') %] +[% INCLUDE 'header.html', title = loc('Sign out'), bodyclass = 'fullwidthpage' %] <h1>[% loc('You have been signed out') %]</h1> -<p>Please feel free to <a href="[% c.uri_for('/auth') %]">sign in again</a>.</p> - +<p>Please feel free to <a href="[% c.uri_for('/auth') %]">sign in again</a>, or +go back to the <a href="/">FixMyStreet front page</a>.</p> [% INCLUDE 'footer.html' %] diff --git a/templates/web/default/common_header_tags.html b/templates/web/default/common_header_tags.html index c87f93994..582afd422 100644 --- a/templates/web/default/common_header_tags.html +++ b/templates/web/default/common_header_tags.html @@ -7,7 +7,8 @@ <script src="[% version('/js/jquery.validate.min.js') %]" type="text/javascript" charset="utf-8"></script> <script type="text/javascript" src="[% version('/js/geo.min.js') %]"></script> -<script type="text/javascript" src="[% version(js_override || '/js/fixmystreet.js') %]"></script> +<script type="text/javascript" src="[% version('/js/fixmystreet.js') %]"></script> +<script type="text/javascript" src="[% version(js_override || '/js/fixmystreet-old-box.js') %]"></script> [% map_js %] diff --git a/templates/web/default/dashboard/index.html b/templates/web/default/dashboard/index.html new file mode 100644 index 000000000..a0ef7b911 --- /dev/null +++ b/templates/web/default/dashboard/index.html @@ -0,0 +1,146 @@ +[% + INCLUDE 'header.html' + title = loc('Dashboard') + robots = 'noindex, nofollow' + bodyclass = 'fullwidthpage' +%] + +<style> + th[scope=row] { text-align: left; } + tr.subtotal { background-color: #eee; } + #overview tr:nth-child(2) { background-color: #fee; } +</style> + +<form> + +<p>Ward: <select 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 %] +</select> +<input type="submit" value="Look up"> + +<h2>Performance Overview</h2> + +<p>Report category: <select 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 %] + </select> +<input type="submit" value="Look up"> + +<table width="100%" id="overview"> + <tr> + <td> </td> + <th scope="col">WTD</th> + <th scope="col">Last 7 days</th> + <th scope="col">Last 4 weeks</th> + <th scope="col">YTD</th> + </tr> + + [% + rows = { + '0' => [ "total", "Total reports received" ] + '1' => [ "fixed - council", "Council has marked as fixed" ] + '2' => [ "fixed_user", "User has marked as fixed" ] + }; + FOR row IN rows %] + <tr> + <th scope="row">[% row.value.1 %]</th> + <td>[% problems.wtd.${row.value.0} %]</td> + <td>[% problems.week.${row.value.0} %]</td> + <td>[% problems.weeks.${row.value.0} %]</td> + <td>[% problems.ytd.${row.value.0} %]</td> + </tr> + [% END %] + + <tr class='subtotal'> + <th scope="row">Total marked as fixed</th> + <td>[% problems.wtd.${"fixed - council"} + problems.wtd.fixed_user %]</td> + <td>[% problems.week.${"fixed - council"} + problems.week.fixed_user %]</td> + <td>[% problems.weeks.${"fixed - council"} + problems.weeks.fixed_user %]</td> + <td>[% problems.ytd.${"fixed - council"} + problems.ytd.fixed_user %]</td> + </tr> + + [% + rows = { + '0' => [ "in progress", "Council has marked as in progress" ] + '1' => [ "planned", "Council has marked as planned" ] + '2' => [ "investigating", "Council has marked as investigating" ] + }; + wtd = 0, week = 0, weeks = 0, ytd = 0; + FOR row IN rows %] + <tr> + <th scope="row">[% row.value.1 %]</th> + <td>[% problems.wtd.${row.value.0} %]</td> + <td>[% problems.week.${row.value.0} %]</td> + <td>[% problems.weeks.${row.value.0} %]</td> + <td>[% problems.ytd.${row.value.0} %]</td> + </tr> + [% END %] + + <tr class='subtotal'> + <th scope="row">Total marked</th> + <td>[% problems.wtd.${"in progress"} + problems.wtd.planned + problems.wtd.investigating %]</td> + <td>[% problems.week.${"in progress"} + problems.week.planned + problems.week.investigating %]</td> + <td>[% problems.weeks.${"in progress"} + problems.weeks.planned + problems.weeks.investigating %]</td> + <td>[% problems.ytd.${"in progress"} + problems.ytd.planned + problems.ytd.investigating %]</td> + </tr> + + <tr> + <th scope="row">Average time to fix</th> + <td>-</td> + <td>-</td> + <td>-</td> + <td>-</td> + </tr> + + <tr> + <th scope="row">Average time to mark</th> + <td>-</td> + <td>-</td> + <td>-</td> + <td>-</td> + </tr> + + <tr class='subtotal'> + <th scope="row">Total not marked</th> + <td>-</td> + <td>-</td> + <td>-</td> + <td>-</td> + </tr> + +</table> + +<h2>Reports</h2> + + </select> +<p>Report state: <select name="state"> +<option value=''>All</option> + [% FOREACH state IN [ ['confirmed', loc('Open')], ['investigating', + loc('Investigating')], ['planned', loc('Planned')], ['in progress', + loc('In Progress')], ['closed', loc('Closed')], ['fixed', loc('Fixed')] ] %] + <option [% 'selected ' IF state.0 == q_state %] value="[% state.0 %]">[% state.1 %]</option> + [% END %] +</select> +<input type="submit" value="Look up"> + +<table width="100%"> + <tr> + <th scope="col">Less than 7 days old</th> + <th scope="col">7-14 days old</th> + <th scope="col">14-30 days old</th> + <th scope="col">30+ days old</th> + </tr> + <tr> + <td><ul><li></li></ul></td> + <td><ul><li></li></ul></td> + <td><ul><li></li></ul></td> + <td><ul><li></li></ul></td> + </tr> +</table> + +</form> + +[% INCLUDE 'footer.html' %] diff --git a/templates/web/default/faq/faq-en-gb.html b/templates/web/default/faq/faq-en-gb.html index ed9d53c24..2c1c43799 100755 --- a/templates/web/default/faq/faq-en-gb.html +++ b/templates/web/default/faq/faq-en-gb.html @@ -61,29 +61,27 @@ by a registered charity, though, so if you want to make a contribution, <a href="https://secure.mysociety.org/donate/">please do</a>.</dd> <dt>Can I use FixMyStreet on my mobile?</dt> - <dd><ul> - <li><em>iPhone:</em> There are two apps for FixMyStreet, one written by us - in 2008 and another much more recently by a volunteer, Martin Stephenson. - Both are available for download on the App Store: + <dd> + <p>The FixMyStreet website should work on your mobile phone, adapting to + the size of your screen automatically. We plan to release updated native + apps in the near future. + <ul> + <li><em>iPhone:</em> Our basic app from 2008 is available for download + on the App Store: <a href="http://itunes.apple.com/gb/app/fixmystreet/id297456545">FixMyStreet</a>, - <a href="http://itunes.apple.com/gb/app/streetreport/id371891859">StreetReport</a>. <li><em>Android:</em> A volunteer, Anna Powell-Smith, has written an app available from the <a href="https://market.android.com/details?id=com.android.fixmystreet">Android Market</a>. <li><em>Nokia:</em> A volunteer, Thomas Forth, has written an app available from the <a href="http://store.ovi.com/content/107557">Ovi Store</a>. </ul> - <p>We also hope to make the website itself much more mobile friendly in the future.</p> </dd> <dt>Why do you only cover the countries of Great Britain?</dt> - <dd>We would love to cover Northern Ireland, but as we were funded for - FixMyStreet by the Department for Constitutional Affairs (now the Ministry - of Justice), we were covered for Ordnance Survey data (but not OSNI data) - by the Pan-Governmental Agreement. The cost for these maps would be - prohibitively expensive for the small charity that we are – if you know of - any way we could get access to the Ordnance Survey for Northern Ireland's - maps so that we can add them to the site, that'd be great.</dd> + <dd>We would love to cover Northern Ireland, but we have only been able + to locate boundaries for Great Britain (from Ordnance Survey). If you + know of a source for Northern Ireland council boundaries + so that we can add them to the site, that'd be great.</dd> </dl> <h2>Practical Questions</h2> @@ -93,7 +91,8 @@ href="https://secure.mysociety.org/donate/">please do</a>.</dd> to find out where reports go at the moment. Also <a href="/contact">contact us</a> to update the address or addresses we use.</dd> <dt>I’m from a council, can we have FixMyStreet on our website?</dt> - <dd>Yes you can! We offer branded, hosted versions of FixMyStreet for local council websites. <a href="/for-councils">Full details</a>.</dd> + <dd>Yes you can! We offer branded, hosted versions of FixMyStreet for local council websites. + <a href="http://www.fixmystreet.com/for-councils">Full details</a>.</dd> <dt>Do you remove silly or illegal content?</dt> <dd>FixMyStreet is not responsible for the content and accuracy of material submitted by its users. We reserve the right to edit or remove any @@ -141,7 +140,8 @@ send you emails in relation to your problem.</dd> <h2>Organisation Questions</h2> <dl> <dt>Who built FixMyStreet?</dt> - <dd>This site was built by <a href="http://www.mysociety.org/">mySociety</a>, in conjunction with the <a href="http://www.youngfoundation.org.uk/">Young Foundation</a>. + <dd>This site was built by <a href="http://www.mysociety.org/">mySociety</a>, + in conjunction with the <a href="http://www.youngfoundation.org.uk/">Young Foundation</a>. mySociety is the project of a registered charity which has grown out of the community of volunteers who built sites like <a href="http://www.theyworkforyou.com/">TheyWorkForYou.com</a>. mySociety’s primary mission is to build Internet projects which give people simple, tangible @@ -149,15 +149,11 @@ benefits in the civic and community aspects of their lives. Our first project was <a href="http://www.writetothem.com/">WriteToThem</a>, where you can write to any of your elected representatives, for free. The charity is called UK Citizens Online Democracy and is charity number 1076346. mySociety can be contacted by email at <a href="mailto:hello@mysociety.org">hello@mysociety.org</a>, -or by post at:<br> -mySociety<br> -483 Green Lanes<br> -London<br> -N13 4BS<br> -UK</dd> +or by post at mySociety, 483 Green Lanes, London, N13 4BS, UK.</dd> <dt><img src="/i/moj.png" align="right" alt="Ministry of Justice" hspace="10">Who pays for it?</dt> - <dd>FixMyStreet was paid for via the Department for -Constitutional Affairs Innovations Fund.</dd> + <dd>FixMyStreet was originally paid for via the Department for + Constitutional Affairs Innovations Fund. It is now funded by a variety of means, from commercial + work to <a href="http://www.mysociety.org/donate/">donations</a>.</dd> <dt><a name="nfi"></a>Wasn’t this site called Neighbourhood Fix-It?</dt> <dd>Yes, we changed the name mid June 2007. We decided Neighbourhood Fix-It was a bit of a mouthful, hard to spell, and hard to publicise (does the URL have a dash in it or not?). The domain FixMyStreet became available, and everyone liked the name.</dd> diff --git a/templates/web/default/index.html b/templates/web/default/index.html index ab8796688..8f755d4d5 100644 --- a/templates/web/default/index.html +++ b/templates/web/default/index.html @@ -49,7 +49,7 @@ </div> [% - recent_photos = c.cobrand.recent_photos(3); + recent_photos = c.cobrand.recent_photos('front', 3); probs = c.cobrand.recent(); %] diff --git a/templates/web/default/js/validation_strings.html b/templates/web/default/js/validation_strings.html index 718d10d56..3148d1993 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') | replace("'", "\\'") %]', email: '[% loc('Please enter a valid email') | replace("'", "\\'") %]' - } + }, + fms_extra_title: '[% loc('Please enter your title') | replace("'", "\\'") %]', + first_name: '[% loc('Please enter your first name') | replace("'", "\\'") %]', + last_name: '[% loc('Please enter your second name') | replace("'", "\\'") %]' }; diff --git a/templates/web/default/report/new/councils_text_all.html b/templates/web/default/report/new/councils_text_all.html index 8514e0b0a..df3388bf3 100644 --- a/templates/web/default/report/new/councils_text_all.html +++ b/templates/web/default/report/new/councils_text_all.html @@ -1,5 +1,5 @@ <p> -[% IF all_councils.${area_ids_to_list.0}.type == 'LBO' %] +[% IF area_ids_to_list.0 != 2489 && area_ids_to_list.0 != 2482 && all_councils.${area_ids_to_list.0}.type == 'LBO' %] [% tprintf( loc('All the information you provide here will be sent to <strong>%s</strong> or a relevant local body such as <strong>TfL</strong>, via the London Report-It system.'), diff --git a/templates/web/default/report/new/extra_name.html b/templates/web/default/report/new/extra_name.html new file mode 100644 index 000000000..e8c2cadaf --- /dev/null +++ b/templates/web/default/report/new/extra_name.html @@ -0,0 +1,18 @@ +[% IF extra_name_info %] +<label for="form_fms_extra_title">Title</label> +[% IF field_errors.fms_extra_title %] + <p class='form-error'>[% field_errors.fms_extra_title %]</p> +[% END %] +[% title = '' %] +[% IF fms_extra_title %][% title = fms_extra_title | upper %] +[% ELSIF c.user && c.user.title %][% title = c.user.title | upper %][% END %] +<select class="form-focus-trigger" id="form_fms_extra_title" + name="fms_extra_title"> + <option></option> + <option value="MR"[% ' selected' IF title == 'MR' %]>Mr</option> + <option value="MISS"[% ' selected' IF title == 'MISS' %]>Miss</option> + <option value="MRS"[% ' selected' IF title == 'MRS' %]>Mrs</option> + <option value="MS"[% ' selected' IF title == 'MS' %]>Ms</option> + <option value="DR"[% ' selected' IF title == 'DR' %]>Dr</option> +</select> +[% END %] diff --git a/templates/web/default/report/updates.html b/templates/web/default/report/updates.html index 374a7c570..7a17adbc7 100644 --- a/templates/web/default/report/updates.html +++ b/templates/web/default/report/updates.html @@ -12,9 +12,13 @@ [% IF update.anonymous || update.name == '' %] [% tprintf( loc( 'Posted anonymously at %s' ), prettify_epoch( update.confirmed_local.epoch ) ) -%] - [%- ELSIF update.user.from_council %] - [% user_name = update.user.name | html %] - [% tprintf( loc( 'Posted by %s (<strong>%s</strong>) at %s' ), user_name, update.user.council, prettify_epoch( update.confirmed_local.epoch ) ) -%] + [%- ELSIF update.user.from_council; + user_name = update.user.name | html; + council = update.user.council; + IF c.cobrand.moniker == 'bromley'; + council = "$council <img src='/cobrands/bromley/favicon.png' alt=''>"; + END %] + [% tprintf( loc( 'Posted by %s (<strong>%s</strong>) at %s' ), user_name, council, prettify_epoch( update.confirmed_local.epoch ) ) -%] [%- ELSE %] [% tprintf( loc( 'Posted by %s at %s' ), update.name, prettify_epoch( update.confirmed_local.epoch ) ) | html -%] [%- END -%] diff --git a/templates/web/default/reports/council.html b/templates/web/default/reports/council.html index 0d3d43d82..d1c2241c7 100755 --- a/templates/web/default/reports/council.html +++ b/templates/web/default/reports/council.html @@ -1,3 +1,9 @@ +[% IF c.cobrand.moniker == 'fixmystreet' OR c.cobrand.moniker == 'bromley'; + style = 'new'; + ELSE; + style = 'old'; + END; +%] [% IF ward %] [% name = "$ward.name, $council.name" thing = loc('ward') @@ -19,7 +25,7 @@ [% map_html %] -[% IF c.cobrand.moniker != 'fixmystreet' AND children.size %] +[% IF style != 'new' AND children.size %] <h2 style="clear:right">[% loc('Wards of this council') %]</h2> <p>[% loc('Follow a ward link to view only reports within that ward.') %]</p> <ul> @@ -66,12 +72,26 @@ Its area is now covered by <a href="/reports/Bedford">Bedford Borough Council</a <a href="/reports/Central+Bedfordshire">Central Bedfordshire Council</a>. [% END %] </p> -[% ELSIF c.cobrand.moniker == 'fixmystreet' %] +[% ELSIF style == 'new' %] <div class="shadow-wrap"> <ul id="key-tools"[% IF NOT children.size %] class="singleton"[% END %]> - <li><a rel="nofollow" id="key-tool-updates-area" class="feed" href="[% rss_url %]">[% tprintf(loc('Get updates of problems in this %s'), thing) %]</a></li> + <li><a rel="nofollow" id="key-tool-updates-area" class="feed" href="[% rss_url %]">[% + IF c.cobrand.moniker == 'bromley' AND thing == 'council'; + 'Get updates of reports in Bromley'; + ELSIF c.cobrand.moniker == 'bromley'; + 'Get updates of reports in this ward'; + ELSE; + tprintf(loc('Get updates of problems in this %s'), thing); + END + %]</a></li> [% IF children.size %] - <li><a href="#council_wards" id="key-tool-wards" class="chevron">[% loc('Wards of this council') %]</a></li> + <li><a href="#council_wards" id="key-tool-wards" class="chevron">[% + IF c.cobrand.moniker == 'bromley'; + 'View reports by ward'; + ELSE; + loc('Wards of this council'); + END + %]</a></li> [% END %] </ul> </div> @@ -81,7 +101,7 @@ Its area is now covered by <a href="/reports/Bedford">Bedford Borough Council</a [% TRY %][% INCLUDE 'reports/cobrand_stats.html' %][% CATCH file %][% END %] -[% IF c.cobrand.moniker == 'fixmystreet' AND children.size %] +[% IF style == 'new' AND children.size %] <section id="council_wards" class="hidden-js"> <h2>[% loc('Wards of this council') %]</h2> <p>[% loc('Follow a ward link to view only reports within that ward.') %]</p> @@ -117,7 +137,7 @@ Its area is now covered by <a href="/reports/Bedford">Bedford Borough Council</a [% IF problems %] <ul class="issue-list-a"> -[% IF c.cobrand.moniker == 'fixmystreet' %] +[% IF style == 'new' %] [% FOREACH problem IN problems %] <li> diff --git a/templates/web/fixmystreet/alert/index.html b/templates/web/fixmystreet/alert/index.html index 9e082650d..03d9843f6 100644 --- a/templates/web/fixmystreet/alert/index.html +++ b/templates/web/fixmystreet/alert/index.html @@ -3,9 +3,15 @@ <h1>[% loc('Local RSS feeds and email alerts') %]</h1> <p> +[% IF c.cobrand.is_council %] +FixMyStreet has a variety of RSS feeds and email alerts for local problems, including +alerts for all problems within a particular ward, or all problems +within a certain distance of a particular location. +[% ELSE %] [% loc('FixMyStreet has a variety of RSS feeds and email alerts for local problems, including alerts for all problems within a particular ward or council, or all problems within a certain distance of a particular location.') %] +[% END %] </p> [% IF location_offshore %] @@ -16,12 +22,17 @@ within a certain distance of a particular location.') %] [% INCLUDE 'errors.html' %] [% END %] -<p>[% loc('To find out what local alerts we have for you, please fill in the form below.') %]</p> +<p> +[% IF c.cobrand.is_council %] +To find out what local alerts we have for you, please enter your [% c.cobrand.council_area %] postcode or street name and area: +[% ELSE %] +[% loc('To find out what local alerts we have for you, please enter your GB postcode or street name and area' ) %] +[% END %] +</p> <form method="get" action="/alert/list" class="full-width"> <fieldset> <div class="form-txt-submit-box"> - <label for="pc">[% c.cobrand.enter_postcode_text %]:</label> - <input type="text" id="pc" name="pc" value="[% pc | html %]" placeholder="[% tprintf(loc('e.g. ‘%s’ or ‘%s’'), c.cobrand.example_places) %]"> + <input type="text" name="pc" value="[% pc | html %]" placeholder="[% tprintf(loc('e.g. ‘%s’ or ‘%s’'), c.cobrand.example_places) %]"> <input class="green-btn" type="submit" value="[% loc('Go') %]"> </div> </fieldset> diff --git a/templates/web/fixmystreet/alert/list.html b/templates/web/fixmystreet/alert/list.html index 8305fff6f..84899d457 100644 --- a/templates/web/fixmystreet/alert/list.html +++ b/templates/web/fixmystreet/alert/list.html @@ -20,7 +20,6 @@ <form id="alerts" name="alerts" method="post" action="/alert/subscribe"> -[%# XXX These photos should perhaps be in a vertical column on the right hand side, as currently. %] [% IF photos.size %] <div class="sticky-sidebar"> <aside> diff --git a/templates/web/fixmystreet/around/around_index.html b/templates/web/fixmystreet/around/around_index.html index 3b79a6e8a..5ffddad4f 100644 --- a/templates/web/fixmystreet/around/around_index.html +++ b/templates/web/fixmystreet/around/around_index.html @@ -1,32 +1,35 @@ -[% INCLUDE 'header.html', title => loc('Reporting a problem'), bodyclass => 'mappage' %] - -[% - # NOTE ON PARTIAL REPORTS: - # - # partial reports get a bit of extra text added, the form goes to - # '/report/new' and the partial hidden field is added to the form. -%] - +[% pre_container_extra = BLOCK %] +<div id="front-main"><div id="front-main-container"> [% question = c.cobrand.enter_postcode_text(); %] - <form action="[% c.uri_for('/around') %]" method="get" name="postcodeForm" id="postcodeForm"> - <fieldset> - <label for="pc">[% question %]:</label> + <label for="pc">[% question %]:</label> + <div> <input type="text" name="pc" value="[% pc | html %]" id="pc" size="10" maxlength="200"> - <input class="green-btn final-submit" type="submit" value="[% loc('Go') %]" id="submit"> + <input type="submit" value="[% loc('Go') %]" id="submit"> + </div> - [% IF partial_token %] - <input type="hidden" name="partial" value="[% partial_token.token %]"> - [% END %] - </fieldset> + [% IF partial_token %] + <input type="hidden" name="partial" value="[% partial_token.token %]"> + [% END %] </form> +</div></div> +[% END %] + +[% INCLUDE 'header.html', title = loc('Reporting a problem'), bodyclass = 'frontpage fullwidthpage' %] + +[% + # NOTE ON PARTIAL REPORTS: + # + # partial reports get a bit of extra text added, the form goes to + # '/report/new' and the partial hidden field is added to the form. +%] [% IF location_offshore %] - <p class="error">[% loc('That spot does not appear to be covered by a council. If you have tried to report an issue past the shoreline, for example, please specify the closest point on land.') %]</p> + <p class="form-error">[% loc('That spot does not appear to be covered by a council. If you have tried to report an issue past the shoreline, for example, please specify the closest point on land.') %]</p> [% ELSIF location_error %] - <p class="error">[% location_error %]</p> + <p class="form-error">[% location_error %]</p> [% END %] [% IF possible_location_matches %] @@ -41,10 +44,8 @@ [% IF partial_token %] <p style="margin-top: 0; color: #cc0000;"> <img align="right" src="/photo/[% partial_report.id %].jpeg" hspace="5"> - [% loc("Thanks for uploading your photo. We now need to locate your problem, so please enter a nearby street name or postcode in the box below :") %] + [% loc("Thanks for uploading your photo. We now need to locate your problem, so please enter a nearby street name or postcode in the box above :") %] </p> [% END %] - - [% INCLUDE 'footer.html' %] diff --git a/templates/web/fixmystreet/around/display_location.html b/templates/web/fixmystreet/around/display_location.html index 6a5b0e2d2..1b02a3710 100755 --- a/templates/web/fixmystreet/around/display_location.html +++ b/templates/web/fixmystreet/around/display_location.html @@ -74,8 +74,13 @@ <div id="side"> [% IF allow_creation %] - <h1 class="big-green-banner">[% loc( 'Click map to report a problem' ) %]</h1> - + <h1 class="big-green-banner"> + [% loc( 'Click map to report a problem' ) + IF c.cobrand.moniker == 'bromley'; + '<span>Yellow pins show existing reports</span>'; + END + %] + </h1> <p id="skip-this-step"> [% tprintf( diff --git a/templates/web/fixmystreet/faq/faq-en-gb.html b/templates/web/fixmystreet/faq/faq-en-gb.html index fe899d3a2..1e676d9f2 100755 --- a/templates/web/fixmystreet/faq/faq-en-gb.html +++ b/templates/web/fixmystreet/faq/faq-en-gb.html @@ -72,29 +72,27 @@ by a registered charity, though, so if you want to make a contribution, <a href="https://secure.mysociety.org/donate/">please do</a>.</dd> <dt>Can I use FixMyStreet on my mobile?</dt> - <dd><ul> - <li><em>iPhone:</em> There are two apps for FixMyStreet, one written by us - in 2008 and another much more recently by a volunteer, Martin Stephenson. - Both are available for download on the App Store: + <dd> + <p>The FixMyStreet website should work on your mobile phone, adapting to + the size of your screen automatically. We plan to release updated native + apps in the near future. + <ul> + <li><em>iPhone:</em> Our basic app from 2008 is available for download + on the App Store: <a href="http://itunes.apple.com/gb/app/fixmystreet/id297456545">FixMyStreet</a>, - <a href="http://itunes.apple.com/gb/app/streetreport/id371891859">StreetReport</a>. <li><em>Android:</em> A volunteer, Anna Powell-Smith, has written an app available from the <a href="https://market.android.com/details?id=com.android.fixmystreet">Android Market</a>. <li><em>Nokia:</em> A volunteer, Thomas Forth, has written an app available from the <a href="http://store.ovi.com/content/107557">Ovi Store</a>. </ul> - <p>We also hope to make the website itself much more mobile friendly in the future.</p> </dd> <dt>Why do you only cover the countries of Great Britain?</dt> - <dd>We would love to cover Northern Ireland, but as we were funded for - FixMyStreet by the Department for Constitutional Affairs (now the Ministry - of Justice), we were covered for Ordnance Survey data (but not OSNI data) - by the Pan-Governmental Agreement. The cost for these maps would be - prohibitively expensive for the small charity that we are – if you know of - any way we could get access to the Ordnance Survey for Northern Ireland's - maps so that we can add them to the site, that'd be great.</dd> + <dd>We would love to cover Northern Ireland, but we have only been able + to locate boundaries for Great Britain (from Ordnance Survey). If you + know of a source for Northern Ireland council boundaries + so that we can add them to the site, that'd be great.</dd> </dl> <h2><a name="practical"></a>Practical Questions</h2> @@ -136,7 +134,8 @@ by a user of the site.</dd> <h2><a name="organisation"></a>Organisation Questions</h2> <dl> <dt>Who built FixMyStreet?</dt> - <dd>This site was built by <a href="http://www.mysociety.org/">mySociety</a>, in conjunction with the <a href="http://www.youngfoundation.org.uk/">Young Foundation</a>. + <dd>This site was built by <a href="http://www.mysociety.org/">mySociety</a>, + in conjunction with the <a href="http://www.youngfoundation.org.uk/">Young Foundation</a>. mySociety is the project of a registered charity which has grown out of the community of volunteers who built sites like <a href="http://www.theyworkforyou.com/">TheyWorkForYou.com</a>. mySociety’s primary mission is to build Internet projects which give people simple, tangible @@ -144,15 +143,11 @@ benefits in the civic and community aspects of their lives. Our first project was <a href="http://www.writetothem.com/">WriteToThem</a>, where you can write to any of your elected representatives, for free. The charity is called UK Citizens Online Democracy and is charity number 1076346. mySociety can be contacted by email at <a href="mailto:hello@mysociety.org">hello@mysociety.org</a>, -or by post at:<br> -mySociety<br> -483 Green Lanes<br> -London<br> -N13 4BS<br> -UK</dd> +or by post at mySociety, 483 Green Lanes, London, N13 4BS, UK.</dd> <dt><img src="/i/moj.png" align="right" alt="Ministry of Justice" hspace="10">Who pays for it?</dt> - <dd>FixMyStreet was paid for via the Department for -Constitutional Affairs Innovations Fund.</dd> + <dd>FixMyStreet was originally paid for via the Department for + Constitutional Affairs Innovations Fund. It is now funded by a variety of means, from commercial + work to <a href="http://www.mysociety.org/donate/">donations</a>.</dd> <dt><a name="nfi"></a>Wasn’t this site called Neighbourhood Fix-It?</dt> <dd>Yes, we changed the name mid June 2007. We decided Neighbourhood Fix-It was a bit of a mouthful, hard to spell, and hard to publicise (does the URL have a dash in it or not?). The domain FixMyStreet became available, and everyone liked the name.</dd> diff --git a/templates/web/fixmystreet/footer.html b/templates/web/fixmystreet/footer.html index ada4b5d7e..903d8c73d 100644 --- a/templates/web/fixmystreet/footer.html +++ b/templates/web/fixmystreet/footer.html @@ -8,7 +8,6 @@ <li><a class="m-app-iphone" href="http://itunes.apple.com/gb/app/fixmystreet/id297456545">iPhone</a></li> <li><a class="m-app-droid" href="https://market.android.com/details?id=com.android.fixmystreet">Android</a></li> <li><a class="m-app-nokia" href="http://store.ovi.com/content/107557">Nokia</a></li> - <li><a class="m-app-iphone-streetreport" href="http://itunes.apple.com/gb/app/streetreport/id371891859">iPhone Street Report</a></li> </ul> </div> diff --git a/templates/web/fixmystreet/header.html b/templates/web/fixmystreet/header.html index baec00b57..1c9dfdcbf 100644 --- a/templates/web/fixmystreet/header.html +++ b/templates/web/fixmystreet/header.html @@ -18,7 +18,7 @@ <link rel="stylesheet" href="[% version('/cobrands/fixmystreet/layout.css') %]"> <![endif]--> - <script src="[% version('/js/modernizr.custom.76759.js') %]" charset="utf-8"></script> + <script src="[% version('/js/modernizr.custom.js') %]" charset="utf-8"></script> [% INCLUDE 'common_header_tags.html', js_override = '/cobrands/fixmystreet/fixmystreet.js' %] [% extra_js %] @@ -51,6 +51,8 @@ [% END %] </div> + [% pre_container_extra %] + <div class="container"> <div class="content[% " $mainclass" | html IF mainclass %]" role="main"> diff --git a/templates/web/fixmystreet/index.html b/templates/web/fixmystreet/index.html index 5603bdc39..808fbd420 100644 --- a/templates/web/fixmystreet/index.html +++ b/templates/web/fixmystreet/index.html @@ -16,18 +16,15 @@ Modernizr.load({ </script> [% END %] -[% INCLUDE 'header.html', title => '' , bodyclass => 'frontpage fullwidthpage' %] - -[% IF error %] - <p class="error">[% error %]</p> -[% END %] - - +[% pre_container_extra = BLOCK %] <div id="front-main"> <div id="front-main-container"> - <h1>[% loc('Report, view, or discuss local problems') %]</h1> - - <h2>[% loc('(like graffiti, fly tipping, broken paving slabs, or street lighting)') %]</h2> + [% IF c.cobrand.moniker == 'bromley' %] + <h1 class="main mob-only">Reporting a problem in Bromley’s streets or parks</h1> + [% ELSE %] + <h1>[% loc('Report, view, or discuss local problems') %]</h1> + <h2>[% loc('(like graffiti, fly tipping, broken paving slabs, or street lighting)') %]</h2> + [% END %] [% question = c.cobrand.enter_postcode_text(); @@ -42,6 +39,17 @@ Modernizr.load({ </form> </div> </div> +[% END %] + +[% INCLUDE 'header.html', title = '', bodyclass = 'frontpage fullwidthpage' %] + +[% IF c.cobrand.moniker == 'bromley' %] +<p>This is primarily for reporting physical problems that can be fixed +like graffiti, cleansing issues or road defects. To report other +kinds of problems like missed bins use our +<a href="http://www.bromley.gov.uk/report">online report it forms</a>. +</p> +[% END %] <div class="tablewrapper"> <div id="front-howto"> @@ -51,7 +59,11 @@ Modernizr.load({ <li>[% question %]</li> <li>[% loc('Locate the problem on a map of the area') %]</li> <li>[% loc('Enter details of the problem') %]</li> - <li>[% loc('We send it to the council on your behalf') %]</li> + [% IF c.cobrand.is_council %] + <li>Confirm the report and [% c.cobrand.council_name %] will investigate</li> + [% ELSE %] + <li>[% loc('We send it to the council on your behalf') %]</li> + [% END %] </ol> <section class="full-width"> @@ -62,7 +74,7 @@ Modernizr.load({ [% - recent_photos = c.cobrand.recent_photos(5); + recent_photos = c.cobrand.recent_photos('front', 5); %] [% IF recent_photos.size %] diff --git a/templates/web/fixmystreet/report/display.html b/templates/web/fixmystreet/report/display.html index deca99f2c..260ebc95a 100644 --- a/templates/web/fixmystreet/report/display.html +++ b/templates/web/fixmystreet/report/display.html @@ -182,6 +182,10 @@ [% INCLUDE 'footer.html' %] [% BLOCK name %] + [% IF problem.council == '2482' %] + [% extra_name_info = 1 %] + [% INCLUDE 'report/new/extra_name.html' %] + [% END %] <label for="form_name">[% loc('Name') %]</label> [% IF field_errors.name %] <p class='form-error'>[% field_errors.name %]</p> diff --git a/templates/web/fixmystreet/report/new/category.html b/templates/web/fixmystreet/report/new/category.html deleted file mode 100644 index 095cd7c2e..000000000 --- a/templates/web/fixmystreet/report/new/category.html +++ /dev/null @@ -1,10 +0,0 @@ -[% FILTER collapse %] -[% IF category_options.size %] - <label for='form_category'>[% category_label | html %]</label> - <select name='category' id='form_category'[% ' onchange="form_category_onchange()"' IF category_extras.size %]> - [% FOREACH cat_op IN category_options %] - <option value='[% cat_op | html %]'[% ' selected' IF report.category == cat_op %]>[% cat_op | html %]</option> - [% END %] - </select> -[% END %] -[% END -%] diff --git a/templates/web/fixmystreet/report/new/councils_text.html b/templates/web/fixmystreet/report/new/councils_text.html deleted file mode 100644 index 1da5746c1..000000000 --- a/templates/web/fixmystreet/report/new/councils_text.html +++ /dev/null @@ -1,9 +0,0 @@ -[% FILTER collapse %] -[% IF area_ids_to_list.size == 0 %] - [% PROCESS 'report/new/councils_text_none.html' %] -[% ELSIF area_ids_to_list.size == all_councils.size %] - [% PROCESS 'report/new/councils_text_all.html' %] -[% ELSE %] - [% PROCESS 'report/new/councils_text_some.html' %] -[% END %] -[% END -%] diff --git a/templates/web/fixmystreet/report/new/councils_text_all.html b/templates/web/fixmystreet/report/new/councils_text_all.html deleted file mode 100644 index fe2d5be12..000000000 --- a/templates/web/fixmystreet/report/new/councils_text_all.html +++ /dev/null @@ -1,19 +0,0 @@ -<p> -[% IF area_ids_to_list.0 != 2489 && all_councils.${area_ids_to_list.0}.type == 'LBO' %] -[% - tprintf( - loc('All the information you provide here will be sent to <strong>%s</strong> or a relevant local body such as <strong>TfL</strong>, via the London Report-It system.'), - all_council_names.join( '</strong>' _ loc(' or ') _ '<strong>' ) - ); -%] -[% ELSE %] -[% - tprintf( - loc('All the information you provide here will be sent to <strong>%s</strong>.'), - all_council_names.join( '</strong>' _ loc(' or ') _ '<strong>' ) - ); -%] -[% END %] - -[% loc('The subject and details of the problem will be public, plus your name if you give us permission.') %] -</p> diff --git a/templates/web/fixmystreet/report/new/councils_text_none.html b/templates/web/fixmystreet/report/new/councils_text_none.html deleted file mode 100644 index 992d030c0..000000000 --- a/templates/web/fixmystreet/report/new/councils_text_none.html +++ /dev/null @@ -1,20 +0,0 @@ -<p>[% - - nget( - "We do not yet have details for the council that covers this location.", - "We do not yet have details for the councils that cover this location.", - all_councils.size - ); -%] -[% - loc("If you submit a problem here the subject and details of the problem will be public, but the problem will <strong>not</strong> be reported to the council."); -%] -[% - tprintf( - loc("You can help us by finding a contact email address for local problems for %s and emailing it to us at <a href='mailto:%s'>%s</a>."), - all_council_names.join( loc(' or ') ), - c.cobrand.contact_email, - c.cobrand.contact_email - ); - -%]</p>
\ No newline at end of file diff --git a/templates/web/fixmystreet/report/new/councils_text_some.html b/templates/web/fixmystreet/report/new/councils_text_some.html deleted file mode 100644 index 9f123fb9a..000000000 --- a/templates/web/fixmystreet/report/new/councils_text_some.html +++ /dev/null @@ -1,28 +0,0 @@ -<p> -[% loc('All the information you provide here will be sent to') %] - -[% FOREACH council_id IN area_ids_to_list %] - [% loc( ' or ') IF ! loop.first %] - <strong>[% all_councils.$council_id.name %]</strong> - [%- '.' IF loop.last %] -[% END %] - -[% - loc('The subject and details of the problem will be public, plus your name if you give us permission.'); -%] -[% - nget( - "We do <strong>not</strong> yet have details for the other council that covers this location.", - "We do <strong>not</strong> yet have details for the other councils that cover this location.", - missing_details_councils.size - ); -%] -[% - tprintf( - loc("You can help us by finding a contact email address for local problems for %s and emailing it to us at <a href='mailto:%s'>%s</a>."), - missing_details_council_names.join( loc(' or ') ), - c.cobrand.contact_email, - c.cobrand.contact_email - ); -%] -</p>
\ No newline at end of file diff --git a/templates/web/fixmystreet/report/new/fill_in_details_form.html b/templates/web/fixmystreet/report/new/fill_in_details_form.html index 283f748ba..237533657 100644 --- a/templates/web/fixmystreet/report/new/fill_in_details_form.html +++ b/templates/web/fixmystreet/report/new/fill_in_details_form.html @@ -69,7 +69,7 @@ [% IF js %] <div id="form_category_row"> - <label class="inline" for="form_category">[% loc('Category') %]</label> + <label for="form_category">[% loc('Category') %]</label> <select name="category" id="form_category" required><option>[% loc('Loading...') %]</option></select> </div> [% ELSE %] @@ -111,7 +111,10 @@ [% IF c.user_exists %] <div class="form-box"> - <label for="form_may_show_nameme">[% loc('Name') %]</label> + + [% INCLUDE 'report/new/extra_name.html' %] + + <label for="form_name">[% loc('Name') %]</label> [% IF field_errors.name %] <p class='form-error'>[% field_errors.name %]</p> [% END %] @@ -168,10 +171,13 @@ <div id="form_sign_in_no" class="form-box"> <h5>[% loc('<strong>No</strong> Let me confirm my report by email') %]</h5> - <label for="form_may_show_nameme">[% loc('Name') %]</label> + [% INCLUDE 'report/new/extra_name.html' %] + + <label for="form_name">[% loc('Name') %]</label> [% IF field_errors.name %] <p class='form-error'>[% field_errors.name %]</p> [% END %] + <input type="text" class="form-focus-trigger validName" value="[% report.name | html %]" name="name" id="form_name" placeholder="[% loc('Your name') %]"> [%# if there is nothing in the name field then set check box as default on form %] diff --git a/templates/web/fixmystreet/report/new/notes.html b/templates/web/fixmystreet/report/new/notes.html index 5a885abd0..289520be3 100644 --- a/templates/web/fixmystreet/report/new/notes.html +++ b/templates/web/fixmystreet/report/new/notes.html @@ -6,4 +6,4 @@ <li>[% loc("Please do not be abusive — abusing your council devalues the service for all users.") %]</li> <li>[% loc("Writing your message entirely in block capitals makes it hard to read, as does a lack of punctuation.") %]</li> <li>[% loc("Remember that FixMyStreet is primarily for reporting physical problems that can be fixed. If your problem is not appropriate for submission via this site remember that you can contact your council directly using their own website.") %]</li> -</ul>
\ No newline at end of file +</ul> diff --git a/templates/web/fixmystreet/report/new/report_import.html b/templates/web/fixmystreet/report/new/report_import.html deleted file mode 100644 index 7aa105afe..000000000 --- a/templates/web/fixmystreet/report/new/report_import.html +++ /dev/null @@ -1,92 +0,0 @@ -[% INCLUDE 'header.html', title => 'External import' %] - -<h1>External import</h1> - -<p>You may inject problem reports into FixMyStreet programatically using this -simple interface. Upon receipt, an email will be sent to the address given, -with a link the user must click in order to check the details of their report, -add any other information they wish, and then submit to the council. - -<p>This interface returns a plain text response; either <samp>SUCCESS</samp> if -the report has been successfully received, or if not, a list of errors, one per -line each starting with <samp>ERROR:</samp>. - -<p>You may submit the following information by POST to this URL -(i.e. <samp>[% c.uri_for('/import') %]</samp> ):</p> - -<style type="text/css" media="screen"> - input { - /* Hide the form elements - they are just here for simpler testing */ - display: none; - } -</style> - -<form method="POST" action="/import" enctype="multipart/form-data"> - -<dl> - <dt>service</dt> - <dd> - <em>Required</em>. - Name of application/service using this interface. - <input type="text" name="service" /> - </dd> - - <dt>id</dt> - <dd> - Unique ID of a user/device, for possible future use.<br> - <small>(e.g. used by Flickr import to know which accounts to look at)</small> - <input type="text" name="id" /> - </dd> - - <dt>subject</dt> - <dd> - <em>Required</em>. Subject of problem report. - <input type="text" name="subject" /> - </dd> - - <dt>detail</dt> - <dd> - Main body and details of problem report. - <input type="text" name="detail" /> - </dd> - - <dt>name</dt> - <dd> - <em>Required</em>. Name of problem reporter. - <input type="text" name="name" /> - </dd> - - <dt>email</dt> - <dd> - <em>Required</em>. Email address of problem reporter. - <input type="text" name="email" /> - </dd> - - <dt>phone</dt> - <dd> - Telephone number of problem reporter. - <input type="text" name="phone" /> - </dd> - - <dt>easting / northing</dt> - <dt>lat / lon</dt> - <dd> - Location of problem report. You can either supply eastings/northings, or WGS84 latitude/longitude. - <input type="text" name="easting" /> - <input type="text" name="northing" /> - <input type="text" name="lat" /> - <input type="text" name="lon" /> - </dd> - - <dt>photo</dt> - <dd> - Photo of problem (JPEG only). - <input type="file" name="photo" /> - </dd> -</dl> - -<input type="submit" /> - -</form> - -[% INCLUDE 'footer.html' %]
\ No newline at end of file |