Attachment 77488 Details for Bug 21163 – Bug 21163: Basket group detail page layout is broken

[patch] Bug 21163: Basket group detail page layout is broken

Bug-21163-Basket-group-detail-page-layout-is-broke.patch (text/plain), 15.75 KB, created by Owen Leonard on 2018-08-06 14:05:56 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Owen Leonard

Created: 2018-08-06 14:05:56 UTC

Size: 15.75 KB

patch

obsolete

>From 0f3dd934d4c768646e3f6c4bcddd8ea081b930e3 Mon Sep 17 00:00:00 2001
>From: Owen Leonard <oleonard@myacpl.org>
>Date: Mon, 6 Aug 2018 13:33:05 +0000
>Subject: [PATCH] Bug 21163: Basket group detail page layout is broken
>
>This patch makes markup changes and improvements to the basket groups
>template. This fixes a problem with layout of the page when viewing a
>closed basket group.
>
>Fixed: Changed the grid options for basket information when a basket
>group is closed.
>
>Also changed: Removed some unnecessary script and style "type"
>attributes. Rearranged some list markup in order to avoid validation
>errors. Removed some id attributes which were causing validation error.
>Added some minor style changes to improve readability.
>
>To test, apply the patch and go to Acquisitions -> Vendor -> Basket
>groups. You should have multiple baskets and basket groups to test with.
>
>- Edit an open basket group. The layout should look correct, with basket
>  group information in the form in the left column and ungrouped basket
>  in the right column. Grouping and ungrouping baskets should work
>  correctly.
>- View a closed basket group. The basket group information should
>  display in a single column that spans the main part of the page.
>- HTML validation of the page should contain no relevant errors.
>---
> koha-tmpl/intranet-tmpl/prog/css/staff-global.css  |   1 +
> .../prog/en/modules/acqui/basketgroup.tt           | 100 +++++++++++++--------
> 2 files changed, 65 insertions(+), 36 deletions(-)
>
>diff --git a/koha-tmpl/intranet-tmpl/prog/css/staff-global.css b/koha-tmpl/intranet-tmpl/prog/css/staff-global.css
>index d05c74b..ad9c505 100644
>--- a/koha-tmpl/intranet-tmpl/prog/css/staff-global.css
>+++ b/koha-tmpl/intranet-tmpl/prog/css/staff-global.css
>@@ -606,6 +606,7 @@ fieldset.brief span.label {
> 	display : block;
> 	font-weight : bold;
> 	padding : .3em 0;
>+    text-align: left;
> }
> 
> fieldset.brief ol, fieldset.brief li {
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basketgroup.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basketgroup.tt
>index 5614d70..3cbb39b 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basketgroup.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basketgroup.tt
>@@ -16,7 +16,7 @@
> [% Asset.js("lib/yui/animation/animation-min.js") %]
> [% Asset.js("lib/yui/dragdrop/dragdrop-min.js") %]
> [% Asset.js("lib/yui/element/element-min.js") %]
>-<style type="text/css">
>+<style>
> /*margin and padding on body element
>   can introduce errors in determining
>   element position and are not recommended;
>@@ -68,6 +68,14 @@ ul.draglist_alt li {
>     list-style: none;
> }
> 
>+li.grouped,
>+li.ungrouped {
>+    display: block;
>+    margin: .2em 0;
>+    max-width: 20em;
>+    padding: .2em;
>+}
>+
> li.grouped {
>     background-color: #D1E6EC;
>     border:1px solid #7EA6B2;
>@@ -86,9 +94,8 @@ fieldset.various li {
> 
> </style>
>  [% END %]
>-<script type="text/javascript">
>-//<![CDATA[
>-	YAHOO.util.Event.onDOMReady(DDApp.init, DDApp, true);
>+<script>
>+    YAHOO.util.Event.onDOMReady(DDApp.init, DDApp, true);
> 
> var MSG_CONFIRM_CLOSE_BASKETGROUP = _("Are you sure you want to close this basketgroup?");
> var MSG_CLOSE_EMPTY_BASKET = _("Why close an empty basket?");
>@@ -118,9 +125,6 @@ function submitForm(form) {
>     } ));
> 
>  });
>-
>-
>-//]]>
> </script>
> </head>
> <body id="acq_basketgroup" class="acq">
>@@ -145,8 +149,8 @@ function submitForm(form) {
>                         <div id="toolbar" class="btn-toolbar">
>                             <div class="btn-group"><a href="[% script_name %]?op=reopen&amp;basketgroupid=[% basketgroupid %]&amp;booksellerid=[% booksellerid %]&amp;mode=singlebg" class="btn btn-default btn-sm" id="reopenbutton"><i class="fa fa-download"></i> Reopen this basket group</a></div>
>                             <div class="btn-group"><a href="[% script_name %]?op=export&amp;basketgroupid=[% basketgroupid %]&amp;booksellerid=[% booksellerid %]" class="btn btn-default btn-sm" id="exportbutton"><i class="fa fa-download"></i> Export this basket group as CSV</a></div>
>-                            <div class="btn-group"><a href="[% script_name %]?op=print&amp;basketgroupid=[% basketgroupid %]&amp;booksellerid=[% booksellerid %]" class="btn btn-default btn-sm" id="printbutton"><i class="fa fa-download"></i> Print this basket group in PDF</a></div>
>-                            <div class="btn-group"><a href="[% script_name %]?op=ediprint&amp;basketgroupid=[% basketgroupid %]&amp;booksellerid=[% booksellerid %]" class="btn btn-default btn-sm" id="printbutton"><i class="fa fa-download"></i> Generate EDIFACT order</a></div>
>+                            <div class="btn-group"><a href="[% script_name %]?op=print&amp;basketgroupid=[% basketgroupid %]&amp;booksellerid=[% booksellerid %]" class="btn btn-default btn-sm"><i class="fa fa-download"></i> Print this basket group in PDF</a></div>
>+                            <div class="btn-group"><a href="[% script_name %]?op=ediprint&amp;basketgroupid=[% basketgroupid %]&amp;booksellerid=[% booksellerid %]" class="btn btn-default btn-sm"><i class="fa fa-download"></i> Generate EDIFACT order</a></div>
>                         </div>
>                     [% END %]
>                     [% IF (name && closedbg) %]
>@@ -187,18 +191,24 @@ function submitForm(form) {
>                                 </form>
>                             </div>
>                         [% END %]
>-                        <div class="col-xs-6 col-xs-pull-6">
>-                            <form action="" method="post" id="groupingform" onsubmit="return submitForm(this)">
>+                        [% IF ( closedbg ) %]
>+                            <div class="col-xs-12">
>+                        [% ELSE %]
>+                            <div class="col-xs-6 col-xs-pull-6">
>+                        [% END %]
>+                            <form action="/cgi-bin/koha/acqui/basketgroup.pl" method="post" id="groupingform" onsubmit="return submitForm(this)">
>                                 <fieldset id="various" class="brief">
>                                     <ol>
>-                                        [% UNLESS (closedbg) %]
>-                                            <li>
>+                                        <li>
>+                                            [% UNLESS (closedbg) %]
>                                                 <label for="basketgroupname">Basket group name:</label>
>                                                 <input type="text" name="basketgroupname" id="basketgroupname" value="[% name %]" class="focus" />
>-                                            </li>
>-                                        [% ELSE %]
>-                                            <input type="hidden" name="basketgroupname" id="basketgroupname" value="[% name %]" />
>-                                        [% END %]
>+                                            [% ELSE %]
>+                                                <span class="label">Basket group name: </span>
>+                                                [% name %]
>+                                                <input type="hidden" name="basketgroupname" id="basketgroupname" value="[% name %]" />
>+                                            [% END %]
>+                                        </li>
>                                         <li>
>                                             [% UNLESS (closedbg) %]
>                                                 <label for="billingplace">Billing place:</label>
>@@ -236,15 +246,17 @@ function submitForm(form) {
>                                                     [% END %]
>                                                 </li>
>                                             [% END %]
>-                                            <li>
>-                                                [% UNLESS (closedbg) %]
>-                                                    <label for="deliverycomment">Delivery comment:</label>
>-                                                    <textarea cols="26" rows="3" name="deliverycomment" id="deliverycomment">[% deliverycomment %]</textarea>
>-                                                [% ELSE %]
>-                                                    <span class="label">Delivery comment:</span>[% deliverycomment %]
>-                                                    <input name="deliverycomment" id="deliverycomment" type="hidden" value = "[% deliverycomment %]" />
>-                                                [% END %]
>-                                            </li>
>+                                            [% IF ( deliverycomment ) %]
>+                                                <li>
>+                                                    [% UNLESS (closedbg) %]
>+                                                        <label for="deliverycomment">Delivery comment:</label>
>+                                                        <textarea cols="26" rows="3" name="deliverycomment" id="deliverycomment">[% deliverycomment %]</textarea>
>+                                                    [% ELSE %]
>+                                                        <span class="label">Delivery comment:</span>[% deliverycomment %]
>+                                                        <input name="deliverycomment" id="deliverycomment" type="hidden" value = "[% deliverycomment %]" />
>+                                                    [% END %]
>+                                                </li>
>+                                            [% END %]
>                                             <li>
>                                                 <span class="label">Baskets in this group:</span>
>                                                 [% UNLESS (closedbg) %]
>@@ -267,11 +279,9 @@ function submitForm(form) {
>                                                 [% END %]
>                                             </ul>
>                                         </li>
>-                                            [% UNLESS (closedbg) %]
>-                                                <li><label><input type="checkbox" id="closedbg" name="closedbg" />Close basket group</label></li>
>-                                            [% ELSE %]
>-                                                <input type="hidden" id="closedbg" name="closedbg" value ="1"/>
>-                                            [% END %]
>+                                        [% UNLESS (closedbg) %]
>+                                            <li><label><input type="checkbox" id="closedbg" name="closedbg" />Close basket group</label></li>
>+                                        [% END %]
>                                     </ol>
>                                 </fieldset>
>                                 [% UNLESS (closedbg) %]
>@@ -282,6 +292,8 @@ function submitForm(form) {
>                                         <input type="hidden" name="op" value="attachbasket" />
>                                         <input type="submit" value="Save" /> <a href="/cgi-bin/koha/acqui/basketgroup.pl?booksellerid=[% booksellerid %]" class="cancel">Cancel</a>
>                                     </fieldset>
>+                                [% ELSE %]
>+                                    <input type="hidden" id="closedbg" name="closedbg" value ="1"/>
>                                 [% END %]
>                             </form>
>                         </div>
>@@ -365,11 +377,27 @@ function submitForm(form) {
>                                                 <td>[% IF (basketgroup.freedeliveryplace) %]Free delivery place[% ELSE %][% Branches.GetName( basketgroup.deliveryplace ) %][% END %]</td>
>                                                 <td>[% basketgroup.basketsqty %]</td>
>                                                 <td>
>-                                                    <form action="/cgi-bin/koha/acqui/basketgroup.pl" method="get"><input type="hidden" name="op" value="add" /><input type="hidden" name="booksellerid" value="[% basketgroup.booksellerid %]" /><input type="hidden" name="basketgroupid" value="[% basketgroup.id %]" /><input type="submit" value="View" /></form>
>-                                                    <form action="/cgi-bin/koha/acqui/basketgroup.pl" method="get"><input type="hidden" name="op" value="reopen" /><input type="hidden" name="booksellerid" value="[% basketgroup.booksellerid %]" /><input type="hidden" name="basketgroupid" value="[% basketgroup.id %]" /><input type="submit" value="Reopen" /></form>
>-                                                    <form action="/cgi-bin/koha/acqui/basketgroup.pl" method="get"><input type="hidden" name="op" value="print" /><input type="hidden" name="basketgroupid" value="[% basketgroup.id %]" /><input type="submit" value="Export as PDF" /></form>
>-                                                    <form action="/cgi-bin/koha/acqui/basketgroup.pl" method="get"><input type="hidden" name="op" value="export" /><input type="hidden" name="basketgroupid" value="[% basketgroup.id %]" /><input type="submit" value="Export as CSV" /></form>
>-                                                    <form action="/cgi-bin/koha/acqui/basketgroup.pl" method="get"><input type="hidden" name="op" value="ediprint" /><input type="hidden" name="basketgroupid" value="[% basketgroup.id %]" /><input type="submit" value="Generate EDIFACT order" /></form>
>+                                                    <form action="/cgi-bin/koha/acqui/basketgroup.pl" method="get">
>+                                                        <input type="hidden" name="op" value="add" />
>+                                                        <input type="hidden" name="booksellerid" value="[% basketgroup.booksellerid %]" />
>+                                                        <input type="hidden" name="basketgroupid" value="[% basketgroup.id %]" /><input type="submit" value="View" />
>+                                                    </form>
>+                                                    <form action="/cgi-bin/koha/acqui/basketgroup.pl" method="get">
>+                                                        <input type="hidden" name="op" value="reopen" />
>+                                                        <input type="hidden" name="booksellerid" value="[% basketgroup.booksellerid %]" />
>+                                                        <input type="hidden" name="basketgroupid" value="[% basketgroup.id %]" /><input type="submit" value="Reopen" />
>+                                                    </form>
>+                                                    <form action="/cgi-bin/koha/acqui/basketgroup.pl" method="get">
>+                                                        <input type="hidden" name="op" value="print" />
>+                                                        <input type="hidden" name="basketgroupid" value="[% basketgroup.id %]" /><input type="submit" value="Export as PDF" />
>+                                                    </form>
>+                                                    <form action="/cgi-bin/koha/acqui/basketgroup.pl" method="get">
>+                                                        <input type="hidden" name="op" value="export" />
>+                                                        <input type="hidden" name="basketgroupid" value="[% basketgroup.id %]" /><input type="submit" value="Export as CSV" />
>+                                                    </form>
>+                                                    <form action="/cgi-bin/koha/acqui/basketgroup.pl" method="get">
>+                                                        <input type="hidden" name="op" value="ediprint" /><input type="hidden" name="basketgroupid" value="[% basketgroup.id %]" /><input type="submit" value="Generate EDIFACT order" />
>+                                                    </form>
>                                                 </td>
>                                             </tr>
>                                         [% END %]
>-- 
>2.1.4

Actions: View | Diff | Splinter Review

Attachments on bug 21163: 77488 | 77489 | 77492 | 77552