diff options
Diffstat (limited to 'templates')
34 files changed, 594 insertions, 38 deletions
diff --git a/templates/email/default/submit-example.txt b/templates/email/default/submit-example.txt new file mode 100644 index 000000000..61850cafa --- /dev/null +++ b/templates/email/default/submit-example.txt @@ -0,0 +1,62 @@ +Subject: Problem Report: Dangerous pothole + +Dear Birmingham City Council, + +A user of FixMyStreet has submitted the following report of a +local problem that they believe might require your attention. + +To view a map of the precise location of this issue, or to provide +an update on the problem, please visit the following link: + + http://www.fixmystreet.com/report/39092 + +---------- + +Name: Matthew Somerville + +Email: [...] + +Phone: [...] + +Category: Potholes + +Subject: Dangerous pothole + +Details: There is a large pothole almost on the give way line as +you approach the junction along Bournville Lane from the east, +which leads to vehicles rolling back as they fall in and out of it +whilst waiting at the junction. + +Easting: 404517 + +Northing: 280922 + +Latitude: 52.4262642791826 + +Longitude: -1.93500217285966 + +Nearest road to the pin placed on the map (automatically +generated by Bing Maps): Bournville Lane, Birmingham B30 1 + +Nearest postcode to the pin placed on the map (automatically +generated): B30 1LA (83m away) + +---------- + +Replies to this email will go to the user who submitted the problem. + +Yours, +The FixMyStreet team + +This message was sent via FixMyStreet, a project of UKCOD, +registered charity number 1076346. If there is a more appropriate +email address for messages about 'Potholes', please let us know by +visiting <http://www.fixmystreet.com/contact>. This will help +improve the service for local people. We also welcome any other +feedback you may have. + +FixMyStreet is now available for full integration into council +websites, making life easier for both you and your residents. +Read more here: +http://www.mysociety.org/fixmystreet-for-local-council-websites/ + diff --git a/templates/web/default/admin/council_contacts.html b/templates/web/default/admin/council_contacts.html index 669f137f9..75d915a29 100644 --- a/templates/web/default/admin/council_contacts.html +++ b/templates/web/default/admin/council_contacts.html @@ -12,6 +12,13 @@ <a href="[% c.uri_for( 'council_contacts', area_id, { text => 1 } ) %]">[% loc('Text only version') %]</a> </p> +[% IF open311.count > 0 %] + <h2> + Council contacts configured via Open311 + </h2> + +[% END %] + <form method="post" action="[% c.uri_for('council_contacts', area_id ) %]" enctype="application/x-www-form-urlencoded" accept-charset="utf-8"> <table cellspacing="0" cellpadding="2" border="1"> @@ -86,4 +93,31 @@ </div> </form> + <h2>[% loc('Configure Open311 integration') %]</h2> + <form method="post" action="[% c.uri_for('council_contacts', area_id ) %]" enctype="application/x-www-form-urlencoded" accept-charset="utf-8"> + [% conf = open311.next %] + <p> + <label for="endpoint">Endpoint</label>: + <input type="text" name="endpoint" id="endpoint" value="[% conf.endpoint %]" size="50"> + </p> + + <p> + <label for="jurisdiction">Jurisdiction</label>: + <input type="text" name="jurisdiction" id="jurisdiction" value="[% conf.jurisdiction %]" size="50"> + </p> + + <p> + <label for="api_key">Api Key</label>: + <input type="text" name="api_key" id="api_key" value="[% conf.api_key %]" size="25"> + </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"> + <input type="hidden" name="token" value="[% token %]"> + <input type="submit" name="Configure Open311" value="[% loc('Configure Open311') %]"> + </p> + </form> + [% INCLUDE 'admin/footer.html' %] diff --git a/templates/web/default/admin/list_updates.html b/templates/web/default/admin/list_updates.html index 4f27b9595..0a05ba4ac 100644 --- a/templates/web/default/admin/list_updates.html +++ b/templates/web/default/admin/list_updates.html @@ -15,8 +15,8 @@ <th>*</th> </tr> [% FOREACH update IN updates -%] - <tr[% ' class="hidden"' IF update.state == 'hidden' || ( problem.state && problem.state == 'hidden' ) %]> - <td>[%- IF update.state == 'confirmed' -%] + <tr[% ' class="hidden"' IF update.state == 'hidden' || update.problem.state == 'hidden' %]> + <td>[%- IF update.state == 'confirmed' && update.problem.state != 'hidden' -%] [%- cobrand_data = update.cobrand_data %] [%- cobrand_data = c.data_for_generic_update IF !update.cobrand %] <a href="[% c.uri_for_email( '/report', update.problem.id, cobrand_data ) %]#update_[% update.id %]">[% update.id %]</a> diff --git a/templates/web/default/around/display_location.html b/templates/web/default/around/display_location.html index 8d8e1dc3c..3d9c82187 100755 --- a/templates/web/default/around/display_location.html +++ b/templates/web/default/around/display_location.html @@ -35,7 +35,7 @@ robots => 'noindex,nofollow'; %] -<form action="[% c.uri_for('/report/new') %]" method="post" name="mapForm" id="mapForm" enctype="multipart/form-data"> +<form action="[% c.uri_for('/report/new') %]" method="post" name="mapForm" id="mapForm" enctype="multipart/form-data" class="validate"> [% IF c.req.params.map_override %] <input type="hidden" name="map_override" value="[% c.req.params.map_override | html %]"> [% END %] @@ -53,7 +53,7 @@ [% ELSE %] <a id='hide_pins_link' rel='nofollow' href='[% c.uri_with( { no_pins => 1 } ) %]'>[% loc('Hide pins') %]</a> [% END %] - [% IF c.cobrand.country == 'GB' %] + [% IF c.cobrand.country == 'GB' || c.cobrand.country == 'NO' %] | [% IF c.req.params.all_pins %] <a id='all_pins_link' rel='nofollow' href='[% c.uri_with( { no_pins => undef, all_pins => undef } ) %]'>[% loc('Hide stale reports') %]</a> diff --git a/templates/web/default/auth/general.html b/templates/web/default/auth/general.html index 6c9d4497a..5407e56e1 100644 --- a/templates/web/default/auth/general.html +++ b/templates/web/default/auth/general.html @@ -2,7 +2,7 @@ <h1>[% loc('Sign in') %]</h1> -<form action="[% c.uri_for() %]" method="post" name="general_auth"> +<form action="[% c.uri_for() %]" method="post" name="general_auth" class="validate"> <input type="hidden" name="r" value="[% c.req.params.r | html %]"> [% IF email_error; @@ -25,7 +25,7 @@ <div class="form-field"> <label class="n" for="email">[% loc('Your email address:') %]</label> - <input type="email" size="30" id="email" name="email" value="[% email | html %]"> + <input type="email" class="required email" size="30" id="email" name="email" value="[% email | html %]"> </div> <div id="form_sign_in"> diff --git a/templates/web/default/common_header_tags.html b/templates/web/default/common_header_tags.html index 44da6aa9b..95b59d9dd 100644 --- a/templates/web/default/common_header_tags.html +++ b/templates/web/default/common_header_tags.html @@ -1,10 +1,21 @@ +[% INCLUDE 'js_validation_msgs.html' %] + <meta http-equiv="content-type" content="text/html; charset=utf-8"> -<script type="text/javascript" src="/jslib/jquery-1.6.2.min.js"></script> +<script type="text/javascript" src="/jslib/jquery-1.7.0.min.js"></script> + +<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/fixmystreet.js') %]"></script> [% map_js %] +[% IF category_extras_json && category_extras_json != '{}' %] +<script type="text/javascript"> + category_extras = [% category_extras_json %]; +</script> +[% END %] + [% IF robots %] <meta name="robots" content="[% robots %]"> [% ELSIF c.config.STAGING_SITE %] diff --git a/templates/web/default/contact/index.html b/templates/web/default/contact/index.html index dc64dd554..2c0c2ff02 100644 --- a/templates/web/default/contact/index.html +++ b/templates/web/default/contact/index.html @@ -5,7 +5,7 @@ <h1>[% loc('Contact the team') %]</h1> -<form method="post" action="/contact/submit"> +<form method="post" action="/contact/submit" class="validate"> [% INCLUDE 'errors.html' %] @@ -66,7 +66,7 @@ [% END %] <div class="form-field"> <label for="form_name">[% loc('Your name:') %]</label> -<input type="text" name="name" id="form_name" value="[% form_name | html %]" size="30"></div> +<input type="text" class="required" name="name" id="form_name" value="[% form_name | html %]" size="30"></div> [% IF field_errors.em %] @@ -74,14 +74,14 @@ [% END %] <div class="form-field"> <label for="form_email">[% loc('Your email:') %]</label> -<input type="text" name="em" id="form_email" value="[% em | html %]" size="30"></div> +<input type="text" class="required email" name="em" id="form_email" value="[% em | html %]" size="30"></div> [% IF field_errors.subject %] <div class="form-error">[% field_errors.subject %]</div> [% END %] <div class="form-field"> <label for="form_subject">[% loc('Subject:') %]</label> -<input type="text" name="subject" id="form_subject" value="[% subject | html %]" size="30"></div> +<input type="text" class="required" name="subject" id="form_subject" value="[% subject | html %]" size="30"></div> [% IF field_errors.message %] <div class="form-error">[% field_errors.message %]</div> @@ -89,7 +89,7 @@ <div class="form-field"> <label for="form_message">[% loc('Message:') %]</label> -<textarea name="message" id="form_message" rows="7" cols="50">[% message | html %]</textarea></div> +<textarea class="required" name="message" id="form_message" rows="7" cols="50">[% message | html %]</textarea></div> <div class="checkbox"><input type="submit" value="[% loc('Post') %]"></div> [% c.cobrand.form_elements('contactForm') %] diff --git a/templates/web/default/footer.html b/templates/web/default/footer.html index b1f22da2c..38e83c1c2 100644 --- a/templates/web/default/footer.html +++ b/templates/web/default/footer.html @@ -10,9 +10,25 @@ <li><a href="/faq">[% loc("Help") %]</a></li> </ul> -[% loc('<a href="http://www.mysociety.org/"><img id="logo" width="133" height="26" src="/i/mysociety-dark.png" alt="View mySociety.org"><span id="logoie"></span></a>') %] +[% IF ! c.cobrand.moniker %] + <!-- winter 2011 promotion for unbranded site only --> + <div id="promo"> + <a href="http://www.mysociety.org/2011/11/02/fix-before-the-freeze/" + title="Fix Before the Freeze - report those dangerous potholes and broken streetlights before winter hits"><img + src="/i/promo-fb4tf.gif" + alt="Fix Before the Freeze - report those dangerous potholes and broken streetlights before winter hits" ></a> + </div> + [% loc('<a href="http://www.mysociety.org/"><img id="logo" width="159" height="39" src="/i/mysociety-on-white.gif" alt="View mySociety.org"><span id="logoie"></span></a>') %] + +[% ELSE %] + + [% loc('<a href="http://www.mysociety.org/"><img id="logo" width="133" height="26" src="/i/mysociety-dark.png" alt="View mySociety.org"><span id="logoie"></span></a>') %] + +[% END %] + +</div> +<div id="footer"> -<div id="footer"> <p>[% loc('Built by <a href="http://www.mysociety.org/">mySociety</a>') %] | <a href="/contact">[% loc("Contact FixMyStreet") | replace(' ', ' ') %]</a></p> @@ -22,13 +38,15 @@ | <a href="https://market.android.com/details?id=com.android.fixmystreet">Android</a> | <a href="http://store.ovi.com/content/107557">Nokia</a> </p> - + <p class="l">[% loc('Are you from a council? Would you like better integration with FixMyStreet?') %] - <a href="http://www.mysociety.org/fixmystreet-for-local-council-websites/">[% loc('Find out about FixMyStreet for councils') %]</a>. - + <a href="http://www.mysociety.org/fixmystreet-for-local-council-websites/">[% loc('Find out about FixMyStreet for councils') %]</a>. + </p> + <p class="r">[% loc('Are you a developer? Would you like to contribute to FixMyStreet?') %] [% loc('Our code is open source and <a href="http://github.com/mysociety/fixmystreet">available on GitHub</a>.') %] </p> + </div> [% INCLUDE 'debug_footer.html' %] diff --git a/templates/web/default/header.html b/templates/web/default/header.html index 1aa8ce159..e3c364363 100644 --- a/templates/web/default/header.html +++ b/templates/web/default/header.html @@ -22,6 +22,7 @@ [% END %] [% INCLUDE 'tracking_code.html' %] + </head> <body> @@ -29,6 +30,7 @@ [%- loc('Fix<span id="my">My</span>Street') %] [%- IF NOT title AND NOT c.req.path %]</h1>[% ELSE %]</a></div>[% END %] + <div [% IF ! c.cobrand.moniker %]class="promo-background"[% END %] > <ul id="meta"> [% IF c.user_exists %] <li>[% tprintf(loc('Signed in as %s'), c.user.name || c.user.email) %] @@ -37,7 +39,10 @@ <li> </li> [% END %] </ul> - <div id="wrapper"><div id="mysociety"> + + [% IF ! c.cobrand.moniker %] + + [% END %] [% INCLUDE 'debug_header.html' %] diff --git a/templates/web/default/js_validation_msgs.html b/templates/web/default/js_validation_msgs.html new file mode 100644 index 000000000..2466ce175 --- /dev/null +++ b/templates/web/default/js_validation_msgs.html @@ -0,0 +1,20 @@ +<script type="text/javascript"> + validation_strings = { + update: '[% loc('Please enter a message') %]', + title: '[% loc('Please enter a subject') %]', + detail: '[% loc('Please enter some details') %]', + name: { + required: '[% loc('Please enter your name') %]', + validName: '[% loc('Please enter your full name, councils need this information - if you do not wish your name to be shown on the site, untick the box') %]', + }, + category: '[% loc('Please choose a category') %]', + rznvy: { + required: '[% loc('Please enter your email') %]', + email: '[% loc('Please enter a valid email') %]', + }, + email: { + required: '[% loc('Please enter your email') %]', + email: '[% loc('Please enter a valid email') %]', + } + }; +</script> diff --git a/templates/web/default/report/display.html b/templates/web/default/report/display.html index aeff140fe..1e320e1b4 100644 --- a/templates/web/default/report/display.html +++ b/templates/web/default/report/display.html @@ -65,7 +65,7 @@ [% INCLUDE 'errors.html' %] - <form method="post" action="[% c.uri_for( '/report/update' ) %]" name="updateForm" class="fieldset"[% IF c.cobrand.allow_photo_upload %] enctype="multipart/form-data"[% END %]> + <form method="post" action="[% c.uri_for( '/report/update' ) %]" name="updateForm" class="fieldset validate"[% IF c.cobrand.allow_photo_upload %] enctype="multipart/form-data"[% END %]> <input type="hidden" name="submit_update" value="1"> <input type="hidden" name="id" value="[% problem.id | html %]"> @@ -75,7 +75,7 @@ [% END %] <div class="form-field"> <label for="form_update">[% loc( 'Update:' ) %]</label> - <textarea name="update" id="form_update" rows="7" cols="30">[% update.text | html %]</textarea> + <textarea name="update" id="form_update" rows="7" cols="30" required>[% update.text | html %]</textarea> </div> [% IF c.user && c.user.belongs_to_council( problem.council ) %] @@ -132,7 +132,7 @@ [% END %] <div class="form-field"> <label for="form_rznvy">[% loc('Your email:' ) %]</label> - <input type="email" name="rznvy" id="form_rznvy" value="[% update.user.email | html %]" size="30"> + <input type="email" name="rznvy" id="form_rznvy" value="[% update.user.email | html %]" size="30" required> </div> <div id="form_sign_in"> @@ -159,7 +159,7 @@ </p> <p> - <input type="submit" name="submit_sign_in" value="[% loc('Post') %]"> + <input type="submit" name="submit_sign_in" id="submit_sign_in" value="[% loc('Post') %]"> </p> </div> @@ -181,7 +181,7 @@ <p style="clear:both"><small>[% loc('Providing a password is optional, but doing so will allow you to more easily report problems, leave updates and manage your reports.') %]</small></p> <p> - <input type="submit" name="submit_register" value="[% loc('Post') %]"> + <input type="submit" name="submit_register" id="submit_register" value="[% loc('Post') %]"> </p> </div> diff --git a/templates/web/default/report/new/category_extras.html b/templates/web/default/report/new/category_extras.html new file mode 100644 index 000000000..7be69e30c --- /dev/null +++ b/templates/web/default/report/new/category_extras.html @@ -0,0 +1,26 @@ +<div id="category_meta"> + [%- IF report_meta %] + [%- category = report.category %] + <h4>Additional Information</h4> + [%- FOR meta IN category_extras.$category %] + [%- meta_name = meta.code -%] + +[% IF field_errors.$meta_name %] + <div class='form-error'>[% field_errors.$meta_name %]</div> +[% END -%] + + <div class="form-field"> + <label for="form_[% meta_name %]">[% meta.description _ ':' %]</label> + [% IF meta.exists('values') %] + <select name="[% meta_name %]" id="form_[% meta_name %]"[% meta.required == 'true' ? ' required' : '' %]> + [% FOR option IN meta.values.value.keys %] + <option value="[% meta.values.value.$option.key %]">[% option %]</option> + [% END %] + </select> + [% ELSE %] + <input type="text" value="[% report_meta.$meta_name | html %]" name="[% meta_name %]" id="form_[% meta_name %]"[% meta.required == 'true' ? ' required' : '' %]> + [% END %] + </div> + [%- END %] + [%- END %] +</div> diff --git a/templates/web/default/report/new/councils_text_none.html b/templates/web/default/report/new/councils_text_none.html index f991e031f..06a4bbe49 100644 --- a/templates/web/default/report/new/councils_text_none.html +++ b/templates/web/default/report/new/councils_text_none.html @@ -7,9 +7,11 @@ "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 ') ), diff --git a/templates/web/default/report/new/fill_in_details.html b/templates/web/default/report/new/fill_in_details.html index a9a113283..701a9bafa 100644 --- a/templates/web/default/report/new/fill_in_details.html +++ b/templates/web/default/report/new/fill_in_details.html @@ -4,14 +4,14 @@ %] [% IF report.used_map %] -<form action="[% c.uri_for('/report/new') %]" method="post" name="mapForm" id="mapForm"[% IF c.cobrand.allow_photo_upload %] enctype="multipart/form-data"[% END %]> +<form action="[% c.uri_for('/report/new') %]" method="post" name="mapForm" id="mapForm"[% IF c.cobrand.allow_photo_upload %] enctype="multipart/form-data"[% END %] class="validate"> [% IF c.req.params.map_override %] <input type="hidden" name="map_override" value="[% c.req.params.map_override | html %]"> [% END %] <input type="hidden" name="pc" value="[% pc | html %]"> [% c.cobrand.form_elements('mapForm') %] [% ELSE %] -<form action="[% c.uri_for('/report/new') %]" method="post" name="mapSkippedForm"[% IF c.cobrand.allow_photo_upload %] enctype="multipart/form-data"[% END %]> +<form action="[% c.uri_for('/report/new') %]" method="post" name="mapSkippedForm"[% IF c.cobrand.allow_photo_upload %] enctype="multipart/form-data"[% END %] class="validate"> <input type="hidden" name="pc" value="[% pc | html %]"> <input type="hidden" name="skipped" value="1"> [% c.cobrand.form_elements('mapSkippedForm') %] diff --git a/templates/web/default/report/new/fill_in_details_form.html b/templates/web/default/report/new/fill_in_details_form.html index 633dc0b11..b6b77c75a 100644 --- a/templates/web/default/report/new/fill_in_details_form.html +++ b/templates/web/default/report/new/fill_in_details_form.html @@ -50,7 +50,7 @@ <div class="form-field"> <label for="form_title">[% loc('Subject:') %]</label> - <input type="text" value="[% report.title | html %]" name="title" id="form_title" size="25"> + <input type="text" value="[% report.title | html %]" name="title" id="form_title" size="25" required> </div> [% IF field_errors.detail %] @@ -59,13 +59,13 @@ <div class="form-field"> <label for="form_detail">[% loc('Details:') %]</label> - <textarea name="detail" id="form_detail" rows="7" cols="26">[% report.detail | html %]</textarea> + <textarea name="detail" id="form_detail" rows="7" cols="26" required>[% report.detail | html %]</textarea> </div> [% IF js %] <div class="form-field" id="form_category_row"> <label for="form_category">[% loc('Category:') %]</label> - <select name="category" id="form_category"><option>[% loc('Loading...') %]</option></select> + <select name="category" id="form_category" required><option>[% loc('Loading...') %]</option></select> </div> [% ELSE %] [% IF category_options.size %] @@ -79,6 +79,10 @@ [% END %] [% END %] +[%- IF category_extras %] +[% PROCESS "report/new/category_extras.html" %] +[%- END %] + [% IF c.cobrand.allow_photo_upload %] [% IF field_errors.photo %] <div class='form-error'>[% field_errors.photo %]</div> @@ -118,7 +122,7 @@ <div class="form-field"> <label for="form_email">[% loc('Your email:') %]</label> - <input type="email" value="[% report.user.email | html %]" name="email" id="form_email" size="25"> + <input type="email" value="[% report.user.email | html %]" name="email" id="form_email" size="25" required> </div> [% INCLUDE 'report/new/notes.html' %] @@ -132,10 +136,10 @@ <div class='form-error'>[% field_errors.password %]</div> [% END %] - <p> + <div class="form-field"> <label class="n" for="password_sign_in">[% loc('<strong>Yes</strong>, I have a password:') %]</label> <input type="password" name="password_sign_in" id="password_sign_in" value="" size="25"> - </p> + </div> <div class="fieldset"> @@ -147,7 +151,7 @@ </p> <p> - <input type="submit" name="submit_sign_in" value="[% loc('Submit') %]"> + <input type="submit" id="submit_sign_in" name="submit_sign_in" value="[% loc('Submit') %]"> </p> </div> @@ -169,7 +173,7 @@ <p style="clear:both"><small>[% loc('Providing a password is optional, but doing so will allow you to more easily report problems, leave updates and manage your reports.') %]</small></p> <p> - <input type="submit" name="submit_register" value="[% loc('Submit') %]"> + <input type="submit" id="submit_register" name="submit_register" value="[% loc('Submit') %]"> </p> </div> @@ -197,7 +201,7 @@ <div class="form-field"> <label for="form_name">[% loc('Your name:') %]</label> - <input type="text" value="[% report.name | html %]" name="name" id="form_name" size="25"> + <input type="text" class="validName" value="[% report.name | html %]" name="name" id="form_name" size="25"> </div> <div class="checkbox"> diff --git a/templates/web/default/report/new/fill_in_details_text.html b/templates/web/default/report/new/fill_in_details_text.html index 9ebb8107b..5d9716915 100644 --- a/templates/web/default/report/new/fill_in_details_text.html +++ b/templates/web/default/report/new/fill_in_details_text.html @@ -4,6 +4,9 @@ to help unless you leave as much detail as you can, so please describe the exact location of the problem (e.g. on a wall), what it is, how long it has been there, a description (and a photo of the problem if you have one), etc.'); + IF category_extras; + ' ' _ loc('Some categories may require additional information.'); + END; ELSE; loc('Please fill in details of the problem below.'); END; diff --git a/templates/web/default/reports/cobrand_stats.html b/templates/web/default/reports/cobrand_stats.html new file mode 100644 index 000000000..e69de29bb --- /dev/null +++ b/templates/web/default/reports/cobrand_stats.html diff --git a/templates/web/default/reports/council.html b/templates/web/default/reports/council.html index 0739e84e8..44f0040cb 100755 --- a/templates/web/default/reports/council.html +++ b/templates/web/default/reports/council.html @@ -75,6 +75,8 @@ Its area is now covered by <a href="/reports/Bedford">Bedford Borough Council</a <h2>[% name %]</h2> +[% INCLUDE 'reports/cobrand_stats.html' %] + [% IF c.cobrand.moniker == '' %] <p class="promo"> FixMyStreet is now available for local council websites. diff --git a/templates/web/emptyhomes/alert/index.html b/templates/web/emptyhomes/alert/index.html new file mode 100644 index 000000000..cbb2b45f9 --- /dev/null +++ b/templates/web/emptyhomes/alert/index.html @@ -0,0 +1,5 @@ +[% INCLUDE 'header.html', title => loc('Local RSS feeds and email alerts') %] + +<h1>[% loc('Local RSS feeds and email alerts') %]</h1> + +[% INCLUDE 'footer.html' %] diff --git a/templates/web/emptyhomes/around/display_location.html b/templates/web/emptyhomes/around/display_location.html new file mode 100755 index 000000000..2b2a8e9f0 --- /dev/null +++ b/templates/web/emptyhomes/around/display_location.html @@ -0,0 +1,57 @@ +[% + + url_skip = c.uri_for( + '/report/new', + { + pc => pc + latitude => short_latitude, + longitude => short_longitude, + skipped => 1, + } + ); + + PROCESS "maps/${map.type}.html"; + + INCLUDE 'header.html', + title => loc('Viewing a location') + robots => 'noindex,nofollow'; +%] + +<form action="[% c.uri_for('/report/new') %]" method="post" name="mapForm" id="mapForm" enctype="multipart/form-data"> +[% IF c.req.params.map_override %] +<input type="hidden" name="map_override" value="[% c.req.params.map_override | html %]"> +[% END %] +<input type="hidden" name="pc" value="[% pc | html %]"> +[% c.cobrand.form_elements('mapForm') %] + +<input type="hidden" name="latitude" id="fixmystreet.latitude" value="[% short_latitude | html %]"> +<input type="hidden" name="longitude" id="fixmystreet.longitude" value="[% short_longitude | html %]"> + +[% map_html %] + +</div> +<div id="side"> + +<p id="text_map" class="banner"> + [% loc( 'To <strong>report a problem</strong>, simply click on the map at the correct location.' ) %] + [% + tprintf( + loc("<small>If you cannot see the map, <a href='%s' rel='nofollow'>skip this step</a>.</small>"), + url_skip + ) + %] + <span id="text_map_arrow"></span> +</p> + +</div> + +<div style="display:none" id="side-form"> +[% INCLUDE "report/new/fill_in_details_form.html" + js = 1, + report.used_map = 1 +%] +</div> + +</form> + +[% INCLUDE 'footer.html' %] diff --git a/templates/web/emptyhomes/front/stats.html b/templates/web/emptyhomes/front/stats.html new file mode 100644 index 000000000..cbb26fee1 --- /dev/null +++ b/templates/web/emptyhomes/front/stats.html @@ -0,0 +1,27 @@ +[% + USE Comma; + # Note - if we want to i18n the commas we should try + # 'Template::Plugin::Number::Format' +%] + +[% + stats = c.cobrand.front_stats_data(); + + new_text = + stats.recency == '1 week' + ? nget( + "<big>%s</big> report in past week", + "<big>%s</big> reports in past week", + stats.new + ) + : nget( + "<big>%s</big> report recently", + "<big>%s</big> reports recently", + stats.new + ); + +%] + +<div id="front_stats"> + <div>[% tprintf( new_text, stats.new ) | comma %]</div> +</div> diff --git a/templates/web/emptyhomes/header.html b/templates/web/emptyhomes/header.html index d1198eada..7f4106f85 100644 --- a/templates/web/emptyhomes/header.html +++ b/templates/web/emptyhomes/header.html @@ -26,7 +26,6 @@ <ul> <li><a href="/">[% loc("Report a problem") %]</a></li> <li><a href="/reports">[% loc("All reports") %]</a></li> - <li><a href="/alert">[% loc("Local alerts") %]</a></li> <li><a href="/faq">[% loc("Help") %]</a></li> <li><a href="/about">[% loc('About us') %]</a></li> [% IF lang_code == 'en-gb' %] diff --git a/templates/web/emptyhomes/index.html b/templates/web/emptyhomes/index.html new file mode 100644 index 000000000..0206bbff0 --- /dev/null +++ b/templates/web/emptyhomes/index.html @@ -0,0 +1,64 @@ +[% INCLUDE 'header.html', title => '' %] + +[% IF c.req.uri.host == 'reportemptyhomes.com' or c.req.uri.host == 'emptyhomes.matthew.fixmystreet.com' %] + +<h2>Channel 4: The Great British Property Scandal</h2> + +<iframe style="float:right; margin-left: 15px;" width="560" height="315" src="http://www.youtube.com/embed/N3OPfTlEEsw" frameborder="0" allowfullscreen></iframe> + +<p>We’re really excited to be offical advisors to the forthcoming new +empty homes TV series <strong>The Great British Property Scandal</strong>!</p> +<p>The series will highlight the nearly two million British families who don’t +have adequate housing, and the million-odd homes lying empty across the UK.</p> + +<ul style="font-size: 125%; line-height: 2"> + +<li><a href="http://www.channel4.com/programmes/the-great-british-property-scandal/articles/report-an-empty">Report an empty property</a></li> +<li><a href="http://cy.reportemptyhomes.com/">Rhoi gwybod am eiddo gwag</a></li> + +<!-- <li><strong>Download the iPhone app</strong> from the App Store.</li> --> + +</ul> + +[% ELSE %] + +[% IF error %] + <p class="error">[% error %]</p> +[% END %] + +<p id="expl"> + <strong>[% loc('Report empty properties') %]</strong> +</p> + +[% + question + = c.cobrand.enter_postcode_text() + || loc("Enter a nearby GB postcode, or street name and area"); +%] + +<form action="[% c.uri_for('/around') %]" method="get" name="postcodeForm" id="postcodeForm"> + <label for="pc">[% question %]:</label> + <span><input type="text" name="pc" value="" id="pc" size="10" maxlength="200"> + <input type="submit" value="[% loc('Go') %]" id="submit"> + </span> + [% c.cobrand.form_elements('postcodeForm') %] +</form> + +<div id="front_intro"> + + <h2>[% loc('How to report a problem') %]</h2> + + <ol> + <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> + </ol> + + [% INCLUDE "front/stats.html" %] + +</div> + +[% END %] + +[% INCLUDE 'footer.html' %] diff --git a/templates/web/emptyhomes/report/display.html b/templates/web/emptyhomes/report/display.html new file mode 100644 index 000000000..933a05948 --- /dev/null +++ b/templates/web/emptyhomes/report/display.html @@ -0,0 +1,32 @@ +[% + problem_title = loc('Viewing a problem') | html; + INCLUDE 'header.html' + title = problem_title + robots = 'noindex, nofollow' +%] + +<div id="side"> + +[% IF banner.id %] +<p class="banner" id="[% banner.id %]"> + [% banner.text %] +</p> +[% END %] + +<h1>Empty property report</h1> + +<p><em>[% problem.meta_line(c) | html %] +[% IF problem.council %] + [% IF problem.whensent %] + <small class="council_sent_info"><br>[% problem.duration_string(c) %]</small> + [% END %] +[% ELSE %] +<br><small>[% loc('Not reported to council') %]</small> +[% END %] + +</em></p> + +</div> + +[% INCLUDE 'footer.html' %] + diff --git a/templates/web/emptyhomes/report/new/all_councils_text.html b/templates/web/emptyhomes/report/new/councils_text_all.html index 8bdad1c1f..8bdad1c1f 100644 --- a/templates/web/emptyhomes/report/new/all_councils_text.html +++ b/templates/web/emptyhomes/report/new/councils_text_all.html diff --git a/templates/web/emptyhomes/report/new/no_councils_text.html b/templates/web/emptyhomes/report/new/councils_text_none.html index dbe9cd510..dbe9cd510 100644 --- a/templates/web/emptyhomes/report/new/no_councils_text.html +++ b/templates/web/emptyhomes/report/new/councils_text_none.html diff --git a/templates/web/emptyhomes/reports/council.html b/templates/web/emptyhomes/reports/council.html new file mode 100755 index 000000000..8ba9bf1ca --- /dev/null +++ b/templates/web/emptyhomes/reports/council.html @@ -0,0 +1,73 @@ +[% IF ward %] + [% name = "$ward.name, $council.name" + thing = loc('ward') + %] +[% ELSE %] + [% name = council.name + thing = loc('council') + %] +[% END %] + +[% + INCLUDE 'header.html', + title = tprintf(loc('%s - Summary reports'), name) + context = 'reports' +%] + +[% IF 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> +[% FOR child IN children.values.sort('name') %] +<li><a href="[% child.url %]">[% child.name %]</a></li> +[% END %] +</ul> +[% END %] + +<div id="side"> + +[% IF council.generation_high == 10 AND c.cobrand.country == 'GB' %] +<p id="unknown">This council no longer exists. +[% IF council.name.match('Penwith|Kerrier|Carrick|Restormel|Caradon|North Cornwall') %] +Its area is now covered by <a href="/reports/Cornwall">Cornwall Council</a>. +[% ELSIF council.name.match('Durham|Easington|Sedgefield|Teesdale|Wear Valley|Derwentside|Chester le Street') %] +Its area is now covered by <a href="/reports/Durham+County">Durham County Council</a>. +[% ELSIF council.name.match('Blyth Valley|Wansbeck|Castle Morpeth|Tynedale|Alnwick|Berwick upon Tweed') %] +Its area is now covered by <a href="/reports/Northumberland">Northumberland County Council</a>. +[% ELSIF council.name.match('North Shropshire|Oswestry|Shrewsbury and Atcham|South Shropshire|Bridgnorth') %] +Its area is now covered by <a href="/reports/Shropshire">Shropshire Council</a>. +[% ELSIF council.name.match('Salisbury|West Wiltshire|Kennet|North Wiltshire') %] +Its area is now covered by <a href="/reports/Wiltshire">Wiltshire Council</a>. +[% ELSIF council.name.match('Ellesmere Port and Neston|Vale Royal|Chester') %] +Its area is now covered by <a href="/reports/Cheshire+West+and+Chester">Cheshire West and Chester Council</a>. +[% ELSIF council.name.match('Macclesfield|Congleton|Crewe and Nantwich') %] +Its area is now covered by <a href="/reports/Cheshire+East">Cheshire East Council</a>. +[% ELSIF council.name.match('Mid Bedfordshire|South Bedfordshire') %] +Its area is now covered by <a href="/reports/Central+Bedfordshire">Central Bedfordshire Council</a>. +[% ELSIF council.name.match('Cheshire') %] +Its area is now covered by <a href="/reports/Cheshire+West+and+Chester">Cheshire West and Chester Council</a> or +<a href="/reports/Cheshire+East">Cheshire East Council</a>. +[% ELSIF council.name.match('Bedfordshire') %] +Its area is now covered by <a href="/reports/Bedford">Bedford Borough Council</a> or +<a href="/reports/Central+Bedfordshire">Central Bedfordshire Council</a>. +[% END %] +</p> +[% END %] + +[% IF c.cobrand.all_councils_report %] + [% tprintf( loc('This is a summary of all reports for one %s.'), thing ) %] +[% ELSE %] + [% tprintf( loc('This is a summary of all reports for this %s.'), thing ) %] +[% END %] + +[% IF ward %] +[% tprintf( loc('You can <a href="%s">view all reports for the council</a> or <a href="/reports">show all councils</a>.'), council_url ) %] +[% ELSE %] +[% loc('You can <a href="/reports">show all councils</a>.') %] +[% END %] + +<h2>[% name %]</h2> + +</div> +[% INCLUDE 'footer.html' %] + diff --git a/templates/web/emptyhomes/reports/index.html b/templates/web/emptyhomes/reports/index.html index f2cd99cdb..db506679e 100755 --- a/templates/web/emptyhomes/reports/index.html +++ b/templates/web/emptyhomes/reports/index.html @@ -20,7 +20,7 @@ [%- ELSIF loop.count % 2 %] class="a" [%- END -%] > -<td align="left"><a href="[% area.url %]">[% area.name %]</a></td> +<td align="left">[% area.name %]</td> <td>[% open.${area.id}.new or 0 %]</td> <td>[% (open.${area.id}.older or 0) + (open.${area.id}.unknown or 0) %]</td> <td>[% fixed.${area.id}.new or 0 %]</td> diff --git a/templates/web/reading/footer.html b/templates/web/reading/footer.html new file mode 100644 index 000000000..ec523aa97 --- /dev/null +++ b/templates/web/reading/footer.html @@ -0,0 +1,47 @@ +</div> +</div> + +<h2 class="v">[% loc('Navigation') %]</h2> +<ul id="navigation"> +<li><a href="/">[% loc("Report a problem") %]</a></li> +<li id="nav_new"><a href="/my">[% loc("Your reports") %]</a></li> +<li><a href="/reports/Reading">[% loc("All reports") %]</a></li> +<li><a href="/alert[% pc ? '/list?pc=' : '' %][% pc | uri %]">[% loc("Local alerts") %]</a></li> +<li><a href="/faq">[% loc("Help") %]</a></li> +</ul> + + <div style="clear:both"></div> + </div> + <div class="footer"> + <div class="contact"> + <p class="title">Contact</p> + <address> + Reading Borough Council<br /> + Civic Centre<br /> + Reading<br /> + RG1 7AE + </address> + <div class="phone"> + <p>Phone: 0118 937 3737<br />Text: 81722</p> + </div> + </div> + <div class="clear"></div> + </div> + </div> + +<!-- START OF eVisitAnalyst CODE --> +<script language="JavaScript" type="text/javascript"> +var ID_section_15243615 = "";//Place section here. +var ID_tt_15243615 = "t"; +var ID_uid_15243615 = "23137"; +</script> +<script src="http://extra.evisitanalyst.com/eva.js" type="text/javascript"></script> +<script src="http://extra.evisitanalyst.com/tag/evatrackclick.js" type="text/javascript"></script> +<noscript> + <img src="http://extra.evisitanalyst.com/eva51/collect/?userid=23137&tt=t" + border="0" alt="eVisit" width="1" height="1"> +</noscript> +<!-- END OF eVisitAnalyst CODE --> + +</body> +</html> diff --git a/templates/web/reading/header.html b/templates/web/reading/header.html new file mode 100644 index 000000000..39281ed01 --- /dev/null +++ b/templates/web/reading/header.html @@ -0,0 +1,39 @@ +<!doctype html> +<!--[if lt IE 7]><html class="no-js ie6 oldie" lang="[% lang_code %]"><![endif]--> +<!--[if IE 7]> <html class="no-js ie7 oldie" lang="[% lang_code %]"><![endif]--> +<!--[if IE 8]> <html class="no-js ie8 oldie" lang="[% lang_code %]"><![endif]--> +<!--[if gt IE 8]><!--><html class="no-js" lang="[% lang_code %]"><!--<![endif]--> + +<html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en"> +<head id="ctl00_pageHead"> +<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" /> + <title>Reading Borough Council | FixMyStreet</title> + <link rel="shortcut icon" href="[% version('/cobrands/reading/images/favicon.ico') %]"> + <link rel="stylesheet" type="text/css" href="[% version('/css/core.css') %]"> + <link rel="stylesheet" type="text/css" href="[% version('/cobrands/reading/css/reading.css') %]" /> + <link rel="stylesheet" type="text/css" href="[% version('/cobrands/reading/css/print3rdParty.css') %]" media="print"/> + <link rel="stylesheet" type="text/css" href="[% version('/cobrands/reading/css/css.css') %]" /> + + [% INCLUDE 'common_header_tags.html' %] + +</head> +<body> + <div class="wrapper"> + <div class="header" id="header"> + <p id="reading-logo" class="thirdParty"><img src="/cobrands/reading/images/reading-borough-council-logo.gif" width="176" height="38" alt="reading borough council logo" class="printMe" /><a href="http://www.reading.gov.uk/" title="Click to return to home page">Reading Borough Council</a></p> + </div> + + <div id="content"> + <div class="thirdParty"> + <!-- end of header --> + + <ul id="meta"> + [% IF c.user_exists %] + <li>[% tprintf(loc('Signed in as %s'), c.user.name || c.user.email) %] + <li><a href="/auth/sign_out">[% loc('Sign out') %]</a></li> + [% ELSE %] + <li> </li> + [% END %] + </ul> + + <div id="wrapper"><div id="mysociety"> diff --git a/templates/web/reading/reports/cobrand_stats.html b/templates/web/reading/reports/cobrand_stats.html new file mode 100644 index 000000000..80976c3a6 --- /dev/null +++ b/templates/web/reading/reports/cobrand_stats.html @@ -0,0 +1,5 @@ +<ul> + <li>Reports submitted via <a href="[% uri_for('/') %]">reading.fixmystreet.com</a>: [% stats.cobrand %]</li> + <li>Reports submitted via <a href="http://www.fixmystreet.com/">www.fixmystreet.com</a>: [% stats.main_site %]<br /><br /> + Statistics date from launch of Reading FixMyStreet.</li> +</ul> diff --git a/templates/web/southampton/report/new/category.html b/templates/web/southampton/report/new/category.html new file mode 100644 index 000000000..7c7748c78 --- /dev/null +++ b/templates/web/southampton/report/new/category.html @@ -0,0 +1,11 @@ +[% FILTER collapse %] +[% IF category_options.size %] + <label for='form_category'>[% category_label | html %]</label> + <select name='category' id='form_category'> + [% FOREACH cat_op IN category_options %] + [% NEXT IF cat_op == 'Abandoned vehicles' %] + <option value='[% cat_op | html %]'[% ' selected' IF report.category == cat_op %]>[% cat_op | html %]</option> + [% END %] + </select> +[% END %] +[% END -%] diff --git a/templates/web/southampton/report/new/form_heading.html b/templates/web/southampton/report/new/form_heading.html new file mode 100644 index 000000000..deeb63e5d --- /dev/null +++ b/templates/web/southampton/report/new/form_heading.html @@ -0,0 +1,4 @@ +<p> +<br /> +<strong>Please report only one problem at a time.</strong> +</p> diff --git a/templates/web/southampton/report/photo.html b/templates/web/southampton/report/photo.html new file mode 100644 index 000000000..07b6a8558 --- /dev/null +++ b/templates/web/southampton/report/photo.html @@ -0,0 +1,6 @@ +[% IF c.cobrand.allow_photo_display && object.photo %] +[% photo = object.get_photo_params %] +<p> + <img alt="" height="[% photo.height %]" width="[% photo.width %]" src="[% photo.url %]"> +</p> +[% END %] |