Bugzilla – Attachment 70819 Details for
Bug 20032
Switch single-column templates to Bootstrap grid: Tools
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 20032: Switch single-column templates to Bootstrap grid: Tools
Bug-20032-Switch-single-column-templates-to-Bootst.patch (text/plain), 6.30 KB, created by
Claire Gravely
on 2018-01-23 09:35:35 UTC
(
hide
)
Description:
Bug 20032: Switch single-column templates to Bootstrap grid: Tools
Filename:
MIME Type:
Creator:
Claire Gravely
Created:
2018-01-23 09:35:35 UTC
Size:
6.30 KB
patch
obsolete
>From 64d95c2969062f91db460b038eed7154fc793994 Mon Sep 17 00:00:00 2001 >From: Owen Leonard <oleonard@myacpl.org> >Date: Thu, 18 Jan 2018 15:32:56 +0000 >Subject: [PATCH] Bug 20032: Switch single-column templates to Bootstrap grid: > Tools > >This patch updates several single-column Tools templates to >use the Bootstrap grid. > >- batchMod-del.tt - Tools -> Batch item deletion -> Submit barcodes or > item numbers for deletion. The grid is changed for the results and > confirmation screens. > >- batchMod-edit.tt - Tools -> Batch item modification -> Submit barcodes > or item numbers for modification. The grid is changed for the results > and confirmation screens. > >- koha-news.tt - Tools -> News -> Edit or create a new news item. The > grid is changed for the edit screen. > >- letter.tt - Tools -> Notices and Slips -> Edit or create a notice. The > grid is changed for the edit screen. > >Each of these pages should look correct. The News and Notices page >should have a single centered column with wide margins on either side. >At lower browser widths the margins should disappear. > >The batch mod screens should be displayed at full screen width. > >Signed-off-by: Claire Gravely <claire.gravely@bsz-bw.de> >--- > .../intranet-tmpl/prog/en/modules/tools/batchMod-del.tt | 6 ++---- > .../intranet-tmpl/prog/en/modules/tools/batchMod-edit.tt | 10 ++++------ > .../intranet-tmpl/prog/en/modules/tools/koha-news.tt | 14 ++++++++++---- > koha-tmpl/intranet-tmpl/prog/en/modules/tools/letter.tt | 16 +++++++++++----- > 4 files changed, 27 insertions(+), 19 deletions(-) > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batchMod-del.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batchMod-del.tt >index 7987756..965bbd8 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batchMod-del.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batchMod-del.tt >@@ -17,9 +17,8 @@ > <a href="/cgi-bin/koha/tools/batchMod.pl?del=1">Batch item deletion</a> > </div> > >-<div id="doc3" class="yui-t7"> >- <div id="bd"> >- <div id="yui-main"> >+<div class="main container-fluid"> >+ > [% IF ( show ) %]<h1>Batch item deletion</h1>[% ELSE %]<h1>Batch item deletion results</h1>[% END %] > [% IF ( barcode_not_unique ) %]<div class="dialog alert"><strong>Error saving item</strong>: Barcode must be unique.</div>[% END %] > [% IF ( no_next_barcode ) %]<div class="dialog alert"><strong>Error saving items</strong>: Unable to automatically determine values for barcodes. No item has been inserted.</div>[% END %] >@@ -183,7 +182,6 @@ > </p> > [% END %] > </div> >- </div> > > [% MACRO jsinclude BLOCK %] > <script type="text/javascript" src="[% interface %]/[% theme %]/js/tools-menu.js"></script> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batchMod-edit.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batchMod-edit.tt >index c25dfe4..910b7e2 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batchMod-edit.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batchMod-edit.tt >@@ -61,9 +61,8 @@ $(document).ready(function(){ > <a href="/cgi-bin/koha/tools/batchMod.pl">Batch item modification</a> > </div> > >-<div id="doc3" class="yui-t7"> >- <div id="bd"> >- <div id="yui-main"> >+<div class="main container-fluid"> >+ > [% IF ( show ) %] > <h1>Batch item modification</h1> > [% ELSE %] >@@ -272,8 +271,7 @@ $(document).ready(function(){ > <a class="btn btn-default" href="/cgi-bin/koha/tools/batchMod.pl"><i class="fa fa-check-square-o"></i> Return to batch item modification</a> > [% END %] > </fieldset> >- >+ > [% END %] >-</div> >- </div> >+ > [% INCLUDE 'intranet-bottom.inc' %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/koha-news.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/koha-news.tt >index 24fe1bf..e0eea87 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/koha-news.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/koha-news.tt >@@ -16,10 +16,16 @@ > <div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> › <a href="/cgi-bin/koha/tools/tools-home.pl">Tools</a> › [% IF ( add_form ) %]<a href="/cgi-bin/koha/tools/koha-news.pl">News</a> › [% IF ( id ) %] > Edit news item[% ELSE %]Add news item[% END %][% ELSE %]News[% END %]</div> > >-[% IF ( add_form ) %]<div id="doc" class="yui-t7">[% ELSE %]<div id="doc3" class="yui-t2">[% END %] >- <div id="bd"> >- <div id="yui-main"> >- <div class="yui-b"> >+[% IF ( add_form ) %] >+ <div class="main container-fluid"> >+ <div class="row"> >+ <div class="col-md-10 col-md-offset-1 col-lg-8 col-lg-offset-2"> >+[% ELSE %] >+ <div id="doc3" class="yui-t2"> >+ <div id="bd"> >+ <div id="yui-main"> >+ <div class="yui-b"> >+[% END %] > > [% UNLESS ( add_form ) %] > [% IF error_message == 'title_missing' %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/letter.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/letter.tt >index cae2112..0b7a32a 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/letter.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/letter.tt >@@ -13,11 +13,17 @@ > > <div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> › <a href="/cgi-bin/koha/tools/tools-home.pl">Tools</a> › [% IF ( add_form or copy_form) %][% IF ( modify ) %]<a href="/cgi-bin/koha/tools/letter.pl">Notices & Slips</a> › Modify notice[% ELSE %] <a href="/cgi-bin/koha/tools/letter.pl">Notices & Slips</a> › Add notice[% END %][% ELSE %][% IF ( add_validate or copy_validate) %] <a href="/cgi-bin/koha/tools/letter.pl">Notices & Slips</a> › Notice added[% ELSE %][% IF ( delete_confirm ) %] <a href="/cgi-bin/koha/tools/letter.pl">Notices & Slips</a> › Confirm deletion[% ELSE %]Notices & Slips[% END %][% END %][% END %]</div> > >-[% IF add_form or copy_form %]<div id="doc" class="yui-t7">[% ELSE %]<div id="doc3" class="yui-t2">[% END %] >- >- <div id="bd"> >- <div id="yui-main"> >- <div class="yui-b"> >+[% IF add_form or copy_form %] >+ <div class="main container-fluid"> >+ <div class="row"> >+ <div class="col-md-8 col-md-offset-2"> >+[% ELSE %] >+ <div id="doc3" class="yui-t2"> >+ <div id="bd"> >+ <div id="yui-main"> >+ <div class="yui-b"> >+[% END %] >+ > > [% IF ( no_op_set ) %] > <h1>Notices and Slips</h1> >-- >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 20032
:
70694
|
70819
|
71209