# HG changeset patch
# User Paul Boddie <paul@boddie.org.uk>
# Date 1322266846 -3600
# Node ID 662ad8e5a209359041695573d01bd319b4ae1768
# Parent  ad34bfccab10801d60954f31c7cebad0ed967099
Moved the search form under the pageline.

diff -r ad34bfccab10 -r 662ad8e5a209 themes/mercurialweb/bookmarks.tmpl
--- a/themes/mercurialweb/bookmarks.tmpl	Sat Nov 26 01:08:12 2011 +0100
+++ b/themes/mercurialweb/bookmarks.tmpl	Sat Nov 26 01:20:46 2011 +0100
@@ -16,16 +16,15 @@
     ><li class="current"><span>Bookmarks</span></li
     ><li><a href="{url}branches{sessionvars%urlparameter}">Branches</a></li
     ><li><a href="{url}file/{node|short}{sessionvars%urlparameter}">Files</a></li
-    ><li><a href="{url}help{sessionvars%urlparameter}">Help</a></li
-    ><li><form id="searchform" action="{url}log"><span class="container">
-        <span class="hint">Search</span>&#160;<input name="rev" id="searchinput" type="text" size="20" />
-      </span>
-      {sessionvars%hiddenformentry}
-      </form>
-    </li>
+    ><li><a href="{url}help{sessionvars%urlparameter}">Help</a></li>
     </ul>
   </div>
   <div id="pageline"></div>
+  <form id="searchform" action="{url}log"><span class="container">
+    <span class="hint">Search</span>&#160;<input name="rev" id="searchinput" type="text" size="20" />
+    </span>
+    {sessionvars%hiddenformentry}
+  </form>
 </div>
 
 <h2>{repo|escape}</h2>
diff -r ad34bfccab10 -r 662ad8e5a209 themes/mercurialweb/branches.tmpl
--- a/themes/mercurialweb/branches.tmpl	Sat Nov 26 01:08:12 2011 +0100
+++ b/themes/mercurialweb/branches.tmpl	Sat Nov 26 01:20:46 2011 +0100
@@ -16,16 +16,15 @@
     ><li><a href="{url}bookmarks{sessionvars%urlparameter}">Bookmarks</a></li
     ><li class="current"><span>Branches</span></li
     ><li><a href="{url}file/{node|short}{sessionvars%urlparameter}">Files</a></li
-    ><li><a href="{url}help{sessionvars%urlparameter}">Help</a></li
-    ><li><form id="searchform" action="{url}log"><span class="container">
-        <span class="hint">Search</span>&#160;<input name="rev" id="searchinput" type="text" size="20" />
-      </span>
-      {sessionvars%hiddenformentry}
-      </form>
-    </li>
+    ><li><a href="{url}help{sessionvars%urlparameter}">Help</a></li>
     </ul>
   </div>
   <div id="pageline"></div>
+  <form id="searchform" action="{url}log"><span class="container">
+    <span class="hint">Search</span>&#160;<input name="rev" id="searchinput" type="text" size="20" />
+    </span>
+    {sessionvars%hiddenformentry}
+  </form>
 </div>
 
 <h2>{repo|escape}</h2>
diff -r ad34bfccab10 -r 662ad8e5a209 themes/mercurialweb/changelog.tmpl
--- a/themes/mercurialweb/changelog.tmpl	Sat Nov 26 01:08:12 2011 +0100
+++ b/themes/mercurialweb/changelog.tmpl	Sat Nov 26 01:20:46 2011 +0100
@@ -16,16 +16,15 @@
     ><li><a href="{url}bookmarks{sessionvars%urlparameter}">Bookmarks</a></li
     ><li><a href="{url}branches{sessionvars%urlparameter}">Branches</a></li
     ><li><a href="{url}file/{node|short}{sessionvars%urlparameter}">Files</a></li
-    ><li><a href="{url}help{sessionvars%urlparameter}">Help</a></li
-    ><li><form id="searchform" action="{url}log"><span class="container">
-        <span class="hint">Search</span>&#160;<input name="rev" id="searchinput" type="text" size="20" />
-      </span>
-      {sessionvars%hiddenformentry}
-      </form>
-    </li>
+    ><li><a href="{url}help{sessionvars%urlparameter}">Help</a></li>
     </ul>
   </div>
   <div id="pageline"></div>
+  <form id="searchform" action="{url}log"><span class="container">
+    <span class="hint">Search</span>&#160;<input name="rev" id="searchinput" type="text" size="20" />
+    </span>
+    {sessionvars%hiddenformentry}
+  </form>
 </div>
 
 <h2>{repo|escape}</h2>
diff -r ad34bfccab10 -r 662ad8e5a209 themes/mercurialweb/changeset.tmpl
--- a/themes/mercurialweb/changeset.tmpl	Sat Nov 26 01:08:12 2011 +0100
+++ b/themes/mercurialweb/changeset.tmpl	Sat Nov 26 01:20:46 2011 +0100
@@ -16,16 +16,15 @@
     ><li><a href="{url}bookmarks{sessionvars%urlparameter}">Bookmarks</a></li
     ><li><a href="{url}branches{sessionvars%urlparameter}">Branches</a></li
     ><li><a href="{url}file/{node|short}{sessionvars%urlparameter}">Files</a></li
-    ><li><a href="{url}help{sessionvars%urlparameter}">Help</a></li
-    ><li><form id="searchform" action="{url}log"><span class="container">
-        <span class="hint">Search</span>&#160;<input name="rev" id="searchinput" type="text" size="20" />
-      </span>
-      {sessionvars%hiddenformentry}
-      </form>
-    </li>
+    ><li><a href="{url}help{sessionvars%urlparameter}">Help</a></li>
     </ul>
   </div>
   <div id="pageline"></div>
+  <form id="searchform" action="{url}log"><span class="container">
+    <span class="hint">Search</span>&#160;<input name="rev" id="searchinput" type="text" size="20" />
+    </span>
+    {sessionvars%hiddenformentry}
+  </form>
 </div>
 
 <h2>{repo|escape}</h2>
diff -r ad34bfccab10 -r 662ad8e5a209 themes/mercurialweb/error.tmpl
--- a/themes/mercurialweb/error.tmpl	Sat Nov 26 01:08:12 2011 +0100
+++ b/themes/mercurialweb/error.tmpl	Sat Nov 26 01:20:46 2011 +0100
@@ -16,16 +16,15 @@
     ><li><a href="{url}bookmarks{sessionvars%urlparameter}">Bookmarks</a></li
     ><li><a href="{url}branches{sessionvars%urlparameter}">Branches</a></li
     ><li><a href="{url}file/{node|short}{sessionvars%urlparameter}">Files</a></li
-    ><li><a href="{url}help{sessionvars%urlparameter}">Help</a></li
-    ><li><form id="searchform" action="{url}log"><span class="container">
-        <span class="hint">Search</span>&#160;<input name="rev" id="searchinput" type="text" size="20" />
-      </span>
-      {sessionvars%hiddenformentry}
-      </form>
-    </li>
+    ><li><a href="{url}help{sessionvars%urlparameter}">Help</a></li>
     </ul>
   </div>
   <div id="pageline"></div>
+  <form id="searchform" action="{url}log"><span class="container">
+    <span class="hint">Search</span>&#160;<input name="rev" id="searchinput" type="text" size="20" />
+    </span>
+    {sessionvars%hiddenformentry}
+  </form>
 </div>
 
 <h2>{repo|escape}</h2>
diff -r ad34bfccab10 -r 662ad8e5a209 themes/mercurialweb/fileannotate.tmpl
--- a/themes/mercurialweb/fileannotate.tmpl	Sat Nov 26 01:08:12 2011 +0100
+++ b/themes/mercurialweb/fileannotate.tmpl	Sat Nov 26 01:20:46 2011 +0100
@@ -16,16 +16,15 @@
     ><li><a href="{url}bookmarks{sessionvars%urlparameter}">Bookmarks</a></li
     ><li><a href="{url}branches{sessionvars%urlparameter}">Branches</a></li
     ><li><a href="{url}file/{node|short}{sessionvars%urlparameter}">Files</a></li
-    ><li><a href="{url}help{sessionvars%urlparameter}">Help</a></li
-    ><li><form id="searchform" action="{url}log"><span class="container">
-        <span class="hint">Search</span>&#160;<input name="rev" id="searchinput" type="text" size="20" />
-      </span>
-      {sessionvars%hiddenformentry}
-      </form>
-    </li>
+    ><li><a href="{url}help{sessionvars%urlparameter}">Help</a></li>
     </ul>
   </div>
   <div id="pageline"></div>
+  <form id="searchform" action="{url}log"><span class="container">
+    <span class="hint">Search</span>&#160;<input name="rev" id="searchinput" type="text" size="20" />
+    </span>
+    {sessionvars%hiddenformentry}
+  </form>
 </div>
 
 <h2>{repo|escape}</h2>
diff -r ad34bfccab10 -r 662ad8e5a209 themes/mercurialweb/filediff.tmpl
--- a/themes/mercurialweb/filediff.tmpl	Sat Nov 26 01:08:12 2011 +0100
+++ b/themes/mercurialweb/filediff.tmpl	Sat Nov 26 01:20:46 2011 +0100
@@ -16,16 +16,15 @@
     ><li><a href="{url}bookmarks{sessionvars%urlparameter}">Bookmarks</a></li
     ><li><a href="{url}branches{sessionvars%urlparameter}">Branches</a></li
     ><li><a href="{url}file/{node|short}{sessionvars%urlparameter}">Files</a></li
-    ><li><a href="{url}help{sessionvars%urlparameter}">Help</a></li
-    ><li><form id="searchform" action="{url}log"><span class="container">
-        <span class="hint">Search</span>&#160;<input name="rev" id="searchinput" type="text" size="20" />
-      </span>
-      {sessionvars%hiddenformentry}
-      </form>
-    </li>
+    ><li><a href="{url}help{sessionvars%urlparameter}">Help</a></li>
     </ul>
   </div>
   <div id="pageline"></div>
+  <form id="searchform" action="{url}log"><span class="container">
+    <span class="hint">Search</span>&#160;<input name="rev" id="searchinput" type="text" size="20" />
+    </span>
+    {sessionvars%hiddenformentry}
+  </form>
 </div>
 
 <h2>{repo|escape}</h2>
diff -r ad34bfccab10 -r 662ad8e5a209 themes/mercurialweb/filerevision.tmpl
--- a/themes/mercurialweb/filerevision.tmpl	Sat Nov 26 01:08:12 2011 +0100
+++ b/themes/mercurialweb/filerevision.tmpl	Sat Nov 26 01:20:46 2011 +0100
@@ -16,16 +16,15 @@
     ><li><a href="{url}bookmarks{sessionvars%urlparameter}">Bookmarks</a></li
     ><li><a href="{url}branches{sessionvars%urlparameter}">Branches</a></li
     ><li><a href="{url}file/{node|short}{sessionvars%urlparameter}">Files</a></li
-    ><li><a href="{url}help{sessionvars%urlparameter}">Help</a></li
-    ><li><form id="searchform" action="{url}log"><span class="container">
-        <span class="hint">Search</span>&#160;<input name="rev" id="searchinput" type="text" size="20" />
-      </span>
-      {sessionvars%hiddenformentry}
-      </form>
-    </li>
+    ><li><a href="{url}help{sessionvars%urlparameter}">Help</a></li>
     </ul>
   </div>
   <div id="pageline"></div>
+  <form id="searchform" action="{url}log"><span class="container">
+    <span class="hint">Search</span>&#160;<input name="rev" id="searchinput" type="text" size="20" />
+    </span>
+    {sessionvars%hiddenformentry}
+  </form>
 </div>
 
 <h2>{repo|escape}</h2>
diff -r ad34bfccab10 -r 662ad8e5a209 themes/mercurialweb/graph.tmpl
--- a/themes/mercurialweb/graph.tmpl	Sat Nov 26 01:08:12 2011 +0100
+++ b/themes/mercurialweb/graph.tmpl	Sat Nov 26 01:20:46 2011 +0100
@@ -16,16 +16,15 @@
     ><li><a href="{url}bookmarks{sessionvars%urlparameter}">Bookmarks</a></li
     ><li><a href="{url}branches{sessionvars%urlparameter}">Branches</a></li
     ><li><a href="{url}file/{node|short}{sessionvars%urlparameter}">Files</a></li
-    ><li><a href="{url}help{sessionvars%urlparameter}">Help</a></li
-    ><li><form id="searchform" action="{url}log"><span class="container">
-        <span class="hint">Search</span>&#160;<input name="rev" id="searchinput" type="text" size="20" />
-      </span>
-      {sessionvars%hiddenformentry}
-      </form>
-    </li>
+    ><li><a href="{url}help{sessionvars%urlparameter}">Help</a></li>
     </ul>
   </div>
   <div id="pageline"></div>
+  <form id="searchform" action="{url}log"><span class="container">
+    <span class="hint">Search</span>&#160;<input name="rev" id="searchinput" type="text" size="20" />
+    </span>
+    {sessionvars%hiddenformentry}
+  </form>
 </div>
 
 <h2>{repo|escape}</h2>
diff -r ad34bfccab10 -r 662ad8e5a209 themes/mercurialweb/help.tmpl
--- a/themes/mercurialweb/help.tmpl	Sat Nov 26 01:08:12 2011 +0100
+++ b/themes/mercurialweb/help.tmpl	Sat Nov 26 01:20:46 2011 +0100
@@ -16,16 +16,15 @@
     ><li><a href="{url}bookmarks{sessionvars%urlparameter}">Bookmarks</a></li
     ><li><a href="{url}branches{sessionvars%urlparameter}">Branches</a></li
     ><li><a href="{url}file/{node|short}{sessionvars%urlparameter}">Files</a></li
-    ><li class="current"><span>Help</span></li
-    ><li><form id="searchform" action="{url}log"><span class="container">
-        <span class="hint">Search</span>&#160;<input name="rev" id="searchinput" type="text" size="20" />
-      </span>
-      {sessionvars%hiddenformentry}
-      </form>
-    </li>
+    ><li class="current"><span>Help</span></li>
     </ul>
   </div>
   <div id="pageline"></div>
+  <form id="searchform" action="{url}log"><span class="container">
+    <span class="hint">Search</span>&#160;<input name="rev" id="searchinput" type="text" size="20" />
+    </span>
+    {sessionvars%hiddenformentry}
+  </form>
 </div>
 
 <h2>{repo|escape}</h2>
diff -r ad34bfccab10 -r 662ad8e5a209 themes/mercurialweb/helptopics.tmpl
--- a/themes/mercurialweb/helptopics.tmpl	Sat Nov 26 01:08:12 2011 +0100
+++ b/themes/mercurialweb/helptopics.tmpl	Sat Nov 26 01:20:46 2011 +0100
@@ -16,16 +16,15 @@
     ><li><a href="{url}bookmarks{sessionvars%urlparameter}">Bookmarks</a></li
     ><li><a href="{url}branches{sessionvars%urlparameter}">Branches</a></li
     ><li><a href="{url}file/{node|short}{sessionvars%urlparameter}">Files</a></li
-    ><li class="current"><span>Help</span></li
-    ><li><form id="searchform" action="{url}log"><span class="container">
-        <span class="hint">Search</span>&#160;<input name="rev" id="searchinput" type="text" size="20" />
-      </span>
-      {sessionvars%hiddenformentry}
-      </form>
-    </li>
+    ><li class="current"><span>Help</span></li>
     </ul>
   </div>
   <div id="pageline"></div>
+  <form id="searchform" action="{url}log"><span class="container">
+    <span class="hint">Search</span>&#160;<input name="rev" id="searchinput" type="text" size="20" />
+    </span>
+    {sessionvars%hiddenformentry}
+  </form>
 </div>
 
 <h2>{repo|escape}</h2>
diff -r ad34bfccab10 -r 662ad8e5a209 themes/mercurialweb/manifest.tmpl
--- a/themes/mercurialweb/manifest.tmpl	Sat Nov 26 01:08:12 2011 +0100
+++ b/themes/mercurialweb/manifest.tmpl	Sat Nov 26 01:20:46 2011 +0100
@@ -16,16 +16,15 @@
     ><li><a href="{url}bookmarks{sessionvars%urlparameter}">Bookmarks</a></li
     ><li><a href="{url}branches{sessionvars%urlparameter}">Branches</a></li
     ><li class="current"><span>Files</span></li
-    ><li><a href="{url}help{sessionvars%urlparameter}">Help</a></li
-    ><li><form id="searchform" action="{url}log"><span class="container">
-        <span class="hint">Search</span>&#160;<input name="rev" id="searchinput" type="text" size="20" />
-      </span>
-      {sessionvars%hiddenformentry}
-      </form>
-    </li>
+    ><li><a href="{url}help{sessionvars%urlparameter}">Help</a></li>
     </ul>
   </div>
   <div id="pageline"></div>
+  <form id="searchform" action="{url}log"><span class="container">
+    <span class="hint">Search</span>&#160;<input name="rev" id="searchinput" type="text" size="20" />
+    </span>
+    {sessionvars%hiddenformentry}
+  </form>
 </div>
 
 <h2>{repo|escape}</h2>
diff -r ad34bfccab10 -r 662ad8e5a209 themes/mercurialweb/search.tmpl
--- a/themes/mercurialweb/search.tmpl	Sat Nov 26 01:08:12 2011 +0100
+++ b/themes/mercurialweb/search.tmpl	Sat Nov 26 01:20:46 2011 +0100
@@ -16,16 +16,15 @@
     ><li><a href="{url}bookmarks{sessionvars%urlparameter}">Bookmarks</a></li
     ><li><a href="{url}branches{sessionvars%urlparameter}">Branches</a></li
     ><li><a href="{url}file/{node|short}{sessionvars%urlparameter}">Files</a></li
-    ><li><a href="{url}help{sessionvars%urlparameter}">Help</a></li
-    ><li><form id="searchform" action="{url}log"><span class="container">
-        <span class="hint">Search</span>&#160;<input name="rev" id="searchinput" type="text" size="20" />
-      </span>
-      {sessionvars%hiddenformentry}
-      </form>
-    </li>
+    ><li><a href="{url}help{sessionvars%urlparameter}">Help</a></li>
     </ul>
   </div>
   <div id="pageline"></div>
+  <form id="searchform" action="{url}log"><span class="container">
+    <span class="hint">Search</span>&#160;<input name="rev" id="searchinput" type="text" size="20" />
+    </span>
+    {sessionvars%hiddenformentry}
+  </form>
 </div>
 
 <h2>{repo|escape}</h2>
diff -r ad34bfccab10 -r 662ad8e5a209 themes/mercurialweb/shortlog.tmpl
--- a/themes/mercurialweb/shortlog.tmpl	Sat Nov 26 01:08:12 2011 +0100
+++ b/themes/mercurialweb/shortlog.tmpl	Sat Nov 26 01:20:46 2011 +0100
@@ -16,16 +16,15 @@
     ><li><a href="{url}bookmarks{sessionvars%urlparameter}">Bookmarks</a></li
     ><li><a href="{url}branches{sessionvars%urlparameter}">Branches</a></li
     ><li><a href="{url}file/{node|short}{sessionvars%urlparameter}">Files</a></li
-    ><li><a href="{url}help{sessionvars%urlparameter}">Help</a></li
-    ><li><form id="searchform" action="{url}log"><span class="container">
-        <span class="hint">Search</span>&#160;<input name="rev" id="searchinput" type="text" size="20" />
-      </span>
-      {sessionvars%hiddenformentry}
-      </form>
-    </li>
+    ><li><a href="{url}help{sessionvars%urlparameter}">Help</a></li>
     </ul>
   </div>
   <div id="pageline"></div>
+  <form id="searchform" action="{url}log"><span class="container">
+    <span class="hint">Search</span>&#160;<input name="rev" id="searchinput" type="text" size="20" />
+    </span>
+    {sessionvars%hiddenformentry}
+  </form>
 </div>
 
 <h2>{repo|escape}</h2>
diff -r ad34bfccab10 -r 662ad8e5a209 themes/mercurialweb/static/style-mercurialweb.css
--- a/themes/mercurialweb/static/style-mercurialweb.css	Sat Nov 26 01:08:12 2011 +0100
+++ b/themes/mercurialweb/static/style-mercurialweb.css	Sat Nov 26 01:20:46 2011 +0100
@@ -303,33 +303,25 @@
     text-decoration: none;
 }
 
-#navibar form span.container {
+span.container {
     position: relative;
-    display: inline-block;
-
-    /* Margin and padding correspond to the navibar settings. */
-
-    margin: 0;
-    background: #999;
+    float: right;
 
     /* Height settings correspond to navibar list entries. */
 
     height: 42px;
     line-height: 42px;
-}
-
-form#searchform span.container {
 
     /* Margin and padding correspond to the navibar settings. */
 
     padding: 0 16px;
 }
 
-#searchform span.container span.hint {
+span.container span.hint {
     display: none;
 }
 
-#searchform span.container:hover span.hint {
+span.container:hover span.hint {
     display: block;
     position: absolute;
     top: 42px;
diff -r ad34bfccab10 -r 662ad8e5a209 themes/mercurialweb/summary.tmpl
--- a/themes/mercurialweb/summary.tmpl	Sat Nov 26 01:08:12 2011 +0100
+++ b/themes/mercurialweb/summary.tmpl	Sat Nov 26 01:20:46 2011 +0100
@@ -16,16 +16,15 @@
     ><li><a href="{url}bookmarks{sessionvars%urlparameter}">Bookmarks</a></li
     ><li><a href="{url}branches{sessionvars%urlparameter}">Branches</a></li
     ><li><a href="{url}file/{node|short}{sessionvars%urlparameter}">Files</a></li
-    ><li><a href="{url}help{sessionvars%urlparameter}">Help</a></li
-    ><li><form id="searchform" action="{url}log"><span class="container">
-        <span class="hint">Search</span>&#160;<input name="rev" id="searchinput" type="text" size="20" />
-      </span>
-      {sessionvars%hiddenformentry}
-      </form>
-    </li>
+    ><li><a href="{url}help{sessionvars%urlparameter}">Help</a></li>
     </ul>
   </div>
   <div id="pageline"></div>
+  <form id="searchform" action="{url}log"><span class="container">
+    <span class="hint">Search</span>&#160;<input name="rev" id="searchinput" type="text" size="20" />
+    </span>
+    {sessionvars%hiddenformentry}
+  </form>
 </div>
 
 <h2>{repo|escape}</h2>
diff -r ad34bfccab10 -r 662ad8e5a209 themes/mercurialweb/tags.tmpl
--- a/themes/mercurialweb/tags.tmpl	Sat Nov 26 01:08:12 2011 +0100
+++ b/themes/mercurialweb/tags.tmpl	Sat Nov 26 01:20:46 2011 +0100
@@ -16,16 +16,15 @@
     ><li><a href="{url}bookmarks{sessionvars%urlparameter}">Bookmarks</a></li
     ><li><a href="{url}branches{sessionvars%urlparameter}">Branches</a></li
     ><li><a href="{url}file/{node|short}{sessionvars%urlparameter}">Files</a></li
-    ><li><a href="{url}help{sessionvars%urlparameter}">Help</a></li
-    ><li><form id="searchform" action="{url}log"><span class="container">
-        <span class="hint">Search</span>&#160;<input name="rev" id="searchinput" type="text" size="20" />
-      </span>
-      {sessionvars%hiddenformentry}
-      </form>
-    </li>
+    ><li><a href="{url}help{sessionvars%urlparameter}">Help</a></li>
     </ul>
   </div>
   <div id="pageline"></div>
+  <form id="searchform" action="{url}log"><span class="container">
+    <span class="hint">Search</span>&#160;<input name="rev" id="searchinput" type="text" size="20" />
+    </span>
+    {sessionvars%hiddenformentry}
+  </form>
 </div>
 
 <h2>{repo|escape}</h2>