X-Git-Url: https://git.deb.at/?a=blobdiff_plain;f=templates%2Fhtml%2Fhead.tmpl;h=1a4b8d907242692c2a32833667b4b2ea460f56a6;hb=b9f1ee37ac17e618a6f4ec774823bc551a952839;hp=74d8b4ab39a6d025feee4b74e9b1e9cba168f657;hpb=41ab743eae0a7875cf03a8b50a060da06af30b39;p=deb%2Fpackages.git

diff --git a/templates/html/head.tmpl b/templates/html/head.tmpl
index 74d8b4a..1a4b8d9 100644
--- a/templates/html/head.tmpl
+++ b/templates/html/head.tmpl
@@ -1,8 +1,8 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
-<html lang="[% lang %]">
+<html lang="[% po_lang %]">
 <head>
 <title>[% organisation %] -- [% title_tag %]</title>
-<link rev="made" href="[% admin.mail %]">
+<link rev="made" href="mailto:[% admin.mail %]">
 <meta http-equiv="Content-Type" content="text/html; charset=[% charset %]">
 <meta name="Author" content="[% admin.name %], [% admin.mail %]">
 <meta name="Description" content="[% description %]">
@@ -11,6 +11,9 @@
 
 <link href="/debian.css" rel="stylesheet" type="text/css" media="all">
 <link href="/packages.css" rel="stylesheet" type="text/css" media="all">
+<link href="/packages-site.css" rel="stylesheet" type="text/css" media="all">
+<link href="/ubuntu/ubuntu.css" rel="stylesheet" type="text/css" media="all">
+<link href="/ubuntu/masthead.css" rel="stylesheet" type="text/css" media="all">
 [% IF rss_alternate %]
 <link rel="alternate" type="application/rss+xml" title="RSS" href="[% rss_alternate %]">
 [% END %]
@@ -23,60 +26,67 @@
 [% sitewidemsg.txt %]
 </div>
 [%- END -%]
-<div id="header">
-   <div id="upperheader">
+    <div id="pageWrapper">
+      <div id="mastWrapper">
+        <div id="masthead">
+          <a class="imageLink"
+             href="[% homepage %]">&nbsp;</a>
 
-   <div id="logo">
-  <!-- very Debian specific use of the logo stuff -->
-  <a href="[% logo.url %]"><img src="[% logo.src %]" alt="" /></a>
-  <a href="[% logo.url %]"><img src="/Pics/debian.png" alt="[% logo.alt %]" width="179" height="61"></a>
-</div> <!-- end logo -->
+          <a class="hiddenStructure"
+             href="[% homepage %]/#documentContent">Skip
+             to content</a>
 
 [%- IF print_search_field %]
-[% checked = 'checked="checked"' %]
-<form method="GET" action="/search">
+[% checked = 'checked="checked"'
+   selected = 'selected="selected"' %]
+<div id="search">
+<form method="GET" action="[% search_url %]">
 <div id="hpacketsearch">
 [% IF search_field_values.mode %]<input type="hidden" name="mode" value="[% search_field_values.mode %]">[% END %]
 [% IF search_field_values.sort_by %]<input type="hidden" name="sort_by" value="[% search_field_values.sort_by %]">[% END %]
 [% IF search_field_values.suite %]<input type="hidden" name="suite" value="[% search_field_values.suite %]">[% END %]
 [% IF search_field_values.sections %]<input type="hidden" name="section" value="[% search_field_values.sections %]">[% END %]
 [% IF search_field_values.architectures %]<input type="hidden" name="arch" value="[% search_field_values.architectures %]">[% END %]
+[% IF opts.lang %]<input type="hidden" name="lang" value="[% opts.lang %]">[% END %]
+<input type="submit" value="[% g('Search') %]">
+<select size="1" name="searchon">
+<option value="names" [% selected IF search_field_values.searchon == 'names' || search_field_values.searchon == 'default' %]>
+[% g('package names') %]</option>
+<option value="all" [% selected IF search_field_values.searchon == 'all' %]>[% g('descriptions') %]</option>
+<option value="sourcenames" [% selected IF search_field_values.searchon == 'sourcenames' %]>[% g('source package names') %]</option>
+<option value="contents" [% selected IF search_field_values.searchon == 'contents' %]>[% g('package contents') %]</option>
+</select>
 <input type="text" size="30" name="keywords" value="[% search_field_values.keywords | html %]" id="kw">
-<input type="submit" value="Search">
-<span style="font-size: 60%"><a href="[% searchformurl %]">all options</a></span>
-<br>
-<div style="font-size: 80%">search in:
-<input type="radio" name="searchon" value="names" id="onlynames" [% checked IF search_field_values.searchon == 'names' || search_field_values.searchon == 'default' %]>
-<label for="onlynames">package names</label>&nbsp;&nbsp;
-
-<input type="radio" name="searchon" value="all" id="descs" [% checked IF search_field_values.searchon == 'all' %]>
-<label for="descs">descriptions</label>
-<br>
-<input type="radio" name="searchon" value="sourcenames" id="src" [% checked IF search_field_values.searchon == 'sourcenames' %]>
-<label for="src">source package names</label>
-<input type="radio" name="searchon" value="contents" id="conts" [% checked IF search_field_values.searchon == 'contents' %]>
-<label for="conts">package contents</label>
-</div>
+<span style="font-size: 60%"><a href="[% searchformurl %]">[% g('all options') %]</a></span>
 </div> <!-- end hpacketsearch -->
 </form>
+</div>
 [% END %]
 
-</div> <!-- end upperheader -->
+     <!-- masthead content begin -->
+    <h5 class="hiddenStructure">Sections</h5>    
+    <div id="nav">
+      <ul>        
+      </ul>
+    </div> <!-- nav -->
+    <!-- masthead content end -->
+    </div> <!-- masthead -->
+   </div>  <!-- mastWrapper -->
 
-<p class="hidecss"><a href="#inner">skip the navigation</a></p>
+<div class="visualClear"></div>
 <div id="pnavbar">
- &gt;&gt; <a href="[% homepage %]" title="[% organisation %] Homepage">[% organisation %]</a>
- &gt;&gt; <a href="[% packages_homepage %]" title="[% organisation %] Packages Homepage">Packages</a>
+ &gt;&gt; <a href="[% project_homepage %]" title="[% g('%s Homepage', organisation) %]">[% organisation %]</a>
+ &gt;&gt; <a href="[% packages_homepage %]" title="[% g('%s Packages Homepage', organisation) %]">[% g('Packages') %]</a>
 [% FOREACH n IN navigation %]
  &gt;&gt; [% IF n.url %]<a href="[% n.url %]" [% IF n.title %]title="[% n.title %]"[% END %]>[% n.name %]</a>[% ELSE %][% n.name %][% END %] 
 [% END %]
 </div> <!-- end navbar -->
 
-</div> <!-- end header -->
-<div id="outer">
-<div id="inner">
+<div class="inside">
+<div id="content" class="">
+<div class="documentContent" id="region-content">
 
 [%- IF page_title %]
-  <h1>[% page_title %]</h1>
+  <h1 class="documentFirstHeading">[% page_title %]</h1>
   [%- PROCESS 'html/messages.tmpl' -%]
 [% END -%]
