Bug 15360: Incorrect or mislabeled behavior on Authorities "New from Z39.50" Button

[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 b42074a..3c5b40f 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,47 +1,56 @@
 [% INCLUDE 'blocking_errors.inc' %]
 [% IF ( authid || CAN_user_editauthorities) %]
 
-<div id="toolbar" class="btn-toolbar">
-
-[% IF ( authid ) %]
-    [% 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>
+    <div id="toolbar" class="btn-toolbar">
+        [% IF ( CAN_user_editauthorities ) %]
+            <div class="btn-group">
+                <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">
+                    [% IF servers.count > 0 %]
+                        <li><a id="z3950_new" href="#">New from Z39.50</a></li>
+                        <li role="separator" class="divider"></li>
+                    [% END %]
+                    [% 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>
         [% END %]
-    [% END %]
-
-    <div class="btn-group">
-        <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">
-            <li><a href="/cgi-bin/koha/authorities/export.pl?format=mads&amp;op=export&amp;authid=[% authid %]">MADS (XML)</a></li>
-            <li><a href="/cgi-bin/koha/authorities/export.pl?format=marcxml&amp;op=export&amp;authid=[% authid %]">MARCXML</a></li>
-            <li><a href="/cgi-bin/koha/authorities/export.pl?format=marc8&amp;op=export&amp;authid=[% authid %]">MARC (non-Unicode/MARC-8)</a></li>
-            <li><a href="/cgi-bin/koha/authorities/export.pl?format=utf8&amp;op=export&amp;authid=[% authid %]">MARC (Unicode/UTF-8)</a></li>
-        </ul>
-    </div>
-[% END %]
 
-[% IF ( CAN_user_editauthorities ) %]
-    <div class="btn-group">
-        <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 authority_type IN authority_types %]
-                <li><a href="/cgi-bin/koha/authorities/authorities.pl?authtypecode=[% authority_type.authtypecode %]">[% authority_type.authtypetext %]</a></li>
+        [% IF ( authid ) %]
+            [% IF ( CAN_user_editauthorities ) %]
+                <div class="btn-group">
+                    <button class="btn btn-default btn-sm dropdown-toggle" data-toggle="dropdown">
+                        <i class="fa fa-pencil"></i> Edit <span class="caret"></span>
+                    </button>
+                    <ul class="dropdown-menu">
+                        <li><a id="editAuth" href="/cgi-bin/koha/authorities/authorities.pl?authid=[% authid %]">Edit record</a></li>
+                        <li><a id="dupAuth" href="/cgi-bin/koha/authorities/authorities.pl?authid=[% authid %]&amp;op=duplicate">Edit as new (duplicate)</a></li>
+                        [% IF servers.count > 0 %]
+                            <li><a id="z3950_replace" href="#">Replace record via Z39.50/SRU</a></li>
+                        [% END %]
+                        [% UNLESS ( count ) %]
+                            <li><a href="#" id="delAuth">Delete record</a></li>
+                        [% END %]
+                    </ul>
+                </div>
             [% END %]
-        </ul>
+
+            <div class="btn-group">
+                <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">
+                    <li><a href="/cgi-bin/koha/authorities/export.pl?format=mads&amp;op=export&amp;authid=[% authid %]">MADS (XML)</a></li>
+                    <li><a href="/cgi-bin/koha/authorities/export.pl?format=marcxml&amp;op=export&amp;authid=[% authid %]">MARCXML</a></li>
+                    <li><a href="/cgi-bin/koha/authorities/export.pl?format=marc8&amp;op=export&amp;authid=[% authid %]">MARC (non-Unicode/MARC-8)</a></li>
+                    <li><a href="/cgi-bin/koha/authorities/export.pl?format=utf8&amp;op=export&amp;authid=[% authid %]">MARC (Unicode/UTF-8)</a></li>
+                </ul>
+            </div>
+        [% END %]
     </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 %]