diff options
Diffstat (limited to 'templates')
56 files changed, 1257 insertions, 359 deletions
diff --git a/templates/email/default/login.txt b/templates/email/default/login.txt new file mode 100644 index 000000000..c873e82af --- /dev/null +++ b/templates/email/default/login.txt @@ -0,0 +1,12 @@ +Subject: [% loc('Your FixMyStreet.com account details') %] + +Please click on the link below to confirm your email address. Then you will be able to view your problem reports. + +[% c.uri_for( '/auth/token', token ) %] + +We will never give away or sell your email address to anyone else without your permission. + +Yours, + the FixMyStreet.com team + + diff --git a/templates/emails/partial b/templates/email/default/partial.txt index d754744b5..279d76ea0 100644 --- a/templates/emails/partial +++ b/templates/email/default/partial.txt @@ -1,12 +1,12 @@ Subject: Confirm your report on FixMyStreet -Hi<?=$values['name']?>, +Hi [% report.name || report.email %], To confirm the report you have uploaded to FixMyStreet via -<?=$values['service']?>, and to check or add any details, +[% report.service %], and to check or add any details, please visit the following URL: -<?=$values['url']?> +[% token_url %] Thanks! diff --git a/templates/email/default/problem-confirm.txt b/templates/email/default/problem-confirm.txt new file mode 100644 index 000000000..e16c90037 --- /dev/null +++ b/templates/email/default/problem-confirm.txt @@ -0,0 +1,20 @@ +Subject: Confirm your problem on FixMyStreet + +Hi [% report.user.name %], + +Please click on the link below to confirm the problem you just +added to FixMyStreet: + +[% token_url %] + +If your email program does not let you click on this link, +copy and paste it into your web browser and press return. + +Your problem had the title: +[% report.title %] + +And details: +[% report.detail %] + +Yours, +The FixMyStreet team diff --git a/templates/email/default/test.txt b/templates/email/default/test.txt new file mode 100644 index 000000000..1200b8726 --- /dev/null +++ b/templates/email/default/test.txt @@ -0,0 +1,15 @@ +Subject: test email ☺ +From: bad-sender@duff.com + +Hello, + +This is a test email where foo: [% foo %]. + +utf8: 我们应该能够无缝处理UTF8编码 + + indented_text + +long line: Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum. + +Yours, + FixMyStreet. diff --git a/templates/website/cobrands/barnet/footer b/templates/web/barnet/footer.html index 40b9adce0..93172f2b9 100644 --- a/templates/website/cobrands/barnet/footer +++ b/templates/web/barnet/footer.html @@ -1,151 +1,151 @@ - </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">{{ ($ENV{REQUEST_URI} eq '/') ? '<strong>Report a problem</strong>' : '<a href="/">Report a problem</a>' }}</li>
- <li class="section">{{ ($ENV{REQUEST_URI} eq '/reports/Barnet') ? '<strong>All reports</strong>' : '<a href="/reports/Barnet">All reports</a>' }}</li>
- <li class="section">{{ ($ENV{REQUEST_URI} eq '/alert') ? '<strong>Local alerts</strong>' : '<a href="/alert">Local alerts</a>' }}</li>
- <li class="section">{{ ($ENV{REQUEST_URI} eq '/faq') ? '<strong>Help</strong>' : '<a href="/faq">Help</a>' }}</li>
- <li class="section">{{ ($ENV{REQUEST_URI} eq '/contact') ? '<strong>Contact</strong>' : '<a href="/contact">Contact</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">
- <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>
- </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> + <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 == '/report/new' ? '<strong>Report a problem</strong>' : '<a href="/report/new">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> + <li class="section">[% c.req.uri.path == '/contact' ? '<strong>Contact</strong>' : '<a href="/contact">Contact</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"> + <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> + </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> diff --git a/templates/website/cobrands/barnet/header b/templates/web/barnet/header.html index cd274df7b..8346ea344 100644 --- a/templates/website/cobrands/barnet/header +++ b/templates/web/barnet/header.html @@ -1,98 +1,93 @@ -<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<html lang="{{ $lang_code }}">
- <head>
- <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
- <link rel="stylesheet" type="text/css" href="/cobrands/barnet/css/basic.css">
-
- <style type="text/css">
- @import url(/css/core.css);
- @import url(/cobrands/barnet/css/layout.css);
- </style>
-
-
- <!-- 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="/cobrands/barnet/javascript/jquery-1.2.6_common.js"></script>
-<script type="text/javascript" src="/cobrands/barnet/javascript/styleswitch.js"></script>
-<script type="text/javascript" src="/cobrands/barnet/javascript/jquery-cookie-min.js"></script>
-<script type="text/javascript" src="/cobrands/barnet/javascript/2008-portsurf.js"></script>
-<script type="text/javascript" src="/yui/utilities.js"></script>
-<script type="text/javascript" src="/js.js"></script>
-{{ $map_js }}
-
-{{ $rss }}
-
- <title>{{ $title }}{{ $site_title }}</title>
- </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">
- <div id="mysociety">
-
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd"> +<html lang="[% lang_code %]"> + <head> + <link rel="stylesheet" type="text/css" href="/cobrands/barnet/css/basic.css"> + + <style type="text/css"> + @import url(/css/core.css); + @import url(/cobrands/barnet/css/layout.css); + </style> + + + <!-- 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="/cobrands/barnet/javascript/jquery-1.2.6_common.js"></script> + <script type="text/javascript" src="/cobrands/barnet/javascript/styleswitch.js"></script> + <script type="text/javascript" src="/cobrands/barnet/javascript/jquery-cookie-min.js"></script> + <script type="text/javascript" src="/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"> + <div id="mysociety"> + diff --git a/templates/web/default/about/about.html b/templates/web/default/about/about.html new file mode 100644 index 000000000..7219f6320 --- /dev/null +++ b/templates/web/default/about/about.html @@ -0,0 +1,9 @@ +[% INCLUDE 'header.html', title => loc('About Us') %] + +<h1>[% loc('About us') %]</h1> + +<h2>FixMyStreet.com</h2> + +[%# FIXME - put in blurb here %] + +[% INCLUDE 'footer.html' %]
\ No newline at end of file diff --git a/templates/web/default/auth/change_password.html b/templates/web/default/auth/change_password.html new file mode 100644 index 000000000..d4a7f107b --- /dev/null +++ b/templates/web/default/auth/change_password.html @@ -0,0 +1,41 @@ +[% INCLUDE 'header.html', title => loc('Change Password') %] + +<h1>[% loc('Change Password') %]</h1> + +[% IF password_changed %] + <p>Your password has been changed!</p> +[% END %] + + +<form action="[% c.uri_for('change_password') %]" method="post" name="change_password"> + + [% 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; + END %] + + + <div> + <span class="error">[% loc_password_error %]</span><br> + <label for="new_password">[% loc('Password:') %]</label> + <input type="password" name="new_password" value="[% new_password | html %]"> + <br> + + <label for="confirm">[% loc('Again:') %]</label> + <input type="password" name="confirm" value="[% confirm | html %]"> + <br> + + <label for="login"> </label> + <input type="submit" value="[% loc('Change Password') %]"> + </div> + +</form> + + +[% INCLUDE 'footer.html' %] diff --git a/templates/web/default/auth/general.html b/templates/web/default/auth/general.html new file mode 100644 index 000000000..3d80a1049 --- /dev/null +++ b/templates/web/default/auth/general.html @@ -0,0 +1,53 @@ +[% INCLUDE 'header.html', title => loc('Login or create an account') %] + +<h1>[% loc('Login or create an account') %]</h1> + + +<form action="[% c.uri_for() %]" method="post" name="general_auth"> + + [% IF email_error; + + # other keys include fqdn, mxcheck if you'd like to write a custom error message + + errors = { + missing => loc('Please enter an email address'), + other => loc('Please check your email address is correct') + }; + + loc_email_error = errors.$email_error || errors.other; + END %] + + + <div> + + [% IF loc_email_error %] + <span class="error">[% loc_email_error %]</span><br> + [% ELSIF login_error %] + <span class="error">Email or password wrong - please try again.</span><br> + [% END %] + + <label for="email">[% loc('Email:') %]</label> + <input type="text" name="email" value="[% email || '' | html %]"> + <br> + + <label for="password">[% loc('Password:') %]</label> + <input type="password" name="password" value=""> + <br> + + <label for="remember_me"> </label> + <input type="checkbox" name="remember_me" value='1' [% 'checked="checked"' IF remember_me %]> + Remember me - do not use on a public computer + <br> + + <label for="login"> </label> + <input type="submit" name="login" value="[% loc('Log me in') %]"> + + <h3>I don't have an account, or I've forgotten my password...</h3> + <label for="email_login"> </label> + <input type="submit" name="email_login" value="[% loc('Email the details I need to the address I entered above') %]"> + </div> + +</form> + + +[% INCLUDE 'footer.html' %] diff --git a/templates/web/default/auth/logout.html b/templates/web/default/auth/logout.html new file mode 100644 index 000000000..9f3390f0a --- /dev/null +++ b/templates/web/default/auth/logout.html @@ -0,0 +1,8 @@ +[% INCLUDE 'header.html', title => loc('Logout') %] + +<h1>[% loc('You have been logged out') %]</h1> + +<p>Please feel free to <a href="[% c.uri_for('/auth/') %]">login again</a>.</p> + + +[% INCLUDE 'footer.html' %]
\ No newline at end of file diff --git a/templates/web/default/auth/token.html b/templates/web/default/auth/token.html new file mode 100644 index 000000000..16dfbb11c --- /dev/null +++ b/templates/web/default/auth/token.html @@ -0,0 +1,25 @@ +[% 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 you email') %]</h1> + +<p>We have sent you an email containing a link to confirm your account.</p> + +<p>If you do not receive the email in the next few minutes please check your spam folder.</p> + +[% END %] + +[% INCLUDE 'footer.html' %]
\ No newline at end of file diff --git a/templates/web/default/common_header_tags.html b/templates/web/default/common_header_tags.html new file mode 100644 index 000000000..9b8dc8515 --- /dev/null +++ b/templates/web/default/common_header_tags.html @@ -0,0 +1,21 @@ +<meta http-equiv="content-type" content="text/html; charset=utf-8"> +<script type="text/javascript" src="/yui/utilities.js"></script> +<script type="text/javascript" src="/js.js"></script> + +[% map_js %] +[% extra_js_verbatim %] + +[% robots %] + +[% IF rss %] + <link rel="alternate" type="application/rss+xml" title="[% rss.0 %]" href="[% rss.1 %]"> +[% END %] +[% legacy_rss %] + +<title> + [% IF legacy_title %] + [% legacy_title %] + [% ELSE %] + [% title | html %] :: [% c.cobrand.site_title %] + [% END %] +</title> diff --git a/templates/web/default/debug_footer.html b/templates/web/default/debug_footer.html new file mode 100644 index 000000000..c19360132 --- /dev/null +++ b/templates/web/default/debug_footer.html @@ -0,0 +1,38 @@ +[% IF c.config.STAGING_SITE %] +<hr clear="both"> +<ul> + <li>cobrand.moniker: [% c.cobrand.moniker %]</li> + <li>additional_template_paths: [% additional_template_paths.join(', ') || '--empty--' %]</li> + <li>lang_code: [% lang_code %]</li> + <li>user.id: [% c.user.id || '--not logged in--' %]</li> +</ul> + +<style> + #overrides_form { + font-size: 80%; + } + #overrides_form label { + float: left; + text-align: right; + padding-right: 0.5em; + width: 12em; + } + +</style> + +<!-- Use a post so that we don't clutter up the url --> +<form action="" method="post" id="overrides_form" name="overrides_form"> + + <label for="_override_clear_all">Clear all overrides:</label> + <input type="checkbox" name="_override_clear_all" id="_override_clear_all" value="1"><br> + + [% FOREACH k IN ['cobrand_moniker', 'lang'] %] + <label for="override_[% k %]">[% k %]:</label> + <input type="text" name="_override_[% k %]" id="override_[% k %]" value="[% c.get_override(k)%]"><br> + [% END %] + + <label> </label><input type="submit" value="Change overrides"> +</form> + +[% END %] + diff --git a/templates/web/default/debug_header.html b/templates/web/default/debug_header.html new file mode 100644 index 000000000..247e55128 --- /dev/null +++ b/templates/web/default/debug_header.html @@ -0,0 +1,5 @@ +[% IF c.config.STAGING_SITE %] + <p class="error"> + [% loc("This is a developer site; things might break at any time, and the database will be periodically deleted.") %] + </p> +[% END %] diff --git a/templates/web/default/email_sent.html b/templates/web/default/email_sent.html new file mode 100644 index 000000000..bcfcf8617 --- /dev/null +++ b/templates/web/default/email_sent.html @@ -0,0 +1,34 @@ +[% INCLUDE 'header.html', title => loc('Create a report') %] + +[% + messages = { + problem => { + action => loc('your problem will not be posted'), + worry => loc("we'll hang on to your problem report while you're checking your email."), + }, + update => { + action => loc('your update will not be posted'), + worry => loc("we'll hang on to your update while you're checking your email."), + }, + alert => { + action => loc('your alert will not be activated'), + worry => loc("we'll hang on to your alert while you're checking your email."), + }, + tms => { + action => 'your expression of interest will not be registered', + worry => "we'll hang on to your expression of interest while you're checking your email.", + } + } +%] +<h1>Nearly Done! Now check your email...</h1> + +<p>The confirmation email <strong>may</strong> take a few minutes to arrive — <em>please</em> be patient.</p> + +<p>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> + +<p>You must now click the link in the email we've just sent you — if you do not, [% messages.$email_type.action %].</p> + +<p>(Don't worry — [% messages.$email_type.worry %])</p> + + +[% INCLUDE 'footer.html' %]
\ No newline at end of file diff --git a/templates/web/default/errors/page_not_found.html b/templates/web/default/errors/page_not_found.html new file mode 100644 index 000000000..92ceb3106 --- /dev/null +++ b/templates/web/default/errors/page_not_found.html @@ -0,0 +1,7 @@ +<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML 2.0//EN"> +<html><head> +<title>404 Not Found</title> +</head><body> +<h1>Not Found</h1> +<p>The requested URL [% c.req.uri.path %] was not found on this server.</p> +</body></html> diff --git a/templates/website/faq-en-gb b/templates/web/default/faq/faq-en-gb.html index 117a9bfa7..7fb1edb19 100755 --- a/templates/website/faq-en-gb +++ b/templates/web/default/faq/faq-en-gb.html @@ -1,3 +1,5 @@ +[% INCLUDE 'header.html', title => loc('Frequently Asked Questions') %] + <h1>Frequently Asked Questions</h1> <dl> <dt>What is FixMyStreet?</dt> @@ -207,3 +209,4 @@ our servers). Let us know if we’ve missed anyone.</dd> </dl> +[% INCLUDE 'footer.html' %] diff --git a/templates/web/default/footer.html b/templates/web/default/footer.html new file mode 100644 index 000000000..90c419734 --- /dev/null +++ b/templates/web/default/footer.html @@ -0,0 +1,24 @@ +</div> +</div> + +<h2 class="v">[% loc('Navigation') %]</h2> +<ul id="navigation"> +<li><a href="/report/new" >[% loc("Report a problem") %]</a></li> +<li><a href="/reports" >[% loc("All reports") %]</a></li> +<li><a href="[% c.uri_for('/alert', {pc => pc}) | html %]">[% loc("Local alerts") %]</a></li> +<li><a href="/faq" >[% loc("Help") %]</a></li> +<li><a href="/contact" >[% loc("Contact") %]</a></li> +</ul> + +[% loc('<a href="http://www.mysociety.org/"><img id="logo" width="133" height="26" src="/i/mysociety-dark.png" alt="View mySociety.org"><span id="logoie"></span></a>') %] + +<p id="footer"> + [% loc('Built by <a href="http://www.mysociety.org/">mySociety</a>, using some <a href="http://github.com/mysociety/fixmystreet">clever</a> <a href="https://secure.mysociety.org/cvstrac/dir?d=mysociety/services/TilMa">code</a>.') %] +</p> + +[% INCLUDE 'tracking_code.html' %] + +[% INCLUDE 'debug_footer.html' %] + +</body> +</html> diff --git a/templates/web/default/header.html b/templates/web/default/header.html new file mode 100644 index 000000000..491329c5d --- /dev/null +++ b/templates/web/default/header.html @@ -0,0 +1,21 @@ +<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd"> +<html lang="[% lang_code %]"> + <head> + + [% INCLUDE 'common_header_tags.html' %] + + <style type="text/css">@import url("/css/core.css"); @import url("/css/main.css");</style> + <!--[if LT IE 7]> + <style type="text/css">@import url("/css/ie6.css");</style> + <![endif]--> + + </head> + <body> + + <div id="header"> + <a href="/">[% loc('Fix<span id="my">My</span>Street') %]</a> + </div> + + <div id="wrapper"><div id="mysociety"> + + [% INCLUDE 'debug_header.html' %] diff --git a/templates/web/default/my/my.html b/templates/web/default/my/my.html new file mode 100644 index 000000000..03b180a3a --- /dev/null +++ b/templates/web/default/my/my.html @@ -0,0 +1,18 @@ +[% INCLUDE 'header.html', title => loc('My Reports') %] + +<h1>[% loc('Your Reports') %]</h1> + +[% FOREACH p = c.user.problems %] + [% "<ul>" IF loop.first %] + + <li><a href="[% c.uri_for( '/report', p.id ) %]">[% p.title | html %]</a> ([% loc(p.state) %])</li> + + [% "</ul>" IF loop.last %] +[% END %] + + +[%# FIXME - put in blurb here %] + +<a href="/auth/change_password">change password</a> + +[% INCLUDE 'footer.html' %]
\ No newline at end of file diff --git a/templates/web/default/report/new/all_councils_text.html b/templates/web/default/report/new/all_councils_text.html new file mode 100644 index 000000000..2cd90b213 --- /dev/null +++ b/templates/web/default/report/new/all_councils_text.html @@ -0,0 +1,8 @@ +<p> +[% + tprintf( + loc('All the information you provide here will be sent to <strong>%s</strong>. The subject and details of the problem will be public, plus your name if you give us permission.'), + all_council_names.join( '</strong>' _ loc(' or ') _ '<strong>' ) + ); +%] +</p> diff --git a/templates/web/default/report/new/fill_in_details.html b/templates/web/default/report/new/fill_in_details.html new file mode 100644 index 000000000..7cf24f619 --- /dev/null +++ b/templates/web/default/report/new/fill_in_details.html @@ -0,0 +1,152 @@ +[% INCLUDE 'header.html', title => loc('Reporting a problem') %] + +[% map_html %] + +<h1>[% loc('Reporting a problem') %]</h1> + +[% + IF report.used_map; + loc('You have located the problem at the point marked with a purple pin on the map. If this is not the correct location, simply click on the map again. '); + END; +%] + +[% IF area_ids_to_list.size == 0 %] + [% INCLUDE 'report/new/no_councils_text.html' %] +[% ELSIF area_ids_to_list.size == all_councils.size %] + [% INCLUDE 'report/new/all_councils_text.html' %] +[% ELSE %] + [% INCLUDE 'report/new/some_councils_text.html' %] +[% END %] + + +[% IF skipped %] + [% loc('Please fill in the form below with details of the problem, and describe the location as precisely as possible in the details box.') %] +[% ELSE %] + [% INCLUDE 'report/new/fill_in_details_text.html' %] +[% END %] + +[% FOREACH error IN errors %] + [% '<ul class="error">' IF loop.first %] + <li>[% error %]</li> + [% '</ul>' IF loop.last %] +[% END %] + +<div id="problem_form"> + +[% INCLUDE 'report/new/form_heading.html' %] + +<div id="fieldset"> + + + + + +[% IF field_errors.council %] + <div class='form-error'>[% field_errors.council %]</div> +[% END %] + +[% IF category_options.size %] + [% IF field_errors.category %] + <div class='form-error'>[% field_errors.category %]</div> + [% END %] + + <div class="form-field"> + <label for="category">[% category_label | html %]</label> + <select name="category"> + [%- FOREACH cat_op IN category_options %] + <option value="[% cat_op | html %]"[% ' selected' IF report.category == cat_op %]>[% cat_op | html %]</option> + [%- END %] + </select> + </div> +[% END %] + +[% IF field_errors.title %] + <div class='form-error'>[% field_errors.title %]</div> +[% END %] + +<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"> +</div> + +[% IF field_errors.detail %] + <div class='form-error'>[% field_errors.detail %]</div> +[% END %] + +<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> +</div> + +[% IF field_errors.photo %] + <div class='form-error'>[% field_errors.photo %]</div> +[% END %] + +<div class='form-field'> +[% IF upload_fileid || report.photo %] + <p>[% loc('You have already attached a photo to this report, attaching another one will replace it.') %]</p> + [% IF upload_fileid %] + <input type="hidden" name="upload_fileid" value="[% upload_fileid %]" /> + [% END %] + [% IF report.photo %] + <img align="right" src="/photo?id=[% report.id %]" hspace="5"> + [% END %] +[% END %] + + <label for="form_photo">[% loc('Photo:') %]</label> + <input type="file" name="photo" id="form_photo" > +</div> + + +[% IF field_errors.name %] + <div class='form-error'>[% field_errors.name %]</div> +[% END %] + +<div class='form-field'> + <label for="form_name">[% loc('Name:') %]</label> + <input type="text" value="[% report.name | html %]" name="name" id="form_name" size="25"> +</div> + + +<div class="checkbox"> + + [%# if there is nothing in the name field then set check box as default on form %] + <input type="checkbox" name="may_show_name" id="form_may_show_name" value="1"[% ' checked' IF !report.anonymous || !report.name %]> + + <!-- FIXME - empythomes should be 'Can we show your name on the site?'--> + <label for="form_may_show_name">[% loc('Can we show your name publicly?') %]</label> + <small>[% loc('(we never show your email address or phone number)') %]</small> +</div> + +[% IF field_errors.email %] + <div class='form-error'>[% field_errors.email %]</div> +[% END %] + +<div class="form-field"> + <label for="form_email">[% loc('Email:') %]</label> + <input type="text" value="[% report_user.email | html %]" name="email" id="form_email" size="25"> +</div> + +<div> + <label for="form_phone">[% loc('Phone:') %]</label> + <input type="text" value="[% report_user.phone | html %]" name="phone" id="form_phone" size="15"> + <small>[% loc('(optional)') %]</small> +</div> + +[% INCLUDE 'report/new/notes.html' %] + +[% IF partial_token %] + <input type="hidden" name="partial" value="[% partial_token.token %]"> +[% END %] + +<p id="problem_submit"> + <input type="hidden" name="submit_problem" value="1"> + <input type="submit" value="[% loc('Submit') %]"> +</p> + +</div> +</div> + +[% map_end %] + +[% INCLUDE 'footer.html' %]
\ No newline at end of file diff --git a/templates/web/default/report/new/fill_in_details_text.html b/templates/web/default/report/new/fill_in_details_text.html new file mode 100644 index 000000000..44c60ed6e --- /dev/null +++ b/templates/web/default/report/new/fill_in_details_text.html @@ -0,0 +1,10 @@ +[% + IF details != 'none'; + loc('Please fill in details of the problem below. The council won\'t be able +to help unless you leave as much detail as you can, so please describe the exact location of +the problem (e.g. on a wall), what it is, how long it has been there, a description (and a +photo of the problem if you have one), etc.'); + ELSE; + loc('Please fill in details of the problem below.'); + END; +%] diff --git a/templates/web/default/report/new/form_heading.html b/templates/web/default/report/new/form_heading.html new file mode 100644 index 000000000..e69de29bb --- /dev/null +++ b/templates/web/default/report/new/form_heading.html diff --git a/templates/web/default/report/new/no_councils_text.html b/templates/web/default/report/new/no_councils_text.html new file mode 100644 index 000000000..c3dade610 --- /dev/null +++ b/templates/web/default/report/new/no_councils_text.html @@ -0,0 +1,20 @@ + + +<p>[% + + nget( + 'We do not yet have details for the council that covers this location.', + 'We do not yet have details for the councils that cover this location.', + all_councils.size + ); + + loc("If you submit a problem here the subject and details of the problem will be public, but the problem will <strong>not</strong> be reported to the council."); + + tprintf( + loc("You can help us by finding a contact email address for local problems for %s and emailing it to us at <a href='mailto:%s'>%s</a>."), + all_council_names.join( loc(' or ') ), + c.cobrand.contact_email, + c.cobrand.contact_email + ); + +%]</p> diff --git a/templates/web/default/report/new/notes.html b/templates/web/default/report/new/notes.html new file mode 100644 index 000000000..44d1b5d83 --- /dev/null +++ b/templates/web/default/report/new/notes.html @@ -0,0 +1,15 @@ +<p>[% loc("Please note:") %]</p> + +<ul> + + <li>[% loc("We will only use your personal information in accordance with our <a href=\"/faq#privacy\">privacy policy.</a>") %]</li> + <li>[% loc("Please be polite, concise and to the point.") %]</li> + <li>[% loc("Please do not be abusive — abusing your council devalues the service for all users.") %]</li> + <li>[% loc("Writing your message entirely in block capitals makes it hard to read, as does a lack of punctuation.") %]</li> + <li>[% loc("Remember that FixMyStreet is primarily for reporting physical problems that can be fixed. If your problem is not appropriate for submission via this site remember that you can contact your council directly using their own website.") %]</li> + + [% IF c.config.COUNTRY == 'GB' %] + <li>[% loc("FixMyStreet and the Guardian are providing this service in partnership in <a href=\"/faq#privacy\">certain cities</a>. In those cities, both have access to any information submitted, including names and email addresses, and will use it only to ensure the smooth running of the service, in accordance with their privacy policies.") %]</li> + [% END %] + +</ul> diff --git a/templates/web/default/report/new/report_import.html b/templates/web/default/report/new/report_import.html new file mode 100644 index 000000000..7aa105afe --- /dev/null +++ b/templates/web/default/report/new/report_import.html @@ -0,0 +1,92 @@ +[% INCLUDE 'header.html', title => 'External import' %] + +<h1>External import</h1> + +<p>You may inject problem reports into FixMyStreet programatically using this +simple interface. Upon receipt, an email will be sent to the address given, +with a link the user must click in order to check the details of their report, +add any other information they wish, and then submit to the council. + +<p>This interface returns a plain text response; either <samp>SUCCESS</samp> if +the report has been successfully received, or if not, a list of errors, one per +line each starting with <samp>ERROR:</samp>. + +<p>You may submit the following information by POST to this URL +(i.e. <samp>[% c.uri_for('/import') %]</samp> ):</p> + +<style type="text/css" media="screen"> + input { + /* Hide the form elements - they are just here for simpler testing */ + display: none; + } +</style> + +<form method="POST" action="/import" enctype="multipart/form-data"> + +<dl> + <dt>service</dt> + <dd> + <em>Required</em>. + Name of application/service using this interface. + <input type="text" name="service" /> + </dd> + + <dt>id</dt> + <dd> + Unique ID of a user/device, for possible future use.<br> + <small>(e.g. used by Flickr import to know which accounts to look at)</small> + <input type="text" name="id" /> + </dd> + + <dt>subject</dt> + <dd> + <em>Required</em>. Subject of problem report. + <input type="text" name="subject" /> + </dd> + + <dt>detail</dt> + <dd> + Main body and details of problem report. + <input type="text" name="detail" /> + </dd> + + <dt>name</dt> + <dd> + <em>Required</em>. Name of problem reporter. + <input type="text" name="name" /> + </dd> + + <dt>email</dt> + <dd> + <em>Required</em>. Email address of problem reporter. + <input type="text" name="email" /> + </dd> + + <dt>phone</dt> + <dd> + Telephone number of problem reporter. + <input type="text" name="phone" /> + </dd> + + <dt>easting / northing</dt> + <dt>lat / lon</dt> + <dd> + Location of problem report. You can either supply eastings/northings, or WGS84 latitude/longitude. + <input type="text" name="easting" /> + <input type="text" name="northing" /> + <input type="text" name="lat" /> + <input type="text" name="lon" /> + </dd> + + <dt>photo</dt> + <dd> + Photo of problem (JPEG only). + <input type="file" name="photo" /> + </dd> +</dl> + +<input type="submit" /> + +</form> + +[% INCLUDE 'footer.html' %]
\ No newline at end of file diff --git a/templates/web/default/report/new/report_new.html b/templates/web/default/report/new/report_new.html new file mode 100644 index 000000000..7a7b9bdaf --- /dev/null +++ b/templates/web/default/report/new/report_new.html @@ -0,0 +1,50 @@ +[% INCLUDE 'header.html', title => loc('Reporting a problem') %] + +<h1>[% loc('Reporting a problem') %]</h1> + +[% IF location_error %] + <div class="error">[% location_error %]</div> +[% END %] + +[% IF partial_token %] + + <p style="margin-top: 0; color: #cc0000;"> + <img align="right" src="/photo?id=[% report.id %]" hspace="5"> + [% loc("Thanks for uploading your photo. We now need to locate your problem, so please enter a nearby street name or postcode in the box below :") %] + </p> + + <input type="hidden" name="partial" value="[% partial_token.token %]"> + +[% ELSE %] + Please select where to create this report: +[% END %] + +<form action="/report/new" method="POST"> + + [% IF pc_error %] + <div class='form-error'>[% pc_error %]</div> + [% END %] + + <div class="form-field"> + <label for="pc">Location:</label> + <input type="text" name="pc" value="[% pc %]"> + </div> + + <p> + <input type="hidden" name="partial" value="[% partial_token.token %]"> + <input type="submit" value="[% loc('Search') %]"> + </p> + + +</form> + +[% IF possible_location_matches %] + <p>[% loc('We found more than one match for that location. We show up to ten matches, please try a different search if yours is not here.') %]</p> + <ul class="pc_alternatives"> + [% FOREACH match IN possible_location_matches %] + <li><a href="[% c.uri_for( '', { pc => match }) %]">[% match | html %]</a></li> + [% END %] + </ul> +[% END %] + +[% INCLUDE 'footer.html' %]
\ No newline at end of file diff --git a/templates/web/default/report/new/some_councils_text.html b/templates/web/default/report/new/some_councils_text.html new file mode 100644 index 000000000..7de7c3f45 --- /dev/null +++ b/templates/web/default/report/new/some_councils_text.html @@ -0,0 +1,26 @@ +<p> +[% loc('All the information you provide here will be sent to') %] + +[% FOREACH council IN all_council_names %] + [% loc( ' or ') IF ! loop.first %] + <strong>[% council %]</strong> + [%- '.' IF loop.last %] +[% END %] + +[% + loc('The subject and details of the problem will be public, plus your name if you give us permission.'); + + nget( + 'We do <strong>not</strong> yet have details for the other council that covers this location.', + 'We do <strong>not</strong> yet have details for the other councils that cover this location.', + missing_details_councils.size + ); + + tprintf( + loc("You can help us by finding a contact email address for local problems for %s and emailing it to us at <a href='mailto:%s'>%s</a>."), + missing_details_council_names.join( loc(' or ') ), + c.cobrand.contact_email, + c.cobrand.contact_email + ); +%] + diff --git a/templates/web/default/tokens/abuse.html b/templates/web/default/tokens/abuse.html new file mode 100644 index 000000000..d1b952621 --- /dev/null +++ b/templates/web/default/tokens/abuse.html @@ -0,0 +1,7 @@ +[% INCLUDE 'header.html', title => loc('Error') %] + +<h1>[% loc('Error') %]</h1> + +<p>[% loc('Sorry, there has been an error confirming your problem.') %]</p> + +[% INCLUDE 'footer.html' %] diff --git a/templates/web/default/tokens/confirm_problem.html b/templates/web/default/tokens/confirm_problem.html new file mode 100644 index 000000000..23d5f52ee --- /dev/null +++ b/templates/web/default/tokens/confirm_problem.html @@ -0,0 +1,22 @@ +[% INCLUDE 'header.html', title => loc('Confirmation') %] + +<h1>[% loc('Confirmation') %]</h1> + +<p class="confirmed"> +[% + loc('You have successfully confirmed your problem'); + + IF problem.council; + loc(' and <strong>we will now send it to the council</strong>'); + END; + + tprintf( + loc( '. You can <a href="%s">view the problem on this site</a>.' ), + c.cobrand.url( '/report/' _ problem.id ) + ); +%] +</p> + +[% display_crossell_advert( problem.email, problem.name ) %] + +[% INCLUDE 'footer.html' %] diff --git a/templates/web/default/tokens/error.html b/templates/web/default/tokens/error.html new file mode 100644 index 000000000..76e22c119 --- /dev/null +++ b/templates/web/default/tokens/error.html @@ -0,0 +1,9 @@ +[% INCLUDE 'header.html', title => loc('Error') %] + +<h1>[% loc('Error') %]</h1> + +[% contact_url = c.cobrand.url('/contact'); %] + +<p>[% tprintf( loc('Thank you for trying to confirm your update or problem. We seem to have an error ourselves though, so <a href="%s">please let us know what went on</a> and we\'ll look into it.'), contact_url ) %]</p> + +[% INCLUDE 'footer.html' %] diff --git a/templates/web/default/tracking_code.html b/templates/web/default/tracking_code.html new file mode 100644 index 000000000..e5fc13793 --- /dev/null +++ b/templates/web/default/tracking_code.html @@ -0,0 +1,16 @@ +[% IF c.config.BASE_URL == "http://www.fixmystreet.com" %] +<!-- 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", 8); +piwikTracker.trackPageView(); +piwikTracker.enableLinkTracking(); +} catch( err ) {} +</script><noscript><p><img src="http://piwik.mysociety.org/piwik.php?idsite=8" style="border:0" alt=""/></p></noscript> +<!-- End Piwik Tag --> +[% ELSE %] +<!-- Tracking code not inserted as "[% c.config.BASE_URL %]" not "http://www.fixmystreet.com" --> +[% END %] diff --git a/templates/web/emptyhomes/about/about.html b/templates/web/emptyhomes/about/about.html new file mode 100644 index 000000000..880f69b98 --- /dev/null +++ b/templates/web/emptyhomes/about/about.html @@ -0,0 +1,43 @@ +[% INCLUDE 'header.html', title => loc('About us') %] + +<h1>[% loc('About us') %]</h1> + +<div style="float: left; width: 48%;"> + + <h2>[% loc('The Empty Homes Agency') %]</h2> + + <p>[% loc('The Empty Homes agency is an independent campaigning charity. We + are not part of government, and have no formal links with local councils + although we work in cooperation with both. We exist to highlight the waste + of empty property and work with others to devise and promote sustainable + solutions to bring empty property back into use. We are based in London but + work across England. We also work in partnership with other charities across + the UK.') %]</p> + +</div> + +<div style="float: right; width:48%;"> + + <h2>[% loc('Shelter Cymru') %]</h2> + + <p>[% loc('Shelter Cymru is Wales’ people and homes charity and wants + everyone in Wales to have a decent home. We believe a home is a fundamental + right and essential to the health and well-being of people and communities. + We work for people in housing need. We have offices all over Wales and + prevent people from losing their homes by offering free, confidential and + independent advice. When necessary we constructively challenge on behalf of + people to ensure they are properly assisted and to improve practice and + learning. We believe that bringing empty homes back into use can make a + significant contribution to the supply of affordable homes in Wales.') %] + + <a href="http://www.sheltercymru.org.uk/shelter/advice/pdetail.asp?cat=20"> + [% loc('Further information about our work on empty homes.') %] + </a> + + </p> + +</div> + +<br clear="both"> + +[% INCLUDE 'footer.html' %]
\ No newline at end of file diff --git a/templates/website/cobrands/emptyhomes/faq-cy b/templates/web/emptyhomes/faq/faq-cy.html index 1a446055e..726ca0ad6 100644 --- a/templates/website/cobrands/emptyhomes/faq-cy +++ b/templates/web/emptyhomes/faq/faq-cy.html @@ -1,3 +1,5 @@ +[% INCLUDE 'header.html', title => loc('Frequently Asked Questions') %] + <h1>Cwestiynau Cyffredin</h1> <dl> @@ -20,7 +22,7 @@ Hyd yn oed wedyn, gall y broses fod yn araf, yn enwedig os yw’r eiddo mewn cyf Byddwn yn cysylltu â chi ddwywaith (mis a chwe mis ar ôl i chi roi gwybod am yr eiddo gwag), fel y gallwch ddweud wrthym beth sydd wedi digwydd. Os nad yw’r cyngor yn gwneud unrhyw beth, neu os ydych chi’n meddwl bod eu hymateb yn annigonol, byddwn yn rhoi cyngor i chi ar beth i’w wneud nesaf.</p> <p> Os taw’r llywodraeth neu un o’i hasiantaethau sy’n berchen ar yr eiddo gwag, nid oes gan gynghorau unrhyw bŵer i helpu’n aml. Fodd bynnag, mae’n bosibl y byddwch yn gallu gweithredu’ch hunan yn uniongyrchol gan ddefnyddio PROD: <a href="http://www.emptyhomes.com/usefulinformation/policy_docs/prods.html">http://www.emptyhomes.com/usefulinformation/policy_docs/prods.html</a> -</dd>, +</dd> <dt>A fydd adrodd am eiddo gwag yn gwneud unrhyw wahaniaeth?</dt> <dd><p>Bydd. Gall cynghorau wneud gwahaniaeth gwirioneddol, ond mae ganddynt lawer o bethau i’w gwneud. Bydd llawer o gynghorau ddim ond yn delio ag eiddo gwag sydd wedi cael eu hysbysu iddyn nhw. Os nad yw pobl yn rhoi gwybod am eiddo gwag, mae’n bosibl iawn y daw cynghorau i’r casgliad bod meysydd gwaith eraill yn fwy pwysig.</p> <p> Mae dros 840,000 o dai gwag yn y DU. Mae’r Asiantaeth Tai Gwag yn amcangyfrif bod dros hanner y rhain yn wag heb angen. Effaith hyn yw gostwng sylweddol yn y stoc tai sydd ar gael, gan fwydo argyfwng tai’r DU. Sgil-effaith y gwastraff hwn yw bod llawer mwy o bwysau’n cael ei roi ar dir adeiladau gan fod mwy o dai’n cael eu hadeiladu i ateb y diffyg. Mae’r Asiantaeth Tai Gwag yn amcangyfrif y byddai dod â dim ond chwarter tai gwag y DU yn ôl mewn defnydd yn rhoi cartrefi i 700,000 o bobl, yn arbed 160 cilometr sgwâr o dir ac yn arbed 10 miliwn tunnell fetrig o CO<sub>2</sub> dros adeiladu’r un nifer o dai newydd. @@ -57,3 +59,5 @@ Os taw’r llywodraeth neu un o’i hasiantaethau sy’n berchen ar yr eiddo gwa href="http://www.easynet.net/publicsector/">Easynet</a> (sydd mor garedig â gwesteia’n holl weinyddion). Rhowch wybod i ni os ydym wedi hepgor unrhyw un.</dd> + +[% INCLUDE 'footer.html' %] diff --git a/templates/website/cobrands/emptyhomes/faq-en-gb b/templates/web/emptyhomes/faq/faq-en-gb.html index aa70a26ee..9d36634cd 100755 --- a/templates/website/cobrands/emptyhomes/faq-en-gb +++ b/templates/web/emptyhomes/faq/faq-en-gb.html @@ -1,3 +1,5 @@ +[% INCLUDE 'header.html', title => loc('Frequently Asked Questions') %] + <h1>Frequently Asked Questions</h1> <dl> <dt>What is this site for?</dt> @@ -47,7 +49,7 @@ If the empty home is owned by the government or one its agencies, councils are often powerless to help. However you might be able to take action directly yourself using a PROD: <a href="http://www.emptyhomes.com/usefulinformation/policy_docs/prods.html">http://www.emptyhomes.com/usefulinformation/policy_docs/prods.html</a> -</dd>, +</dd> <dt>Will reporting an empty home make any difference?</dt> <dd><p>Yes. Councils can make a real difference, but they have lots of things to do. Many councils only deal with empty homes that are reported to @@ -108,3 +110,5 @@ our servers). Let us know if we’ve missed anyone.</dd> </dl> + +[% INCLUDE 'footer.html' %] diff --git a/templates/website/cobrands/emptyhomes/footer b/templates/web/emptyhomes/footer.html index 011773e5b..e9a70de4f 100644 --- a/templates/website/cobrands/emptyhomes/footer +++ b/templates/web/emptyhomes/footer.html @@ -19,7 +19,7 @@ Email: <a href="mailto:info@emptyhomes.com">info@emptyhomes.com</a> <div> <i>in Wales:</i><br> Shelter Cymru<br> -25 Walter Road<br>Swansea +[% lang_code == 'cy' ? '25 Heol Walter<br>Abertawe' : '25 Walter Road<br>Swansea' %] <br>SA1 5NN<br> <a href="mailto:emptyhomes@sheltercymru.org.uk">emptyhomes@sheltercymru.org.uk</a> </div> @@ -36,6 +36,8 @@ Tel: 0344 515 2461<br> </div> +[% INCLUDE 'debug_footer.html' %] + </body> </html> diff --git a/templates/web/emptyhomes/header.html b/templates/web/emptyhomes/header.html new file mode 100644 index 000000000..df97adeae --- /dev/null +++ b/templates/web/emptyhomes/header.html @@ -0,0 +1,51 @@ +<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd"> +<html lang="[% lang_code %]"> +<head> + +[% INCLUDE 'common_header_tags.html' %] + +<style type="text/css"> +@import "/css/core.css"; +@import "/css/cobrands/emptyhomes/emptyhomes.css"; +</style> +<!--[if LT IE 7]> +<style type="text/css">@import url("/css/ie6.css");</style> +<![endif]--> + +</head> +<body> + +<div id="header"> + <a href="http://www.emptyhomes.com/"><img id="eha-logo" border="0" src="/i/eha-logo.jpeg" alt="Empty Homes Agency" width="91" height="71" align="left"></a> + <div> + <small><em>in conjunction with</em></small> + <br> + <a href="http://www.sheltercymru.org.uk/"><img border="0" src="/i/Sheltercymru47s.png" alt="Shelter Cymru" width="80" height="33" align="bottom"></a> + <a href="http://scotland.shelter.org.uk/housing_issues/more_homes/empty_homes"><img border="0" src="/i/SEHPlogo-bwS.png" alt="Scottish Empty Homes Partnership" width="131" height="40" align="bottom"></a> + </div> +</div> + +<div id="navigation"> + <ul> + <li><a href="/report/new" >[% loc("Report a problem") %]</a></li> + <li><a href="/reports" >[% loc("All reports") %]</a></li> + <li><a href="/alert" >[% loc("Local alerts") %]</a></li> + <li><a href="/faq" >[% loc("Help") %]</a></li> + <li><a href="/about" >[% loc('About us') %]</a></li> + [% IF lang_url # old Page.pm code %] + <li><a href="[% lang_url %]">[% lang %]</a></li> + [% ELSE # new Catalyst code %] + [% IF lang_code == 'en-gb' %] + <li><a href="http://cy.[% c.cobrand.base_host %]">Cymraeg</a></li> + [% ELSE %] + <li><a href="http://en.[% c.cobrand.base_host %]">English</a></li> + [% END %] + [% END %] + </ul> +</div> + +<div id="wrapper"> +<div id="mysociety"> + + [% INCLUDE 'debug_header.html' %] + diff --git a/templates/web/emptyhomes/report/new/all_councils_text.html b/templates/web/emptyhomes/report/new/all_councils_text.html new file mode 100644 index 000000000..8bdad1c1f --- /dev/null +++ b/templates/web/emptyhomes/report/new/all_councils_text.html @@ -0,0 +1,8 @@ +<p> +[% + tprintf( + loc('All the information you provide here will be sent to <strong>%s</strong>. On the site, we will show the subject and details of the problem, plus your name if you give us permission.'), + all_council_names.join( '</strong>' _ loc(' or ') _ '<strong>' ) + ); +%] +</p> diff --git a/templates/web/emptyhomes/report/new/fill_in_details_text.html b/templates/web/emptyhomes/report/new/fill_in_details_text.html new file mode 100644 index 000000000..b557a9942 --- /dev/null +++ b/templates/web/emptyhomes/report/new/fill_in_details_text.html @@ -0,0 +1,6 @@ +[% loc('Please fill in details of the empty property below, saying what type of +property it is e.g. an empty home, block of flats, office etc. Tell us +something about its condition and any other information you feel is relevant. +There is no need for you to give the exact address. Please be polite, concise +and to the point; writing your message entirely in block capitals makes it hard +to read, as does a lack of punctuation.') %] diff --git a/templates/web/emptyhomes/report/new/form_heading.html b/templates/web/emptyhomes/report/new/form_heading.html new file mode 100644 index 000000000..911804a58 --- /dev/null +++ b/templates/web/emptyhomes/report/new/form_heading.html @@ -0,0 +1 @@ +<h2>[% loc('Empty property details form') %]</h2> diff --git a/templates/web/emptyhomes/report/new/no_councils_text.html b/templates/web/emptyhomes/report/new/no_councils_text.html new file mode 100644 index 000000000..7edb75852 --- /dev/null +++ b/templates/web/emptyhomes/report/new/no_councils_text.html @@ -0,0 +1,6 @@ +<p> +[% + loc('We do not yet have details for the council that covers this location.'); + loc("If you submit a report here it will be left on the site, but not reported to the council – please still leave your report, so that we can show to the council the activity in their area."); +%] +</p> diff --git a/templates/web/emptyhomes/report/new/notes.html b/templates/web/emptyhomes/report/new/notes.html new file mode 100644 index 000000000..d355cc1ba --- /dev/null +++ b/templates/web/emptyhomes/report/new/notes.html @@ -0,0 +1 @@ +[%# This file deliberately left empty - there are no notes for EmptyHomes %]
\ No newline at end of file diff --git a/templates/web/emptyhomes/tokens/confirm_problem.html b/templates/web/emptyhomes/tokens/confirm_problem.html new file mode 100644 index 000000000..c4d246430 --- /dev/null +++ b/templates/web/emptyhomes/tokens/confirm_problem.html @@ -0,0 +1,39 @@ +[% INCLUDE 'header.html', title => loc('Confirmation') %] + +<h1>[% loc('Confirmation') %]</h1> + +[% IF problem.council %] + <p>[% + loc( + 'Thank you for reporting an empty property on ReportEmptyHomes.com. We have emailed the lead officer for empty homes in the council responsible with details, and asked them to do whatever they can to get the empty property back into use as soon as possible.' + ) + %]</p> + + <p>[% + loc( + 'It is worth noting however that the process can sometimes be slow, especially if the property is in very poor repair or the owner is unwilling to act. In most cases it can take six months or more before you can expect to see anything change and sometimes there may be considerable barries to a property being brought back into use. This doesn’t mean the council isn’t doing anything. We encourage councils to update the website so you can see what is happening. It may be a long process, but you reporting your concerns about this property to the council is a valuable first step.' + ) + %]</p> + + <p>[% + loc( + 'We may contact you periodically to ask if anything has changed with the property you reported.' + ) + %]</p> + + <p>[% + loc( + 'Thank you for using ReportEmptyHomes.com. Your action is already helping to resolve the UK’s empty homes crisis.' + ) + %]</p> +[% ELSE %] + <p>[% + loc( 'Thank you for reporting an empty property on ReportEmptyHomes.com.' ) + %]</p> +[% END %] + +<p> + <a href="[% c.uri_for( '/report', problem.id ) | html %]">[% loc('View your report') %]</a>. +</p> + +[% INCLUDE 'footer.html' %] diff --git a/templates/web/emptyhomes/tracking_code.html b/templates/web/emptyhomes/tracking_code.html new file mode 100644 index 000000000..73526d3bd --- /dev/null +++ b/templates/web/emptyhomes/tracking_code.html @@ -0,0 +1,12 @@ +<!-- 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 --> diff --git a/templates/website/cobrands/fiksgatami/faq-nb b/templates/web/fiksgatami/faq/faq-nb.html index e702a5f2f..3f10c02cd 100644 --- a/templates/website/cobrands/fiksgatami/faq-nb +++ b/templates/web/fiksgatami/faq/faq-nb.html @@ -1,3 +1,5 @@ +[% INCLUDE 'header.html', title => loc('Frequently Asked Questions') %] + <h1>Ofte stilte spørsmål</h1> <dl> <dt>Hva er FiksGatami?</dt> @@ -122,3 +124,5 @@ også gjøre tilgjengelig i kildekoden til slike prosjekter.</p></dd> </dl> + +[% INCLUDE 'footer.html' %] diff --git a/templates/web/fiksgatami/footer.html b/templates/web/fiksgatami/footer.html new file mode 100644 index 000000000..8b3038e71 --- /dev/null +++ b/templates/web/fiksgatami/footer.html @@ -0,0 +1,23 @@ +</div></div> + +<h2 class="v">[% loc('Navigation') %]</h2> +<ul id="navigation"> +<li><a href="/report/new" >[% loc("Report a problem") %]</a></li> +<li><a href="/reports" >[% loc("All reports") %]</a></li> +<li><a href="[% c.uri_for('/alert', {pc => pc}) | html %]">[% loc("Local alerts") %]</a></li> +<li><a href="/faq" >[% loc("Help") %]</a></li> +<li><a href="/contact" >[% loc("Contact") %]</a></li> +</ul> + +<div id="logo" align="center"><a href="http://www.nuug.no/">Foreningen NUUG</a></div> + +<p id="footer"> + [% loc('Built by <a href="http://www.mysociety.org/">mySociety</a> and maintained by <a href="http://www.nuug.no/">NUUG</a>, using some <a href="http://github.com/mysociety/fixmystreet">clever</a> <a href="https://secure.mysociety.org/cvstrac/dir?d=mysociety/services/TilMa">code</a>.') %] +</p> + +[% INCLUDE 'tracking_code.html' %] + +[% INCLUDE 'debug_footer.html' %] + +</body> +</html> diff --git a/templates/web/fiksgatami/header.html b/templates/web/fiksgatami/header.html new file mode 100644 index 000000000..e0bf5b150 --- /dev/null +++ b/templates/web/fiksgatami/header.html @@ -0,0 +1,19 @@ +<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd"> +<html lang="[% lang_code %]"> + <head> + [% INCLUDE 'common_header_tags.html' %] + + <style type="text/css"> + @import url("/css/core.css"); + @import url("/cobrands/fiksgatami/css.css"); + </style> + </head> + <body> + + <div id="header"> + <a href="/">[% loc('Fix<span id="my">My</span>Street') %]</a> + </div> + + <div id="wrapper"><div id="mysociety"> + + [% INCLUDE 'debug_header.html' %] diff --git a/templates/website/scambs-footer b/templates/web/scambs/footer.html index 4a0a319cc..4a0a319cc 100644 --- a/templates/website/scambs-footer +++ b/templates/web/scambs/footer.html diff --git a/templates/website/scambs-header b/templates/web/scambs/header.html index 326602de1..5e25755ed 100644 --- a/templates/website/scambs-header +++ b/templates/web/scambs/header.html @@ -1,7 +1,7 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd"> <html lang="en-gb"> <head> -<title>{{ $title }}Envirocrime - South Cambridgeshire District Council</title> +<title>[% title %]Envirocrime - South Cambridgeshire District Council</title> <meta http-equiv="content-type" content="text/html; charset=utf-8"> <script type="text/javascript" src="/yui/utilities.js"></script> <script type="text/javascript" src="/js.js"></script> @@ -69,7 +69,7 @@ <div id="left"> <div id="leftnav"> <ul> - <li class="first"><a href="/">Report a problem</a> + <li class="first"><a href="/report/new">Report a problem</a> <li class="first">About <li class="first">Recent successes <li class="first">Name and shame diff --git a/templates/website/cobrands/southampton/footer b/templates/web/southampton/footer.html index dac5d9c1a..dac5d9c1a 100644 --- a/templates/website/cobrands/southampton/footer +++ b/templates/web/southampton/footer.html diff --git a/templates/website/cobrands/southampton/header b/templates/web/southampton/header.html index 4f47c92e5..a15054fb6 100644 --- a/templates/website/cobrands/southampton/header +++ b/templates/web/southampton/header.html @@ -1,17 +1,11 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <head> - <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> - <script type="text/javascript" src="/yui/utilities.js"></script> - <script type="text/javascript" src="/js.js"></script> - {{ $map_js }} - {{ $robots }} + [% INCLUDE 'common_header_tags.html' %] - <title>{{ $title }}{{ $site_title }}</title> <link rel="stylesheet" type="text/css" href="/css/core.css" /> <link rel="stylesheet" type="text/css" href="/cobrands/southampton/style.css" /> <link rel="stylesheet" type="text/css" href="/cobrands/southampton/css.css" /> - {{ $rss }} </head> <body> <ul id="topMenu"> diff --git a/templates/website/cobrands/emptyhomes/header b/templates/website/cobrands/emptyhomes/header deleted file mode 100644 index 3281430dd..000000000 --- a/templates/website/cobrands/emptyhomes/header +++ /dev/null @@ -1,41 +0,0 @@ -<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd"> -<html lang="{{ $lang_code }}"> -<head> -<title>{{ $title }}{{ $site_title }}</title> -<meta http-equiv="content-type" content="text/html; charset=utf-8"> -<script type="text/javascript" src="/yui/utilities.js"></script> -<script type="text/javascript" src="/js.js"></script> -{{ $map_js }} -<style type="text/css"> -@import "/css/core.css"; -@import "/css/cobrands/emptyhomes/emptyhomes.css"; -</style> -<!--[if LT IE 7]> -<style type="text/css">@import url("/css/ie6.css");</style> -<![endif]--> -{{ $rss }} -</head> -<body> - -<div id="header"> -<a href="http://www.emptyhomes.com/"><img id="eha-logo" border="0" src="/i/eha-logo.jpeg" alt="Empty Homes Agency" width="91" height="71" align="left"></a> -<div> -<small><em>in conjunction with</em></small><br> -<a href="http://www.sheltercymru.org.uk/"><img border="0" src="/i/Sheltercymru47s.png" alt="Shelter Cymru" width="80" height="33" align="bottom"></a> -<a href="http://scotland.shelter.org.uk/housing_issues/more_homes/empty_homes"><img border="0" src="/i/SEHPlogo-bwS.png" alt="Scottish Empty Homes Partnership" width="131" height="40" align="bottom"></a> -</div> -</div> - -<div id="navigation"> - <ul> - <li><a href="/">{{ $report }}</a> - <li><a href="/reports">{{ $reports }}</a></li> - <li><a href="/alert">{{ $alert }}</a></li> - <li><a href="/faq">{{ $faq }}</a></li> - <li><a href="/about">{{ $about }}</a></li> - <li><a href="{{ $lang_url }}">{{ $lang }}</a></li> - </ul> -</div> - -<div id="wrapper"> -<div id="mysociety"> diff --git a/templates/website/cobrands/fiksgatami/footer b/templates/website/cobrands/fiksgatami/footer deleted file mode 100644 index e78e7d439..000000000 --- a/templates/website/cobrands/fiksgatami/footer +++ /dev/null @@ -1,16 +0,0 @@ -</div></div> -<h2 class="v">{{ $navigation }}</h2> -<ul id="navigation"> -<li><a href="/">{{ $report }}</a></li> -<li><a href="/reports">{{ $reports }}</a></li> -<li><a href="/alert{{ $pc }}">{{ $alerts }}</a></li> -<li><a href="/faq">{{ $help }}</a></li> -<li><a href="/contact">{{ $contact }}</a></li> -</ul> - -{{ $orglogo }} - -<p id="footer">{{ $creditline }}</p> - -</body> -</html> diff --git a/templates/website/cobrands/fiksgatami/header b/templates/website/cobrands/fiksgatami/header deleted file mode 100644 index 41ccabff9..000000000 --- a/templates/website/cobrands/fiksgatami/header +++ /dev/null @@ -1,19 +0,0 @@ -<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd"> -<html lang="{{ $lang_code }}"> - <head> - <meta http-equiv="Content-Type" content="text/html; charset=utf-8"> - <script type="text/javascript" src="/yui/utilities.js"></script> - <script type="text/javascript" src="/js.js"></script> - {{ $map_js }} - {{ $robots }} - - <title>{{ $title }}{{ $site_title }}</title> - <style type="text/css"> - @import url("/css/core.css"); - @import url("/cobrands/fiksgatami/css.css"); - </style> - {{ $rss }} - </head> - <body> - {{ $heading_element_start }}{{ $heading }}{{ $heading_element_end }} - <div id="wrapper"><div id="mysociety"> diff --git a/templates/website/header b/templates/website/header deleted file mode 100644 index b88d9b82c..000000000 --- a/templates/website/header +++ /dev/null @@ -1,19 +0,0 @@ -<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd"> -<html lang="{{ $lang_code }}"> - <head> - <meta http-equiv="Content-Type" content="text/html; charset=utf-8"> - <script type="text/javascript" src="/yui/utilities.js"></script> - <script type="text/javascript" src="/js.js"></script> - {{ $map_js }} - {{ $robots }} - - <title>{{ $title }}{{ $site_title }}</title> - <style type="text/css">@import url("/css/core.css"); @import url("/css/main.css");</style> - <!--[if LT IE 7]> - <style type="text/css">@import url("/css/ie6.css");</style> - <![endif]--> - {{ $rss }} - </head> - <body> - {{ $heading_element_start }}{{ $heading }}{{ $heading_element_end }} - <div id="wrapper"><div id="mysociety"> |