Bug 8184 - Duplicate budget page lacks heading and breadcrumbs

Adding title, heading, and breadcrumbs for "duplicate a budget"
operation. Also:
  - adding cancel link for duplicate and edit
  - correcting the CSS so that the "edit" menu button
    is styled like an edit button.
operations.

Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>

diff --git a/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css b/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css
index e591a73..96c8b7e 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css
+++ b/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css
@@ -905,7 +905,7 @@ fieldset.rows .inputnote {
     visibility:visible; /* you propably don't need to change this one */
     display:block;
 }
-#newbiblio a, #addchild a, #newentry a, #newshelf a, #newmenuc .first-child, #newsupplier .first-child, #newlabel a, #newtemplate a, #newlabelbatch a, #newpatroncardbatch a, #newprofile a, #newsubscription a, #newdictionary a, #newbasket a, #newrootbudget-button, #budgets_menuc .first-child, #periods_menuc .first-child {
+#newbiblio a, #addchild a, #newentry a, #newshelf a, #newmenuc .first-child, #newsupplier .first-child, #newlabel a, #newtemplate a, #newlabelbatch a, #newpatroncardbatch a, #newprofile a, #newsubscription a, #newdictionary a, #newbasket a, #newrootbudget-button, #budgets_menuc .first-child {
        padding-left : 34px;
        background-image: url("../../img/toolbar-new.gif");
        background-position : center left;
@@ -943,7 +943,8 @@ fieldset.rows .inputnote {
 #managelabel a,
 #managetemplate a,
 #managelabelbatch a,
-#manageprofile a {
+#manageprofile a,
+#periods_menuc .first-child {
        padding-left : 34px;
        background-image: url("../../img/toolbar-edit.gif");
        background-position : center left;

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgetperiods.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgetperiods.tt
index aae5925..4b25992 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgetperiods.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgetperiods.tt
@@ -89,7 +89,7 @@
             Add budget
         [% END %]
     [% END %]
-
+    [% IF ( duplicate_form ) %]› Duplicate budget[% END %]
     [% IF ( delete_confirm ) %]›
             Delete budget '[% budget_period_description %]'?
     [% END %]
@@ -136,7 +136,10 @@
             Delete budget '[% budget_period_description %]'?
         [% END %]
     [% END %]
-
+    <!-- duplicate a budget -->
+    [% IF ( duplicate_form ) %]
+        <a href="/cgi-bin/koha/admin/aqbudgetperiods.pl">Budgets</a> &rsaquo; Duplicate budget
+    [% END %]
     <!-- display budget periods list -->
     <!-- ########################################## -->
     [% IF ( else ) %]
@@ -152,6 +155,7 @@
 [% INCLUDE 'budgets-admin-toolbar.inc' %]
 
 [% IF ( duplicate_form ) %]
+<h3>Duplicate budget</h3>
 <form action="/cgi-bin/koha/admin/aqbudgetperiods.pl" name="f" method="post">
     <fieldset class="rows">
     <input type="hidden" name="op" value="duplicate_budget" />
@@ -195,7 +199,7 @@
     </fieldset>
 
     <fieldset class="action">
-        <input type="button" value="Save Changes"  onclick="CheckDuplicateForm(this.form)"    />
+        <input type="button" value="Save Changes"  onclick="CheckDuplicateForm(this.form)" /> <a class="cancel" href="/cgi-bin/koha/admin/aqbudgets.pl?budget_period_id=[% budget_period_id %]">Cancel</a>
     </fieldset>
 
 </form>
@@ -287,7 +291,7 @@
         <!-- ###################################### -->
         <input type="button" value="Save changes"  onclick="Check(this.form)"    />
         <!--             <input type="submit" value="Save Changes"  />  -->
-        <!--            <a href="/cgi-bin/koha/admin/aqbudgetperiods.pl" class="cancel">Cancel</a> -->
+        [% IF ( budget_period_id ) %]<a href="/cgi-bin/koha/admin/aqbudgets.pl?budget_period_id=[% budget_period_id %]" class="cancel">Cancel</a>[% END %]
     </fieldset>
 
 </form>