Bugzilla – Attachment 60688 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 - Tidied up the UI removing close button, and cancel links
Bug-18002---Tidied-up-the-UI-removing-close-button.patch (text/plain), 4.32 KB, created by
Alex Buckley
on 2017-02-26 09:54:48 UTC
(
hide
)
Description:
Bug 18002 - Tidied up the UI removing close button, and cancel links
Filename:
MIME Type:
Creator:
Alex Buckley
Created:
2017-02-26 09:54:48 UTC
Size:
4.32 KB
patch
obsolete
>From 301038f732c6249b320d3376199b3da28b905e9f Mon Sep 17 00:00:00 2001 >From: Alex Buckley <alexbuckley@catalyst.net.nz> >Date: Sat, 18 Feb 2017 05:11:28 +0000 >Subject: [PATCH] Bug 18002 - Tidied up the UI removing close button, and > cancel links > >--- > admin/aqbudgets.pl | 7 +++++-- > koha-tmpl/intranet-tmpl/prog/en/includes/onboardinginclude.inc | 9 ++------- > koha-tmpl/intranet-tmpl/prog/en/includes/onboardinginclude2.inc | 3 ++- > koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgets.tt | 1 + > 4 files changed, 10 insertions(+), 10 deletions(-) > >diff --git a/admin/aqbudgets.pl b/admin/aqbudgets.pl >index 57e2bb2..b950f0f 100755 >--- a/admin/aqbudgets.pl >+++ b/admin/aqbudgets.pl >@@ -223,9 +223,12 @@ 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 $fundcreation = $input->param('fundcreation'); > >+ if ($fundcreation eq "onboarding"){ >+ print $input->redirect("/cgi-bin/koha/acqui/acqui-home.pl"); >+ exit; >+ } > } > > my $set_owner_to_children = $input->param('set_owner_to_children'); >diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/onboardinginclude.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/onboardinginclude.inc >index b372886..40f45aa 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/includes/onboardinginclude.inc >+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/onboardinginclude.inc >@@ -14,7 +14,6 @@ > } > </style> > <div id="onboardingModal"> >- <span class="close">×</span><br><br> > [% IF displayonboardscreen == "acquisitions" %] > <h2> Create a budget</h2> > <form action="/cgi-bin/koha/admin/aqbudgetperiods.pl" name="f" method="post"> >@@ -47,7 +46,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 %] >+ [% 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 %] > </li> > </ol> > </fieldset> >@@ -59,9 +58,5 @@ > </form> > </div> > [% ELSIF displayonboardscreen == "label" %] >-<h2>testing</h2> >- >- >- >- >+ <h2>testing</h2> > [% 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..b766dbc 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/includes/onboardinginclude2.inc >+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/onboardinginclude2.inc >@@ -24,6 +24,7 @@ > </legend> > <input type="hidden" name="op" value="add_validate" /> > <input type="hidden" name="checked" value="0" /> >+ <input type="hidden" name="fundcreation" value="onboarding" /> > <ol> > [% budget_parent_id = 0 %] > <li> >@@ -55,7 +56,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..87350c2 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="fundcreation" value="aqform" /> > <ol> > [% IF ( budget_parent_id ) %] > <li> >-- >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