Attachment 60685 Details for Bug 18002 – Bug 18002 - Created a budget creation onboarding form to be displayed when the user first visits the acquisition area

[patch] Bug 18002 - Created a budget creation onboarding form to be displayed when the user first visits the acquisition area

Bug-18002---Created-a-budget-creation-onboarding-f.patch (text/plain), 5.03 KB, created by Alex Buckley on 2017-02-26 09:05:58 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Alex Buckley

Created: 2017-02-26 09:05:58 UTC

Size: 5.03 KB

patch

obsolete

>From 510834e988d70bfb3dc9b8b39f9cfa36e7c88809 Mon Sep 17 00:00:00 2001
>From: Alex Buckley <alexbuckley@catalyst.net.nz>
>Date: Sun, 29 Jan 2017 11:33:35 +0000
>Subject: [PATCH] Bug 18002 - Created a budget creation onboarding form to be
> displayed when the user first visits the acquisition area
>
>---
> .../prog/en/includes/budgets-active-currency.inc   |  8 ++---
> .../prog/en/modules/acqui/acqui-home.tt            | 38 +++++++++++++++++++++-
> 2 files changed, 41 insertions(+), 5 deletions(-)
>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/budgets-active-currency.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/budgets-active-currency.inc
>index 1862059..005d58e 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/includes/budgets-active-currency.inc
>+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/budgets-active-currency.inc
>@@ -3,12 +3,12 @@
>         <p><b>Currency = [% currency %]</b></p>
>     [% END %]
> [% ELSE %]
>-    <div class="dialog alert">
>-        <h3>No active currency is defined</h3>
>         [% IF CAN_user_parameters_parameters_remaining_permissions %]
>-            <p><a href="/cgi-bin/koha/admin/currency.pl">Please specify an active currency.</a></p>
>+            <h1> You have no currencies defined in your database</h1>
>+            <a href="/cgi-bin/koha/admin/currency.pl?op=add_form" target="_target" data-toggle="tooltip"  title="Enter an appropriate currency and set it to active">Enter a currency</a>
>         [% ELSE %]
>             <p>Your administrator must specify an active currency.</p>
>         [% END %]
>-    </div>
>+        <br>
>+        <p><b>Now you can follow the below steps to set up acquisitions.</b></p><br>
> [% 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 f64a60b..8d1eceb 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,6 +4,21 @@
> <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" />
> <script type="text/javascript" src="[% interface %]/lib/jquery/plugins/treetable/jquery.treetable.js"></script>
>@@ -15,6 +30,13 @@ dt_overwrite_html_sorting_localeCompare();
> 
> $(document).ready(function() {
> 
>+    var modal = document.getElementById('acquisitionsModal');
>+    var span = document.getElementsByClassName("close")[0];
>+
>+    span.onclick = function() {
>+        modal.style.display = "none";
>+    }
>+
>     var oTable = $("#accounts").dataTable($.extend(true, {}, dataTablesDefaults, {
>         "fnDrawCallback": function ( oSettings ) {
>             if ( oSettings.aiDisplay.length == 0 )
>@@ -103,11 +125,25 @@ $(document).ready(function() {
>     [% INCLUDE 'budgets-active-currency.inc' hide = 'yes' %]
>     [% UNLESS ( loop_budget ) %]
>         [% IF ( CAN_user_acquisition_period_manage ) %]
>-        <div class="dialog alert"><a href="/cgi-bin/koha/admin/aqbudgetperiods.pl">You must define a budget in Administration</a></div>
>+            <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>
>         [% ELSE %]
>         <div class="dialog alert">Your administrator must define a budget in Administration</div>
>         [% END %]
>     [% END %]
>+    <script type="text/javascript">
>+        var showModal = 2;
>+    </script>
> <div class="yui-g">
> <div class="yui-u first">
> <div id="acqui_acqui_home_order">
>-- 
>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