Bug 20568: Fix bad resolution conflict with bug 18403

[koha.git] / koha-tmpl / intranet-tmpl / prog / en / includes / authorities-toolbar.inc

diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/authorities-toolbar.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/authorities-toolbar.inc
index 902a2d1..b42074a 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/authorities-toolbar.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/authorities-toolbar.inc
@@ -1,25 +1,19 @@
-<script type="text/javascript">
-//<![CDATA[
-    $(document).ready(function() {
-        $("#delAuth").click(function(){
-            confirm_deletion();
-            return false;
-        });
-    });
+[% INCLUDE 'blocking_errors.inc' %]
+[% IF ( authid || CAN_user_editauthorities) %]
 
-//]]>
-</script>
 <div id="toolbar" class="btn-toolbar">
 
 [% IF ( authid ) %]
-    <div class="btn-group"><a class="btn btn-small" id="editAuth" href="authorities.pl?authid=[% authid %]"><i class="icon-pencil"></i> Edit</a></div>
-    [% UNLESS ( count ) %]
-        <div class="btn-group"><a href="#" class="btn btn-small" id="delAuth"><i class="icon-remove"></i> Delete</a></div>
+    [% IF ( CAN_user_editauthorities ) %]
+        <div class="btn-group"><a class="btn btn-default btn-sm" id="editAuth" href="authorities.pl?authid=[% authid %]"><i class="fa fa-pencil"></i> Edit</a></div>
+        <div class="btn-group"><a class="btn btn-default btn-sm" id="dupAuth" href="authorities.pl?authid=[% authid %]&amp;op=duplicate"><i class="fa fa-copy"></i> Duplicate</a></div>
+        [% UNLESS ( count ) %]
+            <div class="btn-group"><a href="#" class="btn btn-default btn-sm" id="delAuth"><i class="fa fa-trash"></i> Delete</a></div>
+        [% END %]
     [% END %]
-    <div class="btn-group"><a class="btn btn-small" id="dupAuth" href="authorities.pl?authid=[% authid %]&op=duplicate"><i class="icon-pencil"></i> Duplicate</a></div>
 
     <div class="btn-group">
-        <a class="btn btn-small dropdown-toggle" data-toggle="dropdown" href="#"><i class="icon-download-alt"></i> Save
+        <a class="btn btn-default btn-sm dropdown-toggle" data-toggle="dropdown" href="#"><i class="fa fa-download"></i> Save
         <span class="caret"></span>
         </a>
         <ul class="dropdown-menu">
@@ -31,14 +25,23 @@
     </div>
 [% END %]
 
+[% IF ( CAN_user_editauthorities ) %]
     <div class="btn-group">
-        <a class="btn btn-small dropdown-toggle" data-toggle="dropdown" href="#"><i class="icon-plus"></i> New authority
+        <a class="btn btn-default btn-sm dropdown-toggle" data-toggle="dropdown" href="#"><i class="fa fa-plus"></i> New authority
         <span class="caret"></span>
         </a>
         <ul class="dropdown-menu">
-            [% FOREACH authtypesloo IN authtypesloop %]
-            <li><a href="/cgi-bin/koha/authorities/authorities.pl?authtypecode=[% authtypesloo.value %]">[% authtypesloo.authtypetext %]</a></li>
+            [% FOREACH authority_type IN authority_types %]
+                <li><a href="/cgi-bin/koha/authorities/authorities.pl?authtypecode=[% authority_type.authtypecode %]">[% authority_type.authtypetext %]</a></li>
             [% END %]
         </ul>
     </div>
+    [% IF servers.count > 0 %]
+        <div class="btn-group">
+            <a class="btn btn-default btn-sm" id="z3950submit" href="#"><i class="fa fa-search"></i> New from Z39.50</a>
+        </div>
+    [% END %]
+[% END %]
 </div>
+
+[% END %]