diff options
Diffstat (limited to 'templates/web')
-rw-r--r-- | templates/web/barnet/header.html | 10 | ||||
-rw-r--r-- | templates/web/default/admin/problem_row.html | 9 | ||||
-rw-r--r-- | templates/web/default/common_header_tags.html | 2 | ||||
-rw-r--r-- | templates/web/default/header.html | 4 | ||||
-rw-r--r-- | templates/web/default/maps/bing.html | 2 | ||||
-rw-r--r-- | templates/web/default/maps/fms.html | 8 | ||||
-rw-r--r-- | templates/web/default/maps/google.html | 2 | ||||
-rw-r--r-- | templates/web/default/maps/osm-streetview.html | 8 | ||||
-rw-r--r-- | templates/web/default/maps/osm.html | 8 | ||||
-rw-r--r-- | templates/web/emptyhomes/header.html | 2 | ||||
-rw-r--r-- | templates/web/fiksgatami/footer.html | 1 | ||||
-rw-r--r-- | templates/web/fiksgatami/header.html | 4 | ||||
-rw-r--r-- | templates/web/lichfielddc/header.html | 2 | ||||
-rw-r--r-- | templates/web/southampton/header.html | 6 |
14 files changed, 35 insertions, 33 deletions
diff --git a/templates/web/barnet/header.html b/templates/web/barnet/header.html index 1616198e7..8270154ab 100644 --- a/templates/web/barnet/header.html +++ b/templates/web/barnet/header.html @@ -3,7 +3,7 @@ <head> <link rel="stylesheet" type="text/css" href="/cobrands/barnet/css/basic.css"> - <link rel="stylesheet" type="text/css" href="/css/core.css"> + <link rel="stylesheet" type="text/css" href="[% version('/css/core.css') %]"> <link rel="stylesheet" type="text/css" href="/cobrands/barnet/css/layout.css"> <!-- Preferred style sheet enabled when the page is loaded --> @@ -41,10 +41,10 @@ <![endif]--> <link rel="stylesheet" media="print" type="text/css" href="/cobrands/barnet/css/print.css"> - <script type="text/javascript" src="/cobrands/barnet/javascript/jquery-1.2.6_common.js"></script> - <script type="text/javascript" src="/cobrands/barnet/javascript/styleswitch.js"></script> - <script type="text/javascript" src="/cobrands/barnet/javascript/jquery-cookie-min.js"></script> - <script type="text/javascript" src="/cobrands/barnet/javascript/2008-portsurf.js"></script> + <script type="text/javascript" src="[% version('/cobrands/barnet/javascript/jquery-1.2.6_common.js') %]"></script> + <script type="text/javascript" src="[% version('/cobrands/barnet/javascript/styleswitch.js') %]"></script> + <script type="text/javascript" src="[% version('/cobrands/barnet/javascript/jquery-cookie-min.js') %]"></script> + <script type="text/javascript" src="[% version('/cobrands/barnet/javascript/2008-portsurf.js') %]"></script> [% INCLUDE 'common_header_tags.html' %] 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:' ) %] [% 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 update:') %] [% PROCESS format_time time=problem.lastupdate %][% END -%]</small> + [%- IF problem.is_visible %]<br>[% loc('Confirmed:' ) %] [% 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 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]--> diff --git a/templates/web/emptyhomes/header.html b/templates/web/emptyhomes/header.html index 017d3a6f5..25d62db5c 100644 --- a/templates/web/emptyhomes/header.html +++ b/templates/web/emptyhomes/header.html @@ -2,7 +2,7 @@ <html lang="[% lang_code %]"> <head> - <link rel="stylesheet" type="text/css" href="/css/core.css"> + <link rel="stylesheet" type="text/css" href="[% version('/css/core.css') %]"> <link rel="stylesheet" type="text/css" href="/cobrands/emptyhomes/css.css"> <!--[if LT IE 7]> <link rel="stylesheet" type="text/css" href="/css/ie6.css"> diff --git a/templates/web/fiksgatami/footer.html b/templates/web/fiksgatami/footer.html index 173963ff8..986db3967 100644 --- a/templates/web/fiksgatami/footer.html +++ b/templates/web/fiksgatami/footer.html @@ -3,6 +3,7 @@ <h2 class="v">[% loc('Navigation') %]</h2> <ul id="navigation"> <li><a href="/">[% loc("Report a problem") %]</a></li> +<li id="nav_new"><a href="/my">[% loc("Your reports") %]</a></li> <li><a href="/reports">[% loc("All reports") %]</a></li> <li><a href="[% c.uri_for('/alert', {pc => pc}) | html %]">[% loc("Local alerts") %]</a></li> <li><a href="/faq">[% loc("Help") %]</a></li> diff --git a/templates/web/fiksgatami/header.html b/templates/web/fiksgatami/header.html index 44ebb7ee7..0e78bfc43 100644 --- a/templates/web/fiksgatami/header.html +++ b/templates/web/fiksgatami/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="/cobrands/fiksgatami/css.css"> + <link rel="stylesheet" type="text/css" href="[% version('/css/core.css') %]"> + <link rel="stylesheet" type="text/css" href="[% version('/cobrands/fiksgatami/css.css') %]"> [% INCLUDE 'common_header_tags.html' %] </head> diff --git a/templates/web/lichfielddc/header.html b/templates/web/lichfielddc/header.html index e134cd6f9..e17e22b9d 100644 --- a/templates/web/lichfielddc/header.html +++ b/templates/web/lichfielddc/header.html @@ -2,7 +2,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="[% lang_code %]"> <head> - <link rel="stylesheet" type="text/css" href="/css/core.css" /> + <link rel="stylesheet" type="text/css" href="[% version('/css/core.css') %]"> <link rel="stylesheet" type="text/css" href="/cobrands/lichfielddc/css/layout.css" /> <link rel="stylesheet" type="text/css" href="http://www.lichfielddc.gov.uk/site/styles/standard_1_.css" media="screen" /> diff --git a/templates/web/southampton/header.html b/templates/web/southampton/header.html index 049034252..648027d8c 100644 --- a/templates/web/southampton/header.html +++ b/templates/web/southampton/header.html @@ -1,12 +1,12 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <head> - <link rel="stylesheet" type="text/css" href="/css/core.css" /> + <link rel="stylesheet" type="text/css" href="[% version('/css/core.css') %]"> <link rel="stylesheet" type="text/css" href="/cobrands/southampton/style.css" /> - <link rel="stylesheet" type="text/css" href="/cobrands/southampton/css.css" /> + <link rel="stylesheet" type="text/css" href="[% version('/cobrands/southampton/css.css') %]" /> [% INCLUDE 'common_header_tags.html' %] - <script type="text/javascript" src="/js/southampton.js"></script> + <script type="text/javascript" src="[% version('/js/southampton.js') %]"></script> </head> <body> |