[Koha-cvs] koha/koha-tmpl/intranet-tmpl/npl/en/includes in... [dev_week]

[Joshua Ferraro]

CVSROOT:	/sources/koha
Module name:	koha
Branch:		dev_week
Changes by:	Joshua Ferraro <kados>	06/07/07 22:30:37

Modified files:
	koha-tmpl/intranet-tmpl/npl/en/includes: intranet-nav.inc 

Log message:
	merging with rel_2_2

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/npl/en/includes/intranet-nav.inc?cvsroot=koha&only_with_tag=dev_week&r1=1.5.2.6.2.1&r2=1.5.2.6.2.2

Patches:
Index: intranet-nav.inc
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/npl/en/includes/intranet-nav.inc,v
retrieving revision 1.5.2.6.2.1
retrieving revision 1.5.2.6.2.2
diff -u -b -r1.5.2.6.2.1 -r1.5.2.6.2.2
--- intranet-nav.inc	28 May 2006 20:06:58 -0000	1.5.2.6.2.1
+++ intranet-nav.inc	7 Jul 2006 22:30:37 -0000	1.5.2.6.2.2
@@ -19,13 +19,8 @@
 	<input type="submit" value="Search" class="submit" />
 
 	</form></li></ul></li>
-
-	<li><a href="/cgi-bin/koha/catalogue-home.pl">Catalogue Search</a></li>
-<ul>
-<li><form name="f" method="post" action="/cgi-bin/koha/catalogue-home.pl"><input type="hidden" name="op" value="do_search" /><input type="hidden" name="search_type" value="precise" /><input type="hidden" name="zoom" value="0" /><input type="hidden" name="number_to_display" value="10" /><label><span class="accesskey">Barcode Search:</span></label><input type="text" id="itemnumber" name="itemnumber" size="10"  /><input type="submit" value="Search" class="submit"></form></li>
-<li><form name="f" method="post" action="/cgi-bin/koha/catalogue-home.pl"><input type="hidden" name="op" value="do_search" /><input type="hidden" name="order" value="1=4 i<" /><input type="hidden" name="search_type" value="keyword" /><input type="hidden" name="zoom" value="1" /><input type="hidden" name="MARC" value="0" /><input type="hidden" name="number_to_display" value="20" /><label><span class="accesskey">Keyword Search:</span></label><input type="text" id="keyword" name="keyword" size="10"  /><input type="submit" value="Search" class="submit"></form></li>
-</ul>
-
+				<li><a href="/cgi-bin/koha/loadmodules.pl?module=search&amp;marc=1&amp;type=intranet">Catalog</a><ul><li><form method="post" action="/cgi-bin/koha/search.marc/search.pl"><input type="hidden" name="op" value="do_search" /><input type="hidden" name="type" value="intranet" /><input type="hidden" name="nbstatements" value="3" /><label for="navkeyword"><span class="accesskey">Q</span>uick Search:</label><input type="hidden" name="marclist" value="" /><input type="hidden" name="and_or" value="and" /><input type="hidden" name="excluding" value="" /><input type="hidden" name="operator" value="contains" /><input type="text" id="navkeyword" name="value" size="10" accesskey="q" /><input type="submit" value="Start search" class="submit" /></form></li>
+</ul></li>
 <li><a href="/cgi-bin/koha/acqui.simple/addbooks.pl">Cataloging</a><ul>
 <li><a href="/cgi-bin/koha/acqui.simple/addbiblio.pl">Add MARC</a></li>
 <li><a href="/cgi-bin/koha/loadmodules.pl?module=acquisitions">Acquisitions</a></li>