From c9baf7441ffe9f6f1e12829518a1415da39387c6 Mon Sep 17 00:00:00 2001 From: Owen Leonard Date: Fri, 25 Jan 2008 15:04:25 -0600 Subject: [PATCH] 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 Signed-off-by: Chris Cormack Signed-off-by: Joshua Ferraro --- koha-tmpl/opac-tmpl/prog/en/css/opac.css | 65 ++++++++-- .../opac-tmpl/prog/en/includes/masthead.inc | 113 +++++++++--------- .../prog/en/includes/opac-facets.inc | 12 +- .../opac-tmpl/prog/en/lib/yui/button.css | 4 +- .../opac-tmpl/prog/en/modules/opac-main.tmpl | 17 --- .../prog/en/modules/opac-results.tmpl | 3 +- opac/opac-search.pl | 18 ++- 7 files changed, 139 insertions(+), 93 deletions(-) diff --git a/koha-tmpl/opac-tmpl/prog/en/css/opac.css b/koha-tmpl/opac-tmpl/prog/en/css/opac.css index f682b75ee9..78e41e5bfc 100644 --- a/koha-tmpl/opac-tmpl/prog/en/css/opac.css +++ b/koha-tmpl/opac-tmpl/prog/en/css/opac.css @@ -157,7 +157,7 @@ h1#libraryname a { text-decoration:none; width:120px; } - +/* div#cartmenubutton { background:transparent url(../../images/cart-button.gif) no-repeat scroll 0%; border: 0; @@ -199,7 +199,7 @@ div#listmenubutton a { text-decoration:none; width:84px; } - +*/ h1,h2,h3,h4,h5,h6 { font-weight : bold; margin : .5em 0; @@ -467,9 +467,45 @@ a .term { font-weight : bold; } -/***********************************************************/ -/* the user menu, for user option (and biblio detail view) */ -/***********************************************************/ + +#search-facets ul { + margin : 0; + padding : .3em; +} + +#search-facets { + border : 1px solid #e8e8e8; +} + +#search-facets h4 { + background-color : #EFF1DC; + border-bottom : 1px solid #e8e8e8; + font-size : 90%; + margin : 0; + padding : .4em .2em; + text-align : center; +} + +#search-facets ul li { + font-weight : bold; + list-style-type : none; +} + +#search-facets li li { + font-weight : normal; + font-size : 85%; + margin-bottom : 2px; + padding : .1em .2em; +} + +#search-facets li li a { + font-weight : normal; +} + +#search-facets li.showmore a { + font-weight : bold; + text-indent : 1em; +} .suggestion { background-color : #EEEEEB; @@ -668,6 +704,10 @@ a.cancel { margin-top : 5px; } +.searchresults p.details { + color : #979797; +} + .searchresults p { margin: 0; padding: 0; @@ -978,8 +1018,7 @@ line-height : 25px; /* End hide from IE-mac */ .searchhighlightblob { - font-size:75%; - font-style : italic; + font-size : 85%; } @@ -1022,7 +1061,7 @@ div.message { font-weight : normal; text-decoration : none; } - +/* #cart-box { float : left; background : url(../../images/cart-background-right.gif) top right no-repeat; @@ -1058,7 +1097,7 @@ div.message { #cart-box a.cartbutton { background : #9bc1dd url(../../images/cart-small.gif) center left no-repeat; padding-left : 20px; -} +}*/ #opac-main-search #listsmenu a, #opac-main-search #listsmenu h4 { color : #000; @@ -1118,7 +1157,6 @@ ul#i18nMenu li:first-child { ul#i18nMenu li ul li { border : 0; display : block; - padding : 0; } @@ -1172,4 +1210,9 @@ ul#i18nMenu li.more ul li a { div#changelanguage a.yuimenuitemlabel { color : #006699; font-weight : normal; - } \ No newline at end of file + } + #cartDetails { + background-color : #FFF; + border: 1px solid black; + padding : .5em; + } \ No newline at end of file diff --git a/koha-tmpl/opac-tmpl/prog/en/includes/masthead.inc b/koha-tmpl/opac-tmpl/prog/en/includes/masthead.inc index 4014c1feea..b6bf637f87 100644 --- a/koha-tmpl/opac-tmpl/prog/en/includes/masthead.inc +++ b/koha-tmpl/opac-tmpl/prog/en/includes/masthead.inc @@ -1,8 +1,3 @@ -
-
-
@@ -20,15 +15,46 @@
- value="" style="width: 40%;" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + " style="width: 40%;" /> + + + " type="hidden" /> @@ -60,41 +86,21 @@ -
@@ -143,8 +140,8 @@ $(document).ready(function() {
- - +Your Cart +Your Lists --> @@ -156,7 +153,7 @@ $(document).ready(function() { - -
-

Change language

- - - - - -
- -
diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-results.tmpl b/koha-tmpl/opac-tmpl/prog/en/modules/opac-results.tmpl index 8e73b468bb..fde1d0dd1f 100644 --- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-results.tmpl +++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-results.tmpl @@ -133,7 +133,7 @@ href="/cgi-bin/koha/opac-rss.pl?
. "> "> "> by ">  -

- +

- - ; - @@ -197,5 +197,6 @@ href="/cgi-bin/koha/opac-rss.pl? + diff --git a/opac/opac-search.pl b/opac/opac-search.pl index b5a9c1c053..ef2985c012 100755 --- a/opac/opac-search.pl +++ b/opac/opac-search.pl @@ -11,7 +11,6 @@ use C4::Context; 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 @@ -101,9 +100,15 @@ 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' ) { @@ -148,6 +153,7 @@ 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,); @@ -160,6 +166,16 @@ if ( $template_type eq 'advsearch' ) { 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; -- 2.39.5