Bugzilla – Attachment 59992 Details for
Bug 18002
Aquisitions onboarding tool - to help users set up acquisitions the first time
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 18002 - Removed errant warn and inline styling into an internal style sheet
Bug-18002---Removed-errant-warn-and-inline-styling.patch (text/plain), 5.49 KB, created by
Alex Buckley
on 2017-02-07 20:33:51 UTC
(
hide
)
Description:
Bug 18002 - Removed errant warn and inline styling into an internal style sheet
Filename:
MIME Type:
Creator:
Alex Buckley
Created:
2017-02-07 20:33:51 UTC
Size:
5.49 KB
patch
obsolete
>From dc9c08335f7fc60999b44369bd64bc108fe2abbe Mon Sep 17 00:00:00 2001 >From: Alex Buckley <alexbuckley@catalyst.net.nz> >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 @@ > <title>Koha › 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,23 +125,25 @@ $(document).ready(function() { > [% INCLUDE 'budgets-active-currency.inc' hide = 'yes' %] > [% UNLESS ( loop_budget ) %] > [% IF ( CAN_user_acquisition_period_manage ) %] >- <div id="acquisitionsModal" style="z-index:1;background-color:#EDF4F6;padding:20px;width:60%;height:30%;position:fixed;align:center;left:auto;top:auto;right:auto;bottom:10%;"> >- <div class="acquisition-modal-content"> >- Follow these links to set everything up ready to purchase orders:<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 mo ney 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> >+ <div id="acquisitionsModal"> >+ <span class="close">×</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> >- </div> >+ </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
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
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