-<div class="yui-g"><div id="corner"><!-- TMPL_IF NAME="opaclanguagesdisplay" --><div id="languages">
- <ul>
- <!-- TMPL_LOOP NAME="languages" --><li><a href="/cgi-bin/koha/changelanguage.pl?language=<!-- TMPL_VAR NAME="language" -->"><!-- TMPL_VAR NAME="label" --></a> </li><!-- /TMPL_LOOP -->
- </ul></div><!-- /TMPL_IF --></div></div>
-
<div id="members">
<ul><!-- TMPL_IF NAME="loggedinusername" --><li><span class="members">Welcome, <a href="/cgi-bin/koha/opac-user.pl"><span class="loggedinusername"><!-- TMPL_LOOP NAME="USER_INFO" --><!-- TMPL_VAR NAME="title" --> <!-- TMPL_VAR NAME="firstname" --> <!-- TMPL_VAR NAME="surname" --><!-- /TMPL_LOOP --></span></a></span></li><li><a class="logout" href="/cgi-bin/koha/opac-main.pl?logout.x=1">Log Out</a></li><!-- TMPL_ELSE --><li><a href="/cgi-bin/koha/opac-user.pl">Log in to Your Account</a></li><!-- /TMPL_IF -->
</ul>
<form name="searchform" method="get" action="/cgi-bin/koha/opac-search.pl" id="searchform">
<label for="masthead_search"> Search <!-- TMPL_IF name="mylibraryfirst" --> <!-- TMPL_IF name="loggedinusername" -->(in <!-- TMPL_VAR name="LoginBranchcode" --> only)<!-- /TMPL_IF --><!-- /TMPL_IF --></label>
<select name="idx" id="masthead_search">
- <option <!-- TMPL_IF NAME="ms_kw" -->selected="selected"<!-- /TMPL_IF --> value="">Library Catalog</option>
- <option <!-- TMPL_IF NAME="ms_ti" -->selected="selected"<!-- /TMPL_IF --> value="ti">Title</option>
- <option <!-- TMPL_IF NAME="ms_au" -->selected="selected"<!-- /TMPL_IF --> value="au">Author</option>
- <option <!-- TMPL_IF NAME="ms_su" -->selected="selected"<!-- /TMPL_IF --> value="su">Subject</option>
- <option <!-- TMPL_IF NAME="ms_isbn" -->selected="selected"<!-- /TMPL_IF --> value="isbn">ISBN</option>
- <option <!-- TMPL_IF NAME="ms_se" -->selected="selected"<!-- /TMPL_IF --> value="se">Series</option>
- <option <!-- TMPL_IF NAME="ms_callnum" -->selected="selected"<!-- /TMPL_IF --> value="callnum">Call Number</option>
-</select>
- <input type="text" name="q" <!-- TMPL_IF NAME="ms_value" -->value="<!-- TMPL_VAR NAME="ms_value" -->" <!-- /TMPL_IF --> style="width: 40%;" />
+ <!-- TMPL_IF NAME="ms_kw" -->
+ <option selected="selected" value="">Library Catalog</option>
+ <!-- TMPL_ELSE -->
+ <option value="">Library Catalog</option>
+ <!-- /TMPL_IF -->
+ <!-- TMPL_IF NAME="ms_ti" -->
+ <option selected="selected" value="ti">Title</option>
+ <!-- TMPL_ELSE -->
+ <option value="ti">Title</option>
+ <!-- /TMPL_IF -->
+ <!-- TMPL_IF NAME="ms_au" -->
+ <option selected="selected" value="au">Author</option>
+ <!-- TMPL_ELSE -->
+ <option value="au">Author</option>
+ <!-- /TMPL_IF -->
+ <!-- TMPL_IF NAME="ms_su" -->
+ <option selected="selected" value="su">Subject</option>
+ <!-- TMPL_ELSE -->
+ <option value="su">Subject</option>
+ <!-- /TMPL_IF -->
+ <!-- TMPL_IF NAME="ms_isbn" -->
+ <option selected="selected" value="isbn">ISBN</option>
+ <!-- TMPL_ELSE -->
+ <option value="isbn">ISBN</option>
+ <!-- /TMPL_IF -->
+ <!-- TMPL_IF NAME="ms_se" -->
+ <option selected="selected" value="se">Series</option>
+ <!-- TMPL_ELSE -->
+ <option value="se">Series</option>
+ <!-- /TMPL_IF -->
+ <!-- TMPL_IF NAME="ms_callnum" -->
+ <option selected="selected" value="callnum">Call Number</option>
+ <!-- TMPL_ELSE -->
+ <option value="callnum">Call Number</option>
+ <!-- /TMPL_IF --></select>
+<!-- TMPL_IF NAME="ms_value" -->
+ <input type="text" name="q" value="<!-- TMPL_VAR NAME="ms_value" -->" style="width: 40%;" />
+<!-- TMPL_ELSE -->
+ <input type="text" name="q" style="width: 40%;" />
+<!-- /TMPL_IF -->
<!-- TMPL_IF name="mylibraryfirst" --><!-- TMPL_IF name="loggedinusername" -->
<input name="limit" value="<!-- TMPL_VAR name="LoginBranchcode" -->" type="hidden" />
<!-- /TMPL_IF --><!-- /TMPL_IF -->
<script type="text/javascript">
$(document).ready(function() {
- $("#listmenubutton").hover(function(){
- $(this).attr("src","/opac-tmpl/prog/images/lists-button-on.gif");
- },function(){
- $(this).attr("src","/opac-tmpl/prog/images/lists-button.gif");
- });
-
- $("#cartmenubutton").hover(function(){
- $(this).attr("src","/opac-tmpl/prog/images/cart-button-on.gif");
- },function(){
- $(this).attr("src","/opac-tmpl/prog/images/cart-button.gif");
- });
+
+ var cartButton = new YAHOO.widget.Button("cartmenulink");
+ var listsButton = new YAHOO.widget.Button("listsmeulink");
});
- YAHOO.util.Event.onContentReady("cartmenu", function () {
- var cartMenu = new YAHOO.widget.Menu("cartmenu", { lazyload: true });
- cartMenu.render();
- cartMenu.cfg.setProperty("context", ["cartmenubutton", "tr", "br"]);
- cartMenu.subscribe("show", cartMenu.focus);
- function positioncartMenu() {
- cartMenu.align("tr", "br");
- }
- YAHOO.util.Event.addListener("cartmenubutton", "click", cartMenu.show, null, cartMenu);
- YAHOO.widget.Overlay.windowResizeEvent.subscribe(positioncartMenu);
- });
-
- YAHOO.util.Event.onContentReady("listsmenu", function () {
+ YAHOO.util.Event.onContentReady("listsmenu", function () {
var listMenu = new YAHOO.widget.Menu("listsmenu", { lazyload: true });
listMenu.render();
- listMenu.cfg.setProperty("context", ["listmenubutton", "tr", "br"]);
+ listMenu.cfg.setProperty("context", ["listsmeulink", "tr", "br"]);
listMenu.subscribe("show", listMenu.focus);
function positionlistMenu() {
listMenu.align("tr", "br");
}
- YAHOO.util.Event.addListener("listmenubutton", "click", listMenu.show, null, listMenu);
+ YAHOO.util.Event.addListener("listsmeulink", "click", listMenu.show, null, listMenu);
YAHOO.widget.Overlay.windowResizeEvent.subscribe(positionlistMenu);
});
<script>
function init() {
-
- // Build overlay3 dynamically, initially hidden, aligned to context element "context", and 200px wide
- var cartOverlay = new YAHOO.widget.Overlay("overlay3", { context:["cartmenubutton","tr","br"],
+ var cartOverlay = new YAHOO.widget.Overlay("cartDetails", { context:["cartmenubutton","tr","br"],
visible:false,
width:"200px" } );
- cartOverlay.setHeader("Overlay #3 from Script");
- cartOverlay.setBody("This is a dynamically generated Overlay.");
- cartOverlay.setFooter("End of Overlay #3");
+ // cartOverlay.setHeader("Overlay #3 from Script");
+ cartOverlay.setBody("Your cart contains 3 items.");
+ // cartOverlay.setFooter("End of Overlay #3");
cartOverlay.render(document.body);
- YAHOO.util.Event.addListener("cartmenubutton", "mouseover", cartOverlay.show, cartOverlay, true);
- YAHOO.util.Event.addListener("cartmenubutton", "mouseout", cartOverlay.hide, cartOverlay, true);
+ YAHOO.util.Event.addListener("cartmenulink", "mouseover", cartOverlay.show, cartOverlay, true);
+ YAHOO.util.Event.addListener("cartmenulink", "mouseout", cartOverlay.hide, cartOverlay, true);
}
YAHOO.util.Event.addListener(window, "load", init);
</script>
-<style>
- #overlay3 {
- background-color : #FFF;
- border: 1px solid black;
- padding : .5em;
- }
-</style>
<div id="listsmenu" class="yuimenu">
<div class="bd">
</div>
-<div id="cartmenubutton"><a href="#basket">Your Cart</a></div>
-<div id="listmenubutton"><a href="#listmenu">Your Lists</a></div>
+<a id="cartmenulink" href="#basket">Your Cart</a>
+<a id="listsmeulink" href="#listmenu">Your Lists</a>
<!-- <!-- TMPL_IF NAME="opacbookbag" --><div><a class="button cart" href="/cgi-bin/koha/opac-basket.pl" onclick="openBasket(); return false;" title="A "shopping cart" for your selections"><span><span><span><span>Book Bag</span></span></span></span></a></div><!-- /TMPL_IF -->
<!--TMPL_IF NAME="virtualshelves" --><div><a class="button lists" href="/cgi-bin/koha/opac-shelves.pl"><span><span><span><span>Lists</span></span></span></span></a></div><!-- /TMPL_IF --> -->
<div id="breadcrumbs" class="yui-g">
-<!-- TMPL_IF NAME="searchdesc" --><p><!-- TMPL_IF name="total" --><strong>“<!-- TMPL_VAR NAME="query_desc" --><!-- TMPL_VAR NAME="limit_desc" -->” </strong>returned <!-- TMPL_VAR NAME="total" --> results. <!-- TMPL_IF NAME="available" -->Showing only <strong>available</strong> items. <a href="/cgi-bin/koha/opac-search.pl?<!-- TMPL_VAR NAME="query_cgi" --><!-- TMPL_VAR NAME="limit_cgi_not_availablity" -->">Show all items</a><!-- TMPL_ELSE -->Limit to <a href="/cgi-bin/koha/opac-search.pl?<!-- TMPL_VAR NAME="query_cgi" --><!-- TMPL_VAR NAME="limit_cgi" -->&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_IF NAME="searchdesc" --><p><!-- TMPL_IF name="total" --><strong>“<!-- TMPL_VAR NAME="query_desc" --><!-- TMPL_VAR NAME="limit_desc" -->” </strong>returned <!-- TMPL_VAR NAME="total" --> results. <!-- TMPL_IF NAME="related" --> (related searches: <!-- TMPL_LOOP NAME="related" --><!-- TMPL_VAR NAME="related_search" --><!-- /TMPL_LOOP -->). <!-- /TMPL_IF -->
<!-- TMPL_ELSE -->
<!-- TMPL_IF NAME="searchdesc" -->
use C4::Output;
use C4::Auth;
use C4::Search;
-use C4::Languages qw(getAllLanguages);
use C4::Koha;
use POSIX qw(ceil floor);
use C4::Branch; # GetBranches
}
$template->param(itemtypeloop => \@itemtypesloop);
+<<<<<<< HEAD:opac/opac-search.pl
# load the ccodes
# my ($ccodecount,@ccode_loop) = GetCcodes();
# $template->param(ccodeloop=>\@ccode_loop,);
+=======
+# # load the itypes (Called item types in the template -- just authorized values for searching)
+# my ($itypecount,@itype_loop) = GetCcodes();
+# $template->param(itypeloop=>\@itype_loop,);
+>>>>>>> Styling facets; correcting markup error in search results; removing language picker from opac-main (is now in the footer); continuing unfinished work on cart/lists buttons:opac/opac-search.pl
# The following should only be loaded if we're bringing up the advanced search template
if ( $template_type eq 'advsearch' ) {
$template->param(uc(C4::Context->preference("marcflavour")) => 1,
search_boxes_loop => \@search_boxes_array);
+<<<<<<< HEAD:opac/opac-search.pl
# load the language limits (for search)
my $languages_limit_loop = getAllLanguages();
$template->param(search_languages_loop => $languages_limit_loop,);
if ( ($cgi->param('expanded_options') == 0) || ($cgi->param('expanded_options') == 1 ) ) {
$template->param( expanded_options => $cgi->param('expanded_options'));
}
+=======
+# use the global setting by default
+ if ( C4::Context->preference("expandedSearchOption") == 1) {
+ $template->param( expanded_options => C4::Context->preference("expandedSearchOption") );
+ }
+ # but let the user override it
+ if ( ($cgi->param('expanded_options') == 0) || ($cgi->param('expanded_options') == 1 ) ) {
+ $template->param( expanded_options => $cgi->param('expanded_options'));
+ }
+>>>>>>> Styling facets; correcting markup error in search results; removing language picker from opac-main (is now in the footer); continuing unfinished work on cart/lists buttons:opac/opac-search.pl
output_html_with_http_headers $cgi, $cookie, $template->output;
exit;
projects / koha_ffzg / commitdiff