[Koha-patches] [PATCH] Finishing adding additional markup for increased flexibility in stylesheet customization. Patch also includes some markup corrections, but shouldn't result in any visual changes.

Owen Leonard oleonard at myacpl.org
Sat May 10 17:18:02 CEST 2008 

---
 koha-tmpl/opac-tmpl/prog/en/css/opac.css           |    4 +
 koha-tmpl/opac-tmpl/prog/en/includes/masthead.inc  |    2 +-
 .../opac-tmpl/prog/en/modules/opac-ISBDdetail.tmpl |  243 ++++++++++----------
 .../opac-tmpl/prog/en/modules/opac-MARCdetail.tmpl |   53 +++--
 .../opac-tmpl/prog/en/modules/opac-account.tmpl    |    6 +-
 .../prog/en/modules/opac-addbybiblionumber.tmpl    |    9 +-
 .../opac-tmpl/prog/en/modules/opac-advsearch.tmpl  |    4 +-
 .../prog/en/modules/opac-alert-subscribe.tmpl      |   12 +-
 .../prog/en/modules/opac-authorities-home.tmpl     |    2 +
 .../prog/en/modules/opac-authoritiesdetail.tmpl    |    2 +
 .../modules/opac-authoritiessearchresultlist.tmpl  |    2 +
 .../opac-tmpl/prog/en/modules/opac-browser.tmpl    |    6 +-
 .../opac-tmpl/prog/en/modules/opac-detail.tmpl     |   22 ++-
 .../prog/en/modules/opac-full-serial-issues.tmpl   |    6 +-
 koha-tmpl/opac-tmpl/prog/en/modules/opac-main.tmpl |    6 +-
 .../opac-tmpl/prog/en/modules/opac-passwd.tmpl     |    6 +-
 .../prog/en/modules/opac-readingrecord.tmpl        |   16 +-
 .../opac-tmpl/prog/en/modules/opac-review.tmpl     |    5 +-
 .../prog/en/modules/opac-sendbasketform.tmpl       |    8 +-
 .../prog/en/modules/opac-serial-issues.tmpl        |    6 +-
 .../opac-tmpl/prog/en/modules/opac-shelves.tmpl    |   10 +-
 .../prog/en/modules/opac-showreviews.tmpl          |    4 +-
 .../prog/en/modules/opac-suggestions.tmpl          |    8 +-
 koha-tmpl/opac-tmpl/prog/en/modules/opac-tags.tmpl |   14 +-
 .../prog/en/modules/opac-tags_subject.tmpl         |    2 +
 .../opac-tmpl/prog/en/modules/opac-topissues.tmpl  |    6 +-
 koha-tmpl/opac-tmpl/prog/en/modules/opac-user.tmpl |    4 +-
 .../prog/en/modules/opac-userdetails.tmpl          |    2 +
 .../opac-tmpl/prog/en/modules/opac-userupdate.tmpl |   16 +-
 opac/opac-addbybiblionumber.pl                     |    1 +
 opac/opac-readingrecord.pl                         |   33 +++
 31 files changed, 309 insertions(+), 211 deletions(-)

diff --git a/koha-tmpl/opac-tmpl/prog/en/css/opac.css b/koha-tmpl/opac-tmpl/prog/en/css/opac.css
index 1057438..d6c3364 100644
--- a/koha-tmpl/opac-tmpl/prog/en/css/opac.css
+++ b/koha-tmpl/opac-tmpl/prog/en/css/opac.css
@@ -495,6 +495,10 @@ a .term {
 	font-size : 10pt;
 }
 
+#header-wrapper {
+	background-color: #FFF;
+}
+
 #members {
 	background-color: #fff;
 	font-size : 85%;
diff --git a/koha-tmpl/opac-tmpl/prog/en/includes/masthead.inc b/koha-tmpl/opac-tmpl/prog/en/includes/masthead.inc
index 5163e1c..3f6ab36 100644
--- a/koha-tmpl/opac-tmpl/prog/en/includes/masthead.inc
+++ b/koha-tmpl/opac-tmpl/prog/en/includes/masthead.inc
@@ -1,4 +1,4 @@
-<div id="wrapper" style="background-color:#FFF;"><div id="members">
+<div id="header-wrapper"><div id="members">
   <!-- TMPL_IF NAME="opacuserlogin" -->
 	<ul><!-- TMPL_IF NAME="loggedinusername" --><li><span class="members">Welcome, <a href="/cgi-bin/koha/opac-user.pl"><span class="loggedinusername"><!-- TMPL_LOOP NAME="USER_INFO" --><!-- TMPL_VAR NAME="title" --> <!-- TMPL_VAR NAME="firstname" --> <!-- TMPL_VAR NAME="surname" --><!-- /TMPL_LOOP --></span></a></span></li><li><a class="logout" id="logout" href="/cgi-bin/koha/opac-main.pl?logout.x=1">Log Out</a></li><!-- TMPL_ELSE --><li><a href="/cgi-bin/koha/opac-user.pl">Log in to Your Account</a></li><!-- /TMPL_IF -->
 	</ul>	
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 f892b4a..44867eb 100644
--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-ISBDdetail.tmpl
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-ISBDdetail.tmpl
@@ -14,16 +14,134 @@
 <!-- TMPL_IF NAME="OpacNav" --><div id="doc3" class="yui-t1"><!-- TMPL_ELSE --><div id="doc3" class="yui-t7"><!-- /TMPL_IF -->
    <div id="bd">
 	<div id="yui-main">
-	<div class="yui-b"><div class="yui-ge">
+	<div class="yui-b">
+	<div class="yui-ge">
     <div class="yui-u first">
+	<div class="container">	
 	
 	
     <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">ISBD View</span></span></div>
     <!-- TMPL_VAR name="ISBD" -->
 	
+		<div id="bibliodescriptions" class="toptabs">
+	<ul>   
+	<!-- 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" -->#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 -->
+	</ul>
+
+		<div id="opac-isbd-subscriptions">    <!-- TMPL_IF name="subscriptionsnumber" -->
+	        <h2>
+	            We have <!-- TMPL_VAR name="subscriptionsnumber" --> subscription(s) associated with this title.
+	        </h2>
+	        <!-- TMPL_LOOP Name="subscriptions" -->
+	            <h3>At library: <!-- TMPL_VAR name="branchcode" --> <!-- TMPL_VAR name="notes" --></h3>
+	            <p>Below is a list of the three latest issues :</p>
+	            <!-- TMPL_IF name="subscriptionnotes"-->
+	                <p><!--TMPL_VAR Name="subscriptionnotes"--> </p>
+	            <!-- /TMPL_IF -->
+	            <!--TMPL_IF Name="latestserials"-->
+	            <table>
+	            <tr><th>Issue number</th><th>Date</th><th>Status</th></tr>
+	            <!--TMPL_LOOP Name="latestserials"-->
+	                <tr>
+	                    <td>            <!--TMPL_VAR Name="serialseq"-->
+	                    </td>
+	                    <td>            <!--TMPL_VAR Name="planneddate"-->
+	                    </td>
+	                    <td>            <!--TMPL_IF Name="status1"-->Pending
+	                        <!--TMPL_ELSE -->
+	                            <!-- TMPL_IF Name="status2"-->Arrived
+	                            <!--TMPL_ELSE -->
+	                                <!-- TMPL_IF Name="status3"-->Late
+	                                <!--TMPL_ELSE -->
+	                                    <!-- TMPL_IF Name="status4"-->Missing
+	                                    <!--TMPL_ELSE -->
+	                                        <!-- TMPL_IF Name="status5"-->Not Issued
+	                                        <!--/TMPL_IF-->
+	                                    <!--/TMPL_IF-->
+	                                <!--/TMPL_IF-->
+	                            <!--/TMPL_IF-->
+	                        <!--/TMPL_IF-->
+	                    </td>
+	                </tr>
+	            <!--/TMPL_LOOP -->
+	            </table>
+	            <!-- /TMPL_IF -->
+	        <!-- /TMPL_LOOP -->
+	        <p><a href="/cgi-bin/koha/opac-serial-issues.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->" title="Serial issues">Click here</a> for more information on subscription(s) history</p>
+	    <!-- /TMPL_IF --></div>
+
+	<!-- TMPL_IF NAME="reviewson" -->
+	<div id="comments">
+	<!-- TMPL_IF NAME="reviews" -->
+	        <!--TMPL_LOOP NAME="reviews"-->
+	            <h5>
+	                Comment by
+	                <!--TMPL_VAR NAME="title"-->
+	                <!--TMPL_VAR NAME="firstname"-->
+	                <!--TMPL_VAR NAME="surname"-->
+	            </h5>
+				<small>
+	                <!--TMPL_VAR NAME="datereviewed"-->
+	            </small>
+	        <p>
+	          <!--TMPL_VAR NAME="review" ESCAPE="HTML"-->
+	        </p>
+	        <!--/TMPL_LOOP-->
+	    <!-- TMPL_ELSE  -->
+	        <p>There are no comments for this item.</p>
+	<!-- /TMPL_IF -->
+
+	    <!-- TMPL_IF NAME="loggedinusername" -->
+	       <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 -->
+	        <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" -->
+	<!-- Amazon Reviews -->
+	<div id="opac-isbd-amazonreviews">
+
+	    <!-- TMPL_LOOP NAME="BIBLIO_RESULTS" -->
+	    <!-- TMPL_IF NAME="isbn" -->
+	        <h4><a href="http://www.amazon.com/gp/customer-reviews/write-a-review.html/002-2970817-7876066?%5Fencoding=UTF8&asin=<!-- TMPL_VAR NAME="isbn" -->&amp;store=books">Add your own review</a></h4>
+	    <!-- /TMPL_IF -->
+	    <!-- /TMPL_LOOP --><br/>
+
+	        <!-- TMPL_IF NAME="rating" -->
+	            <h4>Rating (from Amazon.com):</h4>
+	        <div id="starMT"><div id="starFull" style="width:<!-- TMPL_VAR NAME="rating" -->px"></div></div>
+
+	        <!-- TMPL_LOOP NAME="AMAZONREVIEWS" -->
+	            <div class="content_set">
+	            <!-- TMPL_IF NAME="summary" -->
+	            <h4 class="underline">  <!-- TMPL_VAR NAME="summary" --></h4>
+	            <!-- /TMPL_IF -->
+	            <!-- TMPL_IF NAME="comment" -->
+	                <p><!-- TMPL_VAR NAME="comment" -->
+	            </p><!-- /TMPL_IF -->
+	            </div>
+	    <!-- /TMPL_LOOP -->
+	    <!-- TMPL_ELSE -->
+
+	    <p> Sorry, there are no reviews available for this title. </p>
+
+	    <!-- /TMPL_IF -->
+	</div> <!-- itemReviews -->
+	<!-- /TMPL_IF-->
+	</div>
+	</div>
 	</div>
 	<div class="yui-u">
-
+	<div class="container">
 <ul id="action">
 
 <!-- TMPL_UNLESS NAME="norequests" -->
@@ -62,127 +180,14 @@
 <input type="submit" name="save" value="Go" /></form></div>
 </div>
 </div>
-
-<div class="yui-g">
-	<div id="bibliodescriptions" class="toptabs">
-<ul>   
-<!-- 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" -->#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 -->
-</ul>
-
-	<div id="opac-isbd-subscriptions">    <!-- TMPL_IF name="subscriptionsnumber" -->
-        <h2>
-            We have <!-- TMPL_VAR name="subscriptionsnumber" --> subscription(s) associated with this title.
-        </h2>
-        <!-- TMPL_LOOP Name="subscriptions" -->
-            <h3>At library: <!-- TMPL_VAR name="branchcode" --> <!-- TMPL_VAR name="notes" --></h3>
-            <p>Below is a list of the three latest issues :</p>
-            <!-- TMPL_IF name="subscriptionnotes"-->
-                <p><!--TMPL_VAR Name="subscriptionnotes"--> </p>
-            <!-- /TMPL_IF -->
-            <!--TMPL_IF Name="latestserials"-->
-            <table>
-            <tr><th>Issue number</th><th>Date</th><th>Status</th></tr>
-            <!--TMPL_LOOP Name="latestserials"-->
-                <tr>
-                    <td>            <!--TMPL_VAR Name="serialseq"-->
-                    </td>
-                    <td>            <!--TMPL_VAR Name="planneddate"-->
-                    </td>
-                    <td>            <!--TMPL_IF Name="status1"-->Pending
-                        <!--TMPL_ELSE -->
-                            <!-- TMPL_IF Name="status2"-->Arrived
-                            <!--TMPL_ELSE -->
-                                <!-- TMPL_IF Name="status3"-->Late
-                                <!--TMPL_ELSE -->
-                                    <!-- TMPL_IF Name="status4"-->Missing
-                                    <!--TMPL_ELSE -->
-                                        <!-- TMPL_IF Name="status5"-->Not Issued
-                                        <!--/TMPL_IF-->
-                                    <!--/TMPL_IF-->
-                                <!--/TMPL_IF-->
-                            <!--/TMPL_IF-->
-                        <!--/TMPL_IF-->
-                    </td>
-                </tr>
-            <!--/TMPL_LOOP -->
-            </table>
-            <!-- /TMPL_IF -->
-        <!-- /TMPL_LOOP -->
-        <p><a href="/cgi-bin/koha/opac-serial-issues.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->" title="Serial issues">Click here</a> for more information on subscription(s) history</p>
-    <!-- /TMPL_IF --></div>
-	
-<!-- TMPL_IF NAME="reviewson" -->
-<div id="comments">
-<!-- TMPL_IF NAME="reviews" -->
-        <!--TMPL_LOOP NAME="reviews"-->
-            <h5>
-                Comment by
-                <!--TMPL_VAR NAME="title"-->
-                <!--TMPL_VAR NAME="firstname"-->
-                <!--TMPL_VAR NAME="surname"-->
-            </h5>
-			<small>
-                <!--TMPL_VAR NAME="datereviewed"-->
-            </small>
-        <p>
-          <!--TMPL_VAR NAME="review" ESCAPE="HTML"-->
-        </p>
-        <!--/TMPL_LOOP-->
-    <!-- TMPL_ELSE  -->
-        <p>There are no comments for this item.</p>
-<!-- /TMPL_IF -->
-
-    <!-- TMPL_IF NAME="loggedinusername" -->
-       <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 -->
-        <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" -->
-<!-- Amazon Reviews -->
-<div id="opac-isbd-amazonreviews">
-        
-    <!-- TMPL_LOOP NAME="BIBLIO_RESULTS" -->
-    <!-- TMPL_IF NAME="isbn" -->
-        <h4><a href="http://www.amazon.com/gp/customer-reviews/write-a-review.html/002-2970817-7876066?%5Fencoding=UTF8&asin=<!-- TMPL_VAR NAME="isbn" -->&amp;store=books">Add your own review</a></h4>
-    <!-- /TMPL_IF -->
-    <!-- /TMPL_LOOP --><br/>
-
-        <!-- TMPL_IF NAME="rating" -->
-            <h4>Rating (from Amazon.com):</h4>
-        <div id="starMT"><div id="starFull" style="width:<!-- TMPL_VAR NAME="rating" -->px"></div></div>
-
-        <!-- TMPL_LOOP NAME="AMAZONREVIEWS" -->
-            <div class="content_set">
-            <!-- TMPL_IF NAME="summary" -->
-            <h4 class="underline">  <!-- TMPL_VAR NAME="summary" --></h4>
-            <!-- /TMPL_IF -->
-            <!-- TMPL_IF NAME="comment" -->
-                <p><!-- TMPL_VAR NAME="comment" -->
-            </p><!-- /TMPL_IF -->
-            </div>
-    <!-- /TMPL_LOOP -->
-    <!-- TMPL_ELSE -->
-
-    <p> Sorry, there are no reviews available for this title. </p>
-
-    <!-- /TMPL_IF -->
-</div> <!-- itemReviews -->
-<!-- /TMPL_IF-->
 </div>
 
 </div>
 </div>
+<div class="yui-b">
+<div class="container">
+<!--TMPL_INCLUDE NAME="navigation.inc" -->
+</div>
 </div>
-	<!-- TMPL_IF NAME="OpacNav" --><div class="yui-b"><!--TMPL_INCLUDE NAME="navigation.inc" --></div><!-- /TMPL_IF -->
 </div>
 <!-- TMPL_INCLUDE NAME="opac-bottom.inc" -->
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 15066ff..e6620f5 100644
--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-MARCdetail.tmpl
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-MARCdetail.tmpl
@@ -7,8 +7,8 @@
 <!-- TMPL_IF NAME="OpacNav" --><div id="doc3" class="yui-t1"><!-- TMPL_ELSE --><div id="doc3" class="yui-t7"><!-- /TMPL_IF -->
    <div id="bd">
 	<div id="yui-main">
-	<div class="yui-b"><div class="yui-g">
-
+	<div class="yui-b">
+<div class="container"><div class="yui-g">
 <div id="toolbar">
 <ul>
 	<!-- TMPL_UNLESS NAME="norequests" --><!-- TMPL_IF NAME="opacuserlogin" --><!-- 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_IF --><!-- /TMPL_UNLESS -->
@@ -27,8 +27,8 @@
         <tr><th colspan="2"><!-- TMPL_VAR name="tag" --></th></tr>
         <!-- TMPL_LOOP name="subfield" -->
                 <tr>
-                    <td ><!-- TMPL_VAR name="marc_lib" --></td>
-                    <td ><!-- TMPL_VAR name="marc_value" --></td>
+                    <td><!-- TMPL_VAR name="marc_lib" --></td>
+                    <td><!-- TMPL_VAR name="marc_value" --></td>
                 </tr>
             <!-- /TMPL_LOOP -->
         <!-- /TMPL_LOOP -->
@@ -46,8 +46,8 @@
         <tr><th colspan="2"><!-- TMPL_VAR name="tag" --></th></tr>
         <!-- TMPL_LOOP name="subfield" -->
                 <tr>
-                    <td ><!-- TMPL_VAR name="marc_lib" --></td>
-                    <td ><!-- TMPL_VAR name="marc_value" --></td>
+                    <td><!-- TMPL_VAR name="marc_lib" --></td>
+                    <td><!-- TMPL_VAR name="marc_value" --></td>
                 </tr>
             <!-- /TMPL_LOOP -->
         <!-- /TMPL_LOOP -->
@@ -56,18 +56,18 @@
         <tr><th colspan="2"><!-- TMPL_VAR name="tag" --></th></tr>
         <!-- TMPL_LOOP name="subfield" -->
                 <tr>
-                    <td ><!-- TMPL_VAR name="marc_lib" --></td>
-                    <td ><!-- TMPL_VAR name="marc_value" --></td>
+                    <td><!-- TMPL_VAR name="marc_lib" --></td>
+                    <td><!-- TMPL_VAR name="marc_value" --></td>
                 </tr>
             <!-- /TMPL_LOOP -->
         <!-- /TMPL_LOOP -->
 
         <!-- TMPL_LOOP name="4XX" -->
-        <tr><th colspan="2" ><!-- TMPL_VAR name="tag" --></td></tr>
+        <tr><th colspan="2" ><!-- TMPL_VAR name="tag" --></th></tr>
         <!-- TMPL_LOOP name="subfield" -->
                 <tr>
-                    <td ><!-- TMPL_VAR name="marc_lib" --></td>
-                    <td ><!-- TMPL_VAR name="marc_value" --></td>
+                    <td><!-- TMPL_VAR name="marc_lib" --></td>
+                    <td><!-- TMPL_VAR name="marc_value" --></td>
                 </tr>
             <!-- /TMPL_LOOP -->
         <!-- /TMPL_LOOP -->
@@ -76,8 +76,8 @@
         <tr><th colspan="2"><!-- TMPL_VAR name="tag" --></th></tr>
         <!-- TMPL_LOOP name="subfield" -->
                 <tr>
-                    <td ><!-- TMPL_VAR name="marc_lib" --></td>
-                    <td ><!-- TMPL_VAR name="marc_value" --></td>
+                    <td><!-- TMPL_VAR name="marc_lib" --></td>
+                    <td><!-- TMPL_VAR name="marc_value" --></td>
                 </tr>
             <!-- /TMPL_LOOP -->
         <!-- /TMPL_LOOP -->
@@ -86,8 +86,8 @@
         <tr><th colspan="2"><!-- TMPL_VAR name="tag" --></th></tr>
         <!-- TMPL_LOOP name="subfield" -->
                 <tr>
-                    <td ><!-- TMPL_VAR name="marc_lib" --></td>
-                    <td ><!-- TMPL_VAR name="marc_value" --></td>
+                    <td><!-- TMPL_VAR name="marc_lib" --></td>
+                    <td><!-- TMPL_VAR name="marc_value" --></td>
                 </tr>
             <!-- /TMPL_LOOP -->
         <!-- /TMPL_LOOP -->
@@ -96,8 +96,8 @@
         <tr><th colspan="2"><!-- TMPL_VAR name="tag" --></th></tr>
         <!-- TMPL_LOOP name="subfield" -->
                 <tr>
-                    <td ><!-- TMPL_VAR name="marc_lib" --></td>
-                    <td ><!-- TMPL_VAR name="marc_value" --></td>
+                    <td><!-- TMPL_VAR name="marc_lib" --></td>
+                    <td><!-- TMPL_VAR name="marc_value" --></td>
                 </tr>
             <!-- /TMPL_LOOP -->
         <!-- /TMPL_LOOP -->
@@ -106,8 +106,8 @@
         <tr><th colspan="2"><!-- TMPL_VAR name="tag" --></th></tr>
         <!-- TMPL_LOOP name="subfield" -->
                 <tr>
-                    <td ><!-- TMPL_VAR name="marc_lib" --></td>
-                    <td ><!-- TMPL_VAR name="marc_value" --></td>
+                    <td><!-- TMPL_VAR name="marc_lib" --></td>
+                    <td><!-- TMPL_VAR name="marc_value" --></td>
                 </tr>
             <!-- /TMPL_LOOP -->
         <!-- /TMPL_LOOP -->
@@ -116,8 +116,8 @@
         <tr><th colspan="2"><!-- TMPL_VAR name="tag" --></th></tr>
         <!-- TMPL_LOOP name="subfield" -->
                 <tr>
-                    <td ><!-- TMPL_VAR name="marc_lib" --></td>
-                    <td ><!-- TMPL_VAR name="marc_value" --></td>
+                    <td><!-- TMPL_VAR name="marc_lib" --></td>
+                    <td><!-- TMPL_VAR name="marc_value" --></td>
                 </tr>
             <!-- /TMPL_LOOP -->
         <!-- /TMPL_LOOP -->
@@ -139,10 +139,15 @@
                 <!-- /TMPL_LOOP -->
         </table><!-- TMPL_ELSE -->
         <p>No copies available.</p>
-    <!-- /TMPL_IF --></div>
-
+    <!-- /TMPL_IF -->
+</div>
+</div>
+</div>
+</div>
+<div class="yui-b">
+<div class="container">
+<!--TMPL_INCLUDE NAME="navigation.inc" -->
 </div>
 </div>
-	<!-- TMPL_IF NAME="OpacNav" --><div class="yui-b"><!--TMPL_INCLUDE NAME="navigation.inc" --></div><!-- /TMPL_IF -->
 </div>
 <!-- TMPL_INCLUDE NAME="opac-bottom.inc" -->
diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-account.tmpl b/koha-tmpl/opac-tmpl/prog/en/modules/opac-account.tmpl
index 51ca983..1c1bad3 100644
--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-account.tmpl
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-account.tmpl
@@ -8,7 +8,7 @@
    <div id="bd">
 	<div id="yui-main">
 	<div class="yui-b"><div class="yui-g">
-
+		<div class="container">
 <!--CONTENT-->
     <!-- TMPL_LOOP NAME="BORROWER_INFO" -->
         <h3><a href="/cgi-bin/koha/opac-user.pl"><!-- TMPL_VAR NAME="firstname" --> <!-- TMPL_VAR NAME="surname" -->'s account</a> <img src="<!-- TMPL_VAR NAME="themelang" -->../../images/caret.gif" width="16" height="16" alt="&gt;" border="0" /> Fines and Charges</h3>
@@ -48,13 +48,15 @@
     <!-- TMPL_ELSE -->
         <h4>You have no Fines or Charges</h4>
     <!-- /TMPL_IF -->
-    
+</div>
 </div>
 </div>
 </div>
 <div class="yui-b">
+<div class="container">
 <!--TMPL_INCLUDE NAME="navigation.inc" -->
 <!-- TMPL_INCLUDE name="usermenu.inc" -->
 </div>
 </div>
+</div>
 <!-- TMPL_INCLUDE NAME="opac-bottom.inc" -->
\ No newline at end of file
diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-addbybiblionumber.tmpl b/koha-tmpl/opac-tmpl/prog/en/modules/opac-addbybiblionumber.tmpl
index 0d314d5..0617b22 100644
--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-addbybiblionumber.tmpl
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-addbybiblionumber.tmpl
@@ -7,7 +7,7 @@
 </head>
 <body id="addtolist">
 <div id="custom-doc" class="yui-t7">
-
+<div class="container">
 <!-- TMPL_UNLESS NAME="newshelf" --><!-- TMPL_IF NAME="multiple"-->
     <h1>Add <!-- TMPL_VAR NAME="total"--> items to <!-- TMPL_IF NAME="singleshelf" --><em><!-- TMPL_VAR NAME="shelfname" --></em>: <!-- TMPL_ELSE -->a list:<!-- /TMPL_IF --></h1>
 <!-- TMPL_ELSE -->
@@ -23,7 +23,7 @@
 <form name="f1" action="/cgi-bin/koha/opac-addbybiblionumber.pl" method="post">
     <fieldset class="rows"><legend>Select a List</legend>
 <ol><li>    <label for="shelfnumber">Add to list:</label> <!-- TMPL_VAR NAME="CGIvirtualshelves" --></li></ol>
- <!-- TMPL_LOOP NAME="biblios" --> <input type="hidden" name="biblionumber" value="<!-- TMPL_VAR NAME="biblionumber" -->"><!-- /TMPL_LOOP -->
+ <!-- TMPL_LOOP NAME="biblios" --> <input type="hidden" name="biblionumber" value="<!-- TMPL_VAR NAME="biblionumber" -->" /><!-- /TMPL_LOOP -->
     <input type="hidden" name="modifyshelfcontents" value="1" /></fieldset>
     <fieldset class="action"><input type="submit" value="Save" class="submit" /> <a class="close cancel" href="#">Cancel</a></fieldset>
 </form>
@@ -52,14 +52,13 @@
                 <option value="1">Private</option>
                 <option value="2">Public</option>
             </select></li></ol></fieldset>
- <!-- TMPL_LOOP NAME="biblios" --> <input type="hidden" name="biblionumber" value="<!-- TMPL_VAR NAME="biblionumber" -->"><!-- /TMPL_LOOP -->
+ <!-- TMPL_LOOP NAME="biblios" --> <input type="hidden" name="biblionumber" value="<!-- TMPL_VAR NAME="biblionumber" -->" /><!-- /TMPL_LOOP -->
     <fieldset class="action"><input type="submit" value="Save" class="submit" /> <a class="close cancel" href="#">Cancel</a></fieldset>
 </form><!-- /TMPL_UNLESS -->
 
 <p align="center">
-    <br /><br />
     <a href="#" class="close">close this window.</a>
 </p>
-
+</div></div>
 </body>
 </html>
diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-advsearch.tmpl b/koha-tmpl/opac-tmpl/prog/en/modules/opac-advsearch.tmpl
index 85b989a..ba2eb59 100644
--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-advsearch.tmpl
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-advsearch.tmpl
@@ -325,7 +325,7 @@
 </div>
 </div>
 
-<div class="yui-g" style="text-align: center;"><!-- SEARCH BUTTONS -->
+<div class="yui-g" style="text-align: center;"><div class="container"><!-- SEARCH BUTTONS -->
 
     <input class="submit" type="submit" accesskey="s" name="do" title="Search" value="OK" />
     <!-- TMPL_IF NAME="expanded_options" -->
@@ -335,7 +335,7 @@
     <!-- /TMPL_IF -->
     <a href="/cgi-bin/koha/opac-search.pl?do=Clear">[New Search]</a>
 
-<!-- /SEARCH BUTTONS --></div>
+<!-- /SEARCH BUTTONS --></div></div>
 </form>
 
 <script type="text/JavaScript" language="JavaScript">
diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-alert-subscribe.tmpl b/koha-tmpl/opac-tmpl/prog/en/modules/opac-alert-subscribe.tmpl
index 3e725ef..ab0813d 100644
--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-alert-subscribe.tmpl
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-alert-subscribe.tmpl
@@ -7,8 +7,8 @@
 <div id="doc3" class="yui-t1">
 <div id="bd">
     <div id="yui-main">
-    <div class="yui-b"><div class="yui-g">
-    <!-- TMPL_IF name="typeissue" -->
+    <div class="yui-b">
+<div class="container">    <!-- TMPL_IF name="typeissue" -->
         <h1 class="catalogue">Subscribe issue receive warning</h1>
             <form action="opac-alert-subscribe.pl" method="post">
                 <p>Do you want to receive an email when a new issue for this subscription arrives?</p>
@@ -20,7 +20,7 @@
                 <input type="submit" value="Yes">
                 <a href="opac-serial-issues.pl?biblionumber=<!-- TMPL_VAR name="biblionumber" -->" >No</a>
             </form>
-        </div>
+
     <!-- /TMPL_IF -->
     <!-- TMPL_IF name="typeissuecancel" -->
         <h1 class="catalogue">Unsubscribe</h1>
@@ -34,8 +34,10 @@
                 <input type="submit" value="Yes" class="button">
                 <a href="opac-serial-issues.pl?biblionumber=<!-- TMPL_VAR name="biblionumber" -->" class="button">No</a>
             </form>
-        </div>
-    <!-- /TMPL_IF -->
+
+    <!-- /TMPL_IF --></div>
+</div>
+</div>
 </div>
 
 <!-- TMPL_INCLUDE NAME="opac-bottom.inc" -->
diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-authorities-home.tmpl b/koha-tmpl/opac-tmpl/prog/en/modules/opac-authorities-home.tmpl
index 8fe0658..6631621 100644
--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-authorities-home.tmpl
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-authorities-home.tmpl
@@ -75,8 +75,10 @@
 </div>
 </div>
 <div class="yui-b">
+<div class="container">
 <!--TMPL_INCLUDE NAME="navigation.inc" -->
 <!-- TMPL_INCLUDE name="usermenu.inc" -->
 </div>
 </div>
+</div>
 <!-- TMPL_INCLUDE NAME="opac-bottom.inc" -->
diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-authoritiesdetail.tmpl b/koha-tmpl/opac-tmpl/prog/en/modules/opac-authoritiesdetail.tmpl
index c0d48d5..fcbbea6 100644
--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-authoritiesdetail.tmpl
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-authoritiesdetail.tmpl
@@ -80,8 +80,10 @@ function showChildren(mynumber) {
 </div>
 </div>
 <div class="yui-b">
+<div class="container">
 <!--TMPL_INCLUDE NAME="navigation.inc" -->
 <!-- TMPL_INCLUDE name="usermenu.inc" -->
 </div>
 </div>
+</div>
 <!-- TMPL_INCLUDE NAME="opac-bottom.inc" -->
\ No newline at end of file
diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-authoritiessearchresultlist.tmpl b/koha-tmpl/opac-tmpl/prog/en/modules/opac-authoritiessearchresultlist.tmpl
index 383b4c0..0cedc31 100644
--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-authoritiessearchresultlist.tmpl
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-authoritiessearchresultlist.tmpl
@@ -85,8 +85,10 @@
 </div>
 </div>
 <div class="yui-b">
+<div class="container">
 <!--TMPL_INCLUDE NAME="navigation.inc" -->
 <!-- TMPL_INCLUDE name="usermenu.inc" -->
 </div>
 </div>
+</div>
 <!-- TMPL_INCLUDE NAME="opac-bottom.inc" -->
\ No newline at end of file
diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-browser.tmpl b/koha-tmpl/opac-tmpl/prog/en/modules/opac-browser.tmpl
index f114763..92624f3 100644
--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-browser.tmpl
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-browser.tmpl
@@ -8,7 +8,7 @@
    <div id="bd">
 	<div id="yui-main">
 	<div class="yui-b"><div class="yui-g">
-
+<div class="container">
     <h1>Browse our catalogue</h1>
         <!-- TMPL_IF name="HIERARCHY_LOOP" -->
         <ul>
@@ -42,12 +42,14 @@
         <!-- TMPL_ELSE -->
             <div class="warning">The browser table is empty. this feature is not fully set-up. See the <a href="http://wiki.koha.org/doku.php?id=opacbrowser">Koha Wiki</a> for more information on what it does and how to configure it.</div>
         <!-- /TMPL_IF -->
-</div>
+</div></div>
 </div>
 </div>
 <div class="yui-b">
+<div class="container">
 <!--TMPL_INCLUDE NAME="navigation.inc" -->
 <!-- TMPL_INCLUDE name="usermenu.inc" -->
 </div>
 </div>
+</div>
 <!-- TMPL_INCLUDE NAME="opac-bottom.inc" -->
\ 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 6afef41..b46abed 100755
--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-detail.tmpl
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-detail.tmpl
@@ -43,7 +43,7 @@
 	<div id="yui-main">
 	<div class="yui-b"><div class="yui-ge">
     <div class="yui-u first">
-	
+	<div class="container">
 	<div id="catalogue_detail_biblio">
 
 	<div id="bookcover">
@@ -156,7 +156,7 @@
     </span><!-- /TMPL_UNLESS -->
 
     <!-- TMPL_IF name="MARCURLS" -->
-	<span class="results_summary"><span class="label">Online Resources:</span>
+	<div class="results_summary"><span class="label">Online Resources:</span>
     <ul>    <!-- TMPL_LOOP name="MARCURLS" -->
 		<li><!-- TMPL_IF NAME="part" --><!-- TMPL_VAR NAME="part" -->
 			<br /><!-- /TMPL_IF --> 
@@ -167,7 +167,7 @@
 		<!-- TMPL_VAR NAME="linktext" --></a>
 			<!-- TMPL_IF NAME="notes" --><ul><!-- TMPL_LOOP NAME="notes" --><li><!-- TMPL_VAR NAME="note" --></li><!-- /TMPL_LOOP --></ul><!-- /TMPL_IF --></li>
             <!-- /TMPL_LOOP --></ul>
-    </span>
+    </div>
     <!-- /TMPL_IF -->
 <!-- /TMPL_IF -->
 		<!-- TMPL_IF NAME="AuthorisedValueImages" -->
@@ -192,7 +192,7 @@
         <!-- TMPL_IF NAME="TagsInputOnDetail" -->
 		<span class="label" id="addtagl"><a href="#">Add</a></span>
          <form name="tagform<!-- TMPL_VAR NAME="biblionumber" -->" method="post" action="/cgi-bin/koha/opac-tags.pl" id="tagform">
-                <label for="newtag<!-- TMPL_VAR NAME="biblionumber" -->">New:</span><input name="newtag<!-- TMPL_VAR NAME="biblionumber" -->" id="newtag<!-- TMPL_VAR NAME="biblionumber" -->" maxlength="100" />
+                <label for="newtag<!-- TMPL_VAR NAME="biblionumber" -->">New:</label><input name="newtag<!-- TMPL_VAR NAME="biblionumber" -->" id="newtag<!-- TMPL_VAR NAME="biblionumber" -->" maxlength="100" />
                 <input name="tagbutton" class="input tagbutton" type="submit" value="Add" />
 				<a href="#">Cancel</a>
             </form>
@@ -209,7 +209,6 @@
         <span class="label">Enhanced Content:</span><a href="<!-- TMPL_VAR NAME="BakerTaylorContentURL" ESCAPE="HTML" -->">Content Cafe</a>
         </span>
     <!-- /TMPL_IF -->
-
 </div>
 
 <div id="bibliodescriptions" class="toptabs">
@@ -494,11 +493,11 @@
 <!-- /TMPL_IF-->
 
 </div>
-
+</div>
 </div>
 
 <div class="yui-u">
-
+<div class="container">
 <ul id="action">
 
 <!-- TMPL_UNLESS NAME="norequests" -->
@@ -562,10 +561,17 @@
 
 </div>
 </div>
+</div>
 
 
 </div>
 </div>
-	<!-- TMPL_IF NAME="OpacNav" --><div class="yui-b"><!--TMPL_INCLUDE NAME="navigation.inc" --></div><!-- /TMPL_IF -->
+<!-- TMPL_IF NAME="OpacNav" -->
+	<div class="yui-b">
+	<div class="container">
+	<!--TMPL_INCLUDE NAME="navigation.inc" -->
+	</div>
+	</div>
+<!-- /TMPL_IF -->
 </div>
 <!-- TMPL_INCLUDE NAME="opac-bottom.inc" -->
diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-full-serial-issues.tmpl b/koha-tmpl/opac-tmpl/prog/en/modules/opac-full-serial-issues.tmpl
index 1e00579..0ae76ec 100644
--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-full-serial-issues.tmpl
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-full-serial-issues.tmpl
@@ -8,7 +8,7 @@
    <div id="bd">
 	<div id="yui-main">
 	<div class="yui-b"><div class="yui-g">
-
+<div class="container">
 
 <!-- TMPL_UNLESS name="popup" -->
     <h1 class="catalogue">Subscription information for <!-- TMPL_VAR name="bibliotitle" --></h1>
@@ -73,12 +73,14 @@ function showlayer(numlayer)
 }
 
 </script>
-</div>
+</div></div>
 </div>
 </div>
 <div class="yui-b">
+<div class="container">
 <!--TMPL_INCLUDE NAME="navigation.inc" -->
 <!-- TMPL_INCLUDE name="usermenu.inc" -->
 </div>
 </div>
+</div>
 <!-- TMPL_INCLUDE NAME="opac-bottom.inc" -->
\ No newline at end of file
diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-main.tmpl b/koha-tmpl/opac-tmpl/prog/en/modules/opac-main.tmpl
index 8898678..aa663ff 100644
--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-main.tmpl
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-main.tmpl
@@ -100,7 +100,11 @@
 </div>
 </div>
 </div>
-<!-- TMPL_IF NAME="OpacNav" --><div class="yui-b"><!--TMPL_INCLUDE NAME="navigation.inc" --></div><!-- /TMPL_IF -->
+<div class="yui-b">
+<div class="container">
+<!--TMPL_INCLUDE NAME="navigation.inc" -->
+</div>
+</div>
 </div>
 
 <!-- TMPL_INCLUDE NAME="opac-bottom.inc" -->
diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-passwd.tmpl b/koha-tmpl/opac-tmpl/prog/en/modules/opac-passwd.tmpl
index b13e767..2b31cb8 100644
--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-passwd.tmpl
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-passwd.tmpl
@@ -8,7 +8,7 @@
    <div id="bd">
 	<div id="yui-main">
 	<div class="yui-b"><div class="yui-g">
-	
+	<div class="container">
 	<h3><a href="/cgi-bin/koha/opac-user.pl"><!-- TMPL_VAR NAME="firstname" --> <!-- TMPL_VAR NAME="surname" -->'s account</a> <img src="<!-- TMPL_VAR NAME="themelang" -->l../../images/caret.gif" width="16" height="16" alt="&gt;" border="0" /> Change your Password </h3>
 
     <!-- TMPL_IF NAME= "Error_messages" -->
@@ -48,13 +48,15 @@
             <p><input type="submit" class="icon back" value="Return to Your Record" /></p>
         </form>
     <!-- /TMPL_IF -->
-
+</div>
 </div>
 </div>
 </div>
 <div class="yui-b">
+<div class="container">
 <!--TMPL_INCLUDE NAME="navigation.inc" -->
 <!-- TMPL_INCLUDE name="usermenu.inc" -->
 </div>
 </div>
+</div>
 <!-- TMPL_INCLUDE NAME="opac-bottom.inc" -->
diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-readingrecord.tmpl b/koha-tmpl/opac-tmpl/prog/en/modules/opac-readingrecord.tmpl
index aa2b06e..e1055a1 100644
--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-readingrecord.tmpl
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-readingrecord.tmpl
@@ -8,7 +8,7 @@
    <div id="bd">
 	<div id="yui-main">
 	<div class="yui-b"><div class="yui-g">
-
+<div class="container">
 <!--CONTENT-->
 <h3><a href="/cgi-bin/koha/opac-user.pl"><!-- TMPL_VAR NAME="firstname" --> <!-- TMPL_VAR NAME="surname" -->'s account</a> <img src="<!-- TMPL_VAR NAME="themelang" -->../../images/caret.gif" width="16" height="16" alt="&gt;" border="0" /> Checkout History</h3>
 
@@ -30,7 +30,7 @@ You have never borrowed anything from this library.
 </ul>
 <div class="tabs-container"><table id="readingrec">
 <tr>
-<!-- TMPL_IF NAME="AmazonContent" --><th>&nbsp;</th><!-- /TMPL_IF -->
+<!-- TMPL_IF EXPR="AmazonContent||GoogleJackets||BakerTaylorEnabled" --><th>&nbsp;</th><!-- /TMPL_IF -->
 <th><!-- TMPL_UNLESS NAME="orderbytitle" --><a
 href="/cgi-bin/koha/opac-readingrecord.pl?order=title">Title</a><!--
 TMPL_ELSE -->Title<!-- /TMPL_UNLESS --></th>
@@ -42,7 +42,13 @@ TMPL_ELSE -->Title<!-- /TMPL_UNLESS --></th>
 <!-- TMPL_LOOP NAME="READING_RECORD" -->
 
 <!-- TMPL_IF NAME="toggle" --><tr><!-- TMPL_ELSE --><tr class="highlight"><!-- /TMPL_IF -->
-<!-- TMPL_IF NAME="AmazonContent" --><td><!-- TMPL_IF NAME="isbn" --><a href="/cgi-bin/koha/opac-detail.pl?bib=<!-- TMPL_VAR NAME="biblionumber" ESCAPE="URL" -->"><img src="http://images.amazon.com/images/P/<!-- TMPL_VAR name="isbn" -->.01.THUMBZZZ.jpg" alt="Book Cover Image" class="thumbnail" /></a><!-- /TMPL_IF --></td><!-- /TMPL_IF -->
+
+<!-- TMPL_IF NAME="AmazonContent" --><td><a href="http://www.amazon.com/gp/reader/<!-- TMPL_VAR NAME="amazonisbn" -->/ref=sib_dp_pt/002-7879865-0184864#reader-link"><img border="0" src="http://images.amazon.com/images/P/<!-- TMPL_VAR name="amazonisbn" -->.01.THUMBZZZ.jpg" alt="Cover Image" /></a></td><!-- /TMPL_IF -->
+
+    <!-- TMPL_IF NAME="GoogleJackets" --><td><div style="block" title="<!-- TMPL_VAR NAME="biblionumber" ESCAPE="URL" -->" id="<!-- TMPL_VAR NAME="amazonisbn" -->" class="gbs-thumbnail"></div></td><!-- /TMPL_IF -->
+
+    <!-- TMPL_IF NAME="BakerTaylorEnabled" --><td><!-- TMPL_IF NAME="clean_isbn" --><a href="https://<!-- TMPL_VAR NAME="BakerTaylorBookstoreURL" ESCAPE="HTML" --><!-- TMPL_VAR NAME="clean_isbn" -->"><img alt="See Baker &amp; Taylor" src="<!-- TMPL_VAR NAME="BakerTaylorImageURL" ESCAPE="HTML" --><!-- TMPL_VAR NAME="clean_isbn" -->" /></a><!-- /TMPL_IF --></td><!-- /TMPL_IF -->
+
 <td><a href="/cgi-bin/koha/opac-detail.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->"><!-- TMPL_VAR NAME="title" --></a>
                     <span class="item-details">
                         <!-- TMPL_VAR NAME="author" -->
@@ -56,13 +62,15 @@ TMPL_ELSE -->Title<!-- /TMPL_UNLESS --></th>
 </table></div></div>
 
 <!-- /TMPL_UNLESS -->
-
+</div>
 </div>
 </div>
 </div>
 <div class="yui-b">
+<div class="container">
 <!--TMPL_INCLUDE NAME="navigation.inc" -->
 <!-- TMPL_INCLUDE name="usermenu.inc" -->
 </div>
 </div>
+</div>
 <!-- TMPL_INCLUDE NAME="opac-bottom.inc" -->
diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-review.tmpl b/koha-tmpl/opac-tmpl/prog/en/modules/opac-review.tmpl
index 4528d71..42ec0d1 100644
--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-review.tmpl
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-review.tmpl
@@ -6,8 +6,7 @@
 	</head> 
 	<body id="comment"> 
 	<div id="custom-doc" class="yui-t7"> 
-<h3> </h3>
-
+<div class="container">
 <form id="reviewf" action="/cgi-bin/koha/opac-review.pl" method="post"> 
     <input type="hidden" name="biblionumber" value="<!-- TMPL_VAR NAME="biblionumber" -->" />
     <input type="hidden" name="type" value="<!-- TMPL_VAR NAME="type" -->" />
@@ -17,7 +16,7 @@
 		</fieldset>
     <p>Note: Your comment must be approved by a librarian. </p>
 		<fieldset class="action"> <input type="submit" value="Submit and close this window" /> <a class="cancel close" href="#">Cancel</a></fieldset>
-</form>
+</form></div>
 <script type="text/JavaScript" language="JavaScript">
 //<![CDATA[
 	 $(document).ready(function() {
diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-sendbasketform.tmpl b/koha-tmpl/opac-tmpl/prog/en/modules/opac-sendbasketform.tmpl
index ba13e22..80087aa 100644
--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-sendbasketform.tmpl
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-sendbasketform.tmpl
@@ -2,12 +2,12 @@
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
 </head>
 <body style="padding: 1em;" id="sendbasket">
-<!-- TMPL_IF NAME="email_add" -->
+<div class="container"><!-- TMPL_IF NAME="email_add" -->
 
 	<!-- TMPL_IF NAME="SENT" -->
 		<h3>Message Sent</h3>
 	    <p>The cart was sent to: <!-- TMPL_VAR NAME="email_add" --></p>
-		<p><a href="#" onclick="window.close(); return false;">Close window</a></p>
+		<p><a class="close" href="#">Close window</a></p>
 	<!-- /TMPL_IF  -->
 	<!-- TMPL_IF NAME="error" -->
 	<p>Problem sending the cart...</p>
@@ -30,9 +30,9 @@
     <li>
         <input type="hidden" name="bib_list" value="<!-- TMPL_VAR NAME="bib_list" -->" />
     </li></ol></fieldset>
-       <fieldset class="action"> <input type="submit" value="Send" /> <a class="cancel" href="#" onclick="window.close(); return false;">Cancel</a> </fieldset>
+       <fieldset class="action"> <input type="submit" value="Send" /> <a class="cancel close" href="#">Cancel</a> </fieldset>
 </form>
 
-<!-- /TMPL_IF -->
+<!-- /TMPL_IF --></div>
 </body>
 </html>
diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-serial-issues.tmpl b/koha-tmpl/opac-tmpl/prog/en/modules/opac-serial-issues.tmpl
index bbc8a15..b8e1e55 100644
--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-serial-issues.tmpl
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-serial-issues.tmpl
@@ -9,7 +9,7 @@
 	<div id="yui-main">
 	<div class="yui-b"><div class="yui-g">
 
-
+<div class="container">
 <h1>Issues for a subscription</h1>
 	<a href="opac-detail.pl?biblionumber=<!-- TMPL_VAR name="biblionumber" -->" class="button">Normal View</a>
 	<a href="opac-serial-issues.pl?selectview=full&amp;biblionumber=<!-- TMPL_VAR name="biblionumber" -->" class="button">Full History</a>
@@ -115,13 +115,15 @@
     <!-- /TMPL_IF -->
 
 <!-- /TMPL_LOOP -->
-
+</div>
 </div>
 </div>
 </div>
 <div class="yui-b">
+<div class="container">
 <!--TMPL_INCLUDE NAME="navigation.inc" -->
 <!-- TMPL_INCLUDE name="usermenu.inc" -->
 </div>
 </div>
+</div>
 <!-- TMPL_INCLUDE NAME="opac-bottom.inc" -->
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 c5fbbd3..864e0ad 100644
--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-shelves.tmpl
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-shelves.tmpl
@@ -43,7 +43,7 @@ $.tablesorter.addParser({
  <div id="bd">
   <div id="yui-main">
    <div class="yui-b">
-
+<div class="container">
 <!-- TMPL_IF NAME="paramsloop" -->
 <!-- TMPL_LOOP NAME="paramsloop" -->
 <div class="yui-ge">
@@ -273,12 +273,14 @@ $.tablesorter.addParser({
             <fieldset class="action"><input type="hidden" name="category" value="1" /><input type="submit" value="Save" class="submit" /> <a class="cancel" href="/cgi-bin/koha/opac-shelves.pl">Cancel</a></fieldset>
         </form>    </div>
 	<!-- /TMPL_IF --><!-- /showadd -->
-    </div>
+    </div></div>
    </div>
   </div>
   <div class="yui-b">
-<!-- TMPL_INCLUDE NAME="navigation.inc" -->
-<!-- TMPL_INCLUDE NAME="usermenu.inc" -->
+  <div class="container">
+	<!-- TMPL_INCLUDE NAME="navigation.inc" -->
+	<!-- TMPL_INCLUDE NAME="usermenu.inc" -->
+  </div>
   </div>
  </div>
 <!-- </div> -->
diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-showreviews.tmpl b/koha-tmpl/opac-tmpl/prog/en/modules/opac-showreviews.tmpl
index 4d3bf18..f0d1eb9 100644
--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-showreviews.tmpl
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-showreviews.tmpl
@@ -8,7 +8,7 @@
 <div id="doc3" class="yui-t1">
    <div id="bd">
 	<div id="yui-main">
-	<div class="yui-b"><div class="yui-g">
+	<div class="yui-b"><div class="container">
 
 <table>
     <!--TMPL_LOOP NAME="reviews"-->
@@ -30,8 +30,10 @@
 </div>
 </div>
 <div class="yui-b">
+<div class="container">
 <!--TMPL_INCLUDE NAME="navigation.inc" -->
 <!-- TMPL_INCLUDE name="usermenu.inc" -->
 </div>
 </div>
+</div>
 <!-- TMPL_INCLUDE NAME="opac-bottom.inc" -->
diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-suggestions.tmpl b/koha-tmpl/opac-tmpl/prog/en/modules/opac-suggestions.tmpl
index e224c58..76101ab 100644
--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-suggestions.tmpl
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-suggestions.tmpl
@@ -43,7 +43,7 @@ $.tablesorter.addParser({
    <div id="bd">
 	<div id="yui-main">
 	<div class="yui-b"><div class="yui-g">
-
+<div class="container">
 <!-- TMPL_IF name="op_add" -->
     <h1>Enter a new purchase suggestion</h1>
 
@@ -136,19 +136,21 @@ $.tablesorter.addParser({
     </table> <!-- TMPL_IF NAME="loggedinusername" --><fieldset class="action">
                 <input type="submit" value="Delete Checked Items" />
             </fieldset>
-        </tr><!-- /TMPL_IF -->
+        <!-- /TMPL_IF -->
         </form>
     <!-- TMPL_ELSE --><p>There are no pending purchase suggestions.</p><!-- /TMPL_IF -->
 	
 	<!-- TMPL_IF NAME="loggedinusername" --><a href="/cgi-bin/koha/opac-suggestions.pl?op=add">Add a purchase suggestion</a><!-- TMPL_ELSE --><!-- TMPL_IF NAME="AnonSuggestions" --><a href="/cgi-bin/koha/opac-suggestions.pl?op=add">Add a purchase suggestion</a><!-- /TMPL_IF --><!-- /TMPL_IF -->
 <!-- /TMPL_IF -->
-
+</div>
 </div>
 </div>
 </div>
 <div class="yui-b">
+<div class="container">
 <!--TMPL_INCLUDE NAME="navigation.inc" -->
 <!-- TMPL_INCLUDE name="usermenu.inc" -->
 </div>
 </div>
+</div>
 <!-- TMPL_INCLUDE NAME="opac-bottom.inc" -->
diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-tags.tmpl b/koha-tmpl/opac-tmpl/prog/en/modules/opac-tags.tmpl
index 0637aa4..f83b61b 100644
--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-tags.tmpl
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-tags.tmpl
@@ -8,7 +8,7 @@
 <div id="bd">
 <div id="yui-main">
   <div class="yui-b"><div class="yui-g">
-
+	<div class="container">
 	<!-- TMPL_IF NAME="ERRORS" -->
 	<!-- TMPL_LOOP NAME="ERRORS" -->
 		<div class="error">There was a problem with this operation:
@@ -64,13 +64,15 @@
 	<!-- /TMPL_LOOP -->
 	</ul>
 	<!-- /TMPL_IF -->
-
 </div>
 </div>
 </div>
-	<div class="yui-b">
-<!-- TMPL_INCLUDE NAME="navigation.inc"  -->
-<!-- TMPL_INCLUDE NAME="usermenu.inc"    -->
-	</div>
+</div>
+<div class="yui-b">
+<div class="container">
+<!--TMPL_INCLUDE NAME="navigation.inc" -->
+<!-- TMPL_INCLUDE name="usermenu.inc" -->
+</div>
+</div>
 </div>
 <!-- TMPL_INCLUDE NAME="opac-bottom.inc" -->
diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-tags_subject.tmpl b/koha-tmpl/opac-tmpl/prog/en/modules/opac-tags_subject.tmpl
index 1f90ea9..f9d1faa 100644
--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-tags_subject.tmpl
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-tags_subject.tmpl
@@ -27,8 +27,10 @@ subject below to see the items in our collection.</p>
 </div>
 </div>
 <div class="yui-b">
+<div class="container">
 <!--TMPL_INCLUDE NAME="navigation.inc" -->
 <!-- TMPL_INCLUDE name="usermenu.inc" -->
 </div>
 </div>
+</div>
 <!-- TMPL_INCLUDE NAME="opac-bottom.inc" -->
\ No newline at end of file
diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-topissues.tmpl b/koha-tmpl/opac-tmpl/prog/en/modules/opac-topissues.tmpl
index 27ce389..278c84b 100644
--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-topissues.tmpl
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-topissues.tmpl
@@ -20,7 +20,7 @@ $.tablesorter.addParser({
 function Dopop(link) {
     newin=window.open(link,'width=500,height=400,toolbar=false,scrollbars=yes');
 }
-
+//]]>
 </script>
 <style type="text/css">
 	#search-facets fieldset { border: 0; margin: 0;padding:0;}#search-facets ol{padding:.3em;}#search-facets li {list-style-type:none;padding:4px 4px;}#search-facets label{font-weight:bold;display:block;margin:.2em 0;}#search-facets fieldset.action {padding-left:4px;margin:.3em;};
@@ -123,10 +123,10 @@ function Dopop(link) {
 </div>
 </div>
 </div>
-<div class="yui-b">
+<div class="yui-b"><div class="container">
 <!-- TMPL_IF NAME="results_loop" --><!-- TMPL_INCLUDE NAME="opac-topissues.inc" --><!-- /TMPL_IF -->
 <!--TMPL_INCLUDE NAME="navigation.inc" -->
 <!-- TMPL_INCLUDE name="usermenu.inc" -->
-</div>
+</div></div>
 </div>
 <!-- TMPL_INCLUDE NAME="opac-bottom.inc" -->
\ No newline at end of file
diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-user.tmpl b/koha-tmpl/opac-tmpl/prog/en/modules/opac-user.tmpl
index a2e5bb3..114b768 100644
--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-user.tmpl
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-user.tmpl
@@ -344,8 +344,10 @@ No renewals left
 </div>
 </div>
 <div class="yui-b">
+<div class="container">
 <!--TMPL_INCLUDE NAME="navigation.inc" -->
-<!-- TMPL_INCLUDE NAME="usermenu.inc" -->
+<!-- TMPL_INCLUDE name="usermenu.inc" -->
+</div>
 </div>
 </div>
 <!-- TMPL_INCLUDE NAME="opac-bottom.inc" -->
diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-userdetails.tmpl b/koha-tmpl/opac-tmpl/prog/en/modules/opac-userdetails.tmpl
index eaf5216..852c5b0 100644
--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-userdetails.tmpl
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-userdetails.tmpl
@@ -78,8 +78,10 @@ Card Number:</th><td><!-- TMPL_VAR NAME="cardnumber" --></td></tr>
 </div>
 </div>
 <div class="yui-b">
+<div class="container">
 <!--TMPL_INCLUDE NAME="navigation.inc" -->
 <!-- TMPL_INCLUDE name="usermenu.inc" -->
 </div>
 </div>
+</div>
 <!-- TMPL_INCLUDE NAME="opac-bottom.inc" -->
\ No newline at end of file
diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-userupdate.tmpl b/koha-tmpl/opac-tmpl/prog/en/modules/opac-userupdate.tmpl
index 5983543..52c6c95 100644
--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-userupdate.tmpl
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-userupdate.tmpl
@@ -1,6 +1,7 @@
 <!-- TMPL_INCLUDE name="doc-head-open.inc" --><!-- TMPL_IF NAME="LibraryNameTitle" --><!-- TMPL_IF NAME="LibraryNameTitle" --><!-- TMPL_VAR NAME="LibraryNameTitle" --><!-- TMPL_ELSE -->Koha Online<!-- /TMPL_IF --><!-- TMPL_ELSE -->Koha Online<!-- /TMPL_IF --> Catalog &rsaquo;  Updating Details for <!-- TMPL_LOOP name="BORROWER_INFO" --><!-- TMPL_VAR name="firstname" --> <!-- TMPL_VAR name="surname" --><!-- /TMPL_LOOP -->
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
 </head>
+<body>
 <!-- TMPL_INCLUDE name="masthead.inc" -->
 
 <div id="doc3" class="yui-t1">
@@ -8,13 +9,13 @@
 	<div id="yui-main">
 	<div class="yui-b"><div class="yui-g" id="userupdate">
 
+<div class="container" style="overflow:auto;">
 <!-- TMPL_LOOP name="BORROWER_INFO" -->
-
 <h3><a href="/cgi-bin/koha/opac-user.pl"><!-- TMPL_VAR NAME="firstname" --> <!-- TMPL_VAR NAME="surname" -->'s account</a> <img src="<!-- TMPL_VAR NAME="themelang" -->../../images/caret.gif" width="16" height="16" alt="&gt;" border="0" /> Your Personal Details</h3>
 
+<form action="/cgi-bin/koha/opac-userupdate.pl" method="get">
 <div class="yui-u first">
 
-<form action="/cgi-bin/koha/opac-userupdate.pl" method="get">
 <input type="hidden" name="modify" value="yes" />
 <fieldset class="brief"><legend>Name</legend><ol>
 <li><label for="firstname">First Name:</label> <input id="firstname" type="text" value="<!-- TMPL_VAR name="firstname" -->"  name="firstname" /></li>
@@ -25,7 +26,7 @@
 <fieldset class="brief"><legend>Contact Information</legend>
 <ol>
 <li>
-    <label for="streetaddress">Address:</label>
+    <label for="address">Address:</label>
 	<input type="text" name="address" value="<!-- TMPL_VAR NAME="address" -->" id="address" />
 	<input type="text" name="address2" value="<!-- TMPL_VAR NAME="address2" -->" id="address2" /></li>
 <li><label for="city">City, State:</label> <input id="city" type="text" value="<!-- TMPL_VAR name="city" -->"  name="city" /></li>
@@ -46,7 +47,7 @@
 <ol>
 <li>
     <label for="B_streetaddress">Permanent or Alternate Address:</label>
-        <textarea id="B_streetaddress" cols="25"  name="B_streetaddress"><!--TMPL_VAR NAME="B_streetnumber"--> <!-- TMPL_VAR name="B_address" --></textarea>
+        <textarea id="B_streetaddress" cols="25" rows="2" name="B_streetaddress"><!--TMPL_VAR NAME="B_streetnumber"--> <!-- TMPL_VAR name="B_address" --></textarea>
 </li>
 
 <li><label for="B_city">City, State:</label> <input id="B_city" type="text" value="<!-- TMPL_VAR name="B_city" -->"  name="B_city" /></li>
@@ -73,18 +74,19 @@
 <fieldset class="action">
 <p>Please make any necessary changes to your record.  Submitting the form will notify a library staff member, who will make the changes permanent.</p>
 <input type="submit" value="Submit Changes" /> <a class="cancel" href="/cgi-bin/koha/opac-user.pl">Cancel</a></fieldset>
-
 </div>
-</form>
 
+</form>
 <!-- /TMPL_LOOP -->
-
+</div>
 </div>
 </div>
 </div>
 <div class="yui-b">
+<div class="container">
 <!--TMPL_INCLUDE NAME="navigation.inc" -->
 <!-- TMPL_INCLUDE name="usermenu.inc" -->
 </div>
 </div>
+</div>
 <!-- TMPL_INCLUDE NAME="opac-bottom.inc" -->
diff --git a/opac/opac-addbybiblionumber.pl b/opac/opac-addbybiblionumber.pl
index c2b719d..265827c 100755
--- a/opac/opac-addbybiblionumber.pl
+++ b/opac/opac-addbybiblionumber.pl
@@ -87,6 +87,7 @@ else {
     if ( @shelvesloop > 0 ) {
         $CGIvirtualshelves = CGI::scrolling_list (
             -name     => 'shelfnumber',
+            -id     => 'shelfnumber',
             -values   => \@shelvesloop,
             -labels   => \%shelvesloop,
             -size     => 1,
diff --git a/opac/opac-readingrecord.pl b/opac/opac-readingrecord.pl
index e8ba45c..e65351e 100755
--- a/opac/opac-readingrecord.pl
+++ b/opac/opac-readingrecord.pl
@@ -89,6 +89,23 @@ for ( my $i = 0 ; $i < $count ; $i++ ) {
     if ( $i % 2 ) {
         $line{'toggle'} = 1;
     }
+	
+	# XISBN Stuff
+	my $xisbn=$issues->[$i]->{'isbn'};
+	$xisbn =~ /(\d*[X]*)/;
+	$line{amazonisbn} = $1;		# FIXME: so it is OK if the ISBN = 'XXXXX' ?
+	my ($clean, $amazonisbn);
+	$amazonisbn = $1;
+	# these might be overkill, but they are better than the regexp above.
+	if (
+		$amazonisbn =~ /\b(\d{13})\b/ or
+		$amazonisbn =~ /\b(\d{10})\b/ or 
+		$amazonisbn =~ /\b(\d{9}X)\b/i
+	) {
+		$clean = $1;
+		$line{clean_isbn} = $1;
+	}
+	
     $line{biblionumber}   = $issues->[$i]->{'biblionumber'};
     $line{title}          = $issues->[$i]->{'title'};
     $line{author}         = $issues->[$i]->{'author'};
@@ -103,6 +120,22 @@ for ( my $i = 0 ; $i < $count ; $i++ ) {
     push( @loop_reading, \%line );
 }
 
+if (C4::Context->preference('BakerTaylorEnabled')) {
+	$template->param(
+		BakerTaylorEnabled  => 1,
+		BakerTaylorImageURL => &image_url(),
+		BakerTaylorLinkURL  => &link_url(),
+		BakerTaylorBookstoreURL => C4::Context->preference('BakerTaylorBookstoreURL'),
+	);
+}
+
+BEGIN {
+	if (C4::Context->preference('BakerTaylorEnabled')) {
+		require C4::External::BakerTaylor;
+		import C4::External::BakerTaylor qw(&image_url &link_url);
+	}
+}
+
 $template->param(
     count          => $count,
     READING_RECORD => \@loop_reading,
-- 
1.5.2.1

More information about the Koha-patches mailing list