[phpwiki-checkins] CVS: phpwiki/themes/Sidebar/templates navbar.tmpl, 1.10, 1.11

[Reini U. <ru...@us...>]

Update of /cvsroot/phpwiki/phpwiki/themes/Sidebar/templates
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5324/templates

Modified Files:
	navbar.tmpl 
Log Message:
Layout improvements

Index: navbar.tmpl
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/themes/Sidebar/templates/navbar.tmpl,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -2 -b -p -d -r1.10 -r1.11
--- navbar.tmpl	6 Apr 2005 06:41:05 -0000	1.10
+++ navbar.tmpl	13 Jan 2007 23:42:20 -0000	1.11
@@ -5,22 +5,12 @@
 ?>
 <!-- The top navigation/search bar -->
-<form action="<?= WikiURL(_("TitleSearch"))?>" target="_top"
-      method="get" accept-charset="<?=$charset?>" style="display:inline">
 <div id="navbuttons">
 <!-- &middot; ?= WikiLink(_("RecentChanges"), "button") ? -->
-<input type="hidden" name="auto_redirect" value="1" />
-<?php if (! USE_PATH_INFO) { ?>
-<input type="hidden" name="pagename" value="<?=_("TitleSearch")?>" />
-<?php } ?>
-<input type="text"  name="s" size="12" maxlength="256"
-             title='<?=_("Quick Search")?>'
-             onmouseover="window.status='<?=_("Quick Search")?>'; return true;"
-             onmouseout="window.status=''; return true;" /><? 
-// remove the class from the href AND img for the annoying box
-$button = Button(_("TitleSearch"));
-$button->setAttr('class', false);
-if (isset($button->_content[0])) $button->_content[0]->setAttr('class', false);
-echo $button->asXml();
-?><?=$SEP?><?= WikiLink(_("FindPage"), "button",_("Full Search")) ?>
+<?= Template("search",
+	     array('SEARCH_AFTER' => 
+		   HTML::button(array('type' => 'submit', 'id' => 'searchGoButton'),
+				HTML::img(array('src' => $WikiTheme->getImageURL("search"),
+						'alt' => 'search'))))) ?>
+<?=$SEP?><?= WikiLink(_("FindPage"), "button",_("Full Search")) ?>
 <?php 
 if (ENABLE_DISCUSSION_LINK) { // This requires Talk: map to end in "/Discussion"
@@ -39,3 +29,2 @@ if (ENABLE_DISCUSSION_LINK) { // This re
 <?php }
 $WikiTheme->setAutosplitWikiWords($split); ?></div>
-</form>
\ No newline at end of file