diff options
Diffstat (limited to 'templates/web')
155 files changed, 1526 insertions, 934 deletions
diff --git a/templates/web/arreglamibarrio/faq/faq-es.html b/templates/web/arreglamibarrio/faq/faq-es.html new file mode 100644 index 000000000..3d5397380 --- /dev/null +++ b/templates/web/arreglamibarrio/faq/faq-es.html @@ -0,0 +1,82 @@ +[% INCLUDE 'header.html', title = loc('Frequently Asked Questions'), bodyclass = 'twothirdswidthpage' %]
+<div class="sticky-sidebar">
+<aside>
+<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>
+</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>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' -%];
+ 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>
+ - falta de limpieza en las calles <br>
+ - pintadas o graffitis
+ <br>
+ - basura sin recoger o contenedores rotos<br>
+ -
+ farolas rotas o apagadas<br>
+ - Baches</dt>
+ <dd></dd>
+ </dl>
+ </dd>
+<dt>¿Para que NO es [% PROCESS 'site-name.html' -%] ?</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:
+ <ul>
+ <li>Comportamientos anti-sociales.
+<li>Cualquier problema de urgencia o emergencias
+<li>Contaminación acustica o ladridos de perros
+<li>Incendios o contaminación por humo u olores
+<li>Las propuestas de los reductores de velocidad / nuevos trazados urbanisticos / etc.
+
+<li>Quejarse de sus vecinos
+<li>Quejarse de las autoridades
+<li>Consumo de drotas, crueldad animal u otras actividades delictivas
+</ul>
+<p>Las autoridades tienen lineas directas para este tipo de notificaciones .</p>
+</dd>
+<dt>¿Como puedo usar esta web? </dt>
+<dd>Después de entrar en un lugar, se le presenta un mapa de esa zona. Puede ver los problemas ya informados en esa área, o reportar los de su propio haciendo clic en el mapa en la localización del problema.</dd>
+<dt>¿Cómo se resuelven los problemas?</dt>
+<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>
+<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>
+</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' -%]
+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>
+<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>
+<h2><a name="organisation"></a>Preguntas a la organización </h2>
+<dl>
+<dt>¿Quién hizo [% PROCESS 'site-name.html' -%]?</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>
+<dt> Me gustaría un sitio como este para mi propio lugar / ¿dónde está el "código fuente" de esta plataforma?</dt>
+<dd>
+El software que está detrás de este sitio es de código abierto, y se encuentra recogido bajo licencia de software GNU Affero GPL. Usted puede
+<a href="https://github.com/mysociety/fixmystreet">descargar el codigo fuente</a> y le ayudaremos a desarrollarlo. Le invitamos a utilizarlo en su propio proyecto, aunque también se debe poner a disposición el código fuente para otros proyectos. <a href="https://www.fixmystreet.com/">FixMyStreet.com</a> es el código original, en Reino Unido y
+<a href="http://www.fiksgatami.no/">Fiksgatami</a> es un ejemplo de código que se utiliza en Noruega.</dd>
+</dl>
+[% INCLUDE 'footer.html' pagefooter = 'yes' %]
diff --git a/templates/web/arreglamibarrio/site-name.html b/templates/web/arreglamibarrio/site-name.html new file mode 100644 index 000000000..3b682b1b2 --- /dev/null +++ b/templates/web/arreglamibarrio/site-name.html @@ -0,0 +1 @@ +ArreglaMiBarrio diff --git a/templates/web/barnet/header.html b/templates/web/barnet/header.html index 0e9bbfa42..101d444a7 100644 --- a/templates/web/barnet/header.html +++ b/templates/web/barnet/header.html @@ -15,7 +15,7 @@ <meta name="Keywords" content="fixmystreet barnet pothole streetlights report street problem" /> <meta name="Description" content="FixMyStreet Barnet: report problems in Barnet like graffiti, fly tipping, broken paving slabs, or street lighting" /> - <link rel="Shortcut Icon" type="image/x-icon" href="http://pledgebank.barnet.gov.uk/microsites/barnet/site/favicon.ico" /> + <link rel="Shortcut Icon" type="image/x-icon" href="/cobrands/barnet/img/favicon.ico" /> <link rel="stylesheet" href="[% version('/cobrands/barnet/base.css') %]"> <link rel="stylesheet" href="[% version('/cobrands/barnet/layout.css') %]" media="(min-width:48em)"> @@ -33,13 +33,15 @@ [% INCLUDE 'common_header_tags.html', js_override = '/cobrands/fixmystreet/fixmystreet.js' %] <script src="[% version('/js/fancybox/jquery.fancybox-1.3.4.pack.js') %]" charset="utf-8"></script> + [% PROCESS 'header_extra.html' %] + </head> <body class="[% bodyclass | html IF bodyclass %]"> <div id="barnet-wrapper"> <div id="ie_wrapper"> <div id="mast"> <div class="pseudoH1"> - <a href="http://www.barnet.gov.uk/"><span>London Borough of Barnet</span> <img src="http://pledgebank.barnet.gov.uk/microsites/barnet/site/images/blank.gif" alt="London Borough of Barnet logo" /></a> + <a href="http://www.barnet.gov.uk/"><span>London Borough of Barnet</span> <img src="/cobrands/barnet/img/blank.gif" alt="London Borough of Barnet logo" /></a> </div> <ul id="skip" class="hidden"> <li><a href="#content" rel="nofollow">Skip to content</a></li> diff --git a/templates/web/base/admin/bodies.html b/templates/web/base/admin/bodies.html index a039f8208..4c95423c0 100644 --- a/templates/web/base/admin/bodies.html +++ b/templates/web/base/admin/bodies.html @@ -35,13 +35,13 @@ [% IF c.cobrand.moniker == 'zurich' %] [% FILTER repeat(4*body.api_key) %] [% END %] [% IF admin_type == 'super' %] - <a href="[% c.uri_for( 'body', id ) %]">[% body.name %]</a> + <a href="[% c.uri_for( 'body', id ) %]">[% body.name | html %]</a> [% ELSE %] - [% body.name %] + [% body.name | html %] [% END %] [% ELSE %] [%# not Zurich: all bodies should be links %] - <a href="[% c.uri_for( 'body', id ) %]">[% body.name %]</a> - [%- ', ' _ body.parent.name IF body.parent -%] + <a href="[% c.uri_for( 'body', id ) %]">[% body.name | html%]</a> + [%- IF body.parent %], [% body.parent.name | html %][% END -%] [% END %] </td> [% IF c.cobrand.moniker == 'zurich' %] diff --git a/templates/web/base/admin/body-form.html b/templates/web/base/admin/body-form.html index 608a77dc2..6b103a7cf 100644 --- a/templates/web/base/admin/body-form.html +++ b/templates/web/base/admin/body-form.html @@ -16,7 +16,7 @@ </div> <p> <label for="name">[% loc('Name') %]</label> - <input type="text" name="name" id="name" value="[% body.name %]" size="50"> + <input type="text" name="name" id="name" value="[% body.name | html %]" size="50"> </p> <div class="admin-hint"> @@ -72,17 +72,21 @@ [% SET body_areas = body.areas %] [% FOR area IN areas %] [% SET aid = area.id %] - <option value="[% area.id %]"[% ' selected' IF body_areas.$aid %]>[% area.name %]</option> + <option value="[% area.id %]"[% ' selected' IF body_areas.$aid %]>[% area.name | html %]</option> [% END %] </select> </p> + <p> + <label for="external_url">[% loc('External URL') %]</label> + <input type="text" name="external_url" id="external_url" value="[% body.external_url | html %]" size="50"> + </p> <div class="admin-hint"> <p>[% loc( "You can mark a body as deleted if you do not want it to be active on the site." ) %]</p> </div> <p> - <label for="deleted">[% loc('Flag as deleted') %]</label> <input type="checkbox" name="deleted" id="deleted" value="1"[% ' checked' IF body.deleted %]> + <label for="deleted" class="inline">[% loc('Flag as deleted') %]</label> </p> <div class="admin-hint"> @@ -124,7 +128,7 @@ </div> <p> <label for="endpoint">[% loc('Endpoint') %]</label> - <input type="text" name="endpoint" id="endpoint" value="[% body.endpoint %]" size="50"> + <input type="text" name="endpoint" id="endpoint" value="[% body.endpoint | html %]" size="50"> </p> <div class="admin-hint"> @@ -137,7 +141,7 @@ </div> <p> <label for="jurisdiction">Open311 Jurisdiction</label> - <input type="text" name="jurisdiction" id="jurisdiction" value="[% body.jurisdiction %]" size="50"> + <input type="text" name="jurisdiction" id="jurisdiction" value="[% body.jurisdiction | html %]" size="50"> </p> <div class="admin-hint"> @@ -150,7 +154,7 @@ </div> <p> <label for="api_key">Open311 API Key</label> - <input type="text" name="api_key" id="api_key" value="[% body.api_key %]" size="25"> + <input type="text" name="api_key" id="api_key" value="[% body.api_key | html %]" size="25"> </p> <div class="admin-hint"> @@ -180,6 +184,9 @@ <p> <label for"comment_user_id">User ID to attribute fetched comments to</label> <input type="text" name="comment_user_id" value="[% body.comment_user_id %]"> + [% IF body.comment_user_id %] + <a href="[% c.uri_for('user_edit', body.comment_user_id) %]">[% loc('edit user') %]</a> + [% END %] </p> <div class="admin-hint"> diff --git a/templates/web/base/admin/body.html b/templates/web/base/admin/body.html index cd87a5af8..84ea6840c 100644 --- a/templates/web/base/admin/body.html +++ b/templates/web/base/admin/body.html @@ -13,14 +13,22 @@ [% IF example_pc %] <a href="[% c.uri_for_email( '/around', { pc => example_pc } ) %]" class="admin-offsite-link">[% tprintf( loc('Example postcode %s'), example_pc ) | html %]</a> | [% END %] - [% IF c.cobrand.moniker == 'emptyhomes' %] - <a href="[% c.uri_for( 'reports', search => 'body:' _ body_id ) %]">[% loc('List all reported problems' ) %]</a> | - [% ELSE %] + [% loc('Area covered') %]: + [% SET body_areas = body.areas %] + [% FOR area IN areas %] + [% SET aid = area.id %] + [% IF body_areas.$aid %] + <a href="[% c.config.MAPIT_URL %][% + '/' UNLESS c.config.MAPIT_URL.search('/$') + %]area/[% aid %].html" class="admin-offsite-link">[% area.name | html %]</a> + [% END %] + [% END %] +<br> <a href="[% c.uri_for_email( '/reports/' _ body_id ) %]" class="admin-offsite-link">[% loc('List all reported problems' ) %]</a> | - [% END %] - <a href="[% c.uri_for( 'body', body_id, { text => 1 } ) %]">[% loc('Text only version') %]</a> + <a href="[% c.uri_for( 'body', body_id, { text => 1 } ) %]">[% loc('Text only version') %]</a> </p> + [% IF body.send_method == 'Open311' %] <h2> Council contacts configured via Open311 @@ -65,7 +73,7 @@ </tr> [% WHILE ( cat = contacts.next ) %] <tr [% IF cat.deleted %]class="is-deleted"[% END %]> - <td class="contact-category"><a href="[% c.uri_for( 'body', body_id, cat.category ) %]">[% cat.category %]</a> + <td class="contact-category"><a href="[% c.uri_for( 'body', body_id, cat.category ) %]">[% cat.category | html %]</a> <br>[% cat.email | html %]</td> <td> [% loc('Confirmed') %]: @@ -79,10 +87,10 @@ <br>[% loc('Devolved') %]: [%- IF body.can_be_devolved AND cat.send_method %][% loc('Yes') %][% ELSE %][% loc('No') %][% END %] </td> - <td>[% cat.editor %] + <td>[% cat.editor | html %] <br><small>[% PROCESS format_time time=cat.whenedited %]</small></td> <td>[% cat.note | html %]</td> - <td><input type="checkbox" name="confirmed" value="[% cat.category %]"></td> + <td><input type="checkbox" name="confirmed" value="[% cat.category | html %]"></td> </tr> [% END %] </table> diff --git a/templates/web/base/admin/category_edit.html b/templates/web/base/admin/category_edit.html index ef7a0a11c..b827a4b6d 100644 --- a/templates/web/base/admin/category_edit.html +++ b/templates/web/base/admin/category_edit.html @@ -23,6 +23,11 @@ <p><strong>[% loc('Category:') %] </strong>[% contact.category | html %] <input type="hidden" name="category" value="[% contact.category | html %]" > <input type="hidden" name="token" value="[% token %]" > + [% IF contact.extra %] + <p><strong>[% loc('Extra data:') %] </strong> + [% USE Dumper %] + [% Dumper.dump(contact.extra) | html %]</p> + [% END %] <p><strong>[% loc('Email:') %] </strong> <input type="text" name="email" value="[% contact.email | html %]" size="30"> @@ -48,17 +53,17 @@ <form method="post" action="[% c.uri_for('body', body_id ) %]" enctype="application/x-www-form-urlencoded" accept-charset="utf-8"> <p> <label for="endpoint">Endpoint</label> - <input type="text" name="endpoint" id="endpoint" value="[% contact.endpoint %]" size="50"> + <input type="text" name="endpoint" id="endpoint" value="[% contact.endpoint | html %]" size="50"> </p> <p> <label for="jurisdiction">Jurisdiction</label> - <input type="text" name="jurisdiction" id="jurisdiction" value="[% contact.jurisdiction %]" size="50"> + <input type="text" name="jurisdiction" id="jurisdiction" value="[% contact.jurisdiction | html %]" size="50"> </p> <p> <label for="api_key">Api Key</label> - <input type="text" name="api_key" id="api_key" value="[% contact.api_key %]" size="25"> + <input type="text" name="api_key" id="api_key" value="[% contact.api_key | html %]" size="25"> </p> <p> @@ -93,7 +98,7 @@ <td>[% PROCESS highlightchanged old=prev new=contact value='email' %]</td> <td>[% PROCESS highlightchanged_yesno old=prev new=contact value='confirmed' %]</td> <td>[% PROCESS highlightchanged_yesno old=prev new=contact value='deleted' %]</td> - <td>[% contact.editor %]</td> + <td>[% contact.editor | html %]</td> <td>[% contact.note | html %]</td> </tr> [%- prev = contact %] diff --git a/templates/web/base/admin/config_page.html b/templates/web/base/admin/config_page.html index 211d41f31..7c9b5e317 100644 --- a/templates/web/base/admin/config_page.html +++ b/templates/web/base/admin/config_page.html @@ -37,6 +37,7 @@ running version <strong>[% git_version || 'unknown' %]</strong>. [% INCLUDE subsection heading="URLs" %] [% INCLUDE with_cobrand value="BASE_URL" cob=c.cobrand.base_url %] [% INCLUDE with_cobrand value="ADMIN_BASE_URL" cob=c.cobrand.admin_base_url %] +[% INCLUDE just_value value="SECURE_PROXY_SSL_HEADER" %] [% INCLUDE subsection heading="Display" %] <tr> @@ -84,10 +85,20 @@ running version <strong>[% git_version || 'unknown' %]</strong>. cob = discob %] [% INCLUDE subsection heading="MapIt" %] -[% INCLUDE just_value value="MAPIT_URL" %] +[% INCLUDE just_value value="MAPIT_URL" + conf = "<a href='" _ c.config.MAPIT_URL _ "'>" _ c.config.MAPIT_URL _ "</a>" %] [% INCLUDE with_cobrand value="MAPIT_TYPES" cob = c.cobrand.area_types %] -[% INCLUDE just_value value="MAPIT_ID_WHITELIST" %] +<tr> + <td>MAPIT_ID_WHITELIST</td> + <td colspan=2> + [% FOR id IN c.config.MAPIT_ID_WHITELIST %] + <a href="[% c.config.MAPIT_URL %][% + '/' UNLESS c.config.MAPIT_URL.search('/$') + %]area/[% id %].html">[% id %]</a>[% ',' UNLESS loop.last %] + [% END %] + </td> +</tr> [% INCLUDE just_value value="MAPIT_GENERATION" %] [% INCLUDE with_cobrand value="MAPIT_TYPES_CHILDREN" cob = c.cobrand.area_types_children %] diff --git a/templates/web/base/admin/header.html b/templates/web/base/admin/header.html index 9f3503e20..6282bf383 100644 --- a/templates/web/base/admin/header.html +++ b/templates/web/base/admin/header.html @@ -1,4 +1,4 @@ -[% INCLUDE 'header.html' admin = 1, bodyclass = 'fullwidthpage admin show-admin-notes' %] +[% INCLUDE 'header.html' admin = 1, bodyclass = 'fullwidthpage admin' %] <style type="text/css"> dt { clear: left; float: left; font-weight: bold; } dd { margin-left: 8em; } diff --git a/templates/web/base/admin/report_edit.html b/templates/web/base/admin/report_edit.html index 12560fdf3..d488dcadc 100644 --- a/templates/web/base/admin/report_edit.html +++ b/templates/web/base/admin/report_edit.html @@ -20,14 +20,27 @@ <li><label for='detail'>[% loc('Details:') %]</label> <textarea name='detail' id='detail' cols=60 rows=10>[% problem.detail | html %]</textarea></li> -<li>[% loc('Co-ordinates:') %] [% problem.latitude %], [% problem.longitude %] +<li>[% loc('Co-ordinates:') %] +<a href="[% c.config.MAPIT_URL %][% + '/' UNLESS c.config.MAPIT_URL.search('/$') +%]point/4326/[% problem.longitude %],[% problem.latitude %].html" +class="admin-offsite-link">[% problem.latitude %], [% problem.longitude %]</a> ( [% SET postcode_safe = problem.postcode | html; tprintf( loc('originally entered: “%s”'), postcode_safe ) %], [% IF problem.used_map %][% loc('used map') %][% ELSE %][% loc("didn't use map") %][% END %])</li> -<li>[% loc('For council(s):') %] [% IF problem.bodies_str %][% problem.bodies_str %][% ELSE %]<em>[% loc('None' ) %]</em>[% END %] ([% loc('other areas:') %] [% problem.areas | remove('^,') | remove( ',$' ) %])</li> +<li>[% loc('Body:') %] + [% IF problem.bodies_str %] + [% FOREACH body IN problem.bodies.values %] + <a href="[% c.uri_for('body', body.id) %]">[% body.name | html %]</a> + [%- ',' IF NOT loop.last %] + [% END %] + [% ELSE %] + <em>[% loc('None' ) %]</em> + [% END %] + ([% loc('other areas:') %] [% problem.areas | remove('^,') | remove( ',$' ) %])</li> [% IF problem.extra.address %] <li>[% loc('Property address:') %] [% problem.extra.address | html %]</li> [% END %] @@ -68,7 +81,10 @@ <li>[% loc('Phone:') %] [% problem.user.phone | html %]</li> <li>[% loc('Created:') %] [% PROCESS format_time time=problem.created %]</li> <li>[% loc('Confirmed:') %] [% PROCESS format_time time=problem.confirmed no_time='-' %]</li> -<li>[% loc('Sent:') %] [% PROCESS format_time time=problem.whensent %] [% IF problem.state == 'confirmed' %]<input onclick="return confirm('[% loc('You really want to resend?') %]')" type="submit" name="resend" value="[% loc('Resend report') %]">[% END %]</li> +<li>[% loc('Sent:') %] [% PROCESS format_time time=problem.whensent %] +[% IF problem.state == 'confirmed' AND problem.whensent %]<input onclick="return confirm('[% loc('You really want to resend?') %]')" type="submit" name="resend" value="[% loc('Resend report') %]">[% END %] +[% IF NOT problem.whensent %]<input type="submit" name="mark_sent" value="[% loc('Mark as sent') %]">[% END %] +</li> <li>[% loc('Last update:') %] [% PROCESS format_time time=problem.lastupdate %]</li> <li>[% loc('Service:') %] [% problem.service %]</li> <li>[% loc('Cobrand:') %] [% problem.cobrand %]</li> diff --git a/templates/web/base/admin/user-form.html b/templates/web/base/admin/user-form.html index 4a57b05a0..3956e8533 100644 --- a/templates/web/base/admin/user-form.html +++ b/templates/web/base/admin/user-form.html @@ -34,8 +34,9 @@ [% FOR body IN bodies %] <option value="[% body.id %]"[% ' selected' IF body.id == user.from_body.id %]>[% body.name %]</option> [% END %] - </li> </select> + [% IF user.from_body AND user.has_permission_to('moderate', user.from_body.id) %]*[% END %] + </li> [% IF c.cobrand.moniker != 'zurich' %] <li> <div class="admin-hint"> diff --git a/templates/web/base/admin/users.html b/templates/web/base/admin/users.html index db97c7d59..19a3de03c 100644 --- a/templates/web/base/admin/users.html +++ b/templates/web/base/admin/users.html @@ -24,7 +24,9 @@ <tr> <td>[% PROCESS value_or_nbsp value=user.name %]</td> <td><a href="[% c.uri_for( 'reports', search => user.email ) %]">[% PROCESS value_or_nbsp value=user.email %]</a></td> - <td>[% PROCESS value_or_nbsp value=user.from_body.name %]</td> + <td>[% PROCESS value_or_nbsp value=user.from_body.name %] + [% IF user.from_body AND user.has_permission_to('moderate', user.from_body.id) %] * [% END %] + </td> [% IF c.cobrand.moniker != 'zurich' %] <td>[% user.flagged == 2 ? loc('(Email in abuse table)') : user.flagged ? loc('Yes') : ' ' %]</td> [% END %] diff --git a/templates/web/base/alert/index.html b/templates/web/base/alert/index.html index e3dead34a..314008846 100644 --- a/templates/web/base/alert/index.html +++ b/templates/web/base/alert/index.html @@ -1,4 +1,4 @@ -[% INCLUDE 'header.html', title = loc('Local RSS feeds and email alerts'), bodyclass = 'twothirdswidthpage alertindex' %] +[% INCLUDE 'header.html', title = loc('Local RSS feeds and email alerts'), bodyclass = 'twothirdswidthpage' %] <h1>[% loc('Local RSS feeds and email alerts') %]</h1> @@ -37,7 +37,7 @@ To find out what local alerts we have for you, please enter your [% c.cobrand.co </form> [% IF photos.size %] -<div class="sticky-sidebar" id="alert_recent"> +<div id="alert_recent"> <aside> <h2>[% loc('Some photos of recent reports') %]</h2> [% FOREACH p IN photos; diff --git a/templates/web/base/alert/list.html b/templates/web/base/alert/list.html index 447bfcd76..7b262f9e7 100644 --- a/templates/web/base/alert/list.html +++ b/templates/web/base/alert/list.html @@ -21,7 +21,7 @@ <form id="alerts" name="alerts" method="post" action="/alert/subscribe"> [% IF photos.size %] - <div id="alert_photos" class="sticky-sidebar"> + <div id="alert_photos"> <aside> <h2>[% loc('Photos of recent nearby reports') %]</h2> [% FOREACH p IN photos; diff --git a/templates/web/base/around/display_location.html b/templates/web/base/around/display_location.html index 804be9603..3f4ec8881 100755 --- a/templates/web/base/around/display_location.html +++ b/templates/web/base/around/display_location.html @@ -6,14 +6,14 @@ rss_url = pc ? c.uri_for( "/rss/pc", pc ) - : c.uri_for( "/rss/l/$short_latitude,$short_longitude" ); + : c.uri_for( "/rss/l/$latitude,$longitude" ); email_url = c.uri_for( '/alert/list', { - lat => short_latitude, - lon => short_longitude, - feed => "local:$short_latitude:$short_longitude", + lat => latitude, + lon => longitude, + feed => "local:$latitude:$longitude", } ); @@ -21,8 +21,8 @@ '/report/new', { pc => pc - latitude => short_latitude, - longitude => short_longitude, + latitude => latitude, + longitude => longitude, skipped => 1, } ); @@ -45,8 +45,8 @@ [% END %] <input type="hidden" name="pc" value="[% pc | html %]"> - <input type="hidden" name="latitude" id="fixmystreet.latitude" value="[% short_latitude | html %]"> - <input type="hidden" name="longitude" id="fixmystreet.longitude" value="[% short_longitude | html %]"> + <input type="hidden" name="latitude" id="fixmystreet.latitude" value="[% latitude | html %]"> + <input type="hidden" name="longitude" id="fixmystreet.longitude" value="[% longitude | html %]"> [% END %] [% map_html %] diff --git a/templates/web/base/auth/sign_out.html b/templates/web/base/auth/sign_out.html index 571e13f9f..c95efacf5 100644 --- a/templates/web/base/auth/sign_out.html +++ b/templates/web/base/auth/sign_out.html @@ -1,7 +1,10 @@ [% INCLUDE 'header.html', title = loc('Sign out'), bodyclass = 'fullwidthpage' %] -<h1>[% loc('You have been signed out') %]</h1> +<div class="confirmation-header"> + <h1>[% loc('You have been signed out') %]</h1> + <p>[% tprintf( loc('Please feel free to <a href="%s">sign in again</a>, or go back to the <a href="/">front page</a>.'), c.uri_for('/auth') ) %]</p> +</div> -<p>[% tprintf( loc('Please feel free to <a href="%s">sign in again</a>, or go back to the <a href="/">front page</a>.'), c.uri_for('/auth') ) %]</p> +[% INCLUDE next_steps.html %] [% INCLUDE 'footer.html' %] diff --git a/templates/web/base/contact/submit.html b/templates/web/base/contact/submit.html index fc416c2d7..5adb87e2d 100644 --- a/templates/web/base/contact/submit.html +++ b/templates/web/base/contact/submit.html @@ -1,20 +1,21 @@ -[% INCLUDE 'header.html', title = loc('Contact Us'), bodyclass = 'fullwidthpage' %] +[% INCLUDE 'header.html', bodyclass = 'fullwidthpage', title = loc('Contact Us') %] -<h1>[% loc('Contact the team') %]</h1> - [% IF success %] - <p> - [% loc("Thanks for your feedback. We'll get back to you as soon as we can!") %] - </p> - [% display_crosssell_advert( em, form_name, 'emailunvalidated', 1 ) %] + <div class="confirmation-header"> + <h1>[% loc('Thank you for your feedback') %]</h1> + <p>[% loc('We’ll get back to you as soon as we can.') %]</p> + </div> [% ELSE %] - <p> - [% tprintf( loc('Failed to send message. Please try again, or <a href="mailto:%s">email us</a>.'), contact_email ) %] - </p> + <div class="confirmation-header confirmation-header--failure"> + <h1>[% loc('Failed to send message') %]</h1> + <p>[% loc('Try emailing us directly:') %] <a href="mailto:[% contact_email %]">[% contact_email %]</a></p> + </div> [% END %] +[% INCLUDE next_steps.html %] + [% INCLUDE 'footer.html' %] diff --git a/templates/web/base/index-steps.html b/templates/web/base/index-steps.html index fac84faba..431791c20 100644 --- a/templates/web/base/index-steps.html +++ b/templates/web/base/index-steps.html @@ -21,15 +21,8 @@ <li>Or visit the Barangay Center in person</li> <li>Staff? <a href="/auth">Sign in</a> and click on the map! [% ELSE %] - [% IF c.cobrand.moniker == 'makemyisland' %] - <li> - Locate the problem on the - <a href="/around?pc=Fonadhoo">map of the island</a> - </li> - [% ELSE %] - <li>[% question %]</li> - <li>[% loc('Locate the problem on a map of the area') %]</li> - [% END %] + <li>[% question %]</li> + <li>[% loc('Locate the problem on a map of the area') %]</li> <li>[% loc('Enter details of the problem') %]</li> [% IF c.cobrand.is_council %] <li>Confirm the report and [% c.cobrand.council_name %] will investigate</li> diff --git a/templates/web/base/maps/bing.html b/templates/web/base/maps/bing.html new file mode 100644 index 000000000..1747f1bbe --- /dev/null +++ b/templates/web/base/maps/bing.html @@ -0,0 +1,12 @@ +[% map_js = BLOCK %] +<!-- <script type="text/javascript" src="http://ecn.dev.virtualearth.net/mapcontrol/mapcontrol.ashx?v=7.0&mkt=en-GB"></script> --> +<script type="text/javascript" src="[% version('/js/OpenLayers.fixmystreet.js') %]"></script> +<script type="text/javascript" src="[% version('/js/map-OpenLayers.js') %]"></script> +<script type="text/javascript" src="[% version('/js/map-bing-ol.js') %]"></script> +<script type="text/javascript" src="[% version('/js/jquery.ba-hashchange.min.js') %]"></script> +<!--[if lte IE 6]> + <link rel="stylesheet" href="/js/OpenLayers-2.13.1/theme/default/ie6-style.css" type="text/css"> +<![endif]--> +[% END %] + +[% map_html = INCLUDE maps/openlayers.html %] diff --git a/templates/web/base/maps/fms.html b/templates/web/base/maps/fms.html index 1cdfc0b35..31e050ba1 100644 --- a/templates/web/base/maps/fms.html +++ b/templates/web/base/maps/fms.html @@ -3,13 +3,11 @@ <script type="text/javascript" src="[% version('/js/OpenLayers.fixmystreet.js') %]"></script> <script type="text/javascript" src="[% version('/js/map-OpenLayers.js') %]"></script> <script type="text/javascript" src="[% version('/js/map-bing-ol.js') %]"></script> +<script type="text/javascript" src="[% version('/js/map-fms.js') %]"></script> <script type="text/javascript" src="[% version('/js/jquery.ba-hashchange.min.js') %]"></script> <!--[if lte IE 6]> <link rel="stylesheet" href="/js/OpenLayers-2.13.1/theme/default/ie6-style.css" type="text/css"> <![endif]--> [% END %] -[% map_html = BLOCK %] -[% INCLUDE maps/openlayers.html %] -[% END %] - +[% map_html = INCLUDE maps/openlayers.html include_key = 1 %] diff --git a/templates/web/base/maps/google-ol.html b/templates/web/base/maps/google-ol.html index 919ae073f..ce22fc94c 100644 --- a/templates/web/base/maps/google-ol.html +++ b/templates/web/base/maps/google-ol.html @@ -10,7 +10,7 @@ [% END %] [% map_sub_links = BLOCK %] -<a class="hidden-nojs" id="map_layer_toggle" href="">[% loc('Satellite') %]</a> +<a class="hidden-nojs" id="map_layer_toggle" href="">[% loc('Map') %]</a> [% END %] [% map_html = BLOCK %] diff --git a/templates/web/base/maps/mapquest-attribution.html b/templates/web/base/maps/mapquest-attribution.html index 60aa1b000..804710ad1 100644 --- a/templates/web/base/maps/mapquest-attribution.html +++ b/templates/web/base/maps/mapquest-attribution.html @@ -10,5 +10,4 @@ [% map_html = BLOCK %] [% INCLUDE maps/openlayers.html %] -<div class="olControlAttribution" style="position: absolute;">Data, imagery and map information provided by <a href="http://www.mapquest.com/">MapQuest</a> <img src="http://developer.mapquest.com/content/osm/mq_logo.png" />, <a href="http://openstreetmap.org/">Open Street Map</a> and contributors, <a href="http://opendatacommons.org/licenses/odbl/">ODbL</a></div> [% END %] diff --git a/templates/web/base/maps/openlayers.html b/templates/web/base/maps/openlayers.html index d01e98138..27c71f42f 100644 --- a/templates/web/base/maps/openlayers.html +++ b/templates/web/base/maps/openlayers.html @@ -22,6 +22,9 @@ var fixmystreet = { 'numZoomLevels': [% map.numZoomLevels %], 'zoomOffset': [% map.zoomOffset %], 'map_type': [% map.map_type %], +[% IF include_key -%] + 'key': '[% c.config.BING_MAPS_API_KEY %]', +[%- END %] 'pins': [% INCLUDE maps/pins_js.html %] } </script> @@ -49,7 +52,7 @@ var fixmystreet = { [% INCLUDE compass %] </noscript></div> [% IF map.copyright %] - <p id="copyright">[% map.copyright %]</p> + <div class="olControlAttribution" style="position: absolute;">[% map.copyright %]</div> [% END %] diff --git a/templates/web/base/maps/osm-toner-lite.html b/templates/web/base/maps/osm-toner-lite.html new file mode 100644 index 000000000..64fa91937 --- /dev/null +++ b/templates/web/base/maps/osm-toner-lite.html @@ -0,0 +1,14 @@ +[% map_js = BLOCK %] +<script type="text/javascript" src="[% version('/js/OpenLayers.fixmystreet.js') %]"></script> +<script type="text/javascript" src="https://stamen-maps.a.ssl.fastly.net/js/tile.stamen.js?v1.3.0"></script> +<script type="text/javascript" src="[% version('/js/map-OpenLayers.js') %]"></script> +<script type="text/javascript" src="[% version('/js/map-toner-lite.js') %]"></script> +<script type="text/javascript" src="[% version('/js/jquery.ba-hashchange.min.js') %]"></script> +<!--[if lte IE 6]> + <link rel="stylesheet" href="/js/OpenLayers-2.13.1/theme/default/ie6-style.css" type="text/css"> +<![endif]--> +[% END %] + +[% map_html = BLOCK %] +[% INCLUDE maps/openlayers.html %] +[% END %] diff --git a/templates/web/base/maps/osm.html b/templates/web/base/maps/osm.html index 3e1e1aec8..0b2db1a53 100644 --- a/templates/web/base/maps/osm.html +++ b/templates/web/base/maps/osm.html @@ -10,5 +10,4 @@ [% map_html = BLOCK %] [% INCLUDE maps/openlayers.html %] -<div class="olControlAttribution" style="position: absolute;">© <a href="http://www.openstreetmap.org/copyright">OpenStreetMap</a> contributors</div> [% END %] diff --git a/templates/web/base/next_steps.html b/templates/web/base/next_steps.html new file mode 100644 index 000000000..9d5b22c80 --- /dev/null +++ b/templates/web/base/next_steps.html @@ -0,0 +1,5 @@ +[%# +Override this file in your cobrand to show promotions or suggested next steps +to your users after they perform major interactions like confirming or updating +problem reports, setting up local area alerts, or signing out. +%] diff --git a/templates/web/base/open311/index.html b/templates/web/base/open311/index.html index df36bcfc9..502b1a69a 100644 --- a/templates/web/base/open311/index.html +++ b/templates/web/base/open311/index.html @@ -95,7 +95,7 @@ for council problem-reporting systems.</p> <ul> -[% jurisdiction_id = 'fiksgatami.no' %] +[% jurisdiction_id = c.cobrand.jurisdiction_id_example %] [% examples = [ { url = c.cobrand.base_url _ "/open311/v2/discovery.xml?jurisdiction_id=$jurisdiction_id", diff --git a/templates/web/base/questionnaire/completed-open.html b/templates/web/base/questionnaire/completed-open.html index c860b7341..0be40ac86 100644 --- a/templates/web/base/questionnaire/completed-open.html +++ b/templates/web/base/questionnaire/completed-open.html @@ -1,11 +1,3 @@ -[% IF c.cobrand.is_council %] -<p style="font-size: 150%"> -Thank you very much for filling in our questionnaire. -</p> -[% ELSE %] -[% loc('<p style="font-size:150%">We’re sorry to hear that. We have two -suggestions: why not try writing to your local representatives or, if -it’s a problem that could be fixed by local people working together, why -not <a href="http://www.pledgebank.com/new">make and publicise a pledge</a>? -</p>') %] +[% IF ! c.cobrand.is_council %] + <p>[% loc('We’re sorry to hear the problem’s not fixed. Why not try writing to your local representatives?') %]</p> [% END %] diff --git a/templates/web/base/questionnaire/completed.html b/templates/web/base/questionnaire/completed.html index 4d848a63c..32aa8bd68 100644 --- a/templates/web/base/questionnaire/completed.html +++ b/templates/web/base/questionnaire/completed.html @@ -1,28 +1,21 @@ -[% - INCLUDE 'header.html', title = loc('Questionnaire') -%] +[% INCLUDE 'header.html', bodyclass = 'fullwidthpage', title = loc('Questionnaire') %] -[% advert_outcome = 1 %] +<div class="confirmation-header"> -[% IF been_fixed == 'Unknown' %] + <h1>[% loc('Thank you for your feedback') %]</h1> -[% loc('<p>Thank you very much for filling in our questionnaire; if you -get some more information about the status of your problem, please come back to the -site and leave an update.</p>') %] + [% IF been_fixed == 'Unknown' %] + <p>[% loc('If you get some more information about the status of your problem, please come back to the site and leave an update.') %]</p> -[% ELSIF new_state == 'confirmed' OR (!new_state AND problem.is_open) OR (!new_state AND problem.is_closed) %] + [% ELSIF new_state == 'confirmed' OR (!new_state AND problem.is_open) OR (!new_state AND problem.is_closed) %] + [% INCLUDE 'questionnaire/completed-open.html' %] -[% INCLUDE 'questionnaire/completed-open.html' %] -[% advert_outcome = 0 %] + [% ELSIF been_fixed == 'Yes' %] + <p>[% loc('Glad to hear it’s been fixed!') %]</p> -[% ELSIF been_fixed == 'Yes' %] + [% END %] -[% loc('<p style="font-size:150%">Thank you very much for filling in our questionnaire; glad to hear it’s been fixed.</p>') %] - -[% END %] - -[% IF advert_outcome %] - [% display_crosssell_advert( problem.user.email, problem.name, 'council', problem.bodies_str ) %] -[% END %] +</div> +[% INCLUDE next_steps.html %] [% INCLUDE 'footer.html' %] diff --git a/templates/web/base/report/_council_sent_info.html b/templates/web/base/report/_council_sent_info.html index 958562dc2..4496611e0 100644 --- a/templates/web/base/report/_council_sent_info.html +++ b/templates/web/base/report/_council_sent_info.html @@ -1,5 +1,5 @@ [% IF problem.whensent || problem.can_display_external_id %] - <small class="council_sent_info"><br> + <p class="council_sent_info"> [% problem.processed_summary_string(c) %] - </small> + </p> [% END %] diff --git a/templates/web/base/report/_main.html b/templates/web/base/report/_main.html index 00b0188af..a7aafb6d0 100644 --- a/templates/web/base/report/_main.html +++ b/templates/web/base/report/_main.html @@ -52,18 +52,19 @@ </div> [% END %] - <p><em> - [% problem.meta_line(c) | html %] - [%- IF !problem.used_map AND c.cobrand.moniker != 'emptyhomes' %]; <strong>[% loc('there is no pin shown as the user did not use the map') %]</strong>[% END %] + <p class="report_meta_info"> + [% problem.meta_line(c) | html %] + [%- IF !problem.used_map AND c.cobrand.moniker != 'emptyhomes' %]; <strong>([% loc('there is no pin shown as the user did not use the map') %])</strong>[% END %] + </p> [% IF problem.bodies_str %] [% INCLUDE 'report/_council_sent_info.html' %] [% ELSE %] - <br><small>[% loc('Not reported to council') %]</small> + <p class="council_sent_info">[% loc('Not reported to council') %]</p> [% END %] [% mlog = problem.latest_moderation_log_entry(); IF mlog %] - <br /> Moderated by [% mlog.user.from_body.name %] at [% prettify_dt(mlog.whenedited) %] + <p>Moderated by [% mlog.user.from_body.name %] at [% prettify_dt(mlog.whenedited) %]</p> [% END %] - </em></p> + [% INCLUDE 'report/_support.html' %] [% INCLUDE 'report/photo.html' object=problem %] diff --git a/templates/web/base/report/display.html b/templates/web/base/report/display.html index a7181942f..0731d9f0e 100644 --- a/templates/web/base/report/display.html +++ b/templates/web/base/report/display.html @@ -31,7 +31,7 @@ [% IF c.cobrand.moniker != 'emptyhomes' %] <p style="padding-bottom: 0.5em; border-bottom: dotted 1px #999999;" align="right"> - <a href="[% c.uri_for( '/around', { lat => short_latitude, lon => short_longitude } ) %]">[% loc( 'More problems nearby' ) %]</a> + <a href="[% c.uri_for( '/around', { lat => latitude, lon => longitude } ) %]">[% loc( 'More problems nearby' ) %]</a> </p> <div id="alert_links"> diff --git a/templates/web/base/report/new/category.html b/templates/web/base/report/new/category.html index ee47adc9e..f640c548c 100644 --- a/templates/web/base/report/new/category.html +++ b/templates/web/base/report/new/category.html @@ -9,7 +9,7 @@ [%- ELSE %] [%- loc('Category') %] [%- END -%]</label> - <select name='category' id='form_category'[% ' onchange="form_category_onchange()"' IF category_extras.size %]> + <select name='category' id='form_category'> [% FOREACH cat_op IN category_options %] [% cat_op_lc = cat_op | lower %] <option value='[% cat_op | html %]'[% ' selected' IF report.category == cat_op || category == cat_op_lc || (category_options.size == 2 AND loop.last) -%] diff --git a/templates/web/base/report/new/category_extras.html b/templates/web/base/report/new/category_extras.html index 6b15cbef9..c0f6a7bae 100644 --- a/templates/web/base/report/new/category_extras.html +++ b/templates/web/base/report/new/category_extras.html @@ -1,28 +1,30 @@ <div id="category_meta"> + [%- category = report.category -%] + + [%- IF unresponsive.$category %] + [% INCLUDE "report/new/unresponsive_body.html" body_id = unresponsive.$category %] + [%- END %] + [%- IF report_meta %] - [%- category = report.category %] <h4>Additional Information</h4> [%- FOR meta IN category_extras.$category %] [%- meta_name = meta.code -%] -[% IF field_errors.$meta_name %] - <div class='form-error'>[% field_errors.$meta_name %]</div> -[% END -%] - - <div class="form-field"> - <label for="form_[% meta_name %]">[% meta.description _ ':' %]</label> - [% IF meta.variable != 'false' %] - [% IF meta.exists('values') - <select name="[% meta_name %]" id="form_[% meta_name %]"[% meta.required == 'true' ? ' required' : '' %]> - [% FOR option IN meta.values.value.value %] - <option value="[% option.key.0 %]"[% IF option.key.0 == report_meta.$meta_name.value %] selected[% END %]>[% option.name.0 %]</option> + <label for="form_[% meta_name %]">[% meta.description _ ':' %]</label> + [% IF field_errors.$meta_name %] + <p class='form-error'>[% field_errors.$meta_name %]</p> + [% END -%] + [% IF meta.variable != 'false' %] + [% IF meta.exists('values') %] + <select name="[% meta_name %]" id="form_[% meta_name %]"[% meta.required == 'true' ? ' required' : '' %]> + [% FOR option IN meta.values.value %] + <option value="[% option.key.0 %]"[% IF option.key.0 == report_meta.$meta_name.value %] selected[% END %]>[% option.name.0 %]</option> + [% END %] + </select> + [% ELSE %] + <input type="text" value="[% report_meta.$meta_name.value | html %]" name="[% meta_name %]" id="form_[% meta_name %]"[% meta.required == 'true' ? ' required' : '' %]> [% END %] - </select> - [% ELSE %] - <input type="text" value="[% report_meta.$meta_name | html %]" name="[% meta_name %]" id="form_[% meta_name %]"[% meta.required == 'true' ? ' required' : '' %]> [% END %] - [% END %] - </div> [%- END %] [%- END %] </div> diff --git a/templates/web/base/report/new/category_wrapper.html b/templates/web/base/report/new/category_wrapper.html new file mode 100644 index 000000000..f6bb618f0 --- /dev/null +++ b/templates/web/base/report/new/category_wrapper.html @@ -0,0 +1,17 @@ +[% IF js %] + <div id="form_category_row"> + <label for="form_category">[% loc('Category') %]</label> + <select name="category" id="form_category" required><option>[% loc('Loading...') %]</option></select> + </div> +[% ELSE %] + [% IF category_options.size %] + [% IF field_errors.category %] + <p class='form-error'>[% field_errors.category %]</p> + [% END %] + [% PROCESS "report/new/category.html" %] + [% END %] +[% END %] + +[%- IF category_extras %] + [% PROCESS "report/new/category_extras.html" %] +[%- END %] diff --git a/templates/web/base/report/new/councils_text.html b/templates/web/base/report/new/councils_text.html index f526beb28..65e41f0d1 100644 --- a/templates/web/base/report/new/councils_text.html +++ b/templates/web/base/report/new/councils_text.html @@ -1,5 +1,7 @@ [% FILTER collapse %] -[% IF bodies_to_list.size == 0 %] +[% IF unresponsive.ALL %] + [% PROCESS 'report/new/unresponsive_body.html' body_id = unresponsive.ALL %] +[% ELSIF bodies_to_list.size == 0 %] [% PROCESS 'report/new/councils_text_none.html' %] [% ELSIF bodies_to_list.size == bodies.size %] [% PROCESS 'report/new/councils_text_all.html' %] diff --git a/templates/web/base/report/new/councils_text_all.html b/templates/web/base/report/new/councils_text_all.html index e9a008e90..9947625a5 100644 --- a/templates/web/base/report/new/councils_text_all.html +++ b/templates/web/base/report/new/councils_text_all.html @@ -1,27 +1,10 @@ -[%# XXX The below type checking is assuming that a body ID can be used to look up a mapit type. %] <p> -[% IF bodies_to_list.0 != 2489 && bodies_to_list.0 != 2482 && all_areas.${bodies_to_list.0}.type == 'LBO' %] -[% - tprintf( - loc('All the information you provide here will be sent to <strong>%s</strong> or a relevant local body such as <strong>TfL</strong>, via the London Report-It system.'), - all_body_names.join( '</strong>' _ loc(' or ') _ '<strong>' ) - ); -%] -[% ELSIF all_areas.${bodies_to_list.0}.type == 'LGD' %] -[% - tprintf( - loc('All the information you provide here will be sent to <strong>%s</strong> or <strong>Roads Service</strong>.'), - all_body_names.join( '</strong>' _ loc(' or ') _ '<strong>' ) - ); -%] -[% ELSE %] [% tprintf( loc('All the information you provide here will be sent to <strong>%s</strong>.'), all_body_names.join( '</strong>' _ loc(' or ') _ '<strong>' ) ); %] -[% END %] [% INCLUDE 'report/new/councils_extra_text.html' %] </p> diff --git a/templates/web/base/report/new/councils_text_none.html b/templates/web/base/report/new/councils_text_none.html index 9293c03a7..684879590 100644 --- a/templates/web/base/report/new/councils_text_none.html +++ b/templates/web/base/report/new/councils_text_none.html @@ -1,28 +1,16 @@ -<p>[% +<p> +[% nget( "We do not yet have details for the council that covers this location.", "We do not yet have details for the councils that cover this location.", missing_details_bodies.size || all_areas.size ); -%] -[% loc("If you submit a problem here the subject and details of the problem will be public, but the problem will <strong>not</strong> be reported to the council."); -%] -[% IF c.cobrand.moniker == 'fixamingata' AND all_body_names.size == 1 %] -[% - tprintf( - "Du kan istället kontakta %s via <a href='%s'>deras webbsida</a>.", - all_body_names.first, all_body_urls.first); -%] -[% ELSE %] -[% tprintf( loc("You can help us by finding a contact email address for local problems for %s and emailing it to us at <a href='mailto:%s'>%s</a>."), missing_details_body_names.join( loc(' or ') ) || all_area_names.join( loc(' or ') ), c.cobrand.contact_email, c.cobrand.contact_email ); - %] -[% END %] </p> diff --git a/templates/web/base/report/new/fill_in_details.html b/templates/web/base/report/new/fill_in_details.html index 1b8a866fc..9d3f52041 100644 --- a/templates/web/base/report/new/fill_in_details.html +++ b/templates/web/base/report/new/fill_in_details.html @@ -22,8 +22,8 @@ [% END %] - <input type="hidden" name="latitude" id="fixmystreet.latitude" value="[% short_latitude | html %]"> - <input type="hidden" name="longitude" id="fixmystreet.longitude" value="[% short_longitude | html %]"> + <input type="hidden" name="latitude" id="fixmystreet.latitude" value="[% latitude | html %]"> + <input type="hidden" name="longitude" id="fixmystreet.longitude" value="[% longitude | html %]"> [% IF report.used_map %] [% map_html %] 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 cee0244c7..d1431ffd3 100644 --- a/templates/web/base/report/new/fill_in_details_form.html +++ b/templates/web/base/report/new/fill_in_details_form.html @@ -63,26 +63,7 @@ <textarea name="detail" id="form_detail" rows="7" cols="26" required>[% report.detail | html %]</textarea> </div> -[% IF js %] - <div class="form-field" id="form_category_row"> - <label for="form_category">[% loc('Category:') %]</label> - <select name="category" id="form_category" required><option>[% loc('Loading...') %]</option></select> - </div> -[% ELSE %] - [% IF category_options.size %] - [% IF field_errors.category %] - <div class='form-error'>[% field_errors.category %]</div> - [% END %] - - <div class="form-field"> - [% PROCESS "report/new/category.html" %] - </div> - [% END %] -[% END %] - -[%- IF category_extras %] -[% PROCESS "report/new/category_extras.html" %] -[%- END %] +[% PROCESS "report/new/category_wrapper.html" %] [% IF c.cobrand.allow_photo_upload %] [% IF field_errors.photo %] diff --git a/templates/web/base/report/update-form.html b/templates/web/base/report/update-form.html index 50bc2906c..4e762a9a5 100644 --- a/templates/web/base/report/update-form.html +++ b/templates/web/base/report/update-form.html @@ -37,7 +37,7 @@ </select> </div> [% ELSE %] - [% IF problem.is_fixed AND c.user_exists AND c.user.id == problem.user_id %] + [% IF problem.is_fixed AND ((c.user_exists AND c.user.id == problem.user_id) OR alert_to_reporter) %] <div class="checkbox"> <input type="checkbox" name="reopen" id="form_reopen" value="1"[% ' checked' IF update.mark_open %]> <label class="inline" for="form_reopen">[% loc('This problem has not been fixed') %]</label> diff --git a/templates/web/base/report/update.html b/templates/web/base/report/update.html index 048968eae..a5fd97870 100644 --- a/templates/web/base/report/update.html +++ b/templates/web/base/report/update.html @@ -6,17 +6,19 @@ [% INCLUDE meta_line %] </em></p></div> [% IF NOT update.whenanswered %] + + [% INCLUDE 'report/photo.html' object=update %] + <div class="update-text"> [% add_links( update.text ) | html_para %] - [% INCLUDE 'report/photo.html' object=update %] - [% IF c.cobrand.allow_update_reporting %] <p align="right"> <small><a rel="nofollow" class="unsuitable-problem" href="[% c.uri_for( '/contact', { id => update.problem_id, update_id => update.id } ) %]">[% loc('Offensive? Unsuitable? Tell us') %]</a></small> </p> [% END %] </div> + [% END %] </div> [% '</div>' IF loop.last %] diff --git a/templates/web/base/report_created.html b/templates/web/base/report_created.html deleted file mode 100644 index 81083654b..000000000 --- a/templates/web/base/report_created.html +++ /dev/null @@ -1,9 +0,0 @@ -[% INCLUDE 'header.html', title => loc('Report created') %] - -<h1>[% loc("Report created") %]</h1> - -<p> -[% loc('Your report has been created and will shortly be sent.') %] -</p> - -[% INCLUDE 'footer.html' %] diff --git a/templates/web/makemyisland/front/footer-marketing.html b/templates/web/base/reports/_list-filters.html index e69de29bb..e69de29bb 100644 --- a/templates/web/makemyisland/front/footer-marketing.html +++ b/templates/web/base/reports/_list-filters.html diff --git a/templates/web/base/reports/_problem-list.html b/templates/web/base/reports/_problem-list.html new file mode 100644 index 000000000..45746e309 --- /dev/null +++ b/templates/web/base/reports/_problem-list.html @@ -0,0 +1,19 @@ +<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/base/reports/body.html b/templates/web/base/reports/body.html index e1d1b359e..b98c5bec6 100755 --- a/templates/web/base/reports/body.html +++ b/templates/web/base/reports/body.html @@ -43,32 +43,8 @@ [% INCLUDE '_hart_hants_note.html' %] [% END %] -[% IF NOT body.areas.size AND c.cobrand.country == 'GB' %] - <p id="unknown" class="alert">This council no longer exists. - [% IF body.name.match('Penwith|Kerrier|Carrick|Restormel|Caradon|North Cornwall') %] - Its area is now covered by <a href="/reports/Cornwall">Cornwall Council</a>. - [% ELSIF body.name.match('Durham|Easington|Sedgefield|Teesdale|Wear Valley|Derwentside|Chester le Street') %] - Its area is now covered by <a href="/reports/Durham+County">Durham County Council</a>. - [% ELSIF body.name.match('Blyth Valley|Wansbeck|Castle Morpeth|Tynedale|Alnwick|Berwick upon Tweed') %] - Its area is now covered by <a href="/reports/Northumberland">Northumberland County Council</a>. - [% ELSIF body.name.match('North Shropshire|Oswestry|Shrewsbury and Atcham|South Shropshire|Bridgnorth') %] - Its area is now covered by <a href="/reports/Shropshire">Shropshire Council</a>. - [% ELSIF body.name.match('Salisbury|West Wiltshire|Kennet|North Wiltshire') %] - Its area is now covered by <a href="/reports/Wiltshire">Wiltshire Council</a>. - [% ELSIF body.name.match('Ellesmere Port and Neston|Vale Royal|Chester') %] - Its area is now covered by <a href="/reports/Cheshire+West+and+Chester">Cheshire West and Chester Council</a>. - [% ELSIF body.name.match('Macclesfield|Congleton|Crewe and Nantwich') %] - Its area is now covered by <a href="/reports/Cheshire+East">Cheshire East Council</a>. - [% ELSIF body.name.match('Mid Bedfordshire|South Bedfordshire') %] - Its area is now covered by <a href="/reports/Central+Bedfordshire">Central Bedfordshire Council</a>. - [% ELSIF body.name.match('Cheshire') %] - Its area is now covered by <a href="/reports/Cheshire+West+and+Chester">Cheshire West and Chester Council</a> or - <a href="/reports/Cheshire+East">Cheshire East Council</a>. - [% ELSIF body.name.match('Bedfordshire') %] - Its area is now covered by <a href="/reports/Bedford">Bedford Borough Council</a> or - <a href="/reports/Central+Bedfordshire">Central Bedfordshire Council</a>. - [% END %] - </p> +[% IF NOT body.areas.size AND c.cobrand.moniker == 'fixmystreet' %] + [% INCLUDE 'reports/_body_gone.html' %] [% ELSE %] [% INCLUDE 'reports/_rss.html' %] [% END %] @@ -84,28 +60,13 @@ </p> [% END %] +[% INCLUDE "reports/_list-filters.html", use_section_wrapper = 1 %] + [% INCLUDE 'pagination.html', param = 'p' %] -<section class="full-width"> - [% INCLUDE column - problems = problems.${body.id} - %] -</section> +[% INCLUDE 'reports/_problem-list.html' %] [% INCLUDE 'pagination.html', param = 'p' %] </div> [% INCLUDE 'footer.html' %] - -[% BLOCK column %] -[% IF problems %] - -<ul class="issue-list-a"> -[% FOREACH problem IN problems %] - [% INCLUDE 'reports/_list-entry.html' %] -[% END %] -</ul> - -[% END %] -[% END %] - diff --git a/templates/web/base/reports/index.html b/templates/web/base/reports/index.html index 7f8d7fbf6..4b8c27b92 100755 --- a/templates/web/base/reports/index.html +++ b/templates/web/base/reports/index.html @@ -18,11 +18,11 @@ <thead> <tr> <th class="title">[% loc('Name') %]</th> -<th class="data">[% loc('New <br>problems') %]</th> -<th class="data">[% loc('Older <br>problems') %]</th> -<th class="data">[% loc('Old / unknown <br>problems') %]</th> -<th class="data">[% loc('Recently <br>fixed') %]</th> -<th class="data">[% loc('Older <br>fixed') %]</th> +<th title="[% loc('Reported within the last four weeks') %]" class="data">[% loc('New <br>problems') %]</th> +<th title="[% loc('Open for more than four weeks, with an update within the past eight weeks') %]" class="data">[% loc('Older <br>problems') %]</th> +<th title="[% loc('Open, but not had any update in eight weeks') %]" class="data">[% loc('Old / unknown <br>problems') %]</th> +<th title="[% loc('Marked fixed/closed in the past eight weeks') %]" class="data">[% loc('Recently <br>fixed') %]</th> +<th title="[% loc('Marked fixed/closed more than eight weeks ago') %]" class="data">[% loc('Older <br>fixed') %]</th> </tr> </thead> @@ -44,4 +44,11 @@ </tbody> </table> +<script type="text/javascript" src="[% version('/js/jquery.fixedthead.js') %]"></script> +<script type="text/javascript"> +$(function(){ + $('.nicetable thead').fixedThead(); +}); +</script> + [% INCLUDE 'footer.html', pagefooter = 'yes' %] diff --git a/templates/web/base/tokens/confirm_alert.html b/templates/web/base/tokens/confirm_alert.html index a33f7e92a..f0ad12ff8 100644 --- a/templates/web/base/tokens/confirm_alert.html +++ b/templates/web/base/tokens/confirm_alert.html @@ -1,20 +1,19 @@ [% INCLUDE 'header.html', bodyclass = 'fullwidthpage', title => loc('Local RSS feeds and email alerts') %] <div class="confirmation-header"> - <h1>[% loc('Local RSS feeds and email alerts') %]</h1> -<p> -[% IF confirm_type == 'subscribe' %] - [% loc('You have successfully confirmed your alert.') %] -[% ELSIF confirm_type == 'unsubscribe' %] - [% loc('You have successfully deleted your alert.') %] -[% ELSIF confirm_type == 'created' %] - [% loc('You have successfully created your alert.') %] -[% END %] -</p> + [% IF confirm_type == 'subscribe' || confirm_type == 'created' %] + <h1>[% loc('Email alert created') %]</h1> + <p>[% loc('Why stop there? <a href="/alert">Set up more alerts</a> for free.') %]</p> + + [% ELSIF confirm_type == 'unsubscribe' %] + <h1>[% loc('Email alert deleted') %]</h1> + <p>[% loc('Inbox zero, here we come!') %]</p> + + [% END %] </div> -[% display_crosssell_advert( alert.user.email, alert.user.name ) %] +[% INCLUDE next_steps.html %] [% INCLUDE 'footer.html' %] diff --git a/templates/web/base/tokens/confirm_problem.html b/templates/web/base/tokens/confirm_problem.html index 217fb0a72..5892d0f9e 100644 --- a/templates/web/base/tokens/confirm_problem.html +++ b/templates/web/base/tokens/confirm_problem.html @@ -1,38 +1,30 @@ [% INCLUDE 'header.html', bodyclass = 'fullwidthpage', title = loc('Confirmation') %] <div class="confirmation-header"> - <h1>[% loc('Your problem has been confirmed!') %]</h1> -[% IF c.cobrand.is_council %] + <h1><a href="[% c.cobrand.base_url_for_report( report ) %][% report.url %]">[% report.title %]</a></h1> - <p> - Thank you. You have successfully confirmed your report - and this will now be investigated by the council. - You can <a href="[% c.cobrand.base_url_for_report( problem ) %][% problem.url %]">view the problem on this site</a>. - </p> - <p>Your reference for this problem is [% problem.id %], please quote it in any enquiries.</p> + [% IF c.cobrand.is_council %] + <h2>Your issue is on its way to the council.</h2> + <p>Your reference for this report is [% report.id %], please quote it in any enquiries.</p> -[% ELSE %] + [% ELSE %] + <h2>[% loc('Thank you for reporting this issue!') %]</h2> + [% IF report.bodies_str %] + <p>[% loc('It’s on its way to the council right now.') %]</p> + [% END %] - <p> - [% loc('Thank you for reporting this issue') %]. - [% IF problem.bodies_str; - loc('<strong>We will now send it to the council</strong>.'); - END; %] - </p> + [% END %] - <p> - [% tprintf( - loc( 'You can <a href="%s%s">view the problem on this site</a>.' ), - c.cobrand.base_url_for_report( problem ), - problem.url - ); %] - </p> - -[% END %] +[% TRY %][% INCLUDE 'tokens/_extras_confirm.html' %][% CATCH file %][% END %] </div> -[% display_crosssell_advert( problem.user.email, problem.name ) %] +[% INCLUDE + next_steps.html, + just_interacted = 1, + share_url = c.cobrand.base_url_for_report(report) _ report.url, + twitter_comment = loc('I just reported a problem on @fixmystreet') +%] [% INCLUDE 'footer.html' %] diff --git a/templates/web/base/tokens/confirm_update.html b/templates/web/base/tokens/confirm_update.html index 21fcfc4ff..01ac992ab 100644 --- a/templates/web/base/tokens/confirm_update.html +++ b/templates/web/base/tokens/confirm_update.html @@ -1,24 +1,26 @@ -[% INCLUDE 'header.html', bodyclass = 'fullwidthpage', title => loc('Confirmation') %] +[% INCLUDE 'header.html', bodyclass = 'fullwidthpage', title = loc('Confirmation'); -<div class="confirmation-header"> - <h1>[% loc('Your update has been confirmed!') %]</h1> +DEFAULT problem = update.problem; +SET problem_url = c.uri_for('/report', problem.id); +IF update; + problem_url = problem_url _ '#update_' _ update.id; +END; -<p class="confirmed"> -[% IF creator_fixed %] -[% - tprintf(loc('Thank you — you can <a href="%s">view your updated problem</a> on the site.'), - c.uri_for( '/report', problem_id ) ); -%] -[% ELSE %] -[% - tprintf( loc('You have successfully confirmed your update and you can now <a href="%s">view it on the site</a>.'), - c.uri_for( '/report', update.problem.id ) _ '#update_' _ update.id ); %] -[% END %] -</p> + +<div class="confirmation-header"> + + <h1><a href="[% problem_url %]">[% problem.title %]</a></h1> + + <h2>[% loc('Thank you for updating this issue!') %]</h2> </div> -[% display_crosssell_advert( update.user.email, update.name ) %] +[% INCLUDE + next_steps.html, + just_interacted = 1, + share_url = c.cobrand.base_url_for_report(problem) _ problem.url, + twitter_comment = loc('I just updated a problem on @fixmystreet') +%] [% INCLUDE 'footer.html' %] diff --git a/templates/web/bromley/front/pre-steps.html b/templates/web/bromley/front/pre-steps.html new file mode 100644 index 000000000..a5523c862 --- /dev/null +++ b/templates/web/bromley/front/pre-steps.html @@ -0,0 +1,5 @@ +<p>This is primarily for reporting physical problems that can be fixed +like graffiti, cleansing issues or road defects. To report other +kinds of problems like missed bins use our +<a href="http://www.bromley.gov.uk/report">online report it forms</a>. +</p> diff --git a/templates/web/bromley/header.html b/templates/web/bromley/header.html index 4f885f513..9559592ff 100644 --- a/templates/web/bromley/header.html +++ b/templates/web/bromley/header.html @@ -40,6 +40,8 @@ <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) %] diff --git a/templates/web/bromley/report/display.html b/templates/web/bromley/report/display.html index f30b4b86d..75b7700a5 100644 --- a/templates/web/bromley/report/display.html +++ b/templates/web/bromley/report/display.html @@ -25,7 +25,7 @@ <ul id="key-tools"> <li><a rel="nofollow" id="key-tool-report-abuse" class="abuse" href="[% c.uri_for( '/contact', { id => problem.id } ) %]">[% loc('Report abuse') %]</a></li> <li><a rel="nofollow" id="key-tool-report-updates" class="feed" href="[% c.uri_for( '/alert/subscribe', { id => problem.id } ) %]">[% loc('Get updates' ) %]</a></li> - <li><a class="chevron" id="key-tool-problems-nearby" href="[% c.uri_for( '/around', { lat => short_latitude, lon => short_longitude } ) %]">[% loc( 'Problems nearby' ) %]</a></li> + <li><a class="chevron" id="key-tool-problems-nearby" href="[% c.uri_for( '/around', { lat => latitude, lon => longitude } ) %]">[% loc( 'Problems nearby' ) %]</a></li> </ul> <div id="report-updates-data" class="hidden-js"> diff --git a/templates/web/bromley/report/new/fill_in_details_form.html b/templates/web/bromley/report/new/fill_in_details_form.html index e5c920eae..6bf077322 100644 --- a/templates/web/bromley/report/new/fill_in_details_form.html +++ b/templates/web/bromley/report/new/fill_in_details_form.html @@ -60,24 +60,7 @@ [% END %] <textarea rows="7" cols="26" name="detail" id="form_detail" placeholder="[% loc('Please describe the exact location of the report. Example: “2 dumped mattresses outside Number 19 Stockwell Close”') %]" required>[% report.detail | html %]</textarea> - [% IF js %] - <div id="form_category_row"> - <label for="form_category">[% loc('Category') %]</label> - <select name="category" id="form_category" required><option>[% loc('Loading...') %]</option></select> - </div> - [% ELSE %] - [% IF category_options.size %] - [% IF field_errors.category %] - <p class='form-error'>[% field_errors.category %]</p> - [% END %] - - [% PROCESS "report/new/category.html" %] - [% END %] - [% END %] - - [%- IF category_extras %] - [% PROCESS "report/new/category_extras.html" %] - [%- END %] + [% PROCESS "report/new/category_wrapper.html" %] [% IF c.cobrand.allow_photo_upload %] [% IF field_errors.photo %] diff --git a/templates/web/eastsussex/report/new/category.html b/templates/web/eastsussex/report/new/category.html index 1759f450f..e4a7ed456 100644 --- a/templates/web/eastsussex/report/new/category.html +++ b/templates/web/eastsussex/report/new/category.html @@ -6,7 +6,7 @@ <label for='form_category' id="form_category_label"> Type </label> - <select name='category' id='form_category'[% ' onchange="form_category_onchange()"' IF category_extras.size %]> + <select name='category' id='form_category'> [% FOREACH cat_op IN category_options %] [% cat_op_lc = cat_op | lower %] [% IF loop.first; cat_op = '-- Pick a type --'; END %] diff --git a/templates/web/eastsussex/report/update-form.html b/templates/web/eastsussex/report/update-form.html index e4314b81d..af966f417 100644 --- a/templates/web/eastsussex/report/update-form.html +++ b/templates/web/eastsussex/report/update-form.html @@ -82,7 +82,7 @@ [% END %] </select> [% ELSE %] - [% IF problem.is_fixed AND c.user_exists AND c.user.id == problem.user_id %] + [% IF problem.is_fixed AND ((c.user_exists AND c.user.id == problem.user_id) OR alert_to_reporter) %] <input type="checkbox" name="reopen" id="form_reopen" value="1"[% ' checked' IF update.mark_open %]> <label class="inline" for="form_reopen">[% loc('This problem has not been fixed') %]</label> diff --git a/templates/web/emptyhomes/report/new/fill_in_details_form.html b/templates/web/emptyhomes/report/new/fill_in_details_form.html index e6ddd56a0..20b0b6842 100644 --- a/templates/web/emptyhomes/report/new/fill_in_details_form.html +++ b/templates/web/emptyhomes/report/new/fill_in_details_form.html @@ -45,22 +45,7 @@ <p>[% loc('Please do not give address or personal information in this section.') %]</p> -[% IF js %] - <div class="form-field" id="form_category_row"> - <label for="form_category">[% loc('Category:') %]</label> - <select name="category" id="form_category" required><option>[% loc('Loading...') %]</option></select> - </div> -[% ELSE %] - [% IF category_options.size %] - [% IF field_errors.category %] - <div class='form-error'>[% field_errors.category %]</div> - [% END %] - - <div class="form-field"> - [% PROCESS "report/new/category.html" %] - </div> - [% END %] -[% END %] +[% PROCESS "report/new/category_wrapper.html" %] [% IF field_errors.title %] <div class='form-error'>[% field_errors.title %]</div> diff --git a/templates/web/emptyhomes/tokens/confirm_problem.html b/templates/web/emptyhomes/tokens/confirm_problem.html index 5e77ca59f..a8a025058 100644 --- a/templates/web/emptyhomes/tokens/confirm_problem.html +++ b/templates/web/emptyhomes/tokens/confirm_problem.html @@ -2,7 +2,7 @@ <h1>[% loc('Confirmation') %]</h1> -[% IF problem.bodies_str %] +[% IF report.bodies_str %] <p>[% loc( 'Thank you for reporting an empty property on ReportEmptyHomes.com. We have emailed the lead officer for empty homes in the council responsible with details, and asked them to do whatever they can to get the empty property back into use as soon as possible.' @@ -36,7 +36,7 @@ as possible will be covered.') [% END %] <p> - <a href="[% c.uri_for( '/report', problem.id ) | html %]">[% loc('View your report') %]</a>. + <a href="[% c.uri_for( '/report', report.id ) | html %]">[% loc('View your report') %]</a>. </p> [% INCLUDE 'footer.html' %] diff --git a/templates/web/fiksgatami/footer.html b/templates/web/fiksgatami/footer.html index bd0921e0b..e9fbeb716 100644 --- a/templates/web/fiksgatami/footer.html +++ b/templates/web/fiksgatami/footer.html @@ -1,5 +1,5 @@ [% IF pagefooter %] - <footer role="content-info"> + <footer role="contentinfo"> [% INCLUDE 'front/footer-marketing.html' %] </footer> [% END %] diff --git a/templates/web/fiksgatami/nn/footer.html b/templates/web/fiksgatami/nn/footer.html index 3d17e37fb..cfef66bc9 100644 --- a/templates/web/fiksgatami/nn/footer.html +++ b/templates/web/fiksgatami/nn/footer.html @@ -1,5 +1,5 @@ [% IF pagefooter %] - <footer role="content-info"> + <footer role="contentinfo"> [% INCLUDE 'front/footer-marketing.html' %] </footer> [% END %] diff --git a/templates/web/fiksgatami/questionnaire/completed-open.html b/templates/web/fiksgatami/questionnaire/completed-open.html deleted file mode 100644 index 72fa507b2..000000000 --- a/templates/web/fiksgatami/questionnaire/completed-open.html +++ /dev/null @@ -1,6 +0,0 @@ -[% loc('<p style="font-size:150%">We’re sorry to hear that. We have two -suggestions: why not try <a href="http://www.norge.no/styresmakter/">writing -direct to your councillor(s)</a> or, if it’s a problem that could be -fixed by local people working together, why not -<a href="http://www.pledgebank.com/new">make and publicise a pledge</a>? -</p>') %] diff --git a/templates/web/fixamingata/faq/faq-sv.html b/templates/web/fixamingata/faq/faq-sv.html index c21b3b45a..05ffdaddc 100755 --- a/templates/web/fixamingata/faq/faq-sv.html +++ b/templates/web/fixamingata/faq/faq-sv.html @@ -31,7 +31,7 @@ till exempel: <ul><li>Övergivna bilar och cyklar <li>Graffiti - <li>Netskräpning + <li>Nedskräpning <li>Gatustädning, exempelvis trasigt glas på en cykelbana <li>Trasiga gatulysen <li>Hål i vägar och gångbanor diff --git a/templates/web/fixamingata/footer.html b/templates/web/fixamingata/footer.html index 697248b82..c6f49cb79 100644 --- a/templates/web/fixamingata/footer.html +++ b/templates/web/fixamingata/footer.html @@ -1,26 +1,6 @@ [% IF pagefooter %] - <footer role="content-info"> - <div class="tablewrapper bordered"> - <div id="footer-mobileapps"> - </div> - <div id="footer-help"> - - <ul> - <li> - <h4>Sekretess och kakor</h4> - <p>Vill du veta mer om det juridiska? Läs vår information <a href="/privacy">om sekretess och kakor</a></p> - </li> - <li> - <h4>[% loc('Are you a developer?') %]</h4> - <p>[% loc('Would you like to contribute to FixMyStreet? Our code is open source and <a href="http://github.com/mysociety/fixmystreet">available on GitHub</a>.') %]</p> - </li> - <li> - <h4>[% loc('Are you from a council?') %]</h4> - <p>Vill du veta mer om FixaMinGata eller hur det kan fungera för er kommun? <a href="/kommun">Läs mer om FixaMinGata för kommuner</a>.</p> - </li> - </ul> - </div> - </div> + <footer role="contentinfo"> + [% INCLUDE 'front/footer-marketing.html' %] </footer> [% END %] </div><!-- .content role=main --> diff --git a/templates/web/fixamingata/front/footer-marketing.html b/templates/web/fixamingata/front/footer-marketing.html new file mode 100644 index 000000000..bc82aa5f1 --- /dev/null +++ b/templates/web/fixamingata/front/footer-marketing.html @@ -0,0 +1,26 @@ + <div class="tablewrapper bordered"> + <div id="footer-mobileapps"> + <!-- + <h4></h4> + <p> + </p> + --> + </div> + + <div id="footer-help"> + <ul> + <li> + <h4>Sekretess och kakor</h4> + <p>Vill du veta mer om det juridiska? Läs vår information <a href="/privacy">om sekretess och kakor</a></p> + </li> + <li> + <h4>[% loc('Are you a developer?') %]</h4> + <p>[% loc('Would you like to contribute to FixMyStreet? Our code is open source and <a href="http://fixmystreet.org">available at fixmystreet.org</a>.') %]</p> + </li> + <li> + <h4>Är du anställd i en kommun?</h4> + <p>Vill du veta mer om FixaMinGata eller hur det kan fungera för er kommun? <a href="/kommun">Läs mer om FixaMinGata för kommuner</a>.</p> + </li> + </ul> + </div> + </div> diff --git a/templates/web/fixamingata/front/recent.html b/templates/web/fixamingata/front/recent.html index 04873f144..bfe35832e 100644 --- a/templates/web/fixamingata/front/recent.html +++ b/templates/web/fixamingata/front/recent.html @@ -13,6 +13,7 @@ }(document, 'script', 'facebook-jssdk'));</script> <link rel="canonical" href="https://plus.google.com/105025269316032228481" /> <div style="height: 50px; position: relative;"><div class="fb-like" data-href="https://www.facebook.com/fixamingata" data-layout="button_count" data-action="like" data-show-faces="true" data-share="true" style="float: left;"></div> <script type="text/javascript" src="https://apis.google.com/js/plusone.js"></script><div style="float: left; padding-left: 20px; padding-top: 2px;"><g:plusone></g:plusone></div></div> + <div style="padding-bottom: 14px;"><a href="https://play.google.com/store/apps/details?id=se.sambruk.fixamingata"><img alt="FixaMin Gata på Google Play" style="height: 45px; width: 129px;" src="/cobrands/fixmystreet/images/google_play_logo.png" /></a></div> [% IF recent_photos.size %] <h2> [% loc('Recently reported problems') %] diff --git a/templates/web/fixamingata/front/tips.html b/templates/web/fixamingata/front/tips.html index 6b423ed5e..fd309708f 100644 --- a/templates/web/fixamingata/front/tips.html +++ b/templates/web/fixamingata/front/tips.html @@ -1 +1 @@ -<div style="height: 329px; padding-top: 20px;"><div style="position: absolute; width: 581px;"><iframe width="581" height="329" src="//www.youtube.com/embed/H5knzdalYI0" frameborder="0" allowfullscreen></iframe></div></div> +<div style="height: 329px; padding-top: 20px;"><iframe width="100%" height="329" src="//www.youtube.com/embed/H5knzdalYI0" frameborder="0" allowfullscreen></iframe></div> diff --git a/templates/web/fixamingata/report/new/councils_text_none.html b/templates/web/fixamingata/report/new/councils_text_none.html new file mode 100644 index 000000000..cdad54f18 --- /dev/null +++ b/templates/web/fixamingata/report/new/councils_text_none.html @@ -0,0 +1,22 @@ +<p> +[% IF all_body_names.size == 1 %] +[% + tprintf( + "%s har valt att inte ta emot rapporter från FixaMinGata, utan hänvisar fel- & synpunktsrapportering till <a href='%s'>kommunens egen webbplats</a>.", + all_body_names.first, all_body_urls.first); +%] +[% END %] +[% + loc("If you submit a problem here the subject and details of the problem will be public, but the problem will <strong>not</strong> be reported to the council."); +%] +[% IF all_body_names.size != 1 %] +[% + tprintf( + loc("You can help us by finding a contact email address for local problems for %s and emailing it to us at <a href='mailto:%s'>%s</a>."), + missing_details_body_names.join( loc(' or ') ) || all_area_names.join( loc(' or ') ), + c.cobrand.contact_email, + c.cobrand.contact_email + ); +%] +[% END %] +</p> diff --git a/templates/web/fixamingata/report/new/fill_in_details_form.html b/templates/web/fixamingata/report/new/fill_in_details_form.html deleted file mode 100644 index 63c4e8788..000000000 --- a/templates/web/fixamingata/report/new/fill_in_details_form.html +++ /dev/null @@ -1,217 +0,0 @@ -<div id="report-a-problem-main"> - <h1>[% loc('Report your problem') %]</h1> - - [% IF report.used_map %] - <p class="change_location">[% loc('Wrong location? Just click again on the map.') %]</p> - [% END %] - - [% IF js %] - <p id="councils_text"> - [% - tprintf( - loc('All the information you provide here will be sent to <strong>%s</strong>.'), - loc('the local council') - ); - %] - [% loc('The subject and details of the problem will be public, plus your name if you give us permission.') %] - </p> - [% ELSE %] - [% PROCESS 'report/new/councils_text.html' %] - [% END %] - - <div id="report-a-problem-sidebar"> - <div class="sidebar-tips"> - [% IF report.used_map %] - [% IF partial_token %] - <p id="unknown">[% loc('Please note your report has <strong>not yet been sent</strong>. Choose a category and add further information below, then submit.') %]</p> - [% END %] - [% END %] - - <p> - [% IF report.used_map %] - [% INCLUDE 'report/new/fill_in_details_text.html' %] - [% ELSE %] - [% loc('Please fill in the form below with details of the problem, and describe the location as precisely as possible in the details box.') %] - [% END %] - </p> - </div> - - <div class="sidebar-notes"> - [% INCLUDE 'report/new/notes.html' %] - </div> - - </div> - - [% INCLUDE 'errors.html' %] - <fieldset> - <div id="problem_form"> - - [% INCLUDE 'report/new/form_heading.html' %] - - - [% IF field_errors.council %] - <p class='form-error'>[% field_errors.council %]</p> - [% END %] - - - - <label for="form_title">[% loc('Subject') %]</label> - [% IF field_errors.title %] - <p class='form-error'>[% field_errors.title %]</p> - [% END %] - <input type="text" value="[% report.title | html %]" name="title" id="form_title" placeholder="[% loc('Provide a title') %]" required> - - <label for="form_detail">[% loc('Details') %]</label> - [% IF field_errors.detail %] - <p class='form-error'>[% field_errors.detail %]</p> - [% END %] - <textarea rows="7" cols="26" name="detail" id="form_detail" placeholder="[% loc('Please fill in details of the problem.') %]" required>[% report.detail | html %]</textarea> - - [% IF js %] - <div id="form_category_row"> - <label for="form_category">[% loc('Category') %]</label> - <select name="category" id="form_category" required><option>[% loc('Loading...') %]</option></select> - </div> - [% ELSE %] - [% IF category_options.size %] - [% IF field_errors.category %] - <p class='form-error'>[% field_errors.category %]</p> - [% END %] - - [% PROCESS "report/new/category.html" %] - [% END %] - [% END %] - - [%- IF category_extras %] - [% PROCESS "report/new/category_extras.html" %] - [%- END %] - - [% IF c.cobrand.allow_photo_upload %] - [% IF field_errors.photo %] - <p class='form-error'>[% field_errors.photo %]</p> - [% END %] - - - [% 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> - - [% IF report.photo %] - <img align="right" src="/photo/[% report.id %].jpeg"> - [% END %] - [% END %] - - <label for="form_photo">[% loc('Photo') %]</label> - <input type="file" name="photo" id="form_photo"> - [% END %] - - [% IF c.user_exists %] - <div class="form-box"> - - [% INCLUDE 'report/new/extra_name.html' %] - - <label for="form_name">[% loc('Name') %]</label> - [% IF field_errors.name %] - <p class='form-error'>[% field_errors.name %]</p> - [% END %] - <input type="text" class="validName" value="[% report.name | html %]" name="name" id="form_name" placeholder="[% loc('Your name') %]"> - - [%# if there is nothing in the name field then set check box as default on form %] - <div class="checkbox-group"> - <input type="checkbox" name="may_show_name" id="form_may_show_name" value="1"[% ' checked' IF !report.anonymous %]> - <label class="inline" for="form_may_show_name">[% loc('Show my name publicly') %]</label> - </div> - - <label for="form_phone">[% loc('Phone number (optional)') %]</label> - <input class="" type="text" value="[% report.user.phone | html %]" name="phone" id="form_phone" placeholder="[% loc('Your phone number') %]"> - - <div class="general-notes"> - <p>[% loc('We never show your email address or phone number.') %]</p> - </div> - - <div class="form-txt-submit-box"> - <input class="green-btn" type="submit" id="submit_register" name="submit_register" value="[% loc('Submit') %]"> - </div> - </div> - [% ELSE %] - - <label for="form_email">[% loc('Your email') %]</label> - [% IF field_errors.email %] - <p class='form-error'>[% field_errors.email %]</p> - [% END %] - <input type="email" value="[% report.user.email | html %]" name="email" id="form_email" placeholder="[% loc('Please enter your email address') %]" required> - - <div id="form_sign_in"> - <h3>[% loc("Now to submit your report…") %]</h3> - - <div id="form_sign_in_no" class="form-box"> - <h5>Om du inte har ett lösenord fyller du i ditt namn och eventuellt telefonnummer och nytt lösenord (valfria) här. När du skickar din rapport får du epost med en länk som du måste klicka på för att bekräfta rapporten. Om du redan har ett lösenord fyller du i detta längre ner på sidan och behöver då inte bekräfta rapporten.</h5> - - [% INCLUDE 'report/new/extra_name.html' %] - - <label for="form_name">[% loc('Name') %]</label> - [% IF field_errors.name %] - <p class='form-error'>[% field_errors.name %]</p> - [% END %] - - <input type="text" class="form-focus-trigger validName" value="[% report.name | html %]" name="name" id="form_name" placeholder="[% loc('Your name') %]"> - - [%# if there is nothing in the name field then set check box as default on form %] - <div class="checkbox-group"> - <input type="checkbox" name="may_show_name" id="form_may_show_name" value="1"[% ' checked' IF !report.anonymous %]> - <label class="inline" for="form_may_show_name">[% loc('Show my name publicly') %]</label> - </div> - - <label for="form_phone">[% loc('Phone number (optional)') %]</label> - <input type="text" value="[% report.user.phone | html %]" name="phone" id="form_phone" placeholder="[% loc('Your phone number') %]"> - - <div class="general-notes form-focus-hidden"> - <p>[% loc('We never show your email address or phone number.') %]</p> - </div> - - <label for="password_register">[% loc('Password (optional)') %]</label> - - <div class="general-notes form-focus-hidden"> - <p>[% loc('Providing a 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" id="submit_register" name="submit_register" value="[% loc('Submit') %]"> - </div> - </div> - <div id="form_sign_in_yes" class="form-box"> - - <h5>Jag har ett lösenord sedan tidigare:</h5> - - <label class="hidden-js n" for="password_sign_in">[% loc('Yes I have a password') %]</label> - <div class="form-txt-submit-box"> - [% IF field_errors.password %] - <p class='form-error'>[% field_errors.password %]</p> - [% END %] - <input type="password" name="password_sign_in" id="password_sign_in" placeholder="[% loc('Your password') %]" value=""> - <input class="green-btn" type="submit" id="submit_sign_in" name="submit_sign_in" value="[% loc('Submit') %]"> - </div> - - <div class="checkbox-group"> - <input type="checkbox" id="remember_me" name="remember_me" value='1'[% ' checked' IF remember_me %]> - <label class="n inline" for="remember_me">[% loc('Keep me signed in on this computer') %]</label> - </div> - </div> - - </div> - - [% END %] - </div> - </fieldset> - - [% IF partial_token %] - <input type="hidden" name="partial" value="[% partial_token.token %]"> - [% END %] - - <input type="hidden" name="submit_problem" value="1"> -</div> diff --git a/templates/web/fixamingata/report/new/form_user_loggedout.html b/templates/web/fixamingata/report/new/form_user_loggedout.html new file mode 100644 index 000000000..36e7d95f4 --- /dev/null +++ b/templates/web/fixamingata/report/new/form_user_loggedout.html @@ -0,0 +1,66 @@ +<label for="form_email">[% loc('Your email') %]</label> +[% IF field_errors.email %] + <p class='form-error'>[% field_errors.email %]</p> +[% END %] +<input type="email" value="[% report.user.email | html %]" name="email" id="form_email" placeholder="[% loc('Please enter your email address') %]" required> + +<div id="form_sign_in"> + <h3>[% loc("Now to submit your report…") %]</h3> + + <div id="form_sign_in_no" class="form-box"> + <h5>Om du inte har ett lösenord fyller du i ditt namn och eventuellt telefonnummer och nytt lösenord (valfria) här. När du skickar din rapport får du epost med en länk som du måste klicka på för att bekräfta rapporten. Om du redan har ett lösenord fyller du i detta längre ner på sidan och behöver då inte bekräfta rapporten.</h5> + + [% INCLUDE 'report/new/extra_name.html' %] + + [% name_public = report.anonymous==0 OR (c.cobrand.default_show_name AND report.anonymous=='') %] + <label for="form_name">[% loc('Name') %]</label> + [% IF field_errors.name %] + <p class='form-error'>[% field_errors.name %]</p> + [% END %] + + <input type="text" class="form-focus-trigger validName" value="[% report.name | html %]" name="name" id="form_name" placeholder="[% loc('Your name') %]"> + + [%# if there is nothing in the name field then set check box as default on form %] + <div class="checkbox-group"> + <input type="checkbox" name="may_show_name" id="form_may_show_name" value="1"[% ' checked' IF name_public %]> + <label class="inline" for="form_may_show_name">[% loc('Show my name publicly') %]</label> + </div> + + <label for="form_phone">[% loc('Phone number (optional)') %]</label> + <input type="text" value="[% report.user.phone | html %]" name="phone" id="form_phone" placeholder="[% loc('Your phone number') %]"> + + <div class="general-notes form-focus-hidden"> + <p>[% loc('We never show your email address or phone number.') %]</p> + </div> + + <label for="password_register">[% loc('Password (optional)') %]</label> + + <div class="general-notes form-focus-hidden"> + <p>[% loc('Providing a 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" id="submit_register" name="submit_register" value="[% loc('Submit') %]"> + </div> + </div> + <div id="form_sign_in_yes" class="form-box"> + + <h5>Jag har ett lösenord sedan tidigare:</h5> + + <label class="hidden-js n" for="password_sign_in">[% loc('Yes I have a password') %]</label> + <div class="form-txt-submit-box"> + [% IF field_errors.password %] + <p class='form-error'>[% field_errors.password %]</p> + [% END %] + <input type="password" name="password_sign_in" id="password_sign_in" placeholder="[% loc('Your password') %]" value=""> + <input class="green-btn" type="submit" id="submit_sign_in" name="submit_sign_in" value="[% loc('Submit') %]"> + </div> + + <div class="checkbox-group"> + <input type="checkbox" id="remember_me" name="remember_me" value='1'[% ' checked' IF remember_me %]> + <label class="n inline" for="remember_me">[% loc('Keep me signed in on this computer') %]</label> + </div> + </div> + +</div> diff --git a/templates/web/fixamingata/report/new/inline-tips.html b/templates/web/fixamingata/report/new/inline-tips.html new file mode 100644 index 000000000..90bb4f975 --- /dev/null +++ b/templates/web/fixamingata/report/new/inline-tips.html @@ -0,0 +1,12 @@ +<div class="description_tips"> + <h4>Tips för bra rapporter:</h4> + <ul class="do"> + <li>Var trevlig</li> + <li>Ange platser noggrant</li> + <li>Skriv hur gammalt problemet är</li> + </ul> + <ul class="dont"> + <li>Använd inte FixaMinGata för rena synpunkter och förslag</li> + <li>Inkludera inte privata kontaktdetaljer i beskrivningen</li> + </ul> +</div> diff --git a/templates/web/fixamingata/static/council.html b/templates/web/fixamingata/static/council.html index ffa302691..8d968f695 100755 --- a/templates/web/fixamingata/static/council.html +++ b/templates/web/fixamingata/static/council.html @@ -59,7 +59,7 @@ Vaggeryd, Vetlanda och Värnamo. <p> <ul> <li>FixaMinGata använder - <a href="http://www.openstreetmap.org/">Open Street Map</a> för sin + <a href="http://www.openstreetmap.org/">OpenStreetMap</a> för sin kartinformation. Verifiera så att de kartor som finns för kommunen är relevanta. Om det finns fel i kartinformationen går detta att korrigera, av kommunen själva eller i samarbete med invånarna.</li> diff --git a/templates/web/fixmindelo/footer.html b/templates/web/fixmindelo/footer.html index 0af813439..e11b81827 100644 --- a/templates/web/fixmindelo/footer.html +++ b/templates/web/fixmindelo/footer.html @@ -1,5 +1,5 @@ [% IF pagefooter %] - <footer role="content-info"> + <footer role="contentinfo"> <div id="footer-help"> <ul> <li> diff --git a/templates/web/fixmybarangay/alert/index.html b/templates/web/fixmybarangay/alert/index.html index 58c4080e8..c168fa41b 100644 --- a/templates/web/fixmybarangay/alert/index.html +++ b/templates/web/fixmybarangay/alert/index.html @@ -27,7 +27,7 @@ FixMyBarangay has a RSS feeds and email alerts for local problems. <form id="alerts" name="alerts" method="post" action="/alert/subscribe"> [% IF photos.size %] -<div class="sticky-sidebar" id="alert_recent"> +<div id="alert_recent"> <aside> <h2>[% loc('Some photos of recent reports') %]</h2> [% FOREACH p IN photos; diff --git a/templates/web/fixmystreet-uk-councils/header_extra.html b/templates/web/fixmystreet-uk-councils/header_extra.html new file mode 100644 index 000000000..9e614f177 --- /dev/null +++ b/templates/web/fixmystreet-uk-councils/header_extra.html @@ -0,0 +1 @@ +<script src="[% start %][% version('/cobrands/fixmystreet-uk-councils/js.js') %]"></script> diff --git a/templates/web/fixmystreet-uk-councils/static/privacy.html b/templates/web/fixmystreet-uk-councils/static/privacy.html index addce1e2d..ba1745978 100644 --- a/templates/web/fixmystreet-uk-councils/static/privacy.html +++ b/templates/web/fixmystreet-uk-councils/static/privacy.html @@ -32,9 +32,7 @@ other companies, you can adjust your usage or install opt-out browser plugins. <dt>Who gets to see my email address?</dt> <dd>If you submit a problem, we pass on your details, and details of the problem, to the council contact or contacts responsible for the area where -you located the problem, or other relevant body (for example, in most of London -we send reports via the central London Report-It service, who may also publish -the public details of your report). Other than the council, who obviously get +you located the problem, or other relevant body. Other than the council, who obviously get your email address, only people we authorise to view the FixMyStreet administration interface will be able to see your email address and they will never use it for anything other than to help administer FixMyStreet. Similarly diff --git a/templates/web/fixmystreet.com/faq/faq-en-gb.html b/templates/web/fixmystreet.com/faq/faq-en-gb.html index 92991fb0a..c295fd430 100755 --- a/templates/web/fixmystreet.com/faq/faq-en-gb.html +++ b/templates/web/fixmystreet.com/faq/faq-en-gb.html @@ -89,7 +89,8 @@ like graffiti, dog fouling, potholes or street lights that don't work. <dd> <p><strong>Urgent issues:</strong> For problems that might put people in immediate danger, like gas leaks or falling trees, please contact your council -directly – by phone if possible. +or the appropriate utility company or emergency service directly – by phone if +possible. <p>We often route problem reports via cleansing services or highways maintenance departments, so using FixMyStreet for urgent matters may result in a delay in your report getting to the right department. @@ -261,8 +262,8 @@ category for your report. If your problem is very near a council boundary, it is easy to place the pin on the wrong side of it by mistake. Similarly, choosing the wrong category can mean that your report is sent to one council when it should have gone to another. -<p>At the moment, FixMyStreet does not send reports to the Highways Agency -(except within London), but we are working on that. +<p>At the moment, FixMyStreet does not send reports to the Highways Agency, +but we are working on that. <p>If the above two paragraphs do not apply, please <a href="/contact">drop us a line</a> and we'll try to get to the bottom of why your report has been misrouted. Please include the URL (web address) of your FixMyStreet report. diff --git a/templates/web/fixmystreet.com/footer-nav.html b/templates/web/fixmystreet.com/footer-nav.html index 1732acf00..c85d1ea1e 100644 --- a/templates/web/fixmystreet.com/footer-nav.html +++ b/templates/web/fixmystreet.com/footer-nav.html @@ -2,7 +2,7 @@ <div class="tablewrapper"> <ul id="footer-main-nav"> <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>[% + >[% loc("Report a problem") %]</[% c.req.uri.path == '/' ? 'span' : 'a' %]></li>[% %]<li><[% IF c.req.uri.path == '/my' %]span[% ELSE %]a href="/my"[% END %]>[% loc("Your reports") %]</[% c.req.uri.path == '/my' ? 'span' : 'a' %]></li>[% %]<li><[% IF c.req.uri.path == '/reports' %]span[% ELSE %]a href="/reports"[% END diff --git a/templates/web/fixmystreet.com/footer_extra.html b/templates/web/fixmystreet.com/footer_extra.html new file mode 100644 index 000000000..ba32a5534 --- /dev/null +++ b/templates/web/fixmystreet.com/footer_extra.html @@ -0,0 +1,3 @@ +<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/front/javascript.html b/templates/web/fixmystreet.com/front/javascript.html new file mode 100644 index 000000000..0ccaa0870 --- /dev/null +++ b/templates/web/fixmystreet.com/front/javascript.html @@ -0,0 +1,15 @@ +<script> +yepnope.addPrefix( 'preload', function ( resource ) { + resource.noexec = true; + return resource; +}); +Modernizr.load({ + load: [ + "preload![% version('/js/OpenLayers.fixmystreet.js') %]", + "preload![% version('/js/map-OpenLayers.js') %]", + "preload![% version('/js/map-bing-ol.js') %]", + "preload![% version('/js/map-fms.js') %]", + "preload![% version('/js/jquery.ba-hashchange.min.js') %]" + ] +}); +</script> diff --git a/templates/web/fixmystreet.com/header_extra.html b/templates/web/fixmystreet.com/header_extra.html index 27ffc12a1..6d3474c23 100644 --- a/templates/web/fixmystreet.com/header_extra.html +++ b/templates/web/fixmystreet.com/header_extra.html @@ -1,3 +1,6 @@ -<script src="[% start %][% version('/js/jquery.cookie.min.js') %]" type="text/javascript" charset="utf-8"></script> +<link rel="Shortcut Icon" type="image/x-icon" href="/cobrands/fixmystreet.com/favicon.ico"> + +<script src="[% start %][% version('/js/jquery.cookie.min.js') %]"></script> +<script src="[% start %][% version('/cobrands/fixmystreet.com/js.js') %]"></script> [% INCLUDE 'tracking_code.html' %] diff --git a/templates/web/fixmystreet.com/next_steps.html b/templates/web/fixmystreet.com/next_steps.html new file mode 100644 index 000000000..5a26a67fe --- /dev/null +++ b/templates/web/fixmystreet.com/next_steps.html @@ -0,0 +1,42 @@ +[%# A trio of suggested steps, shown on completion pages across FMS.com %] + +[% DEFAULT share_url = c.cobrand.base_url %] +[% DEFAULT twitter_comment = 'I just used @fixmystreet, you should try it!' %] + +<div class="next-steps"> + <div class="next-steps__step next-steps__step--apps"> + [% IF just_interacted %] + <h2>[% loc('Next time, try our mobile app!') %]</h2> + [% ELSE %] + <h2>[% loc('Have you tried our mobile app?') %]</h2> + [% END %] + <p>[% loc('Download it now, and it’ll be ready to use when you next pick up your phone.') %]</p> + <p class="next-steps__step__cta"> + <a href="https://itunes.apple.com/gb/app/fixmystreet/id297456545"><img src="/cobrands/fixmystreet.com/images/next-step-apple.png" alt="Download on the App Store" width="120" height="37"></a> + <a href="https://play.google.com/store/apps/details?id=org.mysociety.FixMyStreet"><img src="/cobrands/fixmystreet.com/images/next-step-google.png" alt="Android app on Google Play" width="120" height="37"></a> + </p> + </div> + <div class="next-steps__step next-steps__step--social"> + [% IF just_interacted %] + <h2>[% loc('Great work. Now spread the word!') %]</h2> + <p>[% loc('Share your report on Twitter and Facebook, and let your friends join the conversation.') %]</p> + [% ELSE %] + <h2>[% loc('Spread the word about FixMyStreet!') %]</h2> + <p>[% loc('You know how to get things fixed - now make sure your friends do too.') %]</p> + [% END %] + <p class="next-steps__step__cta"> + <a href="https://twitter.com/intent/tweet?text=[% twitter_comment | uri %]&url=[% share_url | uri %]&related=fixmystreet,mysociety"><img src="/cobrands/fixmystreet.com/images/next-step-twitter.png" alt="Tweet it" width="120" height="37"></a> + <a href="https://www.facebook.com/sharer/sharer.php?u=[% share_url | uri %]"><img src="/cobrands/fixmystreet.com/images/next-step-facebook.png" alt="Share on Facebook" width="120" height="37"></a> + </p> + </div> + <div class="next-steps__step next-steps__step--goodies"> + <h2>[% loc('Free FixMyStreet goodies for you!') %]</h2> + <a href="/posters"> + <img src="/cobrands/fixmystreet.com/images/next-step-goodies.png" alt="" width="105" height="125" class="goodies-preview"> + </a> + <p>[% loc('Perfect for civic groups, clubs, and schools.') %]</p> + <p class="next-steps__step__cta"> + <a href="/posters"><img src="/cobrands/fixmystreet.com/images/next-step-download.png" alt="Download" width="120" height="37"></a> + </p> + </div> +</div> diff --git a/templates/web/fixmystreet.com/questionnaire/completed-open.html b/templates/web/fixmystreet.com/questionnaire/completed-open.html index df8e2d271..073fb0438 100644 --- a/templates/web/fixmystreet.com/questionnaire/completed-open.html +++ b/templates/web/fixmystreet.com/questionnaire/completed-open.html @@ -1,23 +1,19 @@ -[% IF c.cobrand.is_council %] - <p style="font-size: 150%"> - Thank you very much for filling in our questionnaire. - </p> -[% ELSE %] - <p style="font-size:150%">We’re sorry to hear that your problem hasn't been fixed.</p> +[% IF ! c.cobrand.is_council %] + <h2>We’re sorry to hear that your problem hasn’t been fixed.</h2> <p> - FixMyStreet helps you send a report to your council, but we're not responsible for fixing things. - If you'd like to chase your issue, please search your inbox for the latest reply, or auto-reply + FixMyStreet helps you send a report to your council, but we’re not responsible for fixing things. + If you’d like to chase your issue, please search your inbox for the latest reply, or auto-reply from your council, and respond to that. </p> <p> - Meanwhile, if you're getting nowhere, you might consider writing to your local councillor or other + Meanwhile, if you’re getting nowhere, you might consider writing to your local councillor or other representative to see if they can help. </p> <p> - You can do this on <a href="https://www.writetothem.com/">https://www.writetothem.com/</a>, another + You can do this on <a href="https://www.writetothem.com/">WriteToThem</a>, another useful mySociety website. </p> [% END %] diff --git a/templates/web/fixmystreet.com/report/new/category_at_top.html b/templates/web/fixmystreet.com/report/new/category_at_top.html new file mode 100644 index 000000000..f131f37a1 --- /dev/null +++ b/templates/web/fixmystreet.com/report/new/category_at_top.html @@ -0,0 +1 @@ +[% PROCESS "report/new/category_wrapper.html" %] diff --git a/templates/web/fixmystreet.com/report/new/unresponsive_body.html b/templates/web/fixmystreet.com/report/new/unresponsive_body.html new file mode 100644 index 000000000..a1b41aaf5 --- /dev/null +++ b/templates/web/fixmystreet.com/report/new/unresponsive_body.html @@ -0,0 +1,12 @@ +<div class="unresponsive-council-warning"> + <h1>Important message</h1> + <p> + <span class="unresponsive-council">[% bodies.$body_id.name %]</span> doesn’t accept + [% IF category %] + <span class="refused-category">[% category | html %]</span> + [% END %] + reports. + </p> + <p>We can make your report public, but we can’t send it to the council.</p> + <a href="/unresponsive?body=[% body_id %][% IF category %];category=[% category | uri %][% END %]">What can I do instead?</a> +</div> diff --git a/templates/web/fixmystreet.com/reports/_body_gone.html b/templates/web/fixmystreet.com/reports/_body_gone.html new file mode 100755 index 000000000..5a8232110 --- /dev/null +++ b/templates/web/fixmystreet.com/reports/_body_gone.html @@ -0,0 +1,45 @@ +<p id="unknown" class="alert">This council no longer exists. + [% IF body.name.match('Antrim|Newtownabbey') %] + Its area is now covered by <a href="/reports/Antrim+and+Newtownabbey">Antrim and Newtownabbey Borough Council</a>. + [% ELSIF body.name.match('Ards|North Down') %] + Its area is now covered by <a href="/reports/Ards+and+North+Down">Ards and North Down Borough Council</a>. + [% ELSIF body.name.match('Armagh|Banbridge|Craigavon') %] + Its area is now covered by <a href="/reports/Armagh+City%2C+Banbridge+and+Craigavon">Armagh City, Banbridge and Craigavon Borough Council</a>. + [% ELSIF body.name.match('Coleraine|Ballymoney|Moyle|Limavady') %] + Its area is now covered by <a href="/reports/Causeway+Coast+and+Glens">Causeway Coast and Glens District Council</a>. + [% ELSIF body.name.match('Derry|Strabane') %] + Its area is now covered by <a href="/reports/Derry+City+and+Strabane">Derry City and Strabane District Council</a>. + [% ELSIF body.name.match('Fermanagh|Omagh') %] + Its area is now covered by <a href="/reports/Fermanagh+and+Omagh">Fermanagh and Omagh District Council</a>. + [% ELSIF body.name.match('Lisburn|Castlereagh') %] + Its area is now covered by <a href="/reports/Lisburn+and+Castlereagh">Lisburn and Castlereagh City Council</a>. + [% ELSIF body.name.match('Carrickfergus|Larne|Ballymena') %] + Its area is now covered by <a href="/reports/Mid+and+East+Antrim">Mid and East Antrim Borough Council</a>. + [% ELSIF body.name.match('Dungannon|Cookstown|Magherafelt') %] + Its area is now covered by <a href="/reports/Mid+Ulster">Mid Ulster District Council</a>. + [% ELSIF body.name.match('Newry|Down') %] + Its area is now covered by <a href="/reports/Newry%2C+Mourne+and+Down">Newry, Mourne and Down District Council</a>. + [% ELSIF body.name.match('Penwith|Kerrier|Carrick|Restormel|Caradon|North Cornwall') %] + Its area is now covered by <a href="/reports/Cornwall">Cornwall Council</a>. + [% ELSIF body.name.match('Durham|Easington|Sedgefield|Teesdale|Wear Valley|Derwentside|Chester le Street') %] + Its area is now covered by <a href="/reports/Durham+County">Durham County Council</a>. + [% ELSIF body.name.match('Blyth Valley|Wansbeck|Castle Morpeth|Tynedale|Alnwick|Berwick upon Tweed') %] + Its area is now covered by <a href="/reports/Northumberland">Northumberland County Council</a>. + [% ELSIF body.name.match('North Shropshire|Oswestry|Shrewsbury and Atcham|South Shropshire|Bridgnorth') %] + Its area is now covered by <a href="/reports/Shropshire">Shropshire Council</a>. + [% ELSIF body.name.match('Salisbury|West Wiltshire|Kennet|North Wiltshire') %] + Its area is now covered by <a href="/reports/Wiltshire">Wiltshire Council</a>. + [% ELSIF body.name.match('Ellesmere Port and Neston|Vale Royal|Chester') %] + Its area is now covered by <a href="/reports/Cheshire+West+and+Chester">Cheshire West and Chester Council</a>. + [% ELSIF body.name.match('Macclesfield|Congleton|Crewe and Nantwich') %] + Its area is now covered by <a href="/reports/Cheshire+East">Cheshire East Council</a>. + [% ELSIF body.name.match('Mid Bedfordshire|South Bedfordshire') %] + Its area is now covered by <a href="/reports/Central+Bedfordshire">Central Bedfordshire Council</a>. + [% ELSIF body.name.match('Cheshire') %] + Its area is now covered by <a href="/reports/Cheshire+West+and+Chester">Cheshire West and Chester Council</a> or + <a href="/reports/Cheshire+East">Cheshire East Council</a>. + [% ELSIF body.name.match('Bedfordshire') %] + Its area is now covered by <a href="/reports/Bedford">Bedford Borough Council</a> or + <a href="/reports/Central+Bedfordshire">Central Bedfordshire Council</a>. + [% END %] +</p> diff --git a/templates/web/fixmystreet.com/reports/_extras.html b/templates/web/fixmystreet.com/reports/_extras.html index 77a46493b..ff2a67dc2 100755 --- a/templates/web/fixmystreet.com/reports/_extras.html +++ b/templates/web/fixmystreet.com/reports/_extras.html @@ -5,7 +5,8 @@ 'East Sussex County Council' = 'eastsussex.fixmystreet.com' 'Hart District Council' = 'hart.fixmystreet.com' 'Oxfordshire County Council' = 'fixmystreet.oxfordshire.gov.uk' - 'Stevenage Borough Council' = 'stevenage.fixmystreet.com' + 'Stevenage Borough Council' = 'stevenage.fixmystreet.com', + 'Royal Borough of Greenwich' = 'fix.royalgreenwich.gov.uk' } secure = { 'fix.bromley.gov.uk' = 's' diff --git a/templates/web/fixmystreet.com/research/survey_link.html b/templates/web/fixmystreet.com/research/survey_link.html new file mode 100644 index 000000000..7357249d8 --- /dev/null +++ b/templates/web/fixmystreet.com/research/survey_link.html @@ -0,0 +1,3 @@ +<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/council.html b/templates/web/fixmystreet.com/static/council.html index f8eecb0d0..6327c8bab 100644 --- a/templates/web/fixmystreet.com/static/council.html +++ b/templates/web/fixmystreet.com/static/council.html @@ -31,10 +31,11 @@ <div class="councils-section"> <div class="fixed-container"> <div class="section-content"> - <h2>Channel shift</h2> - <p>Every council wants it. There are plenty of ideas on how to achieve it - but FixMyStreet for Councils will actually deliver the holy grail of channel shift.</p> - <p>It’s a tried and tested catalyst for shifting citizen contact online - our existing client councils have reported a shift of up to 300% from phone to online reporting. Why? Because when online reporting systems are this easy, phone contact plummets. </p> - <p>With installation costs from £4,500, FixMyStreet starts paying for itself within weeks - and, most importantly, frees up your staff for more important tasks.</p> + <H2>A real money saver</H2> +<p>FixMyStreet for Councils has brought our clients proven savings in staffing costs and a 50% reduction in average call-handling times. </P> +<p>Every council knows about channel shift - and FixMyStreet is a tried and tested catalyst for shifting citizen contact online.</p> +<p>Existing client councils have reported a shift of up to 300% from phone to online reporting. Why? Because when online reporting systems are this easy, phone contact plummets.</p> +<p>With installation costs from £4,500, FixMyStreet starts paying for itself within weeks - and, most importantly, frees up your staff for more important tasks.</P> </div> </div> </div> @@ -100,7 +101,7 @@ <div class="fixed-container"> <div class="section-content"> <h2>Who's using FixMyStreet for councils?</h2> - <p>Our UK client councils include <a href="http://fixmystreet.stevenage.gov.uk/">Stevenage</a>, <a href="http://fix.bromley.gov.uk/">Bromley</a>, <a href="http://barnet.fixmystreet.com/">Barnet</a>, <a href="http://fixmystreet.oxfordshire.gov.uk/">Oxfordshire</a>, <a href="http://hart.fixmystreet.com/">Hart</a>, <a href="http://eastsussex.fixmystreet.com/">East Sussex County Council</a>, and (soon to launch) Warwickshire County Council.</p> + <p>Our UK client councils include <a href="http://fixmystreet.stevenage.gov.uk/">Stevenage</a>, <a href="http://fix.bromley.gov.uk/">Bromley</a>, <a href="http://barnet.fixmystreet.com/">Barnet</a>, <a href="http://fixmystreet.oxfordshire.gov.uk/">Oxfordshire</a>, <a href="http://hart.fixmystreet.com/">Hart</a>, <a href="http://eastsussex.fixmystreet.com/">East Sussex County Council</a>, <a href="http://fix.royalgreenwich.gov.uk/">Greenwich</a>, and (soon to launch) Warwickshire County Council.</p> <p>FixMyStreet for Councils is also in use outside the UK, in the city of <a href="https://www.zueriwieneu.ch/">Zurich</a>, Switzerland.</p> <h3>Case studies</h3> <p>For the insider view, and to understand the integration process, read these councils’ stories.</p> diff --git a/templates/web/fixmystreet.com/static/posters.html b/templates/web/fixmystreet.com/static/posters.html index 2e26ad40e..bcf235fa4 100644 --- a/templates/web/fixmystreet.com/static/posters.html +++ b/templates/web/fixmystreet.com/static/posters.html @@ -1,5 +1,5 @@ [% extra_css = BLOCK %] - <link rel="stylesheet" href="[% version('/cobrands/fixmystreet/posters.css') %]"> + <link rel="stylesheet" href="[% version('/cobrands/fixmystreet.com/posters.css') %]"> [% END %] [% INCLUDE header.html @@ -11,6 +11,27 @@ badge = '<a href="https://www.fixmystreet.com/"> <img src="https://www.fixmystreet.com/i/fms-badge.jpeg" alt="FixMyStreet - report, view or discuss local problems" border="0"></a>' %] +<script> + +$("[data-goodielink]").on(click, function(e){ + var url = $(this).attr('href') + var name = $(this).attr('data-goodielink') + var callback = function(){ + window.location.href = url + } + if(e.metaKey || e.ctrlKey){ + callback = function(){} + } else { + e.preventDefault() + } + ga('send', 'event', 'goodie', 'download', name, { + 'hitCallback': callback + }) + setTimeout(callback, 2000); +}); + +</script> + <div class="sticky-sidebar"> <aside> <ul class="plain-list"> @@ -33,7 +54,7 @@ <h2 id="activist-pack">The FMS Activist Pack</h2> -<img src="/cobrands/fixmystreet/images/pack-general.jpg" class="pack-preview"> +<img src="/cobrands/fixmystreet.com/images/pack-general.jpg" class="pack-preview" alt=""> <p>Everything you need to help spread the word about FixMyStreet. Includes:</p> @@ -45,11 +66,11 @@ <li>Ideas for letting more people know about FixMyStreet</li> </ul> -<a href="/cobrands/fixmystreet/posters/activist-pack.zip" class="download-button">Download ZIP file</a> +<a href="/cobrands/fixmystreet.com/posters/activist-pack.zip" data-goodielink="activist-pack" class="download-button">Download ZIP file</a> <h2 id="school-pack">Activity Pack for Schools, Brownies, and Scouts</h2> -<img src="/cobrands/fixmystreet/images/pack-schools.jpg" class="pack-preview"> +<img src="/cobrands/fixmystreet.com/images/pack-schools.jpg" class="pack-preview" alt=""> <p>A special pack with activities suitable for groups of children. Includes:</p> @@ -59,11 +80,11 @@ <li>Ideas for activities</li> </ul> -<a href="/cobrands/fixmystreet/posters/schools-clubs-pack.zip" class="download-button">Download ZIP file</a> +<a href="/cobrands/fixmystreet.com/posters/schools-clubs-pack.zip" data-goodielink="schools-clubs-pack" class="download-button">Download ZIP file</a> <h2 id="community-pack">Community Group Pack</h2> -<img src="/cobrands/fixmystreet/images/pack-community.jpg" class="pack-preview"> +<img src="/cobrands/fixmystreet.com/images/pack-community.jpg" class="pack-preview" alt=""> <p>Materials for groups of adults who have a particular interest in their local community. Includes:</p> @@ -75,7 +96,7 @@ <li>Instructions for including a feed of local FixMyStreet reports on your site or blog</li> </ul> -<a href="/cobrands/fixmystreet/posters/community-group-pack.zip" class="download-button">Download ZIP file</a> +<a href="/cobrands/fixmystreet.com/posters/community-group-pack.zip" data-goodielink="community-group-pack" class="download-button">Download ZIP file</a> <h2 id="web">Website Badge</h2> @@ -88,22 +109,26 @@ <h2 id="print">Printed Materials</h2> <ul class="downloads"> - <li><a href="/cobrands/fixmystreet/posters/fixmystreet-poster-a4.pdf"> - <img src="/cobrands/fixmystreet/images/a4-poster.png"> + <li><a href="/cobrands/fixmystreet.com/posters/fixmystreet-poster-a4.pdf" data-goodielink="fixmystreet-poster-a4"> + <img src="/cobrands/fixmystreet.com/images/a4-poster.png" alt=""> <strong>A4 poster</strong> Ideal for a noticeboard at work, in the library, corner shop… wherever your community will see it. </a></li> - <li><a href="/cobrands/fixmystreet/posters/fixmystreet-flyers-a5.pdf"> - <img src="/cobrands/fixmystreet/images/a5-flyers.png"> + <li><a href="/cobrands/fixmystreet.com/posters/fixmystreet-flyers-a5.pdf" data-goodielink="fixmystreet-flyers-a5"> + <img src="/cobrands/fixmystreet.com/images/a5-flyers.png" alt=""> <strong>A5 flyers (2 to a sheet)</strong> Perfect for handing out to friends or posting to subscribers. </a></li> - <li><a href="/cobrands/fixmystreet/posters/fixmystreet-flyers-a6.pdf"> - <img src="/cobrands/fixmystreet/images/a6-flyers.png"> + <li><a href="/cobrands/fixmystreet.com/posters/fixmystreet-flyers-a6.pdf" data-goodielink="fixmystreet-flyers-a6"> + <img src="/cobrands/fixmystreet.com/images/a6-flyers.png" alt=""> <strong>A6 flyers (4 to a sheet)</strong> Great for cafés, pubs, or meetings. </a></li> - <li><a href="/cobrands/fixmystreet/posters/fixmystreet-poop-flags.pdf"> - <img src="/cobrands/fixmystreet/images/dog-poop-flags.png"> + <li><a href="/cobrands/fixmystreet.com/posters/fixmystreet-poop-flags.pdf" data-goodielink="fixmystreet-poop-flags"> + <img src="/cobrands/fixmystreet.com/images/dog-poop-flags.png" alt=""> <strong>Doggy poop flags (4 to a sheet)</strong> Take a stand against dog-fouling with our home-made flags. Some assembly required! </a></li> + <li><a href="/cobrands/fixmystreet.com/posters/fixmystreet-poop-poster.pdf" data-goodielink="fixmystreet-poop-poster"> + <img src="/cobrands/fixmystreet.com/images/dog-poop-poster.png" alt=""> + <strong>A4 “We love our street’ dog poop poster</strong> + </a></li> </ul> <h2 id="adverts">Pre-made Adverts</h2> @@ -111,16 +136,16 @@ <p>Ideal for promoting FixMyStreet in your community newsletter or local magazine. Specially designed to stand out, and get your message across!</p> <ul class="downloads"> - <li><a href="/cobrands/fixmystreet/posters/fixmystreet-advert-90x130.pdf"> - <img src="/cobrands/fixmystreet/images/advert-90x130.png"> + <li><a href="/cobrands/fixmystreet.com/posters/fixmystreet-promote-90x130.pdf" data-goodielink="fixmystreet-advert-90x130"> + <img src="/cobrands/fixmystreet.com/images/promote-90x130.png" alt=""> <strong>Quarter page advert</strong> (9cm wide, 13cm high) </a></li> - <li><a href="/cobrands/fixmystreet/posters/fixmystreet-advert-90x60.pdf"> - <img src="/cobrands/fixmystreet/images/advert-90x60.png"> + <li><a href="/cobrands/fixmystreet.com/posters/fixmystreet-promote-90x60.pdf" data-goodielink="fixmystreet-advert-90x60"> + <img src="/cobrands/fixmystreet.com/images/promote-90x60.png" alt=""> <strong>One-eighth page advert</strong> (9cm wide, 6cm high) </a></li> - <li><a href="/cobrands/fixmystreet/posters/fixmystreet-advert-40x60.pdf"> - <img src="/cobrands/fixmystreet/images/advert-40x60.png"> + <li><a href="/cobrands/fixmystreet.com/posters/fixmystreet-promote-40x60.pdf" data-goodielink="fixmystreet-advert-40x60"> + <img src="/cobrands/fixmystreet.com/images/promote-40x60.png" alt=""> <strong>One-sixteenth page advert</strong> (4cm wide, 6cm high) </a></li> </ul> diff --git a/templates/web/fixmystreet.com/static/privacy.html b/templates/web/fixmystreet.com/static/privacy.html index addce1e2d..ba1745978 100755 --- a/templates/web/fixmystreet.com/static/privacy.html +++ b/templates/web/fixmystreet.com/static/privacy.html @@ -32,9 +32,7 @@ other companies, you can adjust your usage or install opt-out browser plugins. <dt>Who gets to see my email address?</dt> <dd>If you submit a problem, we pass on your details, and details of the problem, to the council contact or contacts responsible for the area where -you located the problem, or other relevant body (for example, in most of London -we send reports via the central London Report-It service, who may also publish -the public details of your report). Other than the council, who obviously get +you located the problem, or other relevant body. Other than the council, who obviously get your email address, only people we authorise to view the FixMyStreet administration interface will be able to see your email address and they will never use it for anything other than to help administer FixMyStreet. Similarly diff --git a/templates/web/fixmystreet.com/static/unresponsive.html b/templates/web/fixmystreet.com/static/unresponsive.html new file mode 100644 index 000000000..be8a3c6e1 --- /dev/null +++ b/templates/web/fixmystreet.com/static/unresponsive.html @@ -0,0 +1,38 @@ +[% INCLUDE header.html + title = 'Unresponsive councils: What you can do', bodyclass = 'unresponsive-council fullwidthpage' +%] + +<div class="unresponsive-council__header"> + <h1>Bad news :(</h1> + <p><strong class="unresponsive-council-name">[% body.name %]</strong> no + longer accepts [% IF category %][% category | html %][% END %] + reports from FixMyStreet.</p> +</div> + +<div class="unresponsive-council__body"> + <p><strong class="unresponsive-council-name">[% body.name %]</strong> is one + of only <strong>2%</strong> of councils that don’t accept reports from + FixMyStreet. We’re sad about it too, but here are some things you can do now:</p> + + [% IF body.external_url %] + <a href="[% body.external_url %]" class="unresponsive-council-cta unresponsive-council-cta--primary"> + <strong>Report your issue directly</strong> to <span class="unresponsive-council-name">[% body.name %]</span> on their website + </a> + [% ELSE %] + <a href="https://www.google.co.uk/search?q=report+[% body.name | uri %]" class="unresponsive-council-cta unresponsive-council-cta--primary"> + Find the website of <span class="unresponsive-council-name">[% body.name %]</span> and <strong>report your issue directly</strong> + </a> + [% END %] + + <h2>If you’d prefer to use FixMyStreet next time:</h2> + + <a href="https://www.writetothem.com/" class="unresponsive-council-cta"> + <strong>Write to your MP or local councillors</strong> to let them know this isn’t okay + </a> + + <a href="https://twitter.com/intent/tweet?via=fixmystreet" class="unresponsive-council-cta"> + <strong>Tweet</strong> to let <span class="unresponsive-council-name">[% body.name %]</span></strong> know you’d rather use FixMyStreet + </a> +</div> + +[% INCLUDE footer.html %] diff --git a/templates/web/fixmystreet.com/tokens/_extras_confirm.html b/templates/web/fixmystreet.com/tokens/_extras_confirm.html new file mode 100644 index 000000000..c27383f42 --- /dev/null +++ b/templates/web/fixmystreet.com/tokens/_extras_confirm.html @@ -0,0 +1 @@ +[% INCLUDE 'research/survey_link.html' %] diff --git a/templates/web/fixmystreet.com/tracking_code.html b/templates/web/fixmystreet.com/tracking_code.html index 23bd8d992..3b163f516 100644 --- a/templates/web/fixmystreet.com/tracking_code.html +++ b/templates/web/fixmystreet.com/tracking_code.html @@ -20,7 +20,7 @@ ga(function(tracker) { tracker.set('location', page + extra); }); ga('ecommerce:addItem', { - 'id': 'report/[% problem.id %]', + 'id': 'report/[% report.id %]', 'quantity': '1', 'name': 'Report' }); diff --git a/templates/web/fixmystreet/footer.html b/templates/web/fixmystreet/footer.html index 71e87ddfb..810708919 100644 --- a/templates/web/fixmystreet/footer.html +++ b/templates/web/fixmystreet/footer.html @@ -1,5 +1,5 @@ [% IF pagefooter %] - <footer role="content-info"> + <footer role="contentinfo"> [% INCLUDE 'front/footer-marketing.html' %] </footer> [% END %] @@ -37,5 +37,8 @@ <!-- [% INCLUDE 'debug_footer.html' %] --> </div> <!-- .wrapper --> + + [% TRY %][% PROCESS 'footer_extra.html' %][% CATCH file %][% END %] + </body> </html> diff --git a/templates/web/fixmystreet/front/javascript.html b/templates/web/fixmystreet/front/javascript.html new file mode 100644 index 000000000..13aa5216c --- /dev/null +++ b/templates/web/fixmystreet/front/javascript.html @@ -0,0 +1,15 @@ +[%# Assume using OpenStreetMap maps %] +<script> +yepnope.addPrefix( 'preload', function ( resource ) { + resource.noexec = true; + return resource; +}); +Modernizr.load({ + load: [ + "preload![% version('/js/OpenLayers.fixmystreet.js') %]", + "preload![% version('/js/map-OpenLayers.js') %]", + "preload![% version('/js/map-OpenStreetMap.js') %]", + "preload![% version('/js/jquery.ba-hashchange.min.js') %]" + ] +}); +</script> diff --git a/templates/web/fixmystreet/header.html b/templates/web/fixmystreet/header.html index a1c0ba38a..4fde56e94 100644 --- a/templates/web/fixmystreet/header.html +++ b/templates/web/fixmystreet/header.html @@ -12,14 +12,20 @@ <meta name="mobileoptimized" content="0"> [% INCLUDE 'header_opengraph.html' %] + [% SET start = c.config.ADMIN_BASE_URL IF admin; -[% 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)"> + # For clarity, the 'fixmystreet' moniker (for fixmystreet.com) puts + # it stylesheets under fixmystreet.com + IF c.cobrand.moniker == 'fixmystreet'; + SET css_dir = 'fixmystreet.com'; + ELSE; + SET css_dir = c.cobrand.moniker; + END %] + <link rel="stylesheet" href="[% start %][% version('/cobrands/' _ css_dir _ '/base.css') %]"> + <link rel="stylesheet" href="[% start %][% version('/cobrands/' _ css_dir _ '/layout.css') %]" media="(min-width:48em)"> [% extra_css %] <!--[if (lt IE 9) & (!IEMobile)]> - <link rel="stylesheet" href="[% start %][% version('/cobrands/' _ c.cobrand.moniker _ '/layout.css') %]"> + <link rel="stylesheet" href="[% start %][% version('/cobrands/' _ css_dir _ '/layout.css') %]"> <![endif]--> <script src="[% start %][% version('/js/modernizr.custom.js') %]" charset="utf-8"></script> diff --git a/templates/web/fixmystreet/header_logo.html b/templates/web/fixmystreet/header_logo.html index 6e4ad9e21..3ae706730 100644 --- a/templates/web/fixmystreet/header_logo.html +++ b/templates/web/fixmystreet/header_logo.html @@ -1 +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> diff --git a/templates/web/fixmystreet/index.html b/templates/web/fixmystreet/index.html index f92518022..0441b3efb 100644 --- a/templates/web/fixmystreet/index.html +++ b/templates/web/fixmystreet/index.html @@ -1,20 +1,4 @@ -[%# Assumes fixmystreet cobrand is using FMS map template - for bonus points preload all the right map elements. %] -[% map_js = BLOCK %] -<script> -yepnope.addPrefix( 'preload', function ( resource ) { - resource.noexec = true; - return resource; -}); -Modernizr.load({ - load: [ - "preload![% version('/js/OpenLayers.fixmystreet.js') %]", - "preload![% version('/js/map-OpenLayers.js') %]", - "preload![% version('/js/map-bing-ol.js') %]", - "preload![% version('/js/jquery.ba-hashchange.min.js') %]" - ] -}); -</script> -[% END %] +[% map_js = PROCESS 'front/javascript.html' %] [% pre_container_extra = PROCESS 'around/postcode_form.html' %] [% INCLUDE 'header.html', title = '', bodyclass = 'frontpage fullwidthpage' %] @@ -23,13 +7,7 @@ Modernizr.load({ <p class="form-error">[% error %]</p> [% END %] -[% IF c.cobrand.moniker == 'bromley' %] -<p>This is primarily for reporting physical problems that can be fixed -like graffiti, cleansing issues or road defects. To report other -kinds of problems like missed bins use our -<a href="http://www.bromley.gov.uk/report">online report it forms</a>. -</p> -[% END %] +[% TRY %][% PROCESS 'front/pre-steps.html' %][% CATCH file %][% END %] <div class="tablewrapper"> <div id="front-howto"> diff --git a/templates/web/fixmystreet/my/_problem-list.html b/templates/web/fixmystreet/my/_problem-list.html new file mode 100644 index 000000000..1a891de80 --- /dev/null +++ b/templates/web/fixmystreet/my/_problem-list.html @@ -0,0 +1,27 @@ +[% 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 index 3944c2b1c..16779e503 100644 --- a/templates/web/fixmystreet/my/my.html +++ b/templates/web/fixmystreet/my/my.html @@ -27,32 +27,14 @@ [% 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 %] @@ -76,9 +58,3 @@ END %] </div> [% INCLUDE 'footer.html' %] - -[% 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/report/display.html b/templates/web/fixmystreet/report/display.html index 4f4e7a2a6..0006241c3 100644 --- a/templates/web/fixmystreet/report/display.html +++ b/templates/web/fixmystreet/report/display.html @@ -38,9 +38,9 @@ <li><a rel="nofollow" id="key-tool-report-share" class="share" href="#report-share">[% loc('Share') %]</a></li> [% END %] [% IF c.cobrand.moniker == 'zurich' %] - <li><a class="chevron" id="key-tool-problems-nearby" href="[% c.uri_for( '/around', { lat => short_latitude, lon => short_longitude } ) %]">[% loc( 'Problems on the map' ) %]</a></li> + <li><a class="chevron" id="key-tool-problems-nearby" href="[% c.uri_for( '/around', { lat => latitude, lon => longitude } ) %]">[% loc( 'Problems on the map' ) %]</a></li> [% ELSE %] - <li><a class="chevron" id="key-tool-problems-nearby" href="[% c.uri_for( '/around', { lat => short_latitude, lon => short_longitude } ) %]">[% loc( 'Problems nearby' ) %]</a></li> + <li><a class="chevron" id="key-tool-problems-nearby" href="[% c.uri_for( '/around', { lat => latitude, lon => longitude } ) %]">[% loc( 'Problems nearby' ) %]</a></li> [% END %] </ul> @@ -72,6 +72,7 @@ </div> +[% TRY %][% INCLUDE 'report/sharing.html' %][% CATCH file %][% END %] [% INCLUDE 'report/updates.html' %] [% INCLUDE 'report/update-form.html' %] [% INCLUDE 'footer.html' %] diff --git a/templates/web/fixmystreet/report/new/category_extras.html b/templates/web/fixmystreet/report/new/category_extras.html deleted file mode 100644 index 48a38435d..000000000 --- a/templates/web/fixmystreet/report/new/category_extras.html +++ /dev/null @@ -1,26 +0,0 @@ -<div id="category_meta"> - [%- IF report_meta %] - [%- category = report.category %] - <h4>Additional Information</h4> - [%- FOR meta IN category_extras.$category %] - [%- meta_name = meta.code -%] - - <label for="form_[% meta_name %]">[% meta.description _ ':' %]</label> - [% IF field_errors.$meta_name %] - <p class='form-error'>[% field_errors.$meta_name %]</p> - [% END -%] - [% IF meta.variable != 'false' %] - [% IF meta.exists('values') %] - <select name="[% meta_name %]" id="form_[% meta_name %]"[% meta.required == 'true' ? ' required' : '' %]> - [% FOR option IN meta.values.value %] - <option value="[% option.key.0 %]"[% IF option.key.0 == report_meta.$meta_name.value %] selected[% END %]>[% option.name.0 %]</option> - [% END %] - </select> - [% ELSE %] - <input type="text" value="[% report_meta.$meta_name.value | html %]" name="[% meta_name %]" id="form_[% meta_name %]"[% meta.required == 'true' ? ' required' : '' %]> - [% END %] - [% END %] - - [%- END %] - [%- END %] -</div> diff --git a/templates/web/fixmystreet/report/new/fill_in_details_form.html b/templates/web/fixmystreet/report/new/fill_in_details_form.html index 75e11c74f..82b1097b7 100644 --- a/templates/web/fixmystreet/report/new/fill_in_details_form.html +++ b/templates/web/fixmystreet/report/new/fill_in_details_form.html @@ -34,6 +34,14 @@ <p class='form-error'>[% field_errors.bodies %]</p> [% END %] + [% TRY %] + [%# Useful for amending form contents based on category selection %] + [% PROCESS 'report/new/category_at_top.html' %] + [% need_to_show_category_selector = 0 %] + [% CATCH file %] + [% need_to_show_category_selector = 1 %] + [% END %] + <label for="form_title">[% loc('One-line summary') %] [% INCLUDE 'report/public_label.html' %]</label> [% IF field_errors.title %] <p class='form-error'>[% field_errors.title %]</p> @@ -48,24 +56,10 @@ [% TRY %][% PROCESS 'report/new/inline-tips.html' %][% CATCH file %][% END %] - [% IF js %] - <div id="form_category_row"> - <label for="form_category">[% loc('Category') %]</label> - <select name="category" id="form_category" required><option>[% loc('Loading...') %]</option></select> - </div> - [% ELSE %] - [% IF category_options.size %] - [% IF field_errors.category %] - <p class='form-error'>[% field_errors.category %]</p> - [% END %] - [% PROCESS "report/new/category.html" %] - [% END %] + [% IF need_to_show_category_selector %] + [% PROCESS "report/new/category_wrapper.html" %] [% END %] - [%- IF category_extras %] - [% PROCESS "report/new/category_extras.html" %] - [%- END %] - [% TRY %][% PROCESS 'report/new/after_category.html' %][% CATCH file %][% END %] [% IF c.cobrand.allow_photo_upload %] diff --git a/templates/web/fixmystreet/report/update-form.html b/templates/web/fixmystreet/report/update-form.html index bde2c84e2..f5dca4669 100644 --- a/templates/web/fixmystreet/report/update-form.html +++ b/templates/web/fixmystreet/report/update-form.html @@ -34,7 +34,7 @@ [% END %] </select> [% ELSE %] - [% IF problem.is_fixed AND c.user_exists AND c.user.id == problem.user_id %] + [% IF problem.is_fixed AND ((c.user_exists AND c.user.id == problem.user_id) OR alert_to_reporter) %] <input type="checkbox" name="reopen" id="form_reopen" value="1"[% ' checked' IF update.mark_open %]> <label class="inline" for="form_reopen">[% loc('This problem has not been fixed') %]</label> diff --git a/templates/web/fixmystreet/report/update.html b/templates/web/fixmystreet/report/update.html index a400b2416..847277dfd 100644 --- a/templates/web/fixmystreet/report/update.html +++ b/templates/web/fixmystreet/report/update.html @@ -28,6 +28,7 @@ <p class="meta-2"> [% INCLUDE meta_line %] </p> </div> [% ELSE %] + [% INCLUDE 'report/photo.html' object=update %] <div class="update-text"> <div class="moderate-display"> [% add_links( update.text ) | html_para %] @@ -50,7 +51,6 @@ [% END %] </p> </div> - [% INCLUDE 'report/photo.html' object=update %] [% END %] </div> [% IF moderating %] diff --git a/templates/web/greenwich/around/_report_banner.html b/templates/web/greenwich/around/_report_banner.html new file mode 100644 index 000000000..52a869262 --- /dev/null +++ b/templates/web/greenwich/around/_report_banner.html @@ -0,0 +1,10 @@ +<h1 class="big-green-banner"> + [% loc( 'Click map to report a problem' ) %] +</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/greenwich/around/around_map_list_items.html b/templates/web/greenwich/around/around_map_list_items.html new file mode 100644 index 000000000..e69de29bb --- /dev/null +++ b/templates/web/greenwich/around/around_map_list_items.html diff --git a/templates/web/greenwich/around/intro.html b/templates/web/greenwich/around/intro.html new file mode 100644 index 000000000..81c0b55df --- /dev/null +++ b/templates/web/greenwich/around/intro.html @@ -0,0 +1,7 @@ +<h1>[% loc('Report a street cleaning or parks issue in Royal Greenwich') %]</h1> +<p> + Use this form for reporting cleaning problems on streets and parks in Greenwich, such as littering, flytipping, graffiti or overflowing bins. +</p> +<p> + To report other kinds of road and street problems like potholes, blocked drains, faulty street lamps or cracks in the pavement, please pick from our list of additional <a href="http://www.royalgreenwich.gov.uk/reportaproblem">reporting forms</a>. +</p> diff --git a/templates/web/greenwich/around/on_map_list_items.html b/templates/web/greenwich/around/on_map_list_items.html new file mode 100644 index 000000000..893f5c698 --- /dev/null +++ b/templates/web/greenwich/around/on_map_list_items.html @@ -0,0 +1,11 @@ +[% 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 new file mode 100644 index 000000000..0d7dfddfc --- /dev/null +++ b/templates/web/greenwich/around/tabbed_lists.html @@ -0,0 +1,5 @@ +[% 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/faq/faq-en-gb.html b/templates/web/greenwich/faq/faq-en-gb.html new file mode 100644 index 000000000..f143581d6 --- /dev/null +++ b/templates/web/greenwich/faq/faq-en-gb.html @@ -0,0 +1,134 @@ +[% 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> + <p> + Note that though most of these services are provided by the Royal Borough of Greenwich, + FixMyStreet will forward some categories of issue to Transport for London (TfL). + </p> + +<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 our main number + 020 8854 8888 and a message will direct you to the relevant Out of Hours + service. </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>Royal Borough of Greenwich 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 the Royal Borough of Greenwich district?</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="http://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 the Royal Borough of Greenwich, or TfL, as +appropriate. 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/makemyisland/footer.html b/templates/web/greenwich/footer.html index d2687a3a1..31ab35f52 100644 --- a/templates/web/makemyisland/footer.html +++ b/templates/web/greenwich/footer.html @@ -1,33 +1,44 @@ [% IF pagefooter %] - <footer role="content-info"> + <footer role="contentinfo"> [% INCLUDE 'front/footer-marketing.html' %] </footer> [% END %] </div><!-- .content role=main --> </div><!-- .container --> + [% IF c.cobrand.moniker == 'fixmystreet' AND bodyclass != 'mappage' %] + [% INCLUDE 'footer-nav.html' %] + [% END %] </div><!-- .table-cell --> <div class="nav-wrapper"> <div class="nav-wrapper-2"> <div id="main-nav" role="navigation"> + <ul id="mysoc-menu"> + <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="[% c.config.BASE_URL %]/"[% END %] class="report-a-problem-btn" + <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="[% c.config.BASE_URL %]/my"[% END + %]<li><[% IF c.req.uri.path == '/my' %]span[% ELSE %]a href="/my"[% END %]>[% loc("Your reports") %]</[% c.req.uri.path == '/my' ? 'span' : 'a' %]></li>[% - %]<li><[% IF c.req.uri.path == '/reports' %]span[% ELSE %]a href="[% c.config.BASE_URL %]/reports"[% END + %]<li><[% IF c.req.uri.path == '/reports/Royal+Borough+of+Greenwich' %]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="[% c.config.BASE_URL %]/alert[% pc ? '/list?pc=' : '' %][% pc | uri %]"[% END + %]<li><[% IF c.req.uri.path == '/alert' %]span[% ELSE %]a href="/alert[% pc ? '/list?pc=' : '' %][% pc | uri %]"[% END %]>[% loc("Local alerts") %]</[% c.req.uri.path == '/alert' ? 'span' : 'a' %]></li>[% - %]<li><[% IF c.req.uri.path == '/faq' %]span[% ELSE %]a href="[% c.config.BASE_URL %]/faq"[% END + %]<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="[% c.config.BASE_URL %]/privacy"[% END + %]<li id="top-nav-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 %] + </body> </html> diff --git a/templates/web/greenwich/front/footer-marketing.html b/templates/web/greenwich/front/footer-marketing.html new file mode 100644 index 000000000..66a75b5cc --- /dev/null +++ b/templates/web/greenwich/front/footer-marketing.html @@ -0,0 +1,31 @@ +<hr /> +<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> + +<div class="footer-nav"> + <ul> + <li><a href="http://www.royalgreenwich.gov.uk/contact" rel="nofollow">Contact us</a></li> + <li><a href="http://www.royalgreenwich.gov.uk/location" rel="nofollow">Location map</a></li> + <li><a href="http://www.royalgreenwich.gov.uk/terms" rel="nofollow">Terms & disclaimer</a></li> + <li><a href="http://www.royalgreenwich.gov.uk/accessibility" rel="nofollow">Accessibility statement</a></li> + <li><a href="http://www.royalgreenwich.gov.uk/statistics" rel="nofollow">Website statistics</a></li> + <li>© 2015 Royal Borough of Greenwich</li> + <li class="last"><a href="http://www.royalgreenwich.gov.uk/cookies">Cookies</a></li> + </ul> +</div> diff --git a/templates/web/greenwich/header_logo.html b/templates/web/greenwich/header_logo.html new file mode 100644 index 000000000..fa279bdc4 --- /dev/null +++ b/templates/web/greenwich/header_logo.html @@ -0,0 +1,29 @@ + <a href="http://www.royalgreenwich.gov.uk/" id="site-logo">[%- PROCESS 'site-name.html' -%]</a> +</div> +<div class="container main-menu-container"> + <ul id="greenwich-menu-desktop"> + <li><a href="http://www.royalgreenwich.gov.uk/pay">Make a payment</a></li> + <li><a href="http://www.royalgreenwich.gov.uk/apply">Apply for it</a></li> + <li><a href="/">Report a problem</a></li> + <li><a href="http://www.royalgreenwich.gov.uk/a_to_z">A to Z of services</a></li> + <li><a href="http://www.royalgreenwich.gov.uk/contact">Contact us</a></li> + <li><a href="http://www.royalgreenwich.gov.uk/about">About us</a></li> + </ul> + + <ul id="greenwich-breadcrumb"> + <li><a class="bc_arrow" href="http://www.royalgreenwich.gov.uk/">Home</a></li> + <li><a href="/">FixMyStreet</a></li> + </ul> + + <ul id="fms-menu-desktop"> + <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 + %]>[% loc("Your reports") %]</[% c.req.uri.path == '/my' ? 'span' : 'a' %]></li>[% + %]<li><[% IF c.req.uri.path == '/reports' %]span[% ELSE %]a href="/reports"[% END + %]>[% loc("All reports") %]</[% c.req.uri.path == '/reports' ? 'span' : 'a' %]></li>[% + %]<li><[% IF c.req.uri.path == '/alert' %]span[% ELSE %]a href="/alert[% pc ? '/list?pc=' : '' %][% pc | uri %]"[% END + %]>[% loc("Local alerts") %]</[% c.req.uri.path == '/alert' ? 'span' : 'a' %]></li>[% + %]<li><[% IF c.req.uri.path == '/faq' %]span[% ELSE %]a href="/faq"[% END + %]>[% loc("Help") %]</[% c.req.uri.path == '/faq' ? 'span' : 'a' %]></li> + </ul> diff --git a/templates/web/greenwich/my/_problem-list.html b/templates/web/greenwich/my/_problem-list.html new file mode 100644 index 000000000..1ff69f9fb --- /dev/null +++ b/templates/web/greenwich/my/_problem-list.html @@ -0,0 +1,25 @@ +<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/greenwich/reports/_list-entry.html b/templates/web/greenwich/reports/_list-entry.html new file mode 100644 index 000000000..cd70410d3 --- /dev/null +++ b/templates/web/greenwich/reports/_list-entry.html @@ -0,0 +1,6 @@ +<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> diff --git a/templates/web/greenwich/reports/_list-filters.html b/templates/web/greenwich/reports/_list-filters.html new file mode 100644 index 000000000..5d610261b --- /dev/null +++ b/templates/web/greenwich/reports/_list-filters.html @@ -0,0 +1,32 @@ +[% 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 new file mode 100644 index 000000000..45746e309 --- /dev/null +++ b/templates/web/greenwich/reports/_problem-list.html @@ -0,0 +1,19 @@ +<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 116b318a3..4558b2381 100644 --- a/templates/web/harrogate/footer.html +++ b/templates/web/harrogate/footer.html @@ -1,5 +1,5 @@ [% IF pagefooter %] - <footer role="content-info"> + <footer role="contentinfo"> [% INCLUDE 'front/footer-marketing.html' %] </footer> [% END %] diff --git a/templates/web/harrogate/header.html b/templates/web/harrogate/header.html index a1c0ba38a..e40a38d94 100644 --- a/templates/web/harrogate/header.html +++ b/templates/web/harrogate/header.html @@ -31,7 +31,7 @@ <link rel="canonical" href="https://www.fixmystreet.com[% c.req.uri.path_query %]"> [% END %] - [% TRY %][% PROCESS 'header_extra.html' %][% CATCH file %][% END %] + [% PROCESS 'header_extra.html' %] </head> [% TRY %][% PROCESS 'set_body_class.html' %][% CATCH file %][% END %] diff --git a/templates/web/harrogate/report/new/after_category.html b/templates/web/harrogate/report/new/after_category.html new file mode 100644 index 000000000..b67019353 --- /dev/null +++ b/templates/web/harrogate/report/new/after_category.html @@ -0,0 +1,48 @@ +<script> + // we link to the informational articles rather than the forms, because in some + // cases the former have more information or links to track progress of faults + // etc.. + var links = { + 'Bus stops': 'http://www.northyorks.gov.uk/article/25853/Bus-stops-and-shelters', + // Pavements/footpaths (multiple options) + 'Potholes': 'http://www.northyorks.gov.uk/article/25215/Roads---potholes', + // Roads/highways (multiple options) + 'Road traffic signs': 'http://www.northyorks.gov.uk/article/25667/Road-signs-and-bollards', + // Street lighting (not considered, as also a Harrogate category) + 'Traffic lights': 'http://www.northyorks.gov.uk/article/25626/Traffic-lights', + 'default': 'http://www.northyorks.gov.uk/article/28237/Report-it-online' + }; + $(function () { + var notice = $('.nycc-notice'); + $("#problem_form").on("change.category", "select#form_category", function(){ + var cat = $(this).val(); + if (cat.search(/NYCC/) > 0) { + cat = cat.replace(' (NYCC)', ''); + var link = links[cat] || links ['default']; + notice.find('a').attr({ href: link }); + notice.show(); + } + else { + notice.hide(); + } + + }); + }); +</script> +<noscript> + <p class="nycc-notice"> + Please report issues for categories labelled <b>(NYCC)</b> directly to + <a href="http://www.northyorks.gov.uk/article/28237/Report-it-online"> + North Yorkshire County Council. + </a> + </p> +</noscript> + +<p class="nycc-notice" style="display:none"> + Please report issues for <b>NYCC</b> managed categories directly to + <a href="http://www.northyorks.gov.uk/article/28237/Report-it-online"> + North Yorkshire County Council. + </a> +</p> + +<p><small>[% loc("Remember that FixMyStreet is primarily for reporting physical problems that can be fixed. If your problem is not appropriate for submission via this site remember that you can contact your council directly using their own website.") %]</small></p> diff --git a/templates/web/hart/header.html b/templates/web/hart/header.html index dcc202b5a..c2d363010 100644 --- a/templates/web/hart/header.html +++ b/templates/web/hart/header.html @@ -42,6 +42,8 @@ <link rel="Shortcut Icon" type="image/x-icon" href="/cobrands/hart/favicon.ico"> + [% PROCESS 'header_extra.html' %] + </head> [% TRY %][% PROCESS 'set_body_class.html' %][% CATCH file %][% END %] <body class="[% bodyclass | html IF bodyclass %]"> diff --git a/templates/web/hart/tokens/confirm_problem.html b/templates/web/hart/tokens/confirm_problem.html index 117d2d1bc..68223e92b 100644 --- a/templates/web/hart/tokens/confirm_problem.html +++ b/templates/web/hart/tokens/confirm_problem.html @@ -4,18 +4,16 @@ <p class="confirmed"> Thank you. You have successfully confirmed your report -[% IF c.cobrand.owns_problem( problem ) %] +[% IF c.cobrand.owns_problem( report ) %] and this will now be investigated by the council. -You can <a href="[% c.cobrand.base_url_for_report( problem ) %][% problem.url %]">view the problem on this site</a>. +You can <a href="[% c.cobrand.base_url_for_report( report ) %][% report.url %]">view the report on this site</a>. [% ELSE %] and this has now been passed on to [%# TODO make this generic %] <b>Hampshire County Council</b> to investigate. -Note that Hart District Council is not responsible for this type of problem. However you can continue to view your problem on the <a href="[% c.cobrand.base_url_for_report( problem ) %][% problem.url %]"><i>fixmystreet.com</i> website</a>. +Note that Hart District Council is not responsible for this type of problem. However you can continue to view your report on the <a href="[% c.cobrand.base_url_for_report( report ) %][% report.url %]"><i>fixmystreet.com</i> website</a>. [% END %] </p> -<p>Your reference for this problem is [% problem.id %], please quote it in any enquiries. +<p>Your reference for this report is [% report.id %], please quote it in any enquiries. </p> -[% display_crosssell_advert( problem.user.email, problem.name ) %] - [% INCLUDE 'footer.html' %] diff --git a/templates/web/makemyisland/_location_buttons.html b/templates/web/makemyisland/_location_buttons.html deleted file mode 100644 index 3604c466f..000000000 --- a/templates/web/makemyisland/_location_buttons.html +++ /dev/null @@ -1,15 +0,0 @@ -<div id="location-buttons"> - <!-- - Fonadhoo (the island) - Barasil (northern most) - Medhuavah (in the middle) - Kurigam (south) - --> - <div class="island-button"> - <a href="/around?pc=Fonadhoo" class="front-page-button">Fonadhoo island</a> - </div> - <a href="/around?latitude=1.846;longitude=73.510" class="front-page-button">Barasil</a> - <a href="/around?latitude=1.833;longitude=73.501" class="front-page-button">Medhuavah</a> - <a href="/around?latitude=1.822;longitude=73.488" class="front-page-button">Kurigam</a> - -</div> diff --git a/templates/web/makemyisland/around/postcode_form.html b/templates/web/makemyisland/around/postcode_form.html deleted file mode 100644 index 81cf948ef..000000000 --- a/templates/web/makemyisland/around/postcode_form.html +++ /dev/null @@ -1,8 +0,0 @@ -<div id="front-main"> - <div id="front-main-container"> - <h1>Report, view, or discuss local problems</h1> - <h2>(dumping waste, street lighting, erosion)</h2> - [% INCLUDE '_location_buttons.html' %] - </div> -</div> - diff --git a/templates/web/makemyisland/header_logo.html b/templates/web/makemyisland/header_logo.html deleted file mode 100644 index 5d8b285dc..000000000 --- a/templates/web/makemyisland/header_logo.html +++ /dev/null @@ -1,2 +0,0 @@ - <a href="http://www.undp.org/" id="united-nations-dp-logo">UNDP</a> - <a href="[% c.config.BASE_URL %]/" id="site-logo">[% PROCESS 'site-name.html -%]</a> diff --git a/templates/web/makemyisland/site-name.html b/templates/web/makemyisland/site-name.html deleted file mode 100644 index 3eb903cd1..000000000 --- a/templates/web/makemyisland/site-name.html +++ /dev/null @@ -1 +0,0 @@ -MakeMyIsland diff --git a/templates/web/oxfordshire/around/_report_banner.html b/templates/web/oxfordshire/around/_report_banner.html new file mode 100644 index 000000000..52a869262 --- /dev/null +++ b/templates/web/oxfordshire/around/_report_banner.html @@ -0,0 +1,10 @@ +<h1 class="big-green-banner"> + [% loc( 'Click map to report a problem' ) %] +</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/oxfordshire/around/around_map_list_items.html b/templates/web/oxfordshire/around/around_map_list_items.html new file mode 100644 index 000000000..e69de29bb --- /dev/null +++ b/templates/web/oxfordshire/around/around_map_list_items.html diff --git a/templates/web/oxfordshire/around/extra_text.html b/templates/web/oxfordshire/around/extra_text.html index 439bf00a2..107d3324f 100644 --- a/templates/web/oxfordshire/around/extra_text.html +++ b/templates/web/oxfordshire/around/extra_text.html @@ -1,5 +1,3 @@ <div class="extra-text"> <p>Please do not use this form for reporting <a href="/faq#pothole" target="_blank">emergencies and urgent problems</a>.</p> - - <p><img src="/i/pin-yellow.png" class="extra-text__image" width="48" height="64" /> - <b>these are problems that have already been reported</b>.<br>Click them to see more details.</p> </div> diff --git a/templates/web/oxfordshire/around/on_map_list_items.html b/templates/web/oxfordshire/around/on_map_list_items.html new file mode 100644 index 000000000..893f5c698 --- /dev/null +++ b/templates/web/oxfordshire/around/on_map_list_items.html @@ -0,0 +1,11 @@ +[% 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 new file mode 100644 index 000000000..0d7dfddfc --- /dev/null +++ b/templates/web/oxfordshire/around/tabbed_lists.html @@ -0,0 +1,5 @@ +[% 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/faq/faq-en-gb.html b/templates/web/oxfordshire/faq/faq-en-gb.html index ddf3fc44d..b85943e0d 100755 --- a/templates/web/oxfordshire/faq/faq-en-gb.html +++ b/templates/web/oxfordshire/faq/faq-en-gb.html @@ -28,7 +28,7 @@ </p> <p> If you are reporting an emergency please do not report it online, but ring our - Customer Service Centre on <strong>0845 310 111</strong>. + Customer Service Centre on <strong>0845 310 1111</strong>. </p> <p> Here is a <a href="http://vimeo.com/65813425">short video</a> diff --git a/templates/web/oxfordshire/footer.html b/templates/web/oxfordshire/footer.html index e654889dd..ed84c0ad6 100644 --- a/templates/web/oxfordshire/footer.html +++ b/templates/web/oxfordshire/footer.html @@ -1,5 +1,5 @@ [% IF pagefooter %] - <footer role="content-info"> + <footer role="contentinfo"> <p><a href="/privacy">Privacy and cookies</a></p> </footer> [% END %] diff --git a/templates/web/oxfordshire/header.html b/templates/web/oxfordshire/header.html index 19bb23374..bc52a0720 100644 --- a/templates/web/oxfordshire/header.html +++ b/templates/web/oxfordshire/header.html @@ -24,73 +24,60 @@ <script src="[% start %][% version('/cobrands/oxfordshire/position_map.js') %]" charset="utf-8"></script> [% INCLUDE 'common_header_tags.html', js_override = '/cobrands/fixmystreet/fixmystreet.js' %] [% extra_js %] - + [% INCLUDE 'tracking_code.html' %] + [% PROCESS 'header_extra.html' %] </head> <body class="[% bodyclass | html IF bodyclass %]"> <div id="oxford-wrapper"> - <div id="oxford-header" class="desk-only oxford-left"> - <a href="http://www.oxfordshire.gov.uk/" title="Home" class="logo">Oxfordshire County Council<span></span></a> - <span id="oxford-links"> - <a href="http://www.oxfordshire.gov.uk/" title="">Oxfordshire County Council home</a> - </span> - <div style="clear:both"></div> - <span class="header"><a href="/">Report a road or street problem</a></span> - <div class="oxford-user"> - <p> - [% IF c.user_exists %] - [% tprintf(loc('Hi %s'), c.user.name || c.user.email) %] - <a href="/auth/sign_out">[% loc('sign out') %]</a> - [% END %] - </p> - </div> - - - <div id="navigation"> - <div class="menubar"> - <div class="menu-inner"> - <ul class="menu"> - <li> - <[% IF c.req.uri.path == '/' %]span[% ELSE %]a href="/"[% END %]>[% "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/Oxfordshire' %]span[% ELSE %]a href="/reports/Oxfordshire"[% END - %]>[% loc("All reports") %]</[% c.req.uri.path == '/reports' ? 'span' : 'a' %]> - </li> - <li> - <[% IF c.req.uri.path == '/alert' %]span[% ELSE %]a href="/alert[% pc ? '/list?pc=' : '' %][% pc | uri %]"[% END - %]>[% loc("Local alerts") %]</[% c.req.uri.path == '/alert' ? 'span' : 'a' %]> - </li> - <li> - <[% IF c.req.uri.path == '/faq' %]span[% ELSE %]a href="/faq"[% END - %]>[% loc("Help") %]</[% c.req.uri.path == '/faq' ? 'span' : 'a' %]> - </li> - </ul> - </div> + <div id="oxford-header" class="desk-only oxford-left"> + <a href="http://www.oxfordshire.gov.uk/" title="Home" class="logo">Oxfordshire County Council<span></span></a> + <span id="oxford-links"> + <a href="http://www.oxfordshire.gov.uk/" title="">Oxfordshire County Council home</a> + </span> + <div style="clear:both"></div> + <span class="header"><a href="/">Report a road or street problem</a></span> + + [% IF c.user_exists %] + <div class="oxford-user"> + <p> + [% tprintf(loc('Hi %s'), c.user.name || c.user.email) %] + <a href="/auth/sign_out">[% loc('Sign out') %]</a> + </p> + </div> + [% END %] + + <div id="navigation"> + <div class="menubar"> + <div class="menu-inner"> + <ul class="menu"> + <li> + <[% IF c.req.uri.path == '/' %]span[% ELSE %]a href="/"[% END %]>[% "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/Oxfordshire' %]span[% ELSE %]a href="/reports/Oxfordshire"[% END + %]>[% loc("All reports") %]</[% c.req.uri.path == '/reports' ? 'span' : 'a' %]> + </li> + <li> + <[% IF c.req.uri.path == '/alert' %]span[% ELSE %]a href="/alert[% pc ? '/list?pc=' : '' %][% pc | uri %]"[% END + %]>[% loc("Local alerts") %]</[% c.req.uri.path == '/alert' ? 'span' : 'a' %]> + </li> + <li> + <[% IF c.req.uri.path == '/faq' %]span[% ELSE %]a href="/faq"[% END + %]>[% loc("Help") %]</[% c.req.uri.path == '/faq' ? 'span' : 'a' %]> + </li> + </ul> + </div> </div> </div> - - - - - </div> <!-- end of oxford header --> -<!-- - <div id="oxford-main-menu" class="desk-only"> - <ul class="tabs"> - <li class="home first"></li>[% - %]<li></li>[% - %]<li></li>[% - %]<li></li>[% - %]<li class="last"></li> - </ul> - </div> ---> - + + </div> <!-- end of oxford header --> + <div class="wrapper"> <div class="table-cell"> @@ -104,7 +91,7 @@ [% IF c.user_exists %] <div id="user-meta"> <p> - [% tprintf(loc('Hi %s'), c.user.name || c.user.email) %] + [% tprintf(loc('Hi %s'), c.user.name || c.user.email) %] <a href="/auth/sign_out">[% loc('sign out') %]</a> </p> </div> diff --git a/templates/web/oxfordshire/js/translation_strings.html b/templates/web/oxfordshire/js/translation_strings.html deleted file mode 100644 index e326da0a8..000000000 --- a/templates/web/oxfordshire/js/translation_strings.html +++ /dev/null @@ -1,40 +0,0 @@ - translation_strings = { - update: '[% loc('Please enter a message') | replace("'", "\\'") %]', - title: '[% loc('Please enter a subject') | replace("'", "\\'") %]', - detail: '[% loc('Please enter some details') | replace("'", "\\'") %]', - name: { - required: '[% loc('Please enter your name') | replace("'", "\\'") %]', - validName: '[% loc('Please enter your full name, councils need this information – if you do not wish your name to be shown on the site, untick the box below') | replace("'", "\\'") %]' - }, - category: '[% loc('Please choose a category') | replace("'", "\\'") %]', - rznvy: { - required: '[% loc('Please enter your email') | replace("'", "\\'") %]', - email: '[% loc('Please enter a valid email') | replace("'", "\\'") %]' - }, - email: { - required: '[% loc('Please enter your email') | replace("'", "\\'") %]', - email: '[% loc('Please enter a valid email') | replace("'", "\\'") %]' - }, - fms_extra_title: '[% loc('Please enter your title') | replace("'", "\\'") %]', - first_name: '[% loc('Please enter your first name') | replace("'", "\\'") %]', - last_name: '[% loc('Please enter your second name') | replace("'", "\\'") %]', - geolocate: '[% loc('or locate me automatically') | replace("'", "\\'") %]', - right_place: '[% loc('Right place?') | replace("'", "\\'") %]', - try_again: '[% loc('Try again') | replace("'", "\\'") %]', - place_pin_on_map: '[% loc('Place pin on map') | replace("'", "\\'") %]', - home: '[% loc('Home') | replace("'", "\\'") %]', - back: '[% loc('Back') | replace("'", "\\'") %]', - how_to_send: '[% loc('How to send successful reports') | replace("'", "\\'") %]', - more_details: '[% loc('Details') | replace("'", "\\'") %]', - - geolocation_declined: '[% loc('You declined; please fill in the box above') | replace("'", "\\'") %]', - geolocation_no_position: '[% loc('Could not look up location') | replace("'", "\\'") %]', - geolocation_no_result: '[% loc('No result returned') | replace("'", "\\'") %]', - geolocation_unknown: '[% loc('Unknown error') | replace("'", "\\'") %]', - - reporting_a_problem: '[% loc('Reporting a problem') | replace("'", "\\'") %]', - ok: '[% loc('OK') | replace("'", "\\'") %]', - map: '[% loc('MAP') | replace("'", "\\'") %]', - - report_problem_heading: '[% loc('Click on the map to report a problem') | replace("'", "\\'") %]' - }; diff --git a/templates/web/oxfordshire/my/_problem-list.html b/templates/web/oxfordshire/my/_problem-list.html new file mode 100644 index 000000000..1ff69f9fb --- /dev/null +++ b/templates/web/oxfordshire/my/_problem-list.html @@ -0,0 +1,25 @@ +<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/report/_council_sent_info.html b/templates/web/oxfordshire/report/_council_sent_info.html index 464c10256..499fd4637 100644 --- a/templates/web/oxfordshire/report/_council_sent_info.html +++ b/templates/web/oxfordshire/report/_council_sent_info.html @@ -1,16 +1,24 @@ [% IF problem.whensent || problem.can_display_external_id %] - <small class="council_sent_info"><br> - [% IF problem.whensent %] - [% problem.duration_string(c) %]<br> - [% END %] - <strong> - [% IF problem.can_display_external_id %] - [% IF problem.whensent %] - Council ref: [% problem.external_id %] - [% ELSE %] - [% problem.external_body %] ref: [% problem.external_id %] - [% END %] - [% END %] - </strong> - </small> + <div class="council_info_box"> + [% IF problem.can_display_external_id %] + <h3> + [% IF problem.whensent %] + Council ref: [% problem.external_id %] + [% ELSE %] + [% problem.external_body %] ref: [% problem.external_id %] + [% END %] + </h3> + [% END %] + + [% IF c.cobrand.problem_response_days(problem) > 0 %] + <p> + Problems in the + [% problem.category %] + category are generally responded to within + [% c.cobrand.problem_response_days(problem) %] + working days. + </p> + [% END %] + + </div> [% END %] diff --git a/templates/web/oxfordshire/report/_main.html b/templates/web/oxfordshire/report/_main.html new file mode 100644 index 000000000..3bb786141 --- /dev/null +++ b/templates/web/oxfordshire/report/_main.html @@ -0,0 +1,98 @@ +[% moderating = c.user && c.user.has_permission_to('moderate', problem.bodies_str) %] + +[% IF moderating %] +[%# TODO: extract stylesheet! %] +<style> + .moderate-edit label { + display: inline-block; + height: 1em; + margin-top: 0; + } + + .moderate-edit input { + display: inline-block; + } + + .moderate-edit { display: none } + .moderate-edit :disabled { + background: #ddd; + } + br { + line-height: 0.5em; + } +</style> +[% END %] + +<div class="problem-header cf" problem-id="[% problem.id %]"> + [% IF moderating %] + [% original = problem.moderation_original_data %] + <form method="post" action="/moderate/report/[% problem.id %]"> + <input type="button" class="btn moderate moderate-display" value="moderate"> + <div class="moderate-edit"> + <input type="checkbox" class="hide-document" name="problem_hide"> + <label for="problem_hide">Hide report completely?</label> + <br /> + <input type="checkbox" name="problem_show_name" [% problem.anonymous ? '' : 'checked' %]> + <label for="problem_show_name">Show name publicly?</label> + [% IF problem.photo or original.photo %] + <br /> + <input type="checkbox" name="problem_show_photo" [% problem.photo ? 'checked' : '' %]> + <label for="problem_show_photo">Show Photo?</label> + [% END %] + </div> + [% END %] + <h1 class="moderate-display">[% problem.title | html %]</h1> + [% IF moderating %] + <div class="moderate-edit"> + [% IF problem.title != original.title %] + <input type="checkbox" name="problem_revert_title" class="revert-title"> + <label for="problem_revert_title">Revert to original title</label> + [% END %] + <h1><input type="text" name="problem_title" value="[% problem.title | html %]"></h1> + </div> + [% END %] + + <p class="report_meta_info"> + [% problem.meta_line(c) | html %] + [%- IF !problem.used_map AND c.cobrand.moniker != 'emptyhomes' %]; <strong>([% loc('there is no pin shown as the user did not use the map') %])</strong>[% END %] + </p> + [% IF problem.whensent %] + <p class="council_sent_info">[% problem.duration_string(c) %]</p> + [% END %] + [% mlog = problem.latest_moderation_log_entry(); IF mlog %] + <p>Moderated by [% mlog.user.from_body.name %] at [% prettify_dt(mlog.whenedited) %]</p> + [% END %] + + [% INCLUDE 'report/_support.html' %] + + [% INCLUDE 'report/photo.html' object=problem %] + <div class="moderate-display"> + [% add_links( problem.detail ) | html_para %] + </div> + + [% IF moderating %] + <div class="moderate-edit"> + [% IF problem.detail != original.detail %] + <input type="checkbox" name="problem_revert_detail" class="revert-textarea"> + <label for="problem_revert_detail">Revert to original text</label> + [% END %] + <textarea name="problem_detail">[% add_links( problem.detail ) %]</textarea> + </div> + + <div class="moderate-edit"> + <label for="moderation_reason">Moderation reason:</label> + <input type="text" name="moderation_reason" placeholder="Describe why you are moderating this"> + <input type="submit" class="red-btn" value="Moderate it"> + <input type="button" class="btn cancel" value="cancel"> + </div> + </form> + [% END %] + + [% IF problem.bodies_str %] + [% INCLUDE 'report/_council_sent_info.html' %] + [% ELSE %] + <div class="council_info_box"> + <p>[% loc('Not reported to council') %]</p> + </div> + [% END %] +</div> diff --git a/templates/web/oxfordshire/reports/_list-entry.html b/templates/web/oxfordshire/reports/_list-entry.html new file mode 100644 index 000000000..cd70410d3 --- /dev/null +++ b/templates/web/oxfordshire/reports/_list-entry.html @@ -0,0 +1,6 @@ +<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> diff --git a/templates/web/oxfordshire/reports/_list-filters.html b/templates/web/oxfordshire/reports/_list-filters.html new file mode 100644 index 000000000..5d610261b --- /dev/null +++ b/templates/web/oxfordshire/reports/_list-filters.html @@ -0,0 +1,32 @@ +[% 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/display_location.html b/templates/web/seesomething/around/display_location.html index ea0a499f7..b54311264 100644 --- a/templates/web/seesomething/around/display_location.html +++ b/templates/web/seesomething/around/display_location.html @@ -4,8 +4,8 @@ '/report/new', { pc => pc - latitude => short_latitude, - longitude => short_longitude, + latitude => latitude, + longitude => longitude, skipped => 1, } ); @@ -25,8 +25,8 @@ [% END %] <input type="hidden" name="pc" value="[% pc | html %]"> - <input type="hidden" name="latitude" id="fixmystreet.latitude" value="[% short_latitude | html %]"> - <input type="hidden" name="longitude" id="fixmystreet.longitude" value="[% short_longitude | html %]"> + <input type="hidden" name="latitude" id="fixmystreet.latitude" value="[% latitude | html %]"> + <input type="hidden" name="longitude" id="fixmystreet.longitude" value="[% longitude | html %]"> [% map_html %] diff --git a/templates/web/seesomething/report/new/category.html b/templates/web/seesomething/report/new/category.html index 8c837a047..691c38497 100644 --- a/templates/web/seesomething/report/new/category.html +++ b/templates/web/seesomething/report/new/category.html @@ -4,7 +4,7 @@ category = category | lower; END; %] <label for='form_category' class="select">[% loc('Category') %]</label> - <select name='category' data-theme="c" id='form_category'[% ' onchange="form_category_onchange()"' IF category_extras.size %]> + <select name='category' data-theme="c" id='form_category'> [% FOREACH cat_op IN category_options %] [% cat_op_lc = cat_op | lower %] <option value='[% cat_op | html %]'[% ' selected' IF report.category == cat_op || category == cat_op_lc %]>[% cat_op | html %]</option> diff --git a/templates/web/seesomething/report_created.html b/templates/web/seesomething/tokens/confirm_problem.html index 4a11d14b4..4a11d14b4 100644 --- a/templates/web/seesomething/report_created.html +++ b/templates/web/seesomething/tokens/confirm_problem.html diff --git a/templates/web/stevenage/footer.html b/templates/web/stevenage/footer.html index 955b86356..454da2bd9 100644 --- a/templates/web/stevenage/footer.html +++ b/templates/web/stevenage/footer.html @@ -1,5 +1,5 @@ [% IF pagefooter %] - <footer role="content-info"> + <footer role="contentinfo"> <div class="tablewrapper bordered"> <div id="footer-mobileapps"> <h4>Mobile apps</h4> diff --git a/templates/web/stevenage/header.html b/templates/web/stevenage/header.html index dbcc37866..155b35b64 100644 --- a/templates/web/stevenage/header.html +++ b/templates/web/stevenage/header.html @@ -23,6 +23,8 @@ [% INCLUDE 'common_header_tags.html', js_override = '/cobrands/fixmystreet/fixmystreet.js' %] [% extra_js %] + [% INCLUDE 'tracking_code.html' %] + [% PROCESS 'header_extra.html' %] </head> <body class="[% bodyclass | html IF bodyclass %]"> diff --git a/templates/web/stevenage/tracking_code.html b/templates/web/stevenage/tracking_code.html new file mode 100644 index 000000000..e7c2bafd6 --- /dev/null +++ b/templates/web/stevenage/tracking_code.html @@ -0,0 +1,16 @@ +[% IF c.config.BASE_URL == "https://www.fixmystreet.com" %] + +<script> + (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){ + (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o), + m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m) + })(window,document,'script','//www.google-analytics.com/analytics.js','ga'); + + ga('create', 'UA-21613820-7', 'auto'); + ga('send', 'pageview'); + +</script> + +[% ELSE %] +<!-- Tracking code not inserted as "[% c.config.BASE_URL %]" not "https://www.fixmystreet.com" --> +[% END %] diff --git a/templates/web/trinidadtobago/footer.html b/templates/web/trinidadtobago/footer.html index 4a8144ccf..4ef368c0d 100644 --- a/templates/web/trinidadtobago/footer.html +++ b/templates/web/trinidadtobago/footer.html @@ -1,5 +1,5 @@ [% IF pagefooter %] - <footer role="content-info"> + <footer role="contentinfo"> <p><a href="/privacy">Privacy and cookies</a></p> </footer> [% END %] diff --git a/templates/web/trinidadtobago/header_logo.html b/templates/web/trinidadtobago/header_logo.html new file mode 100644 index 000000000..d5da7e6b2 --- /dev/null +++ b/templates/web/trinidadtobago/header_logo.html @@ -0,0 +1 @@ + <a href="[% c.config.BASE_URL %]/" id="site-logo">[% PROCESS 'site-name.html' -%]</a> diff --git a/templates/web/trinidadtobago/site-name.html b/templates/web/trinidadtobago/site-name.html new file mode 100644 index 000000000..d9c3f19c7 --- /dev/null +++ b/templates/web/trinidadtobago/site-name.html @@ -0,0 +1 @@ +FixMyStreeTT diff --git a/templates/web/warwickshire/header.html b/templates/web/warwickshire/header.html index 1d52b5546..274a78ce7 100644 --- a/templates/web/warwickshire/header.html +++ b/templates/web/warwickshire/header.html @@ -32,6 +32,7 @@ [% INCLUDE 'common_header_tags.html', js_override = '/cobrands/fixmystreet/fixmystreet.js' %] [% extra_js %] + [% PROCESS 'header_extra.html' %] </head> [% TRY %][% PROCESS 'set_body_class.html' %][% CATCH file %][% END %] diff --git a/templates/web/zerotb/index.html b/templates/web/zerotb/index.html index 754dcbabc..4d0d6555c 100644 --- a/templates/web/zerotb/index.html +++ b/templates/web/zerotb/index.html @@ -9,7 +9,7 @@ Modernizr.load({ load: [ "preload![% version('/js/OpenLayers.fixmystreet.js') %]", "preload![% version('/js/map-OpenLayers.js') %]", - "preload![% version('/js/map-bing-ol.js') %]", + "preload![% version('/js/map-OpenStreetMap.js') %]", "preload![% version('/js/jquery.ba-hashchange.min.js') %]" ] }); diff --git a/templates/web/zerotb/report/display.html b/templates/web/zerotb/report/display.html index 9161fb586..9848c89db 100644 --- a/templates/web/zerotb/report/display.html +++ b/templates/web/zerotb/report/display.html @@ -15,17 +15,11 @@ [% INCLUDE 'report/banner.html' %] -[% IF c.flash.comment_created %] -<p> -[% loc('Your report has been sent') %] -</p> -[% END %] - [% INCLUDE 'report/_main.html' %] <div class="shadow-wrap"> <ul id="key-tools"> - <li><a class="chevron" id="key-tool-problems-nearby" href="[% c.uri_for( '/around', { lat => short_latitude, lon => short_longitude } ) %]">[% loc( 'Clinics nearby' ) %]</a></li> + <li><a class="chevron" id="key-tool-problems-nearby" href="[% c.uri_for( '/around', { lat => latitude, lon => longitude } ) %]">[% loc( 'Clinics nearby' ) %]</a></li> </ul> </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 67471867a..28d9ebe68 100644 --- a/templates/web/zurich/report/new/fill_in_details_form.html +++ b/templates/web/zurich/report/new/fill_in_details_form.html @@ -45,24 +45,7 @@ [% END %] <textarea rows="7" cols="26" name="detail" id="form_detail" placeholder="[% loc('Please fill in details of the problem.') %]" required>[% report.detail | html %]</textarea> - [% IF js %] - <div id="form_category_row"> - <label for="form_category">[% loc('Category') %]</label> - <select name="category" id="form_category" required><option>[% loc('Loading...') %]</option></select> - </div> - [% ELSE %] - [% IF category_options.size %] - [% IF field_errors.category %] - <p class='form-error'>[% field_errors.category %]</p> - [% END %] - - [% PROCESS "report/new/category.html" %] - [% END %] - [% END %] - - [%- IF category_extras %] - [% PROCESS "report/new/category_extras.html" %] - [%- END %] + [% PROCESS "report/new/category_wrapper.html" %] [% IF c.cobrand.allow_photo_upload %] <label for="form_photo">[% loc('Photo') %]</label> diff --git a/templates/web/zurich/tokens/confirm_problem.html b/templates/web/zurich/tokens/confirm_problem.html index d61cf3ffa..d2025f124 100644 --- a/templates/web/zurich/tokens/confirm_problem.html +++ b/templates/web/zurich/tokens/confirm_problem.html @@ -6,8 +6,8 @@ loc('You have successfully confirmed your email address.'); tprintf( loc( 'You can <a href="%s%s">view the problem on this site</a>.' ), - c.cobrand.base_url_for_report( problem ), - problem.url + c.cobrand.base_url_for_report( report ), + report.url ); %] </p> |