From: Chris Cormack <chrisc@catalyst.net.nz>
Date: Fri, 8 Apr 2011 01:02:55 +0000 (+1200)
Subject: Merge remote branch 'kc/new/bug_4912' into kcmaster
X-Git-Url: http://git.rot13.org/?p=koha.git;a=commitdiff_plain;h=f098258e8cf2d616c6bbc35e44c6a1df47be8517

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

f098258e8cf2d616c6bbc35e44c6a1df47be8517
diff --cc koha-tmpl/opac-tmpl/prog/en/modules/opac-shelves.tmpl
index e8d18f8569,998eeebb1d..0ee0e66f5f
--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-shelves.tmpl
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-shelves.tmpl
@@@ -475,9 -411,8 +475,9 @@@ $(function() 
                            </tr>
                          <!-- /TMPL_LOOP -->
                        </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 -->
@@@ -539,9 -478,8 +539,9 @@@
                          </tr>
                      <!-- /TMPL_LOOP --><!-- /shelvesloop -->
                        </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 -->