Attachment 78029 Details for Bug 20690 – Bug 20690: Update two-column templates with Bootstrap grid: Acquisitions part 4

[patch] Bug 20690: Update two-column templates with Bootstrap grid: Acquisitions part 4

Bug-20690-Update-two-column-templates-with-Bootstr.patch (text/plain), 15.61 KB, created by Claire Gravely on 2018-08-21 09:18:37 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Claire Gravely

Created: 2018-08-21 09:18:37 UTC

Size: 15.61 KB

patch

obsolete

>From bb6969465df7fed197861317932452cfc347448e Mon Sep 17 00:00:00 2001
>From: Owen Leonard <oleonard@myacpl.org>
>Date: Tue, 1 May 2018 15:49:26 +0000
>Subject: [PATCH] Bug 20690: Update two-column templates with Bootstrap grid:
> Acquisitions part 4
>
>This patch modifies several acquisitions templates to use the Bootstrap
>grid instead of YUI.
>
>This patch also removes obsolete "text/javascript" attributes from
><script> tags and "text/css" attributes from <style> tags in the
>modified templates.
>
>To test, apply the patch and view the following pages, confirming that
>they look correct at various browser widths:
>
>- Acquisitions home page -> Click a "spent" value for a fund.
>- Acquisitions -> Vendor -> Vendor details.
>- Acquisitions -> Vendor -> Uncertain prices
>- Acquisitions -> Vendor -> Receive shipments
>  - Click an "Invoice number" link in the table of shipments.
>    - Click "Receive" for one of the titles in pending orders.
>
>Signed-off-by: Claire Gravely <claire.gravely@bsz-bw.de>
>---
> .../prog/en/modules/acqui/orderreceive.tt          | 33 ++++++++++---------
> .../intranet-tmpl/prog/en/modules/acqui/parcel.tt  | 26 ++++++++-------
> .../intranet-tmpl/prog/en/modules/acqui/parcels.tt | 32 +++++++++++-------
> .../intranet-tmpl/prog/en/modules/acqui/spent.tt   | 28 ++++++++--------
> .../prog/en/modules/acqui/supplier.tt              | 38 +++++++++++-----------
> .../prog/en/modules/acqui/uncertainprice.tt        | 26 ++++++++-------
> 6 files changed, 99 insertions(+), 84 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 6fc9291..4bb987a 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/orderreceive.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/orderreceive.tt
>@@ -15,18 +15,17 @@
> 
> <div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/acqui/acqui-home.pl">Acquisitions</a> &rsaquo; <a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% booksellerid | html %]">[% name | html %]</a> &rsaquo; Receive items from : [% name | html %] [% IF ( invoice ) %][[% invoice | html %]][% END %] (order #[% ordernumber | html %])</div>
> 
>-<div id="doc3" class="yui-t2">
>-   
>-   <div id="bd">
>-	<div id="yui-main">
>-	<div class="yui-b">
>+<div class="main container-fluid">
>+    <div class="row">
>+        <div class="col-sm-10 col-sm-push-2">
>+            <main>
> 
> <h1>Receive items from : [% name | html %] [% IF ( invoice ) %][[% invoice | html %]] [% END %] (order #[% ordernumber | html %])</h1>
> 
> [% IF ( count ) %]
>     <form action="/cgi-bin/koha/acqui/finishreceive.pl" method="post" onsubmit="return Check(this);">
>-<div class="yui-g">
>-<div class="yui-u first">
>+<div class="row">
>+<div class="col-sm-6">
>     <div class="error" style="display:none"></div>
> 
>     <fieldset class="rows">
>@@ -152,7 +151,7 @@
>     <input type="hidden" name="ordernumber" value="[% ordernumber | html %]" />
>     <input type="hidden" name="booksellerid" value="[% booksellerid | html %]" />
> 	</div>
>-	<div class="yui-u">
>+    <div class="col-sm-6">
>     <fieldset class="rows">
>     <legend>Accounting details</legend>
>         <ol>
>@@ -254,7 +253,7 @@
>     </fieldset>
> 
> </div>
>-</div><div class="yui-g"><fieldset class="action">
>+</div><div class="row"><fieldset class="action">
>         <input type="submit"  value="Save" class="button" accesskey="w" />
>         <a class="cancel" href="/cgi-bin/koha/acqui/parcel.pl?invoiceid=[% invoiceid | html %]&sticky_filters=1">Cancel</a>
> </fieldset></div>    </form>
>@@ -262,13 +261,15 @@
>     This ordernumber does not exist.
> [% END %]
> 
>-</div>
>-</div>
>-<div class="yui-b">
>-[% INCLUDE 'acquisitions-menu.inc' %]
>-</div>
>-</div>
>+</main>
>+</div> 
> 
>+<div class="col-sm-2 col-sm-pull-10">
>+    <aside>
>+        [% INCLUDE 'acquisitions-menu.inc' %]
>+    </aside>
>+</div> 
>+</div> 
> [% MACRO jsinclude BLOCK %]
>     [% Asset.js("js/acquisitions-menu.js") | $raw %]
> [% INCLUDE 'calendar.inc' %]
>@@ -276,7 +277,7 @@
>     [% Asset.js("js/additem.js") | $raw %]
>     [% Asset.js("js/cataloging.js") | $raw %]
>     [% Asset.js("js/prevent_submit.js") | $raw %]
>-    <script type="text/javascript">
>+    <script>
>         function Check(form) {
>             [% IF (AcqCreateItemReceiving) %]
>                 var total_errors = CheckMandatorySubfields(form);
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt
>index a2ac542..a4c0ec0 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt
>@@ -28,11 +28,12 @@
>     [% END %]
> </div>
> 
>-<div id="doc3" class="yui-t2">
> 
>-   <div id="bd">
>-	<div id="yui-main">
>-	<div class="yui-b">
>+<div class="main container-fluid">
>+    <div class="row">
>+        <div class="col-sm-10 col-sm-push-2">
>+            <main>
>+
> 	[% IF ( receive_error ) %]
> 	<div class="dialog alert">
> 	<h3>Error adding items:</h3>
>@@ -387,11 +388,12 @@
> 
> [% END %]
> 
>-</div>
>-</div>
>+</main>
>+</div> 
> 
>+<div class="col-sm-2 col-sm-pull-10">
>+<aside>
> 
>-<div class="yui-b">
> <form action="/cgi-bin/koha/acqui/parcel.pl" id="filterform" method="post">
>   <fieldset class="brief">
>     <h4>Filter</h4>
>@@ -428,17 +430,17 @@
>   </fieldset>
> </form>
> [% INCLUDE 'acquisitions-menu.inc' %]
>-</div>
>-</div>
>+    </aside>
>+</div> 
>+</div> 
> 
> [% MACRO jsinclude BLOCK %]
>     [% Asset.js("js/acquisitions-menu.js") | $raw %]
>     [% INCLUDE 'datatables.inc' %]
>     [% Asset.js("lib/jquery/plugins/jquery.dataTables.columnFilter.js") | $raw %]
>     [% Asset.js("lib/jquery/plugins/jquery.cookie.min.js") | $raw %]
>-    <style type="text/css">#dataPreview { width : 80%; } @media (max-width: 767px) { #dataPreview { margin: 0; width : auto; } }</style>
>-    <script type="text/javascript">
>-
>+    <style>#dataPreview { width : 80%; } @media (max-width: 767px) { #dataPreview { margin: 0; width : auto; } }</style>
>+    <script>
>         dt_overwrite_html_sorting_localeCompare();
>         var sticky_filters = [% sticky_filters | html %];
> 
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcels.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcels.tt
>index 2031230..412f4f7 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcels.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcels.tt
>@@ -14,11 +14,14 @@
> 
> <div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/acqui/acqui-home.pl">Acquisitions</a>  &rsaquo; <a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% booksellerid | html %]">[% name | html %]</a> &rsaquo; Receive shipment from vendor [% name | html %]</div>
> 
>-[% IF ( count ) %]<div id="doc3" class="yui-t2">[% ELSE %]<div id="doc" class="yui-t7">[% END %]
>-   
>-   <div id="bd">
>-	<div id="yui-main">
>-	<div class="yui-b">
>+<div class="main container-fluid">
>+    <div class="row">
>+        [% IF ( count ) %]
>+            <div class="col-sm-10 col-sm-push-2">
>+        [% ELSE %]
>+            <div class="col-md-10 col-md-offset-1 col-lg-8 col-lg-offset-2">
>+        [% END %]
>+            <main>
> 
> [% IF ( error_failed_to_create_invoice ) %]
>     <div id="error" class="dialog alert">
>@@ -172,10 +175,13 @@
>             <fieldset class="action"><input type="submit" class="button" value="Next" /> <a class="cancel" href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% booksellerid | html %]">Cancel</a></fieldset>
>         </form>
>     </div>
>-</div>
>-</div>
>-<div class="yui-b">
>-[% IF ( count ) %]<form method="get" action="parcels.pl">
>+</main>
>+</div> 
>+
>+[% IF ( count ) %]
>+<div class="col-sm-2 col-sm-pull-10">
>+    <aside>
>+    <form method="get" action="parcels.pl">
>     <fieldset class="brief">
> 	<h4>Filter</h4>
>         <ol>
>@@ -198,9 +204,11 @@
>         </ol>
> 	<fieldset class="action"><input type="submit" class="button" value="Filter" /> <a href="/cgi-bin/koha/acqui/parcels.pl?booksellerid=[% booksellerid | html %]">Clear</a></fieldset>
> 	</fieldset>
>-</form>[% END %]
>-</div>
>-</div>
>+</form>
>+</aside>
>+</div>  
>+[% END %]
>+</div> 
> 
> [% MACRO jsinclude BLOCK %]
>     [% Asset.js("js/acquisitions-menu.js") | $raw %]
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/spent.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/spent.tt
>index 21b0701..d3cae4f 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/spent.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/spent.tt
>@@ -15,11 +15,10 @@
> 
> <div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/acqui/acqui-home.pl">Acquisitions</a> &rsaquo; Spent - [% fund_code | html %]</div>
> 
>-<div id="doc3" class="yui-t2">
>-
>-<div id="bd">
>-    <div id="yui-main">
>-        <div class="yui-b">
>+<div class="main container-fluid">
>+    <div class="row">
>+        <div class="col-sm-10 col-sm-push-2">
>+            <main>
> 
> <h1>Fund: [% fund_code | html %]</h1>
> <h2>Spent</h2>
>@@ -79,7 +78,7 @@
> 
>     <tfoot>
>         [% IF shipmentcosts.size || ( adjustments && adjustments.count > 0 ) %]
>-            <tr valign="top">
>+            <tr>
>                 <td colspan="9"> Sub total </td>
>                 <td class="data"> [% subtotal | html %] </td>
>             </tr>
>@@ -109,17 +108,20 @@
>     </tfoot>
> </table>
> 
>-</div>
>-</div>
>-<div class="yui-b">
>-[% INCLUDE 'acquisitions-menu.inc' %]
>-</div>
>-</div>
>+</main>
>+</div> 
>+
>+<div class="col-sm-2 col-sm-pull-10">
>+    <aside>
>+        [% INCLUDE 'acquisitions-menu.inc' %]
>+    </aside>
>+</div> 
>+</div> 
> 
> [% MACRO jsinclude BLOCK %]
>     [% Asset.js("js/acquisitions-menu.js") | $raw %]
>     [% INCLUDE 'datatables.inc' %]
>-    <script type="text/javascript">
>+    <script>
>         $(document).ready(function() {
>             $("#spent").dataTable($.extend(true, {}, dataTablesDefaults, {
>                 "aoColumnDefs": [
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/supplier.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/supplier.tt
>index 5ab90cd..10cc063 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/supplier.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/supplier.tt
>@@ -100,11 +100,11 @@
> 
> <div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/acqui/acqui-home.pl">Acquisitions</a> &rsaquo; [% IF ( enter ) %][% IF ( booksellerid ) %] <a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% booksellerid | html %]">[% name | html %]</a> &rsaquo; Update: [% name | html %][% ELSE %]Add vendor[% END %] [% ELSE %][% name | html %][% END %]</div>
> 
>-<div id="doc3" class="yui-t2">
>+<div class="main container-fluid">
>+    <div class="row">
>+        <div class="col-sm-10 col-sm-push-2">
>+            <main>
> 
>-<div id="bd">
>-    <div id="yui-main">
>-    <div class="yui-b">
>     [% IF ( enter ) %]
>         [% IF ( booksellerid ) %]
>         <h1>Update: [% name | html %]</h1>
>@@ -115,7 +115,6 @@
> [% UNLESS ( enter ) %][% INCLUDE 'acquisitions-toolbar.inc' %][% END %]
> [% IF ( enter ) %]
>     <form action="updatesupplier.pl" name="updatesupplier" class="validated" method="post">
>-    <div class="yui-g">
>         <input type="hidden" name="booksellerid" value="[% booksellerid | html %]" />
>         <fieldset class="rows">
>             <legend>Company details</legend>
>@@ -148,8 +147,7 @@
>             [% END %]
>             <button id="add-contact" class="btn btn-default"><i class="fa fa-plus"></i> Add another contact</button>
>         </fieldset>
>-    </div>
>-        <div class="yui-g">
>+
>         <fieldset class="rows">
>             <legend>Ordering information</legend>
>             <ol class="radio"><li><label for="activestatus" class="radio">Vendor is:</label>
>@@ -244,12 +242,11 @@
>         <fieldset class="action"><input type="submit" value="Save" /> [% IF ( booksellerid ) %]
>         <a class="cancel" href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% booksellerid | html %]">[% ELSE %]<a class="cancel" href="/cgi-bin/koha/acqui/acqui-home.pl">
>         [% END %]Cancel</a></fieldset>
>-        </div>
>     </form>
> [% ELSE %]
>     <h1>[% name | html %]</h1>
>-        <div class="yui-g">
>-            <div id="supplier-company-details" class="yui-u first">
>+        <div class="row">
>+            <div id="supplier-company-details" class="col-sm-6">
>                 <h2>Vendor details</h2>
>                 <p><span class="label">Company name: </span>[% name | html %]</p>
>                 <p><span class="label">Postal address: </span>[% postal | html %]</p>
>@@ -292,7 +289,7 @@
>             </div>
>             </div>
> 
>-            <div class="supplier-contact-details yui-u">
>+            <div class="supplier-contact-details col-sm-6">
>                 <h2>Contact</h2>
>                 [% FOREACH contact IN contacts %]
>                     [% INCLUDE show_contact %]
>@@ -311,7 +308,7 @@
>         </div>
> 
>         [% IF ( contracts ) %]
>-            <div id="supplier-contracts" class="yui-g">
>+            <div id="supplier-contracts">
>                 <h2>Contract(s)</h2>
>                 <table id="contractst">
>                   <thead>
>@@ -345,17 +342,20 @@
> 
> [% END %]
> 
>-</div>
>-</div>
>-<div class="yui-b">
>-[% INCLUDE 'vendor-menu.inc' %]
>-</div>
>-</div>
>+</main>
>+</div> 
>+
>+<div class="col-sm-2 col-sm-pull-10">
>+    <aside>
>+        [% INCLUDE 'vendor-menu.inc' %]
>+    </aside>
>+</div> 
>+</div> 
> 
> [% MACRO jsinclude BLOCK %]
>     [% Asset.js("js/acquisitions-menu.js") | $raw %]
>     [% INCLUDE 'datatables.inc' %]
>-    <script type="text/javascript">
>+    <script>
>         function confirm_deletion() {
>             if (confirm(_("Confirm deletion of this vendor ?"))) {
>                 window.location="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% booksellerid | html %]&op=delete";
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/uncertainprice.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/uncertainprice.tt
>index 5e5c2c5..1401d40 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/uncertainprice.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/uncertainprice.tt
>@@ -14,11 +14,10 @@
> 
> <div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/acqui/acqui-home.pl">Acquisitions</a> &rsaquo; [% IF ( booksellername ) %]<a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% booksellerid | html %]">[% booksellername | html %]</a> &rsaquo; Uncertain prices for vendor [% booksellername | html %][% ELSE %]Uncertain prices[% END %]</div>
> 
>-<div id="doc3" class="yui-t2">
>-
>-    <div id="bd">
>-    <div id="yui-main">
>-    <div class="yui-b">
>+<div class="main container-fluid">
>+    <div class="row">
>+        <div class="col-sm-10 col-sm-push-2">
>+            <main>
> 
> [% INCLUDE 'acquisitions-toolbar.inc' %]
>         [% IF ( validate ) %]
>@@ -132,17 +131,20 @@
> 	</form>
> 	[% END %]
> 
>-</div>
>-</div>
>-<div class="yui-b">
>-[% INCLUDE 'vendor-menu.inc' %]
>-</div>
>-</div>
>+</main>
>+</div> 
>+
>+<div class="col-sm-2 col-sm-pull-10">
>+    <aside>
>+        [% INCLUDE 'vendor-menu.inc' %]
>+    </aside>
>+</div> 
>+</div> 
> 
> [% MACRO jsinclude BLOCK %]
>     [% Asset.js("js/acquisitions-menu.js") | $raw %]
>     [% INCLUDE 'datatables.inc' %]
>-    <script type="text/javascript">
>+    <script>
>         $(document).ready(function() {
>             var uncertainpricet = $("#uncertainpricet").dataTable($.extend(true, {}, dataTablesDefaults, {
>                 "aoColumnDefs": [
>-- 
>2.1.4

Actions: View | Diff | Splinter Review

Attachments on bug 20690: 75203 | 77755 | 77999 | 78029 | 78193