Synching with default tempalte, other cosmetic changes

diff --git a/koha-tmpl/opac-tmpl/npl/en/opac-ISBDdetail.tmpl b/koha-tmpl/opac-tmpl/npl/en/opac-ISBDdetail.tmpl
index 0d8a5e8..6d30947 100644 (file)
--- a/koha-tmpl/opac-tmpl/npl/en/opac-ISBDdetail.tmpl
+++ b/koha-tmpl/opac-tmpl/npl/en/opac-ISBDdetail.tmpl
@@ -2,26 +2,28 @@
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
 <!--TMPL_INCLUDE NAME="masthead.inc" -->
 <!--TMPL_INCLUDE NAME="navigation.inc" -->
-<link rel="stylesheet" type="text/css" href="<!-- TMPL_VAR name="themelang" -->/includes/marc-editor.css">
-<div id="bibliomenu">
-       <a href="opac-detail.pl?bib=<!-- TMPL_VAR name="biblionumber" -->" class="button catalogue">
-               Normal
-       </a>
-       <a href="opac-MARCdetail.pl?bib=<!-- TMPL_VAR name="biblionumber" -->" class="button">
-               MARC
-       </a>
-       <a href="javascript:Dopop('detailprint.pl?bib=<!-- TMPL_VAR name="biblionumber" -->')" class="button catalogue">
-               Print
-       </a>
+
+<div id="main">
+       <div class="details"><h3>ISBD</h3>
+       <p><!-- TMPL_VAR name="ISBD" --></p>
+       
        <!-- TMPL_UNLESS NAME="norequests" -->
-               <a class="button" href="/cgi-bin/koha/opac-reserve.pl?bib=<!-- TMPL_VAR NAME="biblionumber" ESCAPE=URL -->">
-                       Request
-               </a>
-       <!-- /TMPL_UNLESS -->
-</div>
+    <form action="/cgi-bin/koha/opac-reserve.pl" method="post" class="inline">
+    <input type="submit" name="submit"  value="Place Reserve" class="submit" />
+    <input type="hidden" name="bib" value="<!-- TMPL_VAR NAME="biblionumber" -->" />
+    </form>
+<!-- /TMPL_UNLESS -->
+
+<form class="inline" action="opac-MARCdetail.pl" method="get"><input type="hidden" name="bib" value="<!-- TMPL_VAR name="biblionumber" -->" /><input type="submit" class="icon detail" value="MARC View" /></form>
+
+<form class="inline" action="opac-detail.pl" method="get"><input type="hidden" name="bib" value="<!-- TMPL_VAR name="biblionumber" -->" /><input type="submit" class="icon brief" value="Simple View" /></form>
 
-<div id="mainbloc">
-       <p>ISBD : <!-- TMPL_VAR name="ISBD" --></p>
+<form class="inline" action="opac-detailprint.pl" method="get"><input type="hidden" name="bib" value="<!-- TMPL_VAR name="biblionumber" -->" /><input type="submit" class="icon print" value="Print" onclick="Dopop('opac-detailprint.pl?bib=<!-- TMPL_VAR name="biblionumber" -->'); return false;"/></form>
+
+<form class="inline" action="opac-addbookbybiblionumber.pl" method="get"><input type="hidden" name="biblionumber" value="<!-- TMPL_VAR NAME="biblionumber" -->" /><input type="submit" class="icon shelf" value="Add to Shelf" onclick="Dopop('opac-addbookbybiblionumber.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->'); return false;" /></form>
+
+<form class="inline"><input type="submit" class="icon cart" onclick="addRecord('<!-- TMPL_VAR NAME="biblionumber" ESCAPE="URL" -->'); return false;" value="Add to Book Bag" /></form>
+</div>
 </div>
 </body>
 </html>

diff --git a/koha-tmpl/opac-tmpl/npl/en/opac-MARCdetail.tmpl b/koha-tmpl/opac-tmpl/npl/en/opac-MARCdetail.tmpl
index 0903301..9c5c759 100644 (file)
--- a/koha-tmpl/opac-tmpl/npl/en/opac-MARCdetail.tmpl
+++ b/koha-tmpl/opac-tmpl/npl/en/opac-MARCdetail.tmpl
@@ -5,19 +5,19 @@
 
 <div id="main">
 <h2>MARC View</h2>
-<TMPL_UNLESS NAME="norequests">
+<!-- TMPL_UNLESS NAME="norequests" -->
     <form action="/cgi-bin/koha/opac-reserve.pl" method="post" class="inline">
-    <input type="submit" name="submit"  VALUE="Place Reserve" class="submit" />
+    <input type="submit" name="submit"  VALUE="Place Reserve" class="icon reserve" />
     <input type="hidden" name="bib" value="<!-- TMPL_VAR NAME="biblionumber" -->" />
     </form>
-</TMPL_UNLESS>
+<!-- /TMPL_UNLESS -->
 <!-- <form class="inline" action="opac-ISBDdetail.pl" method="get"><input type="hidden" name="bib" value="<!-- TMPL_VAR name="biblionumber" -->" /><input type="submit" class="isbd" value="ISBD" /></form> -->
 
-<form class="inline" action="opac-detail.pl" method="get"><input type="hidden" name="bib" value="<!-- TMPL_VAR name="biblionumber" -->" /><input type="submit" class="brief" value="Normal View" /></form>
+<form class="inline" action="opac-detail.pl" method="get"><input type="hidden" name="bib" value="<!-- TMPL_VAR name="biblionumber" -->" /><input type="submit" class="icon brief" value="Normal View" /></form>
 
-<!-- <form class="inline" action="detailprint.pl" method="get"><input type="hidden" name="bib" value="<!-- TMPL_VAR name="biblionumber" -->" /><input type="submit" class="print" value="Print" onclick="Dopop('detailprint.pl?bib=<!-- TMPL_VAR name="biblionumber" -->'); return false;"/></form> -->
+<form class="inline" action="opac-detailprint.pl" method="get"><input type="hidden" name="bib" value="<!-- TMPL_VAR name="biblionumber" -->" /><input type="submit" class="icon print" value="Print" /></form>
 
-<form class="inline"><input type="submit" class="cart" onclick="addRecord('<!-- TMPL_VAR NAME="biblionumber" ESCAPE="URL" -->'); return false;" value="Add to Book Bag" /></form>
+<form class="inline"><input type="submit" class="icon cart" onclick="addRecord('<!-- TMPL_VAR NAME="biblionumber" ESCAPE="URL" -->'); return false;" value="Add to Book Bag" /></form>
 <div class="table">
                <table><!-- TMPL_LOOP name="0XX" -->
                <tr><td colspan="3" class="marctag"><!-- TMPL_VAR name="tag" --></td></tr>
@@ -119,7 +119,7 @@
                        <!-- /TMPL_LOOP -->
                <!-- /TMPL_LOOP -->
        </table>
-       
+<!-- TMPL_IF NAME="item_header_loop" -->
                <table>
                <caption>Copies</caption>
                                <tr>
@@ -134,7 +134,11 @@
                                                <!-- TMPL_VAR name="item_value" -->
                                        </tr>
                                <!-- /TMPL_LOOP -->
+               </table><!-- TMPL_ELSE -->
+               <table>
+                       <tr><td>No copies available.</td></tr>
                </table>
+       <!-- /TMPL_IF -->
 </div>
 </div>
 </body>

diff --git a/koha-tmpl/opac-tmpl/npl/en/opac-addbookbybiblionumber.tmpl b/koha-tmpl/opac-tmpl/npl/en/opac-addbookbybiblionumber.tmpl
new file mode 100644 (file)
index 0000000..c80db47
--- /dev/null
+++ b/koha-tmpl/opac-tmpl/npl/en/opac-addbookbybiblionumber.tmpl
@@ -0,0 +1,22 @@
+<!-- TMPL_INCLUDE Name="popup-top.inc" -->
+<div id="mainbloc">
+<h1>Add book to bookshelf</h1> 
+<p><label>Title</label><!-- TMPL_VAR NAME="title" --></p>
+<p><label>Author</label><!-- TMPL_VAR NAME="author" --></p>
+<h2>Select bookshelf</h2>
+<form>
+       <p><label>Add to virtual shelf</label><!-- TMPL_VAR NAME="CGIbookshelves" --></p>
+</form>
+<form>
+<h2>or add to a new bookshelf</h2>
+       <p><input type="text" name="newbookshelf" maxlength=40 size=40>
+       <input type="hidden" name="biblionumber" value="<!-- TMPL_VAR NAME="biblionumber" -->">
+               <select name="category">
+                       <option value="1">Private</option>
+                       <option value="2">Public</option>
+                       <option value="3">Free</option>
+               </select>
+       </p>
+       <input type="submit" value="Add to virtual shelf" class="button catalogue">
+</form>
+<!-- TMPL_INCLUDE Name="popup-bottom.inc" -->

diff --git a/koha-tmpl/opac-tmpl/npl/en/opac-detail.tmpl b/koha-tmpl/opac-tmpl/npl/en/opac-detail.tmpl
index fd5a895..5311390 100644 (file)
--- a/koha-tmpl/opac-tmpl/npl/en/opac-detail.tmpl
+++ b/koha-tmpl/opac-tmpl/npl/en/opac-detail.tmpl
@@ -34,11 +34,9 @@
 <!-- TMPL_IF NAME="marcnotes" -->
 <tr><th>Notes:</th><td><ul><!-- TMPL_LOOP NAME="MARCNOTES" --><li><!-- TMPL_VAR NAME="marcnotes" --></li><!-- /TMPL_LOOP --></ul></td></tr>
        <!-- /TMPL_IF -->
-               <!-- TMPL_IF NAME="subjects" -->        
-               <tr><th>Subject(s):</th><td> <!-- TMPL_LOOP NAME="SUBJECTS" -->
-       : <a href="http://koha.athenscounty.lib.oh.us/cgi-bin/koha/opac-searchresults.pl?subjectitems=<!-- TMPL_VAR NAME="SUBJECTS" ESCAPE="URL" -->"><!-- TMPL_VAR NAME=SUBJECTS --></a>  
-       <!-- /TMPL_LOOP --></td></tr>
-               <!-- /TMPL_IF -->
+<!-- TMPL_IF name="subjects" -->
+               <!-- TMPL_LOOP name="subjects" -->
+               <tr><th>Subject(s):</th><td><a href="/cgi-bin/koha/opac-search.pl?op=do_search&amp;marclist=bibliosubject.subject&and_or=and&operator=contains&value=<!-- TMPL_VAR NAME="subject" escape="HTML"-->"><!-- TMPL_VAR NAME="subject" --></a></td></tr><!-- /TMPL_LOOP --><!-- /TMPL_IF -->
 <!-- <tr><th>Biblio Record:</th><td><!-- TMPL_VAR NAME="biblionumber" --></td></tr> -->
 </table>
 
@@ -71,17 +69,20 @@
        <!-- /TMPL_IF -->
        </table>
 
-<TMPL_UNLESS NAME="norequests">
+<!-- TMPL_UNLESS NAME="norequests" -->
     <form action="/cgi-bin/koha/opac-reserve.pl" method="post" class="inline">
-    <input type="submit" name="submit"  VALUE="Place Reserve" class="submit" />
+    <input type="submit" name="submit"  value="Place Reserve" class="icon reserve" />
     <input type="hidden" name="bib" value="<!-- TMPL_VAR NAME="biblionumber" -->" />
     </form>
-</TMPL_UNLESS>
-<!--  <form class="inline" action="opac-ISBDdetail.pl" method="get"><input type="hidden" name="bib" value="<!-- TMPL_VAR name="biblionumber" -->" /><input type="submit" class="isbd" value="ISBD" /></form> -->
+<!-- /TMPL_UNLESS -->
 
-<!-- <form class="inline" action="opac-MARCdetail.pl" method="get"><input type="hidden" name="bib" value="<!-- TMPL_VAR name="biblionumber" -->" /><input type="submit" class="detail" value="MARC View" /></form> -->
+<form class="inline" action="opac-MARCdetail.pl" method="get"><input type="hidden" name="bib" value="<!-- TMPL_VAR name="biblionumber" -->" /><input type="submit" class="icon detail" value="MARC View" /></form>
 
-<!-- <form class="inline" action="detailprint.pl" method="get"><input type="hidden" name="bib" value="<!-- TMPL_VAR name="biblionumber" -->" /><input type="submit" class="print" value="Print" onclick="Dopop('detailprint.pl?bib=<!-- TMPL_VAR name="biblionumber" -->'); return false;"/></form> -->
+<form class="inline" action="opac-ISBDdetail.pl" method="get"><input type="hidden" name="bib" value="<!-- TMPL_VAR name="biblionumber" -->" /><input type="submit" class="icon isbd" value="ISBD" /></form>
+
+<form class="inline" action="opac-detailprint.pl" method="get"><input type="hidden" name="bib" value="<!-- TMPL_VAR name="biblionumber" -->" /><input type="submit" class="icon print" value="Print" onclick="Dopop('opac-detailprint.pl?bib=<!-- TMPL_VAR name="biblionumber" -->'); return false;"/></form>
+
+<form class="inline" action="opac-addbookbybiblionumber.pl" method="get"><input type="hidden" name="biblionumber" value="<!-- TMPL_VAR NAME="biblionumber" -->" /><input type="submit" class="icon shelf" value="Add to Shelf" onclick="Dopop('opac-addbookbybiblionumber.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->'); return false;" /></form>
 
 <form class="inline"><input type="submit" class="icon cart" onclick="addRecord('<!-- TMPL_VAR NAME="biblionumber" ESCAPE="URL" -->'); return false;" value="Add to Book Bag" /></form>
 </div>
@@ -111,6 +112,9 @@
 <!-- TMPL_ELSE -->
 <table><tr><td>No copies available.</td></tr></table>
 <!-- /TMPL_IF -->
+       <!-- TMPL_IF name="subscriptionsnumber" -->
+               <p>This is a serial subscription (There are <!-- TMPL_VAR name="subscriptionsnumber" --> subscriptions associated with this title). You can see which <a href="/cgi-bin/koha/opac-serial-issues.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->" title="Serial issues">Issues</a> we have and don't have</p>
+       <!-- /TMPL_IF -->
 </div>
 </div>
 </body>

diff --git a/koha-tmpl/opac-tmpl/npl/en/opac-serial-issues.tmpl b/koha-tmpl/opac-tmpl/npl/en/opac-serial-issues.tmpl
new file mode 100644 (file)
index 0000000..6d1a548
--- /dev/null
+++ b/koha-tmpl/opac-tmpl/npl/en/opac-serial-issues.tmpl
@@ -0,0 +1,24 @@
+<!-- TMPL_INCLUDE NAME="doc-head-open.inc" --><!-- TMPL_VAR NAME="LibraryName" --> Catalog -- Subscription Details
+<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
+<!--TMPL_INCLUDE NAME="masthead.inc" -->
+<!--TMPL_INCLUDE NAME="navigation.inc" -->
+
+<div id="main">
+
+<h1>Subscription Details</h1>
+<div class="table details">
+<!-- TMPL_LOOP name="subscription_LOOP" -->
+       <table>
+       <caption><em><!-- TMPL_VAR name="bibliotitle" --></em></caption>
+       <tr><th>Details:</th><td><p>It began on <b><!-- TMPL_VAR name="startdate" --></b> and is issued every <b> <!--TMPL_IF name="periodicity1" --> day <!-- /TMPL_IF --> <!--TMPL_IF name="periodicity2" --> week <!-- /TMPL_IF --> <!--TMPL_IF name="periodicity3" --> 2 weeks <!-- /TMPL_IF --> <!--TMPL_IF name="periodicity4" --> 3 weeks <!-- /TMPL_IF --> <!--TMPL_IF name="periodicity5" --> month <!-- /TMPL_IF --> <!--TMPL_IF name="periodicity6" --> 2 months <!-- /TMPL_IF --> <!--TMPL_IF name="periodicity7" --> 3 months <!-- /TMPL_IF --> <!--TMPL_IF name="periodicity8" --> quarter <!-- /TMPL_IF --> <!--TMPL_IF name="periodicity9" --> 2 quarters <!-- /TMPL_IF --> <!--TMPL_IF name="periodicity10" --> year <!-- /TMPL_IF --> <!--TMPL_IF name="periodicity11" --> 2 years <!-- /TMPL_IF --> </b> on <b> <!--TMPL_IF name="arrival1" -->      Monday <!-- /TMPL_IF --> <!--TMPL_IF name="arrival2" --> Tuesday <!-- /TMPL_IF --> <!--TMPL_IF name="arrival3" --> Wednesday <!-- /TMPL_IF --> <!--TMPL_IF name="arrival4" --> Thursday <!-- /TMPL_IF --> <!--TMPL_IF name="arrival5" --> Friday <!-- /TMPL_IF --> <!--TMPL_IF name="arrival6" --> Saturday <!-- /TMPL_IF --> <!--TMPL_IF name="arrival7" --> Sunday <!-- /TMPL_IF --> </b> for <b>     <!-- TMPL_IF name="numberlength" --><!-- TMPL_VAR name="numberlength" --> issues<!-- /TMPL_IF -->       <!-- TMPL_IF name="weeklength" --><!-- TMPL_VAR name="weeklength" --> weeks<!-- /TMPL_IF -->    <!-- TMPL_IF name="monthlength" --><!-- TMPL_VAR name="monthlength" --> months<!-- /TMPL_IF -->         </b> since <b><!-- TMPL_VAR name="startdate" --></b> </p></td></tr>
+<!-- TMPL_IF name="notes" --><tr><th>Notes: </th><td><!-- TMPL_VAR name="notes" --></td></tr><!-- /TMPL_IF -->
+<!-- TMPL_IF name="opacnotes" --><tr><th>Issues summary</th><td><!-- TMPL_VAR name="opacnote" --></td></tr><!-- /TMPL_IF -->
+       </table><!-- /TMPL_LOOP -->
+</div>
+<form action="/cgi-bin/koha/opac-detail.pl" method="get"><input type="hidden" name="bib" value="<!-- TMPL_VAR name="biblionumber" -->" /><p><input type="submit" class="submit" value="Back to Normal View" /></p></form>
+
+</div>
+</body>
+</html>
+
+