From a67714128aff294bd718f1061d58989f037f50b7 Mon Sep 17 00:00:00 2001 From: Owen Leonard Date: Fri, 25 Jan 2008 15:04:28 -0600 Subject: [PATCH] Button styling in masthead.inc is still conflicting with the js load() functions and the menu popup, so buttons are unstyled at the moment. Still need to integrate cart (basket/bookbag) functions. Signed-off-by: Chris Cormack Signed-off-by: Joshua Ferraro --- .../opac-tmpl/prog/en/includes/masthead.inc | 11 +++++---- .../opac-tmpl/prog/en/lib/yui/yui-sprite.png | Bin 0 -> 3123 bytes .../opac-tmpl/prog/images/more-up-arrow.gif | Bin 0 -> 155 bytes opac/opac-search.pl | 21 ------------------ 4 files changed, 5 insertions(+), 27 deletions(-) create mode 100644 koha-tmpl/opac-tmpl/prog/en/lib/yui/yui-sprite.png create mode 100644 koha-tmpl/opac-tmpl/prog/images/more-up-arrow.gif diff --git a/koha-tmpl/opac-tmpl/prog/en/includes/masthead.inc b/koha-tmpl/opac-tmpl/prog/en/includes/masthead.inc index 5482d17a42..480ce8e5ff 100644 --- a/koha-tmpl/opac-tmpl/prog/en/includes/masthead.inc +++ b/koha-tmpl/opac-tmpl/prog/en/includes/masthead.inc @@ -70,8 +70,8 @@ -Cart -Lists +Cart +Lists
@@ -119,12 +119,11 @@ $(document).ready(function() { -
  • Log in to Create Your Own Lists
+
-
Book Bag
--> diff --git a/koha-tmpl/opac-tmpl/prog/en/lib/yui/yui-sprite.png b/koha-tmpl/opac-tmpl/prog/en/lib/yui/yui-sprite.png new file mode 100644 index 0000000000000000000000000000000000000000..afd65e05aaabc820fc2e6bba0740818773fcd599 GIT binary patch literal 3123 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 literal 0 HcmV?d00001 diff --git a/koha-tmpl/opac-tmpl/prog/images/more-up-arrow.gif b/koha-tmpl/opac-tmpl/prog/images/more-up-arrow.gif new file mode 100644 index 0000000000000000000000000000000000000000..a62357d651692c92fb53a1cb1daf59aa6c761655 GIT binary patch literal 155 zcmZ?wbhEHb;m8G?>cU0>9;Xh0|1g#6F~p~ literal 0 HcmV?d00001 diff --git a/opac/opac-search.pl b/opac/opac-search.pl index ef2985c012..62fe01c431 100755 --- a/opac/opac-search.pl +++ b/opac/opac-search.pl @@ -100,15 +100,9 @@ foreach my $thisitemtype ( sort {$itemtypes->{$a}->{'description'} cmp $itemtype } $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' ) { @@ -153,20 +147,6 @@ 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,); - - # 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')); - } -======= # use the global setting by default if ( C4::Context->preference("expandedSearchOption") == 1) { $template->param( expanded_options => C4::Context->preference("expandedSearchOption") ); @@ -175,7 +155,6 @@ if ( $template_type eq 'advsearch' ) { 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; -- 2.20.1