diff options
Diffstat (limited to 'templates/web/base')
32 files changed, 220 insertions, 152 deletions
diff --git a/templates/web/base/admin/body.html b/templates/web/base/admin/body.html index 84ea6840c..d5e575666 100644 --- a/templates/web/base/admin/body.html +++ b/templates/web/base/admin/body.html @@ -24,7 +24,7 @@ [% END %] [% END %] <br> - <a href="[% c.uri_for_email( '/reports/' _ body_id ) %]" class="admin-offsite-link">[% loc('List all reported problems' ) %]</a> | + <a href="[% c.uri_for_email(body.url(c)) %]" class="admin-offsite-link">[% loc('List all reported problems' ) %]</a> | <a href="[% c.uri_for( 'body', body_id, { text => 1 } ) %]">[% loc('Text only version') %]</a> </p> @@ -124,7 +124,6 @@ <form method="post" action="[% c.uri_for('body', body_id ) %]" enctype="application/x-www-form-urlencoded" accept-charset="utf-8"> - [% IF c.cobrand.moniker != 'emptyhomes' %] <div class="admin-hint"> <p> [% loc('Choose a <strong>category</strong> name that makes sense to the public (e.g., "Pothole", "Street lighting") but is helpful @@ -137,7 +136,6 @@ <p> <strong>[% loc('Category:') %] </strong><input type="text" name="category" size="30" value="[% contact.category | html %]"> </p> - [% END %] <div class="admin-hint"> <p> @@ -162,7 +160,7 @@ </p> </div> <p> - <input type="checkbox" name="confirmed" value="1" id="confirmed"[% ' checked' IF contact.confirmed %]> + <input type="checkbox" name="confirmed" value="1" id="confirmed"[% ' checked' IF contact.confirmed OR contact.confirmed == "" %]> <label for="confirmed" class="inline">[% loc('Confirmed') %]</label> </p> diff --git a/templates/web/base/alert/list-ajax.html b/templates/web/base/alert/list-ajax.html new file mode 100644 index 000000000..639af6f07 --- /dev/null +++ b/templates/web/base/alert/list-ajax.html @@ -0,0 +1,9 @@ +[% IF pretty_pc %] + [% + pretty_pc = pretty_pc | html | replace(' ', ' '); + %] +[% END %] + +<div id="alerts"> + [% INCLUDE 'alert/_list.html' %] +</div> diff --git a/templates/web/base/alert/updates.html b/templates/web/base/alert/updates.html index 5efc41bac..104bfa55a 100644 --- a/templates/web/base/alert/updates.html +++ b/templates/web/base/alert/updates.html @@ -5,16 +5,27 @@ [% INCLUDE 'errors.html' %] +<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> <form action="/alert/subscribe" method="post"> -<label class="n" for="alert_rznvy">[% loc('Email:') %]</label> -<input type="email" name="rznvy" id="alert_rznvy" value="[% email | html %]" size="30"> -<input type="hidden" name="id" value="[% problem_id | html %]"> -<input type="hidden" name="type" value="updates"> -<input type="submit" value="[% loc('Subscribe') %]"> + <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 %]" placeholder="[% loc('Your email') %]"> + <input class="green-btn" type="submit" value="[% loc('Subscribe') %]"> + </div> + + <input type="hidden" name="id" value="[% problem_id | html %]"> + <input type="hidden" name="type" value="updates"> + </fieldset> </form> diff --git a/templates/web/base/around/_error_multiple.html b/templates/web/base/around/_error_multiple.html index 15089ba6b..b47a91ca9 100644 --- a/templates/web/base/around/_error_multiple.html +++ b/templates/web/base/around/_error_multiple.html @@ -13,7 +13,7 @@ [% IF partial_token %] <p style="margin-top: 0; color: #cc0000;"> - <img align="right" src="/photo/[% partial_report.id %].jpeg" hspace="5"> + <img align="right" src="[% partial_report.photos.first.url_temp %]" 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 above :") %] </p> [% END %] diff --git a/templates/web/base/around/_main.html b/templates/web/base/around/_main.html index 1b832cb49..900dcb6aa 100644 --- a/templates/web/base/around/_main.html +++ b/templates/web/base/around/_main.html @@ -1,8 +1,3 @@ -<form action="[% c.uri_for('/around') %]" method="get" name="mapForm" id="mapForm"> - <div id="side-form"> - <div id="report-a-problem-main"> - [% pre_container_extra %] - [% INCLUDE 'around/_error_multiple.html' %] - </div> - </div> -</form> +<div class="tablewrapper"> + [% INCLUDE 'around/_error_multiple.html' %] +</div> diff --git a/templates/web/base/around/_updates.html b/templates/web/base/around/_updates.html index 8110a6c7c..458983e8f 100755 --- a/templates/web/base/around/_updates.html +++ b/templates/web/base/around/_updates.html @@ -1,12 +1,5 @@ -<h1>[% loc('Problems in this area') %]</h1> - -<p id="alert_links_area"> - <a id="email_alert" rel="nofollow" href="[% email_url | html %]"> - [%- loc('Email me new local problems') -%] -</a> | - <a href="[% rss_url | html %]" id="rss_alert"> - <span>[% rss_alt %]</span> - <img src="/i/feed.png" width="16" height="16" title="[% rss_title %]" alt="[% rss_alt %]" border="0" style="vertical-align: top"> - </a> -</p> - +<div class="shadow-wrap"> + <ul id="key-tools" class="singleton"> + <li><a class="feed" id="key-tool-around-updates" href="[% email_url | html %]">[% loc("Get updates") %]</a></li> + </ul> +</div> diff --git a/templates/web/base/around/display_location.html b/templates/web/base/around/display_location.html index d38ae6754..7bf62e528 100755 --- a/templates/web/base/around/display_location.html +++ b/templates/web/base/around/display_location.html @@ -30,7 +30,7 @@ PROCESS "maps/${map.type}.html" around_page = 1; SET bodyclass = 'mappage'; - SET rss = [ tprintf(loc('Recent local problems, %s', "%s is the site name"), site_name), rss_url ] IF c.cobrand.moniker != 'emptyhomes'; + SET rss = [ tprintf(loc('Recent local problems, %s', "%s is the site name"), site_name), rss_url ]; INCLUDE 'header.html', title => loc('Viewing a location') robots => 'noindex,nofollow'; @@ -51,7 +51,6 @@ [% map_html %] - [% IF c.cobrand.moniker != 'emptyhomes' %] <p id='sub_map_links'> [% map_sub_links %] [% IF c.req.params.no_pins %] @@ -68,7 +67,6 @@ [% END %] [% END %] </p> - [% END %] </div> @@ -82,13 +80,11 @@ [% TRY %][% INCLUDE 'around/extra_text.html' %][% CATCH file %][% END %] [% END %] - [% IF c.cobrand.moniker != 'emptyhomes' %] [% INCLUDE 'around/_updates.html' %] <section class="full-width"> [% INCLUDE "around/tabbed_lists.html" %] </section> - [% END %] </div> [% IF allow_creation %] diff --git a/templates/web/base/around/postcode_form.html b/templates/web/base/around/postcode_form.html index 601f0ee9e..9c0bc5942 100644 --- a/templates/web/base/around/postcode_form.html +++ b/templates/web/base/around/postcode_form.html @@ -6,9 +6,6 @@ question = c.cobrand.enter_postcode_text || loc('Enter a nearby street name and area'); %] - [% IF c.cobrand.moniker == 'fixmybarangay' %] - [% INCLUDE '_barangay_buttons.html' %] - [% ELSE %] <form action="[% c.uri_for('/around') %]" method="get" name="postcodeForm" id="postcodeForm"> <label for="pc">[% question %]:</label> <div> @@ -21,6 +18,5 @@ [% END %] </form> - [% END %] </div> </div> diff --git a/templates/web/base/auth/general.html b/templates/web/base/auth/general.html index d856dc19a..253dc26a1 100644 --- a/templates/web/base/auth/general.html +++ b/templates/web/base/auth/general.html @@ -14,13 +14,23 @@ <input type="hidden" name="r" value="[% c.req.params.r | html %]"> -[% IF NOT oauth_need_email AND c.config.FACEBOOK_APP_ID %] +[% IF NOT oauth_need_email AND (c.config.FACEBOOK_APP_ID OR c.config.TWITTER_KEY) %] + [% IF c.config.FACEBOOK_APP_ID %] <div class="form-box"> <button name="facebook_sign_in" id="facebook_sign_in" value="facebook_sign_in" class="btn btn--block btn--social btn--facebook"> <img alt="" src="/i/facebook-icon-32.png" width="17" height="32"> Log in with Facebook </button> </div> + [% END %] + [% IF c.config.TWITTER_KEY %] + <div class="form-box"> + <button name="twitter_sign_in" id="twitter_sign_in" value="twitter_sign_in" class="btn btn--block btn--social btn--twitter"> + <img alt="" src="/i/twitter-icon-32.png" width="17" height="32"> + Log in with Twitter + </button> + </div> + [% END %] <div id="js-social-email-hide"> [% END %] @@ -56,7 +66,7 @@ [% END %] </div> -[% IF NOT oauth_need_email AND c.config.FACEBOOK_APP_ID %] +[% IF NOT oauth_need_email AND (c.config.FACEBOOK_APP_ID OR c.config.TWITTER_KEY) %] </div> [% END %] diff --git a/templates/web/base/common_header_tags.html b/templates/web/base/common_header_tags.html index d13509a7a..99d409362 100644 --- a/templates/web/base/common_header_tags.html +++ b/templates/web/base/common_header_tags.html @@ -12,7 +12,7 @@ <script type="text/javascript" src="[% start %][% version('/js/geo.min.js') %]"></script> <script type="text/javascript" src="[% start %][% version('/js/fixmystreet.js') %]"></script> -<script type="text/javascript" src="[% start %][% version(js_override || '/js/fixmystreet-old-box.js') %]"></script> +<script type="text/javascript" src="[% start %][% version('/cobrands/fixmystreet/fixmystreet.js') %]"></script> [% IF admin %] <script src="[% start %]/js/jquery-ui/js/jquery-ui-1.10.3.custom.min.js"></script> diff --git a/templates/web/base/dashboard/index.html b/templates/web/base/dashboard/index.html index b3e1e8426..c0f94ce56 100644 --- a/templates/web/base/dashboard/index.html +++ b/templates/web/base/dashboard/index.html @@ -17,7 +17,6 @@ </hgroup> <div class="filters"> - [% IF c.cobrand.moniker != 'fixmybarangay' %] <p> <label for="ward">Ward:</label> <select name="ward"><option value=''>All</option> @@ -26,7 +25,6 @@ [% END %] </select> </p> - [% END %] <p> <label for="category">Report category:</label> diff --git a/templates/web/base/footer.html b/templates/web/base/footer.html index 3f4e5b551..7626736a0 100644 --- a/templates/web/base/footer.html +++ b/templates/web/base/footer.html @@ -1,33 +1,53 @@ - </div><!-- #mysociety .container --> - - <div id="navigation" class="container" role="navigation"> - <div class="spacer"></div> - <ul id="site-nav" class="nav"> - <li><[% IF c.req.uri.path == '/' %]span[% ELSE %]a href="/"[% END - %]>[% loc("Report a problem") %]</[% c.req.uri.path == '/' ? 'span' : 'a' %]></li>[% - %]<li><[% IF c.req.uri.path == '/my' %]span[% ELSE %]a href="/my"[% END - %]>[% loc("Your reports") %]</[% c.req.uri.path == '/my' ? 'span' : 'a' %]></li>[% - %]<li><[% IF c.req.uri.path == '/reports' %]span[% ELSE %]a href="/reports"[% 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><[% 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></div><!-- wrappers --> - -<div id="footer"> - - <p><a href="/contact">[% tprintf(loc("Contact %s", "%s is the site name"), site_name) | replace(' ', ' ') %]</a></p> - - [% INCLUDE 'front/footer-marketing.html' %] - -</div> - -[% INCLUDE 'debug_footer.html' %] + [% IF pagefooter %] + <footer role="contentinfo"> + [% INCLUDE 'front/footer-marketing.html' %] + </footer> + [% END %] + </div><!-- .content role=main --> + </div><!-- .container --> + [% IF c.cobrand.moniker == 'fixmystreet' AND bodyclass != 'mappage' %] + [% INCLUDE 'footer-nav.html' %] + [% END %] + </div><!-- .table-cell --> + + <div class="nav-wrapper"> + <div class="nav-wrapper-2"> + <div id="main-nav" role="navigation"> + <ul class="nav-menu nav-menu--mysoc"> + <li><a id="mysoc-logo" href="https://www.mysociety.org/">mySociety</a></li> + </ul> +[% + SET base = ""; + SET base = c.cobrand.base_url IF admin; +%] + <ul class="nav-menu nav-menu--main"> + <li><[% IF c.req.uri.path == '/' + %]span[% ELSE %]a href="[% base %]/"[% END %] class="report-a-problem-btn" + >[% loc("Report a problem") %]</[% c.req.uri.path == '/' ? 'span' : 'a' %]></li>[% + %]<li><[% IF c.req.uri.path == '/my' + %]span[% ELSE %]a href="[% base %]/my"[% END + %]>[% loc("Your reports") %]</[% c.req.uri.path == '/my' ? 'span' : 'a' %]></li>[% + %]<li><[% IF c.req.uri.path == '/reports' + %]span[% ELSE %]a href="[% base %]/reports"[% END + %]>[% loc("All reports") %]</[% c.req.uri.path == '/reports' ? 'span' : 'a' %]></li>[% + %]<li><[% IF c.req.uri.path == '/alert' + %]span[% ELSE %]a href="[% base %]/alert[% pc ? '/list?pc=' : '' %][% pc | uri %]"[% END + %]>[% loc("Local alerts") %]</[% c.req.uri.path == '/alert' ? 'span' : 'a' %]></li>[% + %]<li><[% IF c.req.uri.path == '/faq' + %]span[% ELSE %]a href="[% base %]/faq"[% END + %]>[% loc("Help") %]</[% c.req.uri.path == '/faq' ? 'span' : 'a' %]></li>[% + %]<li class="nav-menu__item--privacy"><[% IF c.req.uri.path == '/privacy' + %]span[% ELSE %]a href="[% base %]/privacy"[% END + %]>[% loc("Privacy") %]</[% c.req.uri.path == '/privacy' ? 'span' : 'a' %]></li> + </ul> + </div> + </div> + </div> + +<!-- [% INCLUDE 'debug_footer.html' %] --> + </div> <!-- .wrapper --> + + [% TRY %][% PROCESS 'footer_extra.html' %][% CATCH file %][% END %] </body> </html> diff --git a/templates/web/base/front/international_banner.html b/templates/web/base/front/international_banner.html deleted file mode 100644 index e69de29bb..000000000 --- a/templates/web/base/front/international_banner.html +++ /dev/null diff --git a/templates/web/base/header.html b/templates/web/base/header.html index 1d7960661..7ef37675a 100644 --- a/templates/web/base/header.html +++ b/templates/web/base/header.html @@ -1,30 +1,61 @@ +[% + SET html_att = ' lang="' _ lang_code _ '"'; + # For a right-to-left language, use the following line in your own header: + # SET html_att = html_att _ ' dir="rtl"'; +-%] <!doctype html> -<!--[if lt IE 7]><html class="no-js ie6 iel8" lang="[% lang_code %]"><![endif]--> -<!--[if IE 7]> <html class="no-js ie7 iel8" lang="[% lang_code %]"><![endif]--> -<!--[if IE 8]> <html class="no-js ie8 iel8" lang="[% lang_code %]"><![endif]--> -<!--[if gt IE 8]><!--><html class="no-js" lang="[% lang_code %]"><!--<![endif]--> +<!--[if lt IE 7]><html class="no-js ie6 iel8"[% html_att %]><![endif]--> +<!--[if IE 7]> <html class="no-js ie7 iel8"[% html_att %]><![endif]--> +<!--[if IE 8]> <html class="no-js ie8 iel8"[% html_att %]><![endif]--> +<!--[if IE 9]> <html class="no-js ie9"[% html_att %]><![endif]--> +<!--[if gt IE 9]><!--><html class="no-js"[% html_att %]><!--<![endif]--> <head> <meta name="viewport" content="initial-scale=1.0"> - <meta name="apple-mobile-web-app-capable" content="yes"> - <meta name="apple-mobile-web-app-status-bar-style" content="black"> + <meta http-equiv="X-UA-Compatible" content="IE=Edge,chrome=1"> <meta name="HandHeldFriendly" content="true"> <meta name="mobileoptimized" content="0"> [% INCLUDE 'header_opengraph.html' %] + [% SET start = c.config.ADMIN_BASE_URL IF admin; - <link rel="stylesheet" href="[% version('/css/core.css') %]"> + # For clarity, the 'fixmystreet' moniker (for fixmystreet.com) puts + # it stylesheets under fixmystreet.com + IF c.cobrand.moniker == 'fixmystreet'; + SET css_dir = 'fixmystreet.com'; + ELSE; + SET css_dir = c.cobrand.moniker; + END %] + <link rel="stylesheet" href="[% start %][% version('/cobrands/' _ css_dir _ '/base.css') %]"> + <link rel="stylesheet" href="[% start %][% version('/cobrands/' _ css_dir _ '/layout.css') %]" media="(min-width:48em)"> + [% extra_css %] + <!--[if (lt IE 9) & (!IEMobile)]> + <link rel="stylesheet" href="[% start %][% version('/cobrands/' _ css_dir _ '/layout.css') %]"> + <![endif]--> + <script src="[% start %][% version('/js/modernizr.custom.js') %]" charset="utf-8"></script> + <script src="[% start %][% version('/cobrands/fixmystreet/position_map.js') %]" charset="utf-8"></script> [% INCLUDE 'common_header_tags.html' %] - - </head> - <body> + [% extra_js %] + + [% IF c.req.uri.host == 'osm.fixmystreet.com' %] + <link rel="canonical" href="https://www.fixmystreet.com[% c.req.uri.path_query %]"> + [% END %] -<div id="wrapper"><div id="wrapper2"><div id="wrapper3"> + [% TRY %][% PROCESS 'header_extra.html' %][% CATCH file %][% END %] + + </head> + [% TRY %][% PROCESS 'set_body_class.html' %][% CATCH file %][% END %] + <body class="[% bodyclass | html IF bodyclass %]"> - [% IF NOT title AND NOT c.req.path %]<h1 id="header" role="banner">[% ELSE %]<div id="header" role="banner"><a href="/">[% END - %][% loc('FixMyStreet') %] - [%- IF NOT title AND NOT c.req.path %]</h1>[% ELSE %]</a></div>[% END %] + <div class="wrapper"> + <div class="table-cell"> + <header id="site-header" role="banner"> + <div class="container"> + [% INCLUDE 'header_logo.html' %] + <a href="#main-nav" id="nav-link">Main Navigation</a> + </div> + </header> [% IF c.user_exists %] <div id="user-meta"> @@ -37,6 +68,7 @@ [% pre_container_extra %] - <div id="mysociety" class="container" role="main"> + <div class="container"> + <div class="content[% " $mainclass" | html IF mainclass %]" role="main"> - [% INCLUDE 'debug_header.html' %] + <!-- [% INCLUDE 'debug_header.html' %] --> diff --git a/templates/web/base/header_logo.html b/templates/web/base/header_logo.html index e69de29bb..66378235a 100644 --- a/templates/web/base/header_logo.html +++ b/templates/web/base/header_logo.html @@ -0,0 +1,2 @@ + <a href="[% c.cobrand.base_url IF admin %]/" id="site-logo">[% site_name %]</a> + <a href="[% c.cobrand.base_url IF admin %]/" id="report-cta" title="[%- loc('Report a problem') -%]">[%- loc('Report') -%]</a> diff --git a/templates/web/base/index-steps.html b/templates/web/base/index-steps.html index 431791c20..0ee57bfca 100644 --- a/templates/web/base/index-steps.html +++ b/templates/web/base/index-steps.html @@ -1,26 +1,6 @@ <h2>[% loc('How to report a problem') %]</h2> <ol class="big-numbers"> -[% IF c.cobrand.moniker == 'fixmybarangay' %] - <li>Text <span class="promo-big">FMB LUZ</span> or <span class="promo-big">FMB BSN</span> followed by your report to - <ul id="promo-list"> - <li> - <span class="promo-bigger">391-FMB</span> (391362) SMART short code - </li> - <li> - <span class="promo-bigger">0908 896 8278</span> for all networks - </li> - </ul> - <div class="promo-example"> - For example:<br/> - <div> - FMB LUZ Busted streetlamp, P. Cabantan St., Pole # 12345, near Sto. Antonio Chapel - </div> - </div> - </li> - <li>Or visit the Barangay Center in person</li> - <li>Staff? <a href="/auth">Sign in</a> and click on the map! -[% ELSE %] <li>[% question %]</li> <li>[% loc('Locate the problem on a map of the area') %]</li> <li>[% loc('Enter details of the problem') %]</li> @@ -30,13 +10,10 @@ [% ELSE %] <li>[% loc('We send it to the council on your behalf') %]</li> [% END %] -[% END %] </ol> -[% IF c.cobrand.moniker != 'emptyhomes' %] <section class="full-width"> [% INCLUDE "front/stats.html" %] [% TRY %][% INCLUDE "front/tips.html" %][% CATCH file %][% END %] </section> -[% END %] diff --git a/templates/web/base/js/translation_strings.html b/templates/web/base/js/translation_strings.html index b97104f92..2171566ba 100644 --- a/templates/web/base/js/translation_strings.html +++ b/templates/web/base/js/translation_strings.html @@ -50,7 +50,7 @@ upload_max_files_exceeded: '[% loc ('Whoa there Testino! Three photos are enough.') | replace("'", "\\'") %]', upload_default_message: '[% loc ('Drag and drop photos here or <u>click to upload</u>') | replace("'", "\\'") %]', upload_cancel_confirmation: '[% loc ('Are you sure you want to cancel this upload?') | replace("'", "\\'") %]', - upload_invalid_file_type: '[% loc ('Please upload a JPEG image only') | replace("'", "\\'") %]', + upload_invalid_file_type: '[% loc ('Please upload an image only') | replace("'", "\\'") %]', report_problem_heading: '[% loc('Click map to report a problem') | replace("'", "\\'") %]' }; diff --git a/templates/web/base/my/my.html b/templates/web/base/my/my.html index dff18c025..c3911d4c1 100644 --- a/templates/web/base/my/my.html +++ b/templates/web/base/my/my.html @@ -21,9 +21,7 @@ c.uri_for('/') ) %] [% END %] -[% IF c.cobrand.moniker == 'fixmybarangay' %] - [% INCLUDE '_barangay_buttons.html' %] -[% ELSIF c.cobrand.moniker == 'hart' %] +[% IF c.cobrand.moniker == 'hart' %] [% INCLUDE '_hart_hants_note.html' %] [% END %] diff --git a/templates/web/base/questionnaire/index.html b/templates/web/base/questionnaire/index.html index 86887c163..1068e21e3 100644 --- a/templates/web/base/questionnaire/index.html +++ b/templates/web/base/questionnaire/index.html @@ -82,7 +82,7 @@ [% IF upload_fileid %] <p>[% loc('You have already attached photos to this update. Note that you can attach a maximum of 3 to this update (if you try to upload more, the oldest will be removed).') %]</p> [% FOREACH id IN upload_fileid.split(',') %] - <img align="right" src="/photo/[% id %].temp.jpeg" alt=""> + <img align="right" src="/photo/temp.[% id %]" alt=""> [% END %] [% END %] <input type="file" name="photo1" id="form_photo"> @@ -93,7 +93,6 @@ </div> [% END %] -[% IF c.cobrand.moniker != 'emptyhomes' %] <div class="js-another-questionnaire"> <p>[% loc('Would you like to receive another questionnaire in 4 weeks, reminding you to check the status?') %]</p> <p class="radio-segmented-control"> @@ -103,7 +102,6 @@ <label class="inline" for="another_no">[% loc('No') %]</label> </p> </div> -[% END %] <p><input type="submit" name="submit" value="[% loc('Submit questionnaire') %]"></p> diff --git a/templates/web/base/report/_item.html b/templates/web/base/report/_item.html index 6ae43f798..704dfd29c 100644 --- a/templates/web/base/report/_item.html +++ b/templates/web/base/report/_item.html @@ -3,7 +3,7 @@ [% IF problem.photo %] <img class="img" height="60" width="90" src="[% problem.photos.first.url_fp %]" alt=""> [% END %] - <h4>[% problem.title | html %]</h4> + <h3 class="item-list__heading">[% problem.title | html %]</h3> <small> [%- IF c.cobrand.moniker != 'fixamingata' %] [%# Default: %] [%- prettify_dt( problem.confirmed, 1 ) %] diff --git a/templates/web/base/report/_main.html b/templates/web/base/report/_main.html index a7aafb6d0..7260e619a 100644 --- a/templates/web/base/report/_main.html +++ b/templates/web/base/report/_main.html @@ -54,7 +54,7 @@ <p class="report_meta_info"> [% problem.meta_line(c) | html %] - [%- IF !problem.used_map AND c.cobrand.moniker != 'emptyhomes' %]; <strong>([% loc('there is no pin shown as the user did not use the map') %])</strong>[% END %] + [%- IF !problem.used_map %]; <strong>([% loc('there is no pin shown as the user did not use the map') %])</strong>[% END %] </p> [% IF problem.bodies_str %] [% INCLUDE 'report/_council_sent_info.html' %] diff --git a/templates/web/base/report/new/category.html b/templates/web/base/report/new/category.html index f640c548c..8cfbecdcd 100644 --- a/templates/web/base/report/new/category.html +++ b/templates/web/base/report/new/category.html @@ -4,11 +4,8 @@ category = category | lower; END; %] <label for='form_category' id="form_category_label"> - [%- IF c.cobrand.moniker == 'emptyhomes' %] - [%- loc('Property type:') %] - [%- ELSE %] [%- loc('Category') %] - [%- END -%]</label> + </label> <select name='category' id='form_category'> [% FOREACH cat_op IN category_options %] [% cat_op_lc = cat_op | lower %] diff --git a/templates/web/base/report/new/form_report.html b/templates/web/base/report/new/form_report.html index 68fb2c796..3fbf7c160 100644 --- a/templates/web/base/report/new/form_report.html +++ b/templates/web/base/report/new/form_report.html @@ -31,7 +31,7 @@ [% IF upload_fileid %] <p>[% loc('You have already attached photos to this report. Note that you can attach a maximum of 3 to this report (if you try to upload more, the oldest will be removed).') %]</p> [% FOREACH id IN upload_fileid.split(',') %] - <img align="right" src="/photo/[% id %].temp.jpeg" alt=""> + <img align="right" src="/photo/temp.[% id %]" alt=""> [% END %] [% END %] <input type="file" name="photo1" id="form_photo"> diff --git a/templates/web/base/report/new/form_user_loggedin.html b/templates/web/base/report/new/form_user_loggedin.html index a39200c72..75ff76204 100644 --- a/templates/web/base/report/new/form_user_loggedin.html +++ b/templates/web/base/report/new/form_user_loggedin.html @@ -26,11 +26,9 @@ <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') %]"> - [% IF c.cobrand.moniker != 'fixmybarangay' || c.user.from_body %] - <div class="general-notes"> - <p>[% loc('We never show your email address or phone number.') %]</p> - </div> - [% END %] + <div class="general-notes"> + <p>[% loc('We never show your email address or phone number.') %]</p> + </div> <div class="form-txt-submit-box"> <input class="green-btn" type="submit" id="submit_register" name="submit_register" value="[% loc('Submit') %]"> diff --git a/templates/web/base/report/new/form_user_loggedout.html b/templates/web/base/report/new/form_user_loggedout.html index 6657c87a1..889834580 100644 --- a/templates/web/base/report/new/form_user_loggedout.html +++ b/templates/web/base/report/new/form_user_loggedout.html @@ -1,12 +1,22 @@ -[% IF c.config.FACEBOOK_APP_ID %] +[% IF c.config.FACEBOOK_APP_ID OR c.config.TWITTER_KEY %] <h3>[% loc("Now to submit your report…") %]</h3> + [% IF c.config.FACEBOOK_APP_ID %] <div class="form-box"> <button name="facebook_sign_in" id="facebook_sign_in" value="facebook_sign_in" class="btn btn--block btn--social btn--facebook"> <img alt="" src="/i/facebook-icon-32.png" width="17" height="32"> Log in with Facebook </button> </div> + [% END %] + [% IF c.config.TWITTER_KEY %] + <div class="form-box"> + <button name="twitter_sign_in" id="twitter_sign_in" value="twitter_sign_in" class="btn btn--block btn--social btn--twitter"> + <img alt="" src="/i/twitter-icon-32.png" width="17" height="32"> + Log in with Twitter + </button> + </div> + [% END %] <div id="js-social-email-hide"> [% PROCESS 'report/new/form_user_loggedout_email.html' required = 0 %] [% ELSE %] @@ -20,6 +30,6 @@ [% PROCESS 'report/new/form_user_loggedout_by_email.html' %] </div> -[% IF c.config.FACEBOOK_APP_ID %] +[% IF c.config.FACEBOOK_APP_ID OR c.config.TWITTER_KEY %] </div> [% END %] diff --git a/templates/web/base/report/update-form.html b/templates/web/base/report/update-form.html index 3e0ac890b..29529e5a1 100644 --- a/templates/web/base/report/update-form.html +++ b/templates/web/base/report/update-form.html @@ -5,7 +5,7 @@ [% IF NOT login_success AND NOT oauth_need_email %] <h2>[% loc( 'Provide an update') %]</h2> - [% IF c.cobrand.moniker != 'emptyhomes' AND c.cobrand.moniker != 'stevenage' %] + [% IF c.cobrand.moniker != 'stevenage' %] <div class="general-notes"> [% INCLUDE 'report/updates-sidebar-notes.html' %] </div> diff --git a/templates/web/base/report/update/form_update.html b/templates/web/base/report/update/form_update.html index f7072ae18..007bd68d8 100644 --- a/templates/web/base/report/update/form_update.html +++ b/templates/web/base/report/update/form_update.html @@ -13,7 +13,7 @@ [% IF upload_fileid %] <p>[% loc('You have already attached photos to this update. Note that you can attach a maximum of 3 to this update (if you try to upload more, the oldest will be removed).') %]</p> [% FOREACH id IN upload_fileid.split(',') %] - <img align="right" src="/photo/[% id %].temp.jpeg" alt=""> + <img align="right" src="/photo/temp.[% id %]" alt=""> [% END %] [% END %] <input type="file" name="photo1" id="form_photo"> @@ -38,7 +38,7 @@ ['in progress', loc('In Progress')], ['duplicate', loc('Duplicate')], ['unable to fix', loc('Unable to fix')], ['not responsible', loc('Not Responsible')], ['fixed', loc('Fixed')] ] %] - <option [% 'selected ' IF state.0 == problem.state %] value="[% state.0 %]">[% state.1 %]</option> + <option [% 'selected ' IF state.0 == problem.state_display %] value="[% state.0 %]">[% state.1 %]</option> [% END %] </select> [% ELSE %] diff --git a/templates/web/base/report/update/form_user_loggedout.html b/templates/web/base/report/update/form_user_loggedout.html index 4176633f1..fa26eb8f4 100644 --- a/templates/web/base/report/update/form_user_loggedout.html +++ b/templates/web/base/report/update/form_user_loggedout.html @@ -1,11 +1,21 @@ -[% IF c.config.FACEBOOK_APP_ID %] +[% IF c.config.FACEBOOK_APP_ID OR c.config.TWITTER_KEY %] <h3>[% loc("Now to submit your update…") %]</h3> + [% IF c.config.FACEBOOK_APP_ID %] <div class="form-box"> <button name="facebook_sign_in" id="facebook_sign_in" value="facebook_sign_in" class="btn btn--block btn--social btn--facebook"> <img alt="" src="/i/facebook-icon-32.png" width="17" height="32"> Log in with Facebook </button> </div> + [% END %] + [% IF c.config.TWITTER_KEY %] + <div class="form-box"> + <button name="twitter_sign_in" id="twitter_sign_in" value="twitter_sign_in" class="btn btn--block btn--social btn--twitter"> + <img alt="" src="/i/twitter-icon-32.png" width="17" height="32"> + Log in with Twitter + </button> + </div> + [% END %] <div id="js-social-email-hide"> [% INCLUDE 'report/update/form_user_loggedout_email.html' required=0 %] [% ELSE %] @@ -19,6 +29,6 @@ [% INCLUDE 'report/update/form_user_loggedout_by_email.html' %] </div> -[% IF c.config.FACEBOOK_APP_ID %] +[% IF c.config.FACEBOOK_APP_ID OR c.config.TWITTER_KEY %] </div> [% END %] diff --git a/templates/web/base/report/updates.html b/templates/web/base/report/updates.html index b0a015f03..fc2ac6c78 100644 --- a/templates/web/base/report/updates.html +++ b/templates/web/base/report/updates.html @@ -28,7 +28,7 @@ [%- IF update.mark_fixed %][% update_state = loc( 'marked as fixed' ) %][% END %] [%- IF update.mark_open %][% update_state = loc( 'reopened' ) %][% END %] [%- IF !update_state && update.problem_state %] - [%- state = update.meta_problem_state %] + [%- state = update.problem_state_display %] [%- IF c.cobrand.moniker == 'bromley' OR problem.bodies_str == '2482' %] [%- SET update_state = 'marked as no further action' IF state == 'unable to fix' %] [%- SET update_state = 'marked as third party responsibility' IF state == 'not responsible' %] diff --git a/templates/web/base/reports/_rss.html b/templates/web/base/reports/_rss.html index 9756f131d..f2d164bfa 100644 --- a/templates/web/base/reports/_rss.html +++ b/templates/web/base/reports/_rss.html @@ -1,2 +1,19 @@ -<p><a href="[% rss_url %]"><img align="right" src="/i/feed.png" width="16" height="16" title="[% loc('RSS feed') %]" alt="[% tprintf(loc('RSS feed of problems in this %s'), thing) %]" border="0" hspace="4"></a> +<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 %]">[% + 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'; + ELSIF c.cobrand.is_council; + tprintf(loc('Get updates of %s problems'), thing); + 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">[% ward_text %]</a></li> + [% END %] + </ul> +</div> diff --git a/templates/web/base/reports/_ward-list.html b/templates/web/base/reports/_ward-list.html index e78ac7d90..ed341d389 100755 --- a/templates/web/base/reports/_ward-list.html +++ b/templates/web/base/reports/_ward-list.html @@ -1,9 +1,14 @@ -[% IF location == 'before' AND children.size %] -<h2 style="clear:right">[% ward_text %]</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> +[% IF children.size %] +<section id="council_wards" class="hidden-js"> +<h2>[% ward_text %]</h2> + <p>[% loc('Follow a ward link to view only reports within that ward.') %]</p> + <ul class="item-list item-list--wards full-width"> + [% FOR child IN children.values.sort('name') %] + <li class="item-list__item item-list--wards__item"> + <a href="[% child.url %]">[% child.name %]</a> + </li> + [% END %] + </ul> +</section> [% END %] + diff --git a/templates/web/base/reports/body.html b/templates/web/base/reports/body.html index dfaa98d6a..2ec409765 100755 --- a/templates/web/base/reports/body.html +++ b/templates/web/base/reports/body.html @@ -26,8 +26,6 @@ [% map_html %] -[% INCLUDE 'reports/_ward-list.html', location = 'before' %] - </div> <div id="side"> @@ -51,7 +49,7 @@ [% TRY %][% INCLUDE 'reports/cobrand_stats.html' %][% CATCH file %][% END %] -[% INCLUDE 'reports/_ward-list.html', location = 'after' %] +[% INCLUDE 'reports/_ward-list.html' %] [% IF c.cobrand.moniker == 'fixmystreet' %] <p class="promo"> |