From 04bb614e52f1224bddf1f9058963960738a50fa8 Mon Sep 17 00:00:00 2001 From: Owen Leonard Date: Thu, 31 Jan 2008 13:43:22 -0600 Subject: [PATCH] Removing some unused include files; Correcting nomenclature for cart; hiding quick search form on advanced search page; Styling user menu links as sidebar tabs. Signed-off-by: Chris Cormack Signed-off-by: Joshua Ferraro --- koha-tmpl/opac-tmpl/prog/en/css/opac.css | 49 ++++++++++++++---- .../includes/doc-head-close-basket-print.inc | 15 ------ .../en/includes/doc-head-close-basket.inc | 25 --------- .../en/includes/doc-head-close-results.inc | 29 ----------- .../prog/en/includes/doc-head-close.inc | 2 +- .../prog/en/includes/masthead-basic.inc | 18 ------- .../opac-tmpl/prog/en/includes/masthead.inc | 4 +- .../opac-tmpl/prog/en/includes/navigation.inc | 2 +- .../prog/en/includes/opac-basket-bottom.inc | 2 - .../opac-tmpl/prog/en/includes/usermenu.inc | 4 +- .../prog/en/modules/opac-ISBDdetail.tmpl | 2 +- .../prog/en/modules/opac-MARCdetail.tmpl | 2 +- .../prog/en/modules/opac-basket.tmpl | 31 +++++------ .../prog/en/modules/opac-detail.tmpl | 2 +- .../prog/en/modules/opac-detailprint.tmpl | 11 ++-- .../prog/en/modules/opac-results.tmpl | 2 +- .../prog/en/modules/opac-sendbasket.tmpl | 4 +- .../prog/en/modules/opac-sendbasketform.tmpl | 12 ++--- .../prog/images/side-tab-gradient-hover.gif | Bin 0 -> 92 bytes .../prog/images/side-tab-gradient.gif | Bin 0 -> 92 bytes 20 files changed, 81 insertions(+), 135 deletions(-) delete mode 100644 koha-tmpl/opac-tmpl/prog/en/includes/doc-head-close-basket-print.inc delete mode 100644 koha-tmpl/opac-tmpl/prog/en/includes/doc-head-close-basket.inc delete mode 100644 koha-tmpl/opac-tmpl/prog/en/includes/doc-head-close-results.inc delete mode 100644 koha-tmpl/opac-tmpl/prog/en/includes/masthead-basic.inc delete mode 100644 koha-tmpl/opac-tmpl/prog/en/includes/opac-basket-bottom.inc create mode 100644 koha-tmpl/opac-tmpl/prog/images/side-tab-gradient-hover.gif create mode 100644 koha-tmpl/opac-tmpl/prog/images/side-tab-gradient.gif diff --git a/koha-tmpl/opac-tmpl/prog/en/css/opac.css b/koha-tmpl/opac-tmpl/prog/en/css/opac.css index 253cf9cff9..1b20e5e7e9 100644 --- a/koha-tmpl/opac-tmpl/prog/en/css/opac.css +++ b/koha-tmpl/opac-tmpl/prog/en/css/opac.css @@ -632,10 +632,6 @@ fieldset.brief div.hint, fieldset.rows div.hint { margin : .4em; } -#menu { - margin-top: 1em; -} - h2 span.hint { font-size: 76%; font-weight : normal; @@ -649,10 +645,6 @@ a.cancel { padding-left : 1em; } -#usermenu { - margin-top : 1em; -} - #toolbar ul { margin : 1em 0 0 0; padding : 0; @@ -1222,4 +1214,43 @@ a#cartmenulink, a#cartmenulink:hover { * html .btn.blue { border-color: #2ae; } * html .btn.green { border-color: #9d4; } * html .btn:hover { border-color: #a00; } - #cartmenulink { margin-right : 1em; } \ No newline at end of file + #cartmenulink { margin-right : 1em; } + + div#menu { + border-right: 1px solid #979797; + font-size : 94%; + margin-right: .5em; + padding-top: 1em; + padding-bottom: 2em; +} + +div#menu li a { + text-decoration: none; + display: block; + background : #EEE url(../../images/side-tab-gradient.gif) repeat-y top right; + border: 1px solid #979797; + font-size: 111%; + margin: .5em 0; + padding: .4em .3em; + margin-right : -1px; +} + +div#menu li a:hover { + background : #E8F0F6 url(../../images/side-tab-gradient-hover.gif) repeat-y top right; +} + +div#menu li.active a:hover { + background-color: #fff; + color : #0000CC; +} + +#menu ul li { + list-style-type: none; +} + +#menu ul li.active a { + background-color: #FFF; + background-image : none; + border-right: 0; + font-weight: bold; +} \ No newline at end of file diff --git a/koha-tmpl/opac-tmpl/prog/en/includes/doc-head-close-basket-print.inc b/koha-tmpl/opac-tmpl/prog/en/includes/doc-head-close-basket-print.inc deleted file mode 100644 index 5f0868dced..0000000000 --- a/koha-tmpl/opac-tmpl/prog/en/includes/doc-head-close-basket-print.inc +++ /dev/null @@ -1,15 +0,0 @@ - - -/includes/favicon.ico" type="image/x-icon" /> - - - - - \ No newline at end of file diff --git a/koha-tmpl/opac-tmpl/prog/en/includes/doc-head-close-basket.inc b/koha-tmpl/opac-tmpl/prog/en/includes/doc-head-close-basket.inc deleted file mode 100644 index 0241f39e8e..0000000000 --- a/koha-tmpl/opac-tmpl/prog/en/includes/doc-head-close-basket.inc +++ /dev/null @@ -1,25 +0,0 @@ - - - -/includes/favicon.ico" type="image/x-icon" /> - - - - /css" /> - - /css/opac.css" /> - - - - - - \ No newline at end of file diff --git a/koha-tmpl/opac-tmpl/prog/en/includes/doc-head-close-results.inc b/koha-tmpl/opac-tmpl/prog/en/includes/doc-head-close-results.inc deleted file mode 100644 index e483ecb7b3..0000000000 --- a/koha-tmpl/opac-tmpl/prog/en/includes/doc-head-close-results.inc +++ /dev/null @@ -1,29 +0,0 @@ - - - -/includes/favicon.ico" type="image/x-icon" /> -/css/" /> - - - - - - - - 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 bdb91e5c23..38820be1a1 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 @@ -33,7 +33,7 @@ var MSG_RECORD_IN_BASKET = _("This item is already in your cart"); var MSG_RECORD_ADDED = _("This item has been added to your cart"); var MSG_NRECORDS_ADDED = _(" item(s) added to your cart"); - var MSG_NRECORDS_IN_BASKET = _("already in the bag"); + var MSG_NRECORDS_IN_BASKET = _("already in your cart"); var MSG_NO_RECORD_SELECTED = _("No item was selected"); var MSG_NO_RECORD_ADDED = _("No item was added to your cart"); var MSG_CONFIRM_DEL_BASKET = "Are you sure you want to empty your cart?" diff --git a/koha-tmpl/opac-tmpl/prog/en/includes/masthead-basic.inc b/koha-tmpl/opac-tmpl/prog/en/includes/masthead-basic.inc deleted file mode 100644 index 60349ef756..0000000000 --- a/koha-tmpl/opac-tmpl/prog/en/includes/masthead-basic.inc +++ /dev/null @@ -1,18 +0,0 @@ -
- - - - diff --git a/koha-tmpl/opac-tmpl/prog/en/includes/masthead.inc b/koha-tmpl/opac-tmpl/prog/en/includes/masthead.inc index 25086a65a2..78180e30b6 100644 --- a/koha-tmpl/opac-tmpl/prog/en/includes/masthead.inc +++ b/koha-tmpl/opac-tmpl/prog/en/includes/masthead.inc @@ -11,7 +11,7 @@
-
+ " name="bib" id="bib" onclick="selRecord(value,checked)" /> @@ -171,21 +171,16 @@ - - + +
- " - name="bib" - id="bib" - onclick="selRecord(value,checked);"> - -
+ " name="bib" id="bib" onclick="selRecord(value,checked);" /> + + -

- ',)"> + ',)"> @@ -200,13 +195,15 @@ - + -

+
- +
+ + \ No newline at end of file diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-detail.tmpl b/koha-tmpl/opac-tmpl/prog/en/modules/opac-detail.tmpl index 8bdda33f77..7abe3f3abf 100755 --- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-detail.tmpl +++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-detail.tmpl @@ -168,7 +168,7 @@
  • '); return false;"> - Add to My Book Bag + Add to My Cart
    • diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-detailprint.tmpl b/koha-tmpl/opac-tmpl/prog/en/modules/opac-detailprint.tmpl index 949d9ba455..ac2ddc985b 100644 --- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-detailprint.tmpl +++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-detailprint.tmpl @@ -1,5 +1,11 @@ Koha Online Catalog › Details for: - + + +/includes/favicon.ico" type="image/x-icon" /> + +
    @@ -61,7 +67,6 @@ Due Date Last Seen Barcode - /images/.gif" align="left" title="" alt="" /> @@ -71,11 +76,11 @@ -
    No copies available.
    +