diff options
Diffstat (limited to 'templates')
21 files changed, 207 insertions, 378 deletions
diff --git a/templates/web/barnet/footer.html b/templates/web/barnet/footer.html index 21848963e..32c6b5f7b 100644 --- a/templates/web/barnet/footer.html +++ b/templates/web/barnet/footer.html @@ -1,150 +1,51 @@ - </div> - <br class="cl"> - </div><!-- end content --> - </div><!-- end wrap --> - <div id="left-column"> - - - <div id="navigation"> - <h2>Main Menu</h2> - <ul> - <li class="section"><a href="/">FixMyStreet</a> - <ul> - <li class="section">[% c.req.uri.path == '/' ? '<strong>Report a problem</strong>' : '<a href="/">Report a problem</a>' %]</li> - <li class="section">[% c.req.uri.path == '/reports/Barnet' ? '<strong>All reports</strong>' : '<a href="/reports/Barnet">All reports</a>' %]</li> - <li class="section">[% c.req.uri.path == '/alert' ? '<strong>Local alerts</strong>' : '<a href="/alert">Local alerts</a>' %]</li> - <li class="section">[% c.req.uri.path == '/faq' ? '<strong>Help</strong>' : '<a href="/faq">Help</a>' %]</li> - </ul> - </ul> - </div> <!-- end navigation --> - - <div id="online-services"> - <h2>Online Services</h2> - <ul> - <li><a href="http://www.barnet.gov.uk/">Barnet Council</a></li> - </ul> - <!-- <p class="browse-aloud">Listen to this site using <br><a href="#">Browser Aloud</a></p> --> - </div> <!-- end online-services --> - -<!-- - <div id="useful-links"> - <h2>Useful Links</h2> - <ul> - <li><a href="http://www.barnet.gov.uk/">Council homepage</a></li> - </ul> - </div> ---> - - <div id="contact"> - <h2>Contact</h2> - <dl> - <dt>Council Address</dt> - <dd> - North London Business Park (NLBP),<br> - Oakleigh Road South,<br> - London.<br> - N11 1NP<br> - <a href="http://maps.google.co.uk/maps?f=q&hl=en&geocode=&q=N11+1NP+&sll=53.800651,-4.064941&sspn=11.823255,39.550781&ie=UTF8&ll=51.624877,-0.152156&spn=0.024244,0.077248&t=h&z=14">View map of Barnet</a> - </dd> - <dt>Phone Number</dt> - <dd>020 8359 2000</dd> - <dt>Text Number (SMS)</dt> - <dd>07781 473279</dd> - <dt>Fax Number</dt> - <dd>020 8359 4156</dd> - <dt>Typetalk</dt> - <dd>18001 020 8359 2040</dd> - <dt>Email</dt> - <dd><a href="mailto:first.contact@barnet.gov.uk">first.contact@barnet.gov.uk</a></dd> - </dl> - </div> <!-- end useful-links --> - - </div><!-- end left-column --> - - -<br class="cl"> - - <div id="pre-footer"> - - <div class="box-left"> - - <dl> - <dt>Council Address</dt> - <dd> - North London Business Park (NLBP),<br> - Oakleigh Road South,<br> - London.<br> - N11 1NP<br> - <a href="http://maps.google.co.uk/maps?f=q&hl=en&geocode=&q=N11+1NP+&sll=53.800651,-4.064941&sspn=11.823255,39.550781&ie=UTF8&ll=51.624877,-0.152156&spn=0.024244,0.077248&t=h&z=14">View map of Barnet</a> - </dd> - </dl> - <dl> - <dt>Phone Number</dt> - <dd>020 8359 2000</dd> - <dt>Text Number (SMS)</dt> - <dd>07781 473279</dd> - <dt>Fax Number</dt> - <dd>020 8359 4156</dd> - </dl> - <dl> - <dt>Typetalk</dt> - <dd>18001 020 8359 2040</dd> - <dt>Email</dt> - <dd><a href="mailto:first.contact@barnet.gov.uk">first.contact@barnet.gov.uk</a></dd> - </dl> - </div> - <div class="box-right"> - <!-- - <div class="social-bookmarking"> - <h2>Add this page to your social bookmarks:</h2> - <ul> - <li class="facebook"><a href="#">Facebook</a></li> - <li class="delicious"><a href="#">delicious</a></li> - <li class="technorati"><a href="#">Technorati</a></li> - <li class="stumbleupon"><a href="#">StumbleUpon</a></li> - <li class="google"><a href="#">Google</a></li> - <li class="digg"><a href="#">Digg</a></li> - </ul> - <p>(<a href="#">What's social bookmarking?</a>)</p> - </div> - --> - </div> - -<br class="cl"> - </div><!-- end pre-footer --> - - - - - <div id="footer"> + </div> + <!-- end of content, start of footer --> + </div> + </div> +<!-- googleoff: index --> + <div id="column_nav"> + <div class="navigation active"> + <h2><a href="/">FixMyStreet</a></h2> <ul> - <li><a href="http://www.barnet.gov.uk/copyright">Copyright</a></li> - <li><a href="http://www.barnet.gov.uk/disclaimer">Disclaimer</a></li> - <li><a href="http://www.barnet.gov.uk/privacy">Privacy Statement</a></li> - <li><a href="http://www.barnet.gov.uk/website-accessibility">Accessibility Statement</a></li> - <li><a href="http://www.barnet.gov.uk/atoz">A-Z</a></li> - <li><a href="http://www.barnet.gov.uk/faq">FAQs</a></li> - <li><a href="http://www.barnet.gov.uk/contact-us">Contact Us</a></li> - <li><a href="http://www.barnet.gov.uk/help">Help</a></li> - <li><a href="http://www.barnet.gov.uk/sitemap">Sitemap</a></li> - <li><a href="http://www.barnet.gov.uk/what%27s_on">What's On</a></li> + <li>[% c.req.uri.path == '/' ? '<strong>Report a problem</strong>' : '<a href="/">Report a problem</a>' %]</li> + <li>[% c.req.uri.path == '/reports/Barnet' ? '<strong>All reports</strong>' : '<a href="/reports/Barnet">All reports</a>' %]</li> + <li>[% c.req.uri.path == '/alert' ? '<strong>Local alerts</strong>' : '<a href="/alert">Local alerts</a>' %]</li> + <li class="lastItem">[% c.req.uri.path == '/faq' ? '<strong>Help</strong>' : '<a href="/faq">Help</a>' %]</li> </ul> - </div><!-- end footer --> - - </div><!-- end iewrap --> - -<!-- Piwik --> -<script type="text/javascript"> -var pkBaseURL = (("https:" == document.location.protocol) ? "https://piwik.mysociety.org/" : "http://piwik.mysociety.org/"); -document.write(unescape("%3Cscript src='" + pkBaseURL + "piwik.js' type='text/javascript'%3E%3C/script%3E")); -</script><script type="text/javascript"> -try { -var piwikTracker = Piwik.getTracker(pkBaseURL + "piwik.php", 12); -piwikTracker.trackPageView(); -piwikTracker.enableLinkTracking(); -} catch( err ) {} -</script><noscript><img width=1 height=1 src="http://piwik.mysociety.org/piwik.php?idsite=12" style="border:0" alt=""></noscript> -<!-- End Piwik Tag --> - - </body> -</html> + </div> + <div class="clear"></div> + </div> + <div class="clear"></div> + <div id="footer"> + <p class="addNav"> + <a href="http://www.barnet.gov.uk/copyright">Copyright</a> | <a href="http://www.barnet.gov.uk/privacy">Privacy notice</a> | <a accesskey="0" href="http://www.barnet.gov.uk/accessibility">Accessibility</a> | <a accesskey="8" href="http://www.barnet.gov.uk/terms">Disclaimer</a> | <a accesskey="3" href="http://www.barnet.gov.uk/site_map">Sitemap</a> | <a href="http://www.barnet.gov.uk/contact">Contact us</a> | <a accesskey="6" href="http://www.barnet.gov.uk/a_to_z">A - Z</a> + </p> + <p class="assocLinks"> + <a id="goto_browsealoud" href="http://www.browsealoud.co.uk" title="BrowseAloud"><span class="hidden">BrowseAloud</span></a> + <a id="goto_directgov" href="http://www.direct.gov.uk" title="DirectGov"><span class="hidden">DirectGov</span></a> + <a class="external_link" id="share_facebook" href="http://www.facebook.com/barnetcouncil" title="London Borough of Barnet on Facebook"><span class="hidden">Facebook</span></a> + <a class="external_link" id="share_twitter" href="http://www.twitter.com/barnetcouncil" title="London Borough of Barnet on Twitter"><span class="hidden">Twitter</span></a> + <a class="external_link" id="share_youtube" href="http://www.youtube.com/Barnetcouncil1" title="London Borough of Barnet on YouTube"><span class="hidden">YouTube</span></a> + <a class="external_link" id="share_flickr" href="http://www.flickr.com/photos/barnetcouncil" title="London Borough of Barnet on Flickr"><span class="hidden">Flickr</span></a> + <a class="external_link" id="share_sharethis" href="http://www.sharethis.com/barnetcouncil" title="London Borough of Barnet on ShareThis"><span class="hidden">ShareThis</span></a> + </p> + <div class="clear"></div> + <p class="hidden"> + <a accesskey="1" href="http://www.barnet.gov.uk">Homepage</a> + <a accesskey="2" href="http://www.barnet.gov.uk/whats_new" rel="nofollow">What's new</a> + <a accesskey="4" href="http://www.barnet.gov.uk/site_search" rel="nofollow">Search facility </a> + <a accesskey="5" href="http://www.barnet.gov.uk/faqs" rel="nofollow">Frequently asked questions</a> + <a accesskey="9" href="http://www.barnet.gov.uk/feedback" rel="nofollow">Feedback</a> + <a accesskey="/" href="#mast" rel="nofollow">Top of the page</a> + <a accesskey="s" href="#content" rel="nofollow">Skip to content</a> + <a accesskey="n" href="#column_nav" rel="nofollow">Skip to main navigation</a> + </p> + <div id="bottomBar"> + </div> + </div> +<!-- googleon: index --> + </div> + </div> + </div> + </body> +</html>
\ No newline at end of file diff --git a/templates/web/barnet/header.html b/templates/web/barnet/header.html index 654e3d83c..955473090 100644 --- a/templates/web/barnet/header.html +++ b/templates/web/barnet/header.html @@ -1,93 +1,60 @@ -<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd"> -<!--[if lt IE 7]><html class="ie6 oldie" lang="[% lang_code %]"><![endif]--> -<!--[if IE 7]> <html class="ie7 oldie" lang="[% lang_code %]"><![endif]--> -<!--[if IE 8]> <html class="ie8 oldie" lang="[% lang_code %]"><![endif]--> -<!--[if gt IE 8]><!--><html lang="[% lang_code %]"><!--<![endif]--> - <head> - <link rel="stylesheet" type="text/css" href="/cobrands/barnet/css/basic.css"> - - <link rel="stylesheet" type="text/css" href="[% version('/css/core.css') %]"> - <link rel="stylesheet" type="text/css" href="/cobrands/barnet/css/layout.css"> - - <!-- Preferred style sheet enabled when the page is loaded --> - <link rel="stylesheet" title="default" type="text/css" href="/cobrands/barnet/css/light.css"> - - <!-- Alternate style sheets used for the light/relaxed style --> - <link rel="alternate stylesheet" title="relaxed light" type="text/css" href="/cobrands/barnet/css/light.css"> - <link rel="alternate stylesheet" title="relaxed light" type="text/css" href="/cobrands/barnet/css/relaxed.css"> - - <!-- Alternate style sheets used for the dark style --> - <link rel="alternate stylesheet" title="dark" type="text/css" href="/cobrands/barnet/css/dark.css"> - - <!-- Alternate style sheets used for the dark/relaxed style --> - <link rel="alternate stylesheet" title="relaxed dark" type="text/css" href="/cobrands/barnet/css/dark.css"> - <link rel="alternate stylesheet" title="relaxed dark" type="text/css" href="/cobrands/barnet/css/relaxed.css"> - - - <!--[if lte IE 6]> - <link rel="stylesheet" type="text/css" href="/cobrands/barnet/css/ie.css"> - - <link rel="alternate stylesheet" title="relaxed light" type="text/css" href="/cobrands/barnet/css/ie-relaxed.css"> - - <link rel="alternate stylesheet" title="dark" type="text/css" href="/cobrands/barnet/css/ie-dark.css"> - - <link rel="alternate stylesheet" title="relaxed dark" type="text/css" href="/cobrands/barnet/css/ie-dark.css"> - <link rel="alternate stylesheet" title="relaxed dark" type="text/css" href="/cobrands/barnet/css/ie-relaxed.css"> - <![endif]--> - - <!--[if IE 7]> - <link rel="stylesheet" type="text/css" href="/cobrands/barnet/css/ie-seven.css"> - - <link rel="alternate stylesheet" title="relaxed light" type="text/css" href="/cobrands/barnet/css/ie-seven-relaxed.css"> - - <link rel="alternate stylesheet" title="relaxed dark" type="text/css" href="/cobrands/barnet/css/ie-seven-relaxed.css"> - <![endif]--> - <link rel="stylesheet" media="print" type="text/css" href="/cobrands/barnet/css/print.css"> - - <script type="text/javascript" src="[% version('/cobrands/barnet/javascript/jquery-1.2.6_common.js') %]"></script> - <script type="text/javascript" src="[% version('/cobrands/barnet/javascript/styleswitch.js') %]"></script> - <script type="text/javascript" src="[% version('/cobrands/barnet/javascript/jquery-cookie-min.js') %]"></script> - <script type="text/javascript" src="[% version('/cobrands/barnet/javascript/2008-portsurf.js') %]"></script> - - [% INCLUDE 'common_header_tags.html' %] - - </head> - <body> - - <div id="iewrap"> - <img id="print-logo" src="/cobrands/barnet/images/logo-barnet.gif" alt=""> - <div id="header"> - <a href="http://www.barnet.gov.uk/"><img src="/cobrands/barnet/images/logo-barnet.gif" alt="Barnet Logo"></a> - - <a href="#content" class="rm">Skip to Content</a> - <span class="rm">|</span> - <a href="#navigation" class="rm">Skip to Menu</a> - <span class="rm">|</span> - - <form action="http://www.barnet.gov.uk/search"> - <div class="search-input"> - <input type="hidden" name="col" value="lbb"> - <input type="hidden" name="type" value="sitesearch"> - <label for="input-0" class="rm">Search:</label> - <input type="text" value="Please enter your search" name="search" class="search"> - </div> - <div class="search-button"> - <input type="submit" value="Search" class="submit" id="input-0"> - </div> - </form> - - <div id="switcher" style="display:none"> - <p>Site preferences:</p> - <ul> - <li class="default"><a id="s1" class="styleswitch" rel="default" title="Light colours with the default layout">default</a></li> - <li class="relaxed-light"><a id="s2" class="styleswitch" rel="relaxed light" title="Light colours with the relaxed layout" href="#">relaxed light</a></li> - <li class="dark"><a id="s3" class="styleswitch" rel="dark" title="Dark colours with the default layout" href="#">dark</a></li> - <li class="relaxed-dark"><a id="s4" class="styleswitch" rel="relaxed dark" title="Dark colours with the relaxed layout" href="#">relaxed dark</a></li> - </ul> - </div><!-- end switcher --> - </div><!-- end header --> - - <div id="wrap"> - <div id="content"> +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en"> + <head> + <link rel="stylesheet" type="text/css" href="http://pledgebank.barnet.gov.uk/microsites/barnet/site/styles/standard.css" media="screen" /> +<!--[if lte IE 6]> + <link rel="stylesheet" type="text/css" href="http://pledgebank.barnet.gov.uk/microsites/barnet/site/styles/generic/ie-six.css" media="screen" /> + <link rel="stylesheet" type="text/css" href="http://pledgebank.barnet.gov.uk/microsites/barnet/site/styles/generic/ie-six-print.css" media="print" /> +<![endif]--> +<!--[if IE 7]> + <link rel="stylesheet" type="text/css" href="http://pledgebank.barnet.gov.uk/microsites/barnet/site/styles/generic/ie-seven.css" media="screen" /> +<![endif]--> +<!--[if IE 8]> + <link rel="stylesheet" type="text/css" href="http://pledgebank.barnet.gov.uk/microsites/barnet/site/styles/generic/ie-eight.css" media="screen" /> +<![endif]--> + <link rel="stylesheet" type="text/css" href="http://pledgebank.barnet.gov.uk/microsites/barnet/site/styles/generic/print.css" media="print" /> + <link rel="stylesheet" type="text/css" href="http://pledgebank.barnet.gov.uk/microsites/barnet/site/styles/generic/handheld.css" media="handheld" /> + <link rel="Shortcut Icon" type="image/x-icon" href="http://pledgebank.barnet.gov.uk/microsites/barnet/site/favicon.ico" /> + <link rel="ToC" href="http://www.barnet.gov.uk/site_map" /> + <meta name="Keywords" content="fixmystreet barnet pothole streetlights report street problem" /> + <meta name="Description" content="FixMyStreet Barnet: report problems in Barnet like graffiti, fly tipping, broken paving slabs, or street lighting" /> + + <link rel="stylesheet" type="text/css" href="[% version('/css/core.css') %]"> + <link rel="stylesheet" type="text/css" href="/cobrands/barnet/css/layout.css"> + + [% INCLUDE 'common_header_tags.html' %] + + </head> + <body> + <div id="wrapper"> + <div id="ie_wrapper"> +<!-- googleoff: index --> + <div id="mobile_name">London Borough of Barnet</div> + <div id="mast"> + <div class="pseudoH1"> + <a href="http://www.barnet.gov.uk/"><span>London Borough of Barnet</span> <img src="http://pledgebank.barnet.gov.uk/microsites/barnet/site/images/blank.gif" alt="London Borough of Barnet logo" /></a> + </div> + <ul id="skip" class="hidden"> + <li><a href="#content" rel="nofollow">Skip to content</a></li> + <li><a href="#column_nav" rel="nofollow">Skip to main navigation</a></li> + </ul> + <div class="mast_links"></div> + <span class="clear"></span> + <div id="search"></div> + <div class="clear"></div> + </div> +<!-- googleon: index --> + <div id="page_wrap"> + <div id="page"> + <div id="breadcrumb"> +<!-- googleoff:all --> + <ul> + <li><a href="/">FixMyStreet Home</a></li> + <li class="bc_end"><span>[% c.req.uri.path == '/'? 'Report a problem' : "$title" | html %]</span></li> + </ul> +<!-- googleon:all --> + </div> + <div id="content" class="withWidth fullWidth"> <div id="mysociety"> + <!-- end of header -->
\ No newline at end of file diff --git a/templates/web/default/admin/search_users.html b/templates/web/default/admin/search_users.html index b4fa2c2da..98723e6ef 100644 --- a/templates/web/default/admin/search_users.html +++ b/templates/web/default/admin/search_users.html @@ -18,7 +18,7 @@ [%- FOREACH user IN users %] <tr> <td>[% PROCESS value_or_nbsp value=user.name %]</td> - <td>[% PROCESS value_or_nbsp value=user.email %]</td> + <td><a href="[% c.uri_for( 'search_reports', user.email ) %]">[% PROCESS value_or_nbsp value=user.email %]</a></td> <td>[% PROCESS value_or_nbsp value=user.from_council %]</td> <td>[% user.flagged ? loc('Yes') : ' ' %]</td> <td><a href="[% c.uri_for( 'user_edit', user.id ) %]">[% loc('Edit') %]</a></td> diff --git a/templates/web/default/auth/general.html b/templates/web/default/auth/general.html index c2249fa46..f5e2e423f 100644 --- a/templates/web/default/auth/general.html +++ b/templates/web/default/auth/general.html @@ -34,7 +34,7 @@ <div id="form_sign_in_yes"> <p> - <label class="n" for="password_sign_in">[% loc('<strong>Yes</strong>, I have a password:') %]</label> + <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=""> </p> diff --git a/templates/web/default/common_header_tags.html b/templates/web/default/common_header_tags.html index e74ae7b70..c87f93994 100644 --- a/templates/web/default/common_header_tags.html +++ b/templates/web/default/common_header_tags.html @@ -3,7 +3,7 @@ <script type="text/javascript" src="/js/validation_strings.[% lang_code %].js?[% Math.int( date.now / 3600 ) %]"></script> -<script type="text/javascript" src="/jslib/jquery-1.7.0.min.js"></script> +<script type="text/javascript" src="/jslib/jquery-1.7.2.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> diff --git a/templates/web/default/questionnaire/creator_fixed.html b/templates/web/default/questionnaire/creator_fixed.html index 0d3181ec1..5b6d1254a 100644 --- a/templates/web/default/questionnaire/creator_fixed.html +++ b/templates/web/default/questionnaire/creator_fixed.html @@ -11,9 +11,9 @@ <p align="center"> <input type="radio" name="reported" id="reported_yes" value="Yes"[% ' checked' IF reported == 'Yes' %]> -<label for="reported_yes">[% loc('Yes') %]</label> +<label class="inline" for="reported_yes">[% loc('Yes') %]</label> <input type="radio" name="reported" id="reported_no" value="No"[% ' checked' IF reported == 'No' %]> -<label for="reported_no">[% loc('No') %]</label> +<label class="inline" for="reported_no">[% loc('No') %]</label> </p> <p><input type="submit" name="submit" value="[% loc('Submit') %]"></p> diff --git a/templates/web/default/report/display.html b/templates/web/default/report/display.html index 999d332d2..fac3ef0b2 100644 --- a/templates/web/default/report/display.html +++ b/templates/web/default/report/display.html @@ -1,7 +1,7 @@ [% PROCESS "maps/${map.type}.html"; - problem_title = problem.title _ ' - ' _ loc('Viewing a problem') | html; + problem_title = problem.title _ ' - ' _ loc('Viewing a problem'); INCLUDE 'header.html' title = problem_title rss = [ loc('Updates to this problem, FixMyStreet'), "/rss/$problem.id" ] @@ -144,7 +144,7 @@ [% END %] <p> - <label class="n" for="password_sign_in">[% loc('<strong>Yes</strong>, I have a password:') %]</label> + <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> 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 2a74a44db..9c9451914 100644 --- a/templates/web/default/report/new/fill_in_details_form.html +++ b/templates/web/default/report/new/fill_in_details_form.html @@ -137,7 +137,7 @@ [% END %] <div class="form-field"> - <label class="n" for="password_sign_in">[% loc('<strong>Yes</strong>, I have a password:') %]</label> + <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"> </div> diff --git a/templates/web/default/static/fun.html b/templates/web/default/static/fun.html deleted file mode 100644 index 00976f3ec..000000000 --- a/templates/web/default/static/fun.html +++ /dev/null @@ -1,35 +0,0 @@ -[% INCLUDE header.html - title = 'Weird and Wonderful reports' -%] - -<h1>Weird and Wonderful reports</h1> - -<p>Here are some of the best or strangest reports we’ve seen on FixMyStreet. -They’ve all been fixed, and in one case could have saved lives! -Do let us know if you find any more.</p> - -<ul style='list-style-type: none; margin:0; padding:0'> - -<li><img src='http://www.fixmystreet.com/photo/9468.jpeg' align='right' hspace=8> - <h2>Dumped Piano (right)</h2> - <p>The reporter of this problem summed it up with their report, - which consisted solely of the one character “!”. — - <a href='http://www.fixmystreet.com/report/9468'>Problem report</a> - -<li><h2>Mad Seagull</h2> - <p>“A seagull is attacking various cars within this road. He starts at around 05:45 every morning and continues until around 19:30. This causes a lot of noisy banging and wakes up children.” — - <a href='http://www.fixmystreet.com/report/2722'>Problem report</a> - -<li><img src='http://www.fixmystreet.com/photo/6553.jpeg' align='right' hspace=8> - <h2>Boxes full of cheese dumped (right)</h2> - <p>“About a dozen boxes full of mozzarella cheese have been dumped opposite 3 rufford street. if it warms up we could have nasty road topping problem (seriously there is a lot of cheese)” — - <a href='http://www.fixmystreet.com/report/6553'>Problem report</a> - -<li><h2>Dangerous Nivea Billboard</h2> - <p>“The Nivea 'Oxygen is a wonderful thing' billboard here has a device on it releasing bubbles and foam. This is blowing into the road which is both distracting and dangerous to drivers. A large ball of foam hit my windscreen unexpectedly and nearly caused me to have an accident” — - <a href='http://www.fixmystreet.com/report/7552'>Problem report</a> - -</ul> - -[% INCLUDE footer.html %] - diff --git a/templates/web/emptyhomes/report/display.html b/templates/web/emptyhomes/report/display.html index 933a05948..bcce6789d 100644 --- a/templates/web/emptyhomes/report/display.html +++ b/templates/web/emptyhomes/report/display.html @@ -1,5 +1,5 @@ [% - problem_title = loc('Viewing a problem') | html; + problem_title = loc('Viewing a problem'); INCLUDE 'header.html' title = problem_title robots = 'noindex, nofollow' diff --git a/templates/web/fiksgatami/nn/faq/faq-nn.html b/templates/web/fiksgatami/nn/faq/faq-nn.html index 058ce5355..161cfbea5 100644 --- a/templates/web/fiksgatami/nn/faq/faq-nn.html +++ b/templates/web/fiksgatami/nn/faq/faq-nn.html @@ -160,4 +160,4 @@ </dl> -[% *INCLUDE 'footer.html' %] +[% INCLUDE 'footer.html' %] diff --git a/templates/web/fixmystreet/auth/change_password.html b/templates/web/fixmystreet/auth/change_password.html deleted file mode 100644 index c10560c3e..000000000 --- a/templates/web/fixmystreet/auth/change_password.html +++ /dev/null @@ -1,39 +0,0 @@ -[% INCLUDE 'header.html', title = loc('Change Password') %] - -<h1>[% loc('Change Password') %]</h1> - -[% IF password_changed %] - <p id="fixed">[% loc('Your password has been changed') %]</p> -[% END %] - - -<form action="[% c.uri_for('change_password') %]" method="post" name="change_password" class="fieldset"> - - [% IF password_error; - - errors = { - missing => loc('Please enter a password'), - mismatch => loc('The passwords do not match'), - other => loc('Please check the passwords and try again'), - }; - - loc_password_error = errors.$password_error || errors.other; %] - <div class="form-error">[% loc_password_error %]</div> - [% END %] - - <div class="form-field"> - <label for="new_password">[% loc('Password:') %]</label> - <input type="password" name="new_password" value="[% new_password | html %]"> - </div> - <div class="form-field"> - <label for="confirm">[% loc('Again:') %]</label> - <input type="password" name="confirm" value="[% confirm | html %]"> - </div> - <div class="checkbox"> - <input type="submit" value="[% loc('Change Password') %]"> - </div> - -</form> - - -[% INCLUDE 'footer.html' %] diff --git a/templates/web/fixmystreet/auth/general.html b/templates/web/fixmystreet/auth/general.html index 585232bc5..6ecbcadc5 100644 --- a/templates/web/fixmystreet/auth/general.html +++ b/templates/web/fixmystreet/auth/general.html @@ -31,7 +31,7 @@ <div id="form_sign_in_yes" class="form-box"> <h5>[% loc('<strong>Yes</strong> I have a password') %]</h5> - <label class="hidden-js n" for="password_sign_in">[% loc('<strong>Yes</strong>, I have a password') %]</label> + <label class="hidden-js n" for="password_sign_in">[% loc('<strong>Yes</strong> I have a password') %]</label> <div class="form-txt-submit-box"> <input type="password" name="password_sign_in" id="password_sign_in" value="" placeholder="[% loc('Your password') %]"> diff --git a/templates/web/fixmystreet/auth/sign_out.html b/templates/web/fixmystreet/auth/sign_out.html deleted file mode 100644 index 3d8df60e4..000000000 --- a/templates/web/fixmystreet/auth/sign_out.html +++ /dev/null @@ -1,8 +0,0 @@ -[% INCLUDE 'header.html', title => loc('Sign out') %] - -<h1>[% loc('You have been signed out') %]</h1> - -<p>Please feel free to <a href="[% c.uri_for('/auth') %]">sign in again</a>.</p> - - -[% INCLUDE 'footer.html' %] diff --git a/templates/web/fixmystreet/auth/token.html b/templates/web/fixmystreet/auth/token.html deleted file mode 100644 index 0f44d1074..000000000 --- a/templates/web/fixmystreet/auth/token.html +++ /dev/null @@ -1,27 +0,0 @@ -[% INCLUDE 'header.html', title => loc('Confirm account') %] - -[% IF token_not_found %] - -<h1>[% loc('Error') %]</h1> - -<p>We have not been able to confirm your account - sorry. This may be because:</p> - -<ul> - <li>Link too old or already used</li> - <li>URL not copied correctly</li> - [%# FIXME - add more reasons here %] -</ul> - -[% ELSE %] - -<h1>[% loc('Please check your email') %]</h1> - -<p>[% loc("We have sent you an email containing a link to confirm your account.") %]</p> - -<p>[% loc("The confirmation email <strong>may</strong> take a few minutes to arrive — <em>please</em> be patient.") %]</p> - -<p>[% loc("If you use web-based email or have 'junk mail' filters, you may wish to check your bulk/spam mail folders: sometimes, our messages are marked that way.") %]</p> - -[% END %] - -[% INCLUDE 'footer.html' %] diff --git a/templates/web/fixmystreet/faq/faq-en-gb.html b/templates/web/fixmystreet/faq/faq-en-gb.html index 462c43564..fe899d3a2 100755 --- a/templates/web/fixmystreet/faq/faq-en-gb.html +++ b/templates/web/fixmystreet/faq/faq-en-gb.html @@ -5,8 +5,8 @@ <ul class="plain-list"> <li><a href="#faq">Frequently Asked Questions</a></li> <li><a href="#practical">Practical Questions</a></li> - <li><a href="#privacy">Privacy Questions</a></li> <li><a href="#organisation">Organisation Questions</a></li> + <li><a href="/privacy">Privacy and cookies</a></li> </ul> </aside> </div> @@ -133,22 +133,6 @@ by a user of the site.</dd> to publicise us on the web or in your local area, and why not write to your local paper to let them know about us?</dd> </dl> - <h2><a name="privacy"></a>Privacy Questions</h2> - <dl> - <dt>Who gets to see my email address?</dt> - <dd>If you submit a problem, we pass on your details, and details -of the problem, to the council contact or contacts responsible for the -area where you located the problem. Other than the council, who obviously get your -email address, only people we authorise to view the FixMyStreet administration interface -will be able to see your email address and they will never use it for anything other than -to help administer FixMyStreet. Similarly with email addresses from updates. We will never give or sell your email address to anyone else, -unless we are obliged to by law. Your name will not be published anywhere unless you let us.</dd> - <dt>Will you send nasty, brutish spam to my email address?</dt> - <dd>Never. We will email you if someone leaves an update on a -problem you’ve reported, and send you a questionnaire email four weeks -after you submit a problem, asking for a status update; we’ll only ever -send you emails in relation to your problem.</dd> - </dl> <h2><a name="organisation"></a>Organisation Questions</h2> <dl> <dt>Who built FixMyStreet?</dt> diff --git a/templates/web/fixmystreet/footer.html b/templates/web/fixmystreet/footer.html index c73c9eb2c..ada4b5d7e 100644 --- a/templates/web/fixmystreet/footer.html +++ b/templates/web/fixmystreet/footer.html @@ -25,6 +25,7 @@ </ul> </div> </div> + <p><a href="/privacy">Privacy and cookies</a></p> </footer> [% END %] </div><!-- .content role=main --> diff --git a/templates/web/fixmystreet/my/my.html b/templates/web/fixmystreet/my/my.html index 687c5686e..4793989f8 100644 --- a/templates/web/fixmystreet/my/my.html +++ b/templates/web/fixmystreet/my/my.html @@ -78,9 +78,13 @@ END %] [% END %] </small> </div> + [% IF p.photo %] + <div class="img"> + <img height="60" width="90" src="/photo/[% p.id %].fp.jpeg" alt=""> + </div> + [% END %] </a> </li> [% "</ul>" IF loop.last %] [% END %] - diff --git a/templates/web/fixmystreet/report/display.html b/templates/web/fixmystreet/report/display.html index 42b9dbdb0..0f650b7c2 100644 --- a/templates/web/fixmystreet/report/display.html +++ b/templates/web/fixmystreet/report/display.html @@ -1,7 +1,7 @@ [% PROCESS "maps/${map.type}.html"; - problem_title = problem.title _ ' - ' _ loc('Viewing a problem') | html; + problem_title = problem.title _ ' - ' _ loc('Viewing a problem'); INCLUDE 'header.html' title = problem_title rss = [ loc('Updates to this problem, FixMyStreet'), "/rss/$problem.id" ] diff --git a/templates/web/fixmystreet/static/privacy.html b/templates/web/fixmystreet/static/privacy.html new file mode 100755 index 000000000..17480f68b --- /dev/null +++ b/templates/web/fixmystreet/static/privacy.html @@ -0,0 +1,80 @@ +[% INCLUDE 'header.html', title => loc('Frequently Asked Questions'), bodyclass => 'twothirdswidthpage' %] + +<div class="sticky-sidebar"> + <aside> + <ul class="plain-list"> + <li><a href="#faq">Frequently Asked Questions</a></li> + <li><a href="#practical">Practical Questions</a></li> + <li><a href="#organisation">Organisation Questions</a></li> + <li><strong>Privacy and cookies</strong></li> + </ul> + </aside> +</div> + +<h1>Privacy, cookies, and third party services</h1> + +<p><strong>Our use of your data, cookies, and external services: what you should know, and how to opt out if you want to.</strong></p> + +<p>Summary: We care a lot about our users’ privacy. We provide details below, +and we try our hardest to look after the private data that we hold. Like many +other websites, we sometimes use cookies and Google Analytics to help us make +our websites better. These tools are very common and used by many other sites, +but they do have privacy implications, and as a charity concerned with socially +positive uses of the internet, we think it’s important to explain them in full. +If you don’t want to share your browsing activities on mySociety’s sites with +other companies, you can adjust your usage or install opt-out browser plugins. + +<h2>Privacy</h2> + + <dl> + <dt>Who gets to see my email address?</dt> + <dd>If you submit a problem, we pass on your details, and details +of the problem, to the council contact or contacts responsible for the +area where you located the problem. Other than the council, who obviously get your +email address, only people we authorise to view the FixMyStreet administration interface +will be able to see your email address and they will never use it for anything other than +to help administer FixMyStreet. Similarly with email addresses from updates. We will never give or sell your email address to anyone else, +unless we are obliged to by law. Your name will not be published anywhere unless you let us.</dd> + <dt>Will you send nasty, brutish spam to my email address?</dt> + <dd>Never. We will email you if someone leaves an update on a +problem you’ve reported, and send you a questionnaire email four weeks +after you submit a problem, asking for a status update; we’ll only ever +send you emails in relation to your problem.</dd> + </dl> + +<h2>Cookies</h2> + +<p>To make our service easier or more useful, we sometimes place small data files on your computer or mobile phone, known as cookies; many websites do this. We use this information to, for example, remember you have logged in so you don't need to do that on every page, or to measure how people use the website so we can improve it and make sure it works properly. Below, we list the cookies and services that this site can use. + +<table cellpadding=5> +<tr align="left"><th scope="col">Name</th><th scope="col">Typical Content</th><th scope="col">Expires</th></tr> +<tr><td>fixmystreet_app_session</td><td nowrap>A random unique identifier</td><td>When browser is closed, or four weeks if “Keep me signed in” is ticked</td></tr> +</table> + +<h3>Measuring website usage (Google Analytics)</h3> + +<p>We use Google Analytics to collect information about how people use this site. We do this to make sure it’s meeting its users’ needs and to understand how we could do it better. Google Analytics stores information such as what pages you visit, how long you are on the site, how you got here, what you click on, and information about your web browser. IP addresses are masked (only a portion is stored) and personal information is only reported in aggregate. We do not allow Google to use or share our analytics data for any purpose besides providing us with analytics information, and we recommend that any user of Google Analytics does the same. + +<p>If you’re unhappy with data about your visit to be used in this way, you can install the <a href="http://tools.google.com/dlpage/gaoptout">official browser plugin for blocking Google Analytics</a>. + +<p>The cookies set by Google Analytics are as follows: + +<table cellpadding=5> +<tr align="left"><th scope="col">Name</th><th scope="col">Typical Content</th><th scope="col">Expires</th></tr> +<tr><td>__utma</td><td>Unique anonymous visitor ID</td><td>2 years</td></tr> +<tr><td>__utmb</td><td>Unique anonymous session ID</td><td>30 minutes</td></tr> +<tr><td>__utmz</td><td>Information on how the site was reached (e.g. direct or via a link/search/advertisement)</td><td>6 months</td></tr> +<tr><td>__utmx</td><td>Which variation of a page you are seeing if we are testing different versions to see which is best</td><td>2 years</td></tr> +</table> + +<h4>Google’s Official Statement about Analytics Data</h4> + +<p>“This website uses Google Analytics, a web analytics service provided by Google, Inc. (“Google”). Google Analytics uses “cookies”, which are text files placed on your computer, to help the website analyze how users use the site. The information generated by the cookie about your use of the website (including your IP address) will be transmitted to and stored by Google on servers in the United States . Google will use this information for the purpose of evaluating your use of the website, compiling reports on website activity for website operators and providing other services relating to website activity and internet usage. Google may also transfer this information to third parties where required to do so by law, or where such third parties process the information on Google’s behalf. Google will not associate your IP address with any other data held by Google. You may refuse the use of cookies by selecting the appropriate settings on your browser, however please note that if you do this you may not be able to use the full functionality of this website. By using this website, you consent to the processing of data about you by Google in the manner and for the purposes set out above.”</p> + +<p><a href="http://www.mysociety.org/privacy-online/">More general information on how third party services work</a></p> + +<h2>Credits</h2> + +<p>Bits of wording taken from the <a href="http://www.gov.uk/help/cookies">gov.uk cookies page</a> (under the Open Government Licence). + +[% INCLUDE 'footer.html' pagefooter = 'yes' %] diff --git a/templates/web/fixmystreet/tracking_code.html b/templates/web/fixmystreet/tracking_code.html index b506d41c1..52018b312 100644 --- a/templates/web/fixmystreet/tracking_code.html +++ b/templates/web/fixmystreet/tracking_code.html @@ -4,6 +4,7 @@ var _gaq = _gaq || []; _gaq.push(['_setAccount', 'UA-660910-4']); _gaq.push(['_setDomainName', '.fixmystreet.com']); + _gaq.push (['_gat._anonymizeIp']); _gaq.push(['_trackPageview']); (function() { |