More work on editions in the OPAC; Need both a staff client and OPAC system pref...

Signed-off-by: Joshua Ferraro <jmf@liblime.com>

diff --git a/C4/Auth.pm b/C4/Auth.pm
index f823824..5db0b8d 100755 (executable)
--- a/C4/Auth.pm
+++ b/C4/Auth.pm
@@ -263,6 +263,7 @@ sub get_template_and_user {
             IndependantBranches     => C4::Context->preference("IndependantBranches"),
                        CircAutocompl => C4::Context->preference("CircAutocompl"),
                        yuipath => C4::Context->preference("yuipath"),
+                       FRBRizeEditions => C4::Context->preference("FRBRizeEditions"),
         );
     }
     else {
@@ -306,7 +307,7 @@ sub get_template_and_user {
             patronimages           => C4::Context->preference("patronimages"),
             mylibraryfirst   => C4::Context->preference("SearchMyLibraryFirst"),
             "BiblioDefaultView".C4::Context->preference("BiblioDefaultView") => 1,
-                       FRBRizeEditions => C4::Context->preference("FRBRizeEditions"),
+                       OPACFRBRizeEditions => C4::Context->preference("OPACFRBRizeEditions"),
         );
     }
     return ( $template, $borrowernumber, $cookie );

diff --git a/koha-tmpl/opac-tmpl/prog/en/css/opac.css b/koha-tmpl/opac-tmpl/prog/en/css/opac.css
index 561837e..23c8835 100644 (file)
--- a/koha-tmpl/opac-tmpl/prog/en/css/opac.css
+++ b/koha-tmpl/opac-tmpl/prog/en/css/opac.css
@@ -919,4 +919,29 @@ td.overdue {
        display:block;
        font-size:0.8em;
        padding:0.5em;
-}
\ No newline at end of file
+}
+/*
+h1#libraryname {
+       border:0pt none;
+       margin:0;
+       padding:0;
+       width:240px;
+}
+h1#libraryname {
+       background:transparent url(http://www.myacpl.org/themes/npl/logo.png) no-repeat scroll 0%;
+       border: 0;
+       margin:0.75em .3em 0.75em .7em;
+       padding:0;
+}
+
+h1#libraryname a {
+       border:0;
+       cursor:pointer;
+       display:block;
+       height:0px !important;
+       margin:0;
+       overflow:hidden;
+       padding:60px 0 0;
+       text-decoration:none;
+       width:240px;
+}*/
\ 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 e505e07..cd378a9 100755 (executable)
--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-detail.tmpl
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-detail.tmpl
@@ -179,7 +179,7 @@
     </li><!-- /TMPL_IF -->
 <!-- TMPL_IF NAME="reviewson" --><li><a href="/cgi-bin/koha/opac-detail.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->#comments">Comments</a></li><!-- /TMPL_IF -->
 
-       <!-- TMPL_IF NAME="FRBRizeEditions" --><li><a href="/cgi-bin/koha/opac-detail.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->#editions">Editions</a></li><!-- /TMPL_IF -->
+       <!-- 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 -->
 
@@ -241,6 +241,7 @@
 </div>
 
 <div id="descriptions" class="tabs-container">
+<!-- TMPL_IF NAME="AmazonContent" --><!-- TMPL_IF NAME="item_description" --><strong>Description (from Amazon.com):</strong><ul><li><!-- TMPL_VAR NAME="item_description" --></li></ul><!-- /TMPL_IF --><!-- /TMPL_IF -->
  <!-- TMPL_IF name="MARCNOTES" -->
         <!-- TMPL_LOOP NAME="MARCNOTES" -->
         <p><!-- TMPL_VAR NAME="marcnote" --></p>
@@ -330,20 +331,20 @@
        </div>
 <!-- /TMPL_IF -->
 
-<!-- TMPL_IF NAME="FRBRizeEditions" --><div id="editions" class="tabs-container">
+<!-- TMPL_IF NAME="OPACFRBRizeEditions" --><div id="editions" class="tabs-container">
 
 <h2>Other Editions of this Work</h2>
 <!-- TMPL_IF NAME="XISBNS" -->
 <ul>
 <!-- TMPL_LOOP NAME="XISBNS" -->
-<li><img src="/opac-tmpl/prog/itemtypeimg/<!-- TMPL_VAR NAME="itemtype" -->.gif" title="<!-- TMPL_VAR NAME="itemtype" -->" />
-<a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->"><!-- TMPL_VAR NAME="title" --></a> by <!-- TMPL_VAR NAME="author" --> &copy;<!-- TMPL_VAR NAME="copyrightdate" --></li>
-<img src="http://images.amazon.com/images/P/<!-- TMPL_VAR NAME="isbn" -->.01._THUMBZZZ_PU_PU-5_.jpg" />
+<li><!-- <img src="/opac-tmpl/prog/itemtypeimg/<!-- TMPL_VAR NAME="itemtype" -->.gif" alt="<!-- TMPL_VAR NAME="itemtype" -->" title="<!-- TMPL_VAR NAME="itemtype" -->" /> -->
+<a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->"><!-- TMPL_VAR NAME="title" --></a><!-- TMPL_IF NAME="author" --> by <!-- TMPL_VAR NAME="author" --><!-- /TMPL_IF --><!-- TMPL_IF NAME="copyrightdate" --> &copy;<!-- TMPL_VAR NAME="copyrightdate" --><!-- /TMPL_IF --></li>
+<!-- <img src="http://images.amazon.com/images/P/<!-- TMPL_VAR NAME="isbn" -->.01._THUMBZZZ_PU_PU-5_.jpg" /> -->
 
-       <!-- TMPL_LOOP NAME=items -->
-       <!-- TMPL_IF NAME="itype" --><img src="/opac-tmpl/prog/itemtypeimg/<!-- TMPL_VAR NAME="itype" -->.gif" title="<!-- TMPL_VAR NAME="itype" -->" /><!-- /TMPL_IF -->
+       <!-- <!-- TMPL_LOOP NAME=items -->
+       <!-- TMPL_IF NAME="itype" --><img src="/opac-tmpl/prog/itemtypeimg/<!-- TMPL_VAR NAME="itype" -->.gif" title="<!-- TMPL_VAR NAME="itype" -->" alt="<!-- TMPL_VAR NAME="itype" -->" /><!-- /TMPL_IF -->
        barcode:<!-- TMPL_VAR NAME="barcode" -->
-       <!-- /TMPL_LOOP -->
+       <!-- /TMPL_LOOP --> -->
 <!-- /TMPL_LOOP -->
 </ul>
 <!-- TMPL_ELSE -->