Updating quick search and search links for 2.2

diff --git a/koha-tmpl/intranet-tmpl/npl/en/includes/intranet-nav-brief.inc b/koha-tmpl/intranet-tmpl/npl/en/includes/intranet-nav-brief.inc
index d8757d6..791532e 100644 (file)
--- a/koha-tmpl/intranet-tmpl/npl/en/includes/intranet-nav-brief.inc
+++ b/koha-tmpl/intranet-tmpl/npl/en/includes/intranet-nav-brief.inc
@@ -5,8 +5,8 @@
                                <li><a href="/cgi-bin/koha/mainpage.pl">Koha intranet home</a></li>
                                <li><a href="/cgi-bin/koha/circ/circulation.pl">Circulation</a><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><!-- Display for NPL <li><a href="/reserve_list.php">Reserve List</a></li><li><a href="http://66.213.78.70/secret/reserves/index.cfm">New Title Waiting List</a></li> /Display for NPL --><!-- Hide from NPL --><li><a href="/cgi-bin/koha/circ/branchtransfers.pl">Transfers</a></li><!-- /Hide from NPL --></ul></li>
                                <li><a href="/cgi-bin/koha/members-home.pl">Patrons</a></li>
-                               <li><a href="/cgi-bin/koha/loadmodules.pl?module=search&amp;marc=0&amp;type=intranet">Catalog</a><ul><li><a href="/cgi-bin/koha/loadmodules.pl?module=search&amp;marc=0&amp;type=intranet">Advanced Search</a></li><!-- Display for NPL <li><a href="/item_report.php">Format Search</a></li> /Display for NPL -->
-<li><a href="/cgi-bin/koha/loadmodules.pl?module=search&amp;marc=1&amp;type=intranet">MARC Search</a></li><!-- Display for NPL <li><a href="http://live.moreforohio.org:8080/vdx/">MORE Search</a></li> /Display for NPL -->
+                               <li><a href="/cgi-bin/koha/loadmodules.pl?module=search&amp;marc=1&amp;type=intranet">Catalog</a><ul><li><a href="/cgi-bin/koha/loadmodules.pl?module=search&amp;marc=1&amp;type=intranet">Advanced Search</a></li><!-- Display for NPL <li><a href="/item_report.php">Format Search</a></li> /Display for NPL -->
+<!-- Display for NPL <li><a href="http://live.moreforohio.org:8080/vdx/">MORE Search</a></li> /Display for NPL -->
 </ul></li>
 <li><a href="/cgi-bin/koha/acqui.simple/addbooks.pl">Cataloging</a><ul><!-- Display for NPL <li><a href="/cgi-bin/koha/acqui.simple/addbiblio-simple.pl">Add Temp</a> </li> /Display for NPL --><li><a href="/cgi-bin/koha/acqui.simple/addbiblio.pl">Add MARC</a></li>
 

diff --git a/koha-tmpl/intranet-tmpl/npl/en/includes/intranet-nav.inc b/koha-tmpl/intranet-tmpl/npl/en/includes/intranet-nav.inc
index d2e215a..542eac1 100644 (file)
--- a/koha-tmpl/intranet-tmpl/npl/en/includes/intranet-nav.inc
+++ b/koha-tmpl/intranet-tmpl/npl/en/includes/intranet-nav.inc
@@ -16,11 +16,7 @@
        <input type="submit" value="Search" class="submit" />
 
        </form></li></ul></li>
-                               <li><a href="/cgi-bin/koha/loadmodules.pl?module=search&amp;marc=0&amp;type=intranet">Catalog</a><ul><li><form action="/cgi-bin/koha/search.pl" method="post">
-               <label for="keyword">Quick Search:</label><input id="keyword" type="text"  size="10" name="keyword" />
-               <input type="submit" value="Search" class="submit" />
-               </form></li><li><a href="/cgi-bin/koha/loadmodules.pl?module=search&amp;marc=0&amp;type=intranet">Advanced Search</a></li><!-- Display for NPL <li><a href="/item_report.php">Format Search</a></li> /Display for NPL -->
-<li><a href="/cgi-bin/koha/loadmodules.pl?module=search&amp;marc=1&amp;type=intranet">MARC Search</a></li><!-- Display for NPL <li><a href="http://live.moreforohio.org:8080/vdx/">MORE Search</a></li> /Display for NPL -->
+                               <li><a href="/cgi-bin/koha/loadmodules.pl?module=search&amp;marc=1&amp;type=intranet">Catalog</a><ul><li><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="10" /><input type="submit" value="Start search" class="submit"></form></li><li><a href="/cgi-bin/koha/loadmodules.pl?module=search&amp;marc=1&amp;type=intranet">Advanced Search</a></li><!-- Display for NPL <li><a href="/item_report.php">Format Search</a></li><li><a href="http://live.moreforohio.org:8080/vdx/">MORE Search</a></li> /Display for NPL -->
 </ul></li>
 <li><a href="/cgi-bin/koha/acqui.simple/addbooks.pl">Cataloging</a><ul><!-- Display for NPL <li><a href="/cgi-bin/koha/acqui.simple/addbiblio-simple.pl">Add Temp</a> </li> /Display for NPL --><li><a href="/cgi-bin/koha/acqui.simple/addbiblio.pl">Add MARC</a></li><!-- Hide from NPL --><li><a href="/cgi-bin/koha/loadmodules.pl?module=acquisitions">Acquisitions</a></li><!-- /Hide from NPL --></ul></li>
 <!-- Hide from NPL --><li><a href="/cgi-bin/koha/reports-home.pl">Accounts and Reports</a></li>

diff --git a/koha-tmpl/intranet-tmpl/npl/en/intranet-main.tmpl b/koha-tmpl/intranet-tmpl/npl/en/intranet-main.tmpl
index 1357f9f..66bd53d 100644 (file)
--- a/koha-tmpl/intranet-tmpl/npl/en/intranet-main.tmpl
+++ b/koha-tmpl/intranet-tmpl/npl/en/intranet-main.tmpl
@@ -13,14 +13,10 @@
        <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>
-       <dt><a href="/cgi-bin/koha/search.marc/search.pl?type=intranet">Catalog Search</a></dt>
+       <dt><a href="/cgi-bin/koha/loadmodules.pl?module=search&amp;marc=1&amp;type=intranet">Catalog Search</a></dt>
                <dd>Search bibilographic records
-               <form action="/cgi-bin/koha/search.pl" method="post">
-               <label for="keyword">Quick Search:</label><input id="keyword" type="text"  size="25" name="keyword" />
-               <input type="submit" value="Search" class="submit" />
-               </form>
-               <ul><li><a href="/cgi-bin/koha/loadmodules.pl?module=search&amp;marc=0&amp;type=intranet">Advanced Search</a></li> <!-- Display for NPL <li><a href="/item_report.php">Format Search</a></li> /Display for NPL -->
-<li><a href="/cgi-bin/koha/loadmodules.pl?module=search&amp;marc=1&amp;type=intranet">MARC Search</a></li> </ul>
+<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&amp;marc=1&amp;type=intranet">Advanced Search</a></li><!-- Display for NPL <li><a href="/item_report.php">Format Search</a></li> /Display for NPL --></ul>
                </dd>
 <!-- Hide from NPL -->
 <dt><a href="/cgi-bin/koha/reports-home.pl">Accounts and Reports
@@ -30,9 +26,9 @@
 <dt><a href="/cgi-bin/koha/acqui.simple/addbooks.pl">Cataloging</a></dt>
                        <dd><ul>
 <!-- Display for NPL <li><a href="/cgi-bin/koha/acqui.simple/addbiblio-simple.pl">Enter Brief Record (Temp Cards)</a> </li> /Display for NPL -->
-<li><a href="/cgi-bin/koha/acqui.simple/addbiblio.pl">Advanced Cataloging</a> </li> <!-- Hide from NPL --><li><a href="/cgi-bin/koha/loadmodules.pl?module=acquisitions">Acquisitions</a></li><li><a href="/cgi-bin/koha/bull-home.pl">Serials</a> Manage serial subscriptions and issues</li> <li><a href="/cgi-bin/koha/bookshelves/shelves.pl">Virtual shelves</a> Virtual shelves can be used by librarian or patrons to build virtual libraries inside the "real" one. The virtual shelf can be used by a teacher to help his/her students searching information on a specific topic. It can be used by a library to define "most valuable books for [some category of patron]"</li><!-- /Hide from NPL --></ul></dd>
+<li><a href="/cgi-bin/koha/acqui.simple/addbiblio.pl">Advanced Cataloging</a></li>  <!-- Hide from NPL --><li><a href="/cgi-bin/koha/loadmodules.pl?module=acquisitions">Acquisitions</a></li> <li><a href="/cgi-bin/koha/bull-home.pl">Serials</a></li> <li><a href="/cgi-bin/koha/bookshelves/shelves.pl">Virtual shelves</a></li><!-- /Hide from NPL --></ul></dd>
 <!-- Hide from NPL --><dt><a href="/cgi-bin/koha/admin-home.pl">Koha Administration</a></dt>
-<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></ul></dd> <!-- /Hide from NPL -->
+<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></ul></dd> <!-- /Hide from NPL -->
 </dl></div>
             
 </div>