diff options
Diffstat (limited to 'templates')
188 files changed, 1889 insertions, 1962 deletions
diff --git a/templates/email/default/problem-confirm-not-sending.txt b/templates/email/default/problem-confirm-not-sending.txt new file mode 100644 index 000000000..2443805bb --- /dev/null +++ b/templates/email/default/problem-confirm-not-sending.txt @@ -0,0 +1,32 @@ +Subject: Confirm your report on [% INCLUDE 'site-name.txt' | trim %] + +Hello [% report.name %], + +Please click on the link below to confirm that you want your report to appear +on [% INCLUDE 'site-name.txt' | trim %], despite not being sent to the +council: + +[% 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 %] + +If you no longer wish your report to be displayed on the site, please take no +further action. + +Thank you for supporting [% INCLUDE 'site-name.txt' | trim %]. + + + +[% INCLUDE 'signature.txt' %] + +This email was sent automatically, from an unmonitored email account - so +please do not reply to it. diff --git a/templates/email/default/test.txt b/templates/email/default/test.txt index bfa2c1dd3..1acd4b6ca 100644 --- a/templates/email/default/test.txt +++ b/templates/email/default/test.txt @@ -1,5 +1,4 @@ Subject: test email ☺ -From: bad-sender@duff.com Hello, diff --git a/templates/email/fixamingata/test.txt b/templates/email/fixamingata/test.txt deleted file mode 100644 index bfa2c1dd3..000000000 --- a/templates/email/fixamingata/test.txt +++ /dev/null @@ -1,15 +0,0 @@ -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/email/zurich/problem-closed.txt b/templates/email/zurich/problem-closed.txt index 392004504..b469e74c6 100644 --- a/templates/email/zurich/problem-closed.txt +++ b/templates/email/zurich/problem-closed.txt @@ -16,10 +16,6 @@ Ihre Meldung lautet: -Freundliche Grüsse - -Ihre Stadt Zürich - Dieses E-Mail wurde automatisch generiert. Bitte antworten Sie nicht darauf. diff --git a/templates/email/zurich/problem-confirm.txt b/templates/email/zurich/problem-confirm.txt index b945c6d59..d64d54e8c 100644 --- a/templates/email/zurich/problem-confirm.txt +++ b/templates/email/zurich/problem-confirm.txt @@ -2,7 +2,7 @@ Subject: Züri wie neu: Meldung #[% report.id %] Grüezi [% report.name %] -Besten Dank für Ihre Meldung auf <<Züri wie neu>>. Klicken Sie bitte auf diesen Link, um Ihre E-Mail-Adresse zu bestätigen und über den Status der Meldung informiert zu bleiben. Falls der Link nicht funktioniert, kopieren Sie ihn in Ihren Browser: +Besten Dank für Ihre Meldung auf <<Züri wie neu>>. Klicken Sie bitte auf diesen Link, um[% UNLESS email_confirmed %] Ihre E-Mail-Adresse zu bestätigen und[% END %] über den Status der Meldung informiert zu bleiben. Falls der Link nicht funktioniert, kopieren Sie ihn in Ihren Browser: [% token_url %] @@ -20,4 +20,6 @@ Freundliche Grüsse Ihre Stadt Zürich + + Dieses E-Mail wurde automatisch generiert. Bitte antworten Sie nicht darauf. diff --git a/templates/email/zurich/problem-external.txt b/templates/email/zurich/problem-external.txt index 09cc9c7ca..5645b0e1e 100644 --- a/templates/email/zurich/problem-external.txt +++ b/templates/email/zurich/problem-external.txt @@ -2,8 +2,7 @@ Subject: Züri wie neu: Meldung #[% problem.id %] Grüezi [% problem.name %] -Besten Dank für Ihre Meldung auf <<Züri wie neu>>. Wir haben Ihr Anliegen an [% problem.body(c).name %] -weitergeleitet, da es nicht in den Zuständigkeitsbereich der beteiligten Fachbereiche fällt. +[% problem.extra.public_response %] Unter: [% url %] @@ -16,11 +15,6 @@ Ihre Meldung lautet: -Freundliche Grüsse - -Ihre Stadt Zürich - - Dieses E-Mail wurde automatisch generiert. Bitte antworten Sie nicht darauf. diff --git a/templates/email/zurich/problem-rejected.txt b/templates/email/zurich/problem-rejected.txt index c3d375747..ac02ea19a 100644 --- a/templates/email/zurich/problem-rejected.txt +++ b/templates/email/zurich/problem-rejected.txt @@ -2,16 +2,7 @@ Subject: Züri wie neu: Meldung #[% problem.id %] Grüezi [% problem.name %] -Ihre Meldung wurde aufgrund des Inhalts zurückgewiesen. -Dies kann verschiedene Gründe haben wie zum Beispiel unzureichenden, nicht nachvollziehbaren oder diskriminierenden Inhalt. - -Bitte geben Sie die Meldung nochmals, mit möglichst detaillierten, sachlichen Informationen ein. - -Besten Dank für Ihr Verständnis. - -Freundliche Grüsse - -Ihre Stadt Zürich +[% problem.extra.public_response %] Ihre Meldung lautet: @@ -19,11 +10,6 @@ Ihre Meldung lautet: -Freundliche Grüsse - -Ihre Stadt Zürich - - Dieses E-Mail wurde automatisch generiert. Bitte antworten Sie nicht darauf. diff --git a/templates/email/zurich/problem-wish.txt b/templates/email/zurich/problem-wish.txt new file mode 100644 index 000000000..b7508c316 --- /dev/null +++ b/templates/email/zurich/problem-wish.txt @@ -0,0 +1,16 @@ +Subject: Züri wie neu: Meldung #[% problem.id %] + +Grüezi [% problem.name %] + +[% problem.extra.public_response %] + + +Ihre Meldung lautet: + +[% problem.detail %] + + + + +Dieses E-Mail wurde automatisch generiert. Bitte antworten Sie nicht darauf. + diff --git a/templates/email/zurich/reply-autoresponse.txt b/templates/email/zurich/reply-autoresponse.txt index 1e79549b3..884ea6dea 100644 --- a/templates/email/zurich/reply-autoresponse.txt +++ b/templates/email/zurich/reply-autoresponse.txt @@ -7,4 +7,5 @@ Dies ist eine automatische Antwort auf Ihr E-Mail. Ihr E-Mail wurde nicht überm Falls Sie eine Meldung erfassen möchten, tun Sie das bitte über die Hauptseite: [%# link to FMZ %] + Falls Sie Fragen zu <<Züri wie neu>> haben, senden Sie ein E-Mail an gis-zentrum@zuerich.ch diff --git a/templates/email/zurich/submit-external-personal.txt b/templates/email/zurich/submit-external-personal.txt index 5e0823871..593d047c9 100644 --- a/templates/email/zurich/submit-external-personal.txt +++ b/templates/email/zurich/submit-external-personal.txt @@ -2,7 +2,8 @@ Subject: Züri wie neu: Weitergeleitete Meldung #<?=$values['id']?> Grüezi <?=$values['bodies_name']?>, -Die folgende Meldung wurde auf http://www.stadt-zuerich.ch/zueriwieneu erfasst: +<?=$values['external_message']?> + Öffentliche URL: <?=$values['url']?> @@ -12,15 +13,5 @@ Email des Meldenden: <?=$values['email']?> Telefonnummer des Meldenden: <?=$values['phone']?> -"Züri wie neu" ist ein Pilotprojekt der Stadt Zürich zum Thema -Bürgerbeteiligung. Auf dieser Plattform kann die Bevölkerung auf Schäden und -Mängel an der städtischen Infrastruktur hinweisen. Diese Meldung wurde Ihnen -von der Stadt Zürich gesendet, da es Ihr Zuständigkeitsgebiet betreffen könnte. - -Bei Fragen zum Pilotprojekt "Züri wie neu" wenden Sie sich bitte an -gis-zentrum@zuerich.ch. - - -Freundliche Grüsse -Ihre Stadt Zürich +Bei Fragen zu "Züri wie neu" wenden Sie sich bitte an gis-zentrum@zuerich.ch.
\ No newline at end of file diff --git a/templates/email/zurich/submit-external-wish.txt b/templates/email/zurich/submit-external-wish.txt new file mode 100644 index 000000000..ec472f95f --- /dev/null +++ b/templates/email/zurich/submit-external-wish.txt @@ -0,0 +1,20 @@ +Subject: Züri wie neu: Weitergeleitete Meldung #<?=$values['id']?> + +Grüezi <?=$values['bodies_name']?>, + +<?=$values['external_message']?> + + +Name des Meldenden: <?=$values['name']?> + +Email des Meldenden: <?=$values['email']?> + +Telefonnummer des Meldenden: <?=$values['phone']?> + +Meldung: <?=$values['detail']?> + +Standort in AV-Online anzeigen: +http://webgis.intra.stzh.ch/AV_Online/Direct.asp?Map=AV&Search=Koord&West=<?=$values['west']?>&Nord=<?=$values['nord']?>&B=300 + + +Bei Fragen zu "Züri wie neu" wenden Sie sich bitte an gis-zentrum@zuerich.ch. diff --git a/templates/email/zurich/submit-external.txt b/templates/email/zurich/submit-external.txt index bf409dccc..d85c2f84f 100644 --- a/templates/email/zurich/submit-external.txt +++ b/templates/email/zurich/submit-external.txt @@ -2,19 +2,10 @@ Subject: Züri wie neu: Weitergeleitete Meldung #<?=$values['id']?> Grüezi <?=$values['bodies_name']?>, -Die folgende Meldung wurde auf http://www.stadt-zuerich.ch/zueriwieneu erfasst: +<?=$values['external_message']?> -Öffentliche URL: <?=$values['url']?> - -"Züri wie neu" ist eine Dienstleistung der Stadt Zürich zum Thema -Bürgerbeteiligung. Auf dieser Plattform kann die Bevölkerung auf Schäden und -Mängel an der städtischen Infrastruktur hinweisen. -Diese Meldung wurde Ihnen von der Stadt Zürich gesendet, da es Ihr -Zuständigkeitsgebiet betreffen könnte. - -Bei Fragen zu "Züri wie neu" wenden Sie sich bitte an gis-zentrum@zuerich.ch. +Öffentliche URL: <?=$values['url']?> -Freundliche Grüsse -Ihre Stadt Zürich +Bei Fragen zu "Züri wie neu" wenden Sie sich bitte an gis-zentrum@zuerich.ch.
\ No newline at end of file diff --git a/templates/web/arreglamibarrio/faq/faq-es.html b/templates/web/arreglamibarrio/faq/faq-es.html index 3d5397380..b9ab9842e 100644 --- a/templates/web/arreglamibarrio/faq/faq-es.html +++ b/templates/web/arreglamibarrio/faq/faq-es.html @@ -4,18 +4,18 @@ <ul class="plain-list">
<li><strong>Preguntas frecuentes</strong></li>
<li><a href="/privacy">Privacidad y cookies</a></li>
-<li><a href="/contact">Contacto [% PROCESS 'site-name.html' -%]</a></li>
+<li><a href="/contact">Contacto [% site_name %]</a></li>
</ul>
</aside>
</div>
<h1><a name="faq"></a>Preguntas frecuentes</h1>
<dl>
<dt>¿Qué es este sitio?</dt>
-<dd>[% PROCESS 'site-name.html' -%] es un sitio para ayudar a las personas a informar a su Administración local sobre averías o mal estado de nuestro espacio urgano, simplemente localizandolo en un mapa.</dd>
-<dt>¿Como puedo ponerme en contacto con [% PROCESS 'site-name.html' -%]?</dt>
+<dd>[% site_name %] es un sitio para ayudar a las personas a informar a su Administración local sobre averías o mal estado de nuestro espacio urgano, simplemente localizandolo en un mapa.</dd>
+<dt>¿Como puedo ponerme en contacto con [% site_name %]?</dt>
<dd>Esta es nuestra <a href="/contact">pagina de contacto</a>.</dd>
-<dt>¿Que tipo de problemas puedo notificar con [% PROCESS 'site-name.html' -%]?</dt>
-<dd>Esto depende de la finalidad de [% PROCESS 'site-name.html' -%];
+<dt>¿Que tipo de problemas puedo notificar con [% site_name %]?</dt>
+<dd>Esto depende de la finalidad de [% site_name %];
en el Reino Unido, FixMyStreet es principalmente para informar cosas que están rotas o sucias o dañadas o desechadas y hay que arreglar, de limpieza o de compensación, tales como:
<dl>
<dt>- vehículos abandonados<br>
@@ -29,9 +29,9 @@ <dd></dd>
</dl>
</dd>
-<dt>¿Para que NO es [% PROCESS 'site-name.html' -%] ?</dt>
+<dt>¿Para que NO es [% site_name %] ?</dt>
<dd> </dd>
-<dd>[% PROCESS 'site-name.html' -%] no debe usarse para ponerse en contacto con el Ayuntamiento para todas las incidencias - por favor utilice este sitio sólo para problemas como los anteriores. A menudo los informes de problemas siguen una burocracia y utilizar este sitio para asuntos urgentes pueden retrasarse en llegar al departamento correcto. Usted tendrá que ponerse en contacto con su autoridad directamente ante problemas como:
+<dd>[% site_name %] no debe usarse para ponerse en contacto con el Ayuntamiento para todas las incidencias - por favor utilice este sitio sólo para problemas como los anteriores. A menudo los informes de problemas siguen una burocracia y utilizar este sitio para asuntos urgentes pueden retrasarse en llegar al departamento correcto. Usted tendrá que ponerse en contacto con su autoridad directamente ante problemas como:
<ul>
<li>Comportamientos anti-sociales.
<li>Cualquier problema de urgencia o emergencias
@@ -51,25 +51,25 @@ <dd>Según los informes, se envía un correo electrónico al departamento pertinente. A partir de ese momento puede resolver el problema como normalmente lo haría. Alternativamente, se puede discutir el problema en el sitio web con los demás, y luego juntos requerir al Ayuntamiento que lo arregle, o fijarlo directamente en la web.</dd>
<dt>¿Es grátis? </dt>
<dd>Efectivamente el sitio es de uso gratuito. La plataforma arreglamibarrio.org es mantenido por la Asociación Observatorio Ciudadano Municipal de Alcantarilla, asociación sin ánimo de lucro registrada, así que si usted desea hacer una contribución puede hacerla.</dd>
-<dt>¿Puedo usar [% PROCESS 'site-name.html' -%] con mi móvil?</dt>
+<dt>¿Puedo usar [% site_name %] con mi móvil?</dt>
<dd>
-<p> [% PROCESS 'site-name.html' -%] la web funciona en su teléfono móvil, tiene un diseño "responsive" que se adapta al tamaño de su pantalla de forma automática.</p>
+<p> [% site_name %] la web funciona en su teléfono móvil, tiene un diseño "responsive" que se adapta al tamaño de su pantalla de forma automática.</p>
</dd>
</dl>
<h2><a name="practical"></a>Cuestiones prácticas </h2>
<dl>
<dt>Pertenezco a un Ayuntamiento, ¿dónde envían sus incidencias?</dt>
<dd>Usted puede crear una incidencia de prueba o contactarnos para saber dónde van los informes. Puede contactar con nosotros para actualizar la dirección o direcciones que utilizamos.</dd>
-<dt>Pertenezco a un Ayuntamiento, ¿podríamos tener [% PROCESS 'site-name.html' -%]
+<dt>Pertenezco a un Ayuntamiento, ¿podríamos tener [% site_name %]
en nuestra web?</dt>
<dd>Es posible, pongase en contacto con nosotros y lo estudiaremos </dd>
<dt>¿Eliminan contenido ilegal u ofensivo? </dt>
-<dd>[% PROCESS 'site-name.html' -%] no es responsable de el contenido o exactitud del material presentado por sus usuarios. Nos reservamos el derecho de editar o eliminar cualquier problema o actualizaciones que consideremos inadecuadas.</dd>
+<dd>[% site_name %] no es responsable de el contenido o exactitud del material presentado por sus usuarios. Nos reservamos el derecho de editar o eliminar cualquier problema o actualizaciones que consideremos inadecuadas.</dd>
<dt>¿Porque no puedo alejar más el zoom del mapa?</dt>
-<dd>Intentamos mantener a [% PROCESS 'site-name.html' -%] centrado en la localidad, por lo que restringimos el movimiento a las zonas cubiertas. El mapa le permitirá ver todos los informes que ha realizado, estén donde estén. Si usted es del Ayuntamiento, el correo electrónico de la incidencia también podría contener la ruta más cercana al pin en el mapa.</dd>
+<dd>Intentamos mantener a [% site_name %] centrado en la localidad, por lo que restringimos el movimiento a las zonas cubiertas. El mapa le permitirá ver todos los informes que ha realizado, estén donde estén. Si usted es del Ayuntamiento, el correo electrónico de la incidencia también podría contener la ruta más cercana al pin en el mapa.</dd>
<h2><a name="organisation"></a>Preguntas a la organización </h2>
<dl>
-<dt>¿Quién hizo [% PROCESS 'site-name.html' -%]?</dt>
+<dt>¿Quién hizo [% site_name %]?</dt>
<dd>La plataforma fue creada por mysociety.
<dt>¿Necesita ayuda con el proyecto? </dt>
<dd>Sí, toda ayuda, técnica o no técnica será bienvenida. Por favor, consulte nuestra página de participación.</dd>
diff --git a/templates/web/barnet/footer.html b/templates/web/barnet/footer.html index 60d834d5f..e5f8739b4 100644 --- a/templates/web/barnet/footer.html +++ b/templates/web/barnet/footer.html @@ -8,10 +8,10 @@ <div class="nav-wrapper"> <div class="nav-wrapper-2"> <div id="main-nav" role="navigation"> - <ul id="mysoc-menu"> + <ul class="nav-menu nav-menu--mysoc"> <li><a href="https://www.fixmystreet.com/council">Powered by <img src="/cobrands/barnet/img/fms-logo.png" style="height:20px;"></a></li> </ul> - <ul id="main-menu"> + <ul class="nav-menu nav-menu--main"> <li><[% IF c.req.uri.path == '/' %]span[% ELSE %]a href="/"[% END %] class="report-a-problem-btn" >[% loc("Report a problem") %]</[% c.req.uri.path == '/' ? 'span' : 'a' %]></li>[% %]<li><[% IF c.req.uri.path == '/my' %]span[% ELSE %]a href="/my"[% END diff --git a/templates/web/barnet/header.html b/templates/web/barnet/header.html index 101d444a7..bb89483cb 100644 --- a/templates/web/barnet/header.html +++ b/templates/web/barnet/header.html @@ -1,8 +1,8 @@ <!doctype html> -<!--[if lt IE 7]><html class="no-js ie6 oldie" lang="[% lang_code %]"><![endif]--> -<!--[if IE 7]> <html class="no-js ie7 oldie" lang="[% lang_code %]"><![endif]--> -<!--[if IE 8]> <html class="no-js ie8 oldie" lang="[% lang_code %]"><![endif]--> -<!--[if IE 9]> <html class="no-js ie9 oldie" lang="[% lang_code %]"><![endif]--> +<!--[if lt IE 7]><html class="no-js ie6 iel8" lang="[% lang_code %]"><![endif]--> +<!--[if IE 7]> <html class="no-js ie7 iel8" lang="[% lang_code %]"><![endif]--> +<!--[if IE 8]> <html class="no-js ie8 iel8" lang="[% lang_code %]"><![endif]--> +<!--[if IE 9]> <html class="no-js ie9" lang="[% lang_code %]"><![endif]--> <!--[if gt IE 9]><!--><html class="no-js" lang="[% lang_code %]"><!--<![endif]--> <head> <meta name="viewport" content="initial-scale=1.0"> diff --git a/templates/web/base/admin/category_edit.html b/templates/web/base/admin/category_edit.html index b827a4b6d..c0bd43ef5 100644 --- a/templates/web/base/admin/category_edit.html +++ b/templates/web/base/admin/category_edit.html @@ -43,6 +43,9 @@ [% IF c.cobrand.moniker != 'zurich' %] <input type="checkbox" name="non_public" value="1" id="non_public"[% ' checked' IF contact.non_public %]> <label class="inline" for="non_public">[% loc('Private') %]</label> + [% ELSE %] + <input type="checkbox" name="photo_required" value="1" id="photo_required"[% ' checked' IF contact.get_extra_metadata('photo_required') %]> + <label class="inline" for="photo_required">[% loc('Photo required') %]</label> [% END %] </p> diff --git a/templates/web/base/admin/config_page.html b/templates/web/base/admin/config_page.html index 7c9b5e317..71c524fb3 100644 --- a/templates/web/base/admin/config_page.html +++ b/templates/web/base/admin/config_page.html @@ -42,7 +42,7 @@ running version <strong>[% git_version || 'unknown' %]</strong>. [% INCLUDE subsection heading="Display" %] <tr> <td>Site title</td> - <td colspan=2>[% PROCESS 'site-name.html' -%]</td> + <td colspan=2>[% site_name %]</td> </tr> [% allowed_conf = FOR k IN c.config.ALLOWED_COBRANDS %] [% IF k.keys %][% k.items.join(':') %][% ELSE %][% k %][% END %] diff --git a/templates/web/base/admin/footer.html b/templates/web/base/admin/footer.html index 4c891c4ff..59ef6a32c 100644 --- a/templates/web/base/admin/footer.html +++ b/templates/web/base/admin/footer.html @@ -1 +1 @@ -[% INCLUDE 'footer.html' %] +[% INCLUDE 'footer.html' admin = 1 %] diff --git a/templates/web/base/admin/header.html b/templates/web/base/admin/header.html index 6282bf383..145bb986d 100644 --- a/templates/web/base/admin/header.html +++ b/templates/web/base/admin/header.html @@ -7,7 +7,7 @@ dd { margin-left: 8em; } select { width: auto; } </style> - <p><strong>[% loc('FixMyStreet admin:') %]</strong> + <p><strong>[% tprintf(loc('%s admin:', "%s here is the site name"), site_name) %]</strong> [%- FOREACH link IN allowed_links %] <a href="[% c.uri_for( link ) %]">[% allowed_pages.$link.0 %]</a> [% IF NOT loop.last %]|[% END %] diff --git a/templates/web/base/admin/index.html b/templates/web/base/admin/index.html index c9d2b8deb..dde6523a3 100644 --- a/templates/web/base/admin/index.html +++ b/templates/web/base/admin/index.html @@ -1,7 +1,8 @@ [% INCLUDE 'admin/header.html' title=loc('Summary') -%] +[% PROCESS 'admin/report_blocks.html' %] <div class="fms-admin-info fms-admin-floated"> -This is the administration interface for [% PROCESS 'site-name.html' -%]. If you +This is the administration interface for [% site_name %]. If you need any help or guidance, there is <a href="http://fixmystreet.org/">plenty of online documentation</a>. The FixMyStreet Platform is <a href="https://github.com/mysociety/fixmystreet">actively supported</a> by @@ -20,11 +21,9 @@ and to receive notices of updates. [% END %] [%- BLOCK states -%] -<h2>[% title %]</h2> - -[%- FOREACH state IN object.keys.sort %] +[%- FOREACH state IN list %] [%- '<ul>' IF loop.first %] - <li>[% object.$state %] [% state %]</li> + <li>[% object.$state %] [% state_pretty.$state %]</li> [%- "\n</ul>" IF loop.last %] [%- END %] [% END -%] @@ -44,18 +43,28 @@ and to receive notices of updates. </p> [% END -%] -[% PROCESS states title=loc('Problem breakdown by state') object=problems %] +<h2>[% loc('Problem breakdown by state') %]</h2> +[% FOREACH group IN state_groups %] +[%- '<ul>' IF loop.first %] + <li><strong>[% group.0 %]</strong> + [% PROCESS states object=problems list=group.1 %] + </li> +[%- "\n</ul>" IF loop.last %] +[%- END %] -[% PROCESS states title=loc('Update breakdown by state') object=comments %] +<h2>[% loc('Update breakdown by state') %]</h2> +[% PROCESS states object=comments list=comments.keys.sort %] -[% FOREACH category IN categories %] - [% IF loop.first %] - <h2>[% loc('Category fix rate for problems > 4 weeks old') %]</h2> +[% IF categories.size %] + <h2 id="category-fix-rate">[% loc('Category fix rate for problems > 4 weeks old') %]</h2> <table> <tr><th>[% loc('Category') %]</th><th>[% loc('Total') %]</th><th>[% loc('Fixed') %]</th></tr> - [% END %] +[% FOREACH category IN categories %] <tr><td>[% category.key %]</td><td>[% category.value.total %]</td><td>[% category.value.fixed / category.value.total * 100 | format('%.1f') %]%</td></tr> - [% '</table>' IF loop.last %] +[% END %] + </table> +[% ELSE %] +<p><a href="?show_categories=1#category-fix-rate">[% loc('Category fix rate for problems > 4 weeks old') %]</a></p> [% END %] [% INCLUDE 'admin/footer.html' %] diff --git a/templates/web/base/admin/list_updates.html b/templates/web/base/admin/list_updates.html index d3701bc1e..35f7adf66 100644 --- a/templates/web/base/admin/list_updates.html +++ b/templates/web/base/admin/list_updates.html @@ -34,7 +34,7 @@ <td>[% IF update.user.id == update.problem.user_id %][% loc('Yes') %][% ELSE %][% loc('No') %][% END %]</td> <td>[% IF update.user.belongs_to_body( update.problem.bodies_str ) %][% loc('Yes') %][% ELSE %][% loc('No') %][% END %]</td> <td>[% update.cobrand %]<br>[% update.cobrand_data | html %]</td> - <td>[% update.state %]<br><small> + <td>[% state_pretty.${update.state} %]<br><small> [% loc('Created:') %] [% PROCESS format_time time=update.created %] <br>[% loc('Confirmed:') %] [% PROCESS format_time time=update.confirmed %] </small></td> diff --git a/templates/web/base/admin/problem_row.html b/templates/web/base/admin/problem_row.html index 2413a6062..577e36992 100644 --- a/templates/web/base/admin/problem_row.html +++ b/templates/web/base/admin/problem_row.html @@ -30,7 +30,7 @@ [%- END -%] <br>[% problem.cobrand %]<br>[% problem.cobrand_data | html %] </td> - <td>[% problem.state %]<br><small> + <td>[% state_pretty.${problem.state} %]<br><small> [% loc('Created') %]: [% PROCESS format_time time=problem.created %] <br>[% loc('When sent') %]: [% PROCESS format_time time=problem.whensent %] [%- IF problem.is_visible %]<br>[% loc('Confirmed:' ) %] [% PROCESS format_time time=problem.confirmed %][% END -%] diff --git a/templates/web/base/admin/report_blocks.html b/templates/web/base/admin/report_blocks.html index c2cffc352..941bff821 100644 --- a/templates/web/base/admin/report_blocks.html +++ b/templates/web/base/admin/report_blocks.html @@ -1,3 +1,33 @@ +[% + +SET state_pretty = { + 'confirmed' = loc('Open') + 'investigating' = loc('Investigating') + 'planned' = loc('Planned') + 'in progress' = loc('In progress') + 'action scheduled' = loc('Action Scheduled') + 'fixed' = loc('Fixed') + 'fixed - user' = loc('Fixed - User') + 'fixed - council' = loc('Fixed - Council') + 'unable to fix' = loc('Unable to fix') + 'not responsible' = loc('Not Responsible') + 'duplicate' = loc('Duplicate') + 'closed' = loc('Closed') + 'internal referral' = loc('Internal referral') + 'hidden' = loc('Hidden') + 'partial' = loc('Partial') + 'unconfirmed' = loc('Unconfirmed') +}; + +SET state_groups = [ + [ loc('Open'), [ 'confirmed', 'investigating', 'planned', 'in progress', 'action scheduled' ] ], + [ loc('Fixed'), [ 'fixed', 'fixed - user', 'fixed - council' ] ], + [ loc('Closed'), [ 'unable to fix', 'not responsible', 'duplicate', 'closed', 'internal referral' ] ], + [ loc('Hidden'), [ 'hidden', 'partial', 'unconfirmed' ] ] +]; + +%] + [% BLOCK value_or_nbsp -%] [%- IF value %][% value | html %][% ELSE %] [% END %] [%- END %] diff --git a/templates/web/base/admin/report_edit.html b/templates/web/base/admin/report_edit.html index d488dcadc..d04a1a82b 100644 --- a/templates/web/base/admin/report_edit.html +++ b/templates/web/base/admin/report_edit.html @@ -45,28 +45,10 @@ class="admin-offsite-link">[% problem.latitude %], [% problem.longitude %]</a> <li>[% loc('Property address:') %] [% problem.extra.address | html %]</li> [% END %] <li><label class="inline" for="state">[% loc('State:') %]</label> <select name="state" id="state"> -[% FOREACH group IN [ - [ loc('Open'), [ - [ 'confirmed', loc('Open') ], [ 'investigating', loc('Investigating') ], - [ 'planned', loc('Planned') ], [ 'in progress', loc('In progress') ], - [ 'action scheduled', loc('Action Scheduled') ], - ] ], - [ loc('Fixed'), [ - [ 'fixed', loc('Fixed') ], [ 'fixed - user', loc('Fixed - User') ], - [ 'fixed - council', loc('Fixed - Council') ] - ] ], - [ loc('Closed'), [ - [ 'unable to fix', loc('Unable to fix') ], [ 'not responsible', loc('Not Responsible') ], - [ 'duplicate', loc('Duplicate') ], [ 'closed', loc('Closed') ], - [ 'internal referral', loc('Internal referral') ], - ] ], - [ loc('Hidden'), [ - [ 'hidden', loc('Hidden') ], [ 'partial', loc('Partial') ], [ 'unconfirmed',loc('Unconfirmed') ] - ] ] -] %] +[% FOREACH group IN state_groups %] <optgroup label="[% group.0 %]"> [% FOREACH state IN group.1 %] - <option [% 'selected ' IF state.0 == problem.state %] value="[% state.0 %]">[% state.1 %]</option> + <option [% 'selected ' IF state == problem.state %] value="[% state %]">[% state_pretty.$state %]</option> [% END %] </optgroup> [% END %] diff --git a/templates/web/base/alert/_list.html b/templates/web/base/alert/_list.html index 2ffcfae39..395948248 100644 --- a/templates/web/base/alert/_list.html +++ b/templates/web/base/alert/_list.html @@ -1,11 +1,13 @@ <input type="hidden" name="type" value="local"> <input type="hidden" name="pc" value="[% pc | html %]"> + <input type="hidden" name="latitude" value="[% latitude | html %]"> + <input type="hidden" name="longitude" value="[% longitude | html %]"> <p> [% IF pretty_pc %] [% tprintf( loc('Here are the types of local problem alerts for ‘%s’.'), pretty_pc ) %] [% END %] - [% loc('Select which type of alert you\'d like and click the button for an RSS feed, or enter your email address to subscribe to an email alert.') %] + [% loc('Select which type of alert you’d like and click the button for an RSS feed, or enter your email address to subscribe to an email alert.') %] </p> [% INCLUDE 'errors.html' %] @@ -16,14 +18,15 @@ <p id="rss_local"> <input type="radio" name="feed" id="[% rss_feed_id %]" value="[% rss_feed_id %]"[% IF rss_feed_id == selected_feed || selected_feed == '' %] checked[% END %]> - <label for="[% rss_feed_id %]">[% tprintf( loc('Problems within %.1fkm of this location'), population_radius ) %]</label> - [% loc('(a default distance which covers roughly 200,000 people)') %] <a href='[% rss_feed_uri %]'> - <img src='/i/feed.png' width='16' height='16' title='[% loc('RSS feed of nearby problems') %]' alt='[% loc('RSS feed') %]' border='0'></a> + <label class="inline" for="[% rss_feed_id %]">[% tprintf( loc('Problems within %.1fkm of this location'), population_radius ) %]</label> + <a href='[% rss_feed_uri %]'><img src='/i/feed.png' width='16' height='16' title='[% loc('RSS feed of nearby problems') %]' alt='[% loc('RSS feed') %]' border='0'></a> + <br /> + [% loc('(a default distance which covers roughly 200,000 people)') %] </p> <p id="rss_local_alt"> - [% loc('(alternatively the RSS feed can be customised, within') %] - <a href="[% rss_feed_2k %]">2km</a> / <a href="[% rss_feed_5k %]">5km</a> / <a href="[% rss_feed_10k %]">10km</a> / <a href="[% rss_feed_20k %]">20km</a>) + [% SET distance_options = '<a href="' _ rss_feed_2k _ ' ">2km</a> / <a href="' _ rss_feed_5k _ ' ">5km</a> / <a href="' _ rss_feed_10k _ '">10km</a> / <a href="' _ rss_feed_20k _ '">20km</a>' %] + [% tprintf(loc('(alternatively the RSS feed can be customised, within %s)', "%s is a list of distance links, e.g. [2km] / [5km] / [10km] / [20km]"), distance_options) %] </p> <p> @@ -35,21 +38,20 @@ </p> [% IF reported_to_options %] - <div id="rss_list"> <p><strong> [% loc('Problems within the boundary of:') %] </strong></p> <ul class="plain-list"> [% ELSE %] - <div><ul id="rss_feed"> + <ul id="rss_feed" class="plain-list"> [% END %] [% FOREACH option IN options %] <li[% IF ! (loop.count % 2) %] class="a"[% END %]> <input type="radio" name="feed" id="[% option.id %]" value="[% option.id %]"[% IF option.id == selected_feed %] checked[% END %]> - <label class="inline" for="[% option.id %]">[% option.text %]</label> <a href="[% option.uri %]"><img src="/i/feed.png" width="16" height="16" title="[% option.rss_text %]" alt="RSS feed" border="0"></a> + <label class="inline" for="[% option.id %]">[% option.text %]</label> </li> [% END %] </ul> @@ -61,40 +63,31 @@ title="[% option.rss_text %]" alt="RSS feed" border="0"></a> [% FOREACH option IN reported_to_options %] <li[% IF ! (loop.count % 2) %] class="a"[% END %]> <input type="radio" name="feed" id="[% option.id %]" value="[% option.id %]"[% IF option.id == selected_feed %] checked[% END %]> - <label class="inline" for="[% option.id %]">[% option.text %]</label> <a href="[% option.uri %]"><img src="/i/feed.png" width="16" height="16" title="[% option.rss_text %]" alt="RSS feed" border="0"></a> + <label class="inline" for="[% option.id %]">[% option.text %]</label> </li> [% END %] </ul> <p><small> - [% loc( 'FixMyStreet sends different categories of problem + [% tprintf(loc('%s sends different categories of problem to the appropriate council, so problems within the boundary of a particular council might not match the problems sent to that council. For example, a graffiti report will be sent to the district council, so will appear in both of the district council’s alerts, but will only appear in the "Within the boundary" alert -for the county council.' ) %] +for the county council.', "%s is the site name"), site_name) %] </small></p> -</div> -<div id="rss_buttons"> [% END %] - <p> - <input type="submit" name="rss" value="[% loc('Give me an RSS feed') %]"> - <p> + <input id="alert_rss_button" class="green-btn" type="submit" name="rss" value="[% loc('Give me an RSS feed') %]"> <p id="alert_or"> [% loc('or') %] </p> [% UNLESS c.user_exists %] - <p> - [% loc('Your email:') %] <input type="text" id="rznvy" name="rznvy" value="[% rznvy | html %]" size="30"> - </p> + <label for="rznvy">[% loc('Your email') %]</label> + <input type="text" id="rznvy" name="rznvy" value="[% rznvy | html %]"> [% END %] - - <p> - <input type="submit" name="alert" value="[% loc('Subscribe me to an email alert') %]"> - </p> - </div> <!-- ???? --> + <input id="alert_email_button" style="margin-top:1em;" class="green-btn" type="submit" name="alert" value="[% loc('Subscribe me to an email alert') %]"> diff --git a/templates/web/base/alert/index.html b/templates/web/base/alert/index.html index 314008846..2b12182df 100644 --- a/templates/web/base/alert/index.html +++ b/templates/web/base/alert/index.html @@ -4,13 +4,13 @@ <p> [% IF c.cobrand.is_council %] -FixMyStreet has a variety of RSS feeds and email alerts for local problems, including -alerts for all problems within a particular ward, or all problems -within a certain distance of a particular location. +[% tprintf(loc('%s has a variety of RSS feeds and email alerts for local +problems, including alerts for all problems within a particular ward, or all +problems within a certain distance of a particular location.', "%s is the site name"), site_name) %] [% ELSE %] -[% loc('FixMyStreet has a variety of RSS feeds and email alerts for local problems, including +[% tprintf(loc('%s has a variety of RSS feeds and email alerts for local problems, including alerts for all problems within a particular ward or council, or all problems -within a certain distance of a particular location.') %] +within a certain distance of a particular location.', "%s is the site name"), site_name) %] [% END %] </p> @@ -22,12 +22,12 @@ within a certain distance of a particular location.') %] <p> [% IF c.cobrand.is_council %] -To find out what local alerts we have for you, please enter your [% c.cobrand.council_area %] postcode or street name and area: +[% tprintf(loc('To find out what local alerts we have for you, please enter your %s postcode or street name and area:'), c.cobrand.council_area) %] [% ELSE %] [% loc('To find out what local alerts we have for you, please enter your postcode or street name and area' ) %] [% END %] </p> -<form method="get" action="/alert/list" class="full-width"> +<form method="get" action="/alert/list" class="form-box"> <fieldset> <div class="form-txt-submit-box"> <input type="text" name="pc" value="[% pc | html %]" placeholder="[% tprintf(loc('e.g. ‘%s’ or ‘%s’'), c.cobrand.example_places) %]"> diff --git a/templates/web/fixmystreet/around/around_index.html b/templates/web/base/around/_error_multiple.html index 2cd51da17..15089ba6b 100644 --- a/templates/web/fixmystreet/around/around_index.html +++ b/templates/web/base/around/_error_multiple.html @@ -1,14 +1,3 @@ -[% pre_container_extra = INCLUDE 'around/postcode_form.html' %] -[% INCLUDE 'header.html', title = loc('Reporting a problem'), bodyclass = 'frontpage fullwidthpage' %] - -[% - # NOTE ON PARTIAL REPORTS: - # - # partial reports get a bit of extra text added, the form goes to - # '/report/new' and the partial hidden field is added to the form. -%] - -<div class="tablewrapper"> [% IF location_error %] [% INCLUDE 'around/location_error.html' %] [% END %] @@ -28,6 +17,3 @@ [% loc("Thanks for uploading your photo. We now need to locate your problem, so please enter a nearby street name or postcode in the box above :") %] </p> [% END %] -</div> - -[% INCLUDE 'footer.html' %] diff --git a/templates/web/base/around/_main.html b/templates/web/base/around/_main.html new file mode 100644 index 000000000..1b832cb49 --- /dev/null +++ b/templates/web/base/around/_main.html @@ -0,0 +1,8 @@ +<form action="[% c.uri_for('/around') %]" method="get" name="mapForm" id="mapForm"> + <div id="side-form"> + <div id="report-a-problem-main"> + [% pre_container_extra %] + [% INCLUDE 'around/_error_multiple.html' %] + </div> + </div> +</form> diff --git a/templates/web/base/around/_report_banner.html b/templates/web/base/around/_report_banner.html index 024fe08d9..9fcfe3640 100755 --- a/templates/web/base/around/_report_banner.html +++ b/templates/web/base/around/_report_banner.html @@ -1,10 +1,6 @@ -<p id="text_map" class="banner"> - [% loc( 'To <strong>report a problem</strong>, click on the map at the correct location.' ) %] - [% - tprintf( - loc("<small>If you cannot see the map, <a href='%s' rel='nofollow'>skip this step</a>.</small>"), - url_skip - ) - %] - <span id="text_map_arrow"></span> -</p> +<h1 class="big-green-banner"> + [% loc( 'Click map to report a problem' ) %] +</h1> +<a id="skip-this-step" href="[% url_skip %]" rel="nofollow"> + [% loc("Can't see the map? <em>Skip this step</em>") %] +</a> diff --git a/templates/web/base/around/around_index.html b/templates/web/base/around/around_index.html deleted file mode 100644 index 3b2714643..000000000 --- a/templates/web/base/around/around_index.html +++ /dev/null @@ -1,27 +0,0 @@ -[% - SET bodyclass = 'mappage'; - INCLUDE 'header.html', title => loc('Reporting a problem') -%] - -<form action="[% c.uri_for('/around') %]" method="get" name="mapForm" id="mapForm"> - <div id="side-form"> - <div id="report-a-problem-main"> - [% INCLUDE 'around/postcode_form.html' %] - - [% IF location_error %] - [% INCLUDE 'around/location_error.html' %] - [% END %] - - [% 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="/around?latitude=[% match.latitude | uri %];longitude=[% match.longitude | uri %]">[% match.address | html %]</a></li> - [% END %] - </ul> - [% END %] - </div> - </div> -</form> - -[% INCLUDE 'footer.html' %] diff --git a/templates/web/base/around/around_map_list_items.html b/templates/web/base/around/around_map_list_items.html deleted file mode 100644 index da75561b5..000000000 --- a/templates/web/base/around/around_map_list_items.html +++ /dev/null @@ -1,18 +0,0 @@ -[% IF around_map.size %] - [% FOREACH p IN around_map %] - - [% dist = tprintf("%.1f", (p.distance || 0) ) %] - - <li> - <a href="[% c.uri_for('/report', p.problem.id ) %]">[% p.problem.title | html %]</a> - <small>[% prettify_dt( p.problem.confirmed, 1 ) %], [% dist %]km</small> - [% IF p.problem.is_fixed %] - <small>[% loc('(fixed)') %]</small> - [% ELSIF p.problem.is_closed %] - <small>[% loc('(closed)') %]</small> - [% END %] - </li> - [% END %] -[% ELSE %] - <li>[% loc('No problems found.') %]</li> -[% END %] diff --git a/templates/web/base/around/display_location.html b/templates/web/base/around/display_location.html index 3f4ec8881..d38ae6754 100755 --- a/templates/web/base/around/display_location.html +++ b/templates/web/base/around/display_location.html @@ -30,7 +30,7 @@ PROCESS "maps/${map.type}.html" around_page = 1; SET bodyclass = 'mappage'; - SET rss = [ loc('Recent local problems, FixMyStreet'), rss_url ] IF c.cobrand.moniker != 'emptyhomes'; + SET rss = [ tprintf(loc('Recent local problems, %s', "%s is the site name"), site_name), rss_url ] IF c.cobrand.moniker != 'emptyhomes'; INCLUDE 'header.html', title => loc('Viewing a location') robots => 'noindex,nofollow'; diff --git a/templates/web/base/around/index.html b/templates/web/base/around/index.html new file mode 100644 index 000000000..f2be5575c --- /dev/null +++ b/templates/web/base/around/index.html @@ -0,0 +1,13 @@ +[% pre_container_extra = INCLUDE 'around/postcode_form.html' %] +[% INCLUDE 'header.html', title = loc('Reporting a problem'), bodyclass = 'frontpage fullwidthpage' %] + +[% + # NOTE ON PARTIAL REPORTS: + # + # partial reports get a bit of extra text added, the form goes to + # '/report/new' and the partial hidden field is added to the form. +%] + +[% INCLUDE 'around/_main.html' %] + +[% INCLUDE 'footer.html' %] diff --git a/templates/web/fixmystreet/around/intro.html b/templates/web/base/around/intro.html index d71dad1d5..d71dad1d5 100644 --- a/templates/web/fixmystreet/around/intro.html +++ b/templates/web/base/around/intro.html diff --git a/templates/web/base/around/location_error.html b/templates/web/base/around/location_error.html index 9b907b64b..fc9b2b8ce 100644 --- a/templates/web/base/around/location_error.html +++ b/templates/web/base/around/location_error.html @@ -1 +1 @@ -<p class="error">[% location_error %]</p> +<p class="form-error">[% location_error %]</p> diff --git a/templates/web/base/around/on_map_list_items.html b/templates/web/base/around/on_map_list_items.html index 70a071406..b7257030d 100644 --- a/templates/web/base/around/on_map_list_items.html +++ b/templates/web/base/around/on_map_list_items.html @@ -1,15 +1,14 @@ -[% IF on_map.size %] - [% FOREACH p IN on_map %] - <li> - <a href="[% c.uri_for('/report', p.id ) %]">[% p.title | html %]</a> - <small>[% prettify_dt( p.confirmed, 1 ) %]</small> - [% IF p.is_fixed %] - <small>[% loc('(fixed)') %]</small> - [% ELSIF p.is_closed %] - <small>[% loc('(closed)') %]</small> - [% END %] - </li> +[% all_reports = on_map.merge(around_map) %] +[% IF all_reports.size %] + [% FOREACH problem IN all_reports %] + [% UNLESS problem.title; + dist = tprintf("%.1f", (problem.distance || 0) ); + problem = problem.problem; + END %] + [% INCLUDE 'reports/_list-entry.html' %] [% END %] [% ELSE %] - <li>[% loc('No problems have been reported yet.') %]</li> + <li class="item-list__item item-list__item--empty"> + <p>[% loc('There are no reports to show.') %]</p> + </li> [% END %] diff --git a/templates/web/base/around/postcode_form.html b/templates/web/base/around/postcode_form.html index f58d7285d..601f0ee9e 100644 --- a/templates/web/base/around/postcode_form.html +++ b/templates/web/base/around/postcode_form.html @@ -1,13 +1,26 @@ -[% - question = c.cobrand.enter_postcode_text || loc('Enter a nearby street name and area'); -%] - -<form action="[% c.uri_for('/around') %]" method="get" name="postcodeForm" id="postcodeForm"> - <label for="pc">[% question %]:</label> - <span><input type="text" name="pc" value="[% pc | html %]" id="pc" size="10" maxlength="200"> - <input type="submit" value="[% loc('Go') %]" id="sub"> - </span> - [% IF partial_token %] - <input type="hidden" name="partial" value="[% partial_token.token %]"> - [% END %] -</form> +<div id="front-main"> + <div id="front-main-container"> + [% INCLUDE 'around/intro.html' %] + + [% + question = c.cobrand.enter_postcode_text || loc('Enter a nearby street name and area'); + %] + + [% IF c.cobrand.moniker == 'fixmybarangay' %] + [% INCLUDE '_barangay_buttons.html' %] + [% ELSE %] + <form action="[% c.uri_for('/around') %]" method="get" name="postcodeForm" id="postcodeForm"> + <label for="pc">[% question %]:</label> + <div> + <input type="text" name="pc" value="[% pc | html %]" id="pc" size="10" maxlength="200" placeholder="[% tprintf(loc('e.g. ‘%s’ or ‘%s’'), c.cobrand.example_places) %]"> + <input type="submit" value="[% loc('Go') %]" id="sub"> + </div> + + [% IF partial_token %] + <input type="hidden" name="partial" value="[% partial_token.token %]"> + [% END %] + + </form> + [% END %] + </div> +</div> diff --git a/templates/web/base/around/tabbed_lists.html b/templates/web/base/around/tabbed_lists.html index 4ad7b35fc..b0d46444d 100755 --- a/templates/web/base/around/tabbed_lists.html +++ b/templates/web/base/around/tabbed_lists.html @@ -1,23 +1,5 @@ -<div id="nearby_lists"> - - <h2>[% loc('Reports on and around the map') %]</h2> - - <ul id="current"> - [% INCLUDE "around/on_map_list_items.html" %] - </ul> - - <h2> - [% - tprintf( - loc( 'Closest nearby problems <small>(within %skm)</small>' ), - distance - ) - %] - </h2> - - <ul id="current_near"> - [% INCLUDE "around/around_map_list_items.html" %] - </ul> - -</div> +[% INCLUDE "reports/_list-filters.html" %] +<ul id="current" class="item-list item-list--reports"> + [% INCLUDE "around/on_map_list_items.html" %] +</ul> diff --git a/templates/web/base/auth/general.html b/templates/web/base/auth/general.html index f5e2e423f..6e1db86fe 100644 --- a/templates/web/base/auth/general.html +++ b/templates/web/base/auth/general.html @@ -1,83 +1,70 @@ -[% INCLUDE 'header.html', title = loc('Sign in or create an account') %] +[% INCLUDE 'header.html', bodyclass='authpage', title = loc('Sign in or create an account') %] <h1>[% loc('Sign in') %]</h1> <form action="[% c.uri_for() %]" method="post" name="general_auth" class="validate"> -<input type="hidden" name="r" value="[% c.req.params.r | html %]"> - - [% IF email_error; - - # other keys include fqdn, mxcheck if you'd like to write a custom error message - - errors = { - missing => loc('Please enter your email'), - other => loc('Please check your email address is correct') - }; - - loc_email_error = errors.$email_error || errors.other; - END %] - - [% IF loc_email_error %] + <fieldset> + + <input type="hidden" name="r" value="[% c.req.params.r | html %]"> + + [% IF email_error; + + # other keys include fqdn, mxcheck if you'd like to write a custom error message + + errors = { + missing => loc('Please enter your email'), + other => loc('Please check your email address is correct') + }; + + loc_email_error = errors.$email_error || errors.other; + END %] + + <label class="n" for="email">[% loc('Email') %]</label> + [% IF loc_email_error %] <div class="form-error">[% loc_email_error %]</div> - [% ELSIF sign_in_error %] + [% ELSIF sign_in_error %] <div class="form-error">[% loc('There was a problem with your email/password combination. If you cannot remember your password, or do not have one, please fill in the ‘sign in by email’ section of the form.') %]</div> - [% END %] - - <div class="form-field"> - <label class="n" for="email">[% loc('Your email address:') %]</label> - <input type="email" class="required email" size="30" id="email" name="email" value="[% email | html %]"> - </div> - -<div id="form_sign_in"> - <h3>[% loc("Do you have a FixMyStreet password?") %]</h3> - - <div id="form_sign_in_yes"> - - <p> - <label class="n" for="password_sign_in">[% loc('<strong>Yes</strong> I have a password') %]</label> - <input type="password" name="password_sign_in" id="password_sign_in" value=""> - </p> - - <p> - <input type="checkbox" id="remember_me" name="remember_me" value='1'[% ' checked' IF remember_me %]> - <label class="n" for="remember_me"> - [% loc('Keep me signed in on this computer') %] - </label> - </p> - - <p> - <input type="submit" name="sign_in" value="[% loc('Sign in') %]"> - </p> - - </div> - <div id="form_sign_in_no"> - - <p>[% loc('<strong>No</strong>, I do not, let me sign in by email:') %]</p> - - <div class="fieldset"> - <div class="form-field"> - <label for="name">[% loc('Your name:') %]</label> - <input type="text" name="name" value=""> - </div> + [% END %] + <input type="email" class="required email" id="email" name="email" value="[% email | html %]" placeholder="[% loc('Your email address') %]" autofocus> + + <div id="form_sign_in"> + <h3>[% tprintf(loc("Do you have a %s password?", "%s is the site name"), site_name) %]</h3> + + <div id="form_sign_in_yes" class="form-box"> + <h5>[% loc('<strong>Yes</strong> I have a password') %]</h5> + + <label class="hidden-js n" for="password_sign_in">[% loc('Password:') %]</label> + + <div class="form-txt-submit-box"> + <input type="password" name="password_sign_in" id="password_sign_in" value="" placeholder="[% loc('Your password') %]"> + <input class="green-btn" type="submit" name="sign_in" value="[% loc('Sign in') %]"> + </div> + + <input type="checkbox" id="remember_me" name="remember_me" value='1'[% ' checked' IF remember_me %]> + <label class="inline n" for="remember_me">[% loc('Keep me signed in on this computer') %]</label> - <div class="form-field"> - <label for="password_register">[% loc('Enter a new password:') %]</label> - <input type="password" name="password_register" id="password_register" value=""> </div> - </div> + <div id="form_sign_in_no" class="form-box"> + <h5>[% loc('<strong>No</strong> let me sign in by email') %]</h5> - <p><small>Providing a name and password is optional, but doing so - will allow you to more easily report problems, leave updates and - manage your reports.</small></p> + <label for="name">[% loc('Name') %]</label> + <input type="text" name="name" value="" placeholder="[% loc('Your name') %]"> - <p> - <input type="submit" name="email_sign_in" value="[% loc('Sign in by email') %]"> - </p> + <label for="password_register">[% loc('Password (optional)') %]</label> - </div> + <div class="general-notes"> + <p>[% loc('Providing a name and password is optional, but doing so will allow you to more easily report problems, leave updates and manage your reports.') %]</p> + </div> + + <div class="form-txt-submit-box"> + <input type="password" name="password_register" id="password_register" value="" placeholder="[% loc('Enter a password') %]"> + <input class="green-btn" type="submit" name="email_sign_in" value="[% loc('Sign in') %]"> + </div> + </div> + + </div> -</div> - + </fieldset> </form> diff --git a/templates/web/base/auth/token.html b/templates/web/base/auth/token.html index 361d4fbd5..a4dedcec3 100644 --- a/templates/web/base/auth/token.html +++ b/templates/web/base/auth/token.html @@ -1,25 +1,27 @@ -[% INCLUDE 'header.html', title => loc('Confirm account') %] +[% INCLUDE 'header.html', bodyclass = 'fullwidthpage', title = loc('Confirm account') %] [% IF token_not_found %] +[%# Shown whenever there's an invalid token, eg while confirming a report or logging in without a password %] -<h1>[% loc('Error') %]</h1> + <div class="confirmation-header confirmation-header--failure"> -<p> - [% loc('We have not been able to confirm your account - sorry.') %] - [% loc('This may be because the link is too old or already used, or the address was not copied correctly.') %] -</p> + <h1>[% loc('Sorry, that wasn’t a valid link') %]</h1> + <p>[% loc('The link might have expired, or maybe you didn’t quite copy and paste it correctly.') %]</p> + + </div> [% ELSE %] -<h1>[% loc('Please check your email') %]</h1> + <div class="confirmation-header confirmation-header--inbox"> -<p>[% loc("We have sent you an email containing a link to confirm your account.") %]</p> + <h1>[% loc("Nearly done! Now check your email…") %]</h1> + <p>[% loc("Click the link in our confirmation email to sign in.") %]</p> -[% IF c.cobrand.moniker != 'zurich' %] -<p>[% loc("The confirmation email <strong>may</strong> take a few minutes to arrive — <em>please</em> be patient.") %]</p> -[% END %] + <p> + [% loc("Can’t find our email? Check your spam folder – that’s the solution 99% of the time.") %] + </p> -<p>[% loc("If you use web-based email or have 'junk mail' filters, you may wish to check your bulk/spam mail folders: sometimes, our messages are marked that way.") %]</p> + </div> [% END %] diff --git a/templates/web/base/common_header_tags.html b/templates/web/base/common_header_tags.html index 16098b7f5..0ad3ffb5f 100644 --- a/templates/web/base/common_header_tags.html +++ b/templates/web/base/common_header_tags.html @@ -42,5 +42,5 @@ <title> [% "$title :: " | html IF title %] - [% PROCESS 'site-name.html' -%] + [% site_name -%] </title> diff --git a/templates/web/base/contact/blurb.html b/templates/web/base/contact/blurb.html index 22c9a3cef..463813449 100644 --- a/templates/web/base/contact/blurb.html +++ b/templates/web/base/contact/blurb.html @@ -1,6 +1,6 @@ <p> [% loc('Please do <strong>not</strong> report problems through this form; messages go to -the team behind FixMyStreet, not a council. To report a problem, +the team behind this site, not a council. To report a problem, please <a href="/">go to the front page</a> and follow the instructions.') %] </p> diff --git a/templates/web/base/email_sent.html b/templates/web/base/email_sent.html index 8d7b35a58..7d38f9d67 100644 --- a/templates/web/base/email_sent.html +++ b/templates/web/base/email_sent.html @@ -1,34 +1,23 @@ -[% INCLUDE 'header.html', bodyclass = 'twothirdswidthpage', title = loc('Create a report') %] +[% INCLUDE 'header.html', bodyclass = 'fullwidthpage', title = loc('Create a report') %] -<h1>[% loc("Nearly Done! Now check your email...") %]</h1> +<div class="confirmation-header confirmation-header--inbox"> -[% IF c.cobrand.moniker != 'zurich' %] - <p>[% loc("The confirmation email <strong>may</strong> take a few minutes to arrive — <em>please</em> be patient.") %]</p> -[% END %] + <h1>[% loc("Nearly done! Now check your email…") %]</h1> -<p>[% loc("If you use web-based email or have 'junk mail' filters, you may wish to check your bulk/spam mail folders: sometimes, our messages are marked that way.") %]</p> - -[% IF c.cobrand.moniker != 'zurich' %] <p> - [% loc("You must now click the link in the email we've just sent you.") %] [% IF email_type == 'problem' %] - [% loc("If you do not, your problem will not be posted.") %] + [% loc("Click the link in our confirmation email to publish your problem.") %] [% ELSIF email_type == 'update' %] - [% loc("If you do not, your update will not be posted.") %] + [% loc("Click the link in our confirmation email to publish your update.") %] [% ELSIF email_type == 'alert' %] - [% loc("If you do not, your alert will not be activated.") %] + [% loc("Click the link in our confirmation email to activate your alert.") %] [% END %] </p> <p> - [% IF email_type == 'problem' %] - [% loc("(Don't worry — we'll hang on to your problem report while you're checking your email.)") %] - [% ELSIF email_type == 'update' %] - [% loc("(Don't worry — we'll hang on to your update while you're checking your email.)") %] - [% ELSIF email_type == 'alert' %] - [% loc("(Don't worry — we'll hang on to your alert while you're checking your email.)") %] - [% END %] + [% loc("Can’t find our email? Check your spam folder – that’s the solution 99% of the time.") %] </p> -[% END %] + +</div> [% INCLUDE 'footer.html' %] diff --git a/templates/web/base/faq/faq-en-gb.html b/templates/web/base/faq/faq-en-gb.html index e1e07a8d7..b60f1102a 100755 --- a/templates/web/base/faq/faq-en-gb.html +++ b/templates/web/base/faq/faq-en-gb.html @@ -3,27 +3,27 @@ <div class="sticky-sidebar"> <aside> <ul class="plain-list"> - <li><strong>Frequently Asked Questions</strong></li> - <li><a href="/privacy">Privacy and cookies</a></li> - <li><a href="/contact">Contact [% PROCESS 'site-name.html' -%]</a></li> + <li><strong>[% loc('Frequently Asked Questions') %]</strong></li> + <li><a href="/privacy">[% loc('Privacy and cookies') %]</a></li> + <li><a href="/contact">[% tprintf(loc("Contact %s", "%s is the site name"), site_name) %]</a></li> </ul> </aside> </div> -<h1><a name="faq"></a>Frequently Asked Questions</h1> +<h1><a name="faq"></a>[% loc('Frequently Asked Questions') %]</h1> <dl> <dt>What is this site?</dt> - <dd>[% PROCESS 'site-name.html' -%] is a site to help people report to their + <dd>[% site_name %] is a site to help people report to their local authority, view, or discuss local issues they’ve found, by simply locating them on a map.</dd> - <dt>How do I get in touch with [% PROCESS 'site-name.html' -%]?</dt> + <dt>How do I get in touch with [% site_name %]?</dt> <dd>Here’s our <a href="/contact">contact page</a>.</dd> - <dt>What sort of problems should I report with [% PROCESS 'site-name.html' -%]?</dt> - <dd>This depends upon the precise purpose of [% PROCESS 'site-name.html' -%]; + <dt>What sort of problems should I report with [% site_name %]?</dt> + <dd>This depends upon the precise purpose of [% site_name %]; in the UK, FixMyStreet is primarily for reporting things which are <strong>broken or dirty or damaged or dumped, and need fixing, cleaning or clearing</strong>, such as: @@ -38,8 +38,8 @@ </ul> </dd> - <dt>What isn’t [% PROCESS 'site-name.html' -%] for?</dt> - <dd>[% PROCESS 'site-name.html' -%] is not a way of getting in touch with your + <dt>What isn’t [% site_name %] for?</dt> + <dd>[% site_name %] is not a way of getting in touch with your authority for all issues – please use this site only for problems such as the above. We often route problem reports via cleansing services or highways and so using this site for other matters may result in a delay in @@ -75,9 +75,9 @@ a registered charity, so if you want to make a contribution, <a href="https://www.mysociety.org/donate/">please do</a>.</dd> - <dt>Can I use [% PROCESS 'site-name.html' -%] on my mobile?</dt> + <dt>Can I use [% site_name %] on my mobile?</dt> <dd> - <p>The [% PROCESS 'site-name.html' -%] website will already work on your mobile + <p>The [% site_name %] website will already work on your mobile phone, adapting to the size of your screen automatically.</p> </dd> </dl> @@ -90,18 +90,18 @@ to find out where reports go at the moment. Also <a href="/contact">contact us</a> to update the address or addresses we use.</dd> - <dt>I’m from an authority, can we have [% PROCESS 'site-name.html' -%] + <dt>I’m from an authority, can we have [% site_name %] on our website?</dt> <dd>Quite possibly – contact the people who run this site.</dd> <dt>Do you remove silly or illegal content?</dt> - <dd>[% PROCESS 'site-name.html' -%] is not responsible for the content and + <dd>[% site_name %] is not responsible for the content and accuracy of material submitted by its users. We reserve the right to edit or remove any problems or updates which we consider to be inappropriate upon being informed by a user of the site.</dd> <dt>Why can’t I zoom out more on the reporting map?</dt> - <dd>We want to keep [% PROCESS 'site-name.html' -%] locally focused, so restrict + <dd>We want to keep [% site_name %] locally focused, so restrict the ability to move radically between areas. The map on Your Reports will let you see all the reports you’ve made, wherever they are. If you’re from the authority then the emailed version of the problem @@ -111,7 +111,7 @@ to update the address or addresses we use.</dd> <h2><a name="organisation"></a>Organisation Questions</h2> <dl> - <dt>Who built [% PROCESS 'site-name.html' -%]?</dt> + <dt>Who built [% site_name %]?</dt> <dd>This will depend upon the installation of the FixMyStreet Platform, who should create their own <code>faq/</code> template in their cobrand directory to replace this default one. The FixMyStreet Platform was diff --git a/templates/web/base/footer.html b/templates/web/base/footer.html index a58a3e696..3f4e5b551 100644 --- a/templates/web/base/footer.html +++ b/templates/web/base/footer.html @@ -21,11 +21,9 @@ <div id="footer"> - <p><a href="/contact">[% loc("Contact FixMyStreet") | replace(' ', ' ') %]</a></p> + <p><a href="/contact">[% tprintf(loc("Contact %s", "%s is the site name"), site_name) | replace(' ', ' ') %]</a></p> - <p>[% loc('Are you a <strong>developer</strong>? Would you like to contribute to FixMyStreet?') %] - [% loc('Our code is open source and <a href="http://github.com/mysociety/fixmystreet">available on GitHub</a>.') %] - </p> + [% INCLUDE 'front/footer-marketing.html' %] </div> diff --git a/templates/web/base/front/_list-entry.html b/templates/web/base/front/_list-entry.html new file mode 100755 index 000000000..2fcf5f296 --- /dev/null +++ b/templates/web/base/front/_list-entry.html @@ -0,0 +1 @@ +[% INCLUDE 'report/_item.html' no_fixed = 1 %] diff --git a/templates/web/fixmystreet/front/footer-marketing.html b/templates/web/base/front/footer-marketing.html index 249dbca8d..c0c9b4168 100644 --- a/templates/web/fixmystreet/front/footer-marketing.html +++ b/templates/web/base/front/footer-marketing.html @@ -9,7 +9,7 @@ <div id="footer-help"> <p> - Powered by <a class="platform-logo" href="http://fixmystreet.org/">FixMyStreet Platform</a> + [% loc('Powered by <a class="platform-logo" href="http://fixmystreet.org/">FixMyStreet Platform</a>') %] </p> <ul> <li> diff --git a/templates/web/fixmystreet/front/javascript.html b/templates/web/base/front/javascript.html index 13aa5216c..13aa5216c 100644 --- a/templates/web/fixmystreet/front/javascript.html +++ b/templates/web/base/front/javascript.html diff --git a/templates/web/base/front/recent.html b/templates/web/base/front/recent.html new file mode 100644 index 000000000..cb83c51b8 --- /dev/null +++ b/templates/web/base/front/recent.html @@ -0,0 +1,23 @@ +[% + recent_photos = c.cobrand.recent_photos('front', 5); +%] + +[% IF recent_photos.size %] +<div id="front-recently"> + <h2> + [%- IF c.cobrand.moniker == 'hart' %] + Recently reported + [% ELSE %] + [% loc('Recently reported problems') %] + [% END -%] + </h2> + + <section class="full-width"> + <ul class="item-list item-list--reports item-list--front-page"> + [% FOREACH problem IN recent_photos %] + [% INCLUDE 'front/_list-entry.html' %] + [% END %] + </ul> + </section> +</div> +[% END %] diff --git a/templates/web/base/header.html b/templates/web/base/header.html index e6362a449..1d7960661 100644 --- a/templates/web/base/header.html +++ b/templates/web/base/header.html @@ -1,7 +1,7 @@ <!doctype html> -<!--[if lt IE 7]><html class="no-js ie6 oldie" lang="[% lang_code %]"><![endif]--> -<!--[if IE 7]> <html class="no-js ie7 oldie" lang="[% lang_code %]"><![endif]--> -<!--[if IE 8]> <html class="no-js ie8 oldie" lang="[% lang_code %]"><![endif]--> +<!--[if lt IE 7]><html class="no-js ie6 iel8" lang="[% lang_code %]"><![endif]--> +<!--[if IE 7]> <html class="no-js ie7 iel8" lang="[% lang_code %]"><![endif]--> +<!--[if IE 8]> <html class="no-js ie8 iel8" lang="[% lang_code %]"><![endif]--> <!--[if gt IE 8]><!--><html class="no-js" lang="[% lang_code %]"><!--<![endif]--> <head> <meta name="viewport" content="initial-scale=1.0"> @@ -11,6 +11,8 @@ <meta name="HandHeldFriendly" content="true"> <meta name="mobileoptimized" content="0"> + [% INCLUDE 'header_opengraph.html' %] + <link rel="stylesheet" href="[% version('/css/core.css') %]"> [% INCLUDE 'common_header_tags.html' %] @@ -24,14 +26,16 @@ %][% loc('FixMyStreet') %] [%- IF NOT title AND NOT c.req.path %]</h1>[% ELSE %]</a></div>[% END %] - <ul id="meta"> - [% IF c.user_exists %] - <li>[% tprintf(loc('Signed in as %s'), c.user.name || c.user.email) %] - <li class="last"><a href="/auth/sign_out">[% loc('Sign out') %]</a></li> - [% ELSE %] - <li> </li> - [% END %] - </ul> + [% IF c.user_exists %] + <div id="user-meta"> + <p> + [% tprintf(loc('Hi %s'), c.user.name || c.user.email) %] + <a href="/auth/sign_out">[% loc('sign out') %]</a> + </p> + </div> + [% END %] + + [% pre_container_extra %] <div id="mysociety" class="container" role="main"> diff --git a/templates/web/base/header_opengraph.html b/templates/web/base/header_opengraph.html index e69de29bb..f728d083f 100644 --- a/templates/web/base/header_opengraph.html +++ b/templates/web/base/header_opengraph.html @@ -0,0 +1,6 @@ + <meta property="og:url" content="[% c.cobrand.base_url %][% c.req.uri.path %]"> + <meta property="og:title" content="[% title || site_name %]"> + <meta property="og:site_name" content="[% site_name %]"> + [% IF c.req.uri.path == '/' %]<meta property="og:description" content="Report, view, and discuss local street-related problems.">[% END %] + <meta property="og:type" content="website"> + [% INCLUDE 'header_opengraph_image.html' %] diff --git a/templates/web/base/header_opengraph_image.html b/templates/web/base/header_opengraph_image.html new file mode 100644 index 000000000..7ec1aabb0 --- /dev/null +++ b/templates/web/base/header_opengraph_image.html @@ -0,0 +1,4 @@ + <meta property="og:image" content="[% c.cobrand.base_url %]/cobrands/fixmystreet/images/fms-og_image.jpg"> + <meta property="og:image:type" content="image/jpeg"> + <meta property="og:image:width" content="1200"> + <meta property="og:image:height" content="630"> diff --git a/templates/web/base/index.html b/templates/web/base/index.html index cea0f832a..0441b3efb 100644 --- a/templates/web/base/index.html +++ b/templates/web/base/index.html @@ -1,55 +1,20 @@ -[% INCLUDE 'header.html', title = '' %] +[% map_js = PROCESS 'front/javascript.html' %] + +[% pre_container_extra = PROCESS 'around/postcode_form.html' %] +[% INCLUDE 'header.html', title = '', bodyclass = 'frontpage fullwidthpage' %] [% IF error %] - <p class="error">[% error %]</p> + <p class="form-error">[% error %]</p> [% END %] -<p id="expl"> - [% - subhead = loc('(like graffiti, fly tipping, broken paving slabs, or street lighting)'); - %] - <strong>[% loc('Report, view, or discuss local problems') %]</strong> - [% IF subhead != ' ' %] - <small>[% subhead %]</small> - [% END %] -</p> - -[% PROCESS 'around/postcode_form.html' %] - -<div id="front_intro"> - [% INCLUDE 'index-steps.html' %] -</div> - -[% - recent_photos = c.cobrand.recent_photos('front', 3); - probs = c.cobrand.recent(); -%] +[% TRY %][% PROCESS 'front/pre-steps.html' %][% CATCH file %][% END %] -[% IF probs.size || recent_photos.size %] -<div id="front_recent"> - <h2>[% loc('Recently reported problems') %]</h2> - [% IF recent_photos.size %] - <p id="front_photos"> - [% FOREACH p IN recent_photos; - photo = p.get_photo_params; - %] - <a href="/report/[% p.id %]"><img border="0" height="100" - src="[% photo.url_tn %]" alt="[% p.title | html %]" title="[% p.title | html %]"></a> - [% END %] - </p> - [% END %] +<div class="tablewrapper"> + <div id="front-howto"> + [% INCLUDE 'index-steps.html' %] + </div> - [% IF probs.size %] - <ul id="nearby_lists"> - [% FOREACH p IN probs %] - <li> - <a href="/report/[% p.id %]">[% p.title | html %]</a> - <small>[% prettify_dt( p.confirmed, 1 ) %]</small> - </li> - [% END %] - </ul> - [% END %] + [% INCLUDE 'front/recent.html' %] </div> -[% END %] -[% INCLUDE 'footer.html' %] +[% INCLUDE 'footer.html' pagefooter = 'yes' %] diff --git a/templates/web/base/maps/google-ol.html b/templates/web/base/maps/google-ol.html index ce22fc94c..021570df1 100644 --- a/templates/web/base/maps/google-ol.html +++ b/templates/web/base/maps/google-ol.html @@ -1,5 +1,5 @@ [% map_js = BLOCK %] -<script type="text/javascript" src="http://maps.googleapis.com/maps/api/js?sensor=false"></script> +<script type="text/javascript" src="https://maps.googleapis.com/maps/api/js?v=3.20"></script> <script type="text/javascript" src="[% version('/js/OpenLayers.fixmystreet.google.js') %]"></script> <script type="text/javascript" src="[% version('/js/map-OpenLayers.js') %]"></script> <script type="text/javascript" src="[% version('/js/map-google-ol.js') %]"></script> @@ -10,7 +10,7 @@ [% END %] [% map_sub_links = BLOCK %] -<a class="hidden-nojs" id="map_layer_toggle" href="">[% loc('Map') %]</a> +<a class="hidden-nojs" id="map_layer_toggle" href="">[% loc('Satellite') %]</a> [% END %] [% map_html = BLOCK %] diff --git a/templates/web/base/maps/noscript_map.html b/templates/web/base/maps/noscript_map.html new file mode 100644 index 000000000..aaaa217c9 --- /dev/null +++ b/templates/web/base/maps/noscript_map.html @@ -0,0 +1,64 @@ +<div class="noscript"> + <div id="[% nsm_prefix %]drag"> + <[% map.img_type %] + alt="NW map tile" id="[% nsm_prefix %]t2.2" + name="tile_[% map.x_tile - 1 %].[% map.y_tile - 1 %]" + src="[% map.tiles.0 %]" + style="top:0; left:0;"> + <[% map.img_type %] + alt="NE map tile" id="[% nsm_prefix %]t2.3" + name="tile_[% map.x_tile %].[% map.y_tile - 1 %]" + src="[% map.tiles.1 %]" + style="top:0px; left:256px;"> + <br> + <[% map.img_type %] + alt="SW map tile" id="[% nsm_prefix %]t3.2" + name="tile_[% map.x_tile - 1 %].[% map.y_tile %]" + src="[% map.tiles.2 %]" + style="top:256px; left:0;"> + <[% map.img_type %] + alt="SE map tile" id="[% nsm_prefix %]t3.3" + name="tile_[% map.x_tile %].[% map.y_tile %]" + src="[% map.tiles.3 %]" + style="top:256px; left:256px;"> + </div> + <div id="[% nsm_prefix %]pins">[% FOR pin IN map.pins %][% INCLUDE pin %][% END %]</div> + [% INCLUDE compass %] +</div> + +[% BLOCK compass %] +[% + north = c.uri_with( { lat = map.compass.north.0, lon = map.compass.north.1, zoom = map.zoom } ) + south = c.uri_with( { lat = map.compass.south.0, lon = map.compass.south.1, zoom = map.zoom } ) + east = c.uri_with( { lat = map.compass.east.0, lon = map.compass.east.1, zoom = map.zoom } ) + west = c.uri_with( { lat = map.compass.west.0, lon = map.compass.west.1, zoom = map.zoom } ) + world = c.uri_with( { zoom = 0 } ); + SET zoom_in = c.uri_with( { lat = map.latitude, lon = map.longitude, zoom = map.zoom + 1 } ) IF map.zoom < map.numZoomLevels - 1; + SET zoom_out = c.uri_with( { lat = map.latitude, lon = map.longitude, zoom = map.zoom - 1 } ) IF map.zoom > 0; + SET zoom_in = '#' IF map.zoom >= map.numZoomLevels - 1; + SET zoom_out = '#' IF map.zoom <= 0; +%] +<div style="position: absolute; left: 4px; top: 4px;" class="olControlPanZoom olControlNoSelect" unselectable="on"> + <div style="position: absolute; left: 13px; top: 4px; width: 18px; height: 18px;"><a rel="nofollow" href="[% north %]"><img style="position: relative; width: 18px; height: 18px;" src="/js/OpenLayers-2.13.1/img/north-mini.png" border="0"></a></div> + <div style="position: absolute; left: 4px; top: 22px; width: 18px; height: 18px;"><a rel="nofollow" href="[% west %]"><img style="position: relative; width: 18px; height: 18px;" src="/js/OpenLayers-2.13.1/img/west-mini.png" border="0"></a></div> + <div style="position: absolute; left: 22px; top: 22px; width: 18px; height: 18px;"><a rel="nofollow" href="[% east %]"><img style="position: relative; width: 18px; height: 18px;" src="/js/OpenLayers-2.13.1/img/east-mini.png" border="0"></a></div> + <div style="position: absolute; left: 13px; top: 40px; width: 18px; height: 18px;"><a rel="nofollow" href="[% south %]"><img style="position: relative; width: 18px; height: 18px;" src="/js/OpenLayers-2.13.1/img/south-mini.png" border="0"></a></div> + <div style="position: absolute; left: 13px; top: 63px; width: 18px; height: 18px;"><a rel="nofollow" href="[% zoom_in %]"><img style="position: relative; width: 18px; height: 18px;" src="/js/OpenLayers-2.13.1/img/zoom-plus-mini.png" border="0"></a></div> + <div style="position: absolute; left: 13px; top: 81px; width: 18px; height: 18px;"><a rel="nofollow" href="[% world %]"><img style="position: relative; width: 18px; height: 18px;" src="/js/OpenLayers-2.13.1/img/zoom-world-mini.png" border="0"></a></div> + <div style="position: absolute; left: 13px; top: 99px; width: 18px; height: 18px;"><a rel="nofollow" href="[% zoom_out %]"><img style="position: relative; width: 18px; height: 18px;" src="/js/OpenLayers-2.13.1/img/zoom-minus-mini.png" border="0"></a></div> +</div> +[% END %] + + +[% BLOCK pin %] + +[% IF pin.id %] +<a title="[% pin.title | html %]" href="[% c.uri_for('/report/' _ pin.id) %]"> +[%- END -%] +<img border="0" class="pin" src="[% c.uri_for( c.cobrand.path_to_pin_icons _ 'pin-' _ pin.colour _ '.png') %]" + alt="[% loc('Problem') %]" style="top:[% pin.py - 64 %]px; left:[% pin.px - 24 %]px; position: absolute;"> +[%- IF pin.id -%] +</a> +[% END %] + +[% END %] diff --git a/templates/web/base/maps/openlayers.html b/templates/web/base/maps/openlayers.html index 27c71f42f..1e7ae5ce8 100644 --- a/templates/web/base/maps/openlayers.html +++ b/templates/web/base/maps/openlayers.html @@ -28,67 +28,12 @@ var fixmystreet = { 'pins': [% INCLUDE maps/pins_js.html %] } </script> -<div id="map_box"> +<div id="map_box" aria-hidden="true"> [% pre_map %] - <div id="map"><noscript> - <div id="drag"><[% map.img_type %] - alt="NW map tile" id="t2.2" - name="tile_[% map.x_tile - 1 %].[% map.y_tile - 1 %]" - src="[% map.tiles.0 %]" - style="top:0; left:0;"><[% map.img_type %] - alt="NE map tile" id="t2.3" - name="tile_[% map.x_tile %].[% map.y_tile - 1 %]" - src="[% map.tiles.1 %]" - style="top:0px; left:256px;"><br><[% map.img_type %] - alt="SW map tile" id="t3.2" - name="tile_[% map.x_tile - 1 %].[% map.y_tile %]" - src="[% map.tiles.2 %]" - style="top:256px; left:0;"><[% map.img_type %] - alt="SE map tile" id="t3.3" - name="tile_[% map.x_tile %].[% map.y_tile %]" - src="[% map.tiles.3 %]" - style="top:256px; left:256px;"></div> - <div id="pins">[% FOR pin IN map.pins %][% INCLUDE pin %][% END %]</div> - [% INCLUDE compass %] - </noscript></div> + <div id="map"> + [% INCLUDE 'maps/noscript_map.html' %] + </div> [% IF map.copyright %] <div class="olControlAttribution" style="position: absolute;">[% map.copyright %]</div> [% END %] - -[% BLOCK compass %] -[% - north = c.uri_with( { lat = map.compass.north.0, lon = map.compass.north.1, zoom = map.zoom } ) - south = c.uri_with( { lat = map.compass.south.0, lon = map.compass.south.1, zoom = map.zoom } ) - east = c.uri_with( { lat = map.compass.east.0, lon = map.compass.east.1, zoom = map.zoom } ) - west = c.uri_with( { lat = map.compass.west.0, lon = map.compass.west.1, zoom = map.zoom } ) - world = c.uri_with( { zoom = 0 } ); - SET zoom_in = c.uri_with( { lat = map.latitude, lon = map.longitude, zoom = map.zoom + 1 } ) IF map.zoom < map.numZoomLevels - 1; - SET zoom_out = c.uri_with( { lat = map.latitude, lon = map.longitude, zoom = map.zoom - 1 } ) IF map.zoom > 0; - SET zoom_in = '#' IF map.zoom >= map.numZoomLevels - 1; - SET zoom_out = '#' IF map.zoom <= 0; -%] -<div style="position: absolute; left: 4px; top: 4px;" class="olControlPanZoom olControlNoSelect" unselectable="on"> - <div style="position: absolute; left: 13px; top: 4px; width: 18px; height: 18px;"><a rel="nofollow" href="[% north %]"><img style="position: relative; width: 18px; height: 18px;" src="/js/OpenLayers-2.13.1/img/north-mini.png" border="0"></a></div> - <div style="position: absolute; left: 4px; top: 22px; width: 18px; height: 18px;"><a rel="nofollow" href="[% west %]"><img style="position: relative; width: 18px; height: 18px;" src="/js/OpenLayers-2.13.1/img/west-mini.png" border="0"></a></div> - <div style="position: absolute; left: 22px; top: 22px; width: 18px; height: 18px;"><a rel="nofollow" href="[% east %]"><img style="position: relative; width: 18px; height: 18px;" src="/js/OpenLayers-2.13.1/img/east-mini.png" border="0"></a></div> - <div style="position: absolute; left: 13px; top: 40px; width: 18px; height: 18px;"><a rel="nofollow" href="[% south %]"><img style="position: relative; width: 18px; height: 18px;" src="/js/OpenLayers-2.13.1/img/south-mini.png" border="0"></a></div> - <div style="position: absolute; left: 13px; top: 63px; width: 18px; height: 18px;"><a rel="nofollow" href="[% zoom_in %]"><img style="position: relative; width: 18px; height: 18px;" src="/js/OpenLayers-2.13.1/img/zoom-plus-mini.png" border="0"></a></div> - <div style="position: absolute; left: 13px; top: 81px; width: 18px; height: 18px;"><a rel="nofollow" href="[% world %]"><img style="position: relative; width: 18px; height: 18px;" src="/js/OpenLayers-2.13.1/img/zoom-world-mini.png" border="0"></a></div> - <div style="position: absolute; left: 13px; top: 99px; width: 18px; height: 18px;"><a rel="nofollow" href="[% zoom_out %]"><img style="position: relative; width: 18px; height: 18px;" src="/js/OpenLayers-2.13.1/img/zoom-minus-mini.png" border="0"></a></div> -</div> -[% END %] - - -[% BLOCK pin %] - -[% IF pin.id %] -<a title="[% pin.title | html %]" href="[% c.uri_for('/report/' _ pin.id) %]"> -[%- END -%] -<img border="0" class="pin" src="[% c.uri_for( c.cobrand.path_to_pin_icons _ 'pin-' _ pin.colour _ '.png') %]" - alt="[% loc('Problem') %]" style="top:[% pin.py - 64 %]px; left:[% pin.px - 24 %]px; position: absolute;"> -[%- IF pin.id -%] -</a> -[% END %] - -[% END %] diff --git a/templates/web/greenwich/my/_problem-list.html b/templates/web/base/my/_problem-list.html index 1ff69f9fb..e74dd25ec 100644 --- a/templates/web/greenwich/my/_problem-list.html +++ b/templates/web/base/my/_problem-list.html @@ -1,10 +1,10 @@ -<ul class='issue-list-a full-width'> - [% IF problems.all %] - [% FOREACH p = problems.all %] - [% INCLUDE 'reports/_list-entry.html', problem = p, no_fixed =1 %] +<ul class='item-list item-list--reports full-width'> + [% IF problems.size %] + [% FOREACH problem = problems %] + [% INCLUDE 'reports/_list-entry.html' no_fixed = 1 %] [% END %] [% ELSE %] - <li class="empty"> + <li class="item-list__item item-list__item--empty"> <p>[% loc('There are no reports to show.') %]</p> </li> [% END %] diff --git a/templates/web/base/my/my.html b/templates/web/base/my/my.html index f3ad3f2fe..9be4edfca 100644 --- a/templates/web/base/my/my.html +++ b/templates/web/base/my/my.html @@ -21,32 +21,20 @@ c.uri_for('/') ) %] [% END %] +[% IF c.cobrand.moniker == 'fixmybarangay' %] + [% INCLUDE '_barangay_buttons.html' %] +[% ELSIF c.cobrand.moniker == 'hart' %] + [% INCLUDE '_hart_hants_note.html' %] +[% END %] + +[% INCLUDE "reports/_list-filters.html", use_section_wrapper = 1 %] + [% INCLUDE 'pagination.html', pager = problems_pager, param = 'p' %] -[% FOREACH p = problems.confirmed %] - [% IF loop.first %]<h2>[% loc('Open reports') %]</h2>[% END %] - [% INCLUDE problem %] -[% END %] - -[% FOREACH p = problems.fixed %] - [% IF loop.first %]<h2>[% loc('Fixed reports') %]</h2>[% END %] - [% INCLUDE problem %] -[% END %] - -[% FOREACH p = problems.closed %] - [% IF loop.first %]<h2>[% loc('Closed reports') %]</h2>[% END %] - [% INCLUDE problem %] -[% END %] - -[%# FOREACH p = problems.unconfirmed; - IF loop.first; - '<h2>' _ loc('Unconfirmed reports') _ '</h2>'; - END; - INCLUDE problem; -END %] +[% INCLUDE 'my/_problem-list.html' %] [% FOREACH u IN updates %] [% IF loop.first %] @@ -55,14 +43,14 @@ END %] pager = updates_pager, param = 'u' %] - <ul class="issue-list full-width"> + <ul class="item-list item-list--updates full-width"> [% END %] <li>“[% u.text | html %]” – <a href="[% c.uri_for( '/report', u.problem_id ) %]#update_[% u.id %]">[% u.problem.title | html %]</a>. - <em class="council_sent_info"> + <p><small class="council_sent_info"> [% tprintf( loc("Added %s"), prettify_dt( u.confirmed, 'date' ) ) %] - </em> + </small></p> </li> [% "</ul>" IF loop.last %] [% END %] @@ -70,20 +58,3 @@ END %] </div> [% INCLUDE 'footer.html' %] - -[% BLOCK problem %] - [% "<ul class='issue-list-a full-width'>" IF loop.first %] - - <li><a href="[% c.uri_for( '/report', p.id ) %]">[% p.title | html %]</a> - <em class="council_sent_info"> – - [% IF p.whensent %] - [% tprintf( loc("Reported %s, to %s"), prettify_dt( p.confirmed, 'date' ), p.body(c) ) %] - [% ELSE %] - [% tprintf( loc("Reported %s"), prettify_dt( p.confirmed, 'date' ) ) %] - [% END %] - </em> - </li> - - [% "</ul>" IF loop.last %] -[% END %] - diff --git a/templates/web/base/open311/index.html b/templates/web/base/open311/index.html index 502b1a69a..d42cc2106 100644 --- a/templates/web/base/open311/index.html +++ b/templates/web/base/open311/index.html @@ -3,9 +3,9 @@ <div class="sticky-sidebar"> <aside> <ul class="plain-list"> - <li><a href="/faq">Frequently Asked Questions</a></li> - <li><a href="/privacy">Privacy and cookies</a></li> - <li><a href="/contact">Contact FixMyStreet</a></li> + <li><a href="/faq">[% loc('Frequently Asked Questions') %]</a></li> + <li><a href="/privacy">[% loc('Privacy and cookies') %]</a></li> + <li><a href="/contact">[% tprintf(loc("Contact %s", "%s is the site name"), site_name) %]</a></li> </ul> </aside> </div> diff --git a/templates/web/base/questionnaire/index.html b/templates/web/base/questionnaire/index.html index 2daaaab3a..ab3bde9ad 100644 --- a/templates/web/base/questionnaire/index.html +++ b/templates/web/base/questionnaire/index.html @@ -1,18 +1,32 @@ [% - pre_map = INCLUDE 'report/_main.html'; + SET bodyclass = 'mappage'; + PROCESS "report/photo-js.html"; PROCESS "maps/${map.type}.html"; - INCLUDE 'header.html', title = loc('Questionnaire') + INCLUDE 'header.html', title = loc('Questionnaire'); %] [% map_html %] -[% INCLUDE 'report/updates.html' %] - </div> -<div id="side"> <h1>[% loc('Questionnaire') %]</h1> +<h2 class="questionnaire-report-header">Your report</h2> +<div class="questionnaire-report-reminder"> + [% INCLUDE 'report/photo.html' object=problem %] + <h3 class="questionnaire-report-reminder__report-title"> + <a href="/report/[% problem.id %]">[% problem.title | html %]</a> + </h3> + <p class="questionnaire-report-reminder__report-meta">[% problem.meta_line(c) | html %]</p> + [% IF updates.size %] + <p class="questionnaire-report-reminder__last-update-header"> + <strong>Last update</strong> + <a href="/report/[% problem.id %]">Show all updates</a> + </p> + <p class="questionnaire-report-reminder__last-update">“[% add_links( updates.last.text ) %]”</p> + [% END %] +</div> + <form method="post" action="/questionnaire/submit" id="questionnaire" [%- IF c.cobrand.allow_photo_upload -%] enctype="multipart/form-data" @@ -21,13 +35,8 @@ <input type="hidden" name="token" value="[% token | html %]"> -<p> -[% loc('The details of your problem are available on the right hand side of this page.') %] -[% loc('Please take a look at the updates that have been left.') IF updates %] -</p> - [% IF errors %] -<ul class="error"> +<ul class="error questionnaire-errors"> <li>[% errors.join("</li>\n<li>") %]</li> </ul> [% END %] @@ -37,50 +46,50 @@ [% loc('Has this problem been fixed?') %] </p> -<p> -<input type="radio" name="been_fixed" id="been_fixed_yes" value="Yes"[% ' checked' IF been_fixed == 'Yes' %]> -<label for="been_fixed_yes">[% loc('Yes') %]</label> -<input type="radio" name="been_fixed" id="been_fixed_no" value="No"[% ' checked' IF been_fixed == 'No' %]> -<label for="been_fixed_no">[% loc('No') %]</label> -<input type="radio" name="been_fixed" id="been_fixed_unknown" value="Unknown"[% ' checked' IF been_fixed == 'Unknown' %]> -<label for="been_fixed_unknown">[% loc('Don’t know') %]</label> +<p class="radio-segmented-control"> + <input type="radio" name="been_fixed" id="been_fixed_yes" value="Yes"[% ' checked' IF been_fixed == 'Yes' %]> + <label class="inline" for="been_fixed_yes">[% loc('Yes') %]</label> + <input type="radio" name="been_fixed" id="been_fixed_no" value="No"[% ' checked' IF been_fixed == 'No' %]> + <label class="inline" for="been_fixed_no">[% loc('No') %]</label> + <input type="radio" name="been_fixed" id="been_fixed_unknown" value="Unknown"[% ' checked' IF been_fixed == 'Unknown' %]> + <label class="inline" for="been_fixed_unknown">[% loc('Don’t know') %]</label> </p> [% UNLESS answered_ever_reported %] <p>[% loc('Have you ever reported a problem to a council before, or is this your first time?') %]</p> -<p> -<input type="radio" name="reported" id="reported_yes" value="Yes"[% ' checked' IF reported == 'Yes' %]> -<label for="reported_yes">[% loc('Reported before') %]</label> -<input type="radio" name="reported" id="reported_no" value="No"[% ' checked' IF reported == 'No' %]> -<label for="reported_no">[% loc('First time') %]</label> +<p class="radio-segmented-control"> + <input type="radio" name="reported" id="reported_yes" value="Yes"[% ' checked' IF reported == 'Yes' %]> + <label class="inline" for="reported_yes">[% loc('Reported before') %]</label> + <input type="radio" name="reported" id="reported_no" value="No"[% ' checked' IF reported == 'No' %]> + <label class="inline" for="reported_no">[% loc('First time') %]</label> </p> [% END %] <p>[% loc('If you wish to leave a public update on the problem, please enter it here -(please note it will not be sent to the council). For example, what was -your experience of getting the problem fixed?') %]</p> +(please note it will not be sent to the council).') %]</p> -<p><textarea name="update" style="max-width:90%" rows="7" cols="30">[% update | html %]</textarea></p> +<p><textarea name="update" rows="7" cols="30" placeholder="[% loc('What was your experience of getting the problem fixed?') %]">[% update | html %]</textarea></p> [% IF c.cobrand.allow_photo_upload %] -<div id="fileupload_normalUI"> +<p id="fileupload_normalUI"> [% IF upload_fileid %] + <img align="right" src="/photo/[% upload_fileid %].temp.jpeg" alt=""> <p>[% loc('You have already attached a photo to this report, attaching another one will replace it.') %]</p> <input type="hidden" name="upload_fileid" value="[% upload_fileid %]"> [% END %] <label for="form_photo">[% loc('Photo:') %]</label> <input type="file" name="photo" id="form_photo"> -</div> +</p> [% END %] [% IF c.cobrand.moniker != 'emptyhomes' %] -<div id="another_qn"> +<div class="js-another-questionnaire"> <p>[% loc('Would you like to receive another questionnaire in 4 weeks, reminding you to check the status?') %]</p> - <p> + <p class="radio-segmented-control"> <input type="radio" name="another" id="another_yes" value="Yes"[% ' checked' IF another == 'Yes' %]> - <label for="another_yes">[% loc('Yes') %]</label> + <label class="inline" for="another_yes">[% loc('Yes') %]</label> <input type="radio" name="another" id="another_no" value="No"[% ' checked' IF another == 'No' %]> - <label for="another_no">[% loc('No') %]</label> + <label class="inline" for="another_no">[% loc('No') %]</label> </p> </div> [% END %] @@ -89,7 +98,4 @@ your experience of getting the problem fixed?') %]</p> </form> -</div> - [% INCLUDE 'footer.html' %] - diff --git a/templates/web/fixmystreet/report/_item.html b/templates/web/base/report/_item.html index 8e2e73a8d..d79a4e9f3 100644 --- a/templates/web/fixmystreet/report/_item.html +++ b/templates/web/base/report/_item.html @@ -1,5 +1,5 @@ -<li> -<a class="text" href="[% c.uri_for('/report', problem.id ) %]"> +<li class="item-list__item item-list--reports__item [% item_extra_class %]"> +<a href="[% c.uri_for('/report', problem.id ) %]"> [% IF problem.photo; photo = problem.get_photo_params %] @@ -7,16 +7,16 @@ [% END %] <h4>[% problem.title | html %]</h4> <small> - [% IF c.cobrand.moniker != 'fixamingata' %] [%# Default: %] + [%- IF c.cobrand.moniker != 'fixamingata' %] [%# Default: %] [%- prettify_dt( problem.confirmed, 1 ) %] - [% ELSE %] [%# Swedish cobrand fixamingata: %] + [%- ELSE %] [%# Swedish cobrand fixamingata: %] [%- prettify_dt( problem.confirmed) %] - [% END %] + [%- END %] [%- IF dist %], [% dist %]km[% END %] - [%- IF include_lastupdate AND problem.confirmed != problem.lastupdate AND problem.whensent != problem.lastupdate %], + [%- IF problem.confirmed != problem.lastupdate AND problem.whensent != problem.lastupdate %], [% tprintf(loc('last updated %s'), prettify_dt( problem.lastupdate, 1 ) ) %] [%- END %] - [% IF include_lastupdate %] + [% IF include_sentinfo %] [% IF problem.bodies_str_ids.size > 1 %] [% loc('(sent to both)') %] [% ELSIF problem.bodies_str_ids.size == 0 %] [% loc('(not sent to council)') %] [% END %] diff --git a/templates/web/base/report/display.html b/templates/web/base/report/display.html index 0731d9f0e..329614488 100644 --- a/templates/web/base/report/display.html +++ b/templates/web/base/report/display.html @@ -2,7 +2,7 @@ PROCESS "maps/${map.type}.html"; problem_title = problem.title_safe _ ' - ' _ loc('Viewing a problem'); - SET rss = [ loc('Updates to this problem, FixMyStreet'), "/rss/$problem.id" ] IF c.cobrand.moniker != 'emptyhomes'; + SET rss = [ tprintf(loc('Updates to this problem, %s', "%s is the site name"), site_name), "/rss/$problem.id" ] IF c.cobrand.moniker != 'emptyhomes'; SET robots = 'index, nofollow'; SET robots = 'noindex, nofollow' IF c.cobrand.moniker == 'emptyhomes'; INCLUDE 'header.html' diff --git a/templates/web/base/report/new/category_extras.html b/templates/web/base/report/new/category_extras.html index c0f6a7bae..12ef1486f 100644 --- a/templates/web/base/report/new/category_extras.html +++ b/templates/web/base/report/new/category_extras.html @@ -6,7 +6,7 @@ [%- END %] [%- IF report_meta %] - <h4>Additional Information</h4> + <h4>[% loc('Additional Information') %]</h4> [%- FOR meta IN category_extras.$category %] [%- meta_name = meta.code -%] diff --git a/templates/web/base/report/new/fill_in_details_form.html b/templates/web/base/report/new/fill_in_details_form.html index d1431ffd3..ee219d563 100644 --- a/templates/web/base/report/new/fill_in_details_form.html +++ b/templates/web/base/report/new/fill_in_details_form.html @@ -110,7 +110,8 @@ [% INCLUDE 'report/new/notes.html' %] <div id="form_sign_in"> - <h3>[% loc("Now to submit your report… do you have a FixMyStreet password?") %]</h3> + <h3>[% loc("Now to submit your report…") %]</h3> + <h2>[% tprintf(loc("Do you have a %s password?", "%s is the site name"), site_name) %]</h2> <div id="form_sign_in_yes"> diff --git a/templates/web/fixmystreet/report/photo-js.html b/templates/web/base/report/photo-js.html index 9075ce005..9075ce005 100644 --- a/templates/web/fixmystreet/report/photo-js.html +++ b/templates/web/base/report/photo-js.html diff --git a/templates/web/base/report/photo.html b/templates/web/base/report/photo.html index c463c34c4..094f677d8 100644 --- a/templates/web/base/report/photo.html +++ b/templates/web/base/report/photo.html @@ -1,8 +1,21 @@ [% IF c.cobrand.allow_photo_display(object) && object.photo %] -[% photo = object.get_photo_params %] -<div class="update-img"> - [% IF photo.url_full %]<a href="[% photo.url_full %]" rel="fancy">[% END - %]<img alt="Photo of this report" [% IF photo.height %]height="[% photo.height %]" width="[% photo.width %]"[% END %] src="[% photo.url %]"> - [%- IF photo.url_full %]<span>zoom</span></a>[% END %] -</div> + [% IF object.can('get_photoset') %] + [% FOR photo IN object.get_photoset(c).images %] + <div class="update-img"> + <a href="[% c.cobrand.base_url %]/photo/[% object.id %].[% loop.index %].full.jpeg?[% photo.0 %]" rel="fancy"> + <img alt="Photo of this report" src="[% c.cobrand.base_url %]/photo/[% object.id %].[% loop.index %].jpeg?[% photo.0 %]"> + <span>zoom</span></a> + </div> + [% END %] + [% ELSE %] + [%# e.g. comments %] + [% photo = object.get_photo_params %] + <div class="update-img"> + [% IF photo.url_full %]<a href="[% photo.url_full %]" rel="fancy">[% END %] + <img alt="Photo of this report" + [%- IF photo.height %]height="[% photo.height %]" width="[% photo.width %]"[% END -%] + src="[% photo.url %]"> + [%- IF photo.url_full %]<span>zoom</span></a>[% END %] + </div> + [% END %] [% END %] diff --git a/templates/web/base/report/update-form.html b/templates/web/base/report/update-form.html index 4e762a9a5..3115855d3 100644 --- a/templates/web/base/report/update-form.html +++ b/templates/web/base/report/update-form.html @@ -83,7 +83,8 @@ </div> <div id="form_sign_in"> - <h3>[% loc("Now to submit your update… do you have a FixMyStreet password?") %]</h3> + <h3>[% loc("Now to submit your update…") %]</h3> + <h2>[% tprintf(loc("Do you have a %s password?", "%s is the site name"), site_name) %]</h2> <div id="form_sign_in_yes"> diff --git a/templates/web/base/reports/_list-entry.html b/templates/web/base/reports/_list-entry.html index 445a5315f..dbf0a576e 100755 --- a/templates/web/base/reports/_list-entry.html +++ b/templates/web/base/reports/_list-entry.html @@ -1,6 +1 @@ -<li><a href="[% c.uri_for('/report/' _ problem.id) %]">[% problem.title | html %]</a> - [% IF problem.bodies_str_ids.size > 1 %] <small>[% loc('(sent to both)') %]</small> [% END %] - [% IF c.cobrand.moniker != 'emptyhomes' %] - [% IF problem.bodies_str_ids.size == 0 %] <small>[% loc('(not sent to council)') %]</small> [% END %] - [% END %] -</li> +[% INCLUDE 'report/_item.html' %] diff --git a/templates/web/base/reports/_list-filters.html b/templates/web/base/reports/_list-filters.html index e69de29bb..4dd270dc6 100644 --- a/templates/web/base/reports/_list-filters.html +++ b/templates/web/base/reports/_list-filters.html @@ -0,0 +1,34 @@ +[% select_status = BLOCK %] + <select name="status" id="statuses"> + <option value="all"[% ' selected' IF filter_status == 'all' %]>[% loc('all reports') %]</option> + <option value="open"[% ' selected' IF filter_status == 'open' %]>[% loc('unfixed reports') %]</option> + <option value="closed"[% ' selected' IF filter_status == 'closed' %]>[% loc('closed reports') %]</option> + <option value="fixed"[% ' selected' IF filter_status == 'fixed' %]>[% loc('fixed reports') %]</option> + </select> +[% END %] + +[% select_category = BLOCK %] + <select name="filter_category" id="filter_categories"> + <option value="">[% loc('Everything') %]</option> + [% FOR category IN filter_categories %] + <option value="[% category | html %]"[% ' selected' IF filter_category == category %]> + [% category | html %] + </option> + [% END %] + </select> +[% END %] + +[% IF use_section_wrapper %] +<section class="full-width"> + <form method="get" action=""> +[% END %] + + <p class="report-list-filters"> + [% tprintf(loc('<label>Show %s</label> <label>about %s</label>', 'The first %s is a dropdown of all/fixed/etc, the second is a dropdown of categories'), select_status, select_category) %] + <input type="submit" value="[% loc('Go') %]"> + </p> + +[% IF use_section_wrapper %] + </form> +</section> +[% END %] diff --git a/templates/web/base/reports/_problem-list.html b/templates/web/base/reports/_problem-list.html index 45746e309..4da9e1bb6 100644 --- a/templates/web/base/reports/_problem-list.html +++ b/templates/web/base/reports/_problem-list.html @@ -5,13 +5,13 @@ </section> [% BLOCK column %] - <ul class="issue-list-a"> + <ul class="item-list item-list--reports"> [% IF problems %] [% FOREACH problem IN problems %] - [% INCLUDE 'reports/_list-entry.html' %] + [% INCLUDE 'reports/_list-entry.html' include_sentinfo = 1 include_lastupdate = 1 %] [% END %] [% ELSE %] - <li class="empty"> + <li class="item-list__item item-list__item--empty"> <p>[% loc('There are no reports to show.') %]</p> </li> [% END %] diff --git a/templates/web/base/reports/body.html b/templates/web/base/reports/body.html index b98c5bec6..dfaa98d6a 100755 --- a/templates/web/base/reports/body.html +++ b/templates/web/base/reports/body.html @@ -21,7 +21,7 @@ SET bodyclass = 'mappage'; INCLUDE 'header.html', title = tprintf(loc('%s - Summary reports'), name) - rss = [ tprintf(loc('Problems within %s, FixMyStreet'), name), rss_url ] + rss = [ tprintf(loc('Problems within %s, %s', "First %s is the body name, second %s the site name"), name, site_name), rss_url ] %] [% map_html %] @@ -43,8 +43,8 @@ [% INCLUDE '_hart_hants_note.html' %] [% END %] -[% IF NOT body.areas.size AND c.cobrand.moniker == 'fixmystreet' %] - [% INCLUDE 'reports/_body_gone.html' %] +[% IF NOT body.areas.size %] + [% TRY %][% INCLUDE 'reports/_body_gone.html' %][% CATCH file %][% END %] [% ELSE %] [% INCLUDE 'reports/_rss.html' %] [% END %] diff --git a/templates/web/base/static/privacy.html b/templates/web/base/static/privacy.html index 36720207b..11ab65311 100755 --- a/templates/web/base/static/privacy.html +++ b/templates/web/base/static/privacy.html @@ -1,13 +1,13 @@ [% INCLUDE 'header.html', - title = loc('Frequently Asked Questions'), + title = loc('Privacy and cookies'), bodyclass = 'twothirdswidthpage' %] <div class="sticky-sidebar"> <aside> <ul class="plain-list"> - <li><a href="/faq">Frequently Asked Questions</a></li> - <li><strong>Privacy and cookies</strong></li> - <li><a href="/contact">Contact [% PROCESS 'site-name.html' -%]</a></li> + <li><a href="/faq">[% loc('Frequently Asked Questions') %]</a></li> + <li><a href="/privacy">[% loc('Privacy and cookies') %]</a></li> + <li><a href="/contact">[% tprintf(loc("Contact %s", "%s is the site name"), site_name) %]</a></li> </ul> </aside> </div> diff --git a/templates/web/base/status/index.html b/templates/web/base/status/index.html new file mode 100644 index 000000000..9ed4292b7 --- /dev/null +++ b/templates/web/base/status/index.html @@ -0,0 +1,19 @@ +[% INCLUDE 'header.html' title=loc('Summary') bodyclass='fullwidthpage' %] + +<h1>[% loc('Summary') %]</h1> + +<dl> + <dt>Version</dt> + <dd>[% git_version || 'unknown' %]</dd> +</dl> + +<ul> + <li>[% tprintf( loc('<strong>%d</strong> live problems'), total_problems_live ) %]</li> + <li>[% tprintf( loc('%d live updates'), comments.confirmed || 0 ) %]</li> + <li>[% tprintf( loc('%d confirmed alerts, %d unconfirmed'), alerts.1, alerts.0) %]</li> + <li>[% tprintf( loc('%d questionnaires sent – %d answered (%s%%)'), questionnaires.total, questionnaires.1, questionnaires_pc) %]</li> + <li>[% tprintf( '%d bodies', total_bodies) %], + [% tprintf( loc('%d council contacts – %d confirmed, %d unconfirmed'), contacts.total, contacts.1, contacts.0) %]</li> +</ul> + +[% INCLUDE 'footer.html' %] diff --git a/templates/web/fixmystreet/around/_report_banner.html b/templates/web/bromley/around/_report_banner.html index 5ec7300d6..52a869262 100755..100644 --- a/templates/web/fixmystreet/around/_report_banner.html +++ b/templates/web/bromley/around/_report_banner.html @@ -1,9 +1,10 @@ <h1 class="big-green-banner"> [% loc( 'Click map to report a problem' ) %] - [% IF c.cobrand.moniker == 'bromley' %] - <span>Yellow pins show existing reports</span> - [% END %] </h1> +<div class="click-the-map"> + <h2>[% loc( 'Have you found a problem here?' ) %]</h2> + <p>Click on the map to report it</p> +</div> <a id="skip-this-step" href="[% url_skip %]" rel="nofollow"> [% loc("Can't see the map? <em>Skip this step</em>") %] </a> diff --git a/templates/web/bromley/around/intro.html b/templates/web/bromley/around/intro.html index ee4685b9c..7b7c24726 100644 --- a/templates/web/bromley/around/intro.html +++ b/templates/web/bromley/around/intro.html @@ -1 +1 @@ - <h1 class="main mob-only">Reporting a problem in Bromley’s streets or parks</h1> + <h1 class="main">Reporting a problem in Bromley’s streets or parks</h1> diff --git a/templates/web/bromley/faq/faq-en-gb.html b/templates/web/bromley/faq/faq-en-gb.html index 93576ef20..47b8c05f7 100755 --- a/templates/web/bromley/faq/faq-en-gb.html +++ b/templates/web/bromley/faq/faq-en-gb.html @@ -1,5 +1,7 @@ [% INCLUDE 'header.html', title = 'Help', bodyclass = 'fullwidthpage' %] +<h1> Frequently Asked Questions </h1> + <p>These pages are for reporting things which are broken, dirty, damaged or dumped, and need fixing, cleaning or clearing, such as:</p> <ul><li>abandoned vehicles <li>graffiti @@ -24,7 +26,7 @@ <li>complaining or commenting about the council </ul> - <p>Note, the council does not maintain responsibility for problems on private land or TFL roads (A21 and part of the A232, West Wickham to Locksbottom). TFL road enquiries should be directed to <a href="http://reportit.tfl.gov.uk/">http://reportit.tfl.gov.uk/</a>. + <p>Note, the council does not maintain responsibility for problems on private land or TFL roads (A21 and part of the A232, West Wickham to Locksbottom). TFL road enquiries should be directed to <a href="http://reportit.tfl.gov.uk/">http://reportit.tfl.gov.uk/</a>. </dd> @@ -66,9 +68,9 @@ the problem.</dd> <dd>Yes, if you enter a postcode or address outside the borough you will be re-directed to the main FixMyStreet site that will enable you to report problems elsewhere. FixMyStreet will forward these on to the relevant council.</dd> <dt>The site is powered by FixMyStreet, who are they?</dt> - <dd>FixMyStreet was built by <a href="http://www.mysociety.org/">mySociety</a>, in conjunction with the <a href="http://www.youngfoundation.org.uk/">Young Foundation</a>. + <dd>FixMyStreet was built by <a href="http://www.mysociety.org/">mySociety</a>, in conjunction with the <a href="http://www.youngfoundation.org.uk/">Young Foundation</a>. mySociety is the project of a registered charity which has grown out of the community of -volunteers who built sites like <a href="http://www.theyworkforyou.com/">TheyWorkForYou</a>. +volunteers who built sites like <a href="http://www.theyworkforyou.com/">TheyWorkForYou</a>. mySociety’s primary mission is to build Internet projects which give people simple, tangible benefits in the civic and community aspects of their lives. The charity is called UK Citizens Online Democracy and is charity number 1076346. mySociety diff --git a/templates/web/bromley/footer.html b/templates/web/bromley/footer.html index 88b91cb72..689871fff 100644 --- a/templates/web/bromley/footer.html +++ b/templates/web/bromley/footer.html @@ -1,23 +1,24 @@ + [% IF pagefooter %] + <footer role="contentinfo"> + [% INCLUDE 'front/footer-marketing.html' %] + </footer> + [% END %] </div><!-- .content role=main --> - <p id="bromley-powered-by" class="desk-only"> - <a href="https://www.fixmystreet.com/council">Powered by <img src="/cobrands/bromley/fms-logo.png" alt="FixMyStreet" style="height:20px;"></a> - </p> - </div><!-- .container --> + [% IF c.cobrand.moniker == 'fixmystreet' AND bodyclass != 'mappage' %] + [% INCLUDE 'footer-nav.html' %] + [% END %] </div><!-- .table-cell --> <div class="nav-wrapper"> <div class="nav-wrapper-2"> <div id="main-nav" role="navigation"> - <ul id="mysoc-menu"> - <li><a href="https://www.fixmystreet.com/council">Powered by <img src="/cobrands/bromley/fms-logo.png" alt="FixMyStreet" style="height:20px;"></a></li> - </ul> - <ul id="main-menu"> - <li><[% IF c.req.uri.path == '/' %]span[% ELSE %]a href="/"[% END %] class="report-a-problem-btn" - >[% loc("Report a problem") %]</[% c.req.uri.path == '/' ? 'span' : 'a' %]></li>[% + <ul class="nav-menu nav-menu--main"> + <li><[% IF c.req.uri.path == '/' %]span[% ELSE %]a href="/"[% END + %]>[% loc("Report a problem") %]</[% c.req.uri.path == '/' ? 'span' : 'a' %]></li>[% %]<li><[% IF c.req.uri.path == '/my' %]span[% ELSE %]a href="/my"[% END %]>[% loc("Your reports") %]</[% c.req.uri.path == '/my' ? 'span' : 'a' %]></li>[% - %]<li><[% IF c.req.uri.path == '/reports/Bromley' %]span[% ELSE %]a href="/reports/Bromley"[% END + %]<li><[% IF c.req.uri.path == '/reports' %]span[% ELSE %]a href="/reports"[% END %]>[% loc("All reports") %]</[% c.req.uri.path == '/reports' ? 'span' : 'a' %]></li>[% %]<li><[% IF c.req.uri.path == '/alert' %]span[% ELSE %]a href="/alert[% pc ? '/list?pc=' : '' %][% pc | uri %]"[% END %]>[% loc("Local alerts") %]</[% c.req.uri.path == '/alert' ? 'span' : 'a' %]></li>[% @@ -30,20 +31,7 @@ </div> <!-- .wrapper --> -<div id="bromley-footer" class="desk-only"> - <p class="copy">© 2012 London Borough of Bromley</p> - - <a href="http://www.direct.gov.uk/"><img src="https://www.bromley.gov.uk/site/images/directgov.jpg" alt="Directgov website link - Public services all in one place" /></a> - - <ul class="footer-nav"> - <li><a href="#bromley-header">To the top</a></li> - <li><a href="http://www.bromley.gov.uk/terms">Disclaimer</a></li> - <li><a href="http://www.bromley.gov.uk/privacy" rel="nofollow">Privacy and cookies</a></li> - <li><a href="http://www.bromley.gov.uk/accesstoinfo">Access to information</a></li> - </ul> - -</div> + [% TRY %][% PROCESS 'footer_extra.html' %][% CATCH file %][% END %] - </div></div> </body> </html> diff --git a/templates/web/bromley/footer_extra.html b/templates/web/bromley/footer_extra.html new file mode 100644 index 000000000..176b14f63 --- /dev/null +++ b/templates/web/bromley/footer_extra.html @@ -0,0 +1,41 @@ +<footer class="site-footer"> + <div class="footer-container"> + <div class="column span-12"> + <div class="additional-links footer-list1"> + <h5>Get in touch</h5> + <ul> + <li class="border first-child"><a href="/contact">Contact Us</a></li> + <li class="border"><a href="http://www.bromley.gov.uk/feedback">Feedback</a></li> + </ul> + </div><!--additional-links--> + <div class="additional-links footer-list2"> + <h5>Our website</h5> + <ul> + <li class="first-child"><a href="http://www.bromley.gov.uk/accessibility">Accessibility</a></li> + <li><a href="javascript:void(0);" onclick="window.print()" rel="nofollow">Print</a></li> + <li><a href="javascript:bookmark('http://www.bromley.gov.uk', 'London Borough of Bromley')">Bookmark this page</a></li> + <li><a href="http://www.bromley.gov.uk/privacy">Privacy and cookies</a></li> + <li><a href="http://www.bromley.gov.uk/terms">Disclaimer</a></li> + <li><a href="http://www.bromley.gov.uk/press/article/977/community_library_management_proposals_invited#mast">To the top</a></li> + </ul> + </div><!--additional-links--> + <div class="additional-links"> + <h5>Social</h5> + <div class="social"> + <ul class="inline-list small-size width"> + <li class="first-child"><a href="http://www.facebook.com/LBBromley" title="Facebook"><img src="/cobrands/bromley/facebook.png" alt="Facebook"></a></li> + <li><a href="http://twitter.com/LBofBromley" title="Twitter"><img src="/cobrands/bromley/twitter.png" alt="twitter"></a></li> + <li><a href="http://www.youtube.com/LBBromley" title="Youtube"><img src="/cobrands/bromley/youtube.png" alt="youtube"></a></li> + <li><a href="http://www.flickr.com/photos/lbofbromley/" title="flickr"><img src="/cobrands/bromley/flickr.png" alt="flickr"></a></li> + <li><a href="http://www.bromley.gov.uk/rss/press" title="RSS"><img src="/cobrands/bromley/rss.png" alt="RSS"></a></li> + </ul> + </div><!--social--> + </div><!--additional-links--> + </div> + <div class="column span-12"> + <div class="copyright"> + <p class="first-child">© 2015 London Borough of Bromley</p> + </div><!--copyright--> + </div><!--column--> + </div><!--footer-container--> +</footer>
\ No newline at end of file diff --git a/templates/web/bromley/front/_list-entry.html b/templates/web/bromley/front/_list-entry.html new file mode 100755 index 000000000..046c3b97f --- /dev/null +++ b/templates/web/bromley/front/_list-entry.html @@ -0,0 +1 @@ +[% INCLUDE 'report/_item.html' no_fixed = 1 item_extra_class = 'item-list__item--with-pin' %] diff --git a/templates/web/bromley/front/footer-marketing.html b/templates/web/bromley/front/footer-marketing.html new file mode 100644 index 000000000..bdbe16dfb --- /dev/null +++ b/templates/web/bromley/front/footer-marketing.html @@ -0,0 +1,18 @@ +<div class="tablewrapper"> + <div id="footer-mobileapps"> + <p> + <a href="https://itunes.apple.com/gb/app/fixmystreet/id297456545"> + <img alt="FixMyStreet app on the App Store" src="/cobrands/fixmystreet/images/itunes_store_logo.png" /> + </a> + <a href="https://play.google.com/store/apps/details?id=org.mysociety.FixMyStreet"> + <img alt="FixMyStreet Android app on Google Play" src="/cobrands/fixmystreet/images/google_play_logo.png" /> + </a> + </p> + </div> + + <div id="footer-help"> + <p> + Powered by <a class="platform-logo" href="https://fixmystreet.com/council">FixMyStreet Platform</a> + </p> + </div> +</div>
\ No newline at end of file diff --git a/templates/web/bromley/header.html b/templates/web/bromley/header.html deleted file mode 100644 index 9559592ff..000000000 --- a/templates/web/bromley/header.html +++ /dev/null @@ -1,114 +0,0 @@ -<!doctype html> -<!--[if lt IE 7]><html class="no-js ie6 oldie" lang="[% lang_code %]"><![endif]--> -<!--[if IE 7]> <html class="no-js ie7 oldie" lang="[% lang_code %]"><![endif]--> -<!--[if IE 8]> <html class="no-js ie8 oldie" lang="[% lang_code %]"><![endif]--> -<!--[if IE 9]> <html class="no-js ie9 oldie" lang="[% lang_code %]"><![endif]--> -<!--[if gt IE 9]><!--><html class="no-js" lang="[% lang_code %]"><!--<![endif]--> - <head> - <meta name="viewport" content="initial-scale=1.0"> - <meta http-equiv="X-UA-Compatible" content="IE=Edge,chrome=1"> - <meta name="HandHeldFriendly" content="true"> - <meta name="mobileoptimized" content="0"> - - <link rel="stylesheet" href="[% version('/cobrands/bromley/base.css') %]"> - <link rel="stylesheet" href="[% version('/cobrands/bromley/layout.css') %]" media="(min-width:48em)"> - <link rel="stylesheet" href="[% version('/cobrands/bromley/bromley.css') %]"> - [% extra_css %] - <!--[if (lt IE 9) & (!IEMobile)]> - <link rel="stylesheet" href="[% version('/cobrands/bromley/layout.css') %]"> - <![endif]--> - - <script src="[% version('/js/modernizr.custom.js') %]" charset="utf-8"></script> - <script src="[% version('/cobrands/bromley/position_map.js') %]" charset="utf-8"></script> - [% INCLUDE 'common_header_tags.html', js_override = '/cobrands/fixmystreet/fixmystreet.js' %] - <script type="text/javascript"> - - var _gaq = _gaq || []; - _gaq.push(['_setAccount', 'UA-12543967-1']); - _gaq.push(['_setDomainName', 'bromley.gov.uk']); - _gaq.push(['_trackPageview']); - - (function() { - var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true; - ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js'; - var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s); - })(); - - </script> - - [% extra_js %] - - <link rel="Shortcut Icon" type="image/x-icon" href="/cobrands/bromley/favicon.ico"> - - [% PROCESS 'header_extra.html' %] - - </head> - <body class="[% bodyclass | html IF bodyclass %]"> - [%# ie_wrapper is to prevent a horizontal scrollbar in IE7, it appears (from Bromley site) %] - <div id="bromley-wrapper"><div id="bromley-ie_wrapper"> - -<div id="bromley-header" class="desk-only"> - <ul class="header-nav"> - <li><a href="http://www.bromley.gov.uk/accessibility">Accessibility</a></li> - <li><a class="skiplink" href="http://www.bromley.gov.uk/#user-meta" rel="nofollow">Skip to content</a></li> - <!-- <li><a rel="nofollow" href="http://www.bromley.gov.uk/a_to_z?previewstyle=generic/print.css">Printer friendly</a></li> --> - <!-- <li><a href="http://www.bromley.gov.uk/accessibility/settings">Text size: AAA</a></li> --> - <li><div id="google_translate_element"></div></li> - </ul> - - <div class="logo"> - <a href="http://www.bromley.gov.uk"><img src="/cobrands/bromley/bromley-logo.jpg" alt="London Borough of Bromley logo" width="159" height="114" style="width:159px; height:114px;" /></a> - </div> - - <div class="sign-in"> - [% IF c.user_exists %] - <p> - [% tprintf(loc('Hi %s'), c.user.name || c.user.email) %] - <a href="/auth/sign_out">[% loc('sign out') %]</a> - </p> - [% END %] - </div> - - <div class="main-menu"> - <ul> - <li class="home"><[% IF c.req.uri.path == '/' %]span[% ELSE %]a href="/"[% END %] class="report-a-problem-btn" - >[% "Report" %]</[% c.req.uri.path == '/' ? 'span' : 'a' %]></li>[% - %]<li><[% IF c.req.uri.path == '/my' OR ( c.req.uri.path == '/auth' AND c.req.params.r == 'my' ) %]span[% ELSE %]a href="/my"[% END - %]>[% loc("Your reports") %]</[% ( c.req.uri.path == '/my' OR ( c.req.uri.path == '/auth' AND c.req.params.r == 'my' ) ) ? 'span' : 'a' %]></li>[% - %]<li><[% IF c.req.uri.path == '/reports/Bromley' %]span[% ELSE %]a href="/reports/Bromley"[% END - %]>[% loc("All reports") %]</[% c.req.uri.path == '/reports' ? 'span' : 'a' %]></li>[% - %]<li><[% IF c.req.uri.path == '/alert' %]span[% ELSE %]a href="/alert[% pc ? '/list?pc=' : '' %][% pc | uri %]"[% END - %]>[% loc("Local alerts") %]</[% c.req.uri.path == '/alert' ? 'span' : 'a' %]></li>[% - %]<li class="last"><[% IF c.req.uri.path == '/faq' %]span[% ELSE %]a href="/faq"[% END - %]>[% loc("Help") %]</[% c.req.uri.path == '/faq' ? 'span' : 'a' %]></li> - </ul> - </div> - -</div> - - <div class="wrapper"> - <div class="table-cell"> - <div id="site-header" role="banner"> - <div class="container"> - <a href="/" id="site-logo">FixMyStreet</a> - <a href="#main-nav" id="nav-link">Main Navigation</a> - </div> - </div> - - [% IF c.user_exists %] - <div id="user-meta"> - <p> - [% tprintf(loc('Hi %s'), c.user.name || c.user.email) %] - <a href="/auth/sign_out">[% loc('sign out') %]</a> - </p> - </div> - [% END %] - - <h1 class="main desk-only">Reporting a problem in Bromley’s streets or parks</h1> - - [% pre_container_extra %] - - <div class="container"> - <div class="content[% " $mainclass" | html IF mainclass %]" role="main"> - - diff --git a/templates/web/bromley/header_extra.html b/templates/web/bromley/header_extra.html new file mode 100644 index 000000000..c7fe5f3e3 --- /dev/null +++ b/templates/web/bromley/header_extra.html @@ -0,0 +1 @@ +<script src="[% start %][% version('/cobrands/bromley/a-z-nav.js') %]" charset="utf-8"></script>
\ No newline at end of file diff --git a/templates/web/bromley/header_logo.html b/templates/web/bromley/header_logo.html new file mode 100644 index 000000000..92ff771f9 --- /dev/null +++ b/templates/web/bromley/header_logo.html @@ -0,0 +1,62 @@ + <div class="bromley-header cf"> + <a href="http://www.bromley.gov.uk/" id="site-logo">[% site_name %]</a> + + <ul class="linear-links subtext float-right top-links"> + <li class="first-child"><i class="fa fa-home"></i><a href="http://www.bromley.gov.uk">Home</a></li> + <li><i class="fa fa-sitemap"></i><a href="http://www.bromley.gov.uk/site_map">Sitemap</a></li> + <li><i class="fa fa-user"></i><a href="https://www.bromley.gov.uk/SiteLogin">Register/Sign in</a></li> + </ul> + + <form action="http://www.bromley.gov.uk/site/scripts/google_results.aspx" method="get" id="search" class="main-search" role="search"> + <label for="SearchSite" class="hidden">Search this site</label> + <input type="text" size="18" class="main-search-input field" name="q" id="SearchSite" value="" placeholder="Search the website"> + <input value="Search" type="submit" class="button__primary"> + </form> + </div> +</div> +<div class="container main-menu-container"> + <div class="a-z-container "> + <nav class="main-a-z custom-side-nav"> + <ul class="drop-down-nav"> + <li class="first-child"> + <a href="#" class="main-nav-title">A-Z</a> + <ul class="nav-hover-item nav-hover-item-active a-z"> + <li class="first-child"><a href="http://www.bromley.gov.uk/a_to_z/A">a</a></li> + <li><a href="http://www.bromley.gov.uk/a_to_z/B">b</a></li> + <li><a href="http://www.bromley.gov.uk/a_to_z/C">c</a></li> + <li><a href="http://www.bromley.gov.uk/a_to_z/D">d</a></li> + <li><a href="http://www.bromley.gov.uk/a_to_z/E">e</a></li> + <li><a href="http://www.bromley.gov.uk/a_to_z/F">f</a></li> + <li><a href="http://www.bromley.gov.uk/a_to_z/G">g</a></li> + <li><a href="http://www.bromley.gov.uk/a_to_z/H">h</a></li> + <li><a href="http://www.bromley.gov.uk/a_to_z/I">i</a></li> + <li><a href="http://www.bromley.gov.uk/a_to_z/J">j</a></li> + <li><a href="http://www.bromley.gov.uk/a_to_z/K">k</a></li> + <li><a href="http://www.bromley.gov.uk/a_to_z/L">l</a></li> + <li><a href="http://www.bromley.gov.uk/a_to_z/M">m</a></li> + <li><a href="http://www.bromley.gov.uk/a_to_z/N">n</a></li> + <li><a href="http://www.bromley.gov.uk/a_to_z/O">o</a></li> + <li><a href="http://www.bromley.gov.uk/a_to_z/P">p</a></li> + <li><a href="http://www.bromley.gov.uk/a_to_z/Q">q</a></li> + <li><a href="http://www.bromley.gov.uk/a_to_z/R">r</a></li> + <li><a href="http://www.bromley.gov.uk/a_to_z/S">s</a></li> + <li><a href="http://www.bromley.gov.uk/a_to_z/T">t</a></li> + <li><a href="http://www.bromley.gov.uk/a_to_z/U">u</a></li> + <li><a href="http://www.bromley.gov.uk/a_to_z/V">v</a></li> + <li><a href="http://www.bromley.gov.uk/a_to_z/W">w</a></li> + <li><a href="http://www.bromley.gov.uk/a_to_z/X">x</a></li> + <li><a href="http://www.bromley.gov.uk/a_to_z/Y">y</a></li> + <li><a href="http://www.bromley.gov.uk/a_to_z/Z">z</a></li> + </ul> + </li> + </ul> + </nav> + </div> + <div class="breadcrumb"> + <!-- Breadcrumb --><!-- googleoff:all --> + <ul> + <li class="first-child"><a href="http://www.bromley.gov.uk">Home</a></li> + <li class="current"><span>FixMyStreet</span></li> + </ul> + <!-- END Breadcrumb --><!-- googleon:all --> + </div> diff --git a/templates/web/bromley/report/_item.html b/templates/web/bromley/report/_item.html index cd3fbc18c..3bd8a8686 100644 --- a/templates/web/bromley/report/_item.html +++ b/templates/web/bromley/report/_item.html @@ -1,5 +1,5 @@ -<li> -<a class="text" href="[% c.uri_for('/report', problem.id ) %]"> +<li class="item-list__item item-list--reports__item item-list__item--with-pin [% c.cobrand.pin_colour(problem) %]"> +<a class="[% problem.category %]" href="[% c.uri_for('/report', problem.id ) %]"> [% IF problem.photo; photo = problem.get_photo_params %] @@ -11,7 +11,7 @@ [%- IF include_lastupdate AND problem.confirmed != problem.lastupdate AND problem.whensent != problem.lastupdate %], [% tprintf(loc('last updated %s'), prettify_dt( problem.lastupdate, 1 ) ) %] [%- END %] - [% IF include_lastupdate %] + [% IF include_sentinfo %] [% IF problem.bodies_str_ids.size > 1 %] [% loc('(sent to both)') %] [% ELSIF problem.bodies_str_ids.size == 0 %] [% loc('(not sent to council)') %] [% END %] diff --git a/templates/web/eastsussex/email_sent.html b/templates/web/eastsussex/email_sent.html deleted file mode 100644 index f64a3cd64..000000000 --- a/templates/web/eastsussex/email_sent.html +++ /dev/null @@ -1,34 +0,0 @@ -[% INCLUDE 'header.html', bodyclass = 'twothirdswidthpage', title = loc('Create a report') %] - -<h1>[% loc("Nearly done! Now check your email…") %]</h1> - -[% IF c.cobrand.moniker != 'zurich' %] - <p>[% loc("The confirmation email <strong>may</strong> take a few minutes to arrive — <em>please</em> be patient.") %]</p> -[% END %] - -<p>[% loc("If you use web-based email or have 'junk mail' filters, you may wish to check your bulk/spam mail folders: sometimes, our messages are marked that way.") %]</p> - -[% IF c.cobrand.moniker != 'zurich' %] - <p> - [% loc("You must now click the link in the email we've just sent you.") %] - [% IF email_type == 'problem' %] - [% loc("If you do not, your problem will not be posted.") %] - [% ELSIF email_type == 'update' %] - [% loc("If you do not, your update will not be posted.") %] - [% ELSIF email_type == 'alert' %] - [% loc("If you do not, your alert will not be activated.") %] - [% END %] - </p> - - <p> - [% IF email_type == 'problem' %] - [% loc("(Don't worry — we'll hang on to your problem report while you're checking your email.)") %] - [% ELSIF email_type == 'update' %] - [% loc("(Don't worry — we'll hang on to your update while you're checking your email.)") %] - [% ELSIF email_type == 'alert' %] - [% loc("(Don't worry — we'll hang on to your alert while you're checking your email.)") %] - [% END %] - </p> -[% END %] - -[% INCLUDE 'footer.html' %] diff --git a/templates/web/emptyhomes/header.html b/templates/web/emptyhomes/header.html index de1ecec7b..0f6d1b3b8 100644 --- a/templates/web/emptyhomes/header.html +++ b/templates/web/emptyhomes/header.html @@ -1,7 +1,7 @@ <!doctype html> -<!--[if lt IE 7]><html class="ie6 oldie" lang="[% lang_code %]"><![endif]--> -<!--[if IE 7]> <html class="ie7 oldie" lang="[% lang_code %]"><![endif]--> -<!--[if IE 8]> <html class="ie8 oldie" lang="[% lang_code %]"><![endif]--> +<!--[if lt IE 7]><html class="ie6" lang="[% lang_code %]"><![endif]--> +<!--[if IE 7]> <html class="ie7" lang="[% lang_code %]"><![endif]--> +<!--[if IE 8]> <html class="ie8" lang="[% lang_code %]"><![endif]--> <!--[if gt IE 8]><!--><html lang="[% lang_code %]"><!--<![endif]--> <head> diff --git a/templates/web/fiksgatami/footer.html b/templates/web/fiksgatami/footer.html index e9fbeb716..f5088bcb4 100644 --- a/templates/web/fiksgatami/footer.html +++ b/templates/web/fiksgatami/footer.html @@ -10,11 +10,11 @@ <div class="nav-wrapper"> <div class="nav-wrapper-2"> <div id="main-nav" role="navigation"> - <ul id="mysoc-menu"> + <ul class="nav-menu nav-menu--mysoc"> <li><a href="http://www.nuug.no/">Foreningen NUUG</a></li> </ul> - <ul id="main-menu"> + <ul class="nav-menu nav-menu--main"> <li><[% IF c.req.uri.path == '/' %]span[% ELSE %]a href="/"[% END %] class="report-a-problem-btn" >[% loc("Report a problem") %]</[% c.req.uri.path == '/' ? 'span' : 'a' %]></li>[% %]<li><[% IF c.req.uri.path == '/my' %]span[% ELSE %]a href="/my"[% END diff --git a/templates/web/fiksgatami/header.html b/templates/web/fiksgatami/header.html index 3cdc093cb..ac607be8a 100644 --- a/templates/web/fiksgatami/header.html +++ b/templates/web/fiksgatami/header.html @@ -1,8 +1,8 @@ <!doctype html> -<!--[if lt IE 7]><html class="no-js ie6 oldie" lang="[% lang_code %]"><![endif]--> -<!--[if IE 7]> <html class="no-js ie7 oldie" lang="[% lang_code %]"><![endif]--> -<!--[if IE 8]> <html class="no-js ie8 oldie" lang="[% lang_code %]"><![endif]--> -<!--[if IE 9]> <html class="no-js ie9 oldie" lang="[% lang_code %]"><![endif]--> +<!--[if lt IE 7]><html class="no-js ie6 iel8" lang="[% lang_code %]"><![endif]--> +<!--[if IE 7]> <html class="no-js ie7 iel8" lang="[% lang_code %]"><![endif]--> +<!--[if IE 8]> <html class="no-js ie8 iel8" lang="[% lang_code %]"><![endif]--> +<!--[if IE 9]> <html class="no-js ie9" lang="[% lang_code %]"><![endif]--> <!--[if gt IE 9]><!--><html class="no-js" lang="[% lang_code %]"><!--<![endif]--> <head> <meta name="viewport" content="initial-scale=1.0"> diff --git a/templates/web/fiksgatami/nn/footer.html b/templates/web/fiksgatami/nn/footer.html index cfef66bc9..d7703388a 100644 --- a/templates/web/fiksgatami/nn/footer.html +++ b/templates/web/fiksgatami/nn/footer.html @@ -10,11 +10,11 @@ <div class="nav-wrapper"> <div class="nav-wrapper-2"> <div id="main-nav" role="navigation"> - <ul id="mysoc-menu"> + <ul class="nav-menu nav-menu--mysoc"> <li><a href="http://www.nuug.no/">Foreininga NUUG</a></li> </ul> - <ul id="main-menu"> + <ul class="nav-menu nav-menu--main"> <li><[% IF c.req.uri.path == '/' %]span[% ELSE %]a href="/"[% END %] class="report-a-problem-btn" >[% loc("Report a problem") %]</[% c.req.uri.path == '/' ? 'span' : 'a' %]></li>[% %]<li><[% IF c.req.uri.path == '/my' %]span[% ELSE %]a href="/my"[% END diff --git a/templates/web/fixamingata/footer.html b/templates/web/fixamingata/footer.html index c6f49cb79..376d79ff4 100644 --- a/templates/web/fixamingata/footer.html +++ b/templates/web/fixamingata/footer.html @@ -10,7 +10,7 @@ <div class="nav-wrapper"> <div class="nav-wrapper-2"> <div id="main-nav" role="navigation"> - <ul id="main-menu"> + <ul class="nav-menu nav-menu--main"> <li><[% IF c.req.uri.path == '/' %]span[% ELSE %]a href="/"[% END %] class="report-a-problem-btn" >[% loc("Report a problem") %]</[% c.req.uri.path == '/' ? 'span' : 'a' %]></li>[% %]<li><[% IF c.req.uri.path == '/my' %]span[% ELSE %]a href="/my"[% END diff --git a/templates/web/fixamingata/front/recent.html b/templates/web/fixamingata/front/recent.html index bfe35832e..255882f41 100644 --- a/templates/web/fixamingata/front/recent.html +++ b/templates/web/fixamingata/front/recent.html @@ -20,7 +20,7 @@ </h2> <section class="full-width"> - <ul class="issue-list-a"> + <ul class="item-list item-list--reports"> [% FOREACH problem IN recent_photos %] [% INCLUDE 'report/_item.html', no_fixed = 1 %] [% END %] diff --git a/templates/web/fixmindelo/footer.html b/templates/web/fixmindelo/footer.html index e11b81827..afd8984c7 100644 --- a/templates/web/fixmindelo/footer.html +++ b/templates/web/fixmindelo/footer.html @@ -28,11 +28,11 @@ <div class="nav-wrapper"> <div class="nav-wrapper-2"> <div id="main-nav" role="navigation"> - <ul id="mysoc-menu"> + <ul class="nav-menu nav-menu--mysoc"> <li><a id="mysoc-logo" href="http://www.mysociety.org/">mySociety</a></li> </ul> - <ul id="main-menu"> + <ul class="nav-menu nav-menu--main"> <li><[% IF c.req.uri.path == '/' %]span[% ELSE %]a href="/"[% END %] class="report-a-problem-btn" >[% loc("Report a problem") %]</[% c.req.uri.path == '/' ? 'span' : 'a' %]></li>[% %]<li><[% IF c.req.uri.path == '/my' %]span[% ELSE %]a href="/my"[% END diff --git a/templates/web/fixmindelo/static/privacy.html b/templates/web/fixmindelo/static/privacy.html index fd75f65e2..79817af4b 100644 --- a/templates/web/fixmindelo/static/privacy.html +++ b/templates/web/fixmindelo/static/privacy.html @@ -85,10 +85,9 @@ bloquear o Google Analytics.</a>. <table cellpadding=5> <tr align="left"><th scope="col">Nome</th><th scope="col">conteúdo típico </th><th scope="col">Expira</th></tr> -<tr><td>__utma</td><td>anônimo único ID</td><td>2 anos</td></tr> -<tr><td>__utmb</td><td>única sessão anônima ID </td><td>30 minutos</td></tr> -<tr><td>__utmz</td><td>IInformações sobre como o site foi alcançado (eg direta ou através de um link / search / propaganda)</td><td>6 meses</td></tr> -<tr><td>__utmx</td><td>Que variação de uma página que você está vendo se estamos testando versões diferentes para ver qual é o melhor </td><td>2 anos</td></tr> +<tr><td>_ga</td><td>anônimo único ID</td><td>2 anos</td></tr> +<tr><td>_gat</td><td>única sessão anônima ID </td><td>30 minutos</td></tr> +<tr><td>__utmx / __utmxx</td><td>Que variação de uma página que você está vendo se estamos testando versões diferentes para ver qual é o melhor </td><td>2 anos</td></tr> </table> <h4>Declaração oficial sobre dados do Google Analytics</h4> diff --git a/templates/web/fixmybarangay/around/intro.html b/templates/web/fixmybarangay/around/intro.html new file mode 100644 index 000000000..b876de453 --- /dev/null +++ b/templates/web/fixmybarangay/around/intro.html @@ -0,0 +1,2 @@ + <h1>View local problems</h1> + <h2>(potholes or street lighting)</h2> diff --git a/templates/web/fixmybarangay/around/tabbed_lists.html b/templates/web/fixmybarangay/around/tabbed_lists.html index 342b03f0e..f2f257b03 100644 --- a/templates/web/fixmybarangay/around/tabbed_lists.html +++ b/templates/web/fixmybarangay/around/tabbed_lists.html @@ -9,7 +9,7 @@ IF allow_creation %] </menu> [% END %] -<ul id="current" class="issue-list-a tab"> +<ul id="current" class="item-list item-list--reports tab"> [% INCLUDE "around/on_map_list_items.html" %] </ul> diff --git a/templates/web/fixmybarangay/footer.html b/templates/web/fixmybarangay/footer.html index 5bac32e98..d1f9203f2 100644 --- a/templates/web/fixmybarangay/footer.html +++ b/templates/web/fixmybarangay/footer.html @@ -5,13 +5,11 @@ <div class="nav-wrapper"> <div class="nav-wrapper-2"> <div id="main-nav" role="navigation"> - <ul id="mysoc-menu"> - <li><a id="mysoc-logo" href="http://www.mysociety.org/">mySociety</a></li>[% - %]<!--<li><a href="http://mysociety.org/donate/">Donate</a></li>[% - %]<li><a href="http://www.mysociety.org/projects/">Our Sites</a></li>--> + <ul class="nav-menu nav-menu--mysoc"> + <li><a id="mysoc-logo" href="http://www.mysociety.org/">mySociety</a></li> </ul> - <ul id="main-menu"> + <ul class="nav-menu nav-menu--main"> <li><a href="/around?latitude=10.322;longitude=123.907" class="fmb-bgy-btn">Luz</a></li> <li><a href="/around?latitude=10.288;longitude=123.870" class="fmb-bgy-btn">BSN</a></li> <li><[% IF c.req.uri.path == '/' %]span[% ELSE %]a href="/"[% END %] class="report-a-problem-btn" diff --git a/templates/web/fixmybarangay/header.html b/templates/web/fixmybarangay/header.html index 18388649b..739f4c761 100644 --- a/templates/web/fixmybarangay/header.html +++ b/templates/web/fixmybarangay/header.html @@ -1,8 +1,8 @@ <!doctype html> -<!--[if lt IE 7]><html class="no-js ie6 oldie" lang="[% lang_code %]"><![endif]--> -<!--[if IE 7]> <html class="no-js ie7 oldie" lang="[% lang_code %]"><![endif]--> -<!--[if IE 8]> <html class="no-js ie8 oldie" lang="[% lang_code %]"><![endif]--> -<!--[if IE 9]> <html class="no-js ie9 oldie" lang="[% lang_code %]"><![endif]--> +<!--[if lt IE 7]><html class="no-js ie6 iel8" lang="[% lang_code %]"><![endif]--> +<!--[if IE 7]> <html class="no-js ie7 iel8" lang="[% lang_code %]"><![endif]--> +<!--[if IE 8]> <html class="no-js ie8 iel8" lang="[% lang_code %]"><![endif]--> +<!--[if IE 9]> <html class="no-js ie9" lang="[% lang_code %]"><![endif]--> <!--[if gt IE 9]><!--><html class="no-js" lang="[% lang_code %]"><!--<![endif]--> <head> <meta name="viewport" content="initial-scale=1.0"> diff --git a/templates/web/fixmybarangay/report/_message_manager.html b/templates/web/fixmybarangay/report/_message_manager.html index 3845feeef..e937066ff 100644 --- a/templates/web/fixmybarangay/report/_message_manager.html +++ b/templates/web/fixmybarangay/report/_message_manager.html @@ -16,7 +16,7 @@ </div> [% END %] -<ul id="message_manager" class="issue-list-a tab" style="display: none"> +<ul id="message_manager" class="item-list item-list--reports tab" style="display: none"> <li id="mm-admin-buttons"> [% IF problem.id %] <a style="float:left" id="mm-link-to-toggle-archive" href="#" title="show the message(s) associated with this report">show message for <b>this</b> report</a> diff --git a/templates/web/fixmystreet-uk-councils/report/_item-with-pin.html b/templates/web/fixmystreet-uk-councils/report/_item-with-pin.html new file mode 100644 index 000000000..b36dac3b6 --- /dev/null +++ b/templates/web/fixmystreet-uk-councils/report/_item-with-pin.html @@ -0,0 +1,6 @@ +<li class="item-list__item item-list__item--with-pin [% c.cobrand.pin_colour(problem) %]"> + <a href="[% c.uri_for('/report', problem.id ) %]" class="[% problem.category %]"> + <h3>[% problem.title | html %]</h3> + <p>Reported [%- prettify_dt( problem.confirmed, 1 ) %]</p> + </a> +</li> diff --git a/templates/web/fixmystreet-uk-councils/static/privacy.html b/templates/web/fixmystreet-uk-councils/static/privacy.html index ba1745978..3b077d29e 100644 --- a/templates/web/fixmystreet-uk-councils/static/privacy.html +++ b/templates/web/fixmystreet-uk-councils/static/privacy.html @@ -46,6 +46,13 @@ available).</dd> problem you’ve reported, and send you a questionnaire email four weeks after you submit a problem, asking for a status update; we’ll only ever send you emails in relation to your problem.</dd> + + <dt>How do I stop receiving emails from you?</dt> + <dd>Every alert email we send contains an unsubscribe link at the +bottom for you to stop receiving that alert. After the first questionnaire +email on a report, mentioned above, you have to opt in to receive any further +questionnaire on that report.</dd> + </dl> <h2>Cookies</h2> @@ -92,10 +99,9 @@ plugin for blocking Google Analytics</a>. <table cellpadding=5> <tr align="left"><th scope="col">Name</th><th scope="col">Typical Content</th><th scope="col">Expires</th></tr> -<tr><td>__utma</td><td>Unique anonymous visitor ID</td><td>2 years</td></tr> -<tr><td>__utmb</td><td>Unique anonymous session ID</td><td>30 minutes</td></tr> -<tr><td>__utmz</td><td>Information on how the site was reached (e.g. direct or via a link/search/advertisement)</td><td>6 months</td></tr> -<tr><td>__utmx</td><td>Which variation of a page you are seeing if we are testing different versions to see which is best</td><td>2 years</td></tr> +<tr><td>_ga</td><td>Used to distinguish users</td><td>2 years</td></tr> +<tr><td>_gat</td><d>Used to throtle request rate</td><td>10 minutes</td></tr> +<tr><td>__utmx / __utmxx</td><td>Which variation of a page you are seeing if we are testing different versions to see which is best</td><td>2 years</td></tr> </table> <h4>Google’s Official Statement about Analytics Data</h4> diff --git a/templates/web/fixmystreet.com/contact/address.html b/templates/web/fixmystreet.com/contact/address.html new file mode 100644 index 000000000..2cea59684 --- /dev/null +++ b/templates/web/fixmystreet.com/contact/address.html @@ -0,0 +1,7 @@ +<hr> + +<p>FixMyStreet is a service provided by mySociety, which is the project of a +registered charity, UK Citizens Online Democracy, charity number 1076346.</p> + +<p>If you wish to contact us by post, our address is +<address>mySociety, 483 Green Lanes, London, N13 4BS, UK.</address></p> diff --git a/templates/web/fixmystreet.com/footer_extra.html b/templates/web/fixmystreet.com/footer_extra.html deleted file mode 100644 index ba32a5534..000000000 --- a/templates/web/fixmystreet.com/footer_extra.html +++ /dev/null @@ -1,3 +0,0 @@ -<script type="text/javascript"> - (function(){var e=0.6;var t=null;var n=document.cookie.split(";");for(var r=0;r<n.length;r++){var i=n[r];while(i.charAt(0)==" "){i=i.substring(1,i.length)}if(i.indexOf("ms_srv_t=")==0){var t=i.substring("ms_srv_t=".length,i.length)}if(i.indexOf("ms_srv_r=")==0){var s=i.substring("ms_srv_r=".length,i.length)}}if(t==null){if(Math.random()<e){var o=Math.round((new Date).getTime()/1e3);document.cookie="ms_srv_t="+o+"; path=/";document.cookie="ms_srv_r="+document.referrer+"; path=/";t=o;s=document.referrer}else{document.cookie="ms_srv_t=X; path=/";t="X"}}if(t!="X"&&!!document.getElementById("ms_srv_wrapper")){var u=Math.round((new Date).getTime()/1e3)-t;var a=!!document.getElementById("user-meta");var f=document.getElementById("ms_srv_link");data={ms_time:u,ms_referrer:s||null,ms_registered:a,ms_transaction:f.getAttribute("data-transaction")};var l=[];for(var c in data){l.push(encodeURIComponent(c)+"="+encodeURIComponent(data[c]))}f.href=f.href+"?"+l.join("&");document.getElementById("ms_srv_wrapper").style.display=""}})() -</script> diff --git a/templates/web/fixmystreet.com/research/survey_link.html b/templates/web/fixmystreet.com/research/survey_link.html deleted file mode 100644 index 7357249d8..000000000 --- a/templates/web/fixmystreet.com/research/survey_link.html +++ /dev/null @@ -1,3 +0,0 @@ -<div id="ms_srv_wrapper" style="display:none"> - <p><a href="https://www.surveygizmo.co.uk/s3/1907419/FMS-2014" id="ms_srv_link" data-transaction="report">We’re running a short survey to help us understand how well FixMyStreet works. If you’d like to take it, click here.</a></p> -</div> diff --git a/templates/web/fixmystreet.com/static/privacy.html b/templates/web/fixmystreet.com/static/privacy.html index ba1745978..3b077d29e 100755 --- a/templates/web/fixmystreet.com/static/privacy.html +++ b/templates/web/fixmystreet.com/static/privacy.html @@ -46,6 +46,13 @@ available).</dd> problem you’ve reported, and send you a questionnaire email four weeks after you submit a problem, asking for a status update; we’ll only ever send you emails in relation to your problem.</dd> + + <dt>How do I stop receiving emails from you?</dt> + <dd>Every alert email we send contains an unsubscribe link at the +bottom for you to stop receiving that alert. After the first questionnaire +email on a report, mentioned above, you have to opt in to receive any further +questionnaire on that report.</dd> + </dl> <h2>Cookies</h2> @@ -92,10 +99,9 @@ plugin for blocking Google Analytics</a>. <table cellpadding=5> <tr align="left"><th scope="col">Name</th><th scope="col">Typical Content</th><th scope="col">Expires</th></tr> -<tr><td>__utma</td><td>Unique anonymous visitor ID</td><td>2 years</td></tr> -<tr><td>__utmb</td><td>Unique anonymous session ID</td><td>30 minutes</td></tr> -<tr><td>__utmz</td><td>Information on how the site was reached (e.g. direct or via a link/search/advertisement)</td><td>6 months</td></tr> -<tr><td>__utmx</td><td>Which variation of a page you are seeing if we are testing different versions to see which is best</td><td>2 years</td></tr> +<tr><td>_ga</td><td>Used to distinguish users</td><td>2 years</td></tr> +<tr><td>_gat</td><d>Used to throtle request rate</td><td>10 minutes</td></tr> +<tr><td>__utmx / __utmxx</td><td>Which variation of a page you are seeing if we are testing different versions to see which is best</td><td>2 years</td></tr> </table> <h4>Google’s Official Statement about Analytics Data</h4> diff --git a/templates/web/fixmystreet.com/tokens/_extras_confirm.html b/templates/web/fixmystreet.com/tokens/_extras_confirm.html deleted file mode 100644 index c27383f42..000000000 --- a/templates/web/fixmystreet.com/tokens/_extras_confirm.html +++ /dev/null @@ -1 +0,0 @@ -[% INCLUDE 'research/survey_link.html' %] diff --git a/templates/web/fixmystreet/alert/_list.html b/templates/web/fixmystreet/alert/_list.html deleted file mode 100644 index f376e3c66..000000000 --- a/templates/web/fixmystreet/alert/_list.html +++ /dev/null @@ -1,93 +0,0 @@ - <input type="hidden" name="type" value="local"> - <input type="hidden" name="pc" value="[% pc | html %]"> - <input type="hidden" name="latitude" value="[% latitude | html %]"> - <input type="hidden" name="longitude" value="[% longitude | html %]"> - - <p> - [% IF pretty_pc %] - [% tprintf( loc('Here are the types of local problem alerts for ‘%s’.'), pretty_pc ) %] - [% END %] - [% loc('Select which type of alert you\'d like and click the button for an RSS feed, or enter your email address to subscribe to an email alert.') %] - </p> - - [% INCLUDE 'errors.html' %] - - <p> - [% loc('The simplest alert is our geographic one:') %] - </p> - - <p id="rss_local"> - <input type="radio" name="feed" id="[% rss_feed_id %]" value="[% rss_feed_id %]"[% IF rss_feed_id == selected_feed || selected_feed == '' %] checked[% END %]> - <label class="inline" for="[% rss_feed_id %]">[% tprintf( loc('Problems within %.1fkm of this location'), population_radius ) %]</label> - <a href='[% rss_feed_uri %]'><img src='/i/feed.png' width='16' height='16' title='[% loc('RSS feed of nearby problems') %]' alt='[% loc('RSS feed') %]' border='0'></a> - <br /> - [% loc('(a default distance which covers roughly 200,000 people)') %] - </p> - - <p id="rss_local_alt"> - [% loc('(alternatively the RSS feed can be customised, within') %] - <a href="[% rss_feed_2k %]">2km</a> / <a href="[% rss_feed_5k %]">5km</a> / <a href="[% rss_feed_10k %]">10km</a> / <a href="[% rss_feed_20k %]">20km</a>) - </p> - - <p> - [% IF c.cobrand.is_council %] - Or you can subscribe to an alert for all council problems or one based upon what ward you’re in: - [% ELSE %] - [% loc("Or you can subscribe to an alert based upon what ward or council you’re in:") %] - [% END %] - </p> - - [% IF reported_to_options %] - <p><strong> - [% loc('Problems within the boundary of:') %] - </strong></p> - <ul class="plain-list"> - [% ELSE %] - <ul id="rss_feed" class="plain-list"> - [% END %] - - [% FOREACH option IN options %] - <li[% IF ! (loop.count % 2) %] class="a"[% END %]> - <input type="radio" name="feed" id="[% option.id %]" value="[% option.id %]"[% IF option.id == selected_feed %] checked[% END %]> - <a href="[% option.uri %]"><img src="/i/feed.png" width="16" height="16" -title="[% option.rss_text %]" alt="RSS feed" border="0"></a> - <label class="inline" for="[% option.id %]">[% option.text %]</label> - </li> - [% END %] -</ul> - [% IF reported_to_options %] - <p><strong> - [% loc('Or problems reported to:') %] - </strong></p> - <ul class="plain-list"> - [% FOREACH option IN reported_to_options %] - <li[% IF ! (loop.count % 2) %] class="a"[% END %]> - <input type="radio" name="feed" id="[% option.id %]" value="[% option.id %]"[% IF option.id == selected_feed %] checked[% END %]> - <a href="[% option.uri %]"><img src="/i/feed.png" width="16" height="16" - title="[% option.rss_text %]" alt="RSS feed" border="0"></a> - <label class="inline" for="[% option.id %]">[% option.text %]</label> - </li> - [% END %] - </ul> - <p><small> - [% loc( 'FixMyStreet sends different categories of problem -to the appropriate council, so problems within the boundary of a particular council -might not match the problems sent to that council. For example, a graffiti report -will be sent to the district council, so will appear in both of the district -council’s alerts, but will only appear in the "Within the boundary" alert -for the county council.' ) %] - </small></p> - [% END %] - - <input id="alert_rss_button" class="green-btn" type="submit" name="rss" value="[% loc('Give me an RSS feed') %]"> - - <p id="alert_or"> - [% loc('or') %] - </p> - - [% UNLESS c.user_exists %] - <label for="rznvy">[% loc('Your email') %]</label> - <input type="text" id="rznvy" name="rznvy" value="[% rznvy | html %]"> - [% END %] - <input id="alert_email_button" style="margin-top:1em;" class="green-btn" type="submit" name="alert" value="[% loc('Subscribe me to an email alert') %]"> - diff --git a/templates/web/fixmystreet/around/_main.html b/templates/web/fixmystreet/around/_main.html new file mode 100644 index 000000000..900dcb6aa --- /dev/null +++ b/templates/web/fixmystreet/around/_main.html @@ -0,0 +1,3 @@ +<div class="tablewrapper"> + [% INCLUDE 'around/_error_multiple.html' %] +</div> diff --git a/templates/web/fixmystreet/around/around_map_list_items.html b/templates/web/fixmystreet/around/around_map_list_items.html deleted file mode 100644 index 612b37d00..000000000 --- a/templates/web/fixmystreet/around/around_map_list_items.html +++ /dev/null @@ -1,9 +0,0 @@ -[% IF around_map.size %] - [% FOREACH p IN around_map %] - [% INCLUDE 'report/_item.html' - problem = p.problem, - dist = tprintf("%.1f", (p.distance || 0) ) %] - [% END %] -[% ELSE %] - <li><p>[% loc('No problems found.') %]</p></li> -[% END %] diff --git a/templates/web/fixmystreet/around/location_error.html b/templates/web/fixmystreet/around/location_error.html deleted file mode 100644 index fc9b2b8ce..000000000 --- a/templates/web/fixmystreet/around/location_error.html +++ /dev/null @@ -1 +0,0 @@ -<p class="form-error">[% location_error %]</p> diff --git a/templates/web/fixmystreet/around/on_map_list_items.html b/templates/web/fixmystreet/around/on_map_list_items.html deleted file mode 100644 index 7b66d4267..000000000 --- a/templates/web/fixmystreet/around/on_map_list_items.html +++ /dev/null @@ -1,7 +0,0 @@ -[% IF on_map.size %] - [% FOREACH problem IN on_map %] - [% INCLUDE 'report/_item.html' %] - [% END %] -[% ELSE %] - <li><p>[% loc('No problems have been reported yet.') %]</p></li> -[% END %] diff --git a/templates/web/fixmystreet/around/postcode_form.html b/templates/web/fixmystreet/around/postcode_form.html deleted file mode 100644 index ed5d700f0..000000000 --- a/templates/web/fixmystreet/around/postcode_form.html +++ /dev/null @@ -1,31 +0,0 @@ -<div id="front-main"> - <div id="front-main-container"> - [% IF c.cobrand.moniker == 'fixmybarangay' %] - <h1>View local problems</h1> - <h2>(potholes or street lighting)</h2> - [% ELSE %] - [% INCLUDE 'around/intro.html' %] - [% END %] - - [% - question = c.cobrand.enter_postcode_text || loc('Enter a nearby street name and area'); - %] - - [% IF c.cobrand.moniker == 'fixmybarangay' %] - [% INCLUDE '_barangay_buttons.html' %] - [% ELSE %] - <form action="[% c.uri_for('/around') %]" method="get" name="postcodeForm" id="postcodeForm"> - <label for="pc">[% question %]:</label> - <div> - <input type="text" name="pc" value="[% pc | html %]" id="pc" size="10" maxlength="200" placeholder="[% tprintf(loc('e.g. ‘%s’ or ‘%s’'), c.cobrand.example_places) %]"> - <input type="submit" value="[% loc('Go') %]" id="sub"> - </div> - - [% IF partial_token %] - <input type="hidden" name="partial" value="[% partial_token.token %]"> - [% END %] - - </form> - [% END %] - </div> -</div> diff --git a/templates/web/fixmystreet/around/tabbed_lists.html b/templates/web/fixmystreet/around/tabbed_lists.html deleted file mode 100644 index 77c5a521b..000000000 --- a/templates/web/fixmystreet/around/tabbed_lists.html +++ /dev/null @@ -1,14 +0,0 @@ -<menu id="problems-nav" class="tab-nav"> - <ul> - <li><a href="#current">[% loc('Problems on the map') %]</a></li> - <li><a href="#current_near">[% loc( 'Problems nearby' ) %]</a></li> - </ul> -</menu> - -<ul id="current" class="issue-list-a tab"> - [% INCLUDE "around/on_map_list_items.html" %] -</ul> - -<ul id="current_near" class="issue-list-a tab"> - [% INCLUDE "around/around_map_list_items.html" %] -</ul> diff --git a/templates/web/fixmystreet/auth/general.html b/templates/web/fixmystreet/auth/general.html deleted file mode 100644 index 45239073d..000000000 --- a/templates/web/fixmystreet/auth/general.html +++ /dev/null @@ -1,73 +0,0 @@ -[% INCLUDE 'header.html', bodyclass='authpage', title = loc('Sign in or create an account') %] -[%# should bodyclass='twothirdspage' instead? Need override for Harrogate %] - -<h1>[% loc('Sign in') %]</h1> - -<form action="[% c.uri_for() %]" method="post" name="general_auth" class="validate"> - <fieldset> - <input type="hidden" name="r" value="[% c.req.params.r | html %]"> - - [% IF email_error; - - # other keys include fqdn, mxcheck if you'd like to write a custom error message - - errors = { - missing => loc('Please enter your email'), - other => loc('Please check your email address is correct') - }; - - loc_email_error = errors.$email_error || errors.other; - END %] - <label class="n" for="email">[% loc('Email') %]</label> - [% IF loc_email_error %] - <div class="form-error">[% loc_email_error %]</div> - [% ELSIF sign_in_error %] - <div class="form-error">[% loc('There was a problem with your email/password combination. If you cannot remember your password, or do not have one, please fill in the ‘sign in by email’ section of the form.') %]</div> - [% END %] - <input type="email" class="required email" id="email" name="email" value="[% email | html %]" placeholder="[% loc('Your email address') %]"> - - <div id="form_sign_in"> - [% IF c.cobrand.moniker == 'fixmybarangay' %] - <h3>[% loc("Do you have a FixMyBarangay password?") %]</h3> - [% ELSE %] - <h3>[% loc("Do you have a FixMyStreet password?") %]</h3> - [% END %] - - <div id="form_sign_in_yes" class="form-box"> - <h5>[% loc('<strong>Yes</strong> I have a password') %]</h5> - - <label class="hidden-js n" for="password_sign_in">[% loc('<strong>Yes</strong> I have a password') %]</label> - - <div class="form-txt-submit-box"> - <input type="password" name="password_sign_in" id="password_sign_in" value="" placeholder="[% loc('Your password') %]"> - <input class="green-btn" type="submit" name="sign_in" value="[% loc('Sign in') %]"> - </div> - - <input type="checkbox" id="remember_me" name="remember_me" value='1'[% ' checked' IF remember_me %]> - <label class="inline n" for="remember_me">[% loc('Keep me signed in on this computer') %]</label> - - </div> - <div id="form_sign_in_no" class="form-box"> - <h5>[% loc('<strong>No</strong> let me sign in by email') %]</h5> - - <label for="name">[% loc('Name') %]</label> - <input type="text" name="name" value="" placeholder="[% loc('Your name') %]"> - - <label for="password_register">[% loc('Password (optional)') %]</label> - - <div class="general-notes"> - <p>[% loc('Providing a name and password is optional, but doing so will allow you to more easily report problems, leave updates and manage your reports.') %]</p> - </div> - - <div class="form-txt-submit-box"> - <input type="password" name="password_register" id="password_register" value="" placeholder="[% loc('Enter a password') %]"> - <input class="green-btn" type="submit" name="email_sign_in" value="[% loc('Sign in') %]"> - </div> - </div> - - </div> - </fieldset> -</form> - - -[% INCLUDE 'footer.html' %] diff --git a/templates/web/fixmystreet/contact/blurb.html b/templates/web/fixmystreet/contact/blurb.html index 21a4ae715..3f9e88ed0 100644 --- a/templates/web/fixmystreet/contact/blurb.html +++ b/templates/web/fixmystreet/contact/blurb.html @@ -10,6 +10,6 @@ <p> [% loc('Please do <strong>not</strong> report problems through this form; messages go to -the team behind FixMyStreet, not a council. To report a problem, +the team behind this site, not a council. To report a problem, please <a href="/">go to the front page</a> and follow the instructions.') %] </p> diff --git a/templates/web/fixmystreet/contact/index.html b/templates/web/fixmystreet/contact/index.html index 92f2451ef..96ff7643d 100644 --- a/templates/web/fixmystreet/contact/index.html +++ b/templates/web/fixmystreet/contact/index.html @@ -7,9 +7,9 @@ <div class="sticky-sidebar"> <aside> <ul class="plain-list"> - <li><a href="/faq">Frequently Asked Questions</a></li> - <li><a href="/privacy">Privacy and cookies</a></li> - <li><strong>Contact FixMyStreet</strong></li> + <li><a href="/faq">[% loc('Frequently Asked Questions') %]</a></li> + <li><a href="/privacy">[% loc('Privacy and cookies') %]</a></li> + <li><strong>[% tprintf(loc("Contact %s", "%s is the site name"), site_name) %]</strong></li> </ul> </aside> </div> diff --git a/templates/web/fixmystreet/footer.html b/templates/web/fixmystreet/footer.html index 810708919..7626736a0 100644 --- a/templates/web/fixmystreet/footer.html +++ b/templates/web/fixmystreet/footer.html @@ -13,22 +13,31 @@ <div class="nav-wrapper"> <div class="nav-wrapper-2"> <div id="main-nav" role="navigation"> - <ul id="mysoc-menu"> + <ul class="nav-menu nav-menu--mysoc"> <li><a id="mysoc-logo" href="https://www.mysociety.org/">mySociety</a></li> </ul> - - <ul id="main-menu"> - <li><[% IF c.req.uri.path == '/' %]span[% ELSE %]a href="/"[% END %] class="report-a-problem-btn" +[% + SET base = ""; + SET base = c.cobrand.base_url IF admin; +%] + <ul class="nav-menu nav-menu--main"> + <li><[% IF c.req.uri.path == '/' + %]span[% ELSE %]a href="[% base %]/"[% END %] class="report-a-problem-btn" >[% loc("Report a problem") %]</[% c.req.uri.path == '/' ? 'span' : 'a' %]></li>[% - %]<li><[% IF c.req.uri.path == '/my' %]span[% ELSE %]a href="/my"[% END + %]<li><[% IF c.req.uri.path == '/my' + %]span[% ELSE %]a href="[% base %]/my"[% END %]>[% loc("Your reports") %]</[% c.req.uri.path == '/my' ? 'span' : 'a' %]></li>[% - %]<li><[% IF c.req.uri.path == '/reports' %]span[% ELSE %]a href="/reports"[% END + %]<li><[% IF c.req.uri.path == '/reports' + %]span[% ELSE %]a href="[% base %]/reports"[% END %]>[% loc("All reports") %]</[% c.req.uri.path == '/reports' ? 'span' : 'a' %]></li>[% - %]<li><[% IF c.req.uri.path == '/alert' %]span[% ELSE %]a href="/alert[% pc ? '/list?pc=' : '' %][% pc | uri %]"[% END + %]<li><[% IF c.req.uri.path == '/alert' + %]span[% ELSE %]a href="[% base %]/alert[% pc ? '/list?pc=' : '' %][% pc | uri %]"[% END %]>[% loc("Local alerts") %]</[% c.req.uri.path == '/alert' ? 'span' : 'a' %]></li>[% - %]<li><[% IF c.req.uri.path == '/faq' %]span[% ELSE %]a href="/faq"[% END + %]<li><[% IF c.req.uri.path == '/faq' + %]span[% ELSE %]a href="[% base %]/faq"[% END %]>[% loc("Help") %]</[% c.req.uri.path == '/faq' ? 'span' : 'a' %]></li>[% - %]<li id="top-nav-privacy"><[% IF c.req.uri.path == '/privacy' %]span[% ELSE %]a href="/privacy"[% END + %]<li class="nav-menu__item--privacy"><[% IF c.req.uri.path == '/privacy' + %]span[% ELSE %]a href="[% base %]/privacy"[% END %]>[% loc("Privacy") %]</[% c.req.uri.path == '/privacy' ? 'span' : 'a' %]></li> </ul> </div> diff --git a/templates/web/fixmystreet/front/recent.html b/templates/web/fixmystreet/front/recent.html deleted file mode 100644 index 4cb575489..000000000 --- a/templates/web/fixmystreet/front/recent.html +++ /dev/null @@ -1,24 +0,0 @@ - [% - recent_photos = c.cobrand.recent_photos('front', 5); - %] - - [% IF recent_photos.size %] - <div id="front-recently"> - <h2> - [% IF c.cobrand.moniker == 'hart' %] - Recently reported - [% ELSE %] - [% loc('Recently reported problems') %] - [% END %] - </h2> - - <section class="full-width"> - <ul class="issue-list-a"> - [% FOREACH problem IN recent_photos %] - [% INCLUDE 'report/_item.html', no_fixed = 1 %] - [% END %] - </ul> - </section> - - </div> - [% END %] diff --git a/templates/web/fixmystreet/header.html b/templates/web/fixmystreet/header.html index 4fde56e94..bc9e16af8 100644 --- a/templates/web/fixmystreet/header.html +++ b/templates/web/fixmystreet/header.html @@ -1,9 +1,14 @@ +[% + SET html_att = ' lang="' _ lang_code _ '"'; + # For a right-to-left language, use the following line in your own header: + # SET html_att = html_att _ ' dir="rtl"'; +-%] <!doctype html> -<!--[if lt IE 7]><html class="no-js ie6 oldie" lang="[% lang_code %]"><![endif]--> -<!--[if IE 7]> <html class="no-js ie7 oldie" lang="[% lang_code %]"><![endif]--> -<!--[if IE 8]> <html class="no-js ie8 oldie" lang="[% lang_code %]"><![endif]--> -<!--[if IE 9]> <html class="no-js ie9 oldie" lang="[% lang_code %]"><![endif]--> -<!--[if gt IE 9]><!--><html class="no-js" lang="[% lang_code %]"><!--<![endif]--> +<!--[if lt IE 7]><html class="no-js ie6 iel8"[% html_att %]><![endif]--> +<!--[if IE 7]> <html class="no-js ie7 iel8"[% html_att %]><![endif]--> +<!--[if IE 8]> <html class="no-js ie8 iel8"[% html_att %]><![endif]--> +<!--[if IE 9]> <html class="no-js ie9"[% html_att %]><![endif]--> +<!--[if gt IE 9]><!--><html class="no-js"[% html_att %]><!--<![endif]--> <head> <meta name="viewport" content="initial-scale=1.0"> diff --git a/templates/web/fixmystreet/header_logo.html b/templates/web/fixmystreet/header_logo.html index 3ae706730..66378235a 100644 --- a/templates/web/fixmystreet/header_logo.html +++ b/templates/web/fixmystreet/header_logo.html @@ -1,2 +1,2 @@ - <a href="/" id="site-logo">[%- PROCESS 'site-name.html' -%]</a> - <a href="/" id="report-cta" title="[%- loc('Report a problem') -%]">[%- loc('Report') -%]</a> + <a href="[% c.cobrand.base_url IF admin %]/" id="site-logo">[% site_name %]</a> + <a href="[% c.cobrand.base_url IF admin %]/" id="report-cta" title="[%- loc('Report a problem') -%]">[%- loc('Report') -%]</a> diff --git a/templates/web/fixmystreet/header_opengraph.html b/templates/web/fixmystreet/header_opengraph.html deleted file mode 100644 index d0cd31261..000000000 --- a/templates/web/fixmystreet/header_opengraph.html +++ /dev/null @@ -1,9 +0,0 @@ - <meta property="og:url" content="[% c.cobrand.base_url %][% c.req.uri.path %]"> - <meta property="og:title" content="[% title || 'FixMyStreet' %]"> - <meta property="og:site_name" content="[%- PROCESS 'site-name.html' -%]"> - [% IF c.req.uri.path == '/' %]<meta property="og:description" content="Report, view, and discuss local street-related problems.">[% END %] - <meta property="og:type" content="website"> - <meta property="og:image" content="[% c.cobrand.base_url %]/cobrands/fixmystreet/fms-og_image.png"> - <meta property="og:image:type" content="image/png"> - <meta property="og:image:width" content="500"> - <meta property="og:image:height" content="500"> diff --git a/templates/web/fixmystreet/index.html b/templates/web/fixmystreet/index.html deleted file mode 100644 index 0441b3efb..000000000 --- a/templates/web/fixmystreet/index.html +++ /dev/null @@ -1,20 +0,0 @@ -[% map_js = PROCESS 'front/javascript.html' %] - -[% pre_container_extra = PROCESS 'around/postcode_form.html' %] -[% INCLUDE 'header.html', title = '', bodyclass = 'frontpage fullwidthpage' %] - -[% IF error %] - <p class="form-error">[% error %]</p> -[% END %] - -[% TRY %][% PROCESS 'front/pre-steps.html' %][% CATCH file %][% END %] - -<div class="tablewrapper"> - <div id="front-howto"> - [% INCLUDE 'index-steps.html' %] - </div> - - [% INCLUDE 'front/recent.html' %] -</div> - -[% INCLUDE 'footer.html' pagefooter = 'yes' %] diff --git a/templates/web/fixmystreet/my/_problem-list.html b/templates/web/fixmystreet/my/_problem-list.html deleted file mode 100644 index 1a891de80..000000000 --- a/templates/web/fixmystreet/my/_problem-list.html +++ /dev/null @@ -1,27 +0,0 @@ -[% FOREACH p = problems.confirmed %] - [% IF loop.first %]<h2>[% loc('Open reports') %]</h2>[% END %] - [% INCLUDE problem %] -[% END %] - -[% FOREACH p = problems.fixed %] - [% IF loop.first %]<h2>[% loc('Fixed reports') %]</h2>[% END %] - [% INCLUDE problem %] -[% END %] - -[% FOREACH p = problems.closed %] - [% IF loop.first %]<h2>[% loc('Closed reports') %]</h2>[% END %] - [% INCLUDE problem %] -[% END %] - -[%# FOREACH p = problems.unconfirmed; - IF loop.first; - '<h2>' _ loc('Unconfirmed reports') _ '</h2>'; - END; - INCLUDE problem; -END %] - -[% BLOCK problem %] - [% "<ul class='issue-list-a full-width'>" IF loop.first %] - [% INCLUDE 'report/_item.html', problem = p, no_fixed =1 %] - [% "</ul>" IF loop.last %] -[% END %] diff --git a/templates/web/fixmystreet/my/my.html b/templates/web/fixmystreet/my/my.html deleted file mode 100644 index 16779e503..000000000 --- a/templates/web/fixmystreet/my/my.html +++ /dev/null @@ -1,60 +0,0 @@ -[% - SET bodyclass = 'mappage'; - PROCESS "maps/${map.type}.html" IF problems.size; - INCLUDE 'header.html', title = loc('Your Reports'); -%] - -[% IF problems.size %] - [% map_html %] - </div> - <div id="side"> -[% ELSE %] - <div id="skipped-map"> -[% END %] - -<h1>[% loc('Your Reports') %]</h1> - -<p><a href="/auth/change_password">[% loc('Change password') %]</a></p> - -[% IF ! has_content %] -[% tprintf( loc('You haven’t created any reports yet. <a href="%s">Report a problem now.</a>'), - c.uri_for('/') ) %] -[% END %] - -[% IF c.cobrand.moniker == 'fixmybarangay' %] - [% INCLUDE '_barangay_buttons.html' %] -[% ELSIF c.cobrand.moniker == 'hart' %] - [% INCLUDE '_hart_hants_note.html' %] -[% END %] - -[% INCLUDE "reports/_list-filters.html", use_section_wrapper = 1 %] - -[% INCLUDE 'pagination.html', - pager = problems_pager, - param = 'p' -%] - -[% INCLUDE 'my/_problem-list.html' %] - -[% FOREACH u IN updates %] - [% IF loop.first %] - <h2>[% loc('Your updates') %]</h2> - [% INCLUDE 'pagination.html', - pager = updates_pager, - param = 'u' - %] - <ul class="issue-list full-width"> - [% END %] - - <li>“[% u.text | html %]” - – <a href="[% c.uri_for( '/report', u.problem_id ) %]#update_[% u.id %]">[% u.problem.title | html %]</a>. - <p><small class="council_sent_info"> - [% tprintf( loc("Added %s"), prettify_dt( u.confirmed, 'date' ) ) %] - </small></p> - </li> - [% "</ul>" IF loop.last %] -[% END %] - -</div> - -[% INCLUDE 'footer.html' %] diff --git a/templates/web/fixmystreet/questionnaire/index.html b/templates/web/fixmystreet/questionnaire/index.html deleted file mode 100644 index 69381dc03..000000000 --- a/templates/web/fixmystreet/questionnaire/index.html +++ /dev/null @@ -1,110 +0,0 @@ -[% - SET bodyclass = 'mappage'; - PROCESS "report/photo-js.html"; - PROCESS "maps/${map.type}.html"; - INCLUDE 'header.html', title = loc('Questionnaire'); -%] - -[% map_html %] - -</div> -<div id="side"> - - <menu id="problems-nav" class="tab-nav"> - <ul> - <li><a id="questionnaire_tab" href="#questionnaire">[% loc('Questionnaire') %]</a></li> - <li><a id="report_tab" href="#report">[% loc( 'Your report' ) %]</a></li> - </ul> - </menu> - - <div id="questionnaire" class="issue-list-a tab"> - [% INCLUDE questionnaire_form %] - </div> - - <div id="report" class="issue-list-a tab"> - [% INCLUDE 'report/_main.html' %] - [% INCLUDE 'report/updates.html' %] - </div> -</div> - -[% INCLUDE 'footer.html' %] - -[% BLOCK questionnaire_form %] -<h1>[% loc('Questionnaire') %]</h1> - -<form method="post" action="/questionnaire/submit" id="questionnaire" -[%- IF c.cobrand.allow_photo_upload -%] - enctype="multipart/form-data" -[%- END -%] -> - -<input type="hidden" name="token" value="[% token | html %]"> - -<p> -[% loc('The details of your problem are available from the other tab above.') %] -[% loc('Please <a class="tab_link" href="#report">take a look</a> at the updates that have been left.') IF updates %] -</p> - -[% IF errors %] -<ul class="error"> -<li>[% errors.join("</li>\n<li>") %]</li> -</ul> -[% END %] - -<p> -[% loc('An update marked this problem as fixed.') IF problem.is_fixed %] -[% loc('Has this problem been fixed?') %] -</p> - -<p> -<input type="radio" name="been_fixed" id="been_fixed_yes" value="Yes"[% ' checked' IF been_fixed == 'Yes' %]> -<label class="inline" for="been_fixed_yes">[% loc('Yes') %]</label> -<input type="radio" name="been_fixed" id="been_fixed_no" value="No"[% ' checked' IF been_fixed == 'No' %]> -<label class="inline" for="been_fixed_no">[% loc('No') %]</label> -<input type="radio" name="been_fixed" id="been_fixed_unknown" value="Unknown"[% ' checked' IF been_fixed == 'Unknown' %]> -<label class="inline" for="been_fixed_unknown">[% loc('Don’t know') %]</label> -</p> - -[% UNLESS answered_ever_reported %] -<p>[% loc('Have you ever reported a problem to a council before, or is this your first time?') %]</p> -<p> -<input type="radio" name="reported" id="reported_yes" value="Yes"[% ' checked' IF reported == 'Yes' %]> -<label class="inline" for="reported_yes">[% loc('Reported before') %]</label> -<input type="radio" name="reported" id="reported_no" value="No"[% ' checked' IF reported == 'No' %]> -<label class="inline" for="reported_no">[% loc('First time') %]</label> -</p> -[% END %] - -<p>[% loc('If you wish to leave a public update on the problem, please enter it here -(please note it will not be sent to the council). For example, what was -your experience of getting the problem fixed?') %]</p> - -<p><textarea name="update" style="max-width:90%" rows="7" cols="30">[% update | html %]</textarea></p> - -[% IF c.cobrand.allow_photo_upload %] -<div id="fileupload_normalUI"> - [% IF upload_fileid %] - <img align="right" src="/photo/[% upload_fileid %].temp.jpeg" alt=""> - <p>[% loc('You have already attached a photo to this report, attaching another one will replace it.') %]</p> - <input type="hidden" name="upload_fileid" value="[% upload_fileid %]"> - [% END %] - <label for="form_photo">[% loc('Photo:') %]</label> - <input type="file" name="photo" id="form_photo"> -</div> -[% END %] - -<div id="another_qn"> - <p>[% loc('Would you like to receive another questionnaire in 4 weeks, reminding you to check the status?') %]</p> - <p> - <input type="radio" name="another" id="another_yes" value="Yes"[% ' checked' IF another == 'Yes' %]> - <label class="inline" for="another_yes">[% loc('Yes') %]</label> - <input type="radio" name="another" id="another_no" value="No"[% ' checked' IF another == 'No' %]> - <label class="inline" for="another_no">[% loc('No') %]</label> - </p> -</div> - -<p><input type="submit" name="submit" value="[% loc('Submit questionnaire') %]"></p> - -</form> -[% END %] - diff --git a/templates/web/fixmystreet/report/display.html b/templates/web/fixmystreet/report/display.html index 0006241c3..5f499dd6e 100644 --- a/templates/web/fixmystreet/report/display.html +++ b/templates/web/fixmystreet/report/display.html @@ -6,7 +6,7 @@ problem_title = problem.title_safe _ ' - ' _ loc('Viewing a problem'); INCLUDE 'header.html' title = problem_title - rss = [ loc('Updates to this problem, FixMyStreet'), "/rss/$problem.id" ] + rss = [ tprintf(loc('Updates to this problem, %s', "%s is the site name"), site_name), "/rss/$problem.id" ] robots = 'index, nofollow'; %] diff --git a/templates/web/fixmystreet/report/new/form_user_loggedout.html b/templates/web/fixmystreet/report/new/form_user_loggedout.html index 31cccd44e..c5a58e8a9 100644 --- a/templates/web/fixmystreet/report/new/form_user_loggedout.html +++ b/templates/web/fixmystreet/report/new/form_user_loggedout.html @@ -8,7 +8,7 @@ <div id="form_sign_in"> <h3>[% loc("Now to submit your report…") %]</h3> - <h2>[% loc("Do you have a FixMyStreet password?") %]</h2> + <h2>[% tprintf(loc("Do you have a %s password?", "%s is the site name"), site_name) %]</h2> <div id="form_sign_in_yes" class="form-box"> diff --git a/templates/web/fixmystreet/report/update-form.html b/templates/web/fixmystreet/report/update-form.html index f5dca4669..a69b793b7 100644 --- a/templates/web/fixmystreet/report/update-form.html +++ b/templates/web/fixmystreet/report/update-form.html @@ -83,7 +83,7 @@ <div id="form_sign_in"> <h3>[% loc("Now to submit your update…") %]</h3> - <h2>[% loc("Do you have a FixMyStreet password?") %]</h2> + <h2>[% tprintf(loc("Do you have a %s password?", "%s is the site name"), site_name) %]</h2> <div id="form_sign_in_yes" class="form-box"> <h5>[% loc('<strong>Yes</strong> I have a password') %]</h5> diff --git a/templates/web/fixmystreet/report/update.html b/templates/web/fixmystreet/report/update.html index 847277dfd..66e698606 100644 --- a/templates/web/fixmystreet/report/update.html +++ b/templates/web/fixmystreet/report/update.html @@ -3,9 +3,9 @@ [% IF loop.first %] <section class="full-width"> <h4 class="static-with-rule">[% loc('Updates') %]</h4> - <ul class="issue-list"> + <ul class="item-list item-list--updates"> [% END %] - <li class="issue"> + <li class="item-list__item item-list__item--updates"> [% IF moderating; original_update = update.moderation_original_data %] <form method="post" action="/moderate/report/[% problem.id %]/update/[% update.id %]"> <input type="button" class="btn moderate moderate-display" value="moderate"> @@ -22,14 +22,14 @@ [% END %] </div> [% END %] - <div class="update-wrap"> + <div class="item-list__update-wrap"> [% IF update.whenanswered %] - <div class="update-text"> + <div class="item-list__update-text"> <p class="meta-2"> [% INCLUDE meta_line %] </p> </div> [% ELSE %] [% INCLUDE 'report/photo.html' object=update %] - <div class="update-text"> + <div class="item-list__update-text"> <div class="moderate-display"> [% add_links( update.text ) | html_para %] </div> diff --git a/templates/web/fixmystreet/reports/_list-entry.html b/templates/web/fixmystreet/reports/_list-entry.html deleted file mode 100755 index 8509df376..000000000 --- a/templates/web/fixmystreet/reports/_list-entry.html +++ /dev/null @@ -1 +0,0 @@ -[% INCLUDE 'report/_item.html', include_lastupdate = 1 %] diff --git a/templates/web/fixmystreet/reports/_ward-list.html b/templates/web/fixmystreet/reports/_ward-list.html index 5e82a93cc..b7e19ffc2 100755 --- a/templates/web/fixmystreet/reports/_ward-list.html +++ b/templates/web/fixmystreet/reports/_ward-list.html @@ -2,10 +2,12 @@ <section id="council_wards" class="hidden-js"> <h2>[% ward_text %]</h2> <p>[% loc('Follow a ward link to view only reports within that ward.') %]</p> - <ul class="issue-list-a full-width"> - [% FOR child IN children.values.sort('name') %] - <li><a href="[% child.url %]"><span class="text">[% child.name %]</span></a></li> - [% END %] + <ul class="item-list item-list--wards full-width"> + [% FOR child IN children.values.sort('name') %] + <li class="item-list__item item-list--wards__item"> + <a href="[% child.url %]">[% child.name %]</a> + </li> + [% END %] </ul> </section> [% END %] diff --git a/templates/web/greenwich/around/around_map_list_items.html b/templates/web/greenwich/around/around_map_list_items.html deleted file mode 100644 index e69de29bb..000000000 --- a/templates/web/greenwich/around/around_map_list_items.html +++ /dev/null diff --git a/templates/web/greenwich/around/on_map_list_items.html b/templates/web/greenwich/around/on_map_list_items.html deleted file mode 100644 index 893f5c698..000000000 --- a/templates/web/greenwich/around/on_map_list_items.html +++ /dev/null @@ -1,11 +0,0 @@ -[% all_reports = on_map.merge(around_map) %] -[% IF all_reports.size %] - [% FOREACH problem IN all_reports %] - [% UNLESS problem.title; problem = problem.problem; END %] - [% INCLUDE "reports/_list-entry.html" %] - [% END %] -[% ELSE %] - <li class="empty"> - <p>[% loc('There are no reports to show.') %]</p> - </li> -[% END %] diff --git a/templates/web/greenwich/around/tabbed_lists.html b/templates/web/greenwich/around/tabbed_lists.html deleted file mode 100644 index 0d7dfddfc..000000000 --- a/templates/web/greenwich/around/tabbed_lists.html +++ /dev/null @@ -1,5 +0,0 @@ -[% INCLUDE "reports/_list-filters.html" %] - -<ul class="report-list" id="current"> - [% INCLUDE "around/on_map_list_items.html" %] -</ul> diff --git a/templates/web/greenwich/footer.html b/templates/web/greenwich/footer.html index 31ab35f52..fe905acb1 100644 --- a/templates/web/greenwich/footer.html +++ b/templates/web/greenwich/footer.html @@ -13,11 +13,7 @@ <div class="nav-wrapper"> <div class="nav-wrapper-2"> <div id="main-nav" role="navigation"> - <ul id="mysoc-menu"> - <li><a id="mysoc-logo" href="https://www.mysociety.org/">mySociety</a></li> - </ul> - - <ul id="main-menu"> + <ul class="nav-menu nav-menu--main"> <li><[% IF c.req.uri.path == '/' %]span[% ELSE %]a href="/"[% END %] class="report-a-problem-btn" >[% loc("Report a problem") %]</[% c.req.uri.path == '/' ? 'span' : 'a' %]></li>[% %]<li><[% IF c.req.uri.path == '/my' %]span[% ELSE %]a href="/my"[% END @@ -28,14 +24,13 @@ %]>[% loc("Local alerts") %]</[% c.req.uri.path == '/alert' ? 'span' : 'a' %]></li>[% %]<li><[% IF c.req.uri.path == '/faq' %]span[% ELSE %]a href="/faq"[% END %]>[% loc("Help") %]</[% c.req.uri.path == '/faq' ? 'span' : 'a' %]></li>[% - %]<li id="top-nav-privacy"><[% IF c.req.uri.path == '/privacy' %]span[% ELSE %]a href="/privacy"[% END + %]<li class="nav-menu__item--privacy"><[% IF c.req.uri.path == '/privacy' %]span[% ELSE %]a href="/privacy"[% END %]>[% loc("Privacy") %]</[% c.req.uri.path == '/privacy' ? 'span' : 'a' %]></li> </ul> </div> </div> </div> -<!-- [% INCLUDE 'debug_footer.html' %] --> </div> <!-- .wrapper --> [% TRY %][% PROCESS 'footer_extra.html' %][% CATCH file %][% END %] diff --git a/templates/web/greenwich/front/_list-entry.html b/templates/web/greenwich/front/_list-entry.html new file mode 100755 index 000000000..046c3b97f --- /dev/null +++ b/templates/web/greenwich/front/_list-entry.html @@ -0,0 +1 @@ +[% INCLUDE 'report/_item.html' no_fixed = 1 item_extra_class = 'item-list__item--with-pin' %] diff --git a/templates/web/greenwich/header_logo.html b/templates/web/greenwich/header_logo.html index fa279bdc4..d788de6f8 100644 --- a/templates/web/greenwich/header_logo.html +++ b/templates/web/greenwich/header_logo.html @@ -1,4 +1,4 @@ - <a href="http://www.royalgreenwich.gov.uk/" id="site-logo">[%- PROCESS 'site-name.html' -%]</a> + <a href="http://www.royalgreenwich.gov.uk/" id="site-logo">[% site_name %]</a> </div> <div class="container main-menu-container"> <ul id="greenwich-menu-desktop"> diff --git a/templates/web/greenwich/reports/_list-entry.html b/templates/web/greenwich/reports/_list-entry.html index cd70410d3..b24ef2260 100644 --- a/templates/web/greenwich/reports/_list-entry.html +++ b/templates/web/greenwich/reports/_list-entry.html @@ -1,6 +1 @@ -<li class="[% c.cobrand.pin_colour(problem) %]"> - <a href="[% c.uri_for('/report', problem.id ) %]" class="[% problem.category %]"> - <h3>[% problem.title | html %]</h3> - <p>Reported [%- prettify_dt( problem.confirmed, 1 ) %]</p> - </a> -</li> +[% INCLUDE 'report/_item-with-pin.html' %] diff --git a/templates/web/greenwich/reports/_list-filters.html b/templates/web/greenwich/reports/_list-filters.html deleted file mode 100644 index 5d610261b..000000000 --- a/templates/web/greenwich/reports/_list-filters.html +++ /dev/null @@ -1,32 +0,0 @@ -[% IF use_section_wrapper %] -<section class="full-width"> - <form method="get" action=""> -[% END %] - - <p class="report-list-filters"> - <label> - Show - <select name="status" id="statuses"> - <option value="all"[% ' selected' IF filter_status == 'all' %]>all reports</option> - <option value="open"[% ' selected' IF filter_status == 'open' %]>unfixed reports</option> - <option value="fixed"[% ' selected' IF filter_status == 'fixed' %]>fixed reports</option> - </select> - </label> - <label> - about - <select name="filter_category" id="filter_categories"> - <option value="">Everything</option> - [% FOR category IN filter_categories %] - <option value="[% category | html %]"[% ' selected' IF filter_category == category %]> - [% category | html %] - </option> - [% END %] - </select> - </label> - <input type=submit value="Go" /> - </p> - -[% IF use_section_wrapper %] - </form> -</section> -[% END %] diff --git a/templates/web/greenwich/reports/_problem-list.html b/templates/web/greenwich/reports/_problem-list.html deleted file mode 100644 index 45746e309..000000000 --- a/templates/web/greenwich/reports/_problem-list.html +++ /dev/null @@ -1,19 +0,0 @@ -<section class="full-width"> - [% INCLUDE column - problems = problems.${body.id} - %] -</section> - -[% BLOCK column %] - <ul class="issue-list-a"> - [% IF problems %] - [% FOREACH problem IN problems %] - [% INCLUDE 'reports/_list-entry.html' %] - [% END %] - [% ELSE %] - <li class="empty"> - <p>[% loc('There are no reports to show.') %]</p> - </li> - [% END %] - </ul> -[% END %] diff --git a/templates/web/harrogate/footer.html b/templates/web/harrogate/footer.html index 4558b2381..f262f6156 100644 --- a/templates/web/harrogate/footer.html +++ b/templates/web/harrogate/footer.html @@ -14,34 +14,33 @@ <div class="nav-wrapper-2"> <div id="main-nav" role="navigation"> - <ul id="main-menu"> + <ul class="nav-menu nav-menu--main"> [% selected = c.req.uri.path == '/' %] - <li [% selected ? 'class="menu-item-selected"' : '' %]> - <[% IF selected %]span[% ELSE %]a href="/"[% END %] class="report-a-problem-btn"> + <li><[% IF selected %]span[% ELSE %]a href="/"[% END %]> [% loc("Report a problem") %]</[% selected == '/' ? 'span' : 'a' %]></li> [% selected = c.req.uri.path == '/my' %] - <li [% selected ? 'class="menu-item-selected"' : '' %]> + <li> <[% IF selected %]span[% ELSE %]a href="/my"[% END %]> [% loc("Your reports") %]</[% selected ? 'span' : 'a' %]></li> [% selected = c.req.uri.path == '/reports/Harrogate' %] - <li [% selected ? 'class="menu-item-selected"' : '' %]> + <li> <[% IF selected %]span[% ELSE %]a href="/reports"[% END %]> [% loc("All reports") %]</[% selected ? 'span' : 'a' %]></li> [% selected = c.req.uri.path == '/alert' %] - <li [% selected ? 'class="menu-item-selected"' : '' %]> + <li> <[% IF selected %]span[% ELSE %]a href="/alert[% pc ? '/list?pc=' : '' %][% pc | uri %]"[% END %]> [% loc("Local alerts") %]</[% selected ? 'span' : 'a' %]></li> [% selected = c.req.uri.path == '/faq' %] - <li [% selected ? 'class="menu-item-selected"' : '' %]> + <li> <[% IF selected %]span[% ELSE %]a href="/faq"[% END %]> [% loc("Help") %]</[% selected ? 'span' : 'a' %]></li> [% selected = c.req.uri.path == '/privacy' %] - <li id="top-nav-privacy" [% selected ? 'class="menu-item-selected"' : '' %]> + <li class="nav-menu__item--privacy"> <[% IF selected %]span[% ELSE %]a href="/privacy"[% END %]> [% loc("Privacy") %]</[% selected ? 'span' : 'a' %]></li> </ul> diff --git a/templates/web/harrogate/header.html b/templates/web/harrogate/header.html index e40a38d94..bd319e250 100644 --- a/templates/web/harrogate/header.html +++ b/templates/web/harrogate/header.html @@ -1,8 +1,8 @@ <!doctype html> -<!--[if lt IE 7]><html class="no-js ie6 oldie" lang="[% lang_code %]"><![endif]--> -<!--[if IE 7]> <html class="no-js ie7 oldie" lang="[% lang_code %]"><![endif]--> -<!--[if IE 8]> <html class="no-js ie8 oldie" lang="[% lang_code %]"><![endif]--> -<!--[if IE 9]> <html class="no-js ie9 oldie" lang="[% lang_code %]"><![endif]--> +<!--[if lt IE 7]><html class="no-js ie6 iel8" lang="[% lang_code %]"><![endif]--> +<!--[if IE 7]> <html class="no-js ie7 iel8" lang="[% lang_code %]"><![endif]--> +<!--[if IE 8]> <html class="no-js ie8 iel8" lang="[% lang_code %]"><![endif]--> +<!--[if IE 9]> <html class="no-js ie9" lang="[% lang_code %]"><![endif]--> <!--[if gt IE 9]><!--><html class="no-js" lang="[% lang_code %]"><!--<![endif]--> <head> <meta name="viewport" content="initial-scale=1.0"> diff --git a/templates/web/harrogate/static/privacy.html b/templates/web/harrogate/static/privacy.html index 7f0f090e4..767f80fbf 100755 --- a/templates/web/harrogate/static/privacy.html +++ b/templates/web/harrogate/static/privacy.html @@ -7,7 +7,7 @@ <ul class="plain-list"> <li><a href="/faq">Frequently Asked Questions</a></li> <li><strong>Privacy and cookies</strong></li> - <li><a href="/contact">Contact [%- PROCESS 'site-name.html' -%]</a></li> + <li><a href="/contact">Contact [% site_name %]</a></li> </ul> </aside> </div> diff --git a/templates/web/hart/footer.html b/templates/web/hart/footer.html index 14adf983d..312f63ff4 100644 --- a/templates/web/hart/footer.html +++ b/templates/web/hart/footer.html @@ -23,7 +23,7 @@ </div> <div class="nav-wrapper-2 clearfix"> <div id="main-nav" class="clearfix" role="navigation"> - <ul> + <ul class="nav-menu"> <li> <a href="http://www.hart.gov.uk/home">Home</a> </li> diff --git a/templates/web/hart/header.html b/templates/web/hart/header.html index c2d363010..b7b4fefcc 100644 --- a/templates/web/hart/header.html +++ b/templates/web/hart/header.html @@ -1,8 +1,8 @@ <!doctype html> -<!--[if lt IE 7]><html class="no-js ie6 oldie" lang="[% lang_code %]"><![endif]--> -<!--[if IE 7]> <html class="no-js ie7 oldie" lang="[% lang_code %]"><![endif]--> -<!--[if IE 8]> <html class="no-js ie8 oldie" lang="[% lang_code %]"><![endif]--> -<!--[if IE 9]> <html class="no-js ie9 oldie" lang="[% lang_code %]"><![endif]--> +<!--[if lt IE 7]><html class="no-js ie6 iel8" lang="[% lang_code %]"><![endif]--> +<!--[if IE 7]> <html class="no-js ie7 iel8" lang="[% lang_code %]"><![endif]--> +<!--[if IE 8]> <html class="no-js ie8 iel8" lang="[% lang_code %]"><![endif]--> +<!--[if IE 9]> <html class="no-js ie9" lang="[% lang_code %]"><![endif]--> <!--[if gt IE 9]><!--><html class="no-js" lang="[% lang_code %]"><!--<![endif]--> <head> <meta name="viewport" content="initial-scale=1.0"> diff --git a/templates/web/oxfordshire/around/around_map_list_items.html b/templates/web/oxfordshire/around/around_map_list_items.html deleted file mode 100644 index e69de29bb..000000000 --- a/templates/web/oxfordshire/around/around_map_list_items.html +++ /dev/null diff --git a/templates/web/oxfordshire/around/on_map_list_items.html b/templates/web/oxfordshire/around/on_map_list_items.html deleted file mode 100644 index 893f5c698..000000000 --- a/templates/web/oxfordshire/around/on_map_list_items.html +++ /dev/null @@ -1,11 +0,0 @@ -[% all_reports = on_map.merge(around_map) %] -[% IF all_reports.size %] - [% FOREACH problem IN all_reports %] - [% UNLESS problem.title; problem = problem.problem; END %] - [% INCLUDE "reports/_list-entry.html" %] - [% END %] -[% ELSE %] - <li class="empty"> - <p>[% loc('There are no reports to show.') %]</p> - </li> -[% END %] diff --git a/templates/web/oxfordshire/around/tabbed_lists.html b/templates/web/oxfordshire/around/tabbed_lists.html deleted file mode 100644 index 0d7dfddfc..000000000 --- a/templates/web/oxfordshire/around/tabbed_lists.html +++ /dev/null @@ -1,5 +0,0 @@ -[% INCLUDE "reports/_list-filters.html" %] - -<ul class="report-list" id="current"> - [% INCLUDE "around/on_map_list_items.html" %] -</ul> diff --git a/templates/web/oxfordshire/footer.html b/templates/web/oxfordshire/footer.html index ed84c0ad6..3153125fd 100644 --- a/templates/web/oxfordshire/footer.html +++ b/templates/web/oxfordshire/footer.html @@ -10,11 +10,11 @@ <div class="nav-wrapper"> <div class="nav-wrapper-2"> <div id="main-nav" role="navigation"> - <ul id="mysoc-menu"> + <ul class="nav-menu nav-menu--mysoc"> <li><a id="mysoc-logo" href="https://www.fixmystreet.com/council">Powered by <img src="/cobrands/oxfordshire/images/fms-logo-105x20.png" alt="FixMyStreet"></a></li> </ul> - <ul id="main-menu"> + <ul class="nav-menu nav-menu--main"> <li><[% IF c.req.uri.path == '/' %]span[% ELSE %]a href="/"[% END %] class="report-a-problem-btn" >[% loc("Report a problem") %]</[% c.req.uri.path == '/' ? 'span' : 'a' %]></li>[% %]<li><[% IF c.req.uri.path == '/my' %]span[% ELSE %]a href="/my"[% END diff --git a/templates/web/oxfordshire/front/_list-entry.html b/templates/web/oxfordshire/front/_list-entry.html new file mode 100755 index 000000000..046c3b97f --- /dev/null +++ b/templates/web/oxfordshire/front/_list-entry.html @@ -0,0 +1 @@ +[% INCLUDE 'report/_item.html' no_fixed = 1 item_extra_class = 'item-list__item--with-pin' %] diff --git a/templates/web/oxfordshire/header.html b/templates/web/oxfordshire/header.html index bc52a0720..b4244a51b 100644 --- a/templates/web/oxfordshire/header.html +++ b/templates/web/oxfordshire/header.html @@ -1,8 +1,8 @@ <!doctype html> -<!--[if lt IE 7]><html class="no-js ie6 oldie" lang="[% lang_code %]"><![endif]--> -<!--[if IE 7]> <html class="no-js ie7 oldie" lang="[% lang_code %]"><![endif]--> -<!--[if IE 8]> <html class="no-js ie8 oldie" lang="[% lang_code %]"><![endif]--> -<!--[if IE 9]> <html class="no-js ie9 oldie" lang="[% lang_code %]"><![endif]--> +<!--[if lt IE 7]><html class="no-js ie6 iel8" lang="[% lang_code %]"><![endif]--> +<!--[if IE 7]> <html class="no-js ie7 iel8" lang="[% lang_code %]"><![endif]--> +<!--[if IE 8]> <html class="no-js ie8 iel8" lang="[% lang_code %]"><![endif]--> +<!--[if IE 9]> <html class="no-js ie9" lang="[% lang_code %]"><![endif]--> <!--[if gt IE 9]><!--><html class="no-js" lang="[% lang_code %]"><!--<![endif]--> <head> <meta name="viewport" content="initial-scale=1.0"> diff --git a/templates/web/oxfordshire/my/_problem-list.html b/templates/web/oxfordshire/my/_problem-list.html deleted file mode 100644 index 1ff69f9fb..000000000 --- a/templates/web/oxfordshire/my/_problem-list.html +++ /dev/null @@ -1,25 +0,0 @@ -<ul class='issue-list-a full-width'> - [% IF problems.all %] - [% FOREACH p = problems.all %] - [% INCLUDE 'reports/_list-entry.html', problem = p, no_fixed =1 %] - [% END %] - [% ELSE %] - <li class="empty"> - <p>[% loc('There are no reports to show.') %]</p> - </li> - [% END %] -</ul> - -[% IF ! problems.size %] -<!-- Preserve behaviour of map filters despite map not being shown --> -<script type="text/javascript"> - (function($) { - $(function() { - $(".report-list-filters [type=submit]").hide(); - $(".report-list-filters select").change(function() { - $(this).closest("form").submit(); - }); - }) - })(window.jQuery); -</script> -[% END %] diff --git a/templates/web/oxfordshire/reports/_list-entry.html b/templates/web/oxfordshire/reports/_list-entry.html index cd70410d3..b24ef2260 100644 --- a/templates/web/oxfordshire/reports/_list-entry.html +++ b/templates/web/oxfordshire/reports/_list-entry.html @@ -1,6 +1 @@ -<li class="[% c.cobrand.pin_colour(problem) %]"> - <a href="[% c.uri_for('/report', problem.id ) %]" class="[% problem.category %]"> - <h3>[% problem.title | html %]</h3> - <p>Reported [%- prettify_dt( problem.confirmed, 1 ) %]</p> - </a> -</li> +[% INCLUDE 'report/_item-with-pin.html' %] diff --git a/templates/web/oxfordshire/reports/_list-filters.html b/templates/web/oxfordshire/reports/_list-filters.html deleted file mode 100644 index 5d610261b..000000000 --- a/templates/web/oxfordshire/reports/_list-filters.html +++ /dev/null @@ -1,32 +0,0 @@ -[% IF use_section_wrapper %] -<section class="full-width"> - <form method="get" action=""> -[% END %] - - <p class="report-list-filters"> - <label> - Show - <select name="status" id="statuses"> - <option value="all"[% ' selected' IF filter_status == 'all' %]>all reports</option> - <option value="open"[% ' selected' IF filter_status == 'open' %]>unfixed reports</option> - <option value="fixed"[% ' selected' IF filter_status == 'fixed' %]>fixed reports</option> - </select> - </label> - <label> - about - <select name="filter_category" id="filter_categories"> - <option value="">Everything</option> - [% FOR category IN filter_categories %] - <option value="[% category | html %]"[% ' selected' IF filter_category == category %]> - [% category | html %] - </option> - [% END %] - </select> - </label> - <input type=submit value="Go" /> - </p> - -[% IF use_section_wrapper %] - </form> -</section> -[% END %] diff --git a/templates/web/seesomething/around/around_index.html b/templates/web/seesomething/around/index.html index a143e90a2..a143e90a2 100644 --- a/templates/web/seesomething/around/around_index.html +++ b/templates/web/seesomething/around/index.html diff --git a/templates/web/seesomething/footer.html b/templates/web/seesomething/footer.html index 95297f33d..c29f222d2 100644 --- a/templates/web/seesomething/footer.html +++ b/templates/web/seesomething/footer.html @@ -6,7 +6,7 @@ <div class="nav-wrapper-2"> <div id="main-nav" role="navigation"> - <ul id="main-menu"> + <ul class="nav-menu nav-menu--main"> <li><[% IF c.req.uri.path == '/' %]span[% ELSE %]a href="/"[% END %] class="report-a-problem-btn" >[% loc("Report a problem") %]</[% c.req.uri.path == '/' ? 'span' : 'a' %]></li>[% %]<li><[% IF c.req.uri.path == '/faq' %]span[% ELSE %]a href="/faq"[% END diff --git a/templates/web/stevenage/faq/faq-en-gb.html b/templates/web/stevenage/faq/faq-en-gb.html new file mode 100644 index 000000000..43284a463 --- /dev/null +++ b/templates/web/stevenage/faq/faq-en-gb.html @@ -0,0 +1,125 @@ +[% INCLUDE 'header.html', title = 'Help', bodyclass = 'twothirdswidthpage' %] + +<div class="sticky-sidebar"> + <aside> + <ul class="plain-list"> + <li><a href="#faq">Frequently Asked Questions</a></li> + <li><a href="/privacy">Privacy and cookies</a></li> + <li><a href="/contact">Contact FixMyStreet</a></li> + </ul> + </aside> +</div> + +<h1> Frequently Asked Questions </h1> + +<p>These pages are for reporting things which are broken, dirty, damaged or +dumped, and need fixing, cleaning or clearing: </p> +<ul> + <li>graffiti + <li>flytipping + <li>broken playground equipment + <li>street lighting + <li>potholes +</ul> +<dl> + <dt><a name="emergencies"></a>Reporting emergencies (Out of Hours)</dt> + <dd> + <p> Please do not report problems which present an immediate risk to life, + for example missing manhole covers or a fallen lamp column. </p> + <p> Issues reported via the website are only actioned during office hours. + If you require an Out of Hours service please ring (01438) 314963. </p> + </dd> + + <dt>How do I report a problem here?</dt> + <dd>After entering a postcode or location, you are shown +a map of that area. You can view problems already reported in that area, +or report ones of your own by clicking on the map at the location of +the problem.</dd> + <dt>How are the problems solved?</dt> + <dd>They are reported directly to us so we can then resolve the problem. + You can also discuss the problem on the website with others if you wish.</dd> + + <dt>Do you remove silly or illegal content?</dt> + <dd>Stevenage Borough Council and FixMyStreet are not responsible for the content and accuracy +of material submitted by its users. We reserve the right to edit or remove any +problems or updates which we consider to be inappropriate upon being informed +by a user of the site.</dd> + + <dt>Can I use FixMyStreet on my mobile?</dt> + <dd> + <p>The FixMyStreet website will already work on your mobile phone, adapting to + the size of your screen automatically. Using an app has some advantages, though + — for example, you can create a report even when you have no network + connection. + <ul> + <li> + <a href="https://itunes.apple.com/gb/app/fixmystreet/id297456545">FixMyStreet app for iPhone</a> + <li> + <a href="https://play.google.com/store/apps/details?id=org.mysociety.FixMyStreet">FixMyStreet app for Android</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> + </dd> + + <dt>Can I use these pages to report problems outside of Stevenage?</dd> + <dd>Yes, if you enter a postcode or address outside the borough you will be re-directed to the main FixMyStreet site that will enable you to report problems elsewhere. FixMyStreet will forward these on to the relevant council.</dd> + + <dt>The site is powered by FixMyStreet, who are they?</dt> + <dd>FixMyStreet was built by <a href="http://www.mysociety.org/">mySociety</a>, in conjunction with the <a href="http://www.youngfoundation.org.uk/">Young Foundation</a>. +mySociety is the project of a registered charity which has grown out of the community of +volunteers who built sites like <a href="http://www.theyworkforyou.com/">TheyWorkForYou</a>. +mySociety’s primary mission is to build Internet projects which give people simple, tangible +benefits in the civic and community aspects of their lives. +The charity is called UK Citizens Online Democracy and is charity number 1076346. mySociety +can be contacted by email at <a href="mailto:hello@mysociety.org">hello@mysociety.org</a>, +or by post at mySociety, 483 Green Lanes, London, N13 4BS.</dd> + + <dt>Why does the site use kilometres for measurements?</dt> + <dd>The British national + grid reference system, devised by Ordnance Survey (the British national + mapping agency) around the time of the second world war, uses eastings and + northings measured in metres and kilometres; the maps we use are from + Ordnance Survey and so this is what we use to display distances. + There you have it: not everything British is in miles!</dd> + + <dt>Why can’t I zoom out more on the reporting map?</dt> + <dd>We want to keep reports locally focused, so we restrict the ability to + move radically between areas. The map on <a href="/my">Your Reports</a> will let you see all + the reports you’ve made, wherever they are.</dd> + + <dt>I’d like a site like this for my own location/ where’s the "source code" to this site?</dt> + <dd> +The mySociety software behind this site is open source, and available +under the GNU Affero GPL software license. You can <a +href="https://github.com/mysociety/fixmystreet">download the +source code</a> and help mySociety develop it. +You’re welcome to use it in your own projects, although you must also +make available the source code to any such projects. +<a href="http://www.fiksgatami.no/">Fiksgatami</a> is an example of our code +being used in a Norwegian version of this site. +</dd> + +</dl> + + <h2><a name="privacy"></a>Privacy Questions</h2> + + <dl> + <dt>Who gets to see my email address?</dt> + <dd> +<p>If you submit a problem, your details, and details of the problem, will be +submitted to Stevenage Borough Council. Other than the council, only people we authorise to view the +FixMyStreet administration interface will be able to see your email address and +they will never use it for anything other than to help administer +FixMyStreet.</p> +<p>We will never give or sell your email address to anyone else, unless we are +obliged to by law. Your name will not be published anywhere unless you let us.</p> +</dd> + + <dt>What emails will you send to me?</dt> + <dd>We will email you when we have received your report, and when it has + been investigated and actioned. We will only send you emails that + relate to an issue you have reported.</dd> + + </dl> + +[% INCLUDE 'footer.html' pagefooter = 'yes' %] diff --git a/templates/web/stevenage/footer.html b/templates/web/stevenage/footer.html index 454da2bd9..f9bf63fb6 100644 --- a/templates/web/stevenage/footer.html +++ b/templates/web/stevenage/footer.html @@ -34,7 +34,7 @@ <div class="nav-wrapper"> <div class="nav-wrapper-2"> <div id="main-nav" role="navigation"> - <ul id="main-menu"> + <ul class="nav-menu nav-menu--main"> <li><[% IF c.req.uri.path == '/' %]span[% ELSE %]a href="/"[% END %] class="report-a-problem-btn" >[% loc("Report a problem") %]</[% c.req.uri.path == '/' ? 'span' : 'a' %]></li>[% %]<li><[% IF c.req.uri.path == '/my' %]span[% ELSE %]a href="/my"[% END diff --git a/templates/web/stevenage/header.html b/templates/web/stevenage/header.html index 155b35b64..87fb0d90d 100644 --- a/templates/web/stevenage/header.html +++ b/templates/web/stevenage/header.html @@ -1,8 +1,8 @@ <!doctype html> -<!--[if lt IE 7]><html class="no-js ie6 oldie" lang="[% lang_code %]"><![endif]--> -<!--[if IE 7]> <html class="no-js ie7 oldie" lang="[% lang_code %]"><![endif]--> -<!--[if IE 8]> <html class="no-js ie8 oldie" lang="[% lang_code %]"><![endif]--> -<!--[if IE 9]> <html class="no-js ie9 oldie" lang="[% lang_code %]"><![endif]--> +<!--[if lt IE 7]><html class="no-js ie6 iel8" lang="[% lang_code %]"><![endif]--> +<!--[if IE 7]> <html class="no-js ie7 iel8" lang="[% lang_code %]"><![endif]--> +<!--[if IE 8]> <html class="no-js ie8 iel8" lang="[% lang_code %]"><![endif]--> +<!--[if IE 9]> <html class="no-js ie9" lang="[% lang_code %]"><![endif]--> <!--[if gt IE 9]><!--><html class="no-js" lang="[% lang_code %]"><!--<![endif]--> <head> <meta name="viewport" content="initial-scale=1.0"> diff --git a/templates/web/trinidadtobago/footer.html b/templates/web/trinidadtobago/footer.html index 4ef368c0d..bace22e71 100644 --- a/templates/web/trinidadtobago/footer.html +++ b/templates/web/trinidadtobago/footer.html @@ -10,13 +10,13 @@ <div class="nav-wrapper"> <div class="nav-wrapper-2"> <div id="main-nav" role="navigation"> - <ul id="mysoc-menu"> + <ul class="nav-menu nav-menu--mysoc"> <li><a id="mysoc-logo" href="http://www.mysociety.org/">mySociety</a></li>[% %]<li><a href="http://mysociety.org/donate/">Donate</a></li>[% %]<li><a href="http://www.mysociety.org/projects/">Our Sites</a></li> </ul> - <ul id="main-menu"> + <ul class="nav-menu nav-menu--main"> <li><[% IF c.req.uri.path == '/' %]span[% ELSE %]a href="/"[% END %] class="report-a-problem-btn" >[% loc("Report a problem") %]</[% c.req.uri.path == '/' ? 'span' : 'a' %]></li>[% %]<li><[% IF c.req.uri.path == '/my' %]span[% ELSE %]a href="/my"[% END diff --git a/templates/web/trinidadtobago/header_logo.html b/templates/web/trinidadtobago/header_logo.html index d5da7e6b2..afc37c252 100644 --- a/templates/web/trinidadtobago/header_logo.html +++ b/templates/web/trinidadtobago/header_logo.html @@ -1 +1 @@ - <a href="[% c.config.BASE_URL %]/" id="site-logo">[% PROCESS 'site-name.html' -%]</a> + <a href="[% c.config.BASE_URL %]/" id="site-logo">[% site_name %]</a> diff --git a/templates/web/warwickshire/header.html b/templates/web/warwickshire/header.html index 274a78ce7..35baeacd7 100644 --- a/templates/web/warwickshire/header.html +++ b/templates/web/warwickshire/header.html @@ -1,8 +1,8 @@ <!DOCTYPE html><!-- 3P header begins --> -<!--[if lt IE 7]> <html class="no-js lt-ie9 lt-ie8 lt-ie7 ie6 oldie" lang="[% lang_code %]"> <![endif]--> -<!--[if IE 7]> <html class="no-js lt-ie9 lt-ie8 oldie" ie7 lang="[% lang_code %]"> <![endif]--> -<!--[if IE 8]> <html class="no-js lt-ie9 ie8 oldie" lang="[% lang_code %]"> <![endif]--> -<!--[if IE 9]> <html class="no-js ie9 oldie" lang="[% lang_code %]"><![endif]--> +<!--[if lt IE 7]> <html class="no-js iel8 lt-ie9 lt-ie8 lt-ie7 ie6" lang="[% lang_code %]"> <![endif]--> +<!--[if IE 7]> <html class="no-js iel8 lt-ie9 lt-ie8" ie7 lang="[% lang_code %]"> <![endif]--> +<!--[if IE 8]> <html class="no-js iel8 lt-ie9 ie8" lang="[% lang_code %]"> <![endif]--> +<!--[if IE 9]> <html class="no-js ie9" lang="[% lang_code %]"><![endif]--> <!--[if gt IE 9]><!--> <html class="no-js" lang="[% lang_code %]"> <!--<![endif]--> <head> @@ -195,7 +195,7 @@ %]>[% loc("Local alerts") %]</[% c.req.uri.path == '/alert' ? 'span' : 'a' %]></li>[% %]<li><[% IF c.req.uri.path == '/faq' %]span[% ELSE %]a href="/faq"[% END %]>[% loc("Help") %]</[% c.req.uri.path == '/faq' ? 'span' : 'a' %]></li>[% - %]<li id="top-nav-privacy"><[% IF c.req.uri.path == '/privacy' %]span[% ELSE %]a href="/privacy"[% END + %]<li class="nav-menu__item--privacy"><[% IF c.req.uri.path == '/privacy' %]span[% ELSE %]a href="/privacy"[% END %]>[% loc("Privacy") %]</[% c.req.uri.path == '/privacy' ? 'span' : 'a' %]></li> </ul> </div> diff --git a/templates/web/zerotb/around/around_map_list_items.html b/templates/web/zerotb/around/around_map_list_items.html deleted file mode 100644 index 225ddde6e..000000000 --- a/templates/web/zerotb/around/around_map_list_items.html +++ /dev/null @@ -1,9 +0,0 @@ -[% IF around_map.size %] - [% FOREACH p IN around_map %] - [% INCLUDE 'report/_item.html' - problem = p.problem, - dist = tprintf("%.1f", (p.distance || 0) ) %] - [% END %] -[% ELSE %] - <li><p>[% loc('No clinics found.') %]</p></li> -[% END %] diff --git a/templates/web/zerotb/around/on_map_list_items.html b/templates/web/zerotb/around/on_map_list_items.html index 838e2e9fa..5c7822b48 100644 --- a/templates/web/zerotb/around/on_map_list_items.html +++ b/templates/web/zerotb/around/on_map_list_items.html @@ -1,7 +1,14 @@ -[% IF on_map.size %] - [% FOREACH problem IN on_map %] +[% all_reports = on_map.merge(around_map) %] +[% IF all_reports.size %] + [% FOREACH problem IN all_reports %] + [% UNLESS problem.title; + dist = tprintf("%.1f", (problem.distance || 0) ); + problem = problem.problem; + END %] [% INCLUDE 'report/_item.html' %] [% END %] [% ELSE %] - <li><p>[% loc('No clinics found.') %]</p></li> + <li class="item-list__item item-list__item--empty"> + <p>[% loc('No clinics found.') %]</p> + </li> [% END %] diff --git a/templates/web/zerotb/around/tabbed_lists.html b/templates/web/zerotb/around/tabbed_lists.html index 8b8e8753e..090f03be0 100644 --- a/templates/web/zerotb/around/tabbed_lists.html +++ b/templates/web/zerotb/around/tabbed_lists.html @@ -1,14 +1,3 @@ -<menu id="problems-nav" class="tab-nav"> - <ul> - <li><a href="#current">[% loc('Clinics on the map') %]</a></li> - <li><a href="#current_near">[% loc( 'Clinics nearby' ) %]</a></li> - </ul> -</menu> - -<ul id="current" class="issue-list-a tab"> +<ul id="current" class="item-list item-list--reports tab"> [% INCLUDE "around/on_map_list_items.html" %] </ul> - -<ul id="current_near" class="issue-list-a tab"> - [% INCLUDE "around/around_map_list_items.html" %] -</ul> diff --git a/templates/web/zerotb/footer.html b/templates/web/zerotb/footer.html index c46a03878..cef009484 100644 --- a/templates/web/zerotb/footer.html +++ b/templates/web/zerotb/footer.html @@ -6,7 +6,7 @@ <div class="nav-wrapper"> <div class="nav-wrapper-2"> <div id="main-nav" role="navigation"> - <ul id="main-menu"> + <ul class="nav-menu nav-menu--main"> <li><[% IF c.req.uri.path == '/' %]span[% ELSE %]a href="/"[% END %] class="report-a-problem-btn" >[% loc("Report a Stockout") %]</[% c.req.uri.path == '/' ? 'span' : 'a' %]></li>[% %]<li><[% IF c.req.uri.path == '/faq' %]span[% ELSE %]a href="/faq"[% END diff --git a/templates/web/zerotb/report/_item.html b/templates/web/zerotb/report/_item.html index 92fb8e8d8..e12c9e1fa 100644 --- a/templates/web/zerotb/report/_item.html +++ b/templates/web/zerotb/report/_item.html @@ -1,5 +1,5 @@ -<li> -<a class="text" href="[% c.uri_for('/report', problem.id ) %]"> +<li class="item-list__item item-list--reports__item"> +<a href="[% c.uri_for('/report', problem.id ) %]"> <h4>[% problem.title | html %]</h4> </a> </li> diff --git a/templates/web/zurich/admin/body-form.html b/templates/web/zurich/admin/body-form.html index a31dffe7c..ac2887159 100644 --- a/templates/web/zurich/admin/body-form.html +++ b/templates/web/zurich/admin/body-form.html @@ -48,6 +48,7 @@ <p> <input type="hidden" name="posted" value="body"> <input type="hidden" name="token" value="[% token %]"> + <p> <input type="submit" value="[% body ? loc('Update body') : loc('Add body') %]"> </p> </form> diff --git a/templates/web/zurich/admin/header.html b/templates/web/zurich/admin/header.html index 281b1de23..929df8352 100644 --- a/templates/web/zurich/admin/header.html +++ b/templates/web/zurich/admin/header.html @@ -9,16 +9,20 @@ 'planned' = loc('Planned'), 'fixed - council' = loc('Closed'), 'hidden' = loc('Hidden'), - 'closed' = loc('Closed'), + 'closed' = loc('Extern'), + 'partial' = loc('Not contactable'), + 'investigating' = loc('Wish'), + 'unable to fix' = loc('Jurisdiction unknown'), + 'fixed - council' = loc('Closed'), } %] <style type="text/css"> .adminhidden { color: #666666; } - .admininternal { background-color: #eeeeff; } .active { background-color: #ffffee; cursor: pointer; } .error { color: red; } .overdue { background-color: #ffcccc; } select { width: auto; } + .admin-report-edit select { max-width: 100%; } #fms_pan_zoom { top: 13em !important; } </style> <script> diff --git a/templates/web/zurich/admin/list_updates.html b/templates/web/zurich/admin/list_updates.html index 2b575f27e..bde28567b 100644 --- a/templates/web/zurich/admin/list_updates.html +++ b/templates/web/zurich/admin/list_updates.html @@ -1,45 +1,49 @@ [% IF updates.size %] -<h2>[% loc('Internal notes') %]</h3> - -<table cellspacing="0" cellpadding="2" border="1"> - <tr> - <th>[% loc('ID') %]</th> - <th>[% loc('Created') %]</th> - <th>[% loc('User') %]</th> - <th>[% loc('Text') %]</th> - </tr> -[% FOREACH update IN updates -%] - [% IF update.extra.is_internal_note %] - <tr class="[% 'admininternal' IF update.extra.is_internal_note %]"> - <td>[% update.id %]</td> - <td>[% PROCESS format_date this_date=update.created %] [% update.created.hms %]</td> - <td><a href="mailto:[% update.user.email %]">[% update.user.name || update.user.email %]</a></td> - <td>[% update.text | html %]</td> - </tr> - [% END %] -[% END -%] -</table> - -<h2>[% loc('Updates') %]</h2> - -<table cellspacing="0" cellpadding="2" border="1"> - <tr> - <th>[% loc('ID') %]</th> - <th>[% loc('Created') %]</th> - <th>[% loc('User') %]</th> - <th>[% loc('Text') %]</th> - </tr> -[% FOREACH update IN updates -%] - [% IF ! update.extra.is_internal_note %] - <tr class="[% 'adminhidden' IF update.state == 'hidden' || update.problem.state == 'hidden' %]"> - <td>[% update.id %]</td> - <td>[% PROCESS format_date this_date=update.created %] [% update.created.hms %]</td> - <td><a href="mailto:[% update.user.email %]">[% update.user.name || update.user.email %]</a></td> - <td>[% update.text | html %]</td> - </tr> - [% END %] -[% END -%] -</table> +[%# We assume internal notes are lowest priority, and thus displayed last. + All other updates (eg: "I've done this work, here's what you should tell + the citizen") are displayed first. %] + +[% internal_updates=[]; + sdm_notes=[]; + FOREACH update IN updates; + IF NOT update.extra.is_external_message; + IF update.extra.is_internal_note; + internal_updates.unshift(update); + ELSE; + sdm_notes.unshift(update); + END; + END; + END +%] + +[% IF sdm_notes.size %] + <h2>[% loc('Notes from SDM to DM') %]</h2> + + [% FOREACH update IN sdm_notes -%] + <div class="admin-note [% 'adminhidden' IF update.state == 'hidden' || update.problem.state == 'hidden' %]" title="[% loc('ID') %]: [% update.id %]"> + <p class="admin-note__text">[% update.text | html %]</p> + <p class="admin-note__creator"> + <a href="mailto:[% update.user.email %]">[% update.user.name || update.user.email %]</a> + · [% PROCESS format_date this_date=update.created %] [% update.created.hms %] + </p> + </div> + [% END -%] +[% END %] + +[% IF internal_updates.size %] + <h2>[% loc('Internal notes') %]</h2> + + [% FOREACH update IN internal_updates -%] + <div class="admin-note admininternal" title="[% loc('ID') %]: [% update.id %]"> + <p class="admin-note__text">[% update.text | html %]</p> + <p class="admin-note__creator"> + <a href="mailto:[% update.user.email %]">[% update.user.name || update.user.email %]</a> + · [% PROCESS format_date this_date=update.created %] [% update.created.hms %] + </p> + </div> + [% END -%] + +[% END %] [% END %] diff --git a/templates/web/zurich/admin/problem_row.html b/templates/web/zurich/admin/problem_row.html index 9b395a1ac..baa8d3ac7 100644 --- a/templates/web/zurich/admin/problem_row.html +++ b/templates/web/zurich/admin/problem_row.html @@ -18,7 +18,9 @@ <td>[% PROCESS value_or_nbsp value=problem.category %]</td> <td>[% PROCESS format_date this_date=problem.created %]</td> <td>[% PROCESS format_date this_date=problem.lastupdate %]</td> - <td>[% states.${problem.state} %]</td> + <td> [% states.${problem.state} %][% IF problem.state == 'planned'; + SET cs=problem.get_extra_metadata('closure_status'); + IF cs %] ([% states.$cs %]) [% END; END %]</td> [% IF include_subdiv %] <td> @@ -34,7 +36,11 @@ <td> [% IF problem.photo %] - <img class="img" height="60" width="90" src="[% c.cobrand.base_url %]/photo/[% problem.photo %].temp.jpeg" alt=""> + [% FOR photo IN problem.get_photoset(c).images %] + <div class="update-img"> + <img height="60" width="90" alt="" src="[% c.cobrand.base_url %]/photo/[% photo.0 %].temp.jpeg"> + </div> + [% END %] [% END %] </td> diff --git a/templates/web/zurich/admin/report_edit-sdm.html b/templates/web/zurich/admin/report_edit-sdm.html index 82bbeba23..8e576a718 100644 --- a/templates/web/zurich/admin/report_edit-sdm.html +++ b/templates/web/zurich/admin/report_edit-sdm.html @@ -1,4 +1,5 @@ [% + PROCESS "report/photo-js.html"; PROCESS "maps/zurich.html"; PROCESS 'admin/header.html' title = tprintf(loc('Editing problem %d'), problem.id ), @@ -9,63 +10,141 @@ [% map_html %] </div> -[% status_message %] - <form method="post" action="[% c.uri_for( 'report_edit', problem.id ) %]" enctype="application/x-www-form-urlencoded" accept-charset="utf-8"> <input type="hidden" name="token" value="[% token %]" > <input type="hidden" name="submit" value="1" > -<p align="right"><input type="submit" name="send_back" value="[% loc('Not for my subdivision') %]"></p> - -<ul class="no-bullets"> -<li><a href="[% c.uri_for_email( '/report', problem.id ) %]">[% loc('View report on site' )%]</a></li> - -<li><a href="http://webgis.intra.stzh.ch/AV_Online/Direct.asp?Map=AV&Search=Koord&West=[% problem.local_coords.0 %]&Nord=[% problem.local_coords.1 %]&B=300" target="_blank">Standort in AV-Online anzeigen</a></li> - -<li><span class="mock-label">[% loc('Details:') %]</span> [% problem.detail | html %] -[% IF problem.extra.original_detail %] -<br>[% - SET safe = problem.extra.original_detail | html; - tprintf( loc('originally entered: “%s”'), safe ) -%] -[% END %] -</li> -<li><span class="mock-label">[% loc('Co-ordinates:') %]</span> [% problem.local_coords.join(',') %] - <input type="hidden" name="latitude" id="fixmystreet.latitude" value="[% problem.latitude %]"> - <input type="hidden" name="longitude" id="fixmystreet.longitude" value="[% problem.longitude %]"> -([% - SET safe = problem.postcode | html; - tprintf( loc('originally entered: “%s”'), safe ) -%], -[% IF problem.used_map %][% loc('used map') %][% ELSE %][% loc("didn't use map") %][% END %])</li> - -<li><span class="mock-label">[% loc('Category:') %]</span> [% problem.category | html %] </li> -<li><span class="mock-label">[% loc('Name:') %]</span> [% problem.name | html %] -<li><span class="mock-label">[% loc('Email:') %]</span> [% problem.user.email | html %] -[% IF NOT problem.extra.email_confirmed %]<span class="error">[% loc('Unconfirmed') %]</span>[% END %] -<li><span class="mock-label">[% loc('Phone:') %]</span> [% IF problem.user.phone %][% problem.user.phone | html %][% ELSE %]<em>[% loc('None') %]</em>[% END %]</li> -<li><span class="mock-label">[% loc('Created:') %]</span> [% PROCESS format_date this_date=problem.created %] [% problem.created.hms %]</li> - -[% IF problem.photo %] -<li><img alt="" src="[% c.cobrand.base_url %]/photo/[% problem.photo %].temp.jpeg"></li> -[% END %] - -<li><span class="mock-label">[% loc('State:') %]</span> [% states.${problem.state} %]</li> - -<li><label for="new_internal_note">[% loc('New internal note:') %]</label> -<textarea name='new_internal_note' id='new_internal_note' cols=60 rows=5></textarea></li> - -<li><label for="status_update">[% loc('New update:') %]</label> -<textarea name='status_update' id='status_update' cols=60 rows=5></textarea></li> +<div class="admin-report-edit admin-report-edit--details"> + +<dl> + + <dd class="screen-only">» <a href="[% c.uri_for_email( '/report', problem.id ) %]">[% loc('View report on site' )%]</a></dd> + + <dd class="screen-only">» <a href="http://webgis.intra.stzh.ch/AV_Online/Direct.asp?Map=AV&Search=Koord&West=[% problem.local_coords.0 %]&Nord=[% problem.local_coords.1 %]&B=300" target="_blank">Standort in AV-Online anzeigen</a></dd> + + <dd class="screen-only">» <a href="http://webgis.intra.stzh.ch/stapo/GoogleStreetView.asp?lat=[% problem.latitude %]&lon=[% problem.longitude %]" target="_blank">[% loc('Street View') %]</a></dd> + + <dt><span class="mock-label">[% loc('Details:') %]</span></dt> + <dd>[% problem.detail | html %]</dd> + [% IF problem.extra.original_detail %] + <dd>[% + SET safe = problem.extra.original_detail | html; + tprintf( loc('originally entered: “%s”'), safe ) + %]</dd> + [% END %] + + <dt class="print-only">[% loc('Reported:') %] <!-- Meldedatum --></dt> + <dd class="screen-no-space-after"> + <strong>[% PROCESS format_date this_date=problem.created %] [% problem.created.hms %]</strong> + </dd> + <dt class="print-only">[% loc('Coordinates:') %] <!-- Koordinaten --></dt> + <dd class="screen-no-space-after print-no-space-after"> + [% problem.local_coords.join(',') %] + <input type="hidden" name="latitude" id="fixmystreet.latitude" value="[% problem.latitude %]"> + <input type="hidden" name="longitude" id="fixmystreet.longitude" value="[% problem.longitude %]"> + </dd> + <dd class="screen-no-space-after print-no-space-after"> + [% IF problem.used_map %] + [% loc('Used map') %] + [% ELSE %] + [% loc("Didn't use map") %] + [% END %] + </dd> + <dd>[% + SET safe = problem.postcode | html; + tprintf( loc('originally entered: “%s”'), safe ) + %]</dd> + + <dt class="print-only">[% loc('Reported by:') %] <!-- Meldende Person --></dt> + <dd> + <strong>[% IF problem.name %][% problem.name | html %][% ELSE %][% loc('(No name)') %][% END %]</strong> + <input type='hidden' name='name' id='name' value='[% problem.name | html %]'> + <br> + [% problem.user.email | html %] + [% IF NOT problem.extra.email_confirmed %]<span class="error">[% loc('Unconfirmed') %]</span>[% END %] + <input type='hidden' id='email' name='email' value='[% problem.user.email | html %]'> + <br> + [% IF problem.user.phone %][% problem.user.phone | html %][% ELSE %]<em>[% loc('(No phone number)') %]</em>[% END %] + </dd> + + <dt>[% loc('Category:') %] <!-- Kategorie --></dt> + <dd>[% problem.category | html %]</dd> + + <dt class="print-only">[% loc('State:') %] <!-- Status --></dt> + <dd class="print-only">[% states.${problem.state} %]</dd> + + <dt>[% loc('Time spent (in minutes):') %]</dt> + <dd>[% problem.get_time_spent %]</dd> + + <dd> + [% status_message %] + </dd> + + [% IF problem.photo %] + <dd> + [% FOR photo IN problem.get_photoset(c).images %] + <div class="update-img"> + <a href="[% c.cobrand.base_url %]/photo/[% photo.0 %].fulltemp.jpeg" rel="fancy"> + <img alt="Photo of this report" src="[% c.cobrand.base_url %]/photo/[% photo.0 %].temp.jpeg"> + <span>zoom</span> + </a> + </div> + [% END %] + </dd> + [% END %] + +</dl> + +</div> +<div class="admin-report-edit admin-report-edit--interact"> + +<script type="text/javascript"> + $(function(){ + $('#map_box .noscript').clone().removeClass('noscript').addClass('map_clone print-only').prependTo('.admin-report-edit--interact'); + }); +</script> + +<p align="right" class="screen-only"><input type="submit" name="send_back" value="[% loc('Not for my subdivision') %]"></p> +<p align="right" class="screen-only"><input type="submit" name="not_contactable" value="[% loc('Customer not contactable') %]"></p> + +<ul class="no-bullets screen-only"> + <li> + <label for="new_internal_note">[% loc('New internal note:') %]</label> + <textarea name='new_internal_note' id='new_internal_note' cols=60 rows=4></textarea> + </li> + <li> + <label for="status_update">[% loc('New note to DM:') %]</label> + <textarea name='status_update' id='status_update' cols=60 rows=4></textarea> + </li> </ul> -<p class="cf"> +<p class="screen-only"> + <label for="time_spent">[% loc('Time spent (in minutes):') %]</label> + <input type="text" name="time_spent" id="form_time_spent" style="width: 4em" value="0"> + <script> + $(function () { + $('#form_time_spent').spinner({ + spin: function (e, ui) { + if (ui.value < 0) { return false } + } + }); + }); + </script> +</p> + +<p class="cf screen-only"> <input style="float:left" type="submit" name="Submit changes" value="[% loc('Submit changes') %]" > <input style="float:right" type="submit" name="no_more_updates" value="[% loc('No further updates') %]"> </p> -</form> [% INCLUDE 'admin/list_updates.html' %] +</div> +</form> + +<div id="print_report_map" class="print-only"> +[% INCLUDE 'maps/noscript_map.html' map=print_report_map nsm_prefix="large_" %] +</div> + [% INCLUDE 'admin/footer.html' %] diff --git a/templates/web/zurich/admin/report_edit.html b/templates/web/zurich/admin/report_edit.html index 5376d77f4..64d0950ee 100644 --- a/templates/web/zurich/admin/report_edit.html +++ b/templates/web/zurich/admin/report_edit.html @@ -10,160 +10,312 @@ [% map_html %] </div> -[% status_message %] +[% pstate = problem.get_extra_metadata('closure_status') || problem.state %] -<form method="post" action="[% c.uri_for( 'report_edit', problem.id ) %]" enctype="application/x-www-form-urlencoded" accept-charset="utf-8"> +<form id="report_edit" method="post" action="[% c.uri_for( 'report_edit', problem.id ) %]" enctype="application/x-www-form-urlencoded" accept-charset="utf-8"> <input type="hidden" name="token" value="[% token %]" > <input type="hidden" name="submit" value="1" > -<ul class="no-bullets"> -<li><a href="[% c.uri_for_email( '/report', problem.id ) %]">[% loc('View report on site' )%]</a></li> +<div class="admin-report-edit admin-report-edit--details"> + +<dl> + <dd class="screen-only">» <a href="[% c.uri_for_email( '/report', problem.id ) %]">[% loc('View report on site' )%]</a></dd> -<li><a href="http://webgis.intra.stzh.ch/AV_Online/Direct.asp?Map=AV&Search=Koord&West=[% problem.local_coords.0 %]&Nord=[% problem.local_coords.1 %]&B=300" target="_blank">Standort in AV-Online anzeigen</a></li> + <dd class="screen-only">» <a href="http://webgis.intra.stzh.ch/AV_Online/Direct.asp?Map=AV&Search=Koord&West=[% problem.local_coords.0 %]&Nord=[% problem.local_coords.1 %]&B=300" target="_blank">Standort in AV-Online anzeigen</a></dd> -[% IF problem.state == 'fixed - council' OR problem.state == 'closed' %] - <li><span class="mock-label">[% loc('Details:') %]</span> [% problem.detail | html %] + <dd class="screen-only">» <a href="http://webgis.intra.stzh.ch/stapo/GoogleStreetView.asp?lat=[% problem.latitude %]&lon=[% problem.longitude %]" target="_blank">[% loc('Street View') %]</a></dd> + + [% IF c.cobrand.problem_is_closed(problem) %] + <dt><span class="mock-label">[% loc('Details:') %]</span></dt> + <dd>[% problem.detail | html %]</dd> [% IF problem.extra.original_detail %] - <br>[% - SET detail_safe = problem.extra.original_detail | html; - tprintf( loc('originally entered: “%s”'), detail_safe ) - %] + <dd>[% + SET detail_safe = problem.extra.original_detail | html; + tprintf( loc('originally entered: “%s”'), detail_safe ) + %]</dd> [% END %] - </li> -[% ELSE %] - <li><label for='title'>[% loc('Subject:') %]</label> <input size=60 type='text' id='title' name='title' value='[% problem.title | html %]'></li> - <li><label for='detail'>[% loc('Details:') %]</label> - <textarea name='detail' id='detail' cols=60 rows=5>[% problem.detail | html %]</textarea> + [% ELSE %] + + <dt><label for='title'>[% loc('Subject:') %]</label></dt> + <dd class="screen-only"><input size=60 type='text' id='title' name='title' value='[% problem.title | html %]'></dd> + <dd class="print-only">[% problem.title | html %]</dd> + + <dt><label for='detail'>[% loc('Details:') %]</label></dt> + <dd class="screen-only"><textarea name='detail' id='detail' cols=60 rows=4>[% problem.detail | html %]</textarea></dd> + <dd class="print-only">[% problem.detail | html %]</dd> + [% IF problem.extra.original_detail %] - [% - SET detail_safe = problem.extra.original_detail | html; - tprintf( loc('originally entered: “%s”'), detail_safe ) - %] + <dd>[% + SET detail_safe = problem.extra.original_detail | html; + tprintf( loc('originally entered: “%s”'), detail_safe ) + %]</dd> [% END %] - </li> -[% END %] + [% END %] -<li><span class="mock-label">[% loc('Co-ordinates:') %]</span> [% problem.local_coords.join(',') %] - <input type="hidden" name="latitude" id="fixmystreet.latitude" value="[% problem.latitude %]"> - <input type="hidden" name="longitude" id="fixmystreet.longitude" value="[% problem.longitude %]"> - -([% - SET safe = problem.postcode | html; - tprintf( loc('originally entered: “%s”'), safe ) -%], -[% IF problem.used_map %][% loc('used map') %][% ELSE %][% loc("didn't use map") %][% END %])</li> - -<li><span class="mock-label">[% loc('Name:') %]</span> [% problem.name | html %] <input type='hidden' name='name' id='name' value='[% problem.name | html %]'></li> -<li><span class="mock-label">[% loc('Email:') %]</span> [% problem.user.email | html %] <input type='hidden' id='email' name='email' value='[% problem.user.email | html %]'> -[% IF NOT problem.extra.email_confirmed %]<span class="error">[% loc('Unconfirmed') %]</span>[% END %] -</li> -<li><span class="mock-label">[% loc('Phone:') %]</span> [% IF problem.user.phone %][% problem.user.phone | html %][% ELSE %]<em>[% loc('None') %]</em>[% END %]</li> -<li><span class="mock-label">[% loc('Created:') %]</span> [% PROCESS format_date this_date=problem.created %] [% problem.created.hms %]</li> - - -[% IF problem.photo %] -<li> -[% photo = problem.get_photo_params %] -<div class="update-img"> - <a href="[% c.cobrand.base_url %]/photo/[% problem.photo %].fulltemp.jpeg" rel="fancy"> - <img alt="Photo of this report" src="[% c.cobrand.base_url %]/photo/[% problem.photo %].temp.jpeg"> - <span>zoom</span></a> -</div> -<br> -<input type="submit" name="rotate_photo" value="[% loc('Rotate Left') %]"> -<input type="submit" name="rotate_photo" value="[% loc('Rotate Right') %]"> -<br> -<input type="checkbox" id="publish_photo" name="publish_photo" value="1"[% ' checked' IF problem.extra.publish_photo %]> -<label class="inline" for="publish_photo">[% loc("Publish photo") %]</label></li> -[% END %] -</ul> + <dt class="print-only">[% loc('Reported:') %] <!-- Meldedatum --></dt> + <dd class="screen-no-space-after"> + <strong>[% PROCESS format_date this_date=problem.created %] [% problem.created.hms %]</strong> + </dd> + <dt class="print-only">[% loc('Coordinates:') %] <!-- Koordinaten --></dt> + <dd class="screen-no-space-after print-no-space-after"> + [% problem.local_coords.join(',') %] + <input type="hidden" name="latitude" id="fixmystreet.latitude" value="[% problem.latitude %]"> + <input type="hidden" name="longitude" id="fixmystreet.longitude" value="[% problem.longitude %]"> + </dd> + <dd class="screen-no-space-after print-no-space-after"> + [% IF problem.used_map %] + [% loc('Used map') %] + [% ELSE %] + [% loc("Didn't use map") %] + [% END %] + </dd> + <dd>[% + SET safe = problem.postcode | html; + tprintf( loc('originally entered: “%s”'), safe ) + %]</dd> + + [% SET fields = problem.get_extra_fields; IF fields.size %] + <dd> + [% FOR f IN fields %] + <strong>[% f.description %]</strong> [% f.value %] + <br> + [% END %] + </dd> + [% END %] -<p><label for="new_internal_note">[% loc('New internal note:') %]</label> -<textarea name='new_internal_note' id='new_internal_note' cols=60 rows=5>[% new_internal_note | html %]</textarea></p> - -<p><span class="mock-label">[% loc('State:') %]</span> <select name="state" id="state"> - <option value="">--</option> - [% FOREACH s IN [ - ['unconfirmed', loc('Submitted')] - ['confirmed', loc('Open')], - ['planned', loc('Planned')], - ['hidden', loc('Hidden')], - ] %] - <option [% 'selected ' IF s.0 == problem.state %] value="[% s.0 %]">[% s.1 %]</option> - [% END %] - [% IF problem.state == 'closed' %] - <option selected value="closed">[% loc('Closed') %]</option> - [% ELSIF problem.state == 'fixed - council' %] - <option selected value="fixed - council">[% loc('Closed') %]</option> - [% ELSIF problem.state == 'in progress' %] - <option selected value="in progress">[% loc('In progress') %]</option> + <dt class="print-only">[% loc('Reported by:') %] <!-- Meldende Person --></dt> + <dd> + <strong>[% IF problem.name %][% problem.name | html %][% ELSE %][% loc('(No name)') %][% END %]</strong> + <input type='hidden' name='name' id='name' value='[% problem.name | html %]'> + <br> + [% problem.user.email | html %] + [% IF NOT problem.extra.email_confirmed %]<span class="error">[% loc('Unconfirmed') %]</span>[% END %] + <input type='hidden' id='email' name='email' value='[% problem.user.email | html %]'> + <br> + [% IF problem.user.phone %][% problem.user.phone | html %][% ELSE %]<em>[% loc('(No phone number)') %]</em>[% END %] + </dd> + + <dt>[% loc('Category:') %] <!-- Kategorie --></dt> + <dd>[% problem.category | html %]</dd> + + <dt class="print-only">[% loc('State:') %] <!-- Status --></dt> + <dd class="print-only">[% states_trans.${problem.state} %]</dd> + + <dt>[% loc('Time spent (in minutes):') %]</dt> + <dd>[% problem.get_time_spent %]</dd> + + [% IF problem.photo %] + <dd> + [% FOR photo IN problem.get_photoset(c).images %] + <div class="update-img"> + <a href="[% c.cobrand.base_url %]/photo/[% photo.0 %].fulltemp.jpeg" rel="fancy"> + <img alt="Photo of this report" src="[% c.cobrand.base_url %]/photo/[% photo.0 %].temp.jpeg"> + <span>zoom</span> + </a> + </div> + <input type="submit" name="rotate_photo_[% loop.index %]" value="[% loc('Rotate Left') %]" class="screen-only"> + <input type="submit" name="rotate_photo_[% loop.index %]" value="[% loc('Rotate Right') %]" class="screen-only"> + [% END %] + <br> + <input type="checkbox" id="publish_photo" name="publish_photo" value="1"[% ' checked' IF problem.extra.publish_photo %] class="screen-only"> + <label class="inline screen-only" for="publish_photo">[% loc("Publish photo") %]</label></li> [% END %] -</select></p> -<p id="automatic-reply"> - <span class="mock-label">Automatische Antwort</span> - <input type="checkbox" name="send_rejected_email" id="send_rejected_email" value="1" /> -</p> +</dl> + +</div> + +<div class="admin-report-edit admin-report-edit--interact"> + +[% status_message %] <script type="text/javascript"> -$(function(){ - // Show or hide the automatic reply field - $('#state').change(function(){ - if ($(this).val() === 'hidden') { - $('#automatic-reply').show(); - } else { - $('#automatic-reply').hide(); - } - }).change(); -}); + $(function(){ + $('#map_box .noscript').clone().removeClass('noscript').addClass('map_clone print-only').prependTo('.admin-report-edit--interact'); + }); </script> -[% IF problem.state == 'unconfirmed' OR problem.state == 'confirmed' %] +<dl [% IF status_message %]class="with-message"[% END %]> + + <dt class="screen-only"> + <label for="new_internal_note">[% loc('New internal note:') %]</label> + </dt> + <dd class="screen-only"> + <textarea name='new_internal_note' id='new_internal_note' cols=60 rows=4>[% new_internal_note | html %]</textarea> + </dd> + + <dt class="screen-only"> + <label for="time_spent">[% loc('Time spent (in minutes):') %]</label> + </dt> + <dd class="screen-only"> + <input type="text" name="time_spent" id="form_time_spent" style="width: 4em" value="0"> + </dd> + + <dt class="screen-only"> + <span class="mock-label">[% loc('State:') %]</span> + </dt> + <dd class="screen-only"> + <select name="state" id="state"> + <option value="">--</option> + [% FOREACH s IN states %] + <option [% 'selected ' IF s.state == pstate %] value="[% s.state %]">[% s.trans %]</option> + [% END %] + </select> + </dd> + +</dl> -<ul class="no-bullets"> -[% list = FOR body IN bodies %] +<ul class="no-bullets screen-only"> + +[% IF problem.state == 'confirmed' %] + <li class="assignation"> + <div id="assignation__category"> + <label for="category">[% loc('Assign to different category:') %]</label> + <select name="category" id="category"> + <option value="">--</option> + [% FOREACH cat IN categories %] + <option value="[% cat %]">[% cat %]</option> + [% END %] + </select> + </div> + </li> + + [% list = FOR body IN bodies %] [%- NEXT UNLESS body.parent.id == c.user.from_body.id %] <option value="[% body.id %]"[% IF body.id == problem.bodies_str %] selected[% END %]>[% body.name %]</option> -[% END %] + [% END %] + [% IF admin_type != 'super' AND list %] - <li class="assignation"> + <li class="assignation" id="assignation__subdivision"> <label for="body_subdivision">[% loc('Assign to subdivision:') %]</label> - <select name="body_subdivision" id="body_subdivision"> + <select name="body_subdivision" id="body_subdivision" class="assignation__select"> <option value="">--</option> [% list %] </select> </li> [% END %] -<li class="assignation"> -<label for="category"> -[% loc('Category:') %] [% problem.category %]<br> -[% loc('Assign to different category:') %]</label> - <select name="category" id="category"> - <option value="">--</option> - [% FOREACH cat IN categories %] - <option value="[% cat %]">[% cat %]</option> - [% END %] - </select></li> - -<li class="assignation"> -<label for="body_external">[% loc('Assign to external body:') %]</label> - <select name="body_external" id="body_external"> - <option value="">--</option> - [% FOR body IN bodies %] - [% NEXT IF body.parent OR body.bodies OR body.deleted %] - <option value="[% body.id %]"[% IF body.id == problem.bodies_str %] selected[% END %]>[% body.name %]</option> +[% END %] +</ul> + + +[% IF problem.state == 'planned' %] + [%# 3rd party messages sent for Extern/Wunsch states %] + [% SWITCH pstate %] + [% CASE ['closed','investigating'] %] + <ul class="no-bullets screen-only"> + <li class="assignation" id="assignation__external"> + <span class="error hidden">[% loc('Please select a body.') %]</span> + <label for="body_external"> + [% IF pstate == 'closed' %] + [% loc('Assign to external body:') %] + [% ELSE %] + [% loc('Assign to competent body:') %] + [% END %] + </label> + <select name="body_external" id="body_external"> + <option value="">--</option> + [% FOR body IN bodies %] + [% NEXT IF body.parent OR body.bodies OR body.deleted %] + <option value="[% body.id %]"[% IF body.id == problem.external_body %] selected[% END %]>[% body.name %]</option> + [% END %] + </select> + </li> + <li> + [% IF pstate == 'closed' %] + <input type="checkbox" name="third_personal" id="third_personal" value="1"[% ' checked' IF problem.extra.third_personal %]> + <label for="third_personal" class="inline">[% loc('Include reporter personal details') %]</label> + [% END %] + </li> + <li> + [% INCLUDE 'admin/response_templates_select.html' for='external_body' %] + <textarea name='external_message' id='external_body' cols=60 rows=5>[% problem.get_extra_metadata('external_message') | html %]</textarea> + </li> + </ul> [% END %] - </select> - <br> - <input type="checkbox" name="third_personal" id="third_personal" value="1"[% ' checked' IF problem.extra.third_personal %]> - <label for="third_personal" class="inline">[% loc('Include reporter personal details') %]</label> -</ul> + [%# Public response field shown for Ruckmeldung ausstehend states + # (e.g. various pstates) %] + <ul class="no-bullets screen-only"> + <li id="status_update_container"><label for="status_update"> + [% SWITCH pstate %] + [% CASE ['hidden', 'investigating', 'partial'] %][%# Hidden/Wish/Not contactable %] + [% loc('Reply to user:') %] + [% CASE DEFAULT %] + [% loc('Public response:') %] + [% END %] + </label> + [% INCLUDE 'admin/response_templates_select.html' for='status_update' %] + <textarea name='status_update' id='status_update' cols=60 rows=5> + [%- problem.extra.public_response || default_public_response | html -%] + </textarea> + </li> + </ul> +[% END %] + +<p align="right" class="screen-only"> + [% IF show_publish_response %] + [%# While we call this 'publish_response', the response will not actually + # be "published" for these cases: Wish / Hidden / Not contactable (for these, + # only a private email will be sent to the user. However, in all cases, + # this is the end of processing, so we mark this with the same text used + # for 'No further updates %] + <input type="submit" name="publish_response" value="[% loc('No further updates') %]"> + [% END %] + + [%# This button simply saves changes, but does NOT close the report (though + # it may trigger other workflow %] + <input type="submit" name="Submit changes" value="[% loc('Submit changes') %]" > +</p> + +[% IF c.cobrand.problem_has_public_response(problem) || c.cobrand.problem_has_user_response(problem) %] + <h2>[% loc('Public response:') %]</h2> + <div class="admin-official-answer"> + [% problem.extra.public_response | html_para %] + </div> +[% END %] + +[% SWITCH problem.state %] + [% CASE ['closed','investigating'] %] + <h2> + [% IF problem.state == 'closed' %] + [% loc('Message to external body:') %] + [% ELSE %] + [% loc('Message to competent body:') %] + [% END %] + </h2> + <div class="admin-external-message"> + [% problem.extra.external_message | html_para %] + </div> +[% END %] + + +[% INCLUDE 'admin/list_updates.html' %] + +</div> + +</form> <script type="text/javascript"> $(function(){ - $('.assignation select').change(function(){ + var form_fields_changed = false; + + $('#form_time_spent').spinner({ + spin: function (e, ui) { + if (ui.value < 0) { return false } + form_fields_changed = true; + } + }); + + setTimeout(function(){ + $('.message-updated').fadeOut(250, function(){ + $(this).remove(); + }); + }, 5000); + + // When the user changes a select box, this bit of code + // makes the labels for the other two select boxes grey. + $('.assignation__select, .assignation select').change(function(){ if (this.value == "") { $('.assignation').css('color', '#000'); } else { @@ -172,57 +324,82 @@ $(function(){ $('.assignation').not(a).css('color', '#999'); } }); -}); -</script> - -[% ELSIF problem.state == 'planned' %] - -<ul class="no-bullets"> -[% list = FOR body IN bodies %] - [%- NEXT UNLESS body.parent.id == c.user.from_body.id %] - <option value="[% body.id %]">[% body.name %]</option> -[% END %] - [% IF admin_type != 'super' AND list %] - <li class="assignation"> - <label for="body_subdivision">[% loc('Assign to subdivision:') %]</label> - <select name="body_subdivision" id="body_subdivision"> - <option value="" selected>--</option> - [% list %] - </select> - </li> - [% END %] - - <li><label for="status_update">[% loc('Public response:') %]</label> - - <textarea name='status_update' id='status_update' cols=60 rows=5> - [%- IF problem.extra.public_response -%] - [%- problem.extra.public_response | html -%] - [%- ELSE -%] - -Freundliche Grüsse - -Ihre Stadt Zürich - [%- END %]</textarea> - </li> -</ul> -[% ELSIF problem.state == 'fixed - council' %] + $('#state').change(function(){ + // Show or hide the automatic reply field + var state = $(this).val(); + + // show or disable assignation, templates, public_response, publish if + // same or different state to the one we started on + if ((state === '[% pstate %]')) { + $('input[name=publish_response]').show(); + $('.response_templates_select').show(); + $('#status_update_container').show(); + + if (state === 'confirmed') { + $('#assignation__category').show(); + $('#assignation__subdivision').show(); + } + if ((state === 'closed') || (state === 'investigating')) { + $('#assignation__external').show(); + } else { + $('#assignation__external').hide(); + } + } + else { + $('input[name=publish_response]').hide(); + $('.response_templates_select').hide(); + $('#status_update_container').hide(); + + $('#assignation__category').hide(); + $('#assignation__subdivision').hide(); + $('#assignation__category select').val(''); + $('#assignation__subdivision select').val(''); + + $('#assignation__external select').val(''); + $('#assignation__external').hide(); + $('#external_body').hide(); + $('#third_personal, label[for=third_personal]').hide(); + } -<p><span class="mock-label">[% loc('Public response:') %]</span> -[% problem.extra.public_response | html %] -</p> + }).change(); -[% END %] + $("form#report_edit input[type=submit]").click(function() { + $("form#report_edit").data("clicked_button", $(this).attr("name")); + }); -<p align="right"> -[% IF problem.state == 'planned' %] -<input type="submit" name="publish_response" value="[% loc('Publish the response') %]"> -[% END %] -<input type="submit" name="Submit changes" value="[% loc('Submit changes') %]" > -</p> + $("form#report_edit").submit(function() { + // Make sure the external body field has a value if it's visible + // and the form is submitted as a 'save' action (i.e. not a rotate + // photo). + var clicked = $(this).data("clicked_button"); + if (clicked == "publish_response" || clicked == "Submit changes") { + var visible = $("select#body_external:visible").length > 0; + var val = parseInt($("select#body_external").val()); + if (visible && isNaN(val)) { + $("#assignation__external .error").removeClass("hidden"); + $("select#body_external").focus().get(0).scrollIntoView(); + return false; + } + } + // If the user has clicked to rotate a photo and has edited other + // fields, ask for confirmation before submitting the form + if (/rotate_photo/.test(clicked) && form_fields_changed) { + var message = "[% loc('Rotating this photo will discard unsaved changes to the report.') %]"; + if (!confirm(message)) { + return false; + } + } + }); -</form> + $("form#report_edit").find("input, select, textarea").change(function() { + form_fields_changed = true; + }); +}); +</script> -[% INCLUDE 'admin/list_updates.html' %] +<div id="print_report_map" class="print-only"> +[% INCLUDE 'maps/noscript_map.html' map=print_report_map nsm_prefix="large_" %] +</div> [% INCLUDE 'admin/footer.html' %] diff --git a/templates/web/zurich/admin/response_templates_select.html b/templates/web/zurich/admin/response_templates_select.html new file mode 100644 index 000000000..c0f4104c8 --- /dev/null +++ b/templates/web/zurich/admin/response_templates_select.html @@ -0,0 +1,25 @@ +[% template_name="templates_for_${for}" %] + +[% response_templates = problem.response_templates %] +<div class="response_templates_select"> +<select id="[% template_name %]"> + <option value="">[% loc('Choose a template') %]</option> +[% FOR t IN response_templates %] + <option value="[% t.id %]"> [% t.title | html %] </option> +[% END %] +</select> +</div> +<script> + $(function () { + var response_template_texts = { + [% FOR t IN response_templates %] + [% t.id %]: '[% t.text | escape_js %]' [% loop.last ? '' : ',' %] + [% END %] + }; + $('#[% template_name %]').change(function () { + var val = $(this).val(); + var text = response_template_texts[val]; + $('#[% for %]').val( text ); + }); + }); +</script> diff --git a/templates/web/zurich/admin/stats.html b/templates/web/zurich/admin/stats.html index 52b33ebc4..fa8104496 100644 --- a/templates/web/zurich/admin/stats.html +++ b/templates/web/zurich/admin/stats.html @@ -2,7 +2,7 @@ [% PROCESS 'admin/report_blocks.html' %] [% USE date %] -<p style="float:right"><a href="[% c.uri_with( { export=1 } ) %]">[% loc('All Reports') %]</a></p> +<p style="float:right"><a href="[% c.uri_with( { export=1 } ) %]">[% loc('All Reports as CSV') %]</a></p> [% IF start_date AND end_date %] <p><strong>[% tprintf( loc( 'All reports between %s and %s' ), start_date.ymd, end_date.ymd ) | html %]</strong></p> @@ -48,7 +48,7 @@ <table> <tr><th>[% loc('Category') %]</th><th>[% loc('Count') %]</th></tr> -[% WHILE ( c = per_category.next ) %]<tr><td>[% c.category %]</td><td>[% c.get_column('c') %]</td></tr>[% END %] +[% WHILE ( cc = per_category.next ) %]<tr><td>[% cc.category %]</td><td>[% cc.get_column('c') %]</td></tr>[% END %] </table> [% INCLUDE 'admin/footer.html' %] diff --git a/templates/web/zurich/admin/template_edit.html b/templates/web/zurich/admin/template_edit.html new file mode 100644 index 000000000..1deda6a77 --- /dev/null +++ b/templates/web/zurich/admin/template_edit.html @@ -0,0 +1,38 @@ +[% INCLUDE 'admin/header.html' title=tprintf(loc('Response Templates for %s'), body.name) -%] +[% rt = response_template %] + +<h2> [% tprintf(loc('Response Templates for %s'), body.name) %] </h2> + +<h3> [% IF rt.id %] + [% tprintf(loc('Template «%s»'), rt.title) %] + [% ELSE %] + [% loc('New template') %] + [% END %] +</h3> + +<form method="post" + action="[% c.uri_for('templates', body.id, rt.id || 'new' ) %]" + enctype="application/x-www-form-urlencoded" + accept-charset="utf-8" + class="validate"> + + <p> + <strong>[% loc('Title:') %] </strong> + <input type="text" name="title" class="required" size="30" value="[% rt.title| html %]"> + </p> + <p> + <strong>[% loc('Text:') %] </strong> + <textarea name="text" class="required">[% rt.text |html %]</textarea> + </p> + <p> + <input type="hidden" name="token" value="[% token %]" > + <input type="submit" name="Edit templates" value="[% rt.id ? loc('Save changes') : loc('Create template') %]" > + </p> + [% IF rt.id %] + <p> + <input class="delete" type="submit" name="delete_template" value="[% loc('Delete template') %]"> + </p> + [% END %] +</form> + +[% INCLUDE 'admin/footer.html' %] diff --git a/templates/web/zurich/admin/templates.html b/templates/web/zurich/admin/templates.html new file mode 100644 index 000000000..d3b334022 --- /dev/null +++ b/templates/web/zurich/admin/templates.html @@ -0,0 +1,28 @@ +[% INCLUDE 'admin/header.html' title=tprintf(loc('Response Templates for %s'), body.name) -%] + +<h2> [% tprintf(loc('Response Templates for %s'), body.name) %] </h2> + +<table> + <thead> + <tr> + <th> [% loc('Title') %] </th> + <th> [% loc('Text') %] </th> + <th> [% loc('Created') %] </th> + <th> </th> + </tr> + </thead> + <tbody> +[% FOR t IN response_templates %] + <tr> + <td> [% t.title %] </td> + <td> [% t.text %] </td> + <td> [% t.created %] </td> + <td> <a href="/admin/templates/[% body.id %]/[% t.id %]" class="btn">[% loc('Edit') %]</a> </td> + </tr> +[% END %] + </tbody> +</table> + +<a href="[% c.uri_for('templates', body.id, 'new') %]" class="btn">[% loc('New template') %]</a> + +[% INCLUDE 'admin/footer.html' %] diff --git a/templates/web/zurich/auth/general.html b/templates/web/zurich/auth/general.html index 11c729fde..fd34b79f8 100644 --- a/templates/web/zurich/auth/general.html +++ b/templates/web/zurich/auth/general.html @@ -27,7 +27,7 @@ END %] [% ELSIF sign_in_error %] <div class="form-error">[% loc('There was a problem with your email/password combination. If you cannot remember your password, or do not have one, please fill in the ‘sign in by email’ section of the form.') %]</div> [% END %] - <input type="email" class="required email" id="email" name="email" value="[% email | html %]" placeholder="[% loc('Your email address') %]"> + <input type="email" class="required email" id="email" name="email" value="[% email | html %]" placeholder="[% loc('Your email address') %]" autofocus> <label for="password_sign_in">[% loc('Password (optional)') %]</label> <div class="form-txt-submit-box"> diff --git a/templates/web/zurich/auth/token.html b/templates/web/zurich/auth/token.html new file mode 100644 index 000000000..e199691e0 --- /dev/null +++ b/templates/web/zurich/auth/token.html @@ -0,0 +1,25 @@ +[% INCLUDE 'header.html', bodyclass = 'fullwidthpage', title = loc('Confirm account') %] + +[% IF token_not_found %] + + <div class="confirmation-header confirmation-header--failure"> + + <h1>[% loc('We have not been able to confirm your account - sorry.') %]</h1> + <p>[% loc('This may be because the link is too old or already used, or the address was not copied correctly.') %]</p> + + </div> + +[% ELSE %] + + <div class="confirmation-header confirmation-header--inbox"> + + <h1>[% loc('Please check your email') %]</h1> + <p>[% loc("We have sent you an email containing a link to confirm your account.") %]</p> + + <p>[% loc("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> + + </div> + +[% END %] + +[% INCLUDE 'footer.html' %] diff --git a/templates/web/zurich/email_sent.html b/templates/web/zurich/email_sent.html new file mode 100644 index 000000000..90bfcdbda --- /dev/null +++ b/templates/web/zurich/email_sent.html @@ -0,0 +1,11 @@ +[% INCLUDE 'header.html', bodyclass = 'fullwidthpage', title = loc('Create a report') %] + +<div class="confirmation-header confirmation-header--inbox"> + + <h1>[% loc("Nearly Done! Now check your email...") %]</h1> + + <p>[% loc("If you use web-based email or have 'junk mail' filters, you may wish to check your bulk/spam mail folders: sometimes, our messages are marked that way.") %]</p> + +</div> + +[% INCLUDE 'footer.html' %] diff --git a/templates/web/zurich/faq/faq-de-ch.html b/templates/web/zurich/faq/faq-de-ch.html index c7e284194..deda32a1c 100644 --- a/templates/web/zurich/faq/faq-de-ch.html +++ b/templates/web/zurich/faq/faq-de-ch.html @@ -2,87 +2,55 @@ <h1><a name="faq"></a>Hilfe</h1> - <dl> - -<dt>Was ist «Züri wie neu»</dt> -<dd> -«Züri wie neu» ist eine Online-Plattform, über die die Einwohnerinnen und -Einwohner der Stadt Zürich auf Mängel und Schäden der städtischen Infrastruktur -hinweisen können. «Züri wie neu» wird von der Stadtverwaltung moderiert und -transparent geführt. Die Meldungen werden innerhalb von einem Arbeitstag den zuständigen Fachstellen -zugewiesen und innert fünf Arbeitstagen abschliessend beantwortet. Fällt eine -Meldung nicht in den Zuständigkeitsbereich der Stadtverwaltung, wird die -Meldung anonymisiert der zuständigen dritten Stelle per E-Mail zugestellt. -</dd> - -<dt>Welche Probleme kann ich über «Züri wie neu» melden?</dt> -<dd> -<p>Gemeldet werden können sämtliche Schäden an der Infrastruktur der Stadt Zürich. -Dabei kann es sich um ein Loch im Strassenbelag, ein Graffiti am Stadthaus oder -eine durch Vandalen beschädigte Parkbank handeln. - -<p>Es können Probleme zu folgenden Kategorien gemeldet werden: +<h3 id="was_ist_zri_wie_neu">Was ist «Züri wie neu»</h3> + +<p>«Züri wie neu» ist eine Online-Plattform, über die die Einwohnerinnen und Einwohner die Stadt Zürich auf Schäden an der städtischen Infrastruktur hinweisen können. «Züri wie neu» wird von der Stadtverwaltung moderiert und transparent geführt. Die Meldungen werden innerhalb von einem Arbeitstag den zuständigen Fachstellen zugewiesen und innert fünf Arbeitstagen abschliessend beantwortet. Fällt eine Meldung nicht in den Zuständigkeitsbereich der Stadtverwaltung, wird die Meldung anonymisiert der zuständigen dritten Stelle per E-Mail zugestellt.</p> + +<h3 id="welche_probleme_kann_ich_ber_zri_wie_neu_melden">Welche Probleme kann ich über «Züri wie neu» melden?</h3> + +<p>Gemeldet werden können sämtliche Schäden an der Infrastruktur der Stadt Zürich in folgenden Kategorien:</p> <ul> <li>Abfall / Sammelstellen</li> -<li>Beleuchtung</li> +<li>Beleuchtung / Uhren</li> +<li>Brunnen / Hydranten</li> <li>Graffiti</li> -<li>Spielplatz / Sitzbank</li> +<li>Grünflächen / Spielplätze</li> <li>Strasse / Trottoir / Platz</li> -<li>Tiere / Grünflächen</li> +<li>VBZ / ÖV</li> </ul> -</dd> +<h3 id="was_kann_ich_nicht_ber_zri_wie_neu_melden">Was kann ich nicht über «Züri wie neu» melden?</h3> -<dt>Was kann ich nicht über «Züri wie neu» melden?</dt> -<dd> <ul> -<li>Mängel die nicht auf Stadtgebiet liegen.</li> -<li>Melden Sie «Züri wie neu» KEINE Notfälle. Die Notrufnummern lauten: - <br>Medizinisch - 144 Polizei - 117 Feuer - 118 Allgemein - 112</li> +<li>Schäden die nicht auf Stadtgebiet liegen</li> +<li>Melden Sie «Züri wie neu» KEINE Notfälle. Die Notrufnummern lauten: <br /> +Sanität – 144, Polizei – 117, Feuerwehr – 118, Allgemein - 112</li> <li>Allgemeine Verschönerungs- und Verbesserungsvorschläge</li> </ul> -</dd> - -<dt>Wie verwende ich die Webseite?</dt> -<dd> -<p> -Geben Sie zuerst eine Adresse an oder lassen Sie Ihren Standort automatisch -über den entsprechenden Link lokalisieren. Mittels Mausklick in die danach -angezeigte Karte können Sie den exakten Ort des Mangels angeben. Als letzten -Schritt füllen Sie die Felder des Formulars aus und schicken die Meldung ab. -</p> -<p> -Weiter können Sie bestehende Meldungen sowie auch die Rückmeldungen der -Verwaltung betrachten. -</p> -</dd> - -<dt>Wie werden die Probleme gelöst?</dt> -<dd> -Die Meldungen werden innerhalb von einem Arbeitstag den zuständigen Fachstellen -zugewiesen und innert fünf Arbeitstagen von den dafür zuständigen -Fachstellen bearbeitet sowie mit einer entsprechenden Rückmeldung versehen. -</dd> - -<dt>Kann ich «Züri wie neu» auf meinem Smartphone nutzen?</dt> -<dd> -Ja, sowohl über die für mobile Geräte optimierte Webseite, als auch über die -<a href="https://itunes.apple.com/ch/app/zuri-wie-neu/id631302236">iOS</a>- und <a href="https://play.google.com/store/apps/details?id=ch.zueriwieneu.zueriwieneu">Android-App</a>. -</dd> - -<dt>Kann ich auch Probleme ausserhalb von Zürich melden?</dt> -<dd>Nein.</dd> - -<dt>Werden meine E-Mail-Adresse, mein Name und meine Telefonnummer vertraulich behandelt?</dt> -<dd> -Die Kontaktinformationen werden nur stadtintern für Rückfragen verwendet. Sie -werden weder im Internet publiziert noch an Dritte weitergegeben. -</dd> - -<dt>Wer hat «Züri wie neu» programmiert?</dt> -<dd>«Züri wie neu» wurde von <a href="http://www.mysociety.org/">mySociety</a> entwickelt.</dd> - -</dl> + +<h3 id="wie_melde_ich_einen_schaden">Wie melde ich einen Schaden?</h3> + +<p>Geben Sie zuerst eine Adresse an oder lassen Sie Ihren Standort automatisch über den entsprechenden Link lokalisieren. Mittels Mausklick in die danach angezeigte Karte können Sie den exakten Ort des Mangels angeben. Als letzten Schritt füllen Sie die Felder des Formulars aus, machen mindestens ein Foto des Schadens und schicken die Meldung ab.</p> + +<h3 id="wie_werden_die_schden_behoben">Wie werden die Schäden behoben?</h3> + +<p>Die Meldungen werden innerhalb von einem Arbeitstag den zuständigen Fachstellen zugewiesen und innert fünf Arbeitstagen von den dafür zuständigen Fachstellen bearbeitet sowie mit einer entsprechenden Rückmeldung versehen.</p> + +<h3 id="kann_ich_zri_wie_neu_auf_meinem_smartphone_nutzen">Kann ich «Züri wie neu» auf meinem Smartphone nutzen?</h3> + +<p>Ja, sowohl über die für mobile Geräte optimierte Webseite, als auch über die <a href="https://itunes.apple.com/ch/app/zuri-wie-neu/id631302236">iOS-</a> und <a href="https://play.google.com/store/apps/details?id=ch.zueriwieneu.zueriwieneu">Android-App</a>.</p> + +<h3 id="kann_ich_auch_schden_ausserhalb_von_zrich_melden">Kann ich auch Schäden ausserhalb von Zürich melden?</h3> + +<p>Nein, auf «Züri wie neu» können nur Schäden auf Stadtgebiet gemeldet werden.</p> + +<h3 id="werden_meine_e_mail_adresse_mein_name_und_meine_telefonnummer_vertraulich_behandelt">Werden meine E-Mail-Adresse, mein Name und meine Telefonnummer vertraulich behandelt?</h3> + +<p>Die Kontaktinformationen werden nur stadtintern für Rückfragen verwendet. Sie werden weder im Internet publiziert noch an Dritte weitergegeben.</p> + +<h3 id="wer_hat_zri_wie_neu_programmiert">Wer hat «Züri wie neu» programmiert?</h3> + +<p>«Züri wie neu» wurde von <a href="https://www.mysociety.org/">mySociety</a> programmiert.</p> [% INCLUDE 'footer.html' pagefooter = 'yes' %] diff --git a/templates/web/zurich/footer.html b/templates/web/zurich/footer.html index 2304c048e..11bfa9fcb 100644 --- a/templates/web/zurich/footer.html +++ b/templates/web/zurich/footer.html @@ -1,3 +1,4 @@ +[% USE date %] </div><!-- .content role=main --> </div><!-- .container --> </div><!-- .table-cell --> @@ -12,7 +13,7 @@ </p><p><a href="/admin">[% loc('Summary') %]</a> | <a href="/auth/sign_out">[% loc('sign out') %]</a> </p> [% END %] - <ul id="main-menu" class="mob-only"> + <ul class="nav-menu nav-menu--main mob-only"> <li><[% IF c.req.uri.path == '/' %]a onclick="$('html, body').animate({scrollTop:0}, 500); return false;" href="#site-header"[% ELSE %]a href="/"[% END %] >[% loc("Report a problem") %]</[% c.req.uri.path == '/' ? 'a' : 'a' %]></li>[% %]<li><[% IF c.req.uri.path == '/reports' %]span[% ELSE %]a href="/reports"[% END @@ -30,7 +31,7 @@ <div id="zurich-footer-wrapper" class="desk-only"> <div id="zurich-footer"> - © 2013 Stadt Zürich + © [% date.format(date.now, '%Y') %] Stadt Zürich <span class="hidden">|</span> <a href="http://www.stadt-zuerich.ch/content/portal/de/index/footer/rechtliche_hinweise.html">Rechtliche Hinweise</a> <span class="hidden">|</span> <a href="http://www.stadt-zuerich.ch/content/portal/de/index/footer/impressum.html">Impressum</a> </div> diff --git a/templates/web/zurich/header.html b/templates/web/zurich/header.html index ae1b47712..7e88f3f0f 100644 --- a/templates/web/zurich/header.html +++ b/templates/web/zurich/header.html @@ -1,8 +1,8 @@ <!doctype html> -<!--[if lt IE 7]><html class="no-js ie6 oldie" lang="[% lang_code %]"><![endif]--> -<!--[if IE 7]> <html class="no-js ie7 oldie" lang="[% lang_code %]"><![endif]--> -<!--[if IE 8]> <html class="no-js ie8 oldie" lang="[% lang_code %]"><![endif]--> -<!--[if IE 9]> <html class="no-js ie9 oldie" lang="[% lang_code %]"><![endif]--> +<!--[if lt IE 7]><html class="no-js ie6 iel8" lang="[% lang_code %]"><![endif]--> +<!--[if IE 7]> <html class="no-js ie7 iel8" lang="[% lang_code %]"><![endif]--> +<!--[if IE 8]> <html class="no-js ie8 iel8" lang="[% lang_code %]"><![endif]--> +<!--[if IE 9]> <html class="no-js ie9" lang="[% lang_code %]"><![endif]--> <!--[if gt IE 9]><!--><html class="no-js" lang="[% lang_code %]"><!--<![endif]--> <head> <meta name="viewport" content="initial-scale=1.0"> @@ -14,7 +14,7 @@ [% SET start = c.config.ADMIN_BASE_URL IF admin %] <link rel="stylesheet" href="[% start %][% version('/cobrands/' _ c.cobrand.moniker _ '/base.css') %]"> - <link rel="stylesheet" href="[% start %][% version('/cobrands/' _ c.cobrand.moniker _ '/layout.css') %]" media="(min-width:48em)"> + <link rel="stylesheet" href="[% start %][% version('/cobrands/' _ c.cobrand.moniker _ '/layout.css') %]" media="screen and (min-width:48em)"> [% extra_css %] <!--[if (lt IE 9) & (!IEMobile)]> <link rel="stylesheet" href="[% start %][% version('/cobrands/' _ c.cobrand.moniker _ '/layout.css') %]"> @@ -68,9 +68,14 @@ <li [% IF pagename == 'users' OR pagename == 'user_edit' %]class="current"[% END %]> <a href="/admin/users">[% loc('Users') %]</a> </li> + [% END %] <li [% IF pagename == 'stats' %]class="current"[% END %]> <a href="/admin/stats">[% loc('Stats') %]</a> </li> + [% IF admin_type == 'dm' %] + <li [% IF pagename == 'templates' OR pagename == 'template' %]class="current"[% END %]> + <a href="/admin/templates">[% loc('Templates') %]</a> + </li> [% END %] <li class="search-box"> <form method="get" action="[% c.uri_for('reports') %]" enctype="application/x-www-form-urlencoded" accept-charset="utf-8"> diff --git a/templates/web/zurich/maps/noscript_map.html b/templates/web/zurich/maps/noscript_map.html new file mode 100644 index 000000000..5c2a2c064 --- /dev/null +++ b/templates/web/zurich/maps/noscript_map.html @@ -0,0 +1,70 @@ +<div class="noscript square-map__outer"> + <div class="square-map__inner"> + <div id="[% nsm_prefix %]drag"> + [%- FOR row IN map.tiles -%] + [%- FOR tile IN row -%] + [%- top_px = tile.row_offset * map.tile_size -%] + [%- left_px = tile.col_offset * map.tile_size %] + <[% map.img_type %] + class="square-map__tile" + alt="[% tile.alt %]" + id="[% nsm_prefix %]t[% tile.dotted_id %]" + name="tile_[% tile.dotted_id %]" + src="[% tile.src %]" + style="width: [% 100 / map.cols %]%; height: auto; float: left;"> + [%- END -%] + [% END %] + </div> + <div id="[% nsm_prefix %]pins">[% FOR pin IN map.pins %][% INCLUDE pin %][% END %]</div> + [% INCLUDE compass %] + </div> +</div> + +[% BLOCK compass %] +[% + north = c.uri_with( { lat = map.compass.north.0, lon = map.compass.north.1, zoom = map.zoom } ) + south = c.uri_with( { lat = map.compass.south.0, lon = map.compass.south.1, zoom = map.zoom } ) + east = c.uri_with( { lat = map.compass.east.0, lon = map.compass.east.1, zoom = map.zoom } ) + west = c.uri_with( { lat = map.compass.west.0, lon = map.compass.west.1, zoom = map.zoom } ) + world = c.uri_with( { zoom = 0 } ); + SET zoom_in = c.uri_with( { lat = map.latitude, lon = map.longitude, zoom = map.zoom + 1 } ) IF map.zoom < map.numZoomLevels - 1; + SET zoom_out = c.uri_with( { lat = map.latitude, lon = map.longitude, zoom = map.zoom - 1 } ) IF map.zoom > 0; + SET zoom_in = '#' IF map.zoom >= map.numZoomLevels - 1; + SET zoom_out = '#' IF map.zoom <= 0; +%] +<div style="position: absolute; left: 4px; top: 4px;" class="olControlPanZoom olControlNoSelect" unselectable="on"> + <div style="position: absolute; left: 13px; top: 4px; width: 18px; height: 18px;"><a rel="nofollow" href="[% north %]"><img style="position: relative; width: 18px; height: 18px;" src="/js/OpenLayers-2.13.1/img/north-mini.png" border="0"></a></div> + <div style="position: absolute; left: 4px; top: 22px; width: 18px; height: 18px;"><a rel="nofollow" href="[% west %]"><img style="position: relative; width: 18px; height: 18px;" src="/js/OpenLayers-2.13.1/img/west-mini.png" border="0"></a></div> + <div style="position: absolute; left: 22px; top: 22px; width: 18px; height: 18px;"><a rel="nofollow" href="[% east %]"><img style="position: relative; width: 18px; height: 18px;" src="/js/OpenLayers-2.13.1/img/east-mini.png" border="0"></a></div> + <div style="position: absolute; left: 13px; top: 40px; width: 18px; height: 18px;"><a rel="nofollow" href="[% south %]"><img style="position: relative; width: 18px; height: 18px;" src="/js/OpenLayers-2.13.1/img/south-mini.png" border="0"></a></div> + <div style="position: absolute; left: 13px; top: 63px; width: 18px; height: 18px;"><a rel="nofollow" href="[% zoom_in %]"><img style="position: relative; width: 18px; height: 18px;" src="/js/OpenLayers-2.13.1/img/zoom-plus-mini.png" border="0"></a></div> + <div style="position: absolute; left: 13px; top: 81px; width: 18px; height: 18px;"><a rel="nofollow" href="[% world %]"><img style="position: relative; width: 18px; height: 18px;" src="/js/OpenLayers-2.13.1/img/zoom-world-mini.png" border="0"></a></div> + <div style="position: absolute; left: 13px; top: 99px; width: 18px; height: 18px;"><a rel="nofollow" href="[% zoom_out %]"><img style="position: relative; width: 18px; height: 18px;" src="/js/OpenLayers-2.13.1/img/zoom-minus-mini.png" border="0"></a></div> +</div> +[% END %] + + +[% BLOCK pin %] + +[% IF pin.id %] +<a title="[% pin.title | html %]" href="[% c.uri_for('/report/' _ pin.id) %]"> +[%- END -%] +<img + data-foo="[% pin.px %],[% pin.py %]/ [% map.tile_size %]*[% map.cols %],[% map.rows %]" + border="0" + class="pin" + src="[% c.uri_for( c.cobrand.path_to_pin_icons _ 'pin-' _ pin.colour _ '.png') %]" + alt="[% loc('Problem') %]" + style=" + top: [% pin.py / ( map.tile_size * map.rows ) * 100 %]%; + left: [% pin.px / ( map.tile_size * map.cols ) * 100 %]%; + position: absolute; + margin-left: -24px; /* Half of 48px wide image */ + margin-top: -64px; /* All of 64px tall image */ + " +> +[%- IF pin.id -%] +</a> +[% END %] + +[% END %] diff --git a/templates/web/zurich/report/_item.html b/templates/web/zurich/report/_item.html index 22b39a2c8..9ba5e6fcb 100644 --- a/templates/web/zurich/report/_item.html +++ b/templates/web/zurich/report/_item.html @@ -1,5 +1,5 @@ -<li> -<a class="text" href="[% c.uri_for('/report', problem.id ) %]"> +<li class="item-list__item item-list--reports__item"> +<a href="[% c.uri_for('/report', problem.id ) %]"> [% IF problem.state != 'unconfirmed' AND problem.photo AND c.cobrand.allow_photo_display(problem); photo = problem.get_photo_params %] diff --git a/templates/web/zurich/report/banner.html b/templates/web/zurich/report/banner.html index eda70a0de..c10a99ef6 100644 --- a/templates/web/zurich/report/banner.html +++ b/templates/web/zurich/report/banner.html @@ -1,17 +1,6 @@ [% USE date %] -[% BLOCK banner %] - <div class="banner"> - <p id="[% id %]">[% text %]</p> - </div> -[% END %] - -[% IF problem.state == 'unconfirmed' %] - [% INCLUDE banner, id = 'closed', text = loc('Submitted') %] -[% ELSIF problem.state == 'confirmed' %] - [% INCLUDE banner, id = 'closed', text = loc('Open') %] -[% ELSIF problem.is_fixed OR problem.is_closed %] - [% INCLUDE banner, id = 'fixed', text = loc('Closed') %] -[% ELSIF problem.state == 'in progress' OR problem.state == 'planned' %] - [% INCLUDE banner, id = 'progress', text = loc('In progress') %] -[% END %] +[% problem_hashref = c.cobrand.problem_as_hashref(problem, c) %] +<div class="banner"> + <p id="[% problem_hashref.banner_id %]">[% problem_hashref.state_t %]</p> +</div> diff --git a/templates/web/zurich/report/new/fill_in_details_form.html b/templates/web/zurich/report/new/fill_in_details_form.html index 28d9ebe68..c8c567786 100644 --- a/templates/web/zurich/report/new/fill_in_details_form.html +++ b/templates/web/zurich/report/new/fill_in_details_form.html @@ -48,14 +48,17 @@ [% PROCESS "report/new/category_wrapper.html" %] [% IF c.cobrand.allow_photo_upload %] - <label for="form_photo">[% loc('Photo') %]</label> + <label for="form_photo"> + [% loc('Photo') %] + [% loc('(Defect & location of defect)') %] + </label> [% IF upload_fileid || report.photo %] [% IF upload_fileid %] <img align="right" src="/photo/[% upload_fileid %].temp.jpeg" alt=""> <input type="hidden" name="upload_fileid" value="[% upload_fileid %]"> [% END %] - <p>[% loc('You have already attached a photo to this report, attaching another one will replace it.') %]</p> + <p>[% loc('You have already attached photos to this report. Note that you can attach a maximum of 3 to this report (if you try to upload more, the oldest will be removed).') %]</p> [% IF report.photo %] <img align="right" src="/photo/[% report.id %].jpeg"> @@ -65,7 +68,9 @@ [% IF field_errors.photo %] <p class='form-error'>[% field_errors.photo %]</p> [% END %] - <input type="file" name="photo" id="form_photo"> + <input type="file" name="photo1" id="form_photo"> + <input type="file" name="photo2" id="form_photo2"> + <input type="file" name="photo3" id="form_photo3"> [% END %] <label for="form_email">[% loc('Your email') %]</label> @@ -84,7 +89,7 @@ [% IF field_errors.phone %] <p class='form-error'>[% field_errors.phone %]</p> [% END %] - <input type="text" value="[% report.user.phone | html %]" name="phone" id="form_phone" placeholder="[% loc('Your phone number') %]"> + <input type="text" value="[% report.user.phone | html %]" name="phone" id="form_phone" placeholder="[% loc('Your phone number') %]" required> <div class="form-txt-submit-box"> [%# ID of submit_sign_in so name can be option, name of submit_register so it doesn't try and sign us in %] diff --git a/templates/web/zurich/report/updates.html b/templates/web/zurich/report/updates.html index 786ecd582..1e835aab7 100644 --- a/templates/web/zurich/report/updates.html +++ b/templates/web/zurich/report/updates.html @@ -1,14 +1,14 @@ [% IF problem.state == 'fixed - council' OR problem.state == 'closed' %] <h4 class="static-with-rule">[% loc('Updates') %]</h4> - <ul class="issue-list"> + <ul class="item-list item-list--updates"> <li> - <div class="update-wrap"> - <div class="update-text"> + <div class="item-list__update-wrap"> + <div class="item-list__update-text"> <p class="meta-2">[% prettify_dt( problem.lastupdate, 'zurich' ) %]</p> - [% IF problem.state == 'fixed - council' %] + [%# XXX following should honour zurich_closed_states instead? %] + [% IF problem.state == 'fixed - council' + || ( problem.external_body AND problem.state == 'closed' ) %] [% add_links( problem.extra.public_response ) | html_para %] - [% ELSIF problem.state == 'closed' AND problem.external_body %] - <p>[% tprintf( loc('Assigned to %s'), problem.body(c).name ) %]</p> [% END %] </div> </div> diff --git a/templates/web/zurich/reports/index.html b/templates/web/zurich/reports/index.html index 0ece1ca2c..fd0efcf94 100755 --- a/templates/web/zurich/reports/index.html +++ b/templates/web/zurich/reports/index.html @@ -15,7 +15,7 @@ <section class="full-width"> [% IF problems.0 %] - <ul class="issue-list-a"> + <ul class="item-list item-list--reports"> [% FOREACH problem IN problems.0 %] [% INCLUDE 'reports/_list-entry.html' %] [% END %] |