Bugzilla – Attachment 80309 Details for
Bug 21519
Switch two-column templates to Bootstrap grid: Serials part 1
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 21519: Update two-column templates with Bootstrap grid: Serials part 1
Bug-21519-Update-two-column-templates-with-Bootstr.patch (text/plain), 15.20 KB, created by
Michal Denar
on 2018-10-09 19:54:09 UTC
(
hide
)
Description:
Bug 21519: Update two-column templates with Bootstrap grid: Serials part 1
Filename:
MIME Type:
Creator:
Michal Denar
Created:
2018-10-09 19:54:09 UTC
Size:
15.20 KB
patch
obsolete
>From 46a296023699af9fd2947c2af5b4e92c5fa0fd5c Mon Sep 17 00:00:00 2001 >From: Owen Leonard <oleonard@myacpl.org> >Date: Tue, 9 Oct 2018 13:41:39 +0000 >Subject: [PATCH] Bug 21519: Update two-column templates with Bootstrap grid: > Serials part 1 > >This patch modifies several serials 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: > > - Serials -> Add subscription fields > - Add or edit subscription fields > - Serials -> Check expiration > - Serials -> Claims > - Serials -> Subscription > -> Serial collection > -> Edit serials > -> Routing list > - Save and preview routing list > >Signed-off-by: Michal Denar <black23@gmail.com> >--- > .../prog/en/modules/serials/add_fields.tt | 25 ++++++----- > .../prog/en/modules/serials/checkexpiration.tt | 25 +++++------ > .../prog/en/modules/serials/claims.tt | 25 +++++------ > .../prog/en/modules/serials/routing-preview.tt | 25 +++++------ > .../prog/en/modules/serials/routing.tt | 28 ++++++------ > .../prog/en/modules/serials/serials-collection.tt | 27 ++++++------ > .../prog/en/modules/serials/serials-edit.tt | 50 +++++++++++----------- > 7 files changed, 106 insertions(+), 99 deletions(-) > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/add_fields.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/add_fields.tt >index 2567058..0c88a8d 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/add_fields.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/add_fields.tt >@@ -23,10 +23,11 @@ > <a href="/cgi-bin/koha/mainpage.pl">Home</a> › <a href="/cgi-bin/koha/serials/serials-home.pl">Serials</a> › Manage new fields for subscriptions > </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 op == 'list' %] > <div id="toolbar" class="btn-toolbar"> > <a class="btn btn-default btn-sm" id="newfields" href="/cgi-bin/koha/serials/add_fields.pl?op=add_form"><i class="fa fa-plus"></i> New fields</a> >@@ -136,17 +137,19 @@ > </form> > [% END %] > >- </div> >- </div> >+ </main> >+ </div> <!-- /.col-sm-10.col-sm-push-2 --> > >-<div class="yui-b"> >-[% INCLUDE 'serials-menu.inc' %] >-</div> >-</div> >+ <div class="col-sm-2 col-sm-pull-10"> >+ <aside> >+ [% INCLUDE 'serials-menu.inc' %] >+ </aside> >+ </div> <!-- /.col-sm-2.col-sm-pull-10 --> >+ </div> <!-- /.row --> > > [% MACRO jsinclude BLOCK %] > [% INCLUDE "datatables.inc" %] >- <script type="text/javascript"> >+ <script> > $(document).ready(function(){ > > $("#fieldst").dataTable($.extend(true, {}, dataTablesDefaults, { >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/checkexpiration.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/checkexpiration.tt >index cc10ebb..4d6638c 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/checkexpiration.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/checkexpiration.tt >@@ -12,11 +12,10 @@ > > <div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> › <a href="/cgi-bin/koha/serials/serials-home.pl">Serials</a> › Check expiration </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>Check expiration</h1> > >@@ -121,17 +120,19 @@ > <p>No results for your query</p> > [% END %] > >-</div> >-</div> >+ </main> >+ </div> <!-- /.col-sm-10.col-sm-push-2 --> > >-<div class="yui-b"> >-[% INCLUDE 'serials-menu.inc' %] >-</div> >-</div> >+ <div class="col-sm-2 col-sm-pull-10"> >+ <aside> >+ [% INCLUDE 'serials-menu.inc' %] >+ </aside> >+ </div> <!-- /.col-sm-2.col-sm-pull-10 --> >+ </div> <!-- /.row --> > > [% MACRO jsinclude BLOCK %] > [% INCLUDE 'calendar.inc' %] >- <script type="text/javascript" language="JavaScript"> >+ <script> > $(document).ready(function(){ > $(".renew_subscription").on("click",function(e){ > e.preventDefault(); >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/claims.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/claims.tt >index ba71129..a47a618 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/claims.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/claims.tt >@@ -15,11 +15,10 @@ > > <div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> › <a href="/cgi-bin/koha/serials/serials-home.pl">Serials</a> › Claims</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>Claims</h1> > >@@ -198,18 +197,20 @@ > </fieldset> > [% END %] > >-</div> >-</div> >+ </main> >+ </div> <!-- /.col-sm-10.col-sm-push-2 --> > >-<div class="yui-b"> >-[% INCLUDE 'serials-menu.inc' %] >-</div> >-</div> >+ <div class="col-sm-2 col-sm-pull-10"> >+ <aside> >+ [% INCLUDE 'serials-menu.inc' %] >+ </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> > var sTable; > $(document).ready(function() { > sTable = $("#claimst").dataTable($.extend(true, {}, dataTablesDefaults, { >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/routing-preview.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/routing-preview.tt >index cf956e2..23af966 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/routing-preview.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/routing-preview.tt >@@ -10,11 +10,10 @@ > > <div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> › <a href="/cgi-bin/koha/serials/serials-home.pl">Serials</a> › <a href="/cgi-bin/koha/serials/subscription-detail.pl?subscriptionid=[% subscriptionid | html %]"><i>[% title | html %]</i></a> › Preview routing list</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>Preview routing list for <i>[% title | html %]</i></h2> > >@@ -40,16 +39,18 @@ > <input type="submit" name="delete" class="button" value="Delete" /></fieldset> > </form> > >-</div> >-</div> >+ </main> >+ </div> <!-- /.col-sm-10.col-sm-push-2 --> > >-<div class="yui-b"> >-[% INCLUDE 'serials-menu.inc' %] >-</div> >-</div> >+ <div class="col-sm-2 col-sm-pull-10"> >+ <aside> >+ [% INCLUDE 'serials-menu.inc' %] >+ </aside> >+ </div> <!-- /.col-sm-2.col-sm-pull-10 --> >+ </div> <!-- /.row --> > > [% MACRO jsinclude BLOCK %] >- <script type="text/javascript"> >+ <script> > $(document).ready(function(){ > $("#save_and_preview").on("click",function(e){ > e.preventDefault(); >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/routing.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/routing.tt >index 90af448..d1319a0 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/routing.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/routing.tt >@@ -9,12 +9,10 @@ > > <div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> › <a href="/cgi-bin/koha/serials/serials-home.pl">Serials</a> › <a href="/cgi-bin/koha/serials/subscription-detail.pl?subscriptionid=[% subscriptionid | html %]"><i>[% title | html %]</i></a> › [% IF ( op ) %]Create routing list[% ELSE %]Edit routing list[% 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 ( op ) %] > <h1>Create routing list for <i>[% title | html %]</i></h1> >@@ -78,17 +76,17 @@ > <fieldset class="action"><input type="submit" name="submit" value="Save" /></fieldset> > </form> > >+ </main> >+ </div> <!-- /.col-sm-10.col-sm-push-2 --> > >-</div> >-</div> >- >-<div class="yui-b"> >-[% INCLUDE 'serials-menu.inc' %] >-</div> >-</div> >- >+ <div class="col-sm-2 col-sm-pull-10"> >+ <aside> >+ [% INCLUDE 'serials-menu.inc' %] >+ </aside> >+ </div> <!-- /.col-sm-2.col-sm-pull-10 --> >+ </div> <!-- /.row --> > [% MACRO jsinclude BLOCK %] >- <script type="text/javascript"> >+ <script> > $(document).ready(function(){ > $("#add_recipients").on("click",function(e){ > e.preventDefault(); >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-collection.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-collection.tt >index 8bee8c4..1af50fe 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-collection.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-collection.tt >@@ -16,11 +16,10 @@ > > <div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> › <a href="/cgi-bin/koha/serials/serials-home.pl">Serials</a> › Serial collection information for <i>[% bibliotitle | html %]</i></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 'modals/serials_multi_receiving.inc' %] > >@@ -259,17 +258,19 @@ > </form> > [% END %] > >-</div> >-</div> >+ </main> >+ </div> <!-- /.col-sm-10.col-sm-push-2 --> > >-<div class="yui-b"> >-[% INCLUDE 'serials-menu.inc' %] >-</div> >-</div> >+ <div class="col-sm-2 col-sm-pull-10"> >+ <aside> >+ [% INCLUDE 'serials-menu.inc' %] >+ </aside> >+ </div> <!-- /.col-sm-2.col-sm-pull-10 --> >+ </div> <!-- /.row --> > > [% MACRO jsinclude BLOCK %] > [% INCLUDE 'datatables.inc' %] >- <script type="text/javascript"> >+ <script> > var subscriptionid = "[% subscriptionid | html %]"; > var MSG_CLOSE_SUBSCRIPTION = _("Are you sure you want to close this subscription?"); > var MSG_REOPEN_SUBSCRIPTION = _("Are you sure you want to reopen this subscription?"); >@@ -278,7 +279,7 @@ > [% Asset.js("js/serials-toolbar.js") | $raw %] > [% Asset.js("lib/jquery/plugins/jquery.checkboxes.min.js") | $raw %] > >- <script type="text/javascript"> >+ <script> > > function print_slip(subscriptionid,issue){ > var myurl = 'routing-preview.pl?ok=1&subscriptionid='+subscriptionid+'&issue='+issue; >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-edit.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-edit.tt >index f661c3c..8cabc05 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-edit.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-edit.tt >@@ -7,7 +7,7 @@ > [% Asset.js("js/cataloging.js") | $raw %] > [% Asset.js("js/prevent_submit.js") | $raw %] > [% INCLUDE 'calendar.inc' %] >-<script language="JavaScript" type="text/javascript"> >+<script> > //<![CDATA[ > $(document).ready(function() { > $('#multi_receiving').on('show', function () { >@@ -68,7 +68,7 @@ $(document).ready(function() { > }); > //]]> > </script> >-<style type="text/css">#serials_edit fieldset.rows label, #serials_edit fieldset.rows span.label { >+<style>#serials_edit fieldset.rows label, #serials_edit fieldset.rows span.label { > font-size : 100%; > width : 25%; > } >@@ -86,11 +86,10 @@ $(document).ready(function() { > > <div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> › <a href="/cgi-bin/koha/serials/serials-home.pl">Serials</a> › Serial edition <i>[% bibliotitle | html %] [% IF ( callnumber ) %]([% callnumber | html %])[% END %]</i></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 'modals/serials_multi_receiving.inc' %] > >@@ -434,22 +433,25 @@ $(document).ready(function() { > </fieldset> > </form> > >-</div> >-</div> >+ </main> >+ </div> <!-- /.col-sm-10.col-sm-push-2 --> >+ >+ <div class="col-sm-2 col-sm-pull-10"> >+ <aside> >+ [% INCLUDE 'serials-menu.inc' %] >+ <ul> >+ [% FOREACH subscription IN subscriptions %] >+ <li><a href="serials-collection.pl?subscriptionid=[% subscription.subscriptionid | html %]" title="serial collection for [% subscription.bibliotitle | html %]">Serial collection #[% subscription.subscriptionid | html %]</a></li> >+ <li><a href="subscription-detail.pl?subscriptionid=[% subscription.subscriptionid | html %]" title="detail of the subscription">Subscription #[% subscription.subscriptionid | html %]</a></li> >+ [% IF ( subscription.abouttoexpire ) %] >+ [% UNLESS subscription.closed %] >+ <li><a href="#" onclick="javascript:popup([% subscription.subscriptionid | html %])">Renew #[% subscription.subscriptionid | html %]</a></li> >+ [% END %] >+ [% END %] >+ [% END %] >+ <li><a href="/cgi-bin/koha/catalogue/[% default_bib_view | html %].pl?biblionumber=[% biblionumber | html %]" title="go to [% bibliotitle | html %]">Show biblio</a></li></ul> >+ </aside> >+ </div> <!-- /.col-sm-2.col-sm-pull-10 --> >+ </div> <!-- /.row --> > >-<div class="yui-b"> >-[% INCLUDE 'serials-menu.inc' %] >-<ul> >- [% FOREACH subscription IN subscriptions %] >- <li><a href="serials-collection.pl?subscriptionid=[% subscription.subscriptionid | html %]" title="serial collection for [% subscription.bibliotitle | html %]">Serial collection #[% subscription.subscriptionid | html %]</a></li> >- <li><a href="subscription-detail.pl?subscriptionid=[% subscription.subscriptionid | html %]" title="detail of the subscription">Subscription #[% subscription.subscriptionid | html %]</a></li> >- [% IF ( subscription.abouttoexpire ) %] >- [% UNLESS subscription.closed %] >- <li><a href="#" onclick="javascript:popup([% subscription.subscriptionid | html %])">Renew #[% subscription.subscriptionid | html %]</a></li> >- [% END %] >- [% END %] >- [% END %] >- <li><a href="/cgi-bin/koha/catalogue/[% default_bib_view | html %].pl?biblionumber=[% biblionumber | html %]" title="go to [% bibliotitle | html %]">Show biblio</a></li></ul> >-</div> >-</div> > [% INCLUDE 'intranet-bottom.inc' %] >-- >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 21519
:
80290
|
80309
|
80420