aboutsummaryrefslogtreecommitdiffstats
path: root/templates/web/default
diff options
context:
space:
mode:
authorStruan Donald <struan@exo.org.uk>2011-09-05 16:59:05 +0100
committerStruan Donald <struan@exo.org.uk>2011-09-05 16:59:05 +0100
commiteb823376088f47abf23050a0193225a45b51d6d3 (patch)
treea6eb5fc8cf694a7dd70d7d1a957d65ec09a6c60a /templates/web/default
parentbc39723b98a0bb07cc8d57e99489e3a014d857ef (diff)
parent7fc1083eb431312a59758c473e8ff52ceb8585ef (diff)
Merge branch 'master' of ssh://git.mysociety.org/data/git/public/fixmystreet into js-validation
Conflicts: templates/web/default/common_header_tags.html
Diffstat (limited to 'templates/web/default')
-rw-r--r--templates/web/default/admin/problem_row.html9
-rw-r--r--templates/web/default/common_header_tags.html2
-rw-r--r--templates/web/default/header.html4
-rw-r--r--templates/web/default/maps/bing.html2
-rw-r--r--templates/web/default/maps/fms.html8
-rw-r--r--templates/web/default/maps/google.html2
-rw-r--r--templates/web/default/maps/osm-streetview.html8
-rw-r--r--templates/web/default/maps/osm.html8
8 files changed, 22 insertions, 21 deletions
diff --git a/templates/web/default/admin/problem_row.html b/templates/web/default/admin/problem_row.html
index 664ff1b13..22825429a 100644
--- a/templates/web/default/admin/problem_row.html
+++ b/templates/web/default/admin/problem_row.html
@@ -1,6 +1,6 @@
[%- FOR problem IN problems %]
<tr[% ' class="hidden"' IF problem.state == 'hidden' %]>
- <td>[%- IF problem.state == 'confirmed' || problem.state == 'fixed' -%]
+ <td>[%- IF problem.is_visible -%]
[%- cobrand_data = problem.cobrand_data %]
[%- cobrand_data = c.data_for_generic_problem IF !problem.cobrand %]
<a href="[% c.uri_for_email( '/report', problem.id, cobrand_data ) %]">[% problem.id %]</a>
@@ -20,9 +20,10 @@
<td>[% problem.cobrand %]<br>[% problem.cobrand_data | html %]</td>
<td>[% PROCESS format_time time=problem.created %]</td>
<td>[% problem.state %]<small>
- [%- IF problem.state == 'fixed' || problem.state == 'confirmed' %]<br>[% loc('Confirmed:' ) %]&nbsp;[% PROCESS format_time time=problem.confirmed %][% END -%]
- [%- IF problem.state == 'fixed' %]<br>[% loc('Fixed:') %] [% PROCESS format_time time=problem.lastupdate %][% END -%]
- [%- IF problem.state == 'confirmed' %]<br>[% loc('Last&nbsp;update:') %] [% PROCESS format_time time=problem.lastupdate %][% END -%]</small>
+ [%- IF problem.is_visible %]<br>[% loc('Confirmed:' ) %]&nbsp;[% PROCESS format_time time=problem.confirmed %][% END -%]
+ [%- IF problem.is_fixed %]<br>[% loc('Fixed:') %] [% PROCESS format_time time=problem.lastupdate %][% END -%]
+ [%- IF problem.is_closed %]<br>[% loc('Closed:') %] [% PROCESS format_time time=problem.lastupdate %][% END -%]
+ [%- IF problem.is_open %]<br>[% loc('Last&nbsp;update:') %] [% PROCESS format_time time=problem.lastupdate %][% END -%]</small>
</td>
<td>[% PROCESS format_time time=problem.whensent %]</td>
<td><a href="[% c.uri_for( 'report_edit', problem.id ) %]">[% loc('Edit') %]</a></td>
diff --git a/templates/web/default/common_header_tags.html b/templates/web/default/common_header_tags.html
index b184c200d..a1787c699 100644
--- a/templates/web/default/common_header_tags.html
+++ b/templates/web/default/common_header_tags.html
@@ -3,7 +3,7 @@
<script src="/js/jquery.validate.js" type="text/javascript" charset="utf-8"></script>
-<script type="text/javascript" src="/js/fixmystreet.js"></script>
+<script type="text/javascript" src="[% version('/js/fixmystreet.js') %]"></script>
[% map_js %]
diff --git a/templates/web/default/header.html b/templates/web/default/header.html
index 8778f41b1..5290ffc41 100644
--- a/templates/web/default/header.html
+++ b/templates/web/default/header.html
@@ -2,8 +2,8 @@
<html lang="[% lang_code %]">
<head>
- <link rel="stylesheet" type="text/css" href="/css/core.css">
- <link rel="stylesheet" type="text/css" href="/css/main.css">
+ <link rel="stylesheet" type="text/css" href="[% version('/css/core.css') %]">
+ <link rel="stylesheet" type="text/css" href="[% version('/css/main.css') %]">
<!--[if LT IE 7]>
<link rel="stylesheet" type="text/css" href="/css/ie6.css">
<![endif]-->
diff --git a/templates/web/default/maps/bing.html b/templates/web/default/maps/bing.html
index 6b7114199..277886cdb 100644
--- a/templates/web/default/maps/bing.html
+++ b/templates/web/default/maps/bing.html
@@ -1,6 +1,6 @@
[% 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="/js/map-bing.js"></script>
+<script type="text/javascript" src="[% version('/js/map-bing.js') %]"></script>
[% END %]
[% map_html = BLOCK %]
diff --git a/templates/web/default/maps/fms.html b/templates/web/default/maps/fms.html
index 2b322849b..956a22e69 100644
--- a/templates/web/default/maps/fms.html
+++ b/templates/web/default/maps/fms.html
@@ -1,9 +1,9 @@
[% 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="/js/OpenLayers.fixmystreet.js"></script>
-<script type="text/javascript" src="/js/map-OpenLayers.js"></script>
-<script type="text/javascript" src="/js/map-bing-ol.js"></script>
-<script type="text/javascript" src="/js/jquery.ba-hashchange.min.js"></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="/jslib/OpenLayers-2.10/theme/default/ie6-style.css" type="text/css" />
<![endif]-->
diff --git a/templates/web/default/maps/google.html b/templates/web/default/maps/google.html
index 2e326734b..69020ea81 100644
--- a/templates/web/default/maps/google.html
+++ b/templates/web/default/maps/google.html
@@ -1,6 +1,6 @@
[% map_js = BLOCK %]
<script type="text/javascript" src="http://maps.google.com/maps/api/js?sensor=false"></script>
-<script type="text/javascript" src="/js/map-google.js"></script>
+<script type="text/javascript" src="[% version('/js/map-google.js') %]"></script>
[% END %]
[% map_html = BLOCK %]
diff --git a/templates/web/default/maps/osm-streetview.html b/templates/web/default/maps/osm-streetview.html
index fd889e6ee..3bc4614c6 100644
--- a/templates/web/default/maps/osm-streetview.html
+++ b/templates/web/default/maps/osm-streetview.html
@@ -1,8 +1,8 @@
[% map_js = BLOCK %]
-<script type="text/javascript" src="/js/OpenLayers.fixmystreet.js"></script>
-<script type="text/javascript" src="/js/map-OpenLayers.js"></script>
-<script type="text/javascript" src="/js/map-streetview.js"></script>
-<script type="text/javascript" src="/js/jquery.ba-hashchange.min.js"></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-streetview.js') %]"></script>
+<script type="text/javascript" src="[% version('/js/jquery.ba-hashchange.min.js') %]"></script>
<!--[if lte IE 6]>
<link rel="stylesheet" href="/jslib/OpenLayers-2.10/theme/default/ie6-style.css" type="text/css" />
<![endif]-->
diff --git a/templates/web/default/maps/osm.html b/templates/web/default/maps/osm.html
index f583dd227..804710ad1 100644
--- a/templates/web/default/maps/osm.html
+++ b/templates/web/default/maps/osm.html
@@ -1,8 +1,8 @@
[% map_js = BLOCK %]
-<script type="text/javascript" src="/js/OpenLayers.fixmystreet.js"></script>
-<script type="text/javascript" src="/js/map-OpenLayers.js"></script>
-<script type="text/javascript" src="/js/map-OpenStreetMap.js"></script>
-<script type="text/javascript" src="/js/jquery.ba-hashchange.min.js"></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-OpenStreetMap.js') %]"></script>
+<script type="text/javascript" src="[% version('/js/jquery.ba-hashchange.min.js') %]"></script>
<!--[if lte IE 6]>
<link rel="stylesheet" href="/jslib/OpenLayers-2.10/theme/default/ie6-style.css" type="text/css" />
<![endif]-->
generated by cgit v1.2.3 (git 2.25.1) at 2025-07-14 11:59:43 +0000