improvement in book shelves

diff --git a/bookshelves/shelves.pl b/bookshelves/shelves.pl
index dab9bb2..9fb1707 100755 (executable)
--- a/bookshelves/shelves.pl
+++ b/bookshelves/shelves.pl
@@ -144,6 +144,7 @@ sub viewshelf {
                $line{'barcode'}=$item->{'barcode'};
                $line{'title'}=$item->{'title'};
                $line{'author'}=$item->{'author'};
+               $line{biblionumber} = $item->{biblionumber};
                push(@itemsloop, \%line);
        }
        $template->param(       itemsloop => \@itemsloop,
@@ -156,6 +157,9 @@ sub viewshelf {
 
 #
 # $Log$
+# Revision 1.3  2004/12/02 16:38:50  tipaul
+# improvement in book shelves
+#
 # Revision 1.2  2004/11/19 16:31:30  tipaul
 # bugfix for bookshelves not in official CVS
 #

diff --git a/koha-tmpl/intranet-tmpl/default/en/bookshelves/shelves.tmpl b/koha-tmpl/intranet-tmpl/default/en/bookshelves/shelves.tmpl
index 48ca52e..10e650e 100644 (file)
--- a/koha-tmpl/intranet-tmpl/default/en/bookshelves/shelves.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/en/bookshelves/shelves.tmpl
@@ -3,62 +3,63 @@
 <div id="mainbloc">
 <!-- TMPL_IF Name="viewshelf" -->
        <form>
-               <table>
-                       <tr>
-                               <th class="catalogue">
-                                       Contents of <!-- TMPL_VAR NAME="shelfname" -->
-                               </th>
-                       </tr>
-                       <!-- TMPL_LOOP Name="itemsloop" -->
-                               <tr>
-                                       <td bgcolor="<!-- TMPL_VAR NAME="color" -->"><input type="checkbox" name="REM-<!-- TMPL_VAR NAME="itemnumber" -->"></td>
-                                       <td bgcolor="<!-- TMPL_VAR NAME="color" -->"><!-- TMPL_VAR NAME="barcode" --></td>
-                                       <td bgcolor="<!-- TMPL_VAR NAME="color" -->"><!-- TMPL_VAR NAME="title" --></td>
-                                       <td bgcolor="<!-- TMPL_VAR NAME="color" -->"><!-- TMPL_VAR NAME="author" --></td>
+               <h1 class="catalogue"><!-- TMPL_VAR NAME="shelfname" --></h1>
+
+               <div id="bloc25">
+               <h2 class="catalogue">Shelf content</h2>
+                       <table class="small">
+                               <tr colspan="4">
+                                       <th class="catalogue">delete</th>
+                                       <th class="catalogue">barcode</th>
+                                       <th class="catalogue">title</th>
+                                       <th class="catalogue">Author</th>
                                </tr>
-                       <!-- /TMPL_LOOP -->
-               </table>
-               <br>
-               <a href="shelves.pl" class="button">Shelf list</a>
-               <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" -->">
-               <!-- TMPL_IF name="manageshelf" -->
-                       <input type="submit" value="Remove Selected Items" class="button">
-               <!-- /TMPL_IF -->
+                               <!-- TMPL_LOOP Name="itemsloop" -->
+                                       <tr>
+                                               <td bgcolor="<!-- TMPL_VAR NAME="color" -->"><input type="checkbox" name="REM-<!-- TMPL_VAR NAME="itemnumber" -->"></td>
+                                               <td bgcolor="<!-- TMPL_VAR NAME="color" -->"><!-- TMPL_VAR NAME="barcode" --></td>
+                                               <td bgcolor="<!-- TMPL_VAR NAME="color" -->"><a href="../MARCdetail.pl?bib=<!-- TMPL_VAR name="biblionumber" -->"><!-- TMPL_VAR NAME="title" --></a></td>
+                                               <td bgcolor="<!-- TMPL_VAR NAME="color" -->"><!-- TMPL_VAR NAME="author" --></td>
+                                       </tr>
+                               <!-- /TMPL_LOOP -->
+                       </table>
+                       <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" -->">
+                       <!-- TMPL_IF name="manageshelf" -->
+                               <input type="submit" value="Remove Selected Items" class="button catalogue">
+                       <!-- /TMPL_IF -->
+               </div>
        </form>
 
        <!-- TMPL_IF name="manageshelf" -->
-       <form>
-               <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" -->">
-               <table>
-                       <tr>
-                               <td>
-                                       Add a book by barcode in <!-- TMPL_VAR NAME="shelfname" -->:
-                               </td>
-                               <td>
-                                       <input 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="button">
-                               </td>
-                       </tr>
-               </table>
-       </form>
+       <div id="bloc25">
+               <form>
+               <h2 class="catalogue">Add a book by barcode</h2>
+                       <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 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="button catalogue">
+               </form>
+       </div>
        <!-- /TMPL_IF -->
+       <div id="bloc25">
+               <a href="shelves.pl" class="button catalogue">Shelf list</a>
+       </div>
 <!-- TMPL_ELSE -->
        <!-- TMPL_IF Name="shelves" -->
+               <h1 class="catalogue">Bookshelves</h1>
                <!-- TMPL_IF Name="status1" -->
-                       <font color="red"><!-- TMPL_VAR NAME="string1" --></font><p>
+                       <p class="problem"><!-- TMPL_VAR NAME="string1" --><p>
                <!-- /TMPL_IF -->
                <!-- TMPL_LOOP Name="paramsloop" -->
                        <!-- TMPL_IF Name="status" -->
-                               <font color="red"><!-- TMPL_VAR NAME="string" --></font><p>
+                               <p class="problem"><!-- TMPL_VAR NAME="string" --><p>
                        <!-- /TMPL_IF -->
                <!-- /TMPL_LOOP -->
-               <h1 class="catalogue">Bookshelves</h1>
                <div id="bloc25">
                                        <h2 class="catalogue">Select Shelves to Delete</h2>
                                        <form method="post">
@@ -69,7 +70,7 @@
                                                        <label>
                                                                <input type="checkbox" name="DEL-<!-- TMPL_VAR NAME="shelf" -->">
                                                        </label>
-                                                               <!-- TMPL_VAR NAME="shelfname" --> (<!-- TMPL_VAR NAME="shelfbookcount" --> books)
+                                                               <a href="shelves.pl?viewshelf=<!-- TMPL_VAR name="shelf" -->"><!-- TMPL_VAR NAME="shelfname" --></a> (<!-- TMPL_VAR NAME="shelfbookcount" --> item(s))
                                                </p>
                                                <!-- /TMPL_IF -->
                                                <!-- /TMPL_LOOP -->
@@ -103,25 +104,30 @@
                        </form>
                </div>
        <!-- TMPL_ELSE -->
-               <table>
-                       <tr>
-                               <th class="catalogue">
-                                       Shelf List
-                               </th>
-                       </tr>
-                       <!-- TMPL_LOOP Name="shelvesloop" -->
-                       <tr>
-                               <td bgcolor="<!-- TMPL_VAR NAME="color" -->">
-                                       <a href="shelves.pl?viewshelf=<!-- TMPL_VAR NAME="shelf" -->">
-                                               <!-- TMPL_VAR NAME="shelfname" -->(<!-- TMPL_VAR NAME="shelfbookcount" --> books)
-                                       </a>
-                               </td>
-                       </tr>
-                       <!-- /TMPL_LOOP -->
-               </table>
-               <P>
+               <div id="bloc25">
+                       <h2 class="catalogue">Shelf list</h2>
+                       <table class="small">
+                               <tr>
+                                       <th class="catalogue">Shelf name</th>
+                                       <th class="catalogue">Content size</th>
+                               </tr>
+                               <!-- TMPL_LOOP Name="shelvesloop" -->
+                               <tr>
+                                       <td bgcolor="<!-- TMPL_VAR NAME="color" -->">
+                                               <a href="shelves.pl?viewshelf=<!-- TMPL_VAR NAME="shelf" -->">
+                                                       <!-- TMPL_VAR NAME="shelfname" -->
+                                               </a>
+                                       </td>
+                                       <td bgcolor="<!-- TMPL_VAR NAME="color" -->">
+                                       <!-- TMPL_VAR NAME="shelfbookcount" --> item(s)
+                                       </td>
+                               </tr>
+                               <!-- /TMPL_LOOP -->
+                       </table>
+               </div>
+               <div id="bloc25">
                        <a href="shelves.pl?shelves=1" class="button catalogue">Add or Remove Book Shelves</a>
-               </p>
+               </div>
        <!-- /TMPL_IF -->
 <!-- /TMPL_IF -->
 </div>