From 301038f732c6249b320d3376199b3da28b905e9f Mon Sep 17 00:00:00 2001 From: Alex Buckley Date: Sat, 18 Feb 2017 05:11:28 +0000 Subject: [PATCH] Bug 18002 - Tidied up the UI removing close button, and cancel links --- admin/aqbudgets.pl | 7 +++++-- koha-tmpl/intranet-tmpl/prog/en/includes/onboardinginclude.inc | 9 ++------- koha-tmpl/intranet-tmpl/prog/en/includes/onboardinginclude2.inc | 3 ++- koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgets.tt | 1 + 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/admin/aqbudgets.pl b/admin/aqbudgets.pl index 57e2bb2..b950f0f 100755 --- a/admin/aqbudgets.pl +++ b/admin/aqbudgets.pl @@ -223,9 +223,12 @@ if ($op eq 'add_form') { ModBudgetUsers($budget_hash->{budget_id}, @budgetusersid); $budget_modified = 1; - print $input->redirect("/cgi-bin/koha/acqui/acqui-home.pl"); - exit; + my $fundcreation = $input->param('fundcreation'); + if ($fundcreation eq "onboarding"){ + print $input->redirect("/cgi-bin/koha/acqui/acqui-home.pl"); + exit; + } } my $set_owner_to_children = $input->param('set_owner_to_children'); diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/onboardinginclude.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/onboardinginclude.inc index b372886..40f45aa 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/onboardinginclude.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/onboardinginclude.inc @@ -14,7 +14,6 @@ }
- ×

[% IF displayonboardscreen == "acquisitions" %]

Create a budget

@@ -47,7 +46,7 @@
  • - [% IF ( budget_period_active ) %][% ELSE %] [% END %] + [% IF ( budget_period_active ) %][% ELSE %] [% END %]
  • @@ -59,9 +58,5 @@
    [% ELSIF displayonboardscreen == "label" %] -

    testing

    - - - - +

    testing

    [% END %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/onboardinginclude2.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/onboardinginclude2.inc index 51ea060..b766dbc 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/onboardinginclude2.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/onboardinginclude2.inc @@ -24,6 +24,7 @@ +
      [% budget_parent_id = 0 %]
    1. @@ -55,7 +56,7 @@
      - Cancel +
      diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgets.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgets.tt index 6e09b87..87350c2 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgets.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgets.tt @@ -464,6 +464,7 @@ var MSG_PARENT_BENEATH_BUDGET = "- " + _("New budget-parent is beneath budget") +
        [% IF ( budget_parent_id ) %]
      1. -- 2.1.4