Merge branch 'bug_9640' into 3.12-master

This commit is contained in:
Jared Camins-Esakov 2013-02-18 09:04:46 -05:00
commit a012efca4b
1 changed files with 3 additions and 15 deletions

View File

@ -544,21 +544,9 @@ function CheckRuleForm(f) {
[% IF ( display_list ) %]
<div id="toolbar">
<script type="text/javascript">
//<![CDATA[
// prepare DOM for YUI Toolbar
$(document).ready(function() {
yuiToolbar();
});
// YUI Toolbar Functions
function yuiToolbar() {
new YAHOO.widget.Button("newrule");
} //]]>
</script>
<ul class="toolbar">
<li><a id="newrule" href="[% script_name %]?op=add_matching_rule">New record matching rule</a></li>
</ul></div>
<div id="toolbar" class="btn-toolbar">
<a class="btn btn-small" id="newrule" href="[% script_name %]?op=add_matching_rule"><i class="icon-plus"></i> New record matching rule</a>
</div>
<h2>Record matching rules</h2>
[% IF ( added_matching_rule ) %]