Attachment 67663 Details for Bug 18060 – Bug 18060: Followup solving $layout error

[patch] Bug 18060: Followup solving $layout error

Bug-18060-Followup-solving-layout-error.patch (text/plain), 9.36 KB, created by Alex Buckley on 2017-10-06 03:57:46 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Alex Buckley

Created: 2017-10-06 03:57:46 UTC

Size: 9.36 KB

patch

obsolete

>From b801940461602b4009a8016e317e1a547f505b98 Mon Sep 17 00:00:00 2001
>From: Alex Buckley <alexbuckley@catalyst.net.nz>
>Date: Sat, 8 Jul 2017 12:01:30 +0000
>Subject: [PATCH] Bug 18060: Followup solving $layout error
>
>---
> koha-tmpl/intranet-tmpl/prog/css/staff-global.css  | 22 +++++++++++++++++++++
> .../prog/en/includes/onboardinginclude1.inc        | 23 ++++++----------------
> .../prog/en/includes/onboardinginclude2.inc        | 19 +++++++++++-------
> .../prog/en/modules/acqui/acqui-home.tt            | 22 ---------------------
> labels/label-edit-template.pl                      |  2 +-
> labels/label-home.pl                               |  4 +++-
> 6 files changed, 44 insertions(+), 48 deletions(-)
>
>diff --git a/koha-tmpl/intranet-tmpl/prog/css/staff-global.css b/koha-tmpl/intranet-tmpl/prog/css/staff-global.css
>index fe451eb..41cb048 100644
>--- a/koha-tmpl/intranet-tmpl/prog/css/staff-global.css
>+++ b/koha-tmpl/intranet-tmpl/prog/css/staff-global.css
>@@ -3039,6 +3039,20 @@ div#aqhelp{
>     border-radius:10px;
> }
> 
>+#LabelOnboardingModal{
>+    z-index:1;
>+    background-color:#EDF4F6;
>+    padding: .2em 0;
>+    width: 100%;
>+    float:right;
>+    left: 100%;
>+    position:relative;
>+    top: 10px;
>+    padding-left:10px;
>+    padding-right:10px;
>+    border-radius:10px;
>+}
>+
> #acqui-onboard{
>     text-align: center;
>     padding-bottom:15px;
>@@ -3059,3 +3073,11 @@ div#aqhelp{
> #budget_code_onboard{
>     width:55%;
> }
>+
>+
>+
>+
>+
>+
>+
>+
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/onboardinginclude1.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/onboardinginclude1.inc
>index f7cbda0..d7ff57f 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/includes/onboardinginclude1.inc
>+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/onboardinginclude1.inc
>@@ -1,18 +1,3 @@
>-<style type="text/css">
>-    #onboardingModal{
>-        z-index:1;
>-        background-color:#EDF4F6;
>-        padding:20px;
>-        width:70%;
>-        position:absolute;
>-        overflow:scroll;
>-        left:auto;
>-        top:auto;
>-        right:auto;
>-        bottom:auto;
>-}
>-</style>
>-
> [% BLOCK translate_justification_types %]
>  [%  SWITCH type %]
>  [%   CASE 'L' %]Left
>@@ -35,7 +20,7 @@
> <div id="onboardingModal">
>         <h1 id="acqui-onboard"> Acquisition onboarding wizard</h1>
> 
>-        <h3> This onboarding wizard will take you through the process of setting up Acquistions </h3>
>+        <h3> This onboarding wizard will take you through the process of setting up Acquisitions </h3>
>         <p>Start by completing this form to create a currency which you will use to create your first budget and fund.<br>
>         A fund is the accounting value you use to create orders</p>
>          <form action="/cgi-bin/koha/admin/currency.pl" name="Aform" method="post" class="validated">
>@@ -76,8 +61,12 @@
> </div>
> 
> [% ELSIF displayonboarding == "label" %]
>-<div id="onboardingModal">
>+<div id="LabelOnboardingModal">
>     <form name="input" action="/cgi-bin/koha/labels/label-edit-layout.pl" method="get">
>+        <h1> Label onboarding wizard</h1>
>+
>+        <h3> This onboarding wizard will take you through the process of setting up labels </h3>
>+        <p> Start by completing this form to create a label which you will be able to print, after creating a printer profile </p>
>         <fieldset class="rows">
>         <legend>[% IF ( layout_id ) %]Edit[% ELSE %]Create[% END %] label layout</legend>
>         <ol>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/onboardinginclude2.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/onboardinginclude2.inc
>index 5cbabe2..079a429 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/includes/onboardinginclude2.inc
>+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/onboardinginclude2.inc
>@@ -1,12 +1,12 @@
>+[% IF  displayonboarding == "acquisitions" %]
>     <div id="onboardingModal">
>-    [% IF  displayonboarding == "acquisitions" %]
>-        <h2> Acquisition onboarding wizard</h2>
>+        <h1> Acquisition onboarding wizard</h1>
>         <p> Create a budget which is the highest level value in acquisitions accountancy. <br>
>         After creating this budget you will be prompted to create a fund which is what you will use to set up orders.
>         </p>
>         <b>If you have previously created a budget (which was subsequently deleted) then you will be redirected to the budget administration page after creating a budget using this form. On the budget administration page click Actions->Add fund to create a fund</b>
>         <h3> Create a budget</h3>
>-        <form action="/cgi-bin/koha/admin/aqbudgetperiods.pl" name="f" method="post">
>+        <form action="/cgi-bin/koha/admin/aqbudgetperiods.pl" id="acquisitiononboarding" name="acquisitiononboarding" method="post">
>             <fieldset class="rows">
>                 <input type="hidden" name="op" value="add_validate" />
>                 <input type="hidden" name="step" value="3"/>
>@@ -43,8 +43,13 @@
>                 </a>
>             </fieldset>
>         </form>
>- [% ELSIF displayonboarding == "label" %]
>- <form name="input" action="/cgi-bin/koha/labels/label-edit-template.pl" method="get">
>+    </div>
>+[% ELSIF displayonboarding == "label" %]
>+    <div id="LabelOnboardingModal">
>+        <h1> Label omboarding wizard </h1>
>+        <h3> This onboarding wizard will take you through the process of setting up labels </h3>
>+        <p> Create a label template which can be printed after you have set up a printer profile </p>
>+        <form name="labelonboarding" id="labelonboarding" action="/cgi-bin/koha/labels/label-edit-template.pl" method="get">
>         <fieldset class="rows">
>             <ol>
>                <li>
>@@ -149,6 +154,6 @@
>                   <input type="hidden" name="template_id" value="[% template_id %]" />
>             [% END %]
>        </fieldset>
>-</form>
>+    </form>
>+    </div>
> [% END %]
>-</div>
>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 bc8b9f5..a1ed992 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
>@@ -255,28 +255,6 @@ $(document).ready(function() {
>     </table>
>     </div>
>     [% END %]
>-
>-  <button type="button" id="show" onclick"unhide(aqhelp)">Show the next steps to set up Acquisitions</button>
>-    <br><br>
>-    <div id="aqhelp">
>-        <h1> Next steps</h1>
>-        <h2> 1. Create your first vendor</h2>
>-        <p> A vendor is the organisation your institution purchases items from i.e. suppliers<br>
>-        You must create a vendor before you can create any orders</p>
>-        <b>Click <a href="/cgi-bin/koha/acqui/supplier.pl?op=enter">here</a> to create a vendor.</b>
>-        <br><br>
>-        <h2> 2. Create your first basket</h2>
>-        <p> A basket is the conceptual container that holds orders. Each basket is assigned to a single vendor so you can perform multiple seperate orders from a single vendor simultaneously. Because of its reliance on vendor the basket must be created after the vendor</p>
>-        <b> To create a basket, click the 'New basket' button on the Vendor Information page which is displayed after you create a vendor</b>
>-        <br><br>
>-        <h2> 3. Create an order</h2>
>-        <p> An order is a assignment of items purchased from a single vendor at a single time</p>
>-        You create an order by clicking "Add to basket" in the Basket page. From here you can choose the item(s) you want to purchase from existing MARC records in your Koha catalogue, subscription, new item record, external source, staged file (bibliographic file in the process of being uploaded), or from popularly held items.
>-        </p>
>-        <br><br>
>-        For further information about creating a vendor, basket and order go to the Koha manual:
>-        <a href="http://translate.koha-community.org/manual/master/en/html/09_acquisitions.html"> Koha manual Acquisitions section</a>
>-    </div>
> </div>
> </div>
> <div class="yui-b">
>diff --git a/labels/label-edit-template.pl b/labels/label-edit-template.pl
>index d7d891b..0660fbb 100755
>--- a/labels/label-edit-template.pl
>+++ b/labels/label-edit-template.pl
>@@ -114,7 +114,7 @@ elsif ($op eq 'save') {
> 
>     my $profilevalue = C4::Creators::Profile->retrieve_all();
>     if ($profilevalue == 0) {
>-        print $cgi->redirect("label-edit-profile.pl");
>+        print $cgi->redirect("label-edit-profile.pl?op=new");
>         exit;
>     }else{
>         print $cgi->redirect("/cgi-bin/koha/labels/label-home.pl");
>diff --git a/labels/label-home.pl b/labels/label-home.pl
>index 4c5645b..e8a632c 100755
>--- a/labels/label-home.pl
>+++ b/labels/label-home.pl
>@@ -30,8 +30,10 @@ use C4::Creators::Layout;
> use C4::Creators::Template;
> use C4::Creators;
> use C4::Labels;
>+use C4::Labels::Layout;
> 
> my $cgi = new CGI;
>+my $layout = C4::Labels::Layout->new();
> my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
>     {
>         template_name   => "labels/label-home.tt",
>@@ -46,11 +48,11 @@ my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
> my $op = $cgi->param('op') || '';
> my $layout_id = $cgi->param('layout_id') || $cgi->param('element_id') || '';
> my $layout_choice = $cgi->param('layout_choice') || '';
>-my $layout = C4::Labels::Layout->new();
> 
> sub _set_selected {
>     my ($type_list, $object, $data_type) = @_;
>     SET_SELECTED:
>+    warn $layout;
>     foreach my $type (@$type_list) {
>     if ($layout->get_attr($data_type)) {
>      if ($type->{'type'} eq $layout->get_attr($data_type)) {
>-- 
>2.1.4

Actions: View | Diff | Splinter Review

Attachments on bug 18060: 63224 | 63225 | 63228 | 63229 | 63587 | 63588 | 63589 | 64733 | 64766 | 64951 | 67663