Merge branch 'bug_9639' into 3.12-master

This commit is contained in:
Jared Camins-Esakov 2013-02-18 09:03:33 -05:00
commit 398d7a2858

View file

@ -30,10 +30,6 @@ function Check(f) {
alert(alertString2); alert(alertString2);
} }
} }
$(document).ready(function() {
new YAHOO.widget.Button("addtag");
});
//]]> //]]>
</script> </script>
</head> </head>
@ -65,10 +61,9 @@ $(document).ready(function() {
<div class="yui-b"> <div class="yui-b">
[% IF ( else ) %] [% IF ( else ) %]
<div id="toolbar"> <div id="toolbar" class="btn-toolbar">
<ul class="toolbar"> <a class="btn btn-small" id="addtag" href="/cgi-bin/koha/admin/marctagstructure.pl?op=add_form&amp;frameworkcode=[% frameworkcode %]"><i class="icon-plus"></i> New tag</a>
<li><a id="addtag" href="/cgi-bin/koha/admin/marctagstructure.pl?op=add_form&amp;frameworkcode=[% frameworkcode %]">New tag</a></li> </div>[% END %]
</ul></div>[% END %]
<h1>MARC Framework for [% IF ( frameworkcode ) %][% frameworktext %] ([% frameworkcode %])[% ELSE %]default MARC framework[% END %]</h1> <h1>MARC Framework for [% IF ( frameworkcode ) %][% frameworktext %] ([% frameworkcode %])[% ELSE %]default MARC framework[% END %]</h1>