From 71cf702a1f7ec81f59962f55cd263d350b090e84 Mon Sep 17 00:00:00 2001
From: Alex Buckley <alexbuckley@catalyst.net.nz>
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 @@
 
                     <li>
                         <label for="budget_period_active">Make budget active: </label>
-                        [% IF ( budget_period_active ) %]<input type="checkbox" checked="checked" id="budget_period_active" name="budget_period_active" value="1" />[% ELSE %]  <input type="checkbox" id="budget_period_active" name="budget_period_active" value="1"/> [% END %]
+                        <input type="checkbox" checked="checked" id="budget_period_active" name="budget_period_active" value="1" />
                     </li>
                 </ol>
             </fieldset>
@@ -59,9 +59,72 @@
         </form>
     </div>
     [% ELSIF displayonboardscreen == "label" %]
-<h2>testing</h2>
-
-
-
+    <div id="onboardingModal">
+        <h2>Labels</h2>
+        <form name="input" action="/cgi-bin/koha/labels/label-edit-layout.pl" method="get">
+             <fieldset class="rows">
+             <legend>[% IF ( layout_id ) %]Edit[% ELSE %]Create[% END %] label layout</legend>
+             <ol>
+                  <li>
+                         <label for="layout_name">Layout name: </label>
+                         <input type="text" name="layout_name" id="layout_name" size="20" value="[% layout_name %]" />
+                  </li>
+                  <li>
+                         <label for="barcode_type">Choose barcode type (encoding): </label>
+                         <select name="barcode_type" id="barcode_type">
+                            [% FOREACH barcode_type IN barcode_types %]
+                                [% IF ( barcode_type.selected ) %]
+                                    <option value="[% barcode_type.type %]" selected="selected">[% barcode_type.name %]</option>
+                                [% ELSE %]
+                                    <option value="[% barcode_type.type %]">[% barcode_type.name %]</option>
+                                [% END %]
+                            [% END %]
+                         </select>
+                  </li>
+                  <li>
+                         <label for="printing_type">Choose layout type: </label>
+                         <select name="printing_type" id="printing_type">
+                         [% FOREACH label_type IN label_types %]
+                              [% IF ( label_type.selected ) %]
+                                  <option value="[% label_type.type %]" selected="selected">[% PROCESS translate_label_types type=label_type.type %]</option>
+                              [% ELSE %]
+                                  <option value="[% label_type.type %]">[% PROCESS translate_label_types type=label_type.type %]</option>
+                              [% END %]
+                         [% END %]
+                         </select>
+                  </li>
+                  <li>
+                       <fieldset>
+                           <legend>Bibliographic data to print</legend>
+                           <ol>
+                                 <li class="radio">
+                                    [% IF ( layout_string ) %]
+                                        <input type="radio" name="layout_choice" id="layout_choice_order" value="layout_table" checked="che    cked" /><label for="layout_choice_order">Choose order of text fields to print</label>
+                                    [% ELSE %]
+                                        <input type="radio" name="layout_choice" id="layout_choice_order" value="layout_table" /><label for    ="layout_choice_order">Choose Order Of Text Fields to Print</label>
+                                    [% END %]
+                                    <div id="layout_table">
+                                        <p>
+                                        [% FOREACH text_field IN fields %]
+                                            <select name="[% text_field.field_name %]" id="[% text_field.field_name |url %]">
+                                                <option value=""></option>
+                                                [% FOREACH orde IN [1..field_count] %]
+                                                    [% IF ( orde == text_field.order ) %]
+                                                         <option value="[% orde %]" selected="1">[% orde %]</option>
+                                                    [% ELSE %]
+                                                         <option value="[% orde %]">[% orde %]</option>
+                                                    [% END %]
+                                                [% END %]
+                                            </select>&nbsp;<label for="[% text_field.field_name |url %]">[% text_field.field_la    bel %]</label>
 
-    [% END %]
+                                            &nbsp;&nbsp;
+                                        [% END %]
+                                        </p>
+                                    </div>
+                                 </li>
+                                 [% UNLESS ( layout_string ) %]
+                                    <li class="radio"><input type="radio" id="layout_choice_list" name="layout_choice" value="layou    t_string" checked="checked" /> <label for="layout_choice_list">List fields</label></li>
+                                 [% ELSE %]
+                                    <li class="radio"><input type="radio" id="layout_choice_list" name="layout_choice" value="layou    t_string" /> <label for="layout_choice_list">List Fields</label></li>
+                                 [% 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 %]
             </legend>
             <input type="hidden" name="op" value="add_validate" />
+            <input type="hidden" name="fundcreated" value="onboarding" />
             <input type="hidden" name="checked" value="0" />
             <ol>
                 [% budget_parent_id = 0 %]
                 <li>
                      <span class="label">Fund parent: </span>
-                     [% budget_parent_name %]
-                     [% budget_parent_id %] - [% budget_parent_name %]
+                     [% budget_parent_id %]
                      <input type="hidden" name="budget_parent_id" value= NULL />
                 </li>
                 <li>
@@ -55,7 +55,7 @@
 
         </fieldset>
         <fieldset class="action">
-            <input type="submit" value="Submit" /> <a class="cancel" href="/cgi-bin/koha/admin/aqbudgets.pl">Cancel</a>
+            <input type="submit" value="Submit" />
             <input type="hidden" name="budget_period_id" value="1" />
         </fieldset>
     </form>
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")
 
     <input type="hidden" name="op" value="add_validate" />
     <input type="hidden" name="checked" value="0" />
+    <input type="hidden" name="fundcreated" value="acquiform" />
     <ol>
     [% IF ( budget_parent_id ) %]
     <li>
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 @@
                     <div class="yui-g">
                     [% INCLUDE 'labels-toolbar.inc' %]
                         <div class="yui-u first">
-
+                            [% IF 
+                                [% displayonboardscreen == "label" %]
+                                    [% INCLUDE 'onboardinginclude.inc' %]
                         </div>
                     </div>
                 </div>
-- 
2.1.4