[Koha-cvs] koha/koha-tmpl/intranet-tmpl/npl/en includes/in... [dev_week]
Owen Leonard
oleonard at athenscounty.lib.oh.us
Sat Oct 7 15:17:11 CEST 2006
CVSROOT: /sources/koha
Module name: koha
Branch: dev_week
Changes by: Owen Leonard <oleonard> 06/10/07 13:17:11
Modified files:
koha-tmpl/intranet-tmpl/npl/en/includes: intranet-nav.inc
search-topmenu.inc
koha-tmpl/intranet-tmpl/npl/en: intranet-main.tmpl
Log message:
Updating quick search forms for new search API
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.3&r2=1.5.2.6.2.4
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/npl/en/includes/search-topmenu.inc?cvsroot=koha&only_with_tag=dev_week&r1=1.1.2.3&r2=1.1.2.3.2.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/npl/en/intranet-main.tmpl?cvsroot=koha&only_with_tag=dev_week&r1=1.4.2.4.2.4&r2=1.4.2.4.2.5
Patches:
Index: includes/intranet-nav.inc
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/npl/en/includes/Attic/intranet-nav.inc,v
retrieving revision 1.5.2.6.2.3
retrieving revision 1.5.2.6.2.4
diff -u -b -r1.5.2.6.2.3 -r1.5.2.6.2.4
--- includes/intranet-nav.inc 13 Jul 2006 19:17:36 -0000 1.5.2.6.2.3
+++ includes/intranet-nav.inc 7 Oct 2006 13:17:11 -0000 1.5.2.6.2.4
@@ -19,7 +19,7 @@
<input type="submit" value="Search" class="submit" />
</form></li></ul></li><!-- /TMPL_IF -->
- <!-- TMPL_IF NAME="CAN_user_catalogue" --><li><a href="/cgi-bin/koha/loadmodules.pl?module=search&marc=1&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>
+ <!-- TMPL_IF NAME="CAN_user_catalogue" --><li><a href="/search">Advanced Search</a><ul><li><form name="searchform" method="get" action="/search" id="searchform"><input type="hidden" name="idx" value="" /><label for="navkeyword"><span class="accesskey">Q</span>uick Search:</label><input type="text" id="navkeyword" name="q" size="10" accesskey="q" /><input type="submit" name="do" value="Start search" class="submit" /></form></li>
<li><a href="/cgi-bin/koha/bookshelves/shelves.pl">Virtual Shelves</a></li>
</ul></li><!-- /TMPL_IF -->
<!-- TMPL_IF NAME="CAN_user_editcatalogue" --><li><a href="/cgi-bin/koha/acqui.simple/addbooks.pl">Cataloging</a><ul>
Index: includes/search-topmenu.inc
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/npl/en/includes/Attic/search-topmenu.inc,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.3.2.1
diff -u -b -r1.1.2.3 -r1.1.2.3.2.1
--- includes/search-topmenu.inc 4 Aug 2005 20:51:44 -0000 1.1.2.3
+++ includes/search-topmenu.inc 7 Oct 2006 13:17:11 -0000 1.1.2.3.2.1
@@ -1,3 +1,22 @@
-<div id="topmenu"><a href="/cgi-bin/koha/search.marc/search.pl?type=intranet">Advanced Search</a> |
-<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="keyword">Quick 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="keyword" name="value" size="10" /><input type="submit" value="Start search" class="submit" /></form> | <a href="/cgi-bin/koha/bookshelves/shelves.pl">Virtual Shelves</a>
+<div id="topmenu"><form name="searchform" method="get" action="/search" id="searchform"><label for="masthead_search">Search</label>
+<select name="idx" id="masthead_search">
+ <option selected="selected" value="">Library Catalog</option>
+ <option value="ti">Title</option>
+ <option value="au">Author</option>
+ <option value="su">Subject</option>
+ <option value="isbn">ISBN</option>
+ <option value="se">Series</option>
+ <option value="callnum">Call Number</option>
+</select>
+<input type="text" name="q" style="width: 23%;"/>
+<input type="submit" name="do" value="Search" class="submit" /> | <a href="/search">Advanced Search</a></p>
+</form> | <a href="/cgi-bin/koha/bookshelves/shelves.pl">Virtual Shelves</a>
+</div>
+
+<div id="breadcrumbs">
+<!-- TMPL_IF NAME="searchdesc" --><p><!-- TMPL_IF name="total" --><strong>“<!-- TMPL_VAR NAME="searchdesc" -->” </strong>returned <!-- TMPL_VAR NAME="total" --> results. <!-- TMPL_IF NAME="available" -->Showing only <strong>available</strong> items. <a href="/search?q=<!-- TMPL_VAR NAME="searchdesc" -->">Show all items</a><!-- TMPL_ELSE -->Limit to <a href="/search?q=<!-- TMPL_VAR NAME="searchdesc" -->&limit=available">currently available items.</a><!-- /TMPL_IF --><!-- TMPL_IF NAME="related" --> (related searches: <!-- TMPL_LOOP NAME="related" --><!-- TMPL_VAR NAME="related_search" --><!-- /TMPL_LOOP -->). <!-- /TMPL_IF -->
+<!-- TMPL_ELSE -->
+<strong>“<!-- TMPL_VAR NAME="searchdesc" -->”</strong>
+<!-- TMPL_VAR NAME="search_error" -->
+<!-- /TMPL_IF --></p><!-- /TMPL_IF -->
</div>
\ No newline at end of file
Index: intranet-main.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/npl/en/Attic/intranet-main.tmpl,v
retrieving revision 1.4.2.4.2.4
retrieving revision 1.4.2.4.2.5
diff -u -b -r1.4.2.4.2.4 -r1.4.2.4.2.5
--- intranet-main.tmpl 24 Sep 2006 01:05:05 -0000 1.4.2.4.2.4
+++ intranet-main.tmpl 7 Oct 2006 13:17:11 -0000 1.4.2.4.2.5
@@ -8,15 +8,24 @@
<dd><ul><li><a href="/cgi-bin/koha/circ/circulation.pl">Issues</a></li> <li><a href="/cgi-bin/koha/circ/returns.pl">Returns</a></li> <li><a href="/cgi-bin/koha/circ/branchtransfers.pl">Transfers</a></li>
<li><a href="/cgi-bin/koha/circ/selectbranchprinter.pl">Set Branch</a></li></ul></dd><!-- /TMPL_IF -->
<!-- TMPL_IF NAME="CAN_user_borrowers" --><dt><a href="/cgi-bin/koha/members/members-home.pl">Patrons</a></dt>
- <dd>Start with a search to add, update, or delete a record, check accounts, & renew items.
- <form action="/cgi-bin/koha/members/member.pl" method="post">
+ <dd><form action="/cgi-bin/koha/members/member.pl" method="post">
<label for="member">Enter Name or Barcode</label><input id="member" type="text" size="25" name="member" />
<input type="submit" value="Search" class="submit" />
</form></dd><!-- /TMPL_IF -->
- <!-- TMPL_IF NAME="CAN_user_catalogue" --><dt><a href="/cgi-bin/koha/loadmodules.pl?module=search&marc=1&type=intranet">Catalog Search</a></dt>
- <dd>Search bibilographic records
-<form name="f" 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="keyword">Quick 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="keyword" name="value" size="25" /><input type="submit" value="Start search" class="submit"></form>
- <ul><li><a href="/cgi-bin/koha/loadmodules.pl?module=search&marc=1&type=intranet">Advanced Search</a></li><li><a href="/cgi-bin/koha/bookshelves/shelves.pl">Virtual shelves</a></li></ul>
+ <!-- TMPL_IF NAME="CAN_user_catalogue" --><dt><a href="/search">Catalog Search</a></dt>
+ <dd><form name="searchform" method="get" action="/search" id="searchform"><label for="main_search">Search</label>
+<select name="idx" id="main_search">
+ <option selected="selected" value="">Library Catalog</option>
+ <option value="ti">Title</option>
+ <option value="au">Author</option>
+ <option value="su">Subject</option>
+ <option value="isbn">ISBN</option>
+ <option value="se">Series</option>
+ <option value="callnum">Call Number</option>
+</select>
+<input type="text" name="q" style="width: 23%;"/>
+<input type="submit" name="do" value="Search" class="submit" />
+ <ul><li><a href="/search">Advanced Search</a></li><li><a href="/cgi-bin/koha/bookshelves/shelves.pl">Virtual shelves</a></li></ul>
</dd><!-- /TMPL_IF --></dl></div>
<div id="submenu">
<!-- TMPL_IF NAME="CAN_user_editcatalogue" --><dl>
@@ -33,7 +42,7 @@
<dd><ul><li><a href="/cgi-bin/koha/admin-home.pl">System Adminstration Home</a></li> <li><a href="/cgi-bin/koha/admin/systempreferences.pl">System Preferences</a></li> <li><a href="/cgi-bin/koha/barcodes/barcodes.pl">Barcodes generator</a></li> <li><a href="/cgi-bin/koha/admin/aqbookfund.pl">Book funds</a></li> <li><a href="/cgi-bin/koha/import/breeding.pl">Import to reservoir</a> <li><a href="/cgi-bin/koha/label-home.pl">Spine and Barcode Labels</a></li></ul></dd>
</dl><!-- /TMPL_IF -->
<!-- TMPL_IF name="IntranetmainUserblock" --><!-- TMPL_VAR name="IntranetmainUserblock" --><!-- /TMPL_IF -->
-<br clear="both" /></div>
+<br class="clear" /></div>
</div>
<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
More information about the Koha-cvs
mailing list