From eb1b0ac1b6f3118ee0c087ad4671e3f91a265aa4 Mon Sep 17 00:00:00 2001 From: Owen Leonard Date: Wed, 21 Nov 2007 14:56:22 -0600 Subject: [PATCH] Tweaks to opac-detail, opac-results. Many changes to opac-shelves.tmpl following the pattern of revision started in dev_week and continued in the 3.0 staff client. Signed-off-by: Chris Cormack Signed-off-by: Joshua Ferraro --- koha-tmpl/opac-tmpl/prog/en/css/opac.css | 206 ++++++++++++++++-- .../prog/en/includes/doc-head-close.inc | 2 +- .../opac-tmpl/prog/en/includes/masthead.inc | 22 +- koha-tmpl/opac-tmpl/prog/en/js/script.js | 38 +++- .../prog/en/modules/opac-detail.tmpl | 2 + .../prog/en/modules/opac-results.tmpl | 33 ++- .../prog/en/modules/opac-shelves.tmpl | 99 ++++----- .../opac-tmpl/prog/images/addtobasket.gif | Bin 0 -> 115 bytes .../opac-tmpl/prog/images/cart-small.gif | Bin 0 -> 70 bytes .../opac-tmpl/prog/images/clearbasket.gif | Bin 0 -> 114 bytes .../opac-tmpl/prog/images/feed-icon-16x16.png | Bin 0 -> 764 bytes .../opac-tmpl/prog/images/placereserve.gif | Bin 0 -> 97 bytes opac/opac-shelves.pl | 58 +++-- 13 files changed, 340 insertions(+), 120 deletions(-) create mode 100644 koha-tmpl/opac-tmpl/prog/images/addtobasket.gif create mode 100644 koha-tmpl/opac-tmpl/prog/images/cart-small.gif create mode 100644 koha-tmpl/opac-tmpl/prog/images/clearbasket.gif create mode 100644 koha-tmpl/opac-tmpl/prog/images/feed-icon-16x16.png create mode 100644 koha-tmpl/opac-tmpl/prog/images/placereserve.gif diff --git a/koha-tmpl/opac-tmpl/prog/en/css/opac.css b/koha-tmpl/opac-tmpl/prog/en/css/opac.css index 0edd75f570..4bb81cb92f 100644 --- a/koha-tmpl/opac-tmpl/prog/en/css/opac.css +++ b/koha-tmpl/opac-tmpl/prog/en/css/opac.css @@ -121,6 +121,12 @@ fieldset.action { width : auto; } +form { + display : inline; + margin : 0; + padding : 0; +} + h1 { font-size : 138.5%; } @@ -231,8 +237,12 @@ li { list-style : disc; } +p.availability { + font-size : 87%; +} + .available { - font-size : 0.75em; + color : #006600; } .inwait { @@ -272,10 +282,6 @@ a .term { background-color : #F9FF9A; } -.unavailable { - background-color : #FFED3D; -} - /* action buttons */ #action { margin-top : .5em; @@ -688,6 +694,10 @@ p.searchresults { padding : 3px 3px 5px 5px; } +.searchresults table { + margin : 0; +} + .searchresults td, .searchresults th, .searchresults table { border: 0; } @@ -696,16 +706,12 @@ p.searchresults { border-bottom : 1px solid #CCCCCC; } -.searchresults table { - border-top : 0px solid #CCCCCC; -} - -p.availability { - color:#666666; +.searchresults tr:first-child { + border : 0; } -.available { - font-size: 90%; +.searchresults table { + border-top : 0px solid #CCCCCC; } .searchresults a.reserve, .searchresults a.reserve:visited { @@ -730,4 +736,178 @@ a.reserve { } .unavailable { color: #990033; +} + +#corner { + position: absolute; + top: .5em; + right: .2em; +} + +#corner a.cart { + background-image : url(/opac-tmpl/prog/images/cart-small.gif); + background-position: left; + background-repeat : no-repeat; + padding: 0 15px; + text-decoration: none; +} + +.pages { + line-height : 1.8em; + text-align: center; +} +a:link.current { + background-color: transparent; + color: #3366CC; + font-weight: bold; + padding: 1px 5px 1px 5px; + text-decoration: none; +} +a:visited.current { + background-color: transparent; + color: #3366CC; + font-weight: bold; + padding: 1px 5px 1px 5px; + text-decoration: none; +} + +a:hover.current { + background-color: #CCFF00; + color: #CC3333; + font-weight: bold; + padding: 1px 5px 1px 5px; + text-decoration: none; +} + +a:active.current { + background-color: #99CC00; + color: #FFFF99; + font-weight: bold; + padding: 1px 5px 1px 5px; + text-decoration: none; +} + +.current { + background-color: #FFFFFF; + color: #3366CC; + font-weight: bold; + padding: 1px 5px 1px 5px; + text-decoration: none; +} + +a:link.nav { + background-color: #EFF1DC; + border: 1px solid #CCCC99; + color: #3366CC; + font-weight: bold; + padding: 1px 5px 1px 5px; + text-decoration: none; +} + +a:visited.nav { + background-color: #EFF1DC; + border: 1px solid #CCCC99; + color: #3366CC; + font-weight: bold; + padding: 1px 5px 1px 5px; + text-decoration: none; +} + +a:hover.nav { + background-color: #FFFFCC; + border: 1px solid #CCCC99; + color: #CC3333; + font-weight: bold; + padding: 1px 5px 1px 5px; + text-decoration: none; +} + +a:active.nav { + background-color: #FFFFCC; + border: 1px solid #CCCC99; + color: #D25500; + font-weight: bold; + padding: 1px 5px 1px 5px; + text-decoration: none; +} + +input.icon { + background-position: left; + background-repeat: no-repeat; + font-size : 96%; + font-weight: bold; + padding: 2px 2px 2px 22px; + background-color: #6699CC; + border: 1px outset #666666; + color: #FFFFCC; +} + +input.shelf, a.shelf { + background-image: url(/opac-tmpl/prog/images/addtobasket.gif); +} + +input.clearall, a.clearall { + background-image: url(/opac-tmpl/prog/images/clearbasket.gif); +} + +/* Tabs */ +ul.link-tabs { + list-style-type: none; + margin: 9px 0 -2px 5px; + padding: 0; +} + +ul.link-tabs li { + display: inline; + padding: 0px; +} + +ul.link-tabs li a { + font-weight: bold; + padding: 2px 4px 2px 4px; + text-decoration: none; + border-top: 1px solid #DDDDDD; + border-left : 1px solid #DDDDDD; + border-right : 1px solid #666666; +} + +ul.link-tabs li#power_formButton a, ul.link-tabs li#proximity_formButton a { + padding: 2px 4px 3px 4px; +} + +ul.link-tabs li.off a { + background-color: #EEEEEB; + border-bottom: 1px solid #DDDDDD; +} + +ul.link-tabs li.off a:hover { + padding: 2px 3px 2px 4px; + background-color: #FFFFEC; + border-top: 1px solid #BEBF84; + border-left : 1px solid #BEBF84; + border-right : 2px solid #333333; +} + +ul.link-tabs li.on a { + background-color: #FFFFFF; + border-bottom: 1px solid #FFFFFF; +} + +ul.link-tabs li a.debit { + background-color : #FFFF99; + color : #990033; +} + +div.tab-container { + border : 1px solid #DDDDDD; + margin-top : 4px; + padding : .7em; + width : 90%; +} + +div.message { + border : 1px solid #8ebaff; + padding : .3em; + margin : .3em; + width : 50%; } \ No newline at end of file diff --git a/koha-tmpl/opac-tmpl/prog/en/includes/doc-head-close.inc b/koha-tmpl/opac-tmpl/prog/en/includes/doc-head-close.inc index e4d2c2662e..ca9dfd338a 100644 --- a/koha-tmpl/opac-tmpl/prog/en/includes/doc-head-close.inc +++ b/koha-tmpl/opac-tmpl/prog/en/includes/doc-head-close.inc @@ -35,7 +35,7 @@ var MSG_NO_RECORD_SELECTED = _("No item was selected"); var MSG_NO_RECORD_ADDED = _("No item was added to your book bag"); $(document).ready(function() { - //verify_images(); + verify_images(); }); diff --git a/koha-tmpl/opac-tmpl/prog/en/includes/masthead.inc b/koha-tmpl/opac-tmpl/prog/en/includes/masthead.inc index cf9ace365c..803ef2726f 100644 --- a/koha-tmpl/opac-tmpl/prog/en/includes/masthead.inc +++ b/koha-tmpl/opac-tmpl/prog/en/includes/masthead.inc @@ -4,15 +4,6 @@ @@ -38,3 +29,16 @@ Advanced Search + + + + \ No newline at end of file diff --git a/koha-tmpl/opac-tmpl/prog/en/js/script.js b/koha-tmpl/opac-tmpl/prog/en/js/script.js index ce9f97a721..60fd21bd37 100644 --- a/koha-tmpl/opac-tmpl/prog/en/js/script.js +++ b/koha-tmpl/opac-tmpl/prog/en/js/script.js @@ -1,15 +1,33 @@ -function CheckAll() -{ -count = document.mainform.elements.length; - for (i=0; i < count; i++) - { - if(document.mainform.elements[i].checked == 1){ - document.mainform.elements[i].checked = 0; - } else { - document.mainform.elements[i].checked = 1; +/** + * this function checks all checkbox + * or uncheck all if there are already checked. + */ + function CheckAll(){ + var checkboxes = document.getElementsByTagName('input'); + var nbCheckbox = checkboxes.length; + var check = areAllChecked(); + check = !check; + for(var i=0;iLocation Status Date Due + Last Seen Volume @@ -223,6 +224,7 @@ + &item=">Fix Itemtype 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 8039b73e59..39550177a6 100644 --- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-results.tmpl +++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-results.tmpl @@ -14,7 +14,7 @@
- + @@ -32,7 +32,7 @@

- + -->
@@ -123,11 +123,11 @@ @@ -136,13 +136,13 @@ - +
This Virtual Shelf is empty.

- + - Check All - - + Check All + +

+ "> http://images.amazon.com/images/P/.01.TZZZZZZZ.jpghttp://g-images.amazon.com/images/G/01/x-site/icons/no-img-sm.gif" alt="image" class="thumbnail" /> - " title=""/> + " title="" /> @@ -215,24 +215,17 @@
- &offset="> + &offset=&sort_by=&limit="> << Previous - - + - &offset=&sort_by="> - - + &offset=&sort_by=&limit="> - - &offset="> - Next >> - - + &offset=&sort_by=&limit=">Next >>
@@ -253,7 +246,7 @@ -
Not finding what you're looking for?
Make a purchase suggestion
+
Not finding what you're looking for?
Make a purchase suggestion
Not finding what you're looking for?
Make a purchase suggestion
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 f35e45e9f9..40d3593628 100644 --- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-shelves.tmpl +++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-shelves.tmpl @@ -8,28 +8,32 @@
-

Virtual Shelves /images/caret.gif" width="16" height="16" alt=">" border="0" /> The Virtual Shelf is empty

-
+

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

+ + " /> - + - class="highlight"> - + + + + " /> +
- Check All - + /../images/checkall.gif" alt="Check All" border="0" /> +   Title Author Call No.
+ +
" /> - "> - - /images/.gif" alt="" title="" /> + /../itemtypeimg/.gif" alt="" title="" /> @@ -55,24 +59,14 @@
-
This Virtual Shelf is empty.
- /images/checkall.gif" height="18" width="18" alt="Check All" title="Check All" border="0" />" /> + + " /> - " />
" name="shelf" />
" />
-

-
- - - - - - -
Add an Item to this Virtual Shelf by Barcode
" />" />
-
+ " />
" />
-
@@ -83,7 +77,6 @@

-
@@ -92,8 +85,7 @@

-
-
+ @@ -127,50 +119,59 @@ +

Virtual Shelves

+ -
- -