# HG changeset patch
# User Paul Boddie <paul@boddie.org.uk>
# Date 1275865998 -7200
# Node ID 0114d93d19c71421c547b757a4be851eb6d22071
# Parent  a2c123b01066f4698ee1b614d2cc71a162d7d1b7
Changed the menu entry capitalisation.
Refined the stylesheet, making it compatible with Roundup styling work,
permitting multiple forms in the navibar and links in the current navibar entry.

diff -r a2c123b01066 -r 0114d93d19c7 themes/mercurialweb/search.tmpl
--- a/themes/mercurialweb/search.tmpl	Sun Jun 06 16:56:26 2010 +0200
+++ b/themes/mercurialweb/search.tmpl	Mon Jun 07 01:13:18 2010 +0200
@@ -8,12 +8,12 @@
   <div id="logo"><a href="{url}..{sessionvars%urlparameter}"><img src="{staticurl}mercurial-logo.png" alt="Mercurial logo" /></a></div>
   <div class="controls">
     <ul id="navibar">
-    <li><a href="{url}summary{sessionvars%urlparameter}">summary</a></li
-    ><li><a href="{url}shortlog{sessionvars%urlparameter}">shortlog</a></li
-    ><li><a href="{url}changelog{sessionvars%urlparameter}">changelog</a></li
-    ><li><a href="{url}branches{sessionvars%urlparameter}">branches</a></li
-    ><li><a href="{url}tags{sessionvars%urlparameter}">tags</a></li
-    ><li><a href="{url}files{sessionvars%urlparameter}">files</a></li
+    <li><a href="{url}summary{sessionvars%urlparameter}">Summary</a></li
+    ><li><a href="{url}shortlog{sessionvars%urlparameter}">Shortlog</a></li
+    ><li><a href="{url}changelog{sessionvars%urlparameter}">Changelog</a></li
+    ><li><a href="{url}branches{sessionvars%urlparameter}">Branches</a></li
+    ><li><a href="{url}tags{sessionvars%urlparameter}">Tags</a></li
+    ><li><a href="{url}files{sessionvars%urlparameter}">Files</a></li
     ><li><form id="searchform" action="{url}log"><span class="container">
         <span class="hint">Search</span>&nbsp;<input name="rev" id="searchinput" type="text" size="20" />
       </span>
diff -r a2c123b01066 -r 0114d93d19c7 themes/mercurialweb/shortlog.tmpl
--- a/themes/mercurialweb/shortlog.tmpl	Sun Jun 06 16:56:26 2010 +0200
+++ b/themes/mercurialweb/shortlog.tmpl	Mon Jun 07 01:13:18 2010 +0200
@@ -8,12 +8,12 @@
   <div id="logo"><a href="{url}..{sessionvars%urlparameter}"><img src="{staticurl}mercurial-logo.png" alt="Mercurial logo" /></a></div>
   <div class="controls">
     <ul id="navibar">
-    <li><a href="{url}summary{sessionvars%urlparameter}">summary</a></li
-    ><li class="current"><span>shortlog</span></li
-    ><li><a href="{url}changelog{sessionvars%urlparameter}">changelog</a></li
-    ><li><a href="{url}tags{sessionvars%urlparameter}">tags</a></li
-    ><li><a href="{url}branches{sessionvars%urlparameter}">branches</a></li
-    ><li><a href="{url}files{sessionvars%urlparameter}">files</a></li
+    <li><a href="{url}summary{sessionvars%urlparameter}">Summary</a></li
+    ><li class="current"><span>Shortlog</span></li
+    ><li><a href="{url}changelog{sessionvars%urlparameter}">Changelog</a></li
+    ><li><a href="{url}tags{sessionvars%urlparameter}">Tags</a></li
+    ><li><a href="{url}branches{sessionvars%urlparameter}">Branches</a></li
+    ><li><a href="{url}files{sessionvars%urlparameter}">Files</a></li
     ><li><form id="searchform" action="{url}log"><span class="container">
         <span class="hint">Search</span>&nbsp;<input name="rev" id="searchinput" type="text" size="20" />
       </span>
diff -r a2c123b01066 -r 0114d93d19c7 themes/mercurialweb/static/style-mercurialweb.css
--- a/themes/mercurialweb/static/style-mercurialweb.css	Sun Jun 06 16:56:26 2010 +0200
+++ b/themes/mercurialweb/static/style-mercurialweb.css	Mon Jun 07 01:13:18 2010 +0200
@@ -108,12 +108,16 @@
     padding: 0;
 }
 
+#navibar li form {
+    display: inline;
+}
+
 #navibar a, #navibar li.current span, .navigation a {
     color: #fff;
     text-decoration: none;
 }
 
-#navibar a, #navibar li.current span {
+#navibar a {
     background: #999;
 }
 
@@ -169,18 +173,13 @@
     text-decoration: none;
 }
 
-#searchform {
-    display: inline;
-}
-
-#searchform span.container {
+#navibar form span.container {
+    position: relative;
     display: inline-block;
-    position: relative;
 
     /* Margin and padding correspond to the navibar settings. */
 
     margin: 0;
-    padding: 0 16px;
     background: #999;
 
     /* Height settings correspond to navibar list entries. */
@@ -189,6 +188,13 @@
     line-height: 42px;
 }
 
+form#searchform span.container {
+
+    /* Margin and padding correspond to the navibar settings. */
+
+    padding: 0 16px;
+}
+
 #searchform span.container span.hint {
     display: none;
 }
diff -r a2c123b01066 -r 0114d93d19c7 themes/mercurialweb/summary.tmpl
--- a/themes/mercurialweb/summary.tmpl	Sun Jun 06 16:56:26 2010 +0200
+++ b/themes/mercurialweb/summary.tmpl	Mon Jun 07 01:13:18 2010 +0200
@@ -8,12 +8,12 @@
   <div id="logo"><a href="{url}..{sessionvars%urlparameter}"><img src="{staticurl}mercurial-logo.png" alt="Mercurial logo" /></a></div>
   <div class="controls">
     <ul id="navibar">
-    <li class="current"><span>summary</span></li
-    ><li><a href="{url}shortlog{sessionvars%urlparameter}">shortlog</a></li
-    ><li><a href="{url}changelog{sessionvars%urlparameter}">changelog</a></li
-    ><li><a href="{url}branches{sessionvars%urlparameter}">branches</a></li
-    ><li><a href="{url}tags{sessionvars%urlparameter}">tags</a></li
-    ><li><a href="{url}files{sessionvars%urlparameter}">files</a></li
+    <li class="current"><span>Summary</span></li
+    ><li><a href="{url}shortlog{sessionvars%urlparameter}">Shortlog</a></li
+    ><li><a href="{url}changelog{sessionvars%urlparameter}">Changelog</a></li
+    ><li><a href="{url}branches{sessionvars%urlparameter}">Branches</a></li
+    ><li><a href="{url}tags{sessionvars%urlparameter}">Tags</a></li
+    ><li><a href="{url}files{sessionvars%urlparameter}">Files</a></li
     ><li><form id="searchform" action="{url}log"><span class="container">
         <span class="hint">Search</span>&nbsp;<input name="rev" id="searchinput" type="text" size="20" />
       </span>