Merge branch 'bug_9632' into 3.12-master

This commit is contained in:
Jared Camins-Esakov 2013-02-18 08:51:45 -05:00
commit 61faf37355

View file

@ -46,8 +46,6 @@
}
$(document).ready(function() {
new YAHOO.widget.Button("newcurrency");
// prevents users to check active with a currency != 1
$("#rate").keyup(function() {
check_currency( $(this).val() );
@ -76,10 +74,9 @@
<div class="yui-b">
[% IF ( else ) %]
<div id="toolbar">
<ul class="toolbar">
<li><a id="newcurrency" href="[% script_name %]?op=add_form">New currency</a></li>
</ul></div>
<div id="toolbar" class="btn-toolbar">
<a class="btn btn-small" id="newcurrency" href="[% script_name %]?op=add_form"><i class="icon-plus"></i> New currency</a>
</div>
[% END %]
[% IF ( add_form ) %]