allow search form visibility to be controlled on the template

hide extrafooter from misctemplate display per default

diff --git a/IkiWiki.pm b/IkiWiki.pm
index d20a3709c9a9a4c911e0a0dfce6025e7de0e8f97..54271beccac03847003bc0ea2c92e90433238df7 100644 (file)
--- a/IkiWiki.pm
+++ b/IkiWiki.pm
@@ -1757,7 +1757,6 @@ sub misctemplate ($$;@) {
                baseurl => baseurl(),
                html5 => $config{html5},
                have_actions => 0, # force off
                baseurl => baseurl(),
                html5 => $config{html5},
                have_actions => 0, # force off

-               searchform => 0,   # ditto

                parentlinks => [{  # override
                        url => $config{url},
                        page => $config{wikiname},
                parentlinks => [{  # override
                        url => $config{url},
                        page => $config{wikiname},

diff --git a/templates/page.tmpl b/templates/page.tmpl
index f5257058c04cd8733947c809d6882f6ec4ae3d74..eb76cafa610e4149ffe84428abc96dcd87b1fb1f 100644 (file)
--- a/templates/page.tmpl
+++ b/templates/page.tmpl
@@ -52,9 +52,11 @@
 </TMPL_IF>
 </span>
 </span>
 </TMPL_IF>
 </span>
 </span>

+<TMPL_IF ISPAGE>

 <TMPL_IF NAME="SEARCHFORM">
 <TMPL_VAR SEARCHFORM>
 </TMPL_IF>
 <TMPL_IF NAME="SEARCHFORM">
 <TMPL_VAR SEARCHFORM>
 </TMPL_IF>

+</TMPL_IF>

 <TMPL_IF HTML5></header><TMPL_ELSE></div></TMPL_IF>
 
 <TMPL_IF NAME="HAVE_ACTIONS">
 <TMPL_IF HTML5></header><TMPL_ELSE></div></TMPL_IF>
 
 <TMPL_IF NAME="HAVE_ACTIONS">


@@ -184,8 +186,8 @@ Last edited <TMPL_VAR MTIME>
 </div>
 
 <TMPL_IF HTML5></nav><TMPL_ELSE></div></TMPL_IF>
 </div>
 
 <TMPL_IF HTML5></nav><TMPL_ELSE></div></TMPL_IF>

-</TMPL_IF>

 <TMPL_IF EXTRAFOOTER><TMPL_VAR EXTRAFOOTER></TMPL_IF>
 <TMPL_IF EXTRAFOOTER><TMPL_VAR EXTRAFOOTER></TMPL_IF>

+</TMPL_IF>

 <!-- from <TMPL_VAR WIKINAME> -->
 <TMPL_IF HTML5></footer><TMPL_ELSE></div></TMPL_IF>
 
 <!-- from <TMPL_VAR WIKINAME> -->
 <TMPL_IF HTML5></footer><TMPL_ELSE></div></TMPL_IF>