Attachment 60676 Details for Bug 18002 – Bug 18002 - Added in a onboardinginclude.inc which will be the include displayed if the user has not set up their acquisitions or labels areas.

[patch] Bug 18002 - Added in a onboardinginclude.inc which will be the include displayed if the user has not set up their acquisitions or labels areas.

Bug-18002---Added-in-a-onboardingincludeinc-which-.patch (text/plain), 6.48 KB, created by Alex Buckley on 2017-02-26 07:41:07 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Alex Buckley

Created: 2017-02-26 07:41:07 UTC

Size: 6.48 KB

patch

obsolete

>From 2acc7949dd242d9d6b290f1809f325422647f021 Mon Sep 17 00:00:00 2001
>From: Alex Buckley <alexbuckley@catalyst.net.nz>
>Date: Wed, 8 Feb 2017 17:58:07 +1300
>Subject: [PATCH] Bug 18002 - Added in a onboardinginclude.inc which will be
> the include displayed if the user has not set up their acquisitions or labels
> areas.
>
>This include contains a form to create a budget but this is not yet
>inserting into the database
>---
> .../prog/en/includes/onboardinginclude.inc         | 74 ++++++++++++++++++++++
> .../prog/en/modules/acqui/acqui-home.tt            | 28 +-------
> 2 files changed, 76 insertions(+), 26 deletions(-)
> create mode 100644 koha-tmpl/intranet-tmpl/prog/en/includes/onboardinginclude.inc
>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/onboardinginclude.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/onboardinginclude.inc
>new file mode 100644
>index 0000000..b26f070
>--- /dev/null
>+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/onboardinginclude.inc
>@@ -0,0 +1,74 @@
>+[% USE Koha %]
>+[% USE KohaDates %]
>+[% USE Branches %]
>+
>+<style type="text/css">
>+ #onboardingModal{
>+     z-index:1;
>+     background-color:#5bad3f;
>+     padding:20px;
>+     width:80%;
>+     height:60%;
>+     position:fixed;
>+     left:auto;
>+     top:auto;
>+     right:auto;
>+     bottom:auto;
>+            border-radius:25px;
>+}
>+</style>
>+
>+[% step = 1 %]
>+
>+<div id="onboardingModal">
>+     <span class="close">&times;</span><br><br>
>+[% IF  displayonboardscreen == "acquisitions" %]
>+     <h2> Create a budget</h2>
>+     <form action="/cgi-bin/koha/admin/aqbudgetperiods.pl" name="f" method="post">
>+        <fieldset class="rows">
>+            <input type="hidden" name="op" value="add_validate" />
>+            <input type="hidden" name="budget_period_id" value="[% budget_period_id %]" />
>+            <ol>
>+                <li>
>+                    <label class="required" for="from">Start date: </label>
>+                    <input type="text" size="10" id="from" name="budget_period_startdate" value="[% budget_period_startdate | $KohaDates %]" class="datepickerfrom" />
>+                    <div class="hint">[% INCLUDE 'date-format.inc' %]</div>
>+                </li>
>+
>+                <li>
>+                    <label class="required" for="to">End date: </label>
>+                    <input type="text" size="10" id="to" name="budget_period_enddate" value="[% budget_period_enddate | $KohaDates %]" class="datepickerto" />
>+                    <div class="hint">[% INCLUDE 'date-format.inc' %]</div>
>+                </li>
>+
>+                <li>
>+                    <label class="required" for="budget_period_description">Description: </label>
>+                    <input type="text" id="budget_period_description" name="budget_period_description"
>+                    size="48" maxlength="80" value="[% budget_period_description %]" />
>+                </li>
>+
>+                <li>
>+                    <label for="budget_period_total">Total amount: </label>
>+                    <input type="text" id="budget_period_total" name="budget_period_total"
>+                    size="10" maxlength="80" value="[% budget_period_total | $Price on_editing => 1 %]" />
>+                </li>
>+
>+                <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_a    ctive" value="1" />[% ELSE %]  <input type="checkbox" id="budget_period_active" name="budget_period_active" value="1"/> [% END %]
>+                </li>
>+            </ol>
>+        </fielset>
>+
>+        <fieldset class="action">
>+            <input type="button" value="Save" onclick="Check(this.form)" />
>+            <a href="/cgi-bin/koha/admin/aqbudgetperiods.pl" class="cancel">Cancel</a>
>+        </fielset>
>+    </form>
>+</div>
>+[% ELSIF displayonboardscreen == "label" %]
>+
>+
>+
>+<h2>testing</h2>
>+[% END %]
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/acqui-home.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/acqui-home.tt
>index 8d1eceb..0bc0982 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/acqui-home.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/acqui-home.tt
>@@ -4,20 +4,6 @@
> <title>Koha &rsaquo; Acquisitions</title>
> [% INCLUDE 'doc-head-close.inc' %]
> <link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/datatables.css" />
>-<style type="text/css">
>-#acquisitionsModal{
>-    z-index:1;
>-    background-color:#EDF4F6;
>-    padding:20px;
>-    width:65%;
>-    height:20%;
>-    position:fixed;
>-    left:auto;
>-    top:auto;
>-    right:auto;
>-    bottom:auto;
>-}
>-</style>
> 
> [% INCLUDE 'datatables.inc' %]
> <link href="[% interface %]/lib/jquery/plugins/treetable/stylesheets/jquery.treetable.css" rel="stylesheet" type="text/css" />
>@@ -125,18 +111,8 @@ $(document).ready(function() {
>     [% INCLUDE 'budgets-active-currency.inc' hide = 'yes' %]
>     [% UNLESS ( loop_budget ) %]
>         [% IF ( CAN_user_acquisition_period_manage ) %]
>-            <div id="acquisitionsModal">
>-                       <span class="close">&times;</span><br><br>
>-                       <b>Follow these links to set everything up ready to create orders:</b><br><br>
>-                       <h2><a href="/cgi-bin/koha/admin/aqbudgetperiods.pl?op=add_form" target="_blank" data-toggle="tooltip"  title="The budget is the overall amount of money avaliable for the institution over a period of time">1. create a budget</a>
>-                       ->
>-                       <a href="/cgi-bin/koha/admin/aqbudgetperiods.pl" target="_blank" data-toggle="tooltip" title="The fund is the amount of money for one area of the institution e.g. Books fund. Click this link then select the 'Edit' button beside the budget and click 'Add fund'"> 2. assign a fund to that budget</a>
>-                       ->
>-                       <a href="/cgi-bin/koha/acqui/supplier.pl?op=enter" target="_blank" data-toggle="tooltip" title="Vendor is the organisation you purchase items from">3. create a vendor</a>
>-                       ->
>-                       <a href="/cgi-bin/koha/acqui/booksellers.pl" target="_blank" data-toggle="tooltip" title="Basket contains the order items. Select the 'New basket' button">4. create a basket</a>
>-                       </h2>
>-             </div>
>+             [% displayonboardscreen = "acquisitions" %]
>+             [% INCLUDE onboardinginclude.inc %]
>         [% ELSE %]
>         <div class="dialog alert">Your administrator must define a budget in Administration</div>
>         [% END %]
>-- 
>2.1.4

Actions: View | Diff | Splinter Review

Attachments on bug 18002: 59910 | 59911 | 59992 | 60676 | 60677 | 60678 | 60679 | 60680 | 60681 | 60682 | 60683 | 60684 | 60685 | 60686 | 60687 | 60688 | 61987 | 61988 | 63150 | 63151 | 63380 | 63456 | 64732 | 64746 | 64765 | 64947 | 66301 | 67649 | 67650 | 67651 | 68108 | 68109 | 68110