aboutsummaryrefslogtreecommitdiffstats
path: root/templates
diff options
context:
space:
mode:
Diffstat (limited to 'templates')
-rw-r--r--templates/emails/alert-update2
-rw-r--r--templates/emails/submit-brent4
-rw-r--r--templates/emails/submit-council4
-rw-r--r--templates/website/cobrands/barnet/footer (renamed from templates/website/cobrands/barnet/barnet-footer)1
-rw-r--r--templates/website/cobrands/barnet/header (renamed from templates/website/cobrands/barnet/barnet-header)1
-rw-r--r--templates/website/cobrands/emptyhomes/faq-cy (renamed from templates/website/faq-eha.cy.html)0
-rwxr-xr-xtemplates/website/cobrands/emptyhomes/faq-en-gb (renamed from templates/website/faq-eha.html)0
-rw-r--r--templates/website/cobrands/emptyhomes/footer (renamed from templates/website/cobrands/emptyhomes/emptyhomes-footer)0
-rw-r--r--templates/website/cobrands/emptyhomes/header (renamed from templates/website/cobrands/emptyhomes/emptyhomes-header)2
-rw-r--r--templates/website/cobrands/fiksgatami/faq-nb124
-rw-r--r--templates/website/cobrands/fiksgatami/footer16
-rw-r--r--templates/website/cobrands/fiksgatami/header19
-rw-r--r--templates/website/cobrands/southampton/footer25
-rw-r--r--templates/website/cobrands/southampton/header127
-rwxr-xr-xtemplates/website/faq-en-gb (renamed from templates/website/faq.html)21
-rw-r--r--templates/website/header2
-rw-r--r--templates/website/problem2
17 files changed, 336 insertions, 14 deletions
diff --git a/templates/emails/alert-update b/templates/emails/alert-update
index f68ee55a4..ac0ddd50a 100644
--- a/templates/emails/alert-update
+++ b/templates/emails/alert-update
@@ -4,6 +4,8 @@ The following updates have been left on this problem:
<?=$values['data']?>
+<?=$values['state_message']?>
+
To view or reply to these updates, please visit the following URL:
<?=$values['problem_url']?>
diff --git a/templates/emails/submit-brent b/templates/emails/submit-brent
index 6cb226209..f3a9e5bb8 100644
--- a/templates/emails/submit-brent
+++ b/templates/emails/submit-brent
@@ -21,9 +21,9 @@ Email: <?=$values['email']?>
Details: <?=$values['detail']?>
-Easting: <?=$values['easting']?>
+<?=$values['easting_northing']?>Latitude: <?=$values['latitude']?>
-Northing: <?=$values['northing']?>
+Longitude: <?=$values['longitude']?>
<?=$values['closest_address_machine']?>----------
diff --git a/templates/emails/submit-council b/templates/emails/submit-council
index d3a4a0c64..21c89119d 100644
--- a/templates/emails/submit-council
+++ b/templates/emails/submit-council
@@ -21,9 +21,9 @@ Email: <?=$values['email']?>
Details: <?=$values['detail']?>
-Easting: <?=$values['easting']?>
+<?=$values['easting_northing']?>Latitude: <?=$values['latitude']?>
-Northing: <?=$values['northing']?>
+Longitude: <?=$values['longitude']?>
<?=$values['closest_address']?>----------
diff --git a/templates/website/cobrands/barnet/barnet-footer b/templates/website/cobrands/barnet/footer
index f6963e553..40b9adce0 100644
--- a/templates/website/cobrands/barnet/barnet-footer
+++ b/templates/website/cobrands/barnet/footer
@@ -1,3 +1,4 @@
+ </div>
<br class="cl">
</div><!-- end content -->
</div><!-- end wrap -->
diff --git a/templates/website/cobrands/barnet/barnet-header b/templates/website/cobrands/barnet/header
index 67619b417..cd274df7b 100644
--- a/templates/website/cobrands/barnet/barnet-header
+++ b/templates/website/cobrands/barnet/header
@@ -94,4 +94,5 @@
<div id="wrap">
<div id="content">
+ <div id="mysociety">
diff --git a/templates/website/faq-eha.cy.html b/templates/website/cobrands/emptyhomes/faq-cy
index 1a446055e..1a446055e 100644
--- a/templates/website/faq-eha.cy.html
+++ b/templates/website/cobrands/emptyhomes/faq-cy
diff --git a/templates/website/faq-eha.html b/templates/website/cobrands/emptyhomes/faq-en-gb
index aa70a26ee..aa70a26ee 100755
--- a/templates/website/faq-eha.html
+++ b/templates/website/cobrands/emptyhomes/faq-en-gb
diff --git a/templates/website/cobrands/emptyhomes/emptyhomes-footer b/templates/website/cobrands/emptyhomes/footer
index 011773e5b..011773e5b 100644
--- a/templates/website/cobrands/emptyhomes/emptyhomes-footer
+++ b/templates/website/cobrands/emptyhomes/footer
diff --git a/templates/website/cobrands/emptyhomes/emptyhomes-header b/templates/website/cobrands/emptyhomes/header
index dfdefa8cc..3281430dd 100644
--- a/templates/website/cobrands/emptyhomes/emptyhomes-header
+++ b/templates/website/cobrands/emptyhomes/header
@@ -38,4 +38,4 @@
</div>
<div id="wrapper">
-<div id="content">
+<div id="mysociety">
diff --git a/templates/website/cobrands/fiksgatami/faq-nb b/templates/website/cobrands/fiksgatami/faq-nb
new file mode 100644
index 000000000..e702a5f2f
--- /dev/null
+++ b/templates/website/cobrands/fiksgatami/faq-nb
@@ -0,0 +1,124 @@
+<h1>Ofte stilte spørsmål</h1>
+<dl>
+ <dt>Hva er FiksGatami?</dt>
+
+ <dd>FiksGataMi er et nettsted for å hjelpe folk til å rapportere
+ problemer, vise, eller diskutere lokale problemer de har funnet i
+ sitt område ved ganske enkelt å finne dem på et kart. Du kan melde
+ problemer uten å tenke på hvilken offentlig myndighet som er
+ ansvarlig for å løse det, det finner FiksGataMi ut for deg.</dd>
+
+ <dt>Hva slags problemer kan jeg rapportere med FiksGataMi?</dt>
+
+ <dd>FiksGataMi er primært for rapportering av ting som
+ er <strong>ødelagt, skadet, dumpet eller trenger å bli reparert,
+ rengjort eller ryddet</strong>. Dette kan for eksempel være:
+
+ <ul>
+ <li>Forlatte kjøretøy</li>
+ <li>Gatelys som ikke virker</li>
+ <li>Plakater eller graffiti</li>
+ <li>Søppel</li>
+ <li>Behov for rengjøring</li>
+ <li>Behov for brøyting</li>
+ <li>Glatt vei eller gangsti</li>
+ </ul>
+ </dd>
+
+ <dt>Hva er FiksGataMi ikke?</dt>
+ <dd>FiksGataMi er ikke en måte å komme i kontakt med offentlig
+ myndighet for alle spørsmål - vennligst bruk FiksGataMi bare for
+ problemer som de ovennevnte.
+
+ <strong>Du må kontakte offentlige myndigheter direkte for
+ problemer som for eksempel</strong>:
+
+ <ul>
+ <li>Saker som haster eller akutt problemer</li>
+ <li>Støyforurensning eller bjeffende hunder</li>
+ <li>Brann og røyk / luktforurensning</li>
+ <li>Endringsforslag til kommune, fylke eller stat</li>
+ <li>Klager over naboene</li>
+ <li>Kriminell aktivitet</li>
+ </ul>
+ </dd>
+
+ <dt>Hvordan bruker jeg nettstedet?</dt>
+ <dd>Når du har angitt et postnummer eller sted, blir du presentert
+ med et kart over det området. Du kan se problemer allerede
+ rapportert i dette området, eller rapporten selv på egen hånd ved
+ å klikke på kartet for plasseringen av problemet.</dd>
+
+ <dt>Hvordan blir saken løst?</dt>
+ <dd>Saken blir meldt til offentlige myndigheter via e-post. Saken
+ blir så behandlet på normal måte. Alternativt kan du diskutere
+ problemet på nettstedet med andre, og da sammen påvirke offentlige
+ myndigheter til å fikse det, eller fikse det direkte selv.</dd>
+
+ <dt>Er det gratis å bruke fiksgatami.no?</dt>
+ <dd>Ja, nettsiden er gratis å bruke. FiksGataMi drives av NUUG,
+ skjønt, hvis du ønsker å gi et bidrag, kan du gjøre det.</dd>
+
+ <dt>Kan jeg bruke FiksGataMi fra min mobil?</dt>
+ <dd>Hvis mobilen har nettleser kan du fint bruke tjenesten fra
+ mobiltelefon. Det jobbes med å skaffe finansiering til å tilpasse
+ iPhone- og Android-apps til norske forhold for å gjøre det enda
+ enklere å rapportere fra smart-telefoner.</dd>
+
+ <dt>Praktisk informasjon</dt>
+ <dd>FiksGataMi er ikke ansvarlig for innholdet og riktigheten av
+ materiale innsendt av brukerne. Vi forbeholder oss retten til å
+ redigere eller fjerne eventuelle problemer eller oppdateringer som
+ vi anser å være upassende fortrinnsvis etter å bli informert av en
+ bruker på nettstedet.</dd>
+
+ <dt>Hvorfor blir ikke mitt stedsnavn funnet?</dt>
+
+ <dd>Tjenesten bruker navnesøk hos Google Maps for å lokalisere
+ steder. Hvis Google Maps har mangler i sin stedsnavndatabase, vil
+ stedet ikke bli funnet eller sende deg til feil plass.
+ Tilsvarende søk på Google Maps (etter f.eks. "Slogvær, Norway")
+ vil også feile. For å fikse det må en ta kontakt med Google.</dd>
+
+</dl>
+
+<h2><a name="privacy"></a>Spørsmål om personvern</h2>
+
+<dl>
+
+ <dt>Vil jeg motta reklame eller annet uønsket epost?</dt>
+ <dd>Det vil ikke forekomme. Vi sender deg en epost hvis det skjer en
+ oppdatering av de problemer du har meldt inn, og vi vil aldri
+ sende deg e-post i forhold til noe annet en de problemene du
+ abonnerer på eller har meldt inn.</dd>
+
+ <dt>Hvem får å se min e-postadresse?</dt>
+ <dd>Hvis du melder inn en sak, lagrer vi på detaljer om saken, vi
+ sender samtidig en melding til kontakten eller kontaktene hos den
+ relevante myndighet som er ansvarlig for området der saken er
+ geografisk lokalisert. Meldingen sendes til offentlig myndighet
+ som følger offentlighetsloven og vil gi enhver innsyn i meldingen
+ og epostadressen etter de gjeldene lover og regler. Vi i
+ FiksGataMi vi ikke under noen omstendighet gi eller selge
+ e-postadressen din til noen andre.</dd>
+
+ <dt>Hvem står bak FiksGataMi?</dt>
+ <dd><p>Foreningen Norwegian Unix User Group (NUUG) står bak og
+ driver FiksGataMi. <a href="http://www.friprog.no/">Nasjonalt
+ kompetansesenter for fri programvare</a> og
+ <a href="http://www.dss.dep.no/">Departementenes
+ Servicesenter</a> bidrar med finansiering av prosjektet.</p>
+
+ <p>Organisasjonen mySociety i England har drevet og utviklet
+ nettstedet FixMyStreet siden 2007. Programvaren for FiksGataMi
+ drives idag basert på den samme programvaren og utvikling
+ foregår som et samarbeid mellom NUUG i Norge og MySociety i
+ England. FiksGataMi er i så måte et internasjonalt prosjekt.</p>
+
+ <p>Programvaren bak dette nettstedet er fri programvare, og er
+ tilgjengelig i hovedsak under GNU Affero GPL
+ programvarelisensen. Du kan laste ned kildekoden og hjelpe oss å
+ utvikle det. Du må gjerne bruke den i egne prosjekter, men du må
+ også gjøre tilgjengelig i kildekoden til slike prosjekter.</p></dd>
+
+ </dl>
diff --git a/templates/website/cobrands/fiksgatami/footer b/templates/website/cobrands/fiksgatami/footer
new file mode 100644
index 000000000..e78e7d439
--- /dev/null
+++ b/templates/website/cobrands/fiksgatami/footer
@@ -0,0 +1,16 @@
+</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
new file mode 100644
index 000000000..41ccabff9
--- /dev/null
+++ b/templates/website/cobrands/fiksgatami/header
@@ -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>
+ <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/cobrands/southampton/footer b/templates/website/cobrands/southampton/footer
new file mode 100644
index 000000000..dac5d9c1a
--- /dev/null
+++ b/templates/website/cobrands/southampton/footer
@@ -0,0 +1,25 @@
+ </div>
+ </div>
+
+ <!-- End of main content area -->
+
+
+
+ <!-- Start of footer -->
+
+ <div id="footer">
+ <a href="http://www.southampton.gov.uk/council-partners/accesstoinfo/" class="accessInfo"><img alt="Access to Information" src="/cobrands/southampton/accessInfo.gif" /></a>
+ <ul id="bottomMenu">
+ <li><a href="http://www.southampton.gov.uk/tools/copyright.aspx">Copyright &copy; Southampton City Council 2009</a>|</li>
+ <li><a href="http://www.southampton.gov.uk/tools/privacypolicy.aspx">Privacy</a>|</li>
+ <li><a href="http://www.southampton.gov.uk/tools/disclaimer.aspx">Disclaimer</a>|</li>
+ <li><a href="http://www.southampton.gov.uk/tools/sitestats.aspx">Site Statistics</a>|</li>
+ <li><a href="http://www.southampton.gov.uk/living/emergency-planning/">Emergencies</a></li>
+ </ul>
+ </div>
+
+ <!-- End of footer -->
+
+ </div>
+</body>
+</html>
diff --git a/templates/website/cobrands/southampton/header b/templates/website/cobrands/southampton/header
new file mode 100644
index 000000000..4f47c92e5
--- /dev/null
+++ b/templates/website/cobrands/southampton/header
@@ -0,0 +1,127 @@
+<!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 }}
+
+ <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">
+ <li><a href="/#content">Skip to content</a>|</li>
+ <li><a href="http://www.southampton.gov.uk/tools/accesskeys.aspx">Access keys</a>|</li>
+ <li><a href="http://www.southampton.gov.uk/tools/accessibility.aspx">Accessibility Information</a>|</li>
+ <li><a href="http://app.readspeaker.com/proreader/proreader.php?cid=5386&amp;lang=en_uk&amp;url=http://www.southampton.gov.uk" class="listen" onclick='window.open(this.href+"&amp;selhtml="+escape(selectedString), "prwin", "width=190, height=120, resizable=1, scrollbars=1, screenX=0, screenY=0, left=0, top=0"); return false;'>Listen</a>|</li>
+ <li><a href="http://www.southampton.gov.uk/tools/help.aspx">Site help</a>|</li>
+ <li><a href="http://www.southampton.gov.uk/tools/sitemap.aspx">Site map</a></li>
+ </ul>
+ <div id="wrapper">
+
+ <!-- Start of header -->
+
+ <div id="header">
+ <img class="logo" alt="Southampton City Council Logo" src="/cobrands/southampton/SCClogo.png" />
+ <a class="siteTitle" href="http://www.southampton.gov.uk">Southampton City Council</a>
+ <div id="searchWrap">
+ <form id="frmSearch" method="get" action="http://websearch.southampton.gov.uk/search">
+ <fieldset>
+ <label for="searchbox">Search the site<br /></label>
+ <input class="text" type="text" value="Enter keywords" id="searchbox" name="q"/>
+ <input type="hidden" id="site" name="site" value="SouthamptonOnline"/>
+ <input type="hidden" id="client" name="client" value="SouthamptonOnline"/>
+ <input type="hidden" id="proxystylesheet" name="proxystylesheet" value="SouthamptonOnline"/>
+ <input type="hidden" id="output" name="output" value="xml_no_dtd"/>
+ <input class="button" type="submit" value="search" />
+ </fieldset>
+ </form>
+ <form id="whereILive" method="post" action="http://www.southampton.gov.uk/MySoton/default.aspx">
+ <fieldset>
+ <label for="PostCode">Where I live
+ <img class="moreInfo" src="/cobrands/southampton/information.gif" alt="Find information about where you live" title="Find information about where you live" /><br />
+ </label>
+ <input id="PostCode" name="Postcode" class="text2" type="text" value="Enter street/postcode" />
+ <input class="button" type="submit" value="go" />
+ </fieldset>
+ </form>
+
+ </div>
+ <a class="mctv" href="http://www.southampton.mycounciltv.org"><img src="/cobrands/southampton/mctv.png" alt="Link to MyCouncilTV videos" /></a>
+ <ul id="topNav">
+ <li><a href="http://www.southampton.gov.uk/online/">Do it online</a></li>
+ <li><a href="http://www.southampton.gov.uk/customer-service/">Customer Services</a></li>
+ <li><a href="http://www.southampton.gov.uk/business/">Business</a></li>
+ <li><a href="http://www.southampton.gov.uk/s-environment/">Environment</a></li>
+ <li><a href="http://www.southampton.gov.uk/learning/">Learning</a></li>
+ <li><a href="http://www.southampton.gov.uk/s-leisure/">Leisure</a></li>
+ <li><a href="http://www.southampton.gov.uk/living/">Living</a></li>
+ <li><a href="http://www.southampton.gov.uk/council-partners/">Council/Partners</a></li>
+ <li><a href="http://www.southampton.gov.uk/news-events/">News and events</a></li>
+ <li><a href="http://www.southampton.gov.uk/visitors/">Visitors</a></li>
+ </ul>
+ <p class="atoz">A-Z of Council Services:</p>
+ <ul id="atoz">
+ <li><a href="http://www.southampton.gov.uk/atoz/default.aspx?L=A">A</a></li>
+ <li><a href="http://www.southampton.gov.uk/atoz/default.aspx?L=B">B</a></li>
+ <li><a href="http://www.southampton.gov.uk/atoz/default.aspx?L=C">C</a></li>
+ <li><a href="http://www.southampton.gov.uk/atoz/default.aspx?L=D">D</a></li>
+ <li><a href="http://www.southampton.gov.uk/atoz/default.aspx?L=E">E</a></li>
+ <li><a href="http://www.southampton.gov.uk/atoz/default.aspx?L=F">F</a></li>
+ <li><a href="http://www.southampton.gov.uk/atoz/default.aspx?L=G">G</a></li>
+ <li><a href="http://www.southampton.gov.uk/atoz/default.aspx?L=H">H</a></li>
+ <li><a href="http://www.southampton.gov.uk/atoz/default.aspx?L=I">I</a></li>
+ <li><a href="http://www.southampton.gov.uk/atoz/default.aspx?L=J">J</a></li>
+ <li><a href="http://www.southampton.gov.uk/atoz/default.aspx?L=K">K</a></li>
+ <li><a href="http://www.southampton.gov.uk/atoz/default.aspx?L=L">L</a></li>
+ <li><a href="http://www.southampton.gov.uk/atoz/default.aspx?L=M">M</a></li>
+ <li><a href="http://www.southampton.gov.uk/atoz/default.aspx?L=N">N</a></li>
+ <li><a href="http://www.southampton.gov.uk/atoz/default.aspx?L=O">O</a></li>
+ <li><a href="http://www.southampton.gov.uk/atoz/default.aspx?L=P">P</a></li>
+ <li><a href="http://www.southampton.gov.uk/atoz/default.aspx?L=Q">Q</a></li>
+ <li><a href="http://www.southampton.gov.uk/atoz/default.aspx?L=R">R</a></li>
+ <li><a href="http://www.southampton.gov.uk/atoz/default.aspx?L=S">S</a></li>
+ <li><a href="http://www.southampton.gov.uk/atoz/default.aspx?L=T">T</a></li>
+ <li><a href="http://www.southampton.gov.uk/atoz/default.aspx?L=U">U</a></li>
+ <li><a href="http://www.southampton.gov.uk/atoz/default.aspx?L=V">V</a></li>
+ <li><a href="http://www.southampton.gov.uk/atoz/default.aspx?L=W">W</a></li>
+ <li><a href="http://www.southampton.gov.uk/atoz/default.aspx?L=X">X</a></li>
+ <li><a href="http://www.southampton.gov.uk/atoz/default.aspx?L=Y">Y</a></li>
+ <li><a href="http://www.southampton.gov.uk/atoz/default.aspx?L=Z">Z</a></li>
+ </ul>
+ <ul id="contacts">
+ <li><a href="http://www.southampton.gov.uk/customer-service/contact/">Contact us</a></li>
+ <li><a href="http://map.southampton.gov.uk/gis/">location and maps</a></li>
+ </ul>
+
+ </div>
+
+ <!-- End of header -->
+
+
+ <!-- Start of menu bar -->
+
+ <div id="menuBar">
+ <ul id="leftMenu">
+ <li class="parent"><a href="/">Fix My Street</a></li>
+ <li class="selected"><a href="/">Report a problem</a></li>
+ <li><a href="/reports/Southampton">All reports</a></li>
+ <li><a href="/alerts">Local alerts</a></li>
+ <li><a href="/faq">Help</a></li>
+ <li><a href="/contact">Contact</a></li>
+ </ul>
+ </div>
+
+
+ <!-- End of menu bar -->
+
+
+ <!-- Start of main content area -->
+
+ <div id="contentArea">
+ <div id="mysociety">
diff --git a/templates/website/faq.html b/templates/website/faq-en-gb
index a0f364550..117a9bfa7 100755
--- a/templates/website/faq.html
+++ b/templates/website/faq-en-gb
@@ -29,8 +29,9 @@ or clearing</strong>, such as:
directly for problems such as</strong>:
<ul><li>Anti-social behaviour
-
+ <li>Any urgent or emergency problems
<li>Noise pollution or barking dogs
+ <li>Fires and smoke/smell pollution
<li>Missing wheelie bins or recycling boxes or missed rubbish collections
<li>Proposals for speed bumps/ CCTV/ pedestrian crossings/ new road layouts/ etc.
<li>Complaining about your neighbours
@@ -56,13 +57,19 @@ by a registered charity, though, so if you want to make a contribution, <a
href="https://secure.mysociety.org/donate/">please do</a>.</dd>
<dt>Can I use FixMyStreet on my mobile?</dt>
- <dd>There are two iPhone apps for FixMyStreet, one written by us in 2008 and
- another much more recently by a volunteer, Martin Stephenson. Both are available for
- download on the App Store:
+ <dd><ul>
+ <li><em>iPhone:</em> There are two apps for FixMyStreet, one written by us
+ in 2008 and another much more recently by a volunteer, Martin Stephenson.
+ Both are available for download on the App Store:
<a href="http://itunes.apple.com/gb/app/fixmystreet/id297456545">FixMyStreet</a>,
<a href="http://itunes.apple.com/gb/app/streetreport/id371891859">StreetReport</a>.
- There is an Android app written by a volunteer, Anna Powell-Smith,
- available from the Android Market.
+ <li><em>Android:</em> A volunteer, Anna Powell-Smith, has written an app
+ available from the
+ <a href="https://market.android.com/details?id=com.android.fixmystreet">Android Market</a>.
+ <li><em>Nokia:</em> A volunteer, Thomas Forth, has written an app available from the
+ <a href="http://store.ovi.com/content/107557">Ovi Store</a>.
+ </ul>
+ <p>We also hope to make the website itself much more mobile friendly in the future.</p>
</dd>
<dt>Why do you only cover the countries of Great Britain?</dt>
@@ -106,7 +113,7 @@ dragging an empty square.</dd>
this might mean that you&rsquo;ll need to pan around to figure out where the
problem is if you&rsquo;re not familiar with the area. If you&rsquo;re from the
council then the emailed version of the problem report will contain the
- closest postal address to the pin on the map.</dd>
+ closest road to the pin on the map.</dd>
<dt>This site is great – why aren&rsquo;t you better publicised?</dt>
<dd>As a tiny charity we simply don&rsquo;t have a publicity budget, and we
diff --git a/templates/website/header b/templates/website/header
index 028d05506..b88d9b82c 100644
--- a/templates/website/header
+++ b/templates/website/header
@@ -16,4 +16,4 @@
</head>
<body>
{{ $heading_element_start }}{{ $heading }}{{ $heading_element_end }}
- <div id="wrapper"><div id="content">
+ <div id="wrapper"><div id="mysociety">
diff --git a/templates/website/problem b/templates/website/problem
index aba6b009c..4debc1d2e 100644
--- a/templates/website/problem
+++ b/templates/website/problem
@@ -37,7 +37,7 @@
<input type="hidden" name="submit_update" value="1">
<input type="hidden" name="id" value="{{ $input_h{id} }}">
<div><label for="form_name">{{ $name_label }}</label>
-<input type="text" name="name" id="form_name" value="{{ $input_h{name} }}" size="20"> (optional)</div>
+<input type="text" name="name" id="form_name" value="{{ $input_h{name} }}" size="20"> {{ $optional }}</div>
{{ if ( $field_errors{email}) {
"<div class='form-error'>$field_errors{email}</div>";
} }}