From ce6724c21dd42bb02114a942400812942240804c Mon Sep 17 00:00:00 2001 From: Owen Leonard <oleonard@myacpl.org> Date: Wed, 2 May 2018 16:38:08 +0000 Subject: [PATCH] Bug 21963: Update two-column templates with Bootstrap grid: Patrons part 1 This patch modifies several patron 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: - Patrons -> View patron - Fines - Account - Create manual credit - Delete - Try to delete a patron with checkouts - Discharges - Housebound - Files - Holds history Signed-off-by: Claire Gravely <claire.gravely@bsz-bw.de> Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org> --- .../prog/en/modules/members/boraccount.tt | 25 +++++++++-------- .../prog/en/modules/members/deletemem.tt | 26 ++++++++++-------- .../prog/en/modules/members/discharge.tt | 26 +++++++++--------- .../intranet-tmpl/prog/en/modules/members/files.tt | 25 +++++++++-------- .../prog/en/modules/members/holdshistory.tt | 29 ++++++++++++-------- .../prog/en/modules/members/housebound.tt | 32 ++++++++++------------ .../prog/en/modules/members/mancredit.tt | 26 ++++++++++-------- 7 files changed, 103 insertions(+), 86 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/boraccount.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/boraccount.tt index e9680a5c55..bd689a60d5 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/boraccount.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/boraccount.tt @@ -23,11 +23,11 @@ <div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> › <a href="/cgi-bin/koha/members/members-home.pl">Patrons</a> › Account for [% INCLUDE 'patron-title.inc' %]</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"> [% INCLUDE 'members-toolbar.inc' %] <form action="/cgi-bin/koha/members/boraccount.pl" method="get"><input type="hidden" name="borrowernumber" id="borrowernumber" value="[% patron.borrowernumber | html %]" /></form> @@ -94,22 +94,25 @@ </tr> </tfoot> </table> -</div></div> - </div> </div> -<div class="yui-b"> -[% INCLUDE 'circ-menu.inc' %] -</div> -</div> + </main> + </div> <!-- /.col-sm-10.col-sm-push-2 --> + + <div class="col-sm-2 col-sm-pull-10"> + <aside> + [% INCLUDE 'circ-menu.inc' %] + </aside> + </div> <!-- /.col-sm-2.col-sm-pull-10 --> + </div> <!-- /.row --> [% MACRO jsinclude BLOCK %] [% INCLUDE 'datatables.inc' %] [% INCLUDE 'columns_settings.inc' %] [% INCLUDE 'str/members-menu.inc' %] [% Asset.js("js/members-menu.js") | $raw %] - <script type="text/javascript"> + <script> $(document).ready(function() { var txtActivefilter = _("Filter paid transactions"); var txtInactivefilter = _("Show all transactions"); diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/deletemem.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/deletemem.tt index aafb9615a6..f17df687d4 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/deletemem.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/deletemem.tt @@ -12,11 +12,12 @@ [% INCLUDE 'patron-search.inc' %] <div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> › <a href="/cgi-bin/koha/members/members-home.pl">Patrons</a> › Delete patron [% patron.firstname | html %] [% patron.surname | 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> + [% INCLUDE 'members-toolbar.inc' %] [% IF ( ItemsOnIssues || charges || guarantees ) %] <div class="dialog alert"> @@ -49,13 +50,16 @@ </form> </div> [% END %] -</div> -</div> -<div class="yui-b"> -[% INCLUDE 'circ-menu.inc' %] -</div> -</div> + </main> + </div> <!-- /.col-sm-10.col-sm-push-2 --> + + <div class="col-sm-2 col-sm-pull-10"> + <aside> + [% INCLUDE 'circ-menu.inc' %] + </aside> + </div> <!-- /.col-sm-2.col-sm-pull-10 --> + </div> <!-- /.row --> [% MACRO jsinclude BLOCK %] [% INCLUDE 'str/members-menu.inc' %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/discharge.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/discharge.tt index d3d636d022..b832fdf597 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/discharge.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/discharge.tt @@ -18,11 +18,11 @@ › [% UNLESS blocking_error %]Discharge for [% patron.firstname | html %] [% patron.surname | html %] ([% patron.cardnumber | html %])[% END %] </div> -<div id="doc3" class="yui-t1"> - <div id="bd"> - <div id="yui-main"> - <div class="yui-b"> -<div class="yui-g"> +<div class="main container-fluid"> + <div class="row"> + <div class="col-sm-10 col-sm-push-2"> + <main> + <h3>Discharge</h3> [% FOR message IN messages %] <div class="dialog [% message.type | html %]"> @@ -64,15 +64,15 @@ </table> [% END %] -</div> - + </main> + </div> <!-- /.col-sm-10.col-sm-push-2 --> -</div> -</div> -<div class="yui-b"> -[% INCLUDE 'circ-menu.inc' %] -</div> -</div> + <div class="col-sm-2 col-sm-pull-10"> + <aside> + [% INCLUDE 'circ-menu.inc' %] + </aside> + </div> <!-- /.col-sm-2.col-sm-pull-10 --> + </div> <!-- /.row --> [% MACRO jsinclude BLOCK %] [% INCLUDE 'str/members-menu.inc' %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/files.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/files.tt index 05230c69fa..0b46d985d4 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/files.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/files.tt @@ -15,10 +15,11 @@ <div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> › <a href="/cgi-bin/koha/members/members-home.pl">Patrons</a> › Files for [% INCLUDE 'patron-title.inc' %]</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 'members-toolbar.inc' %] <h1>Files</h1> @@ -78,18 +79,20 @@ </fieldset> </form> - </div> - </div> + </main> + </div> <!-- /.col-sm-10.col-sm-push-2 --> - <div class="yui-b"> - [% INCLUDE 'circ-menu.inc' %] - </div> - </div> + <div class="col-sm-2 col-sm-pull-10"> + <aside> + [% INCLUDE 'circ-menu.inc' %] + </aside> + </div> <!-- /.col-sm-2.col-sm-pull-10 --> + </div> <!-- /.row --> [% MACRO jsinclude BLOCK %] [% INCLUDE 'str/members-menu.inc' %] [% Asset.js("js/members-menu.js") | $raw %] - <script type="text/javascript"> + <script> $(document).ready(function(){ $(".confirmdelete").on("click", function(){ $(this).parents('tr').addClass("warn"); diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/holdshistory.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/holdshistory.tt index 1140b7ad51..09ed124fc8 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/holdshistory.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/holdshistory.tt @@ -19,10 +19,11 @@ <div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> › <a href="/cgi-bin/koha/members/members-home.pl">Patrons</a> › Holds history for [% INCLUDE 'patron-title.inc' %]</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 'members-toolbar.inc' %] <h1>Holds history</h1> @@ -39,6 +40,7 @@ <div id="holdshistory" style="overflow:hidden"> <table id="table_holdshistory"> <thead> + <tr> <th class="anti-the">Title</th> <th>Author</th> <th>Barcode</th> @@ -51,9 +53,11 @@ <th>Requested item type</th> [% END %] <th>Status</th> + </tr> </thead> <tbody> [% FOREACH hold IN holds %] + <tr> <td><a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% hold.biblio.biblionumber | uri %]">[% hold.biblio.title | html %]</a></td> <td>[% hold.biblio.author | html %]</td> <td>[% hold.item.barcode | html %]</td> @@ -109,20 +113,23 @@ </div> [% END %] -</div> -</div> -<div class="yui-b"> -[% INCLUDE 'circ-menu.inc' %] -</div> -</div> + </main> + </div> <!-- /.col-sm-10.col-sm-push-2 --> + + <div class="col-sm-2 col-sm-pull-10"> + <aside> + [% INCLUDE 'circ-menu.inc' %] + </aside> + </div> <!-- /.col-sm-2.col-sm-pull-10 --> + </div> <!-- /.row --> [% MACRO jsinclude BLOCK %] [% INCLUDE 'datatables.inc' %] [% INCLUDE 'columns_settings.inc' %] [% INCLUDE 'str/members-menu.inc' %] [% Asset.js("js/members-menu.js") | $raw %] - <script type="text/javascript" id="js"> + <script> $(document).ready(function() { var columns_settings = [% ColumnsSettings.GetColumns('members', 'holdshistory', 'holdshistory-table', 'json') %]; [% UNLESS show_itemtype_column %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/housebound.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/housebound.tt index 60d848921e..9cc6edaebd 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/housebound.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/housebound.tt @@ -20,18 +20,15 @@ › Details for [% INCLUDE 'patron-title.inc' %] </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 'members-toolbar.inc' %] - <div class="yui-g"> - <!-- Title --> <h3>Housebound details for [% INCLUDE 'patron-title.inc' %]</h3> - <div class="first"> [% FOR m IN messages %] <div class="dialog [% m.type | html %]"> @@ -417,19 +414,20 @@ [% END %] - </div> <!-- End yui-u first --> - </div> <!-- End yui-g --> - </div> - </div> - <div class="yui-b"> - [% INCLUDE 'circ-menu.inc' %] - </div> -</div> + </main> + </div> <!-- /.col-sm-10.col-sm-push-2 --> + + <div class="col-sm-2 col-sm-pull-10"> + <aside> + [% INCLUDE 'circ-menu.inc' %] + </aside> + </div> <!-- /.col-sm-2.col-sm-pull-10 --> + </div> <!-- /.row --> [% MACRO jsinclude BLOCK %] [% INCLUDE 'calendar.inc' %] - <script type="text/javascript"> - + [% Asset.js("js/members-menu.js") | $raw %] + <script> $(document).ready(function() { $("a.delete").click(function(){ return confirm(_("Are you sure you want to delete this delivery?")); diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/mancredit.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/mancredit.tt index c02943d96c..9df404adaa 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/mancredit.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/mancredit.tt @@ -14,11 +14,11 @@ <div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> › <a href="/cgi-bin/koha/members/members-home.pl">Patrons</a> › Manual credit</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 'members-toolbar.inc' %] <!-- The manual invoice and credit buttons --> @@ -52,18 +52,20 @@ </div></div> -</div> -</div> + </main> + </div> <!-- /.col-sm-10.col-sm-push-2 --> -<div class="yui-b"> -[% INCLUDE 'circ-menu.inc' %] -</div> -</div> + <div class="col-sm-2 col-sm-pull-10"> + <aside> + [% INCLUDE 'circ-menu.inc' %] + </aside> + </div> <!-- /.col-sm-2.col-sm-pull-10 --> + </div> <!-- /.row --> [% MACRO jsinclude BLOCK %] [% INCLUDE 'str/members-menu.inc' %] [% Asset.js("js/members-menu.js") | $raw %] - <script type="text/javascript"> + <script> $(document).ready(function(){ $('#mancredit').preventDoubleFormSubmit(); $("fieldset.rows input, fieldset.rows select").addClass("noEnterSubmit"); -- 2.11.0