diff options
-rw-r--r-- | templates/web/angus/header.html | 8 | ||||
-rw-r--r-- | templates/web/base/common_header_tags.html | 2 | ||||
-rw-r--r-- | templates/web/base/header.html | 8 | ||||
-rw-r--r-- | templates/web/base/header/css.html | 11 | ||||
-rw-r--r-- | templates/web/fiksgatami/header.html | 9 | ||||
-rw-r--r-- | templates/web/hart/header.html | 9 | ||||
-rw-r--r-- | templates/web/oxfordshire/header.html | 8 | ||||
-rw-r--r-- | templates/web/stevenage/header.html | 8 | ||||
-rw-r--r-- | templates/web/warwickshire/header.html | 8 | ||||
-rw-r--r-- | templates/web/zurich/header.html | 8 |
10 files changed, 19 insertions, 60 deletions
diff --git a/templates/web/angus/header.html b/templates/web/angus/header.html index c1d9870cd..1814045cb 100644 --- a/templates/web/angus/header.html +++ b/templates/web/angus/header.html @@ -16,13 +16,7 @@ <meta name="mobileoptimized" content="0"> [% INCLUDE 'header_opengraph.html' %] - <link rel="stylesheet" href="[% version('/cobrands/angus/base.css') %]"> - <link rel="stylesheet" href="[% version('/cobrands/angus/layout.css') %]" media="(min-width:48em)"> - [% extra_css %] - <!--[if (lt IE 9) & (!IEMobile)]> - <link rel="stylesheet" href="[% version('/cobrands/angus/layout.css') %]"> - <![endif]--> - + [% INCLUDE 'header/css.html' %] [% INCLUDE 'common_header_tags.html' %] [% IF c.req.uri.host == 'osm.fixmystreet.com' %] diff --git a/templates/web/base/common_header_tags.html b/templates/web/base/common_header_tags.html index e5a4d25f2..321e45649 100644 --- a/templates/web/base/common_header_tags.html +++ b/templates/web/base/common_header_tags.html @@ -1,7 +1,5 @@ [% SET start = c.config.ADMIN_BASE_URL IF admin %] -<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 %]" data-cobrand="[% c.cobrand.moniker %]"> diff --git a/templates/web/base/header.html b/templates/web/base/header.html index 4e537a7ec..37c81f454 100644 --- a/templates/web/base/header.html +++ b/templates/web/base/header.html @@ -19,13 +19,7 @@ <meta name="mobileoptimized" content="0"> [% INCLUDE 'header_opengraph.html' %] - <link rel="stylesheet" href="[% version('/cobrands/' _ c.cobrand.asset_moniker _ '/base.css') %]"> - <link rel="stylesheet" href="[% version('/cobrands/' _ c.cobrand.asset_moniker _ '/layout.css') %]" media="(min-width:48em)"> - [% extra_css %] - <!--[if (lt IE 9) & (!IEMobile)]> - <link rel="stylesheet" href="[% version('/cobrands/' _ c.cobrand.asset_moniker _ '/layout.css') %]"> - <![endif]--> - + [% INCLUDE 'header/css.html' %] [% INCLUDE 'common_header_tags.html' %] [% IF c.req.uri.host == 'osm.fixmystreet.com' %] diff --git a/templates/web/base/header/css.html b/templates/web/base/header/css.html new file mode 100644 index 000000000..219369465 --- /dev/null +++ b/templates/web/base/header/css.html @@ -0,0 +1,11 @@ +[% SET base_css = version('/cobrands/' _ c.cobrand.asset_moniker _ '/base.css') %] +[% SET layout_css = version('/cobrands/' _ c.cobrand.asset_moniker _ '/layout.css') %] + +<link rel="stylesheet" href="[% base_css %]"> +<link rel="stylesheet" href="[% layout_css %]" media="screen and (min-width:48em)"> +<!--[if (lt IE 9) & (!IEMobile)]> + <link rel="stylesheet" href="[% layout_css %]"> +<![endif]--> +<link rel="stylesheet" href="[% version('/vendor/OpenLayers/theme/default/style.css') %]"> + +[% extra_css %] diff --git a/templates/web/fiksgatami/header.html b/templates/web/fiksgatami/header.html index 17765948f..7c73f6060 100644 --- a/templates/web/fiksgatami/header.html +++ b/templates/web/fiksgatami/header.html @@ -11,14 +11,7 @@ <meta name="mobileoptimized" content="0"> [% INCLUDE 'header_opengraph.html' %] - - <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)"> - [% extra_css %] - <!--[if (lt IE 9) & (!IEMobile)]> - <link rel="stylesheet" href="[% version('/cobrands/' _ c.cobrand.moniker _ '/layout.css') %]"> - <![endif]--> - + [% INCLUDE 'header/css.html' %] [% INCLUDE 'common_header_tags.html' %] [% TRY %][% PROCESS 'header_extra.html' %][% CATCH file %][% END %] diff --git a/templates/web/hart/header.html b/templates/web/hart/header.html index ee29df818..0aae5568b 100644 --- a/templates/web/hart/header.html +++ b/templates/web/hart/header.html @@ -11,15 +11,8 @@ <meta name="mobileoptimized" content="0"> [% INCLUDE 'header_opengraph.html' %] - - <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)"> + [% INCLUDE 'header/css.html' %] <link rel="stylesheet" href="[% version('/cobrands/hart/hart.css') %]"> - [% extra_css %] - <!--[if (lt IE 9) & (!IEMobile)]> - <link rel="stylesheet" href="[% version('/cobrands/' _ c.cobrand.moniker _ '/layout.css') %]"> - <![endif]--> - [% INCLUDE 'common_header_tags.html' %] <link rel="Shortcut Icon" type="image/x-icon" href="/cobrands/hart/favicon.ico"> diff --git a/templates/web/oxfordshire/header.html b/templates/web/oxfordshire/header.html index 3666eb4ff..fce316bf9 100644 --- a/templates/web/oxfordshire/header.html +++ b/templates/web/oxfordshire/header.html @@ -13,13 +13,7 @@ <meta name="HandHeldFriendly" content="true"> <meta name="mobileoptimized" content="0"> - <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)"> - [% extra_css %] - <!--[if (lt IE 9) & (!IEMobile)]> - <link rel="stylesheet" href="[% version('/cobrands/' _ c.cobrand.moniker _ '/layout.css') %]"> - <![endif]--> - + [% INCLUDE 'header/css.html' %] [% INCLUDE 'common_header_tags.html' %] [% INCLUDE 'tracking_code.html' %] diff --git a/templates/web/stevenage/header.html b/templates/web/stevenage/header.html index 34f5ba2b2..219486a9e 100644 --- a/templates/web/stevenage/header.html +++ b/templates/web/stevenage/header.html @@ -10,13 +10,7 @@ <meta name="HandHeldFriendly" content="true"> <meta name="mobileoptimized" content="0"> - <link rel="stylesheet" href="[% version('/cobrands/stevenage/base.css') %]"> - <link rel="stylesheet" href="[% version('/cobrands/stevenage/layout.css') %]" media="(min-width:48em)"> - [% extra_css %] - <!--[if (lt IE 9) & (!IEMobile)]> - <link rel="stylesheet" href="[% version('/cobrands/' _ c.cobrand.moniker _ '/layout.css') %]"> - <![endif]--> - + [% INCLUDE 'header/css.html' %] [% INCLUDE 'common_header_tags.html' %] [% INCLUDE 'tracking_code.html' %] diff --git a/templates/web/warwickshire/header.html b/templates/web/warwickshire/header.html index 727a81c5f..6ad06f69a 100644 --- a/templates/web/warwickshire/header.html +++ b/templates/web/warwickshire/header.html @@ -38,13 +38,7 @@ <script src="[% version ('/cobrands/' _ c.cobrand.moniker _ '/vendor/gamma/jquery.zrssfeed.o.js') %]" type="text/javascript"></script> <script src="[% version ('/cobrands/' _ c.cobrand.moniker _ '/vendor/gamma/homepage-slider-test.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)"> - [% extra_css %] - <!--[if (lt IE 9) & (!IEMobile)]> - <link rel="stylesheet" href="[% version('/cobrands/' _ c.cobrand.moniker _ '/layout.css') %]"> - <![endif]--> - + [% INCLUDE 'header/css.html' %] [% INCLUDE 'common_header_tags.html' %] </head> diff --git a/templates/web/zurich/header.html b/templates/web/zurich/header.html index 0ab051aa7..117e44449 100644 --- a/templates/web/zurich/header.html +++ b/templates/web/zurich/header.html @@ -10,13 +10,7 @@ <meta name="HandHeldFriendly" content="true"> <meta name="mobileoptimized" content="0"> - <link rel="stylesheet" href="[% version('/cobrands/' _ c.cobrand.moniker _ '/base.css') %]"> - <link rel="stylesheet" href="[% version('/cobrands/' _ c.cobrand.moniker _ '/layout.css') %]" media="screen and (min-width:48em)"> - [% extra_css %] - <!--[if (lt IE 9) & (!IEMobile)]> - <link rel="stylesheet" href="[% version('/cobrands/' _ c.cobrand.moniker _ '/layout.css') %]"> - <![endif]--> - + [% INCLUDE 'header/css.html' %] <link rel="stylesheet" href="//ajax.googleapis.com/ajax/libs/jqueryui/1.9.2/themes/redmond/jquery-ui.css"> [% INCLUDE 'common_header_tags.html' %] |