Merge remote branch 'kc/new/bug_4912' into kcmaster

diff --git a/koha-tmpl/opac-tmpl/prog/en/css/opac.css b/koha-tmpl/opac-tmpl/prog/en/css/opac.css
index f04a51c..aa295c9 100644 (file)
--- a/koha-tmpl/opac-tmpl/prog/en/css/opac.css
+++ b/koha-tmpl/opac-tmpl/prog/en/css/opac.css
@@ -9,7 +9,7 @@ a, a:visited {
        color : #006699;
 }
 
-a:hover,input.editshelf:hover,a.editshelf:hover,input.deleteshelf:hover {
+a:hover,#toolbar input.editshelf:hover,input.editshelf:hover,a.editshelf:hover,input.deleteshelf:hover {
        color : #990033;
 }
 

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 e8d18f8..0ee0e66 100644 (file)
--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-shelves.tmpl
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-shelves.tmpl
@@ -211,7 +211,7 @@ $(function() {
 
 <a class="print tag_hides" href="opac-shelves.pl" onclick="print(); return false;">Print List</a>
 
-                <!-- TMPL_IF NAME="manageshelf" --> | <a class="editshelf tag_hides" href="/cgi-bin/koha/opac-shelves.pl?shelfnumber=<!-- TMPL_VAR NAME="shelfnumber" -->&amp;op=modif">Edit List</a>
+                <!-- TMPL_IF NAME="manageshelf" --> | <form method="get" action="opac-shelves.pl" class="tag_hides"><input type="hidden" name="op" value="modif" /><!-- TMPL_IF NAME="showprivateshelves" --><input type="hidden" name="display" value="privateshelves" /><!-- /TMPL_IF --> <input type="hidden" name="shelfnumber" value="<!-- TMPL_VAR NAME="shelfnumber" -->" /> <input type="submit" class="editshelf tag_hides" value="Edit List" /></form>
                       <form method="post" action="opac-shelves.pl" class="tag_hides">
                         <input type="hidden" value="1" name="shelves"/>
                     <!-- TMPL_IF NAME="showprivateshelves" -->
@@ -477,7 +477,7 @@ $(function() {
                       </table>
                       <div class="pages"><!-- TMPL_VAR name="pagination_bar"--></div>
                     <!-- TMPL_ELSE -->
-                         No Private Lists.
+                         <p>No private lists.</p>
                     <!-- /TMPL_IF --><!-- /shelveslooppriv -->
                   <!-- /TMPL_IF --><!-- /showprivateshelves -->
                   <!-- TMPL_ELSE --><!-- /loggedinusername -->
@@ -541,7 +541,7 @@ $(function() {
                       </table>
                   <!-- TMPL_IF NAME="pagination_bar" --><div class="pages"><!-- TMPL_VAR name="pagination_bar"--></div><!-- /TMPL_IF -->
                   <!-- TMPL_ELSE --><!-- /shelvesloop -->
-                    <!-- TMPL_IF NAME="showpublicshelves" -->No Public Lists.<!-- /TMPL_IF -->
+                    <!-- TMPL_IF NAME="showpublicshelves" --><p>No public lists.</p><!-- /TMPL_IF -->
                   <!-- /TMPL_IF --><!-- /shelvesloop -->
                   
                     </div><!-- /publicshelves -->