Finalizing new view links; Removing MARC tab from holdings/comments/reviews tab block...

Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
Signed-off-by: Joshua Ferraro <jmf@liblime.com>

diff --git a/koha-tmpl/opac-tmpl/prog/en/css/opac.css b/koha-tmpl/opac-tmpl/prog/en/css/opac.css
index ce14816..07b8801 100644 (file)
--- 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 4893f0c..61847bc 100644 (file)
--- 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 @@
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
 <script type="text/JavaScript" language="JavaScript">
 //<![CDATA[
-        $(document).ready(function() {
-$('#bibliodescriptions > ul').tabs().bind('select.ui-tabs', function(e, ui) {
-   location.href = $.data(ui.tab, 'load.ui-tabs');
-   return false;
-});
-}); 
+       $(document).ready(function() {
+               $('#bibliodescriptions > ul').tabs();
+       }); 
 //]]>
 </script>
 </head>
@@ -21,7 +18,7 @@ $('#bibliodescriptions > ul').tabs().bind('select.ui-tabs', function(e, ui) {
     <div class="yui-u first">
        
        
-   <div> <h1 style="display: inline;">ISBD</h1> <span id="views"><a id="Normalview" href="/cgi-bin/koha/opac-detail.pl?biblionumber=<!-- TMPL_VAR name="biblionumber" -->">[ Normal View ]</a> <a id="MARCview" href="/cgi-bin/koha/opac-MARCdetail.pl?biblionumber=<!-- TMPL_VAR name="biblionumber" -->">[ MARC View ]</a></span></div>
+    <div id="views"> <h1 style="display: inline;">ISBD</h1> <span class="views"><a id="Normalview" href="/cgi-bin/koha/opac-detail.pl?biblionumber=<!-- TMPL_VAR name="biblionumber" -->">[ Normal View ]</a> <a id="MARCview" href="/cgi-bin/koha/opac-MARCdetail.pl?biblionumber=<!-- TMPL_VAR name="biblionumber" -->">[ MARC View ]</a> <span id="ISBDview"  href="/cgi-bin/koha/opac-ISBDdetail.pl?biblionumber=<!-- TMPL_VAR name="biblionumber" -->">ISBD View</span></span></div>
     <!-- TMPL_VAR name="ISBD" -->
        
        </div>
@@ -72,14 +69,8 @@ $('#bibliodescriptions > ul').tabs().bind('select.ui-tabs', function(e, ui) {
 <!-- TMPL_IF name="subscriptionsnumber" --><li>
             <a href="/cgi-bin/koha/opac-ISBDdetail.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->#opac-isbd-subscriptions">Subscriptions</a>
     </li><!-- /TMPL_IF -->
-<!-- TMPL_IF NAME="reviewson" --><li><a href="/cgi-bin/koha/opac-ISBDdetail.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->#opac-isbd-comments">Comments</a></li><!-- /TMPL_IF -->
+<!-- TMPL_IF NAME="reviewson" --><li><a href="/cgi-bin/koha/opac-ISBDdetail.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->#comments">Comments</a></li><!-- /TMPL_IF -->
        <!-- TMPL_IF NAME="AmazonContent" --><li><a href="/cgi-bin/koha/opac-ISBDdetail.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->#opac-isbd-amazonreviews">Amazon Reviews</a></li><!-- /TMPL_IF -->
-
-      <li><a class="external"  href="/cgi-bin/koha/opac-detail.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->">Normal View</a></li>
-
-       <li> <a class="external" href="/cgi-bin/koha/opac-MARCdetail.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->">
-            MARC View
-        </a></li>
 </ul>
 
        <div id="opac-isbd-subscriptions">    <!-- TMPL_IF name="subscriptionsnumber" -->
@@ -125,36 +116,35 @@ $('#bibliodescriptions > ul').tabs().bind('select.ui-tabs', function(e, ui) {
     <!-- /TMPL_IF --></div>
        
 <!-- TMPL_IF NAME="reviewson" -->
-    <div id="opac-isbd-comments"><!-- TMPL_IF NAME="reviews" -->
-    <h2>Reviews by members:</h2>
+<div id="comments">
+<!-- TMPL_IF NAME="reviews" -->
         <!--TMPL_LOOP NAME="reviews"-->
-        <p>
-            <b>
-                Review by
+            <h5>
+                Comment by
                 <!--TMPL_VAR NAME="title"-->
-                <!--TMPL_VAR NAME="surname"-->
                 <!--TMPL_VAR NAME="firstname"-->
-            </b>
-            <br />
-            <small>
+                <!--TMPL_VAR NAME="surname"-->
+            </h5>
+                       <small>
                 <!--TMPL_VAR NAME="datereviewed"-->
             </small>
-        </p>
         <p>
           <!--TMPL_VAR NAME="review"-->
         </p>
-        <br />
         <!--/TMPL_LOOP-->
     <!-- TMPL_ELSE  -->
-        <b>No reviews has been writed on this biblio.</b>
-    <!-- /TMPL_IF -->
+        <p>There are no comments for this item.</p>
+<!-- /TMPL_IF -->
+
     <!-- TMPL_IF NAME="loggedinusername" -->
-        <a href="javascript:Dopop('/cgi-bin/koha/opac-review.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber"-->');">
-            Write or modify your reviews on this biblio.
-        </a>
+       <p> <a href="javascript:Dopop('/cgi-bin/koha/opac-review.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber"-->');">
+            Post or edit your comments on this item.
+        </a></p>
     <!-- TMPL_ELSE -->
-        <br /><a href="/cgi-bin/koha/opac-user.pl">Log in to your account</a> to write a review here.
-    <!-- /TMPL_IF --></div>
+        <p><a href="/cgi-bin/koha/opac-user.pl">Log in to your account</a> to post a comment.</p>
+    <!-- /TMPL_IF -->
+       </div>
+
 <!-- /TMPL_IF -->
 
 <!-- TMPL_IF NAME="AmazonContent" -->

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 d7898b9..69d5d12 100644 (file)
--- 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 @@
 
 <div id="toolbar">
 <ul>
-       <li><a href="/cgi-bin/koha/opac-detail.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->">Normal View</a></li>
-       <!-- TMPL_IF NAME="ISBD" --><li><a href="/cgi-bin/koha/opac-ISBDdetail.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->">ISBD View</a></li><!-- /TMPL_IF -->
        <!-- TMPL_UNLESS NAME="norequests" --><!-- TMPL_IF NAME="RequestOnOpac" --><li><a class="link reserve" href="/cgi-bin/koha/opac-reserve.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->">Place Hold</a></li><!-- /TMPL_IF --><!-- /TMPL_UNLESS -->
        <li><a class="link print" href="/cgi-bin/koha/opac-detailprint.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->" onclick="Dopop('opac-detailprint.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->'); return false;">Print</a></li>
        <!-- TMPL_IF name="virtualshelves" --><!-- TMPL_IF NAME="loggedinusername" --><li><a class="link addtoshelf" href="/cgi-bin/koha/opac-addbybiblionumber.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->" onclick="Dopop('opac-addbybiblionumber.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->'); return false;">Save to Your Lists</a></li><!-- /TMPL_IF --><!-- /TMPL_IF -->
@@ -22,7 +20,7 @@
 </div>
 
     <div class="yui-g" style="margin-top : 1em;">
-       <div><h1 style="display: inline;">MARC View</h1> <span id="views"><a id="Normalview" href="/cgi-bin/koha/opac-detail.pl?biblionumber=<!-- TMPL_VAR name="biblionumber" -->">[ Normal View ]</a> <a id="ISBDview"  href="/cgi-bin/koha/opac-ISBDdetail.pl?biblionumber=<!-- TMPL_VAR name="biblionumber" -->">[ ISBD View ]</a></span></div>
+       <div id="views"><h1 style="display: inline;">MARC View</h1> <span class="views"><a id="Normalview" href="/cgi-bin/koha/opac-detail.pl?biblionumber=<!-- TMPL_VAR name="biblionumber" -->">Normal View</a> <span id="MARCview" href="/cgi-bin/koha/opac-MARCdetail.pl?biblionumber=<!-- TMPL_VAR name="biblionumber" -->">MARC View</span> <!-- TMPL_IF NAME="ISBD" --><a id="ISBDview"  href="/cgi-bin/koha/opac-ISBDdetail.pl?biblionumber=<!-- TMPL_VAR name="biblionumber" -->">ISBD View</a><!-- /TMPL_IF --></span></div>
        <table id="marc">
         <!-- TMPL_LOOP name="0XX" -->
         <tr><th colspan="2"><!-- TMPL_VAR name="tag" --></th></tr>

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 26dfad5..64344ae 100755 (executable)
--- 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 @@
 <script type="text/JavaScript" language="JavaScript">
 //<![CDATA[
         $(document).ready(function() {
-$('#bibliodescriptions > ul').tabs().bind('select.ui-tabs', function(e, ui) {
-   location.href = $.data(ui.tab, 'load.ui-tabs');
-   return false;
-});
-}); 
+               $('#bibliodescriptions > ul').tabs();
+       }); 
 //]]>
 </script>
 </head>
@@ -29,7 +26,7 @@ $('#bibliodescriptions > ul').tabs().bind('select.ui-tabs', function(e, ui) {
         <img border="0" src="http://g-images.amazon.com/images/G/01/x-site/icons/no-img-sm.gif" alt="Cover Image" />
         <!-- /TMPL_IF --></div>
 <!-- /TMPL_IF -->
-   <div id="views"> <h1 style="display: inline"><!-- TMPL_VAR NAME="title" --> <!-- TMPL_IF NAME="subtitle" --> <span class="subtitle"><!-- TMPL_VAR NAME="subtitle" --></span><!-- /TMPL_IF --></h1> <span class="views"><span id="Normalview">Normal View</span> <a id="MARCview" href="/cgi-bin/koha/opac-MARCdetail.pl?biblionumber=<!-- TMPL_VAR name="biblionumber" -->">MARC View</a> <a id="ISBDview"  href="/cgi-bin/koha/opac-ISBDdetail.pl?biblionumber=<!-- TMPL_VAR name="biblionumber" -->">ISBD View</a></span></div>
+   <div id="views"> <h1 style="display: inline"><!-- TMPL_VAR NAME="title" --> <!-- TMPL_IF NAME="subtitle" --> <span class="subtitle"><!-- TMPL_VAR NAME="subtitle" --></span><!-- /TMPL_IF --></h1> <span class="views"><span id="Normalview">Normal View</span> <a id="MARCview" href="/cgi-bin/koha/opac-MARCdetail.pl?biblionumber=<!-- TMPL_VAR name="biblionumber" -->">MARC View</a> <!-- TMPL_IF NAME="ISBD" --><a id="ISBDview" href="/cgi-bin/koha/opac-ISBDdetail.pl?biblionumber=<!-- TMPL_VAR name="biblionumber" -->">ISBD View</a><!-- /TMPL_IF --></span></div>
     <!-- TMPL_IF NAME="author" --><h2 class="author">By <a href="/cgi-bin/koha/opac-search.pl?q=au:<!-- TMPL_VAR NAME="author" -->"><!-- TMPL_VAR NAME="author" --></a></h2><!-- /TMPL_IF -->
     <p>
         [
@@ -206,13 +203,6 @@ $('#bibliodescriptions > ul').tabs().bind('select.ui-tabs', function(e, ui) {
        <!-- TMPL_IF NAME="OPACFRBRizeEditions" --><li><a href="/cgi-bin/koha/opac-detail.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->#editions">Editions</a></li><!-- /TMPL_IF -->
        
        <!-- TMPL_IF NAME="AmazonContent" --><li><a href="/cgi-bin/koha/opac-detail.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->#amazonreviews">Amazon Reviews</a></li><!-- /TMPL_IF -->
-
-        <!-- TMPL_IF NAME="ISBD" --><li><a href="/cgi-bin/koha/opac-ISBDdetail.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->">ISBD View</a></li><!-- /TMPL_IF -->
-
-       <li> <a class="external" href="/cgi-bin/koha/opac-MARCdetail.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->">
-            MARC View
-        </a></li>
-       <li></li>
 </ul>
 
 <div id="holdings">

diff --git a/koha-tmpl/opac-tmpl/prog/images/isbd.gif b/koha-tmpl/opac-tmpl/prog/images/isbd.gif
new file mode 100644 (file)
index 0000000..6a031df
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 (file)
index 0000000..4441f58
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 (file)
index 0000000..34012c1
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 773d5e9..a694c21 100755 (executable)
--- 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,