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]-->