Markup and style corrections.

[koha.git] / koha-tmpl / opac-tmpl / prog / en / modules / opac-shelves.tmpl

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 ca7cb0c..70c1826 100644 (file)
--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-shelves.tmpl
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-shelves.tmpl
@@ -241,6 +241,7 @@ $.tablesorter.addParser({
                     <!-- /TMPL_IF -->
                 </form>
             <!-- /TMPL_IF -->&nbsp;
+            <a href="#" class="send" onclick="open(CGIBIN+'opac-sendshelf.pl?shelfid=<!-- TMPL_VAR NAME="shelf" -->','win_form','dependant=yes,scrollbars=no,resizable=no,height=300,width=450,top=50,left=100')">Send List</a>
         </td>
         </tr>
                 <!-- /TMPL_LOOP -->
@@ -288,6 +289,10 @@ $.tablesorter.addParser({
           <!-- /TMPL_IF -->
         </form>
       <!-- /TMPL_IF -->&nbsp;
+<<<<<<< HEAD:koha-tmpl/opac-tmpl/prog/en/modules/opac-shelves.tmpl
+=======
+      <a href="#" class="send" onclick="open(CGIBIN+'opac-sendshelf.pl?shelfid=<!-- TMPL_VAR NAME="shelf" -->','win_form','dependant=yes,scrollbars=no,resizable=no,height=300,width=450,top=50,left=100')">Send List</a>
+>>>>>>> ffa3c9a... Markup and style corrections.:koha-tmpl/opac-tmpl/prog/en/modules/opac-shelves.tmpl
     </td>
                </tr>
             <!-- /TMPL_LOOP -->