Synching with rel_2_2

diff --git a/koha-tmpl/intranet-tmpl/npl/en/bookshelves/shelves.tmpl b/koha-tmpl/intranet-tmpl/npl/en/bookshelves/shelves.tmpl
index f2501c3..28bd87c 100644 (file)
--- a/koha-tmpl/intranet-tmpl/npl/en/bookshelves/shelves.tmpl
+++ b/koha-tmpl/intranet-tmpl/npl/en/bookshelves/shelves.tmpl
@@ -4,22 +4,56 @@
 <!-- TMPL_INCLUDE NAME="intranet-nav.inc" -->
 
 <div id="main">
+
+<!-- TMPL_IF name="edit" -->
+               <form method="post" action="<!-- TMPL_VAR NAME="script_name" -->">
+                       <input type="hidden" name="op" value="modifsave" />
+                       <table>
+                       <caption>Editing Shelf <em><!-- TMPL_VAR name="shelfname"--></em></caption>
+                       <tr><td><input type="hidden" name="shelfnumber" value="<!-- TMPL_VAR name="shelfnumber" -->" /><label for="shelfname">Name:</label></td><td><input id="shelfname" type="text" name="shelfname" size="25" value="<!-- TMPL_VAR name="shelfname"-->" /></td></tr>
+                       <tr><td><label for="owner">Owner:</label></td><td><input type="hidden" id="owner" name="owner" value="<!-- TMPL_VAR NAME="loggedinuser" -->" /><!-- TMPL_VAR NAME="loggedinusername" --></td></tr>
+                       <tr><td><label for="category">Category:</label></td><td><select id="category" name="category">
+                                       <!-- TMPL_IF name="category1" -->
+                                               <option value="1" selected>Private</option>
+                                       <!-- TMPL_ELSE -->
+                                               <option value="1">Private</option>
+                                       <!-- /TMPL_IF -->
+                                       <!-- TMPL_IF name="category2" -->
+                                               <option value="2" selected>Public</option>
+                                       <!-- TMPL_ELSE -->
+                                               <option value="2">Public</option>
+                                       <!-- /TMPL_IF -->
+                                       <!-- TMPL_IF name="category3" -->
+                                               <option value="3" selected>Free</option>
+                                       <!-- TMPL_ELSE -->
+                                               <option value="3">Free</option>
+                                       <!-- /TMPL_IF -->
+                               </select></td></tr>
+                       </table>
+                       <ul><li>a private bookshelf is managed by you &amp; can be seen only by you.</li>
+                               <li> A public can be seen by everybody, but managed only by you.</li>
+                               <li> A free can be managed by any user.</li></ul>
+                       <p><input type="submit" value="Save Changes" class="submit" /></p>
+               </form>
+<!-- /TMPL_IF -->
+
 <!-- TMPL_IF Name="viewshelf" -->
-       <form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
+       <form action="<!-- TMPL_VAR NAME="script_name" -->" method="post" name="mainform">
                        <table>
-                       <caption><!-- TMPL_VAR NAME="shelfname" --></caption>
+                       <caption>Contents of <em><!-- TMPL_VAR NAME="shelfname" --></em></caption>
                                <tr>
-                                       <th>&nbsp;</th>
+                                       <!-- TMPL_IF name="manageshelf" --><th><a href="/cgi-bin/koha/shelves.pl" onclick="CheckAll(); return false;"><img src="<!-- TMPL_VAR NAME="themelang" -->/images/checkall.gif" height="18" width="18" alt="Check All" title="Check All" border="0" /></a></th><!-- /TMPL_IF -->
                                        <th>Title</th>
                                        <th>Author</th>
-                                       <th>Barcode</th>
-                               </tr>
-                               <!-- TMPL_LOOP Name="itemsloop" -->
-                                       <tr>
-                                               <td><input type="checkbox" name="REM-<!-- TMPL_VAR NAME="itemnumber" -->" /></td>
+                                       <th>Item Type</th>
+                                       <th>&copy;</th>
+                                       <th>&nbsp;</th>
+                               </tr><!-- TMPL_LOOP Name="itemsloop" --><!-- TMPL_IF NAME="toggle" --><tr class="highlight"><!-- TMPL_ELSE --><tr><!-- /TMPL_IF --><!-- TMPL_IF name="manageshelf" --><td><input type="checkbox" name="REM-<!-- TMPL_VAR NAME="itemnumber" -->" /></td><!-- /TMPL_IF -->
                                                <td><a href="/cgi-bin/koha/detail.pl?bib=<!-- TMPL_VAR name="biblionumber" -->"><!-- TMPL_VAR NAME="title" --></a></td>
                                                <td><!-- TMPL_VAR NAME="author" --></td> 
-                                               <td><!-- TMPL_VAR NAME="barcode" --></td>
+                                               <td><!-- TMPL_VAR NAME="itemtype" --></td>
+                                               <td><!-- TMPL_VAR NAME="publicationyear" --></td>
+                                               <td><a href="/cgi-bin/koha/request.pl?bib=<!-- TMPL_VAR NAME="biblionumber" -->">Reserves</a></td>
                                        </tr>
                                <!-- /TMPL_LOOP -->
                        </table>
@@ -32,21 +66,20 @@
 
        <!-- TMPL_IF name="manageshelf" -->
                <form>
-               <table>
-               <caption>Add a book by barcode</caption>
-               <tr><td><label for="barcode">Barcode:</label></td><td><input type="hidden" name="shelfnumber" value="<!-- TMPL_VAR NAME="shelfnumber" -->" />
+               <div class="data"><table>
+               <caption>Add an item by barcode</caption>
+               <tr><th><label for="barcode">Barcode:</label></th><td><input type="hidden" name="shelfnumber" value="<!-- TMPL_VAR NAME="shelfnumber" -->" />
                        <input type="hidden" name="modifyshelfcontents" value="1" />
                        <input type="hidden" name="viewshelf" value="<!-- TMPL_VAR NAME="shelfnumber" -->" />
                        <input type="text" size="14" maxlength="14" id="barcode" name="addbarcode" />
                        <input type="hidden" name="modifyshelfcontents" value="1" />
-                       <input type="hidden" name="shelfnumber" value="<!-- TMPL_VAR NAME="shelfnumber" -->" /><input type="submit" value="Save" class="submit" /></td></tr></table>
+                       <input type="hidden" name="shelfnumber" value="<!-- TMPL_VAR NAME="shelfnumber" -->" /><input type="submit" value="Save" class="submit" /></td></tr></table></div>
                </form>
        <!-- /TMPL_IF -->
                <form action="/cgi-bin/koha/bookshelves/shelves.pl" method="get"><input type="submit" class="submit" value="Return to Virtual Shelves" /></form>
                                </div>
 <!-- TMPL_ELSE -->
        <!-- TMPL_IF Name="shelves" -->
-               <h1>Bookshelves</h1>
                <!-- TMPL_IF Name="status1" -->
                        <p class="problem"><!-- TMPL_VAR NAME="string1" --><p>
                <!-- /TMPL_IF -->
@@ -55,49 +88,37 @@
                                <p class="problem"><!-- TMPL_VAR NAME="string" --><p>
                        <!-- /TMPL_IF -->
                <!-- /TMPL_LOOP -->
-               <div id="bloc25">
-                                       <h2>Select Shelves to Delete</h2>
                                        <form method="post" action="<!-- TMPL_VAR NAME="script_name" -->">
-                                       <input type="hidden" name="shelves" value="1" />
+                                       <input type="hidden" name="shelves" value="1" /><table>
+                                               <caption>Bookshelves</caption>
+                                               <th>&nbsp;</th><th>Title</th><th>Item Count</th>
                                                <!-- TMPL_LOOP Name="shelvesloop" -->
                                                <!-- TMPL_IF name="canmanage" -->
-                                               <p>
-                                                       <label></label>
-                                                               <input type="checkbox" name="DEL-<!-- TMPL_VAR NAME="shelf" -->" />
                                                        
-                                                               <a href="shelves.pl?viewshelf=<!-- TMPL_VAR name="shelf" -->"><!-- TMPL_VAR NAME="shelfname" --></a> (<!-- TMPL_VAR NAME="shelfbookcount" --> item(s))
-                                               </p>
+                                               <!-- TMPL_IF NAME="toggle" --><tr><!-- TMPL_ELSE --><tr class="highlight"><!-- /TMPL_IF --><td><!-- TMPL_IF NAME="shelfbookcount" --><input type="checkbox" name="DEL-<!-- TMPL_VAR NAME="shelf" -->" disabled="disabled" readonly="readonly" /><!-- TMPL_ELSE --><input type="checkbox" name="DEL-<!-- TMPL_VAR NAME="shelf" -->" /><!-- /TMPL_IF --></td><td><a href="shelves.pl?viewshelf=<!-- TMPL_VAR name="shelf" -->"><!-- TMPL_VAR NAME="shelfname" --></a></td><td><!-- TMPL_IF NAME="shelfbookcount" --><!-- TMPL_VAR NAME="shelfbookcount" --> item(s)<sup>*</sup><!-- TMPL_ELSE -->Empty<!-- /TMPL_IF --></td></tr>
                                                <!-- /TMPL_IF -->
-                                               <!-- /TMPL_LOOP -->
+                                               <!-- /TMPL_LOOP --></table>
                                        <p>
-                                               <input type="submit" value="Delete Shelves" class="submit" />
+                                               <input type="submit" value="Delete Selected Shelves" class="submit" /> <sup>*</sup>Shelves must be empty before they can be deleted.
                                        </p>
                                        </form>
-               </div>
-               <div id="bloc25">
-                       <form method="post" action="<!-- TMPL_VAR NAME="script_name" -->">
+
+                       <form class="inline" method="post" action="<!-- TMPL_VAR NAME="script_name" -->">
                                <input type="hidden" name="shelves" value="1" />
-                               <h2>Add Shelf</h2>
-                               <p><label>Name</label><input type="text" name="addshelf" size="25" /></p>
-                               <p><label>Owner</label><input type="hidden" name="owner" value="<!-- TMPL_VAR NAME="loggedinuser" -->" /><!-- TMPL_VAR NAME="loggedinusername" --></p>
-                               <p><label>Category</label>
-                                       <select name="category">
+                               <div class="data"><table>
+                               <caption>Add Shelf</caption>
+                               <tr><th><label>Name</label></th><td><input type="text" name="addshelf" size="25" /></td></tr>
+                               <tr><th><label>Owner</label></th><td><input type="hidden" name="owner" value="<!-- TMPL_VAR NAME="loggedinuser" -->" /><!-- TMPL_VAR NAME="loggedinusername" --></td></tr>
+                               <tr><th><label>Category</label></th>
+                                       <td><select name="category">
                                                <option value="1">Private</option>
                                                <option value="2">Public</option>
-                                               <option value="3">Free</option>
-                                       </select>
-                               </p>
-                               <p> <li>a private bookshelf is managed by you &amp; can be seen only by you.</li>
-                                       <li> A public can be seen by everybody, but managed only by you.</li>
-                                       <li> A free can be managed by any user.</li>
-                               </p>
-                               <p>
-                                       <input type="submit" value="Add New Shelf" class="submit" />
-                                       <a href="shelves.pl">back to shelf list</a>
-                               </p>
-
-                       </form>
-               </div>
+                                       </select></td></tr>
+</table></div>
+<ul><li>A private bookshelf is managed by you and can be seen only by you.</li>
+                                       <li> A public shelf can be seen by everybody, but managed only by you.</li></ul>
+                                       <input type="submit" value="Add New Shelf" class="submit" /></form>
+                                       <form action="shelves.pl" method="get" class="inline"><input type="submit" class="submit" value="Back to Shelf List" /></form>
        <!-- TMPL_ELSE -->
                        <table>
                        <caption>Virtual Shelves</caption>
@@ -108,7 +129,7 @@
                                        <th>&nbsp;</th>
                                </tr>
                                <!-- TMPL_LOOP Name="shelvesloop" -->
-                               <tr>
+                               <!-- TMPL_IF NAME="toggle" --><tr class="highlight"><!-- TMPL_ELSE --><tr><!-- /TMPL_IF -->
                                        <td>
                                                <a href="shelves.pl?viewshelf=<!-- TMPL_VAR NAME="shelf" -->">
                                                        <!-- TMPL_VAR NAME="shelfname" -->
@@ -128,11 +149,7 @@
                                        <td>
                                                <!-- TMPL_VAR NAME="shelfbookcount" --> item(s)
                                        </td>
-                                       <!-- TMPL_IF name="mine" -->
-                                               <td>
-                                                       <a href="shelves.pl?op=modif&amp;shelf=<!-- TMPL_VAR NAME="shelf" -->">Edit</a>
-                                                       <!-- TMPL_VAR name="surname" --><!-- TMPL_VAR name="firstname" -->                                              </td>
-                                       <!-- /TMPL_IF -->
+                                       <td><!-- TMPL_IF name="mine" --><a href="shelves.pl?op=modif&amp;shelf=<!-- TMPL_VAR NAME="shelf" -->">Edit</a><!-- TMPL_VAR name="surname" --><!-- TMPL_VAR name="firstname" --><!-- TMPL_ELSE -->&nbsp;<!-- /TMPL_IF --></td>
                                </tr>
                                <!-- /TMPL_LOOP -->
                        </table>
@@ -140,36 +157,5 @@
        <!-- /TMPL_IF -->
 <!-- /TMPL_IF -->
 
-<!-- TMPL_IF name="edit" -->
-               <form method="post" action="<!-- TMPL_VAR NAME="script_name" -->">
-                       <input type="hidden" name="op" value="modifsave" />
-                       <table>
-                       <caption>Editing Shelf <em><!-- TMPL_VAR name="shelfname"--></em></caption>
-                       <tr><td><input type="hidden" name="shelfnumber" value="<!-- TMPL_VAR name="shelfnumber" -->" /><label for="shelfname">Name:</label></td><td><input id="shelfname" type="text" name="shelfname" size="25" value="<!-- TMPL_VAR name="shelfname"-->" /></td></tr>
-                       <tr><td><label for="owner">Owner:</label></td><td><input type="hidden" id="owner" name="owner" value="<!-- TMPL_VAR NAME="loggedinuser" -->" /><!-- TMPL_VAR NAME="loggedinusername" --></td></tr>
-                       <tr><td><label for="category">Category:</label></td><td><select id="category" name="category">
-                                       <!-- TMPL_IF name="category1" -->
-                                               <option value="1" selected>Private</option>
-                                       <!-- TMPL_ELSE -->
-                                               <option value="1">Private</option>
-                                       <!-- /TMPL_IF -->
-                                       <!-- TMPL_IF name="category2" -->
-                                               <option value="2" selected>Public</option>
-                                       <!-- TMPL_ELSE -->
-                                               <option value="2">Public</option>
-                                       <!-- /TMPL_IF -->
-                                       <!-- TMPL_IF name="category3" -->
-                                               <option value="3" selected>Free</option>
-                                       <!-- TMPL_ELSE -->
-                                               <option value="3">Free</option>
-                                       <!-- /TMPL_IF -->
-                               </select></td></tr>
-                       </table>
-                       <ul><li>a private bookshelf is managed by you &amp; can be seen only by you.</li>
-                               <li> A public can be seen by everybody, but managed only by you.</li>
-                               <li> A free can be managed by any user.</li></ul>
-                       <p><input type="submit" value="Save Changes" class="submit" /></p>
-               </form>
-<!-- /TMPL_IF -->
 </div>
 <!-- TMPL_INCLUDE Name="intranet-bottom.inc" -->