From 115dd8752f0395d6f169780166a514476bd839f4 Mon Sep 17 00:00:00 2001 From: Owen Leonard Date: Thu, 31 Dec 2009 12:45:54 -0500 Subject: [PATCH] Interface corrections and improvements to OPAC lists - improving behavior for users with no javascript - style improvements to list "toolbar" - adding new toolbar icons - adding display of subtitle to lists --- C4/VirtualShelves/Page.pm | 2 + koha-tmpl/opac-tmpl/prog/en/css/opac.css | 258 +++++++++++------- .../prog/en/modules/opac-downloadshelf.tmpl | 31 ++- .../prog/en/modules/opac-sendshelfform.tmpl | 8 +- .../prog/en/modules/opac-shelves.tmpl | 66 ++--- koha-tmpl/opac-tmpl/prog/images/download.png | Bin 0 -> 369 bytes .../opac-tmpl/prog/images/empty-small.png | Bin 0 -> 474 bytes .../prog/images/place-hold-small.png | Bin 0 -> 430 bytes .../opac-tmpl/prog/images/print-small.png | Bin 0 -> 507 bytes koha-tmpl/opac-tmpl/prog/images/send.png | Bin 0 -> 472 bytes .../opac-tmpl/prog/images/tags-small.png | Bin 0 -> 361 bytes 11 files changed, 216 insertions(+), 149 deletions(-) create mode 100644 koha-tmpl/opac-tmpl/prog/images/download.png create mode 100644 koha-tmpl/opac-tmpl/prog/images/empty-small.png create mode 100644 koha-tmpl/opac-tmpl/prog/images/place-hold-small.png create mode 100644 koha-tmpl/opac-tmpl/prog/images/print-small.png create mode 100644 koha-tmpl/opac-tmpl/prog/images/send.png create mode 100644 koha-tmpl/opac-tmpl/prog/images/tags-small.png diff --git a/C4/VirtualShelves/Page.pm b/C4/VirtualShelves/Page.pm index d80c72c38b..72937bd6e9 100644 --- a/C4/VirtualShelves/Page.pm +++ b/C4/VirtualShelves/Page.pm @@ -182,6 +182,7 @@ SWITCH: { } ($items, $totitems) = GetShelfContents($shelfnumber, $shelflimit, $shelfoffset); for my $this_item (@$items) { + my $record = GetMarcBiblio($this_item->{'biblionumber'}); # the virtualshelfcontents table does not store these columns nor are they retrieved from the items # and itemtypes tables, so I'm commenting them out for now to quiet the log -crn #$this_item->{imageurl} = $imgdir."/".$itemtypes->{ $this_item->{itemtype} }->{'imageurl'}; @@ -189,6 +190,7 @@ SWITCH: { $this_item->{'dateadded'} = format_date($this_item->{'dateadded'}); $this_item->{'imageurl'} = getitemtypeinfo($this_item->{'itemtype'})->{'imageurl'}; $this_item->{'coins'} = GetCOinSBiblio($this_item->{'biblionumber'}); + $this_item->{'subtitle'} = C4::Biblio::get_koha_field_from_marc('bibliosubtitle', 'subtitle', $record, ''); } push @paramsloop, {display => 'privateshelves'} if $category == 1; $showadd = 1; diff --git a/koha-tmpl/opac-tmpl/prog/en/css/opac.css b/koha-tmpl/opac-tmpl/prog/en/css/opac.css index 208fdced6d..cd3a11ab42 100644 --- a/koha-tmpl/opac-tmpl/prog/en/css/opac.css +++ b/koha-tmpl/opac-tmpl/prog/en/css/opac.css @@ -393,11 +393,50 @@ a .term { padding : .3em 0; } -#action a, #toolbar a { +#action a { background-position : 5px center; background-repeat : no-repeat; text-decoration : none; - padding-left : 26px; + padding-left : 35px; +} + +#action a.print { + background-image:url(../../images/print.gif); +} + +#action a#furthersearches { + background : transparent url(../../images/menu-arrow.gif) no-repeat right center; + border : 1px solid #F3F3F3; + margin-left : 5px; + padding : 2px 26px 2px 10px; + text-decoration : none; +} + +#action a#furthersearches:hover { + border-top : 1px solid #FFF; + border-left : 1px solid #FFF; + border-right : 1px solid #979797; + border-bottom : 1px solid #979797; +} + +#action a.reserve, +.searchresults a.reserve { + background-image:url(../../images/placereserve.gif); +} + +#action a.addtoshelf, #toolbar a.addtoshelf { + background-image:url(../../images/addtoshelf.gif); +} + +#action a.addtocart, #toolbar a.addtocart { + background-image:url(../../images/cart2.gif); +} + +/* toolbar buttons */ + +#toolbar a, +#toolbar input { + white-space : nowrap; } #toolbar ul { @@ -417,82 +456,147 @@ a .term { border-left : 0; } -#action a.reserve, #toolbar a.reserve, .searchresults a.reserve { - background-image:url(../../images/placereserve.gif); + +#toolbar a.print { + background: transparent url(../../images/print-small.png) 5px 50% no-repeat; + display : none; + text-decoration : none; + padding-left : 23px; } -.searchresults a.highlight_toggle { - background : transparent url(../../images/highlight.gif) -4px center no-repeat; - display: none; - font-weight: normal; - padding : 0 10px 0 21px; +#toolbar a.brief { + background: transparent url(../../images/brief.gif) 5px 50% no-repeat; + text-decoration : none; + padding-left : 23px; } -#action a.addtoshelf, #toolbar a.addtoshelf { - background-image:url(../../images/addtoshelf.gif); +#toolbar a.detail { + background: transparent url(../../images/detail.gif) 5px 50% no-repeat; + text-decoration : none; + padding-left : 27px; } -#action a.addtocart, #toolbar a.addtocart { - background-image:url(../../images/cart2.gif); +#toolbar a.download { + background : transparent url("../../images/download.png") 7px 50% no-repeat; + padding-left : 24px; + text-decoration : none; } -#action a.print, #toolbar a.print { - background-image:url(../../images/print.gif); +#toolbar a.editshelf { + background : transparent url("../../images/shelf-edit.gif") 12px 50% no-repeat; + padding-left : 26px; + text-decoration : none; } -#action a#furthersearches { - background : transparent url(../../images/menu-arrow.gif) no-repeat right center; - border : 1px solid #F3F3F3; - margin-left : 5px; - padding : 2px 26px 2px 10px; +#toolbar a.empty { + background: transparent url(../../images/empty-small.png) 5px 50% no-repeat; text-decoration : none; + padding-left : 21px; } -#action a#furthersearches:hover { - border-top : 1px solid #FFF; - border-left : 1px solid #FFF; - border-right : 1px solid #979797; - border-bottom : 1px solid #979797; +#toolbar a.hide { + background: transparent url(../../images/close.gif) 5px 50% no-repeat; + text-decoration : none; + padding-left : 26px; } -#toolbar a.brief { - background-image: url(../../images/brief.gif); +#toolbar a.hold { + background: transparent url(../../images/place-hold-small.png) 5px 50% no-repeat; + text-decoration : none; + padding-left : 23px; } -#toolbar a.detail { - background-image: url(../../images/detail.gif); +#toolbar a.newshelf { + background : transparent url("../../images/shelf-new.gif") 5px 50% no-repeat; + padding-left : 23px; + text-decoration : none; } -#toolbar a.print { - background-image: url(../../images/print.gif); +#toolbar a.send, +a.send { + background: transparent url(../../images/send.png) 2px 50% no-repeat; + text-decoration : none; + padding-left : 28px; } -#toolbar a.hide { - background-image: url(../../images/close.gif); +#toolbar a.new { + background : transparent url("../../images/new.gif") 5px 50% no-repeat; + padding-left : 23px; + text-decoration : none; } -#toolbar a.send { - background-image: url(../../images/send.gif); +#toolbar input.download { + background : transparent url("../../images/download.png") 7px 50% no-repeat; + border : 0; + color : #006699; + cursor : pointer; + padding-left : 24px; + text-decoration : none; } -.sendlist { - display : none; + +#toolbar input.editshelf, +input.editshelf { + background : transparent url("../../images/shelf-edit.gif") 10px 50% no-repeat; + border : 0; + color : #006699; + cursor : pointer; + font-size : 100%; + padding-left : 29px; + text-decoration : none; } -a.send { - background-image: url(../../images/send.gif); - background-position : 0px center; - background-repeat : no-repeat; + +#toolbar input.newshelf { + background : transparent url("../../images/shelf-new.gif") center left no-repeat; + border : 0; + color : #006699; + cursor : pointer; + font-size : 100%; + margin: 0 0.5em; + padding-left : 15px; text-decoration : none; - padding-left : 21px; - padding-right : 5px; } -a.hold, + +#toolbar input.deleteshelf, +input.deleteshelf { + background : transparent url("../../images/shelf-delete.gif") 7px 50% no-repeat; + border : 0; + color : #006699; + cursor : pointer; + font-size : 100%; + padding-left : 20px; +} + +#toolbar input.deleteshelf:hover { + color: #990033; +} + + +#toolbar input.editshelf:active,input.deleteshelf:active { + border : 0; +} + +#tagsel_span input.submit, +#tagsel_tag { + background-image: url(../../images/tags-small.png); + background-position : 7px center; + background-repeat : no-repeat; + padding-left : 25px; + text-decoration: none; +} + +#placehold input.submit:hover, +#tagsel_span input.submit:hover { + color: #990033; +} + #placehold input.submit { - background-image: url(../../images/placereserve.gif); + background-image:url(../../images/placereserve.gif); background-position : 9px center; background-repeat : no-repeat; text-decoration : none; - padding-left : 34px; + padding-left : 23px; } + #placehold input.submit, #tagsel_span input.submit { border : 0; @@ -503,22 +607,11 @@ a.hold, color : #336699; cursor : pointer; } -#tagsel_span input.submit, -#tagsel_tag { - background-image: url(../../images/tags.gif); - background-position : 9px center; - background-repeat : no-repeat; - padding-left : 24px; - text-decoration: none; -} -#tagsel_tag { - padding-left: 27px; -} -#placehold input.submit:hover,#tagsel_span input.submit:hover { - color: #990033; -} -#toolbar a.empty { - background-image: url(../../images/trash.gif); +.searchresults a.highlight_toggle { + background : transparent url(../../images/highlight.gif) -4px center no-repeat; + display: none; + font-weight: normal; + padding : 0 10px 0 21px; } /* the itemtype list in advanced search */ @@ -1743,47 +1836,6 @@ a#MARCview, a#MARCviewPop, a#ISBDview, a#Normalview { #shelfbrowser a { display : block; } -a.new { - background : transparent url("../../images/new.gif") center left no-repeat; - border : 0; - color : #006699; - cursor : pointer; - margin:0pt 0.5em; - padding-left : 15px; - text-decoration : none; -} -input.editshelf,a.editshelf { - background : transparent url("../../images/shelf-edit.gif") center left no-repeat; - border : 0; - color : #006699; - cursor : pointer; - margin:0pt 0.5em; - padding-left : 15px; - text-decoration : none; -} -input.newshelf,a.newshelf { - background : transparent url("../../images/shelf-new.gif") center left no-repeat; - border : 0; - color : #006699; - cursor : pointer; - font-size : 100%; - margin:0pt 0.5em; - padding-left : 15px; - text-decoration : none; -} -input.deleteshelf { - background : transparent url("../../images/shelf-delete.gif") center left no-repeat; - border : 0; - color : #006699; - cursor : pointer; - font-size : 100%; - margin:0pt 0.5em; - padding-left : 13px; -} - -input.editshelf:active,input.deleteshelf:active { - border : 0; -} #comments .commentline { border-bottom : 2px solid #eeeeeb; diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-downloadshelf.tmpl b/koha-tmpl/opac-tmpl/prog/en/modules/opac-downloadshelf.tmpl index 52203f5037..b5effbcd76 100644 --- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-downloadshelf.tmpl +++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-downloadshelf.tmpl @@ -1,11 +1,18 @@ -Download shelf +Koha Online Catalog › Download list + - - - Your Download should automatically start + +
+

Your download should begin automatically.

-
- + +
+
  1. - " /> - +
+
+
" /> +
-

Close this window

-
+

Back to lists

- +
diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-sendshelfform.tmpl b/koha-tmpl/opac-tmpl/prog/en/modules/opac-sendshelfform.tmpl index 41f7d32b36..9d0e717e68 100644 --- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-sendshelfform.tmpl +++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-sendshelfform.tmpl @@ -1,5 +1,11 @@ Koha Online Catalog › Sending Your List +
@@ -7,7 +13,7 @@

Message Sent

The list was sent to:

-

Close window

+

Back to lists

Problem sending the list...

diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-shelves.tmpl b/koha-tmpl/opac-tmpl/prog/en/modules/opac-shelves.tmpl index 6217977b1c..c35655359d 100644 --- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-shelves.tmpl +++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-shelves.tmpl @@ -72,9 +72,9 @@ function tagAdded() { } $(function() { - $("span.clearall").html(""+_('Clear All')+"<\/a>"); - $("span.checkall").html(""+_('Select All')+"<\/a>"); - $(".sendlist").show(); + $("span.clearall").html(""+_('Clear All')+"<\/a>|"); + $("span.checkall").html(""+_('Select All')+"<\/a>"); + $("a.print").show(); $("#placehold").html(""+_('Place Hold')+"<\/a>"); $("a.hold").click(function(){ holdSelections(); @@ -116,7 +116,7 @@ $(function() { tagSelected(); return false; }); - $("#addtags").html(""+_("Tag")+"<\/a>"); + $("#addtags").html(""+_("Tag")+"<\/a> |"); $("#tagsel_button").click(function(){ tagAdded(); return false; @@ -144,7 +144,7 @@ $(function() { -
+
@@ -195,28 +195,12 @@ $(function() {

Lists /../images/caret.gif" width="16" height="16" alt=">" border="0" />

- - - +
@@ -356,7 +358,7 @@ $(function() { - New List + @@ -383,8 +385,7 @@ $(function() { Open - ','win_form','dependant=yes,scrollbars=no,resizable=no,height=300,width=450,top=50,left=100'); return false; ">Send List - + " /> @@ -424,7 +425,7 @@ $(function() {