diff options
| -rw-r--r-- | perllib/FixMyStreet/App/View/Web.pm | 8 | ||||
| -rwxr-xr-x | templates/web/barnet/faq/faq-en-gb.html | 2 | ||||
| -rwxr-xr-x | templates/web/default/faq/faq-en-gb.html | 2 | ||||
| -rw-r--r-- | templates/web/default/report/updates.html | 2 | ||||
| -rwxr-xr-x | templates/web/fixmystreet/faq/faq-en-gb.html | 4 | ||||
| -rw-r--r-- | templates/web/fixmystreet/report/banner.html | 2 | ||||
| -rw-r--r-- | templates/web/oxfordshire/report/new/councils_text_all.html | 3 | ||||
| -rwxr-xr-x | templates/web/zurich/faq/faq-de-ch.html | 8 |
8 files changed, 18 insertions, 13 deletions
diff --git a/perllib/FixMyStreet/App/View/Web.pm b/perllib/FixMyStreet/App/View/Web.pm index febeaf3c1..8d3775ddc 100644 --- a/perllib/FixMyStreet/App/View/Web.pm +++ b/perllib/FixMyStreet/App/View/Web.pm @@ -121,10 +121,16 @@ sub add_links { $text =~ s/\r//g; $text = ent($text); - $text =~ s{(https?://[^\s]+)}{<a href="$1">$1</a>}g; + $text =~ s{(https?://)([^\s]+)}{"<a href='$1$2'>$1" . _space_slash($2) . '</a>'}ge; return $text; } +sub _space_slash { + my $t = shift; + $t =~ s{/(?!$)}{/ }g; + return $t; +} + =head2 escape_js Used to escape strings that are going to be put inside JavaScript. diff --git a/templates/web/barnet/faq/faq-en-gb.html b/templates/web/barnet/faq/faq-en-gb.html index 126a03314..08bb744a6 100755 --- a/templates/web/barnet/faq/faq-en-gb.html +++ b/templates/web/barnet/faq/faq-en-gb.html @@ -7,7 +7,7 @@ <li>flyposting or graffiti <li>flytipping or litter <li>streetcleaning, such as broken glass in a cycle lane - <li>unlit lamposts + <li>unlit lampposts <li>broken playground equipment <li>potholes </ul> diff --git a/templates/web/default/faq/faq-en-gb.html b/templates/web/default/faq/faq-en-gb.html index 26f93afb8..bf47a1420 100755 --- a/templates/web/default/faq/faq-en-gb.html +++ b/templates/web/default/faq/faq-en-gb.html @@ -18,7 +18,7 @@ or clearing</strong>, such as: <li>Flytipping or litter <li>Streetcleaning, such as broken glass in a cycle lane [% IF c.cobrand.moniker != 'southampton' %] - <li>Unlit lamposts + <li>Unlit lampposts [% END %] <li>Potholes </ul> diff --git a/templates/web/default/report/updates.html b/templates/web/default/report/updates.html index 04a8bec33..c2aad42f9 100644 --- a/templates/web/default/report/updates.html +++ b/templates/web/default/report/updates.html @@ -28,7 +28,7 @@ [%- IF update.mark_open %][% update_state = ", " _ loc( 'reopened' ) %][% END %] [%- IF !update_state && update.problem_state %] [%- state = update.meta_problem_state %] - [%- IF ( c.cobrand.moniker == 'bromley' OR update.user.council == 'Bromley Council' ) AND update.problem_state == 'unable to fix' %] + [%- IF ( c.cobrand.moniker == 'bromley' OR update.user.body == 'Bromley Council' ) AND update.problem_state == 'unable to fix' %] [%- state = loc('no further action') %] [% END %] [%- IF update.problem_state == 'confirmed' AND global.last_state != '' %] diff --git a/templates/web/fixmystreet/faq/faq-en-gb.html b/templates/web/fixmystreet/faq/faq-en-gb.html index 8628085e5..3fe8d5af9 100755 --- a/templates/web/fixmystreet/faq/faq-en-gb.html +++ b/templates/web/fixmystreet/faq/faq-en-gb.html @@ -32,7 +32,7 @@ or clearing</strong>, such as: <li>Flytipping or litter <li>Streetcleaning, such as broken glass in a cycle lane [% IF c.cobrand.moniker != 'southampton' %] - <li>Unlit lamposts + <li>Unlit lampposts [% END %] <li>Potholes </ul> @@ -80,12 +80,14 @@ href="https://secure.mysociety.org/donate/">please do</a>.</dd> the size of your screen automatically. We plan to release updated native apps in the near future. <ul> +<!-- <li><em>iPhone:</em> Our basic app from 2008 is available for download on the App Store: <a href="http://itunes.apple.com/gb/app/fixmystreet/id297456545">FixMyStreet</a>, <li><em>Android:</em> A volunteer, Anna Powell-Smith, has written an app available from the <a href="https://market.android.com/details?id=com.android.fixmystreet">Android Market</a>. +--> <li><em>Nokia:</em> A volunteer, Thomas Forth, has written an app available from the <a href="http://store.ovi.com/content/107557">Ovi Store</a>. </ul> diff --git a/templates/web/fixmystreet/report/banner.html b/templates/web/fixmystreet/report/banner.html index 25c9db424..307a6f7ae 100644 --- a/templates/web/fixmystreet/report/banner.html +++ b/templates/web/fixmystreet/report/banner.html @@ -5,7 +5,7 @@ </div> [% END %] -[% IF c.cobrand.moniker != 'bromley' AND problem.council != '2482' AND problem.is_open AND date.now - problem.lastupdate_local.epoch > 8 * 7 * 24 * 60 * 60 %] +[% IF c.cobrand.moniker != 'bromley' AND problem.bodies_str != '2482' AND problem.is_open AND date.now - problem.lastupdate_local.epoch > 8 * 7 * 24 * 60 * 60 %] [% INCLUDE banner, id = 'unknown', text = loc('Unknown') %] [% END %] [% IF problem.is_fixed %] diff --git a/templates/web/oxfordshire/report/new/councils_text_all.html b/templates/web/oxfordshire/report/new/councils_text_all.html index a7babd2db..638c9d7de 100644 --- a/templates/web/oxfordshire/report/new/councils_text_all.html +++ b/templates/web/oxfordshire/report/new/councils_text_all.html @@ -13,8 +13,7 @@ </div> <p>You can use this form to report a problem or to make an enquiry about roads -and pavements in your area. All the information you provide here will be sent -to <strong>[% all_council_names.join( '</strong> or <strong>' ) %]</strong>. +and pavements in your area. The subject and details of the problem will be public, plus your name if you give us permission. If you report a fault on a road that is not owned by Oxfordshire County Council we will pass the report on to the relevant body. diff --git a/templates/web/zurich/faq/faq-de-ch.html b/templates/web/zurich/faq/faq-de-ch.html index a739f1b74..a354810df 100755 --- a/templates/web/zurich/faq/faq-de-ch.html +++ b/templates/web/zurich/faq/faq-de-ch.html @@ -28,9 +28,7 @@ or clearing</strong>, such as: <li>Flyposting or graffiti <li>Flytipping or litter <li>Streetcleaning, such as broken glass in a cycle lane - [% IF c.cobrand.moniker != 'southampton' %] - <li>Unlit lamposts - [% END %] + <li>Unlit lampposts <li>Potholes </ul> </dd> @@ -64,8 +62,8 @@ the problem.</dd> <dt>How are the problems solved?</dt> <dd>They are reported to the [% IF !c.cobrand.is_council %]relevant[% END %] council by email. The council can then resolve the problem the way they normally would. -Alternatively, you can discuss the problem on the website with others[% IF c.cobrand.moniker != 'southampton' %], and -then together lobby the council to fix it, or fix it directly yourselves[% END %].</dd> +Alternatively, you can discuss the problem on the website with others, and +then together lobby the council to fix it, or fix it directly yourselves.</dd> <dt>Is it free?</dt> <dd>The site is free to use, yes. FixMyStreet is run by a registered charity, though, so if you want to make a contribution, <a |