projects / koha_ffzg / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 21eaccd)
Re-working virtual shelves interface to try to make it cleaner and make the steps...
authorOwen Leonard <oleonard@myacpl.org>
Sat, 27 Oct 2007 19:14:50 +0000 (14:14 -0500)
committerJoshua Ferraro <jmf@liblime.com>
Mon, 29 Oct 2007 20:46:28 +0000 (15:46 -0500)
Signed-off-by: Chris Cormack <crc@liblime.com>
Signed-off-by: Joshua Ferraro <jmf@liblime.com>
koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css patch | blob | history
koha-tmpl/intranet-tmpl/prog/en/includes/virtualshelves-toolbar.inc [new file with mode: 0644] patch | blob
koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/shelves.tmpl patch | blob | history

diff --git a/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css b/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css
index 0bbc5c0..c42ef34 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css
+++ b/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css
@@ -319,6 +319,7 @@ div.cmDiv
 .clickMenu li.more li a {
        background-image : none;
        padding-right : 0;
+       white-space : nowrap;
 }
 
 .clickMenu
@@ -819,4 +820,8 @@ tr.expired td {
 span.expired {
        color : #990000;
        font-style : italic;
+}
+
+div.help {
+       margin: .9em 0 0 0;  
 }
\ No newline at end of file
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/virtualshelves-toolbar.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/virtualshelves-toolbar.inc
new file mode 100644 (file)
index 0000000..6594084
--- /dev/null
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/virtualshelves-toolbar.inc
@@ -0,0 +1,33 @@
+<div id="toolbar">
+       <script type="text/javascript">
+       //<![CDATA[
+
+       // prepare DOM for YUI Toolbar
+
+        $(document).ready(function() {
+               $("#deleteshelfc").empty();
+           yuiToolbar();
+        });
+
+       // YUI Toolbar Functions
+
+       function yuiToolbar() {
+                   newshelfButton = new YAHOO.widget.Button("newshelf");
+                   editshelfButton = new YAHOO.widget.Button("editshelf");
+                       deleteshelfButton = new YAHOO.widget.Button({
+                                            id: "deleteshelf", 
+                                            type: "button", 
+                                            label: "Delete Shelf", 
+                                            container: "deleteshelfc",
+                                                                                       onclick: {fn:function(){confirmDelete("Are you sure you want to delete this shelf?")}}
+                                        });
+       }
+
+       //]]>
+       </script>
+       
+<ul class="toolbar">
+
+       <li><a id="newshelf" href="/cgi-bin/koha/virtualshelves/shelves.pl?shelves=1">New Shelf</a></li>
+       <!-- TMPL_IF NAME="viewshelf" --><!-- TMPL_IF name="manageshelf" --><li><a id="editshelf" href="/cgi-bin/koha/virtualshelves/shelves.pl?op=modif&amp;shelf=<!-- TMPL_VAR NAME="shelfnumber" -->">Edit Shelf</a></li><li id="deleteshelfc"><a id="deleteshelf" href="/cgi-bin/koha/virtualshelves/shelves.pl?shelves=1&amp;DEL-<!-- TMPL_VAR NAME="shelfnumber" -->=1">Delete Shelf</a></li><!-- /TMPL_IF --><!-- /TMPL_IF -->
+</ul></div>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/shelves.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/shelves.tmpl
index 5b35a13..60db0fc 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/shelves.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/shelves.tmpl
@@ -1,6 +1,7 @@
 <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
-<title>Koha &rsaquo; <!-- TMPL_IF NAME="viewshelf" -->Virtual Shelves &rsaquo; Contents of <!-- TMPL_VAR NAME="shelfname" --><!-- TMPL_ELSE -->Virtual Shelves<!-- /TMPL_IF --></title>
+<title>Koha &rsaquo; <!-- TMPL_IF NAME="viewshelf" -->Virtual Shelves &rsaquo; Contents of <!-- TMPL_VAR NAME="shelfname" --><!-- TMPL_ELSE -->Virtual Shelves<!-- /TMPL_IF --><!-- TMPL_IF NAME="shelves" --> &rsaquo; Create New Virtual Shelf<!-- /TMPL_IF --><!-- TMPL_IF NAME="edit" --> &rsaquo; Edit virtual shelf <!-- TMPL_VAR name="shelfname"--><!-- /TMPL_IF --></title>
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
+<!-- TMPL_INCLUDE NAME="yui-toolbars.inc" -->
 <script type="text/javascript" src="<!-- TMPL_VAR name="themelang" -->/lib/jquery/plugins/jquery.checkboxes.pack.js"></script>
 <script type="text/javascript">
 //<![CDATA[    
@@ -59,32 +60,29 @@ function confirmDelete(s){
        //]]>
 </script>
 </head>
-<body>
+<body class="yui-skin-sam">
 <!-- TMPL_INCLUDE NAME="header.inc" -->
 <!-- TMPL_INCLUDE NAME="cat-search.inc" -->
 
-<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/catalogue/search.pl">Catalogue</a>  &rsaquo; <!-- TMPL_IF NAME="viewshelf" --><a href="/cgi-bin/koha/virtualshelves/shelves.pl">Virtual Shelves</a> &rsaquo; Contents of <i><!-- TMPL_VAR NAME="shelfname" --></i><!-- TMPL_ELSE -->Virtual Shelves<!-- /TMPL_IF --></div>
+<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <!-- TMPL_IF NAME="viewshelf" --><a href="/cgi-bin/koha/virtualshelves/shelves.pl">Virtual Shelves</a> &rsaquo; Contents of <i><!-- TMPL_VAR NAME="shelfname" --></i><!-- TMPL_ELSE --><a href="/cgi-bin/koha/virtualshelves/shelves.pl">Virtual Shelves</a><!-- /TMPL_IF --><!-- TMPL_IF NAME="shelves" --> &rsaquo; Create New Virtual Shelf<!-- /TMPL_IF --><!-- TMPL_IF NAME="edit" --> &rsaquo; Edit virtual shelf <i><!-- TMPL_VAR name="shelfname"--></i><!-- /TMPL_IF --></div>
 
-<div id="doc3" class="yui-t2">
+<div id="doc" class="yui-t7">
    
    <div id="bd">
        <div id="yui-main">
-       <div class="yui-b">
-
+       <div class="yui-g">
+               <!-- TMPL_INCLUDE NAME="virtualshelves-toolbar.inc" -->
+       </div>
+       
 <!-- TMPL_IF NAME="viewshelf" -->
-<div id="action">
-<!-- TMPL_IF name="manageshelf" --><ul>
-    <li><a  href="/cgi-bin/koha/virtualshelves/shelves.pl?op=modif&amp;shelf=<!-- TMPL_VAR NAME="shelfnumber" -->">Edit this shelf</a></li>
-    </ul><!-- /TMPL_IF -->
-</div>
-
-<fieldset>
-<legend>Contents of <i><!-- TMPL_VAR NAME="shelfname" --></i></legend>
+<div class="yui-g">
+    <!-- TMPL_IF NAME="itemsloop" -->
 
 <form action="/cgi-bin/koha/virtualshelves/shelves.pl" method="post" class="checkboxed">
         <input type="hidden" name="viewshelf" value="<!-- TMPL_VAR NAME="shelfnumber" -->" />
         <input type="hidden" name="modifyshelfcontents" value="1" />
-    <!-- TMPL_IF NAME="itemsloop" -->
+<fieldset>
+<legend>Contents of <i><!-- TMPL_VAR NAME="shelfname" --></i></legend>
     <table>
             <tr>
                 <th class="checkall">
@@ -97,12 +95,16 @@ function confirmDelete(s){
                                <th>&nbsp;</th>
             </tr>
         <!-- TMPL_LOOP NAME="itemsloop" -->
-            <tr<!-- TMPL_IF name="color" --> class="highlight"<!-- /TMPL_IF -->>
+                       <!-- TMPL_IF name="color" -->
+            <tr class="highlight">
+                       <!-- TMPL_ELSE -->
+                       <tr>
+                       <!-- /TMPL_IF -->
                     <td>
                         <input type="checkbox" name="REM-<!-- TMPL_VAR NAME="biblionumber" -->" />
                     </td>
                     <td>
-                        <img src="<!-- TMPL_VAR NAME="themelang" -->/images/<!-- TMPL_VAR NAME="itemtype" -->.gif" alt="<!-- TMPL_VAR NAME="itemtype" -->" title="<!-- TMPL_VAR NAME="itemtype" -->" />
+                        <img src="<!-- TMPL_VAR NAME="themelang" -->/../img/<!-- TMPL_VAR NAME="itemtype" -->.gif" alt="<!-- TMPL_VAR NAME="itemtype" -->" title="<!-- TMPL_VAR NAME="itemtype" -->" />
                     </td>
                     <td>
                 <!-- TMPL_IF name="BiblioDefaultViewmarc" -->
@@ -125,30 +127,24 @@ function confirmDelete(s){
                     <td><!-- TMPL_VAR NAME="classification" --></td>
                                        <td><a href="/cgi-bin/koha/reserve/request.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->">Holds</a></td>
         </tr>
-        <!-- /TMPL_LOOP -->
+        <!-- /TMPL_LOOP --><!-- /itemsloop -->
     </table>
-    <!-- TMPL_ELSE -->
-
-    <p><b>This shelf is empty.</b></p>
-    <!-- TMPL_UNLESS NAME="itemsloop" -->
-        <input type="hidden" name="DEL-<!-- TMPL_VAR NAME="shelfnumber" -->" />
-        <input type="hidden" name="shelves" value="1" />
-        <input type="submit" value="Delete this shelf" onclick="return confirmDelete('Are you sure you want to delete this shelf?')" />
-        <!-- /TMPL_UNLESS -->
-        <!-- /TMPL_IF -->
-    <!-- TMPL_IF name="manageshelf" -->
+       
+       <!-- TMPL_IF name="manageshelf" -->
         <!-- TMPL_IF NAME="itemsloop" -->
-            <b>With selected items :</b>
-            <input type="submit" value="Remove" onclick="return confirmDelete('Are you sure you want to remove these items from the shelf?')" style="display:inline;" />
-        <!-- /TMPL_IF -->
-        <!-- /TMPL_IF -->
+            <input type="submit" value="Remove selected Items" onclick="return confirmDelete('Are you sure you want to remove these items from the shelf?')" />
+        <!-- /TMPL_IF --><!-- /itemsloop -->
+        <!-- /TMPL_IF --><!-- /manageshelf -->
                </fieldset>
 </form>
+        <!-- /TMPL_IF --><!-- /viewshelf -->
+  </div>
+  <div class="yui-g">
     <!-- TMPL_IF name="manageshelf" -->
     
 <form action="/cgi-bin/koha/virtualshelves/shelves.pl" method="post">
-<fieldset>
-    <legend>Add an item to this shelf by barcode</legend>
+<fieldset class="brief">
+    <legend>Add an item to <i><!-- TMPL_VAR NAME="shelfname" --></i></legend>
         <ol>
             <li>
                 <label for="addbarcode">Barcode:</label>
@@ -161,10 +157,14 @@ function confirmDelete(s){
                </ol>
        </fieldset>
 </form>
+</div>
 <!-- /TMPL_IF -->
 <!-- TMPL_ELSE -->
     <!-- TMPL_IF NAME="shelves" -->
-        <!-- TMPL_IF NAME="status1" -->
+<div class="yui-ge">
+       <div class="yui-u first">
+               <!-- TMPL_IF NAME="already" --><p class="error">A virtual shelf with that name already exists!</p><!-- /TMPL_IF -->
+               <!-- TMPL_IF NAME="status1" -->
             <p class="error"><!-- TMPL_VAR NAME="string1" --></p>
         <!-- /TMPL_IF -->
         <!-- TMPL_LOOP NAME="paramsloop" -->
@@ -173,63 +173,44 @@ function confirmDelete(s){
             <!-- /TMPL_IF -->
         <!-- /TMPL_LOOP -->
     <form method="post" action="/cgi-bin/koha/virtualshelves/shelves.pl">
-        <input type="hidden" name="shelves" value="1">
-        <h3>Create a new virtual shelf</h3>
-        <table>
-        <tr><th scope="row"><label for="addshelf">Shelf name:</label> </th><td> <input id="addshelf" type="text" name="addshelf" size="25"></td></tr>
-        <tr><th scope="row"><label for="owner">Owner:</label> </th><td><input type="hidden" name="owner" id="owner" value="<!-- TMPL_VAR name="loggedinuser" -->"><!-- TMPL_VAR name="loggedinusername" --></td></tr>
-        <tr><th scope="row"><label for="category">Category:</label> </th><td><select name="category" id="category">
+        <input type="hidden" name="shelves" value="1" />
+        <fieldset class="rows">
+               <legend>Create a new virtual shelf</legend>
+        <ol>
+        <li><label for="addshelf">Shelf name: </label> <input id="addshelf" type="text" name="addshelf" size="25" /></li>
+        <li><span class="label">Owner: </span><input type="hidden" name="owner" id="owner" value="<!-- TMPL_VAR name="loggedinuser" -->" /><!-- TMPL_VAR name="loggedinusername" --></li>
+        <li><label for="category">Category: </label><select name="category" id="category">
                                     <option value="1">Private</option>
                                     <option value="2">Public</option>
-                                                                       <option value="3">Free</option>
-                                    </select></td></tr></table>
-        <ul>
+                                                                       <option value="3">Free</option></select></li></ol></fieldset>
+ 
+               <p><input type="submit" value="Save" /></p>
+               </form>
+                     
+
+    </div>
+       <div class="yui-u">
+               <div class="help"><ul>
             <li>A <b>private</b> virtual shelf is managed by you and can be seen only by you.</li>
             <li> A <b>public</b> virtual shelf can be seen by everybody, but managed only by you.</li>
                        <li> An <b>open</b> virtual shelf can be seen and managed by everybody.</li>
-        </ul>
-                                <p><input type="submit" value="Add a new shelf"></p>
-                    </form>
+        </ul></div>
+       </div>
+</div>
         
-        <!-- TMPL_IF NAME="numberCanManage" -->
-        <!-- TMPL_IF NAME="shelvesloop" -->
-        <form method="post" action="/cgi-bin/koha/virtualshelves/shelves.pl" name="mainform">
-                    <input type="hidden" name="shelves" value="1" />
-                    <h3>Delete virtual shelves</h3>
-                    <table>
-                        <tr><th>&nbsp;</th><th>Shelf name</th><th>Contents</th></tr>
-                        <!-- TMPL_LOOP NAME="shelvesloop" -->
-                        <!-- TMPL_IF name="canmanage" -->
-                        <tr>
-                            <td>
-                                <input type="checkbox" name="DEL-<!-- TMPL_VAR NAME="shelf" -->" />
-                            </td>
-                            <td>
-                                <a href="/cgi-bin/koha/virtualshelves/shelves.pl?viewshelf=<!-- TMPL_VAR NAME="shelf" -->"><!-- TMPL_VAR NAME="shelfname" --></a>
-                            </td>
-                            <td>
-                                <!-- TMPL_VAR NAME="shelfvirtualcount" --> item(s)
-                            </td>
-                        </tr>
-                        <!-- /TMPL_IF -->
-                        <!-- /TMPL_LOOP -->
-                    </table>
-        <input type="submit" value="Delete shelves" /></form>
-        <!-- /TMPL_IF -->
-        <!-- /TMPL_IF -->
-
-        <p><form class="inline" action="/cgi-bin/koha/virtualshelves/shelves.pl" method="get"><input type="submit" value="Back to virtual shelves" /></form></p>
-
     <!-- TMPL_ELSE -->
     <!-- TMPL_IF name="edit" -->
-        <form method="post">
-            <input type="hidden" name="op" value="modifsave">
-            <input type="hidden" name="shelfnumber" value="<!-- TMPL_VAR name="shelfnumber" -->">
-<h3>Edit virtual shelf '<!-- TMPL_VAR name="shelfname"-->'</h3>
-            <table>
-            <tr><td><label for="shelfname">Shelf name: </label></td><td><input type="text" id="shelfname" 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">
+       <div class="yui-ge">
+       <div class="yui-u first">
+       <!-- TMPL_IF NAME="already" --><p class="error">A virtual shelf with that name already exists!</p><!-- /TMPL_IF -->
+        <form method="post" action="/cgi-bin/koha/virtualshelves/shelves.pl">
+            <input type="hidden" name="op" value="modifsave" />
+            <input type="hidden" name="shelfnumber" value="<!-- TMPL_VAR name="shelfnumber" -->" />
+<fieldset class="rows"><legend>Edit virtual shelf <i><!-- TMPL_VAR name="shelfname"--></i></legend>
+            <ol>
+            <li><label for="shelfname">Shelf name: </label><input type="text" id="shelfname" name="shelfname" size="25" value="<!-- TMPL_VAR name="shelfname"-->" /></li>
+            <li><label for="owner">Owner: </label><input type="hidden" id="owner" name="owner" value="<!-- TMPL_VAR NAME="loggedinuser" -->" /><!-- TMPL_VAR NAME="loggedinusername" --></li>
+            <li><label for="category">Category: </label><select id="category" name="category">
                     <!-- TMPL_IF name="category1" -->
                         <option value="1" selected="selected">Private</option>
                     <!-- TMPL_ELSE -->
@@ -240,21 +221,25 @@ function confirmDelete(s){
                     <!-- TMPL_ELSE -->
                         <option value="2">Public</option>
                                        <!-- TMPL_IF NAME="category3" -->
-                                               <option value="3" selected="selected">Free</option>
+                                               <option value="3" selected="selected">Open</option>
                                        <!-- TMPL_ELSE -->
-                                               <option value="3">Free</option>
+                                               <option value="3">Open</option>
                     <!-- /TMPL_IF -->
-                </select></td></tr>
-            </table>
+                </select></li>
+            </ol></fieldset>
+            <p><input type="submit" value="Save changes" /></p>
+                       
+        </form>
+               </div>
+               <div class="yui-u">
             <ul><li>A <strong>private</strong> virtual shelf is managed by you and can be seen <strong>only</strong> by you.</li>
                 <li> A <strong>public</strong> virtual shelf can be seen by <strong>everybody</strong>, but managed only by you.</li>
                                 <li> A <b>free</b> virtual shelf can be seen and managed by everybody.</li>
-            </ul>
-            <p><input type="submit" value="Save changes"></p>
-                       
-        </form>
-<!-- /TMPL_IF -->
-<!-- /TMPL_IF -->
+            </ul></div>
+       </div>
+
+<!-- /TMPL_IF --><!-- TMPL_ELSE -->
+<!-- TMPL_IF NAME="shelvesloop" -->
 <h3>Virtual shelves</h3>
 
 <table>
@@ -266,20 +251,18 @@ function confirmDelete(s){
 <td>
 <!-- TMPL_IF NAME="viewcategory1" -->Private<!-- /TMPL_IF -->
 <!-- TMPL_IF NAME="viewcategory2" -->Public<!-- /TMPL_IF -->
-<!-- TMPL_IF NAME="viewcategory3" -->Free<!-- /TMPL_IF -->
+<!-- TMPL_IF NAME="viewcategory3" -->Open<!-- /TMPL_IF -->
 </td>
 <td><!-- TMPL_VAR NAME="shelfvirtualcount" --> </td>
-<td><!-- TMPL_IF name="mine" --><a href="/cgi-bin/koha/virtualshelves/shelves.pl?op=modif&amp;shelf=<!-- TMPL_VAR NAME="shelf" -->">Edit</a><!-- TMPL_ELSE -->&nbsp;<!-- /TMPL_IF --></td></tr>
-
+<td><!-- TMPL_IF name="mine" --><a href="/cgi-bin/koha/virtualshelves/shelves.pl?op=modif&amp;shelf=<!-- TMPL_VAR NAME="shelf" -->">Edit</a> <a href="/cgi-bin/koha/virtualshelves/shelves.pl?shelves=1&amp;DEL-<!-- TMPL_VAR NAME="shelf" -->=1" onclick="return confirmDelete('Are you sure you want to remove this virtual shelf?')">Delete</a><!-- TMPL_ELSE -->&nbsp;<!-- /TMPL_IF --></td></tr>
 <!-- /TMPL_LOOP -->
 </table>
-        <p><form action="/cgi-bin/koha/virtualshelves/shelves.pl" method="get"><input type="hidden" value="1" name="shelves" /><input type="submit" value="Add or remove virtual shelves" /></form></p>
-    <!-- /TMPL_IF -->
+<!-- /TMPL_IF -->
+
+<!-- /TMPL_IF -->
+<!-- /TMPL_IF -->
 
 </div>
 </div>
-<div class="yui-b">
-<!-- TMPL_INCLUDE NAME="cat-menu.inc" -->
-</div>
-</div>
+
 <!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
\ No newline at end of file
Unnamed repository; edit this file 'description' to name the repository.