Merge branch 'bug_9646' into 3.12-master

This commit is contained in:
Jared Camins-Esakov 2013-02-18 09:11:25 -05:00
commit 9f4069fb8a

View file

@ -145,7 +145,7 @@
<form action="[% script_name %]" method="post">
<input type="hidden" name="op" value="delete_confirmed" />
<input type="hidden" name="searchfield" value="[% searchfield %]" />
<input type="submit" value="Delete this Printer" />
<input type="submit" value="Delete this printer" />
</form> <form action="[% script_name %]" method="post">
<input type="submit" value="Do not Delete" />
</form>
@ -160,18 +160,9 @@
[% IF ( else ) %]
<div id="toolbar">
<script type="text/javascript">
//<![CDATA[
// prepare DOM for YUI Toolbar
$(document).ready(function() {
new YAHOO.widget.Button("newprinter");
});
//]]>
</script>
<ul class="toolbar">
<li><a id="newprinter" href="/cgi-bin/koha/admin/printers.pl?op=add_form">New printer</a></li>
</ul></div>
<div id="toolbar" class="btn-toolbar">
<a class="btn btn-small" id="newprinter" href="/cgi-bin/koha/admin/printers.pl?op=add_form"><i class="icon-plus"></i> New printer</a>
</div>
<h2>Printers</h2>
[% IF ( searchfield ) %]