From: Owen Leonard Date: Mon, 3 Mar 2008 05:27:00 +0000 (+1300) Subject: Finalizing new view links; Removing MARC tab from holdings/comments/reviews tab block... X-Git-Tag: v3.00.00-beta~211 X-Git-Url: http://git.rot13.org/?a=commitdiff_plain;h=1fd2b1d36344663272b4a4dba06b67989a139d5b;p=koha.git Finalizing new view links; Removing MARC tab from holdings/comments/reviews tab block (also fixes broken tab behavior introduced in my last tab update) Signed-off-by: Chris Cormack Signed-off-by: Joshua Ferraro --- diff --git a/koha-tmpl/opac-tmpl/prog/en/css/opac.css b/koha-tmpl/opac-tmpl/prog/en/css/opac.css index ce14816807..07b880112b 100644 --- a/koha-tmpl/opac-tmpl/prog/en/css/opac.css +++ b/koha-tmpl/opac-tmpl/prog/en/css/opac.css @@ -1202,7 +1202,10 @@ div#menu li.active a:hover { #searchsubmit { cursor : default; font-size : 87%; - margin-top : -.1em; + font-weight : normal; + margin-top : 0; + margin-left : .2em; + padding: 2px 2px 1px 2px; } #export { @@ -1424,17 +1427,32 @@ ul.ui-tabs-nav li.ui-tabs-selected a, ul.ui-tabs-nav li.ui-tabs-selected span.a margin-left : .7em; } +#bibliodescriptions { + margin-top : .5em; +} + a#MARCview, span#MARCview, a#ISBDview, span#ISBDview, a#Normalview, span#Normalview { - background-image : url(../../images/doc.gif); background-position : 5px 3px; background-repeat : no-repeat; font-size : 87%; font-weight : normal; padding : .2em .5em; - padding-left : 15px; text-decoration: none; } +a#MARCview, span#MARCview { + background-image : url(../../images/marc.gif); + padding-left : 17px; +} +a#ISBDview, span#ISBDview { + background-image : url(../../images/isbd.gif); + padding-left : 20px; +} +a#Normalview, span#Normalview { + background-image : url(../../images/normal.gif); + padding-left : 15px; +} + a#MARCview, a#ISBDview, a#Normalview { background-color : #F3F3F3; border-left : 1px solid #E8E8E8; diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-ISBDdetail.tmpl b/koha-tmpl/opac-tmpl/prog/en/modules/opac-ISBDdetail.tmpl index 4893f0c479..61847bc542 100644 --- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-ISBDdetail.tmpl +++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-ISBDdetail.tmpl @@ -2,12 +2,9 @@ @@ -21,7 +18,7 @@ $('#bibliodescriptions > ul').tabs().bind('select.ui-tabs', function(e, ui) {
-

ISBD

">[ Normal View ] ">[ MARC View ]
+
@@ -72,14 +69,8 @@ $('#bibliodescriptions > ul').tabs().bind('select.ui-tabs', function(e, ui) {
  • #opac-isbd-subscriptions">Subscriptions
    • -
  • #opac-isbd-comments">Comments
    • +
  • #comments">Comments
  • #opac-isbd-amazonreviews">Amazon Reviews
    • - -
  • ">Normal View
    • - -
  • "> - MARC View -
    • @@ -125,36 +116,35 @@ $('#bibliodescriptions > ul').tabs().bind('select.ui-tabs', function(e, ui) {
    -
    -

    Reviews by members:

    +
    + -

    - - Review by +

    + Comment by - - -
    - + +
    + -

    -
    - No reviews has been writed on this biblio. - +

    There are no comments for this item.

    + + - ');"> - Write or modify your reviews on this biblio. - +

    ');"> + Post or edit your comments on this item. +

    -
    Log in to your account to write a review here. -
    +

    Log in to your account to post a comment.

    + +
    + diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-MARCdetail.tmpl b/koha-tmpl/opac-tmpl/prog/en/modules/opac-MARCdetail.tmpl index d7898b9252..69d5d128cd 100644 --- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-MARCdetail.tmpl +++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-MARCdetail.tmpl @@ -11,8 +11,6 @@
    - +

    MARC View

    ">Normal View ">MARC View ">ISBD View
    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 26dfad5c10..64344ae89a 100755 --- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-detail.tmpl +++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-detail.tmpl @@ -3,11 +3,8 @@ @@ -29,7 +26,7 @@ $('#bibliodescriptions > ul').tabs().bind('select.ui-tabs', function(e, ui) { Cover Image - +

    By ">

    [ @@ -206,13 +203,6 @@ $('#bibliodescriptions > ul').tabs().bind('select.ui-tabs', function(e, ui) {

  • #editions">Editions
  • #amazonreviews">Amazon Reviews
    • - -
  • ">ISBD View
    • - -
  • "> - MARC View -
    • -
  • diff --git a/koha-tmpl/opac-tmpl/prog/images/isbd.gif b/koha-tmpl/opac-tmpl/prog/images/isbd.gif new file mode 100644 index 0000000000..6a031dfa69 Binary files /dev/null and b/koha-tmpl/opac-tmpl/prog/images/isbd.gif differ diff --git a/koha-tmpl/opac-tmpl/prog/images/marc.gif b/koha-tmpl/opac-tmpl/prog/images/marc.gif new file mode 100644 index 0000000000..4441f5823b Binary files /dev/null and b/koha-tmpl/opac-tmpl/prog/images/marc.gif differ diff --git a/koha-tmpl/opac-tmpl/prog/images/normal.gif b/koha-tmpl/opac-tmpl/prog/images/normal.gif new file mode 100644 index 0000000000..34012c136b Binary files /dev/null and b/koha-tmpl/opac-tmpl/prog/images/normal.gif differ diff --git a/opac/opac-detail.pl b/opac/opac-detail.pl index 773d5e9a58..a694c21e88 100755 --- a/opac/opac-detail.pl +++ b/opac/opac-detail.pl @@ -151,6 +151,11 @@ foreach ( @$reviews ) { $_->{datereviewed} = format_date($_->{datereviewed}); } + +if(C4::Context->preference("ISBD")) { + $template->param(ISBD => 1); +} + $template->param( ITEM_RESULTS => \@items, subscriptionsnumber => $subscriptionsnumber,