Shelves - fixup display, in particular intranet side

Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
Signed-off-by: Joshua Ferraro <jmf@liblime.com>

diff --git a/C4/VirtualShelves.pm b/C4/VirtualShelves.pm
index 159881c..58430c3 100644 (file)
--- a/C4/VirtualShelves.pm
+++ b/C4/VirtualShelves.pm
@@ -172,7 +172,7 @@ sub GetShelvesSummary {
 
 =item GetShelf
 
-  (shelfnumber,shelfname,owner,category) = &GetShelf($shelfnumber);
+  (shelfnumber,shelfname,owner,category,sortfield) = &GetShelf($shelfnumber);
 
 Looks up information about the contents of virtual virtualshelves number
 C<$shelfnumber>
@@ -184,7 +184,7 @@ Returns the database's information on 'virtualshelves' table.
 sub GetShelf {
     my ($shelfnumber) = @_;
     my $query = qq(
-        SELECT shelfnumber,shelfname,owner,category,sortfield
+        SELECT shelfnumber, shelfname, owner, category, sortfield
         FROM   virtualshelves
         WHERE  shelfnumber=?
     );

diff --git a/C4/VirtualShelves/Page.pm b/C4/VirtualShelves/Page.pm
index 8aca409..fbfb4bf 100755 (executable)
--- a/C4/VirtualShelves/Page.pm
+++ b/C4/VirtualShelves/Page.pm
@@ -27,6 +27,7 @@ use C4::VirtualShelves qw/:DEFAULT GetShelvesSummary/;
 use C4::Biblio;
 use C4::Items;
 use C4::Auth qw/get_session/;
+use C4::Members;
 use C4::Output;
 use Exporter;
 
@@ -209,26 +210,29 @@ SWITCH: {
 # rebuild shelflist in case a shelf has been added
 # $shelflist = GetShelves( $loggedinuser, 2 );
 $showadd and $template->param(showadd => 1);
-my $i = 0;
 my @shelvesloop;
 my @shelveslooppriv;
 my $numberCanManage = 0;
 
 foreach my $element (sort { lc($shelflist->{$a}->{'shelfname'}) cmp lc($shelflist->{$b}->{'shelfname'}) } keys %$shelflist) {
        my %line;
-       (++$i % 2) and $shelflist->{$element}->{toggle} = 1; # $line{'toggle'} = $i;
        $shelflist->{$element}->{shelf} = $element;
        my $category = $shelflist->{$element}->{'category'};
+       my $owner    = $shelflist->{$element}->{ 'owner'  };
        my $canmanage = ShelfPossibleAction( $loggedinuser, $element, 'manage' );
        $shelflist->{$element}->{"viewcategory$category"} = 1;
        $shelflist->{$element}->{canmanage} = $canmanage;
-       if ($shelflist->{$element}->{'owner'} eq $loggedinuser) {
+       if ($owner eq $loggedinuser or $canmanage) {
                $shelflist->{$element}->{'mine'} = 1;
-       }
-       $numberCanManage++ if $canmanage;
+       } 
+       my $member = GetMember($owner,'borrowernumber');
+       $shelflist->{$element}->{ownername} = $member->{firstname} . " " . $member->{surname};
+       $numberCanManage++ if $canmanage;       # possibly outmoded
        if ($shelflist->{$element}->{'category'} eq '1') {
+               (scalar(@shelveslooppriv) % 2) and $shelflist->{$element}->{toggle} = 1;
                push (@shelveslooppriv, $shelflist->{$element});
        } else {
+               (scalar(@shelvesloop)     % 2) and $shelflist->{$element}->{toggle} = 1;
                push (@shelvesloop, $shelflist->{$element});
        }
 }

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 0d9e5df..f27cd01 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/shelves.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/shelves.tmpl
@@ -31,8 +31,8 @@ $(document).ready(function(){
                }
        }
     /**
-     * this function checks all checkbox 
-     * or uncheck all if there are already checked.
+     * This function checks all checkboxes if all are empty,
+     * or unchecks all if any already checked.
      */
     function CheckAll(){
         var checkboxes = document.getElementsByTagName('input');
@@ -45,7 +45,7 @@ $(document).ready(function(){
         }
     }
     /**
-     * this function return true if all checkbox are checked
+     * This function returns true if ALL checkboxes are checked
      */
     function areAllChecked(){
         var checkboxes = document.getElementsByTagName('input');
@@ -232,9 +232,9 @@ $(document).ready(function(){
     <!-- TMPL_IF name="edit" -->
                <input type="hidden" name="op" value="modifsave" />
                <input type="hidden" name="shelfnumber" value="<!-- TMPL_VAR name="shelfnumber" -->" />
-               <legend>Edit List <i><!-- TMPL_VAR name="shelfname"--></i></legend>
+               <legend>Edit List <i><!-- TMPL_VAR name="shelfname" --></i></legend>
                <ol>
-               <li><label for="shelfname">Name: </label><input type="text" id="shelfname" name="shelfname" size="25" value="<!-- TMPL_VAR name="shelfname"-->" /></li>
+               <li><label for="shelfname">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">
@@ -274,17 +274,19 @@ $(document).ready(function(){
 <!-- TMPL_IF NAME="shelvesloopall" -->
 <h3>Lists</h3>
 <table>
-<tr><th>Name</th><th>Category</th><th>Items</th><th>&nbsp;</th></tr>
+<tr><th>Name</th><th>Owner</th><th>Category</th><th>Items</th><th>&nbsp;</th></tr>
 <!-- TMPL_LOOP NAME="shelvesloopall" -->
 <tr<!-- TMPL_IF NAME="toggle" --> class="highlight"<!-- /TMPL_IF -->>
 <td><a href="/cgi-bin/koha/virtualshelves/shelves.pl?viewshelf=<!-- TMPL_VAR NAME="shelf" -->"><!-- TMPL_VAR NAME="shelfname" --></a></td>
+<td><!-- TMPL_IF NAME="owner" --><!-- TMPL_VAR NAME="ownername" --><!-- TMPL_ELSE -->Koha Admin<!-- /TMPL_IF -->
+</td>
 <td>
   <!-- TMPL_IF NAME="viewcategory1" -->Private<!-- /TMPL_IF -->
   <!-- TMPL_IF NAME="viewcategory2" -->Public<!-- /TMPL_IF -->
   <!-- TMPL_IF NAME="viewcategory3" -->Open<!-- /TMPL_IF -->
 </td>
 <td><!-- TMPL_VAR NAME="count" --></td>
-<td><!-- TMPL_IF NAME="mine" -->
+<td>
        <form action="/cgi-bin/koha/virtualshelves/shelves.pl" method="get">
                <input type="hidden" name="shelfnumber" value="<!-- TMPL_VAR NAME="shelf" -->" />
                <input type="hidden" name="op" value="modif" />
@@ -300,7 +302,6 @@ $(document).ready(function(){
                <input type="submit" onclick='return confirmDelete(_("Are you sure you want to remove this List?"));' value="Delete" />
                <!-- /TMPL_IF -->
        </form>
-       <!-- /TMPL_IF -->&nbsp;
 </td>
 </tr>
 <!-- /TMPL_LOOP -->

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 eb777ca..8232d05 100644 (file)
--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-shelves.tmpl
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-shelves.tmpl
@@ -153,13 +153,17 @@
         
                <!-- TMPL_IF NAME="loggedinusername" -->
         <table>
-        <tr><th>List Name</th><th>Contents</th><th>Sort by</th><th>&nbsp;</th></tr>
+        <tr><th>List Name</th><th>Contents</th><th>Sort by</th><th>Type</th><th>&nbsp;</th></tr>
             <!-- TMPL_IF NAME="shelveslooppriv" -->
                 <!-- TMPL_LOOP NAME="shelveslooppriv" -->
                     <!-- TMPL_IF NAME="toggle" --><tr class="highlight"><!--TMPL_ELSE--><tr><!-- /TMPL_IF -->
         <td><a href="opac-shelves.pl?viewshelf=<!-- TMPL_VAR NAME="shelf" -->"><!-- TMPL_VAR NAME="shelfname" --></a></td>
         <td><!-- TMPL_VAR NAME="count" --> item(s)</td>
         <td><!-- TMPL_VAR NAME="sortfield" --></td>
+        <td><!-- TMPL_IF NAME="viewcategory1" -->Private<!-- /TMPL_IF -->
+                       <!-- TMPL_IF NAME="viewcategory2" -->Public<!-- /TMPL_IF -->
+                       <!-- TMPL_IF NAME="viewcategory3" -->Open<!-- /TMPL_IF -->
+               </td>
         <td>
             <!-- TMPL_IF NAME="mine" -->
                                <form action="opac-shelves.pl" method="get">
@@ -197,11 +201,16 @@
                <!-- /TMPL_IF -->
         <!-- TMPL_IF NAME="shelvesloop" -->
         <table>
-        <tr><th>List Name</th><th>Contents</th></tr>
+        <tr><th>List Name</th><th>Contents</th><th>Type</th></tr>
             <!-- TMPL_LOOP NAME="shelvesloop" -->
                 <!-- TMPL_IF NAME="toggle" --><tr class="highlight"><!--TMPL_ELSE--><tr><!-- /TMPL_IF -->
                <td><a href="opac-shelves.pl?viewshelf=<!-- TMPL_VAR NAME="shelf" -->"><!-- TMPL_VAR NAME="shelfname" --></a></td>
-               <td><!-- TMPL_VAR NAME="count" --> item(s)</td></tr>
+               <td><!-- TMPL_VAR NAME="count" --> item(s)</td>
+        <td><!-- TMPL_IF NAME="viewcategory1" -->Private<!-- /TMPL_IF -->
+                       <!-- TMPL_IF NAME="viewcategory2" -->Public<!-- /TMPL_IF -->
+                       <!-- TMPL_IF NAME="viewcategory3" -->Open<!-- /TMPL_IF -->
+               </td>
+               </tr>
             <!-- /TMPL_LOOP -->
         </table>
         <!-- TMPL_ELSE -->