hgweb: consolidate search form for monoblue
Same deal as for paper.
--- a/mercurial/templates/monoblue/bookmarks.tmpl Fri Jun 09 13:59:13 2017 -0700
+++ b/mercurial/templates/monoblue/bookmarks.tmpl Fri Jun 09 13:41:10 2017 -0700
@@ -9,13 +9,7 @@
<div class="page-header">
<h1 class="breadcrumb"><a href="/">Mercurial</a> {pathdef%breadcrumb} / bookmarks</h1>
- <form action="{url|urlescape}log">
- {sessionvars%hiddenformentry}
- <dl class="search">
- <dt><label>Search: </label></dt>
- <dd><input type="text" name="rev" /></dd>
- </dl>
- </form>
+ {searchform}
<ul class="page-nav">
<li><a href="{url|urlescape}summary{sessionvars%urlparameter}">summary</a></li>
--- a/mercurial/templates/monoblue/branches.tmpl Fri Jun 09 13:59:13 2017 -0700
+++ b/mercurial/templates/monoblue/branches.tmpl Fri Jun 09 13:41:10 2017 -0700
@@ -9,13 +9,7 @@
<div class="page-header">
<h1 class="breadcrumb"><a href="/">Mercurial</a> {pathdef%breadcrumb} / branches</h1>
- <form action="{url|urlescape}log">
- {sessionvars%hiddenformentry}
- <dl class="search">
- <dt><label>Search: </label></dt>
- <dd><input type="text" name="rev" /></dd>
- </dl>
- </form>
+ {searchform}
<ul class="page-nav">
<li><a href="{url|urlescape}summary{sessionvars%urlparameter}">summary</a></li>
--- a/mercurial/templates/monoblue/changelog.tmpl Fri Jun 09 13:59:13 2017 -0700
+++ b/mercurial/templates/monoblue/changelog.tmpl Fri Jun 09 13:41:10 2017 -0700
@@ -9,13 +9,7 @@
<div class="page-header">
<h1 class="breadcrumb"><a href="/">Mercurial</a> {pathdef%breadcrumb} / changelog</h1>
- <form action="{url|urlescape}log">
- {sessionvars%hiddenformentry}
- <dl class="search">
- <dt><label>Search: </label></dt>
- <dd><input type="text" name="rev" /></dd>
- </dl>
- </form>
+ {searchform}
<ul class="page-nav">
<li><a href="{url|urlescape}summary{sessionvars%urlparameter}">summary</a></li>
--- a/mercurial/templates/monoblue/changeset.tmpl Fri Jun 09 13:59:13 2017 -0700
+++ b/mercurial/templates/monoblue/changeset.tmpl Fri Jun 09 13:41:10 2017 -0700
@@ -9,13 +9,7 @@
<div class="page-header">
<h1 class="breadcrumb"><a href="/">Mercurial</a> {pathdef%breadcrumb} / changeset</h1>
- <form action="{url|urlescape}log">
- {sessionvars%hiddenformentry}
- <dl class="search">
- <dt><label>Search: </label></dt>
- <dd><input type="text" name="rev" /></dd>
- </dl>
- </form>
+ {searchform}
<ul class="page-nav">
<li><a href="{url|urlescape}summary{sessionvars%urlparameter}">summary</a></li>
--- a/mercurial/templates/monoblue/error.tmpl Fri Jun 09 13:59:13 2017 -0700
+++ b/mercurial/templates/monoblue/error.tmpl Fri Jun 09 13:41:10 2017 -0700
@@ -9,13 +9,7 @@
<div class="page-header">
<h1 class="breadcrumb"><a href="/">Mercurial</a> {pathdef%breadcrumb} / not found: {repo|escape}</h1>
- <form action="{url|urlescape}log">
- {sessionvars%hiddenformentry}
- <dl class="search">
- <dt><label>Search: </label></dt>
- <dd><input type="text" name="rev" /></dd>
- </dl>
- </form>
+ {searchform}
<ul class="page-nav">
<li><a href="{url|urlescape}summary{sessionvars%urlparameter}">summary</a></li>
--- a/mercurial/templates/monoblue/fileannotate.tmpl Fri Jun 09 13:59:13 2017 -0700
+++ b/mercurial/templates/monoblue/fileannotate.tmpl Fri Jun 09 13:41:10 2017 -0700
@@ -9,13 +9,7 @@
<div class="page-header">
<h1 class="breadcrumb"><a href="/">Mercurial</a> {pathdef%breadcrumb} / annotate</h1>
- <form action="{url|urlescape}log">
- {sessionvars%hiddenformentry}
- <dl class="search">
- <dt><label>Search: </label></dt>
- <dd><input type="text" name="rev" /></dd>
- </dl>
- </form>
+ {searchform}
<ul class="page-nav">
<li><a href="{url|urlescape}summary{sessionvars%urlparameter}">summary</a></li>
--- a/mercurial/templates/monoblue/filecomparison.tmpl Fri Jun 09 13:59:13 2017 -0700
+++ b/mercurial/templates/monoblue/filecomparison.tmpl Fri Jun 09 13:41:10 2017 -0700
@@ -9,13 +9,7 @@
<div class="page-header">
<h1 class="breadcrumb"><a href="/">Mercurial</a> {pathdef%breadcrumb} / file comparison</h1>
- <form action="{url|urlescape}log">
- {sessionvars%hiddenformentry}
- <dl class="search">
- <dt><label>Search: </label></dt>
- <dd><input type="text" name="rev" /></dd>
- </dl>
- </form>
+ {searchform}
<ul class="page-nav">
<li><a href="{url|urlescape}summary{sessionvars%urlparameter}">summary</a></li>
--- a/mercurial/templates/monoblue/filediff.tmpl Fri Jun 09 13:59:13 2017 -0700
+++ b/mercurial/templates/monoblue/filediff.tmpl Fri Jun 09 13:41:10 2017 -0700
@@ -9,13 +9,7 @@
<div class="page-header">
<h1 class="breadcrumb"><a href="/">Mercurial</a> {pathdef%breadcrumb} / file diff</h1>
- <form action="{url|urlescape}log">
- {sessionvars%hiddenformentry}
- <dl class="search">
- <dt><label>Search: </label></dt>
- <dd><input type="text" name="rev" /></dd>
- </dl>
- </form>
+ {searchform}
<ul class="page-nav">
<li><a href="{url|urlescape}summary{sessionvars%urlparameter}">summary</a></li>
--- a/mercurial/templates/monoblue/filelog.tmpl Fri Jun 09 13:59:13 2017 -0700
+++ b/mercurial/templates/monoblue/filelog.tmpl Fri Jun 09 13:41:10 2017 -0700
@@ -9,13 +9,7 @@
<div class="page-header">
<h1 class="breadcrumb"><a href="/">Mercurial</a> {pathdef%breadcrumb} / file revisions</h1>
- <form action="{url|urlescape}log">
- {sessionvars%hiddenformentry}
- <dl class="search">
- <dt><label>Search: </label></dt>
- <dd><input type="text" name="rev" /></dd>
- </dl>
- </form>
+ {searchform}
<ul class="page-nav">
<li><a href="{url|urlescape}summary{sessionvars%urlparameter}">summary</a></li>
--- a/mercurial/templates/monoblue/filerevision.tmpl Fri Jun 09 13:59:13 2017 -0700
+++ b/mercurial/templates/monoblue/filerevision.tmpl Fri Jun 09 13:41:10 2017 -0700
@@ -9,13 +9,7 @@
<div class="page-header">
<h1 class="breadcrumb"><a href="/">Mercurial</a> {pathdef%breadcrumb} / file revision</h1>
- <form action="{url|urlescape}log">
- {sessionvars%hiddenformentry}
- <dl class="search">
- <dt><label>Search: </label></dt>
- <dd><input type="text" name="rev" /></dd>
- </dl>
- </form>
+ {searchform}
<ul class="page-nav">
<li><a href="{url|urlescape}summary{sessionvars%urlparameter}">summary</a></li>
--- a/mercurial/templates/monoblue/graph.tmpl Fri Jun 09 13:59:13 2017 -0700
+++ b/mercurial/templates/monoblue/graph.tmpl Fri Jun 09 13:41:10 2017 -0700
@@ -10,13 +10,7 @@
<div class="page-header">
<h1 class="breadcrumb"><a href="/">Mercurial</a> {pathdef%breadcrumb} / graph</h1>
- <form action="{url|urlescape}log">
- {sessionvars%hiddenformentry}
- <dl class="search">
- <dt><label>Search: </label></dt>
- <dd><input type="text" name="rev" /></dd>
- </dl>
- </form>
+ {searchform}
<ul class="page-nav">
<li><a href="{url|urlescape}summary{sessionvars%urlparameter}">summary</a></li>
--- a/mercurial/templates/monoblue/help.tmpl Fri Jun 09 13:59:13 2017 -0700
+++ b/mercurial/templates/monoblue/help.tmpl Fri Jun 09 13:41:10 2017 -0700
@@ -9,13 +9,7 @@
<div class="page-header">
<h1 class="breadcrumb"><a href="/">Mercurial</a> {pathdef%breadcrumb} / help</h1>
- <form action="{url|urlescape}log">
- {sessionvars%hiddenformentry}
- <dl class="search">
- <dt><label>Search: </label></dt>
- <dd><input type="text" name="rev" /></dd>
- </dl>
- </form>
+ {searchform}
<ul class="page-nav">
<li><a href="{url|urlescape}summary{sessionvars%urlparameter}">summary</a></li>
--- a/mercurial/templates/monoblue/helptopics.tmpl Fri Jun 09 13:59:13 2017 -0700
+++ b/mercurial/templates/monoblue/helptopics.tmpl Fri Jun 09 13:41:10 2017 -0700
@@ -9,13 +9,7 @@
<div class="page-header">
<h1 class="breadcrumb"><a href="/">Mercurial</a> {pathdef%breadcrumb} / help</h1>
- <form action="{url|urlescape}log">
- {sessionvars%hiddenformentry}
- <dl class="search">
- <dt><label>Search: </label></dt>
- <dd><input type="text" name="rev" /></dd>
- </dl>
- </form>
+ {searchform}
<ul class="page-nav">
<li><a href="{url|urlescape}summary{sessionvars%urlparameter}">summary</a></li>
--- a/mercurial/templates/monoblue/manifest.tmpl Fri Jun 09 13:59:13 2017 -0700
+++ b/mercurial/templates/monoblue/manifest.tmpl Fri Jun 09 13:41:10 2017 -0700
@@ -9,13 +9,7 @@
<div class="page-header">
<h1 class="breadcrumb"><a href="/">Mercurial</a> {pathdef%breadcrumb} / files</h1>
- <form action="{url|urlescape}log">
- {sessionvars%hiddenformentry}
- <dl class="search">
- <dt><label>Search: </label></dt>
- <dd><input type="text" name="rev" /></dd>
- </dl>
- </form>
+ {searchform}
<ul class="page-nav">
<li><a href="{url|urlescape}summary{sessionvars%urlparameter}">summary</a></li>
--- a/mercurial/templates/monoblue/map Fri Jun 09 13:59:13 2017 -0700
+++ b/mercurial/templates/monoblue/map Fri Jun 09 13:41:10 2017 -0700
@@ -279,3 +279,12 @@
hiddenformentry = '<input type="hidden" name="{name}" value="{value|escape}" />'
graph = graph.tmpl
breadcrumb = '> <a href="{url|urlescape}">{name|escape}</a> '
+
+searchform = '
+ <form action="{url|urlescape}log">
+ {sessionvars%hiddenformentry}
+ <dl class="search">
+ <dt><label>Search: </label></dt>
+ <dd><input type="text" name="rev" value="{query|escape}" /></dd>
+ </dl>
+ </form>'
--- a/mercurial/templates/monoblue/notfound.tmpl Fri Jun 09 13:59:13 2017 -0700
+++ b/mercurial/templates/monoblue/notfound.tmpl Fri Jun 09 13:41:10 2017 -0700
@@ -9,13 +9,7 @@
<div class="page-header">
<h1 class="breadcrumb"><a href="/">Mercurial</a> {pathdef%breadcrumb} / not found: {repo|escape}</h1>
- <form action="{url|urlescape}log">
- {sessionvars%hiddenformentry}
- <dl class="search">
- <dt><label>Search: </label></dt>
- <dd><input type="text" name="rev" /></dd>
- </dl>
- </form>
+ {searchform}
<ul class="page-nav">
<li><a href="{url|urlescape}summary{sessionvars%urlparameter}">summary</a></li>
--- a/mercurial/templates/monoblue/search.tmpl Fri Jun 09 13:59:13 2017 -0700
+++ b/mercurial/templates/monoblue/search.tmpl Fri Jun 09 13:41:10 2017 -0700
@@ -9,13 +9,7 @@
<div class="page-header">
<h1 class="breadcrumb"><a href="/">Mercurial</a> {pathdef%breadcrumb} / search</h1>
- <form action="{url|urlescape}log">
- {sessionvars%hiddenformentry}
- <dl class="search">
- <dt><label>Search: </label></dt>
- <dd><input type="text" name="rev" value="{query|escape}" /></dd>
- </dl>
- </form>
+ {searchform}
<ul class="page-nav">
<li><a href="{url|urlescape}summary{sessionvars%urlparameter}">summary</a></li>
--- a/mercurial/templates/monoblue/shortlog.tmpl Fri Jun 09 13:59:13 2017 -0700
+++ b/mercurial/templates/monoblue/shortlog.tmpl Fri Jun 09 13:41:10 2017 -0700
@@ -9,13 +9,7 @@
<div class="page-header">
<h1 class="breadcrumb"><a href="/">Mercurial</a> {pathdef%breadcrumb} / shortlog</h1>
- <form action="{url|urlescape}log">
- {sessionvars%hiddenformentry}
- <dl class="search">
- <dt><label>Search: </label></dt>
- <dd><input type="text" name="rev" /></dd>
- </dl>
- </form>
+ {searchform}
<ul class="page-nav">
<li><a href="{url|urlescape}summary{sessionvars%urlparameter}">summary</a></li>
--- a/mercurial/templates/monoblue/summary.tmpl Fri Jun 09 13:59:13 2017 -0700
+++ b/mercurial/templates/monoblue/summary.tmpl Fri Jun 09 13:41:10 2017 -0700
@@ -9,13 +9,7 @@
<div class="page-header">
<h1 class="breadcrumb"><a href="/">Mercurial</a> {pathdef%breadcrumb} / summary</h1>
- <form action="{url|urlescape}log">
- {sessionvars%hiddenformentry}
- <dl class="search">
- <dt><label>Search: </label></dt>
- <dd><input type="text" name="rev" /></dd>
- </dl>
- </form>
+ {searchform}
<ul class="page-nav">
<li class="current">summary</li>
--- a/mercurial/templates/monoblue/tags.tmpl Fri Jun 09 13:59:13 2017 -0700
+++ b/mercurial/templates/monoblue/tags.tmpl Fri Jun 09 13:41:10 2017 -0700
@@ -9,13 +9,7 @@
<div class="page-header">
<h1 class="breadcrumb"><a href="/">Mercurial</a> {pathdef%breadcrumb} / tags</h1>
- <form action="{url|urlescape}log">
- {sessionvars%hiddenformentry}
- <dl class="search">
- <dt><label>Search: </label></dt>
- <dd><input type="text" name="rev" /></dd>
- </dl>
- </form>
+ {searchform}
<ul class="page-nav">
<li><a href="{url|urlescape}summary{sessionvars%urlparameter}">summary</a></li>
--- a/tests/test-hgweb-descend-empties.t Fri Jun 09 13:59:13 2017 -0700
+++ b/tests/test-hgweb-descend-empties.t Fri Jun 09 13:41:10 2017 -0700
@@ -289,13 +289,14 @@
<div class="page-header">
<h1 class="breadcrumb"><a href="/">Mercurial</a> / files</h1>
- <form action="/log">
- <input type="hidden" name="style" value="monoblue" />
- <dl class="search">
- <dt><label>Search: </label></dt>
- <dd><input type="text" name="rev" /></dd>
- </dl>
- </form>
+
+ <form action="/log">
+ <input type="hidden" name="style" value="monoblue" />
+ <dl class="search">
+ <dt><label>Search: </label></dt>
+ <dd><input type="text" name="rev" value="" /></dd>
+ </dl>
+ </form>
<ul class="page-nav">
<li><a href="/summary?style=monoblue">summary</a></li>