Bugzilla – Attachment 78909 Details for
Bug 21305
Update two-column templates with Bootstrap grid: Patron clubs
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 21305: Update two-column templates with Bootstrap grid: Patron clubs
Bug-21305-Update-two-column-templates-with-Bootstr.patch (text/plain), 4.68 KB, created by
Jonathan Druart
on 2018-09-15 22:37:00 UTC
(
hide
)
Description:
Bug 21305: Update two-column templates with Bootstrap grid: Patron clubs
Filename:
MIME Type:
Creator:
Jonathan Druart
Created:
2018-09-15 22:37:00 UTC
Size:
4.68 KB
patch
obsolete
>From 36adf78024a883cf82ca707c8055af08cf29ed1f Mon Sep 17 00:00:00 2001 >From: Owen Leonard <oleonard@myacpl.org> >Date: Wed, 2 May 2018 16:08:29 +0000 >Subject: [PATCH] Bug 21305: Update two-column templates with Bootstrap grid: > Patron clubs >MIME-Version: 1.0 >Content-Type: text/plain; charset=UTF-8 >Content-Transfer-Encoding: 8bit > >This patch modifies patron clubs 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: > > - Tools -> Patron clubs > - View club enrollments > >Signed-off-by: Dilan Johnpullé <dilan@calyx.net.au> > >Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org> >--- > .../prog/en/modules/clubs/club-enrollments.tt | 28 ++++++++++++---------- > .../intranet-tmpl/prog/en/modules/clubs/clubs.tt | 27 ++++++++++++--------- > 2 files changed, 32 insertions(+), 23 deletions(-) > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/clubs/club-enrollments.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/clubs/club-enrollments.tt >index d6843d373b..7cf9165d0f 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/clubs/club-enrollments.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/clubs/club-enrollments.tt >@@ -15,10 +15,11 @@ > [% INCLUDE 'cat-search.inc' %] > <div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> › <a href="/cgi-bin/koha/tools/tools-home.pl">Tools</a> › <a href="clubs.pl">Patron clubs</a> › Club enrollments</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>Club enrollments for <i>[% club.name | html %]</i></h1> > > <table id="enrollments-table"> >@@ -43,18 +44,21 @@ > [% END %] > </tbody> > </table> >- </div> >- </div> >- <div class="yui-b noprint"> >- [% INCLUDE 'tools-menu.inc' %] >- </div> >- </div> >-</div> >+ >+ </main> >+ </div> <!-- /.col-sm-10.col-sm-push-2 --> >+ >+ <div class="col-sm-2 col-sm-pull-10"> >+ <aside> >+ [% INCLUDE 'tools-menu.inc' %] >+ </aside> >+ </div> <!-- /.col-sm-2.col-sm-pull-10 --> >+ </div> <!-- /.row --> > > [% MACRO jsinclude BLOCK %] > [% INCLUDE 'datatables.inc' %] > [% Asset.js("js/tools-menu.js") | $raw %] >- <script type="text/javascript"> >+ <script> > $(document).ready(function() { > eTable = $('#enrollments-table').dataTable($.extend(true, {}, dataTablesDefaults, { > "sPaginationType": "four_button", >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/clubs/clubs.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/clubs/clubs.tt >index 05ac3ea10e..0e3ba3e635 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/clubs/clubs.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/clubs/clubs.tt >@@ -16,10 +16,11 @@ > [% INCLUDE 'cat-search.inc' %] > <div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> › <a href="/cgi-bin/koha/tools/tools-home.pl">Tools</a> › Patron clubs</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>Patron clubs</h1> > > [% IF club_template %] >@@ -214,17 +215,21 @@ > <div class="dialog message">No clubs defined. A club template must be defined before a club can be defined.</div> > [% END %] > [% END %] >- </div> <!-- /.yui-b --> >- </div> <!-- /.yui-main --> >- <div class="yui-b noprint"> >- [% INCLUDE 'tools-menu.inc' %] >- </div> >- </div> <!-- /#bd --> >+ >+ </main> >+ </div> <!-- /.col-sm-10.col-sm-push-2 --> >+ >+ <div class="col-sm-2 col-sm-pull-10"> >+ <aside> >+ [% INCLUDE 'tools-menu.inc' %] >+ </aside> >+ </div> <!-- /.col-sm-2.col-sm-pull-10 --> >+ </div> <!-- /.row --> > > [% MACRO jsinclude BLOCK %] > [% INCLUDE 'datatables.inc' %] > [% Asset.js("js/tools-menu.js") | $raw %] >- <script type="text/javascript"> >+ <script> > $(document).ready(function() { > tTable = $('#club-templates-table').dataTable($.extend(true, {}, dataTablesDefaults, { > "sPaginationType": "four_button", >-- >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 21305
:
78345
|
78430
| 78909