diff options
Diffstat (limited to 'templates')
19 files changed, 116 insertions, 39 deletions
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/admin/report_edit.html b/templates/web/default/admin/report_edit.html index 470ad311a..79207192d 100644 --- a/templates/web/default/admin/report_edit.html +++ b/templates/web/default/admin/report_edit.html @@ -43,6 +43,11 @@ [% IF problem.photo %] [% photo = problem.get_photo_params %] <li><img alt="" height="[% photo.height %]" width="[% photo.width %]" src="[% c.cobrand.base_url %][% photo.url %]"> +<br> +[% IF rotated %]Photo may be cached. View image directly to check<br>[% END %] +<input type="submit" name="rotate_photo" value="Rotate Left" /> +<input type="submit" name="rotate_photo" value="Rotate Right" /> +<br> <input type="checkbox" id="remove_photo" name="remove_photo" value="1"> <label for="remove_photo">[% loc("Remove photo (can't be undone!)") %]</label></li> [% END %] diff --git a/templates/web/default/around/display_location.html b/templates/web/default/around/display_location.html index f091de0f2..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 %] 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 e6278847d..95b59d9dd 100644 --- a/templates/web/default/common_header_tags.html +++ b/templates/web/default/common_header_tags.html @@ -1,5 +1,10 @@ +[% 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> 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/header.html b/templates/web/default/header.html index f54793fe4..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> 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.html b/templates/web/default/report/new/category.html index 6ec0eb19f..095cd7c2e 100644 --- a/templates/web/default/report/new/category.html +++ b/templates/web/default/report/new/category.html @@ -1,7 +1,7 @@ [% FILTER collapse %] [% IF category_options.size %] <label for='form_category'>[% category_label | html %]</label> - <select name='category' id='form_category'> + <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 %] diff --git a/templates/web/default/report/new/category_extras.html b/templates/web/default/report/new/category_extras.html index 479b9f46c..7be69e30c 100644 --- a/templates/web/default/report/new/category_extras.html +++ b/templates/web/default/report/new/category_extras.html @@ -12,13 +12,13 @@ <div class="form-field"> <label for="form_[% meta_name %]">[% meta.description _ ':' %]</label> [% IF meta.exists('values') %] - <select name="[% meta_name %]" id="form_[% meta_name %]"> + <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 %]"> + <input type="text" value="[% report_meta.$meta_name | html %]" name="[% meta_name %]" id="form_[% meta_name %]"[% meta.required == 'true' ? ' required' : '' %]> [% END %] </div> [%- END %] 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 e2d8cb3ec..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 %] @@ -122,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' %] @@ -136,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"> @@ -151,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> @@ -173,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> @@ -201,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/updates.html b/templates/web/default/report/updates.html index 803ed197e..4fd3c75d4 100644 --- a/templates/web/default/report/updates.html +++ b/templates/web/default/report/updates.html @@ -18,18 +18,18 @@ [%- ", " _ tprintf(loc( 'marked as %s' ), update.meta_problem_state) IF update.problem_state %] </em></p> - [% IF c.cobrand.allow_update_reporting %] - <p> - <a rel="nofollow" class="unsuitable-problem" href="[% c.uri_for( '/contact?id=' _ update.problem_id _ ';update_id' _ update.id ) %]">[% loc('Offensive? Unsuitable? Tell us') %]</a> - </p> - [% END %] - </div> <div class="update-text"> [% add_links( update.text ) | html_para %] [% INCLUDE 'report/photo.html' object=update %] + + [% IF c.cobrand.allow_update_reporting %] + <p align="right"> + <small><a rel="nofollow" class="unsuitable-problem" href="[% c.uri_for( '/contact', { id => update.problem_id, update_id => update.id } ) %]">[% loc('Offensive? Unsuitable? Tell us') %]</a></small> + </p> + [% END %] </div> </div> [% '</div>' IF loop.last %] diff --git a/templates/web/emptyhomes/header.html b/templates/web/emptyhomes/header.html index 7f4106f85..d7fbcb6af 100644 --- a/templates/web/emptyhomes/header.html +++ b/templates/web/emptyhomes/header.html @@ -6,7 +6,7 @@ <head> <link rel="stylesheet" type="text/css" href="[% version('/css/core.css') %]"> - <link rel="stylesheet" type="text/css" href="/cobrands/emptyhomes/css.css"> + <link rel="stylesheet" type="text/css" href="[% version('/cobrands/emptyhomes/css.css') %]"> [% INCLUDE 'common_header_tags.html' %] </head> diff --git a/templates/web/emptyhomes/index.html b/templates/web/emptyhomes/index.html index 34cb0a1c0..7c4d6881b 100644 --- a/templates/web/emptyhomes/index.html +++ b/templates/web/emptyhomes/index.html @@ -1,5 +1,27 @@ [% 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> + +<div class="video"><object id="flashObj" width="480" height="270" classid="clsid:D27CDB6E-AE6D-11cf-96B8-444553540000" codebase="http://download.macromedia.com/pub/shockwave/cabs/flash/swflash.cab#version=9,0,47,0"><param name="movie" value="http://c.brightcove.com/services/viewer/federated_f9?isVid=1&isUI=1" /><param name="bgcolor" value="#FFFFFF" /><param name="flashVars" value="@videoPlayer=1293919404001&playerID=1242807532001&playerKey=AQ~~,AAABIWs5YNk~,K8Yb_Dc0PlMA8gCUiCBbnEcXR1bU7HRm&domain=embed&dynamicStreaming=true" /><param name="base" value="http://admin.brightcove.com" /><param name="seamlesstabbing" value="false" /><param name="allowFullScreen" value="true" /><param name="swLiveConnect" value="true" /><param name="allowScriptAccess" value="always" /><embed src="http://c.brightcove.com/services/viewer/federated_f9?isVid=1&isUI=1" bgcolor="#FFFFFF" flashVars="@videoPlayer=1293919404001&playerID=1242807532001&playerKey=AQ~~,AAABIWs5YNk~,K8Yb_Dc0PlMA8gCUiCBbnEcXR1bU7HRm&domain=embed&dynamicStreaming=true" base="http://admin.brightcove.com" name="flashObj" width="480" height="270" seamlesstabbing="false" type="application/x-shockwave-flash" allowFullScreen="true" allowScriptAccess="always" swLiveConnect="true" pluginspage="http://www.macromedia.com/shockwave/download/index.cgi?P1_Prod_Version=ShockwaveFlash"></embed></object></div> + +<p>We’re really excited to be offical advisors to the forthcoming new +empty homes TV series<br><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 class="channel4"> + +<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><a href="http://itunes.apple.com/gb/app/empty-homes-spotter/id482550587?mt=8"><img src="/i/appstore.png" hspace="5" alt="" align="right">Download the iPhone app</a> from the App Store.</li> + +</ul> + +[% ELSE %] + [% IF error %] <p class="error">[% error %]</p> [% END %] @@ -37,4 +59,6 @@ </div> +[% END %] + [% INCLUDE 'footer.html' %] diff --git a/templates/web/reading/footer.html b/templates/web/reading/footer.html index 2d58eb0c7..ec523aa97 100644 --- a/templates/web/reading/footer.html +++ b/templates/web/reading/footer.html @@ -28,5 +28,20 @@ <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/reports/cobrand_stats.html b/templates/web/reading/reports/cobrand_stats.html index becb724cf..80976c3a6 100644 --- a/templates/web/reading/reports/cobrand_stats.html +++ b/templates/web/reading/reports/cobrand_stats.html @@ -1,4 +1,5 @@ <ul> - <li>Reports submitted via <a href="[% uri_for('/') %]">reading.fixmystreet.com</a>: [% cobrand_count %]</li> - <li>Reports submitted via <a href="http://www.fixmystreet.com/">www.fixmystreet.com</a>: [% total_count %]</li> + <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/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 %] |