Bugzilla – Attachment 75203 Details for
Bug 20690
Update two-column templates with Bootstrap grid: Acquisitions part 4
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[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.24 KB, created by
Owen Leonard
on 2018-05-09 11:45:57 UTC
(
hide
)
Description:
Bug 20690: Update two-column templates with Bootstrap grid: Acquisitions part 4
Filename:
MIME Type:
Creator:
Owen Leonard
Created:
2018-05-09 11:45:57 UTC
Size:
15.24 KB
patch
obsolete
>From c9d599c5d28be3fd355cb52270656e7c7bf1a420 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. >--- > .../prog/en/modules/acqui/orderreceive.tt | 33 ++++++++++--------- > .../intranet-tmpl/prog/en/modules/acqui/parcel.tt | 25 +++++++------- > .../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(+), 83 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 abd35a6..bc677f1 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/orderreceive.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/orderreceive.tt >@@ -14,18 +14,17 @@ > > <div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> › <a href="/cgi-bin/koha/acqui/acqui-home.pl">Acquisitions</a> › <a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% booksellerid %]">[% name %]</a> › Receive items from : [% name %] [% IF ( invoice ) %][[% invoice |html %]][% END %] (order #[% ordernumber %])</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 %] [% IF ( invoice ) %][[% invoice |html %]] [% END %] (order #[% ordernumber %])</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"> >@@ -151,7 +150,7 @@ > <input type="hidden" name="ordernumber" value="[% ordernumber %]" /> > <input type="hidden" name="booksellerid" value="[% booksellerid %]" /> > </div> >- <div class="yui-u"> >+ <div class="col-sm-6"> > <fieldset class="rows"> > <legend>Accounting details</legend> > <ol> >@@ -247,7 +246,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 %]&sticky_filters=1">Cancel</a> > </fieldset></div> </form> >@@ -255,13 +254,15 @@ > This ordernumber does not exist. > [% END %] > >-</div> >-</div> >-<div class="yui-b"> >-[% INCLUDE 'acquisitions-menu.inc' %] >-</div> >-</div> >+</main> >+</div> <!-- /.col-sm-10.col-sm-push-2 --> > >+<div class="col-sm-2 col-sm-pull-10"> >+ <aside> >+ [% INCLUDE 'acquisitions-menu.inc' %] >+ </aside> >+</div> <!-- /.col-sm-2.col-sm-pull-10 --> >+</div> <!-- /.row --> > [% MACRO jsinclude BLOCK %] > [% Asset.js("js/acquisitions-menu.js") %] > [% INCLUDE 'calendar.inc' %] >@@ -269,7 +270,7 @@ > [% Asset.js("js/additem.js") %] > [% Asset.js("js/cataloging.js") %] > [% Asset.js("js/prevent_submit.js") %] >- <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 96c2f51..4bd3d9f 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt >@@ -27,11 +27,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> >@@ -378,11 +379,12 @@ > > [% END %] > >-</div> >-</div> >+</main> >+</div> <!-- /.col-sm-10.col-sm-push-2 --> > >+<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> >@@ -419,16 +421,17 @@ > </fieldset> > </form> > [% INCLUDE 'acquisitions-menu.inc' %] >-</div> >-</div> >+ </aside> >+</div> <!-- /.col-sm-2.col-sm-pull-10 --> >+</div> <!-- /.row --> > > [% MACRO jsinclude BLOCK %] > [% Asset.js("js/acquisitions-menu.js") %] > [% INCLUDE 'datatables.inc' %] > [% Asset.js("lib/jquery/plugins/jquery.dataTables.columnFilter.js") %] > [% Asset.js("lib/jquery/plugins/jquery.cookie.min.js") %] >- <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 %]; >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 ee0ecd0..6f89317 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcels.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcels.tt >@@ -13,11 +13,14 @@ > > <div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> › <a href="/cgi-bin/koha/acqui/acqui-home.pl">Acquisitions</a> › <a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% booksellerid %]">[% name %]</a> › Receive shipment from vendor [% name %]</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"> >@@ -171,10 +174,13 @@ > <fieldset class="action"><input type="submit" class="button" value="Next" /> <a class="cancel" href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% booksellerid %]">Cancel</a></fieldset> > </form> > </div> >-</div> >-</div> >-<div class="yui-b"> >-[% IF ( count ) %]<form method="get" action="parcels.pl"> >+</main> >+</div> <!-- /.col-sm-10.col-sm-push-2 --> >+ >+[% 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> >@@ -197,9 +203,11 @@ > </ol> > <fieldset class="action"><input type="submit" class="button" value="Filter" /> <a href="/cgi-bin/koha/acqui/parcels.pl?booksellerid=[% booksellerid %]">Clear</a></fieldset> > </fieldset> >-</form>[% END %] >-</div> >-</div> >+</form> >+</aside> >+</div> <!-- /.col-sm-2.col-sm-pull-10 --> >+[% END %] >+</div> <!-- /.row --> > > [% MACRO jsinclude BLOCK %] > [% Asset.js("js/acquisitions-menu.js") %] >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 ec91e86..56b0b08 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/spent.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/spent.tt >@@ -14,11 +14,10 @@ > > <div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> › <a href="/cgi-bin/koha/acqui/acqui-home.pl">Acquisitions</a> › Spent - [% fund_code %]</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 %]</h1> > <h2>Spent</h2> >@@ -78,7 +77,7 @@ > > <tfoot> > [% IF shipmentcosts.size %] >- <tr valign="top"> >+ <tr> > <td colspan="9"> Sub total </td> > <td class="data"> [% subtotal %] </td> > </tr> >@@ -97,17 +96,20 @@ > </tfoot> > </table> > >-</div> >-</div> >-<div class="yui-b"> >-[% INCLUDE 'acquisitions-menu.inc' %] >-</div> >-</div> >+</main> >+</div> <!-- /.col-sm-10.col-sm-push-2 --> >+ >+<div class="col-sm-2 col-sm-pull-10"> >+ <aside> >+ [% INCLUDE 'acquisitions-menu.inc' %] >+ </aside> >+</div> <!-- /.col-sm-2.col-sm-pull-10 --> >+</div> <!-- /.row --> > > [% MACRO jsinclude BLOCK %] > [% Asset.js("js/acquisitions-menu.js") %] > [% 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 1d7b033..5113bee 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/supplier.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/supplier.tt >@@ -99,11 +99,11 @@ > > <div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> › <a href="/cgi-bin/koha/acqui/acqui-home.pl">Acquisitions</a> › [% IF ( enter ) %][% IF ( booksellerid ) %] <a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% booksellerid %]">[% name |html %]</a> › 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> >@@ -114,7 +114,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 %]" /> > <fieldset class="rows"> > <legend>Company details</legend> >@@ -147,8 +146,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> >@@ -243,12 +241,11 @@ > <fieldset class="action"><input type="submit" value="Save" /> [% IF ( booksellerid ) %] > <a class="cancel" href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% booksellerid %]">[% 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> >@@ -291,7 +288,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 %] >@@ -310,7 +307,7 @@ > </div> > > [% IF ( contracts ) %] >- <div id="supplier-contracts" class="yui-g"> >+ <div id="supplier-contracts"> > <h2>Contract(s)</h2> > <table id="contractst"> > <thead> >@@ -344,17 +341,20 @@ > > [% END %] > >-</div> >-</div> >-<div class="yui-b"> >-[% INCLUDE 'vendor-menu.inc' %] >-</div> >-</div> >+</main> >+</div> <!-- /.col-sm-10.col-sm-push-2 --> >+ >+<div class="col-sm-2 col-sm-pull-10"> >+ <aside> >+ [% INCLUDE 'vendor-menu.inc' %] >+ </aside> >+</div> <!-- /.col-sm-2.col-sm-pull-10 --> >+</div> <!-- /.row --> > > [% MACRO jsinclude BLOCK %] > [% Asset.js("js/acquisitions-menu.js") %] > [% 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 %]&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 0b24419..90efb2b 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/uncertainprice.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/uncertainprice.tt >@@ -13,11 +13,10 @@ > > <div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> › <a href="/cgi-bin/koha/acqui/acqui-home.pl">Acquisitions</a> › [% IF ( booksellername ) %]<a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% booksellerid %]">[% booksellername %]</a> › Uncertain prices for vendor [% booksellername %][% 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 ) %] >@@ -131,17 +130,20 @@ > </form> > [% END %] > >-</div> >-</div> >-<div class="yui-b"> >-[% INCLUDE 'vendor-menu.inc' %] >-</div> >-</div> >+</main> >+</div> <!-- /.col-sm-10.col-sm-push-2 --> >+ >+<div class="col-sm-2 col-sm-pull-10"> >+ <aside> >+ [% INCLUDE 'vendor-menu.inc' %] >+ </aside> >+</div> <!-- /.col-sm-2.col-sm-pull-10 --> >+</div> <!-- /.row --> > > [% MACRO jsinclude BLOCK %] > [% Asset.js("js/acquisitions-menu.js") %] > [% INCLUDE 'datatables.inc' %] >- <script type="text/javascript"> >+ <script> > $(document).ready(function() { > var uncertainpricet = $("#uncertainpricet").dataTable($.extend(true, {}, dataTablesDefaults, { > "aoColumnDefs": [ >-- >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 20690
:
75203
|
77755
|
77999
|
78029
|
78193