From 71cf702a1f7ec81f59962f55cd263d350b090e84 Mon Sep 17 00:00:00 2001 From: Alex Buckley Date: Sat, 18 Feb 2017 01:56:30 +0000 Subject: [PATCH] BUg 18002 - Started to add label layout creation form to onboardinginclude.inc file --- admin/aqbudgets.pl | 7 +- .../prog/en/includes/onboardinginclude.inc | 75 ++++++++++++++++++++-- .../prog/en/includes/onboardinginclude2.inc | 6 +- .../prog/en/modules/admin/aqbudgets.tt | 1 + .../prog/en/modules/labels/label-home.tt | 4 +- 5 files changed, 81 insertions(+), 12 deletions(-) diff --git a/admin/aqbudgets.pl b/admin/aqbudgets.pl index 57e2bb2..4943473 100755 --- a/admin/aqbudgets.pl +++ b/admin/aqbudgets.pl @@ -223,8 +223,11 @@ 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 $fundcreated = $input->param('fundcreated'); + if ($fundcreated eq "onboarding") { + print $input->redirect("/cgi-bin/koha/acqui/acqui-home.pl"); + exit; + } } diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/onboardinginclude.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/onboardinginclude.inc index b372886..41eb8fb 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/onboardinginclude.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/onboardinginclude.inc @@ -47,7 +47,7 @@
  • - [% IF ( budget_period_active ) %][% ELSE %] [% END %] +
  • @@ -59,9 +59,72 @@ [% ELSIF displayonboardscreen == "label" %] -

    testing

    - - - +
    +

    Labels

    +
    +
    + [% IF ( layout_id ) %]Edit[% ELSE %]Create[% END %] label layout +
      +
    1. + + +
    2. +
    3. + + +
    4. +
    5. + + +
    6. +
    7. +
      + Bibliographic data to print +
        +
      1. + [% IF ( layout_string ) %] + + [% ELSE %] + + [% END %] +
        +

        + [% FOREACH text_field IN fields %] +   - [% END %] +    + [% END %] +

        +
        +
      2. + [% UNLESS ( layout_string ) %] +
      3. + [% ELSE %] +
      4. + [% END %] +[% 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..f237815 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/onboardinginclude2.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/onboardinginclude2.inc @@ -23,13 +23,13 @@ [% END %] +
          [% budget_parent_id = 0 %]
        1. Fund parent: - [% budget_parent_name %] - [% budget_parent_id %] - [% budget_parent_name %] + [% budget_parent_id %]
        2. @@ -55,7 +55,7 @@
      - Cancel +
    8. 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..e9171ef 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. diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-home.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-home.tt index f5e7725..83d981f 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-home.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-home.tt @@ -20,7 +20,9 @@
        [% INCLUDE 'labels-toolbar.inc' %]
        - + [% IF + [% displayonboardscreen == "label" %] + [% INCLUDE 'onboardinginclude.inc' %]
    -- 2.1.4