From dc9c08335f7fc60999b44369bd64bc108fe2abbe Mon Sep 17 00:00:00 2001 From: Alex Buckley Date: Tue, 7 Feb 2017 18:27:08 +0000 Subject: [PATCH] Bug 18002 - Removed errant warn and inline styling into an internal style sheet --- acqui/acqui-home.pl | 1 - .../prog/en/modules/acqui/acqui-home.tt | 48 ++++++++++++++++------ 2 files changed, 36 insertions(+), 13 deletions(-) diff --git a/acqui/acqui-home.pl b/acqui/acqui-home.pl index 856558f..fe53174 100755 --- a/acqui/acqui-home.pl +++ b/acqui/acqui-home.pl @@ -107,7 +107,6 @@ foreach my $budget ( @{$budget_arr} ) { push @budget_loop, $budget; } -warn \@budget_loop; $template->param( type => 'intranet', loop_budget => \@budget_loop, 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 9143be1..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 @@ Koha › Acquisitions [% INCLUDE 'doc-head-close.inc' %] + + [% INCLUDE 'datatables.inc' %] @@ -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,23 +125,25 @@ $(document).ready(function() { [% INCLUDE 'budgets-active-currency.inc' hide = 'yes' %] [% UNLESS ( loop_budget ) %] [% IF ( CAN_user_acquisition_period_manage ) %] -
-
- Follow these links to set everything up ready to purchase orders:

-

1. Create a budget - -> - 2. assign a fund to that budget - -> - 3. create a vendor - -> - 4. create a basket +
+ ×

+ Follow these links to set everything up ready to create orders:

+

1. create a budget + -> + 2. assign a fund to that budget + -> + 3. create a vendor + -> + 4. create a basket

-
-

+
[% ELSE %]
Your administrator must define a budget in Administration
[% END %] [% END %] +
-- 2.1.4