Bugzilla – Attachment 83569 Details for
Bug 21442
Switch two-column templates to Bootstrap grid: Circulation part 1
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 21442: Update two-column templates with Bootstrap grid: Circulation part 1
Bug-21442-Update-two-column-templates-with-Bootstr.patch (text/plain), 14.23 KB, created by
Katrin Fischer
on 2019-01-01 22:34:32 UTC
(
hide
)
Description:
Bug 21442: Update two-column templates with Bootstrap grid: Circulation part 1
Filename:
MIME Type:
Creator:
Katrin Fischer
Created:
2019-01-01 22:34:32 UTC
Size:
14.23 KB
patch
obsolete
>From 24381cd2570b6d01ff7cd72438546fa3b657f441 Mon Sep 17 00:00:00 2001 >From: Owen Leonard <oleonard@myacpl.org> >Date: Wed, 2 May 2018 15:14:03 +0000 >Subject: [PATCH] Bug 21442: Update two-column templates with Bootstrap grid: > Circulation part 1 > >This patch modifies several circulation 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: > > - Circulation -> Pending on-site checkouts (enable OnSiteCheckouts > preference). > - Test with the CircSidebar system preference both on and off > - Circulation -> Overdues > - Circulation -> Holds to pull > - Circulation -> Renew > - Test with the CircSidebar system preference both on and off > - Circulation -> Bibliographic detail page -> Request article (enable > ArticleRequests system preferences) > - Circulation -> Hold ratios > >Signed-off-by: Claire Gravely <claire.gravely@bsz-bw.de> > >Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org> > >Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de> >--- > .../prog/en/modules/circ/on-site_checkouts.tt | 38 ++++++++++----- > .../intranet-tmpl/prog/en/modules/circ/overdue.tt | 26 +++++----- > .../prog/en/modules/circ/pendingreserves.tt | 25 ++++++---- > .../intranet-tmpl/prog/en/modules/circ/renew.tt | 56 ++++++++++++---------- > .../prog/en/modules/circ/request-article.tt | 26 +++++----- > .../prog/en/modules/circ/reserveratios.tt | 28 ++++++----- > 6 files changed, 119 insertions(+), 80 deletions(-) > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/on-site_checkouts.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/on-site_checkouts.tt >index 221ae8f49f..ab613123da 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/on-site_checkouts.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/on-site_checkouts.tt >@@ -17,10 +17,18 @@ > > <div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> › <a href="/cgi-bin/koha/circ/circulation-home.pl">Circulation</a> › Pending on-site checkouts</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-12"> >+ <main> >+ <div class="row"> >+ >+ [% IF Koha.Preference('CircSidebar') %] >+ <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 %] >+ > <h1>Pending on-site checkouts</h1> > [% IF pending_onsite_checkouts %] > <table id="pending_onsite_checkout"> >@@ -56,16 +64,24 @@ > [% ELSE %] > <h3>No pending on-site checkout.</h3> > [% END %] >- </div> >- </div> >- <div class="yui-b"> >- [% IF Koha.Preference('CircSidebar') %][% INCLUDE 'circ-nav.inc' %][% END %] >- </div> >- </div> >+ >+ [% IF Koha.Preference('CircSidebar') %] >+ </div> <!-- /.col-sm-10.col-sm-push-2 --> >+ <div class="col-sm-2 col-sm-pull-10"> >+ <aside> >+ [% INCLUDE 'circ-nav.inc' %] >+ </aside> >+ </div> <!-- /.col-sm-2.col-sm-pull-10 --> >+ </div> <!-- /.row --> >+ [% END %] >+ >+ </main> >+ </div> <!-- /.col-sm-12 --> >+ </div> <!-- /.row --> > > [% MACRO jsinclude BLOCK %] > [% INCLUDE 'datatables.inc' %] >- <script type="text/javascript"> >+ <script> > $(document).ready(function(){ > if ( $("#pending_onsite_checkout").length ) { > $("#pending_onsite_checkout").dataTable($.extend(true, {}, dataTablesDefaults, { >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/overdue.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/overdue.tt >index 9295d94894..402918e780 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/overdue.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/overdue.tt >@@ -8,7 +8,7 @@ > <title>Koha › Circulation › Items overdue as of [% todaysdate | html %]</title> > [% INCLUDE 'doc-head-close.inc' %] > [% Asset.css("css/datatables.css") | $raw %] >-<style type="text/css"> >+<style> > .sql {display:none;} > </style> > </head> >@@ -19,11 +19,10 @@ > > <div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> › <a href="/cgi-bin/koha/circ/circulation-home.pl">Circulation</a> › Overdues as of [% todaysdate | 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> > > [% IF ( noreport ) %] > <h2>Overdue report</h2> >@@ -92,9 +91,12 @@ > [% END %] <!-- overdueloop --> > [% END %] <!-- noreport --> > >-</div> >-</div> >-<div class="yui-b"> >+ </main> >+ </div> <!-- /.col-sm-10.col-sm-push-2 --> >+ >+ <div class="col-sm-2 col-sm-pull-10"> >+ <aside> >+ > <form method="post" action="/cgi-bin/koha/circ/overdue.pl"> > <fieldset class="brief"> > <h4>Filter on:</h4> >@@ -200,8 +202,10 @@ > </fieldset> > </fieldset> > </form> >-</div> >-</div> >+ >+ </aside> >+ </div> <!-- /.col-sm-2.col-sm-pull-10 --> >+ </div> <!-- /.row --> > > [% MACRO jsinclude BLOCK %] > [% INCLUDE 'calendar.inc' %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/pendingreserves.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/pendingreserves.tt >index f9551ddd0a..8a551a11e2 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/pendingreserves.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/pendingreserves.tt >@@ -20,11 +20,11 @@ > > <div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> › <a href="/cgi-bin/koha/circ/circulation-home.pl">Circulation</a> › Holds to pull</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"> > [% FOR m IN messages %] > <div class="dialog [% m.type | html %]"> > [% SWITCH m.code %] >@@ -162,9 +162,13 @@ > [% END %] > </div> > >-</div> >-</div> >-<div class="yui-b"> >+ >+ </main> >+ </div> <!-- /.col-sm-10.col-sm-push-2 --> >+ >+ <div class="col-sm-2 col-sm-pull-10"> >+ <aside> >+ > <div id="filters"> > > <form action="/cgi-bin/koha/circ/pendingreserves.pl" method="post" > >@@ -195,14 +199,15 @@ > </form> > > </div> >-</div> >-</div> >+ </aside> >+ </div> <!-- /.col-sm-2.col-sm-pull-10 --> >+ </div> <!-- /.row --> > > [% MACRO jsinclude BLOCK %] > [% INCLUDE 'calendar.inc' %] > [% INCLUDE 'datatables.inc' %] > [% INCLUDE 'columns_settings.inc' %] >- <script type="text/javascript"> >+ <script> > $(document).ready(function() { > var columns_settings = [% ColumnsSettings.GetColumns('circ', 'holds', 'holds-to-pull', 'json') | $raw %]; > var holdst = KohaTable("holdst", { >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/renew.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/renew.tt >index 5498c169ef..78c0c698fe 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/renew.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/renew.tt >@@ -14,10 +14,18 @@ > > <div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> › <a href="/cgi-bin/koha/circ/circulation-home.pl">Circulation</a> › Renew</div> > >-[% IF Koha.Preference('CircSidebar') %]<div id="doc3" class="yui-t2">[% ELSE %]<div id="doc" class="yui-t7">[% END %] >- <div id="bd"> >- <div id="yui-main"> >- [% IF Koha.Preference('CircSidebar') %]<div class="yui-b">[% END %] >+<div class="main container-fluid"> >+ <div class="row"> >+ <div class="col-sm-12"> >+ <main> >+ <div class="row"> >+ >+ [% IF Koha.Preference('CircSidebar') %] >+ <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 %] >+ > [% IF error %] > <div class="dialog alert"> > <h3>Cannot renew:</h3> >@@ -146,41 +154,39 @@ > </div> > [% END %] > >- <div class="yui-g"> >- > [% UNLESS error %] > <form method="post" action="/cgi-bin/koha/circ/renew.pl" autocomplete="off" > > >- <div class="yui-u first"> >- <fieldset> >- <legend>Renew</legend> >+ <fieldset> >+ <legend>Renew</legend> > >- <label for="barcode">Enter item barcode: </label> >+ <label for="barcode">Enter item barcode: </label> > >- <input name="barcode" id="barcode" size="14" class="focus" type="text" /> >+ <input name="barcode" id="barcode" size="14" class="focus" type="text" /> > >- <input type="submit" class="submit" value="Submit" /> >- </fieldset> >- </div> >+ <input type="submit" class="submit" value="Submit" /> >+ </fieldset> > > </form> > [% END %] > >- </div> >- </div> >- >-[% IF Koha.Preference('CircSidebar') %] >-</div> >+ [% IF Koha.Preference('CircSidebar') %] >+ </div> <!-- /.col-sm-10.col-sm-push-2 --> >+ <div class="col-sm-2 col-sm-pull-10"> >+ <aside> >+ [% INCLUDE 'circ-nav.inc' %] >+ </aside> >+ </div> <!-- /.col-sm-2.col-sm-pull-10 --> >+ </div> <!-- /.row --> >+ [% END %] > >-<div class="yui-b noprint"> >- [% INCLUDE 'circ-nav.inc' %] >-</div> >-[% END %] >-<div> >+ </main> >+ </div> <!-- /.col-sm-12 --> >+ </div> <!-- /.row --> > > [% MACRO jsinclude BLOCK %] > [% IF error %] >- <script type="text/javascript"> >+ <script> > $( document ).ready(function() { > removeFocus(); > }); >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/request-article.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/request-article.tt >index 18c5d73820..7248ecdcf7 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/request-article.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/request-article.tt >@@ -28,11 +28,11 @@ > [% END %] > </div> > >- [% INCLUDE 'blocking_errors.inc' %] >- <div id="doc3" class="yui-t2"> >- <div id="bd"> >- <div id="yui-main"> >- <div class="yui-b"> >+[% INCLUDE 'blocking_errors.inc' %] >+<div class="main container-fluid"> >+ <div class="row"> >+ <div class="col-sm-10 col-sm-push-2"> >+ <main> > > <h1>Request article from <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% biblio.id | uri %]">[% biblio.title | html %]</a></h1> > [% IF no_patrons_found %] >@@ -291,19 +291,21 @@ > </table> > </fieldset> > [% END %] >- </div> >- </div> > >- <div class="yui-b"> >+ </main> >+ </div> <!-- /.col-sm-10.col-sm-push-2 --> >+ >+ <div class="col-sm-2 col-sm-pull-10"> >+ <aside> > [% INCLUDE 'biblio-view-menu.inc' %] >- </div> >- </div> >- </div> >+ </aside> >+ </div> <!-- /.col-sm-2.col-sm-pull-10 --> >+ </div> <!-- /.row --> > > [% MACRO jsinclude BLOCK %] > [% INCLUDE 'datatables.inc' %] > >- <script type="text/javascript"> >+ <script> > $('#current-article-requests').ready(function() { > $(".hide").hide(); > }); >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/reserveratios.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/reserveratios.tt >index 5073850d50..eb0efc7681 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/reserveratios.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/reserveratios.tt >@@ -9,7 +9,7 @@ > <title>Koha › Circulation › Hold ratios</title> > [% INCLUDE 'doc-head-close.inc' %] > [% Asset.css("css/datatables.css") | $raw %] >-<style type="text/css"> >+<style> > .sql { display: none; } > .ulined { text-decoration: underline; } > .ratiolimit { color: blue; cursor: pointer; } >@@ -23,10 +23,11 @@ > > <div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> › <a href="/cgi-bin/koha/circ/circulation-home.pl">Circulation</a> › Hold ratios</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>Hold ratios to calculate items needed</h1> > <h3>Calculated on [% todaysdate | $KohaDates %]. From [% from | $KohaDates %] > to [% to | $KohaDates %]</h3> >@@ -101,9 +102,13 @@ > [% ELSE %] > <b>No items found.</b> > [% END %] >-</div> >-</div> >-<div class="yui-b"> >+ >+ </main> >+ </div> <!-- /.col-sm-10.col-sm-push-2 --> >+ >+ <div class="col-sm-2 col-sm-pull-10"> >+ <aside> >+ > <form action="/cgi-bin/koha/circ/reserveratios.pl" method="post" > > <fieldset class="brief"> > <h4>Refine results:</h4> >@@ -142,13 +147,14 @@ > [% END %] > </form> > >-</div> >-</div> >+ </aside> >+ </div> <!-- /.col-sm-2.col-sm-pull-10 --> >+ </div> <!-- /.row --> > > [% MACRO jsinclude BLOCK %] > [% INCLUDE 'calendar.inc' %] > [% INCLUDE 'datatables.inc' %] >- <script type="text/javascript"> >+ <script> > $(document).ready(function() { > $(".ratiolimit").click(function () { > $("#ratio").val($(this).html()); >-- >2.11.0
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 21442
:
79599
|
80407
|
83295
|
83313
| 83569