Bugzilla – Attachment 77753 Details for
Bug 20672
Update two-column templates with Bootstrap grid: Acquisitions part 3
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 20672: Update two-column templates with Bootstrap grid: Acquisitions part 3
Bug-20672-Update-two-column-templates-with-Bootstr.patch (text/plain), 12.29 KB, created by
Owen Leonard
on 2018-08-13 14:48:19 UTC
(
hide
)
Description:
Bug 20672: Update two-column templates with Bootstrap grid: Acquisitions part 3
Filename:
MIME Type:
Creator:
Owen Leonard
Created:
2018-08-13 14:48:19 UTC
Size:
12.29 KB
patch
obsolete
>From 5216b95ec9f839892bdb0a66571679d0cab2ce38 Mon Sep 17 00:00:00 2001 >From: Owen Leonard <oleonard@myacpl.org> >Date: Tue, 1 May 2018 15:47:24 +0000 >Subject: [PATCH] Bug 20672: Update two-column templates with Bootstrap grid: > Acquisitions part 3 > >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 in the modified templates. > >To test, apply the patch and view the following pages, confirming that >they look correct at various browser widths: > >- Acquisitions -> Vendor -> Add to basket -> From an existing record -> > Search results. > - Order >- Acquisitions -> Vendor -> Add to basket -> From a subscription >- Acquisitions -> Vendor -> Add to basket -> From a suggestion >- Acquisitions -> Vendor -> Add to basket -> From an external source > - Search for an title which already exists in your catalog > - Select a search result which has an ISBN matching the title in your > catalog. > - Order. The duplicate warning page is the one modified. >- Acquisitions home page -> Click an "Ordered" value for a fund. >--- > .../prog/en/modules/acqui/neworderbiblio.tt | 28 +++++++++--------- > .../prog/en/modules/acqui/neworderempty.tt | 26 +++++++++-------- > .../en/modules/acqui/neworderempty_duplicate.tt | 33 ++++++++++++---------- > .../prog/en/modules/acqui/newordersubscription.tt | 23 ++++++++------- > .../prog/en/modules/acqui/newordersuggestion.tt | 28 +++++++++--------- > .../intranet-tmpl/prog/en/modules/acqui/ordered.tt | 26 +++++++++-------- > 6 files changed, 89 insertions(+), 75 deletions(-) > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderbiblio.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderbiblio.tt >index 877e41a..43e1375 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderbiblio.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderbiblio.tt >@@ -12,12 +12,11 @@ > > <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> › <a href="/cgi-bin/koha/acqui/basket.pl?basketno=[% basketno %]">Basket [% basketno %]</a> › Search existing records</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>Search existing records</h1> > > >@@ -100,17 +99,20 @@ > > [% INCLUDE 'acquisitions-add-to-basket.inc' %] > >-</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() { > var resultst = $("#resultst").dataTable($.extend(true, {}, dataTablesDefaults, { > 'sDom': 't', >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tt >index 1a10af9..d3cc04f 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.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> › <a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% booksellerid %]">[% name %]</a> › <a href="/cgi-bin/koha/acqui/basket.pl?basketno=[% basketno %]">Basket [% basketno %]</a> › [% IF ( ordernumber ) %]Modify order details (line #[% ordernumber %])[% ELSE %]New order[% 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> > > <h2> > [% IF ( ordernumber ) %] >@@ -508,12 +507,15 @@ > </div> > </div> > >-</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") %] >@@ -522,7 +524,7 @@ > [% Asset.js("js/additem.js") %] > [% Asset.js("js/cataloging.js") %] > [% Asset.js("js/prevent_submit.js") %] >- <script type="text/javascript"> >+ <script> > actTotal = ""; > > function Check(ff) { >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty_duplicate.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty_duplicate.tt >index 78ad410..be15fc0 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty_duplicate.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty_duplicate.tt >@@ -9,11 +9,10 @@ > > <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/basket.pl?basketno=[% basketno %]">Basket [% basketno %]</a> › Duplicate warning</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> > > <div class="dialog alert"> > <h4>Duplicate warning</h4> >@@ -23,8 +22,8 @@ > [% ELSE %]<a class="popup" target="_blank" title="Open in new window" href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% biblionumber |url %]">[% END %][% duplicatetitle %]</a></p> > </div> > >-<div class="yui-gb"> >-<div class="yui-u first"> >+<div class="row"> >+<div class="col-sm-4"> > <div style="border: 1px solid #DDD; padding:1em;"> > <form action="/cgi-bin/koha/acqui/neworderempty.pl"> > <h4>Use existing record</h4> >@@ -37,7 +36,7 @@ > </div> > </div> > >-<div class="yui-u"> >+<div class="col-sm-4"> > <div style="border: 1px solid #DDD; padding:1em;"> > <form action="/cgi-bin/koha/acqui/basket.pl"> > <h4>Cancel and return to order</h4> >@@ -48,7 +47,7 @@ > </div> > </div> > >-<div class="yui-u"> >+<div class="col-sm-4"> > <div style="border: 1px solid #DDD; padding:1em;"> > <form action="/cgi-bin/koha/acqui/neworderempty.pl"> > <h4>Create new record</h4> >@@ -64,10 +63,14 @@ > > </div> > >-</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 --> >+ > [% INCLUDE 'intranet-bottom.inc' %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/newordersubscription.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/newordersubscription.tt >index aad7d34..d567334 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/newordersubscription.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/newordersubscription.tt >@@ -15,10 +15,11 @@ > > <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 %]">[% booksellername %]</a> › <a href="/cgi-bin/koha/acqui/basket.pl?basketno=[% basketno %]">Basket [% basketno %]</a> › Add order from a subscription</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> >+ > <h2>Serials subscriptions</h2> > [% IF (done_searched) %] > <label for="show_only_renewed"> >@@ -87,19 +88,21 @@ > [% ELSE %] > <p>Use the search form on the left to find subscriptions.</p> > [% END %] >- </div> >- </div> >+ </main> >+ </div> <!-- /.col-sm-10.col-sm-push-2 --> > >- <div class="yui-b"> >+<div class="col-sm-2 col-sm-pull-10"> >+ <aside> > [% INCLUDE 'subscriptions-search.inc' %] > [% 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' %] >- <script type="text/javascript"> >+ <script> > function updateRowsVisibility(show_only_renewed) { > if ( show_only_renewed ) { > $("#srlt [data-reneweddate='']").hide(); >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/newordersuggestion.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/newordersuggestion.tt >index 9b5fd90..afdf8d0 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/newordersuggestion.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/newordersuggestion.tt >@@ -12,12 +12,11 @@ > > <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> › <a href="/cgi-bin/koha/acqui/basket.pl?basketno=[% basketno %]">Basket [% basketno %]</a> › Add order from a suggestion</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>Suggestions</h1> > [% IF ( suggestions_loop ) %] > <a href="#" id="show_only_mine">Show only mine</a> | <a href="#" id="show_all">Show all suggestions</a> >@@ -67,17 +66,20 @@ > [% ELSE %] > There are no outstanding (accepted) suggestions. > [% 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 'datatables.inc' %] >- <script type="text/javascript"> >+ <script> > $(document).ready(function() { > var suggestionst = $("#suggestionst").dataTable($.extend(true, {}, dataTablesDefaults, { > "aoColumnDefs": [ >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/ordered.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/ordered.tt >index f1418cd..b0e0c10 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/ordered.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/ordered.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> › Ordered - [% 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>Ordered</h2> >@@ -99,17 +98,20 @@ > > </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": [ >-- >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 20672
:
75133
|
77753
|
77996
|
78028
|
78192