Bug 12214: (follow-up) Clean up reports-toolbar.inc, show Edit link when SQL has...

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Galen Charlton <gmc@esilibrary.com>

diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/reports-toolbar.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/reports-toolbar.inc
index 782fc83..b7e7a79 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/reports-toolbar.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/reports-toolbar.inc
@@ -1,17 +1,31 @@
 <div id="toolbar" class="btn-toolbar">
-    [% IF ( CAN_user_reports_create_reports ) %]<div class="btn-group">
-        <button class="btn btn-small dropdown-toggle" data-toggle="dropdown"><i class="icon-plus"></i> New report <span class="caret"></span></button>
+    [% IF ( CAN_user_reports_create_reports ) %]
+        <div class="btn-group">
+            <button class="btn btn-small dropdown-toggle" data-toggle="dropdown"><i class="icon-plus"></i> New report <span class="caret"></span></button>
             <ul class="dropdown-menu">
                 <li id="newmenuc"><a href="/cgi-bin/koha/reports/guided_reports.pl?phase=Build%20new">New guided report</a> </li>
                 <li id="newsql"><a href="/cgi-bin/koha/reports/guided_reports.pl?phase=Create%20report%20from%20SQL">New SQL report</a> </li>
             </ul>
-    </div>[% END %]
-[% IF ( showsql || execute || editsql || save_successful ) %]
-    [% UNLESS ( errors ) %][%# Unless there are errors saving a report %]
-        [% UNLESS ( editsql ) %][%# Do not show edit button on edit page %]
-            [% IF ( CAN_user_reports_create_reports ) %]<div class="btn-group"><a id="editreport" class="btn btn-small" href="/cgi-bin/koha/reports/guided_reports.pl?reports=[% id %]&amp;phase=Edit%20SQL"><i class="icon-pencil"></i> Edit</a></div>[% END %]
+        </div>
+    [% END %]
+
+    [% IF ( showsql || execute || editsql || save_successful ) %]
+        [% UNLESS ( editsql ) # Do not show edit button on edit page %]
+            [% IF ( CAN_user_reports_create_reports ) %]
+                <div class="btn-group">
+                    <a id="editreport" class="btn btn-small" href="/cgi-bin/koha/reports/guided_reports.pl?reports=[% id %]&amp;phase=Edit%20SQL">
+                        <i class="icon-pencil"></i> Edit
+                    </a>
+                </div>
+            [% END %]
+        [% END %]
+
+        [% UNLESS ( errors ) # Unless there are errors saving a report %]
+            <div class="btn-group">
+                <a id="runreport" class="btn btn-small" href="/cgi-bin/koha/reports/guided_reports.pl?reports=[% id %]&amp;phase=Run%20this%20report">
+                    <i class="icon-play"></i> Run report
+                </a>
+            </div>
         [% END %]
-        <div class="btn-group"><a id="runreport" class="btn btn-small" href="/cgi-bin/koha/reports/guided_reports.pl?reports=[% id %]&amp;phase=Run%20this%20report"><i class="icon-play"></i> Run report</a></div>
     [% END %]
-[% END %]
 </div>