diff options
| author | intrigeri <intrigeri@boum.org> | 2009-03-08 09:50:27 +0100 |
|---|---|---|
| committer | intrigeri <intrigeri@boum.org> | 2009-03-08 09:50:27 +0100 |
| commit | ae474d8e14631ff519ed7d54bb64eaa0538f56d9 (patch) | |
| tree | 09637db5faf2632b67b581cf04463fe4493584d4 /templates | |
| parent | 0314ed459ba1c49fad9170a54cc05f1c9e9c96bf (diff) | |
| parent | 08e4472fc469c630ebef93e16a66a5a69d9cb33a (diff) | |
| download | ikiwiki-ae474d8e14631ff519ed7d54bb64eaa0538f56d9.tar ikiwiki-ae474d8e14631ff519ed7d54bb64eaa0538f56d9.tar.gz | |
Merge commit 'upstream/master' into prv/po
Conflicts:
IkiWiki/Plugin/editpage.pm
debian/control
debian/copyright
doc/todo/need_global_renamepage_hook.mdwn
Signed-off-by: intrigeri <intrigeri@boum.org>
Diffstat (limited to 'templates')
| -rw-r--r-- | templates/googleform.tmpl | 4 | ||||
| -rw-r--r-- | templates/misc.tmpl | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/templates/googleform.tmpl b/templates/googleform.tmpl index 523cff001..e2d4a1f43 100644 --- a/templates/googleform.tmpl +++ b/templates/googleform.tmpl @@ -1,6 +1,6 @@ <form method="get" action="http://www.google.com/search" id="searchform"> <div> - <input name="sitesearch" value="<TMPL_VAR SITEFQDN>" type="hidden"> - <input name="q" value="" id="searchbox" size="16" maxlength="255" type="text"> + <input name="sitesearch" value="<TMPL_VAR SITEFQDN>" type="hidden" /> + <input name="q" value="" id="searchbox" size="16" maxlength="255" type="text" /> </div> </form> diff --git a/templates/misc.tmpl b/templates/misc.tmpl index 7f65217d1..0de56edeb 100644 --- a/templates/misc.tmpl +++ b/templates/misc.tmpl @@ -17,11 +17,13 @@ </head> <body> +<div class="pageheader"> <div class="header"> <span> <TMPL_VAR INDEXLINK>/ <TMPL_VAR TITLE> </span> </div> +</div> <!-- .pageheader --> <div id="content"> <TMPL_VAR PAGEBODY> |