aboutsummaryrefslogtreecommitdiffstats
path: root/templates/web/default
diff options
context:
space:
mode:
Diffstat (limited to 'templates/web/default')
-rw-r--r--templates/web/default/alert/index.html2
-rw-r--r--templates/web/default/alert/list.html2
-rw-r--r--templates/web/default/around/around_index.html2
-rwxr-xr-xtemplates/web/default/around/display_location.html4
-rw-r--r--templates/web/default/auth/general.html2
-rwxr-xr-xtemplates/web/default/faq/faq-en-gb.html2
-rw-r--r--templates/web/default/index.html2
-rw-r--r--templates/web/default/js_validation_msgs.html2
-rw-r--r--templates/web/default/maps/openlayers.html12
-rw-r--r--templates/web/default/maps/pins_js.html2
-rw-r--r--templates/web/default/report/new/fill_in_details_form.html2
-rwxr-xr-xtemplates/web/default/reports/council.html7
-rw-r--r--templates/web/default/static/fun.html4
13 files changed, 17 insertions, 28 deletions
diff --git a/templates/web/default/alert/index.html b/templates/web/default/alert/index.html
index d8478cf98..274d61780 100644
--- a/templates/web/default/alert/index.html
+++ b/templates/web/default/alert/index.html
@@ -30,7 +30,7 @@ postcode or street name and area:' ) %]
<h2>[% loc('Some photos of recent reports') %]</h2>
[% FOREACH p IN photos %]
<a href="/report/[% p.id %]"><img border="0" height="100"
- src="/photo?tn=1;id=[% p.id %]" alt="[% p.title | html %]" title="[% p.title | html %]"></a>
+ src="/photo/[% p.id %].tn.jpeg" alt="[% p.title | html %]" title="[% p.title | html %]"></a>
[% END %]
</div>
[% END %]
diff --git a/templates/web/default/alert/list.html b/templates/web/default/alert/list.html
index c763331cc..9f2bd69d0 100644
--- a/templates/web/default/alert/list.html
+++ b/templates/web/default/alert/list.html
@@ -27,7 +27,7 @@
<h2>[% loc('Photos of recent nearby reports') %]</h2>
[% FOREACH p IN photos %]
<a href="/report/[% p.id %]"><img border="0" height="100"
- src="/photo?tn=1;id=[% p.id %]" alt="[% p.title | html %]" title="[% p.title | html %]"></a>
+ src="/photo/[% p.id %].tn.jpeg" alt="[% p.title | html %]" title="[% p.title | html %]"></a>
[% END %]
</div>
[% END %]
diff --git a/templates/web/default/around/around_index.html b/templates/web/default/around/around_index.html
index c07eb2ca2..012354f4a 100644
--- a/templates/web/default/around/around_index.html
+++ b/templates/web/default/around/around_index.html
@@ -39,7 +39,7 @@
[% IF partial_token %]
<p style="margin-top: 0; color: #cc0000;">
- <img align="right" src="/photo?id=[% report.id %]" hspace="5">
+ <img align="right" src="/photo/[% report.id %].jpeg" hspace="5">
[% loc("Thanks for uploading your photo. We now need to locate your problem, so please enter a nearby street name or postcode in the box below&nbsp;:") %]
</p>
[% END %]
diff --git a/templates/web/default/around/display_location.html b/templates/web/default/around/display_location.html
index b5705a77b..27f54f346 100755
--- a/templates/web/default/around/display_location.html
+++ b/templates/web/default/around/display_location.html
@@ -55,9 +55,9 @@
[% IF c.cobrand.country == 'GB' || c.cobrand.country == 'NO' %]
|
[% IF c.req.params.all_pins %]
- <a id='all_pins_link' rel='nofollow' href='[% c.uri_with( { no_pins => undef, all_pins => undef } ) %]'>[% loc('Hide stale reports') %]</a>
+ <a id='all_pins_link' rel='nofollow' href='[% c.uri_with( { no_pins => undef, all_pins => undef } ) %]'>[% loc('Hide old') %]</a>
[% ELSE %]
- <a id='all_pins_link' rel='nofollow' href='[% c.uri_with( { no_pins => undef, all_pins => 1 } ) %]'>[% loc('Include stale reports') %]</a>
+ <a id='all_pins_link' rel='nofollow' href='[% c.uri_with( { no_pins => undef, all_pins => 1 } ) %]'>[% loc('Show old') %]</a>
[% END %]
[% END %]
</p>
diff --git a/templates/web/default/auth/general.html b/templates/web/default/auth/general.html
index 5407e56e1..c2249fa46 100644
--- a/templates/web/default/auth/general.html
+++ b/templates/web/default/auth/general.html
@@ -20,7 +20,7 @@
[% IF loc_email_error %]
<div class="form-error">[% loc_email_error %]</div>
[% ELSIF sign_in_error %]
- <div class="form-error">[% loc('There was a problem with your email/password combination. Passwords and user accounts are a brand <strong>new</strong> service, so you probably do not have one yet &ndash; please fill in the right hand side of this form to get one.') %]</div>
+ <div class="form-error">[% loc('There was a problem with your email/password combination. If you cannot remember your password, or do not have one, please fill in the &lsquo;sign in by email&rsquo; section of the form.') %]</div>
[% END %]
<div class="form-field">
diff --git a/templates/web/default/faq/faq-en-gb.html b/templates/web/default/faq/faq-en-gb.html
index 599d3a37e..ed9d53c24 100755
--- a/templates/web/default/faq/faq-en-gb.html
+++ b/templates/web/default/faq/faq-en-gb.html
@@ -93,7 +93,7 @@ href="https://secure.mysociety.org/donate/">please do</a>.</dd>
to find out where reports go at the moment. Also <a href="/contact">contact us</a>
to update the address or addresses we use.</dd>
<dt>I&rsquo;m from a council, can we have FixMyStreet on our website?</dt>
- <dd>Yes you can! We offer branded, hosted versions of FixMyStreet for local council websites. <a href="http://www.mysociety.org/fixmystreet-for-local-council-websites/">Full details</a>.</dd>
+ <dd>Yes you can! We offer branded, hosted versions of FixMyStreet for local council websites. <a href="/for-councils">Full details</a>.</dd>
<dt>Do you remove silly or illegal content?</dt>
<dd>FixMyStreet is not responsible for the content and accuracy
of material submitted by its users. We reserve the right to edit or remove any
diff --git a/templates/web/default/index.html b/templates/web/default/index.html
index 06f3ef771..e5f98b0c5 100644
--- a/templates/web/default/index.html
+++ b/templates/web/default/index.html
@@ -63,7 +63,7 @@
<p id="front_photos">
[% FOREACH p IN recent_photos %]
<a href="/report/[% p.id %]"><img border="0" height="100"
- src="/photo?tn=1;id=[% p.id %]" alt="[% p.title | html %]" title="[% p.title | html %]"></a>
+ src="/photo/[% p.id %].tn.jpeg" alt="[% p.title | html %]" title="[% p.title | html %]"></a>
[% END %]
</p>
[% END %]
diff --git a/templates/web/default/js_validation_msgs.html b/templates/web/default/js_validation_msgs.html
index 0263f75ce..f89ab4bcc 100644
--- a/templates/web/default/js_validation_msgs.html
+++ b/templates/web/default/js_validation_msgs.html
@@ -5,7 +5,7 @@
detail: '[% loc('Please enter some details') %]',
name: {
required: '[% loc('Please enter your name') %]',
- 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') %]'
+ 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') %]'
},
category: '[% loc('Please choose a category') %]',
rznvy: {
diff --git a/templates/web/default/maps/openlayers.html b/templates/web/default/maps/openlayers.html
index 1c0a32278..e815642f1 100644
--- a/templates/web/default/maps/openlayers.html
+++ b/templates/web/default/maps/openlayers.html
@@ -59,8 +59,8 @@ var fixmystreet = {
east = c.uri_with( { lat = map.compass.east.0, lon = map.compass.east.1, zoom = map.zoom } )
west = c.uri_with( { lat = map.compass.west.0, lon = map.compass.west.1, zoom = map.zoom } )
world = c.uri_with( { zoom = 0 } );
- SET zoom_in = c.uri_with( { zoom = map.zoom + 1 } ) IF map.zoom < map.numZoomLevels - 1;
- SET zoom_out = c.uri_with( { zoom = map.zoom - 1 } ) IF map.zoom > 0;
+ SET zoom_in = c.uri_with( { lat = map.latitude, lon = map.longitude, zoom = map.zoom + 1 } ) IF map.zoom < map.numZoomLevels - 1;
+ SET zoom_out = c.uri_with( { lat = map.latitude, lon = map.longitude, zoom = map.zoom - 1 } ) IF map.zoom > 0;
SET zoom_in = '#' IF map.zoom >= map.numZoomLevels - 1;
SET zoom_out = '#' IF map.zoom <= 0;
%]
@@ -78,15 +78,11 @@ var fixmystreet = {
[% BLOCK pin %]
-[% cols = {
- red = 'R', green = 'G', blue = 'B', purple = 'P',
- }
-%]
[% IF pin.id %]
<a title="[% pin.title | html %]" href="[% c.uri_for('/report/' _ pin.id) %]">
[%- END -%]
-<img border="0" class="pin" src="[% c.uri_for('/i/pin' _ cols.${pin.colour} _ '.png') %]"
- alt="[% loc('Problem') %]" style="top:[% pin.py - 58 %]px; left:[% pin.px - 22 %]px; position: absolute;">
+<img border="0" class="pin" src="[% c.uri_for('/i/pin-' _ pin.colour _ '.png') %]"
+ alt="[% loc('Problem') %]" style="top:[% pin.py - 64 %]px; left:[% pin.px - 24 %]px; position: absolute;">
[%- IF pin.id -%]
</a>
[% END %]
diff --git a/templates/web/default/maps/pins_js.html b/templates/web/default/maps/pins_js.html
index 355fffaba..d9c6b3531 100644
--- a/templates/web/default/maps/pins_js.html
+++ b/templates/web/default/maps/pins_js.html
@@ -1,4 +1,4 @@
[ [% FOR pin IN map.pins -%]
- [ [% pin.latitude %], [% pin.longitude %], '[% pin.colour %]', '[% pin.id %]', "[% pin.title | escape_js %]" ]
+ [ [% pin.latitude %], [% pin.longitude %], '[% pin.colour %]', '[% pin.id %]', "[% pin.title | escape_js %]", '[% pin.type %]' ]
[%- IF !loop.last %],[% END %]
[% END %] ]
diff --git a/templates/web/default/report/new/fill_in_details_form.html b/templates/web/default/report/new/fill_in_details_form.html
index 2809b9c0e..ed8b07ea1 100644
--- a/templates/web/default/report/new/fill_in_details_form.html
+++ b/templates/web/default/report/new/fill_in_details_form.html
@@ -95,7 +95,7 @@
<input type="hidden" name="upload_fileid" value="[% upload_fileid %]" />
[% END %]
[% IF report.photo %]
- <img align="right" src="/photo?id=[% report.id %]" hspace="5">
+ <img align="right" src="/photo/[% report.id %].jpeg" hspace="5">
[% END %]
[% END %]
diff --git a/templates/web/default/reports/council.html b/templates/web/default/reports/council.html
index 797d34d6b..ec9efbdbf 100755
--- a/templates/web/default/reports/council.html
+++ b/templates/web/default/reports/council.html
@@ -77,13 +77,6 @@ Its area is now covered by <a href="/reports/Bedford">Bedford Borough Council</a
[% INCLUDE 'reports/cobrand_stats.html' %]
-[% IF c.cobrand.moniker == 'fixmystreet' %]
-<p class="promo">
- FixMyStreet is now available for local council websites.
- <a href="http://www.mysociety.org/fixmystreet-for-local-council-websites/">Find&nbsp;out&nbsp;more</a>.
-</p>
-[% END %]
-
[% INCLUDE 'pagination.html', param = 'p' %]
[% INCLUDE column
diff --git a/templates/web/default/static/fun.html b/templates/web/default/static/fun.html
index abe9d4028..00976f3ec 100644
--- a/templates/web/default/static/fun.html
+++ b/templates/web/default/static/fun.html
@@ -10,7 +10,7 @@ Do let us know if you find any more.</p>
<ul style='list-style-type: none; margin:0; padding:0'>
-<li><img src='http://www.fixmystreet.com/photo?id=9468' align='right' hspace=8>
+<li><img src='http://www.fixmystreet.com/photo/9468.jpeg' align='right' hspace=8>
<h2>Dumped Piano (right)</h2>
<p>The reporter of this problem summed it up with their report,
which consisted solely of the one character &ldquo;!&rdquo;. &mdash;
@@ -20,7 +20,7 @@ Do let us know if you find any more.</p>
<p>&ldquo;A seagull is attacking various cars within this road. He starts at around 05:45 every morning and continues until around 19:30. This causes a lot of noisy banging and wakes up children.&rdquo; &mdash;
<a href='http://www.fixmystreet.com/report/2722'>Problem report</a>
-<li><img src='http://www.fixmystreet.com/photo?id=6553' align='right' hspace=8>
+<li><img src='http://www.fixmystreet.com/photo/6553.jpeg' align='right' hspace=8>
<h2>Boxes full of cheese dumped (right)</h2>
<p>&ldquo;About a dozen boxes full of mozzarella cheese have been dumped opposite 3 rufford street. if it warms up we could have nasty road topping problem (seriously there is a lot of cheese)&rdquo; &mdash;
<a href='http://www.fixmystreet.com/report/6553'>Problem report</a>
generated by cgit v1.2.3 (git 2.25.1) at 2025-04-26 13:37:15 +0000