diff options
Diffstat (limited to 'templates')
21 files changed, 36 insertions, 36 deletions
diff --git a/templates/web/angus/maps/fms.html b/templates/web/angus/maps/fms.html index 1516ae05e..61c56f121 100644 --- a/templates/web/angus/maps/fms.html +++ b/templates/web/angus/maps/fms.html @@ -1,6 +1,6 @@ [% map_js = [ - version('/js/OpenLayers/OpenLayers.angus.js'), + version('/vendor/OpenLayers/OpenLayers.angus.js'), version('/js/map-OpenLayers.js'), version('/js/map-bing-ol.js'), version('/js/map-fms.js'), diff --git a/templates/web/base/common_footer_tags.html b/templates/web/base/common_footer_tags.html index 01420c37d..915751802 100644 --- a/templates/web/base/common_footer_tags.html +++ b/templates/web/base/common_footer_tags.html @@ -3,7 +3,7 @@ [% PROCESS 'common_scripts.html' %] <!--[if lte IE 9]> - <script src="[% version('/js/history.polyfill.min.js') %]"></script> + <script src="[% version('/vendor/history.polyfill.min.js') %]"></script> <![endif]--> [% FOR script IN scripts ~%] [% script = script.0 ? script : [ script ] ~%] diff --git a/templates/web/base/common_header_tags.html b/templates/web/base/common_header_tags.html index adbcf3c0b..e5a4d25f2 100644 --- a/templates/web/base/common_header_tags.html +++ b/templates/web/base/common_header_tags.html @@ -1,6 +1,6 @@ [% SET start = c.config.ADMIN_BASE_URL IF admin %] -<link rel="stylesheet" href="[% version('/js/OpenLayers/theme/default/style.css') %]"> +<link rel="stylesheet" href="[% version('/vendor/OpenLayers/theme/default/style.css') %]"> <meta http-equiv="content-type" content="text/html; charset=utf-8" id="js-meta-data" data-page="[% page %]" @@ -11,7 +11,7 @@ [% END %] <!--[if (lt IE 9)]> - <script src="[% version('/js/html5shiv.js') %]""></script> + <script src="[% version('/vendor/html5shiv.js') %]"></script> <![endif]--> <script nonce="[% csp_nonce %]"> window.Modernizr=function(e,t,n){function r(e){p.cssText=e}function o(e,t){return typeof e===t}var a,i,c,l="2.8.3",s={},u=t.documentElement,d="modernizr",f=t.createElement(d),p=f.style,m=({}.toString,{}),h=[],y=h.slice,v=function(e,n,r,o){var a,i,c,l,s=t.createElement("div"),f=t.body,p=f||t.createElement("body");if(parseInt(r,10))for(;r--;)c=t.createElement("div"),c.id=o?o[r]:d+(r+1),s.appendChild(c);return a=["­",'<style id="s',d,'">',e,"</style>"].join(""),s.id=d,(f?s:p).innerHTML+=a,p.appendChild(s),f||(p.style.background="",p.style.overflow="hidden",l=u.style.overflow,u.style.overflow="hidden",u.appendChild(p)),i=n(s,e),f?s.parentNode.removeChild(s):(p.parentNode.removeChild(p),u.style.overflow=l),!!i},g=function(t){var n=e.matchMedia||e.msMatchMedia;if(n)return n(t)&&n(t).matches||!1;var r;return v("@media "+t+" { #"+d+" { position: absolute; } }",function(t){r="absolute"==(e.getComputedStyle?getComputedStyle(t,null):t.currentStyle).position}),r},b={}.hasOwnProperty;c=o(b,"undefined")||o(b.call,"undefined")?function(e,t){return t in e&&o(e.constructor.prototype[t],"undefined")}:function(e,t){return b.call(e,t)};for(var E in m)c(m,E)&&(i=E.toLowerCase(),s[i]=m[E](),h.push((s[i]?"":"no-")+i));return r(""),f=a=null,s._version=l,s.mq=g,s.testStyles=v,s}(this,this.document); @@ -20,7 +20,7 @@ </script> [% IF admin %] - <link rel="stylesheet" href="[% version('/js/jquery-ui/css/smoothness/jquery-ui-1.10.3.custom.min.css') %]"> + <link rel="stylesheet" href="[% version('/vendor/jquery-ui/css/smoothness/jquery-ui-1.10.3.custom.min.css') %]"> [% END %] [% IF robots %] diff --git a/templates/web/base/common_scripts.html b/templates/web/base/common_scripts.html index 42c04f11f..474edc46e 100644 --- a/templates/web/base/common_scripts.html +++ b/templates/web/base/common_scripts.html @@ -9,10 +9,10 @@ scripts.push( start _ "/js/translation_strings." _ lang_code _ ".js?" _ Math.int( date.now / 3600 ), version('/jslib/jquery-1.7.2.min.js'), version('/js/validation_rules.js'), - version('/js/jquery.validate.min.js'), - version('/js/dropzone.min.js'), + version('/vendor/jquery.validate.min.js'), + version('/vendor/dropzone.min.js'), version('/js/jquery.multi-select.js'), - version('/js/geo.min.js'), + version('/vendor/geo.min.js'), version('/cobrands/fixmystreet/fixmystreet.js'), ); @@ -33,7 +33,7 @@ scripts.push( IF admin; scripts.push( - version('/js/jquery-ui/js/jquery-ui-1.10.3.custom.min.js'), + version('/vendor/jquery-ui/js/jquery-ui-1.10.3.custom.min.js'), version('/cobrands/fixmystreet/admin.js'), ); END; diff --git a/templates/web/base/front/javascript.html b/templates/web/base/front/javascript.html index 6b8e2a292..69eb626f7 100644 --- a/templates/web/base/front/javascript.html +++ b/templates/web/base/front/javascript.html @@ -1,10 +1,10 @@ [% # Assume using OpenStreetMap maps map_js = [ - version('/js/yepnope.js'), + version('/vendor/yepnope.js'), [ version('/cobrands/fixmystreet/front.js'), { id = 'script_front', - 'data-scripts' = version('/js/OpenLayers/OpenLayers.fixmystreet.js') _ ',' _ + 'data-scripts' = version('/vendor/OpenLayers/OpenLayers.fixmystreet.js') _ ',' _ version('/js/map-OpenLayers.js') _ ',' _ version('/js/map-OpenStreetMap.js') } ], diff --git a/templates/web/base/maps/bing.html b/templates/web/base/maps/bing.html index 59d012c4f..df45eced5 100644 --- a/templates/web/base/maps/bing.html +++ b/templates/web/base/maps/bing.html @@ -1,6 +1,6 @@ [% map_js = [ - version('/js/OpenLayers/OpenLayers.fixmystreet.js'), + version('/vendor/OpenLayers/OpenLayers.fixmystreet.js'), version('/js/map-OpenLayers.js'), version('/js/map-bing-ol.js'), ]; diff --git a/templates/web/base/maps/fms.html b/templates/web/base/maps/fms.html index e155ff778..ff5b4eab6 100644 --- a/templates/web/base/maps/fms.html +++ b/templates/web/base/maps/fms.html @@ -1,6 +1,6 @@ [% map_js = [ - version('/js/OpenLayers/OpenLayers.fixmystreet.js'), + version('/vendor/OpenLayers/OpenLayers.fixmystreet.js'), version('/js/map-OpenLayers.js'), version('/js/map-bing-ol.js'), version('/js/map-fms.js'), diff --git a/templates/web/base/maps/google-ol.html b/templates/web/base/maps/google-ol.html index 7c7711de9..d88043403 100644 --- a/templates/web/base/maps/google-ol.html +++ b/templates/web/base/maps/google-ol.html @@ -6,7 +6,7 @@ END; map_js = [ google_maps_url, - version('/js/OpenLayers/OpenLayers.google.js'), + version('/vendor/OpenLayers/OpenLayers.google.js'), version('/js/map-OpenLayers.js'), version('/js/map-google-ol.js'), ] diff --git a/templates/web/base/maps/mapquest-attribution.html b/templates/web/base/maps/mapquest-attribution.html index e469901a8..43d6106a5 100644 --- a/templates/web/base/maps/mapquest-attribution.html +++ b/templates/web/base/maps/mapquest-attribution.html @@ -1,6 +1,6 @@ [% map_js = [ - version('/js/OpenLayers/OpenLayers.fixmystreet.js'), + version('/vendor/OpenLayers/OpenLayers.fixmystreet.js'), version('/js/map-OpenLayers.js'), version('/js/map-OpenStreetMap.js'), ]; diff --git a/templates/web/base/maps/osm-streetview.html b/templates/web/base/maps/osm-streetview.html index dcf45d3b6..f68f53039 100644 --- a/templates/web/base/maps/osm-streetview.html +++ b/templates/web/base/maps/osm-streetview.html @@ -1,6 +1,6 @@ [% map_js = [ - version('/js/OpenLayers/OpenLayers.fixmystreet.js'), + version('/vendor/OpenLayers/OpenLayers.fixmystreet.js'), version('/js/map-OpenLayers.js'), version('/js/map-streetview.js'), ]; diff --git a/templates/web/base/maps/osm-toner-lite.html b/templates/web/base/maps/osm-toner-lite.html index 6512eaf2c..22b6636c5 100644 --- a/templates/web/base/maps/osm-toner-lite.html +++ b/templates/web/base/maps/osm-toner-lite.html @@ -1,6 +1,6 @@ [% map_js = [ - version('/js/OpenLayers/OpenLayers.fixmystreet.js'), + version('/vendor/OpenLayers/OpenLayers.fixmystreet.js'), "https://stamen-maps.a.ssl.fastly.net/js/tile.stamen.js?v1.3.0", version('/js/map-OpenLayers.js'), version('/js/map-toner-lite.js'), diff --git a/templates/web/base/maps/osm.html b/templates/web/base/maps/osm.html index e469901a8..43d6106a5 100644 --- a/templates/web/base/maps/osm.html +++ b/templates/web/base/maps/osm.html @@ -1,6 +1,6 @@ [% map_js = [ - version('/js/OpenLayers/OpenLayers.fixmystreet.js'), + version('/vendor/OpenLayers/OpenLayers.fixmystreet.js'), version('/js/map-OpenLayers.js'), version('/js/map-OpenStreetMap.js'), ]; diff --git a/templates/web/base/report/photo-js.html b/templates/web/base/report/photo-js.html index 91b9930e7..8c8c91669 100644 --- a/templates/web/base/report/photo-js.html +++ b/templates/web/base/report/photo-js.html @@ -1,6 +1,6 @@ [% extra_css = BLOCK %] - <link rel="stylesheet" href="[% version('/js/fancybox/jquery.fancybox-1.3.4.css') %]"> + <link rel="stylesheet" href="[% version('/vendor/fancybox/jquery.fancybox-1.3.4.css') %]"> [% END %] [% extra_js = [ - version('/js/fancybox/jquery.fancybox-1.3.4.pack.js') + version('/vendor/fancybox/jquery.fancybox-1.3.4.pack.js') ] %] diff --git a/templates/web/bristol/footer_extra_js.html b/templates/web/bristol/footer_extra_js.html index 1cfcf00f6..2f54083a0 100644 --- a/templates/web/bristol/footer_extra_js.html +++ b/templates/web/bristol/footer_extra_js.html @@ -1,5 +1,5 @@ [% scripts.push( - version('/js/OpenLayers.Projection.OrdnanceSurvey.js') + version('/vendor/OpenLayers.Projection.OrdnanceSurvey.js') version('/cobrands/fixmystreet-uk-councils/js.js'), version('/cobrands/fixmystreet/assets.js'), version('/cobrands/bristol/js.js'), diff --git a/templates/web/bristol/maps/bristol.html b/templates/web/bristol/maps/bristol.html index 08f6fba1c..f13ea4d32 100644 --- a/templates/web/bristol/maps/bristol.html +++ b/templates/web/bristol/maps/bristol.html @@ -1,6 +1,6 @@ [% map_js = [ - version('/js/OpenLayers/OpenLayers.bristol.js'), + version('/vendor/OpenLayers/OpenLayers.bristol.js'), version('/js/map-OpenLayers.js'), version('/js/map-wmts-base.js'), version('/js/map-wmts-bristol.js'), diff --git a/templates/web/bromley/maps/bromley.html b/templates/web/bromley/maps/bromley.html index c2ee0273f..71a150f5a 100644 --- a/templates/web/bromley/maps/bromley.html +++ b/templates/web/bromley/maps/bromley.html @@ -1,6 +1,6 @@ [% map_js = [ - version('/js/OpenLayers/OpenLayers.fixmystreet.js'), + version('/vendor/OpenLayers/OpenLayers.fixmystreet.js'), version('/js/map-OpenLayers.js'), version('/js/map-bing-ol.js'), version('/js/map-fms.js'), diff --git a/templates/web/fixmystreet-uk-councils/footer_extra_js.html b/templates/web/fixmystreet-uk-councils/footer_extra_js.html index 1e7a38f8a..218607498 100644 --- a/templates/web/fixmystreet-uk-councils/footer_extra_js.html +++ b/templates/web/fixmystreet-uk-councils/footer_extra_js.html @@ -1,4 +1,4 @@ [% scripts.push( - version('/js/OpenLayers.Projection.OrdnanceSurvey.js') + version('/vendor/OpenLayers.Projection.OrdnanceSurvey.js') version('/cobrands/fixmystreet-uk-councils/js.js'), ) %] diff --git a/templates/web/fixmystreet.com/footer_extra_js.html b/templates/web/fixmystreet.com/footer_extra_js.html index d03aa8657..d5ed1543d 100644 --- a/templates/web/fixmystreet.com/footer_extra_js.html +++ b/templates/web/fixmystreet.com/footer_extra_js.html @@ -1,5 +1,5 @@ [% scripts.push( - version('/js/OpenLayers.Projection.OrdnanceSurvey.js'), - version('/js/jquery.cookie.min.js'), + version('/vendor/OpenLayers.Projection.OrdnanceSurvey.js'), + version('/cobrands/fixmystreet.com/vendor/jquery.cookie.min.js'), version('/cobrands/fixmystreet.com/js.js'), ) %] diff --git a/templates/web/fixmystreet.com/front/javascript.html b/templates/web/fixmystreet.com/front/javascript.html index baf7ebb64..4bf586b70 100644 --- a/templates/web/fixmystreet.com/front/javascript.html +++ b/templates/web/fixmystreet.com/front/javascript.html @@ -1,9 +1,9 @@ [% map_js = [ - version('/js/yepnope.js'), + version('/vendor/yepnope.js'), [ version('/cobrands/fixmystreet/front.js'), { id = "script_front", - 'data-scripts' = version('/js/OpenLayers/OpenLayers.fixmystreet.js') _ ',' _ + 'data-scripts' = version('/vendor/OpenLayers/OpenLayers.fixmystreet.js') _ ',' _ version('/js/map-OpenLayers.js') _ ',' _ version('/js/map-bing-ol.js') _ ',' _ version('/js/map-fms.js') diff --git a/templates/web/warwickshire/header.html b/templates/web/warwickshire/header.html index da56719eb..583606ef8 100644 --- a/templates/web/warwickshire/header.html +++ b/templates/web/warwickshire/header.html @@ -7,16 +7,16 @@ <head> <meta name="viewport" content="initial-scale=1.0"> - <link rel="shortcut icon" href="/cobrands/warwickshire/gamma/images/favicon.ico" /> + <link rel="shortcut icon" href="/cobrands/warwickshire/vendor/gamma/images/favicon.ico" /> <!-- Style --> - <link rel="stylesheet" type="text/css" href="[% version ('/cobrands/' _ c.cobrand.moniker _ '/gamma/style.css') %]" /> - <link rel="stylesheet" type="text/css" href="[% version ('/cobrands/' _ c.cobrand.moniker _ '/gamma/bootstrap-responsive.css') %]"> + <link rel="stylesheet" type="text/css" href="[% version ('/cobrands/' _ c.cobrand.moniker _ '/vendor/gamma/style.css') %]" /> + <link rel="stylesheet" type="text/css" href="[% version ('/cobrands/' _ c.cobrand.moniker _ '/vendor/gamma/bootstrap-responsive.css') %]"> <!-- Scripts --> - <script src="[% version ('/cobrands/' _ c.cobrand.moniker _ '/gamma/modernizr-2.6.2-respond-1.1.0.min.js') %]" type="text/javascript"></script> - <script src="[% version ('/cobrands/' _ c.cobrand.moniker _ '/gamma/jquery-1.9.0.min.js') %]" type="text/javascript"></script> - <script src="[% version ('/cobrands/' _ c.cobrand.moniker _ '/gamma/bootstrap.min.js') %]" type="text/javascript"></script> - <script src="[% version ('/cobrands/' _ c.cobrand.moniker _ '/gamma/main.js') %]" type="text/javascript"></script> + <script src="[% version ('/cobrands/' _ c.cobrand.moniker _ '/vendor/gamma/modernizr-2.6.2-respond-1.1.0.min.js') %]" type="text/javascript"></script> + <script src="[% version ('/cobrands/' _ c.cobrand.moniker _ '/vendor/gamma/jquery-1.9.0.min.js') %]" type="text/javascript"></script> + <script src="[% version ('/cobrands/' _ c.cobrand.moniker _ '/vendor/gamma/bootstrap.min.js') %]" type="text/javascript"></script> + <script src="[% version ('/cobrands/' _ c.cobrand.moniker _ '/vendor/gamma/main.js') %]" type="text/javascript"></script> <link rel="stylesheet" href="[% version('/cobrands/' _ c.cobrand.moniker _ '/base.css') %]"> <link rel="stylesheet" href="[% version('/cobrands/' _ c.cobrand.moniker _ '/layout.css') %]" media="(min-width:48em)"> diff --git a/templates/web/zurich/maps/zurich.html b/templates/web/zurich/maps/zurich.html index f85be4aef..4e07575c2 100644 --- a/templates/web/zurich/maps/zurich.html +++ b/templates/web/zurich/maps/zurich.html @@ -1,6 +1,6 @@ [% map_js = [ - version('/js/OpenLayers.2.11.zurich.js'), + version('/vendor/OpenLayers.2.11.zurich.js'), version('/js/OpenLayers.Projection.CH1903Plus.js'), version('/js/map-OpenLayers.js'), version('/js/map-wmts-base.js'), |