Rearranged <div> and <form> tags to allow the search box to validate.

[cocanwiki.git] / templates / page.html

diff --git a/templates/page.html b/templates/page.html
index d46ac5e..2d3b3ab 100644 (file)
--- a/templates/page.html
+++ b/templates/page.html
@@ -54,10 +54,10 @@
 
 <div id="menu_div">
 <ul id="bottommenu" class="menu">
-<li id="index_li" class="first"> ::if(is_homepage)::::else::<a href="/">::end::Home&nbsp;page::if(is_homepage)::::else::</a>::end:: </li>
-::table(sitemenu)::<li id="::url::_li"> ::if(is_linked)::<a href="/::url_html_tag::">::end::::label_html::::if(is_linked)::</a>::end:: </li>
+<li id="index_li" class="first"> ::if(is_homepage)::::else::<a href="/">::end::<span>Home&nbsp;page</span>::if(is_homepage)::::else::</a>::end:: </li>
+::table(sitemenu)::<li id="::url::_li"> ::if(is_linked)::<a href="/::url_html_tag::">::end::<span>::label_html::</span>::if(is_linked)::</a>::end:: </li>
 ::end::
-<li id="sitemap_li"> <a href="/_sitemap">Sitemap</a> </li>
+<li id="sitemap_li"> <a href="/_sitemap"><span>Sitemap</span></a> </li>
 </ul>
 
 <ul id="editmenu" class="menu">
@@ -97,11 +97,11 @@
 </div>
 
 ::if(search_box)::
+<form method="get" action="/_search">
 <div id="search_div">
-<form method="get" action="/_bin/search.cmo">
 <input name="q" value=""/><input type="submit" value="Search"/>
-</form>
 </div>
+</form>
 ::end::
 
 ::if(navigation)::