diff options
| -rw-r--r-- | templates/web/emptyhomes/header.html | 34 | ||||
| -rw-r--r-- | templates/website/cobrands/barnet/header | 98 |
2 files changed, 18 insertions, 114 deletions
diff --git a/templates/web/emptyhomes/header.html b/templates/web/emptyhomes/header.html index 9083a204a..df97adeae 100644 --- a/templates/web/emptyhomes/header.html +++ b/templates/web/emptyhomes/header.html @@ -1,12 +1,8 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd"> <html lang="[% lang_code %]"> <head> -<title>[% title | html %] :: [% c.cobrand.site_title %]</title> -<meta http-equiv="content-type" content="text/html; charset=utf-8"> -<script type="text/javascript" src="/yui/utilities.js"></script> -<script type="text/javascript" src="/js.js"></script> -[% extra_js_verbatim IF extra_js_verbatim %] +[% INCLUDE 'common_header_tags.html' %] <style type="text/css"> @import "/css/core.css"; @@ -16,16 +12,17 @@ <style type="text/css">@import url("/css/ie6.css");</style> <![endif]--> -[% IF rss %] - <link rel="alternate" type="application/rss+xml" title="[% rss.0 %]" href="[% rss.1 %]"> -[% END %] - </head> <body> <div id="header"> -<a href="http://www.emptyhomes.com/"><img border="0" src="/i/eha-logo.jpeg" alt="Empty Homes Agency" width="91" height="71" align="middle"></a> -<a href="http://www.sheltercymru.org.uk/"><img border="0" src="/i/Sheltercymru47.gif" alt="Shelter Cymru" width="114" height="47" align="middle"></a> + <a href="http://www.emptyhomes.com/"><img id="eha-logo" border="0" src="/i/eha-logo.jpeg" alt="Empty Homes Agency" width="91" height="71" align="left"></a> + <div> + <small><em>in conjunction with</em></small> + <br> + <a href="http://www.sheltercymru.org.uk/"><img border="0" src="/i/Sheltercymru47s.png" alt="Shelter Cymru" width="80" height="33" align="bottom"></a> + <a href="http://scotland.shelter.org.uk/housing_issues/more_homes/empty_homes"><img border="0" src="/i/SEHPlogo-bwS.png" alt="Scottish Empty Homes Partnership" width="131" height="40" align="bottom"></a> + </div> </div> <div id="navigation"> @@ -35,15 +32,20 @@ <li><a href="/alert" >[% loc("Local alerts") %]</a></li> <li><a href="/faq" >[% loc("Help") %]</a></li> <li><a href="/about" >[% loc('About us') %]</a></li> - [% IF lang_code == 'en-gb' %] - <li><a href="http://cy.[% c.cobrand.base_host %]">Cymraeg</a></li> - [% ELSE %] - <li><a href="http://en.[% c.cobrand.base_host %]">English</a></li> + [% IF lang_url # old Page.pm code %] + <li><a href="[% lang_url %]">[% lang %]</a></li> + [% ELSE # new Catalyst code %] + [% IF lang_code == 'en-gb' %] + <li><a href="http://cy.[% c.cobrand.base_host %]">Cymraeg</a></li> + [% ELSE %] + <li><a href="http://en.[% c.cobrand.base_host %]">English</a></li> + [% END %] [% END %] - </ul> + </ul> </div> <div id="wrapper"> <div id="mysociety"> [% INCLUDE 'debug_header.html' %] + diff --git a/templates/website/cobrands/barnet/header b/templates/website/cobrands/barnet/header deleted file mode 100644 index cd274df7b..000000000 --- a/templates/website/cobrands/barnet/header +++ /dev/null @@ -1,98 +0,0 @@ -<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<html lang="{{ $lang_code }}">
- <head>
- <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
- <link rel="stylesheet" type="text/css" href="/cobrands/barnet/css/basic.css">
-
- <style type="text/css">
- @import url(/css/core.css);
- @import url(/cobrands/barnet/css/layout.css);
- </style>
-
-
- <!-- Preferred style sheet enabled when the page is loaded -->
- <link rel="stylesheet" title="default" type="text/css" href="/cobrands/barnet/css/light.css">
-
- <!-- Alternate style sheets used for the light/relaxed style -->
- <link rel="alternate stylesheet" title="relaxed light" type="text/css" href="/cobrands/barnet/css/light.css">
- <link rel="alternate stylesheet" title="relaxed light" type="text/css" href="/cobrands/barnet/css/relaxed.css">
-
- <!-- Alternate style sheets used for the dark style -->
- <link rel="alternate stylesheet" title="dark" type="text/css" href="/cobrands/barnet/css/dark.css">
-
- <!-- Alternate style sheets used for the dark/relaxed style -->
- <link rel="alternate stylesheet" title="relaxed dark" type="text/css" href="/cobrands/barnet/css/dark.css">
- <link rel="alternate stylesheet" title="relaxed dark" type="text/css" href="/cobrands/barnet/css/relaxed.css">
-
-
- <!--[if lte IE 6]>
- <link rel="stylesheet" type="text/css" href="/cobrands/barnet/css/ie.css">
-
- <link rel="alternate stylesheet" title="relaxed light" type="text/css" href="/cobrands/barnet/css/ie-relaxed.css">
-
- <link rel="alternate stylesheet" title="dark" type="text/css" href="/cobrands/barnet/css/ie-dark.css">
-
- <link rel="alternate stylesheet" title="relaxed dark" type="text/css" href="/cobrands/barnet/css/ie-dark.css">
- <link rel="alternate stylesheet" title="relaxed dark" type="text/css" href="/cobrands/barnet/css/ie-relaxed.css">
- <![endif]-->
-
- <!--[if IE 7]>
- <link rel="stylesheet" type="text/css" href="/cobrands/barnet/css/ie-seven.css">
-
- <link rel="alternate stylesheet" title="relaxed light" type="text/css" href="/cobrands/barnet/css/ie-seven-relaxed.css">
-
- <link rel="alternate stylesheet" title="relaxed dark" type="text/css" href="/cobrands/barnet/css/ie-seven-relaxed.css">
- <![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="/yui/utilities.js"></script>
-<script type="text/javascript" src="/js.js"></script>
-{{ $map_js }}
-
-{{ $rss }}
-
- <title>{{ $title }}{{ $site_title }}</title>
- </head>
- <body>
-
- <div id="iewrap">
- <img id="print-logo" src="/cobrands/barnet/images/logo-barnet.gif" alt="">
- <div id="header">
- <a href="http://www.barnet.gov.uk/"><img src="/cobrands/barnet/images/logo-barnet.gif" alt="Barnet Logo"></a>
-
- <a href="#content" class="rm">Skip to Content</a>
- <span class="rm">|</span>
- <a href="#navigation" class="rm">Skip to Menu</a>
- <span class="rm">|</span>
-
- <form action="http://www.barnet.gov.uk/search">
- <div class="search-input">
- <input type="hidden" name="col" value="lbb">
- <input type="hidden" name="type" value="sitesearch">
- <label for="input-0" class="rm">Search:</label>
- <input type="text" value="Please enter your search" name="search" class="search">
- </div>
- <div class="search-button">
- <input type="submit" value="Search" class="submit" id="input-0">
- </div>
- </form>
-
- <div id="switcher" style="display:none">
- <p>Site preferences:</p>
- <ul>
- <li class="default"><a id="s1" class="styleswitch" rel="default" title="Light colours with the default layout">default</a></li>
- <li class="relaxed-light"><a id="s2" class="styleswitch" rel="relaxed light" title="Light colours with the relaxed layout" href="#">relaxed light</a></li>
- <li class="dark"><a id="s3" class="styleswitch" rel="dark" title="Dark colours with the default layout" href="#">dark</a></li>
- <li class="relaxed-dark"><a id="s4" class="styleswitch" rel="relaxed dark" title="Dark colours with the relaxed layout" href="#">relaxed dark</a></li>
- </ul>
- </div><!-- end switcher -->
- </div><!-- end header -->
-
- <div id="wrap">
- <div id="content">
- <div id="mysociety">
-
|