Attachment 151430 Details for Bug 33771 – Bug 33771: Fix markup errors in orderreceive.tt

[patch] Bug 33771: Fix markup errors in orderreceive.tt

Bug-33771-Fix-markup-errors-in-orderreceivett.patch (text/plain), 5.09 KB, created by Tomás Cohen Arazi (tcohen) on 2023-05-18 17:14:08 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Tomás Cohen Arazi (tcohen)

Created: 2023-05-18 17:14:08 UTC

Size: 5.09 KB

patch

obsolete

>From bbf48e70a1bb3cd2019667ad6b2edebec8e2534d Mon Sep 17 00:00:00 2001
>From: Lucas Gass <lucas@bywatersolutions.com>
>Date: Thu, 18 May 2023 16:10:02 +0000
>Subject: [PATCH] Bug 33771: Fix markup errors in orderreceive.tt
>
>This patch fixed the following on orderreceive.tt:
>
>-One of the <th> is closed with a </td>
>-The #jobpanel element div is not properly closed
>-Style tags are in the HTML body and they should be in the HTML head
>-The #modal-order-main needs a class of 'row', this has been added.
>
>Apply the pacth and follow the steps in 8179 until you get to the orderreceive.tt. There should be no visual changes but the markup has been corrected.
>
>Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
>---
> .../prog/en/modules/acqui/orderreceive.tt     | 92 ++++++++++---------
> 1 file changed, 47 insertions(+), 45 deletions(-)
>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/orderreceive.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/orderreceive.tt
>index 937bacfb06e..1ff5f563143 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/orderreceive.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/orderreceive.tt
>@@ -10,6 +10,48 @@
> [% INCLUDE 'doc-head-open.inc' %]
> <title>Receipt summary for : [% name | html %] [% IF ( invoice ) %]invoice, [% invoice | html %][% END %] &rsaquo; Acquisitions &rsaquo; Koha</title>
> [% INCLUDE 'doc-head-close.inc' %]
>+    <style>
>+        @media (min-width: 1200px) {
>+            #receive-modal, #receive-modal .modal-content {
>+                width: 98%;
>+            }
>+        }
>+        #receive-modal .modal-body {
>+            background-color: #F3F4F4;
>+        }
>+
>+        .lbl {
>+            font-weight: 700;
>+            text-align: right;
>+        }
>+        .modal-body ol {
>+            list-style-type: none;
>+        }
>+
>+        .modal-body ol li {
>+            list-style-type: none;
>+            padding-bottom: 1em;
>+            width: 100%;
>+        }
>+
>+        .modal-body h4 {
>+            margin-left: 1em;
>+            padding: .2em .5em;
>+            margin-bottom: 17px;
>+        }
>+
>+        .modal-body label {
>+            margin-right: 1em;
>+            text-align: right;
>+            width: 11em;
>+            display: inline-block;
>+            font-weight: 700;
>+        }
>+
>+        .modal-body textarea {
>+            vertical-align: text-top;
>+        }
>+    </style>
> </head>
> 
> <body id="acq_orderreceive" class="acq">
>@@ -46,7 +88,7 @@
>     <table id="multiple_orders" class="table table-bordered table-striped">
>         <thead>
>             <tr>
>-                <th>Order</td>
>+                <th>Order</th>
>                 <th>Title</th>
>                 <th>Author</th>
>                 <th>ISBN</th>
>@@ -63,7 +105,9 @@
>             <button class="save btn btn-primary" disabled>Confirm</button>
>             <a class="cancel btn btn-default" href="/cgi-bin/koha/acqui/parcel.pl?invoiceid=[% invoiceid | html %]&sticky_filters=1">Cancel</a>
>         </fieldset>
>-        <div id="jobpanel"><div id="jobstatus" class="progress_panel">Job progress: <div id="jobprogress"></div> <span id="jobprogresspercent">0</span>%</div>
>+        <div id="jobpanel">
>+            <div id="jobstatus" class="progress_panel">Job progress: <div id="jobprogress"></div> <span id="jobprogresspercent">0</span>%</div>
>+        </div>
>     </div>
> 
>     <div class="modal fade" id="order_edit" tabindex="-1" role="dialog" aria-labelledby="Order edit">
>@@ -75,7 +119,7 @@
>                 </div>
>                 <div class="modal-body">
>                     <div class="hide" id="loading">Loading ...</div>
>-                    <div id="modal-order-main row">
>+                    <div id="modal-order-main" class="row">
>                         <!--ul>
>                             <li><a href="#info-panel">Info</a></li>
>                             <li><a href="#accounting-panel">Accounting</a></li>
>@@ -357,48 +401,6 @@
>     [% INCLUDE 'js-date-format.inc' %]
>     [% INCLUDE 'format_price.inc' %]
>     [% Asset.js("lib/jquery/plugins/jquery.dataTables.columnFilter.js") | $raw %]
>-    <style>
>-        @media (min-width: 1200px) {
>-            #receive-modal, #receive-modal .modal-content {
>-                width: 98%;
>-            }
>-        }
>-        #receive-modal .modal-body {
>-            background-color: #F3F4F4;
>-        }
>-
>-        .lbl {
>-            font-weight: 700;
>-            text-align: right;
>-        }
>-        .modal-body ol {
>-            list-style-type: none;
>-        }
>-
>-        .modal-body ol li {
>-            list-style-type: none;
>-            padding-bottom: 1em;
>-            width: 100%;
>-        }
>-
>-        .modal-body h4 {
>-            margin-left: 1em;
>-            padding: .2em .5em;
>-            margin-bottom: 17px;
>-        }
>-
>-        .modal-body label {
>-            margin-right: 1em;
>-            text-align: right;
>-            width: 11em;
>-            display: inline-block;
>-            font-weight: 700;
>-        }
>-
>-        .modal-body textarea {
>-            vertical-align: text-top;
>-        }
>-    </style>
>     <script>
>         function display_string(key, strings, fallback) {
>             if ( strings.hasOwnProperty(key) ) {
>-- 
>2.40.1

Actions: View | Diff | Splinter Review

Attachments on bug 33771: 151429 | 151430