Fixing Merge on shelves Adding Print and send List

This commit is contained in:
Henri-Damien LAURENT 2009-11-06 17:31:28 +01:00
parent 638dfd30e5
commit 46b30f4b0f

View file

@ -194,13 +194,10 @@ $(function() {
<input type="hidden" value="1" name="DEL-<!-- TMPL_VAR NAME="shelfnumber" -->"/> <input type="hidden" value="1" name="DEL-<!-- TMPL_VAR NAME="shelfnumber" -->"/>
<input type="submit" class="deleteshelf" value="Delete List" onclick="return confirmDelete(_('Are you sure you want to remove this List?'));"/> <input type="submit" class="deleteshelf" value="Delete List" onclick="return confirmDelete(_('Are you sure you want to remove this List?'));"/>
</form> </form>
<<<<<<< HEAD:koha-tmpl/opac-tmpl/prog/en/modules/opac-shelves.tmpl
=======
<a class="print" href="opac-shelves.pl" onclick="print(); return false;">Print</a> <a class="print" href="opac-shelves.pl" onclick="print(); return false;">Print</a>
<a href="#" class="send tag_hides" onclick="open(CGIBIN+'opac-sendshelf.pl?shelfid=<!-- TMPL_VAR NAME="shelfnumber" -->','win_form','dependant=yes,scrollbars=no,resizable=no,height=300,width=450,top=50,left=100')">Send List</a> <a href="#" class="send tag_hides" onclick="open(CGIBIN+'opac-sendshelf.pl?shelfid=<!-- TMPL_VAR NAME="shelfnumber" -->','win_form','dependant=yes,scrollbars=no,resizable=no,height=300,width=450,top=50,left=100')">Send List</a>
>>>>>>> cefbb72... Ticket 1110 : Balance carts and lists:koha-tmpl/opac-tmpl/prog/en/modules/opac-shelves.tmpl
<!-- TMPL_IF NAME="RequestOnOpac" --> <!-- TMPL_IF NAME="RequestOnOpac" -->
<span id="placehold"></span> <span id="placehold"></span>
<!-- /TMPL_IF --> <!-- /TMPL_IF -->