Bugzilla – Attachment 82180 Details for
Bug 21436
Switch two-column templates to Bootstrap grid: Tools part 4
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 21436: Update two-column templates with Bootstrap grid: Tools part 4
Bug-21436-Update-two-column-templates-with-Bootstr.patch (text/plain), 14.01 KB, created by
Josef Moravec
on 2018-11-09 16:39:10 UTC
(
hide
)
Description:
Bug 21436: Update two-column templates with Bootstrap grid: Tools part 4
Filename:
MIME Type:
Creator:
Josef Moravec
Created:
2018-11-09 16:39:10 UTC
Size:
14.01 KB
patch
obsolete
>From dd87daaebdfc37d802851d7c12d89ee8c45c51d7 Mon Sep 17 00:00:00 2001 >From: Owen Leonard <oleonard@myacpl.org> >Date: Fri, 4 May 2018 14:25:16 +0000 >Subject: [PATCH] Bug 21436: Update two-column templates with Bootstrap grid: > Tools part 4 > >This patch modifies several tools 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: > > - Tools -> Task scheduler > - Tools -> Staged MARC management -> View batch -> View diff of > imported record which duplicates a record in the catalog > - Tools -> Stage MARC for import > - Test each step > - Tools -> Upload local cover image > - Test each step > - Tools -> Upload any file > - Test each step > - Tools -> Log viewer > - Test from the tools menu and from both the bibliographic > patron details pages ("Modification log"). > >Signed-off-by: Josef Moravec <josef.moravec@gmail.com> >--- > .../prog/en/modules/tools/scheduler.tt | 30 ++++++++-------- > .../prog/en/modules/tools/showdiffmarc.tt | 17 +++++---- > .../prog/en/modules/tools/stage-marc-import.tt | 28 ++++++++------- > .../prog/en/modules/tools/upload-images.tt | 30 ++++++++-------- > .../intranet-tmpl/prog/en/modules/tools/upload.tt | 42 ++++++++++++---------- > .../intranet-tmpl/prog/en/modules/tools/viewlog.tt | 42 ++++++++++++---------- > 6 files changed, 104 insertions(+), 85 deletions(-) > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/scheduler.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/scheduler.tt >index 94e633dba5..bf968fdaec 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/scheduler.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/scheduler.tt >@@ -12,13 +12,10 @@ > > <div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> › <a href="/cgi-bin/koha/tools/tools-home.pl">Tools</a> › <strong>Task scheduler</strong></div> > >-<div id="doc3" class="yui-t2"> >- >- <div id="bd"> >- <div id="yui-main"> >- <div class="yui-b"> >- >-<div id="main"> >+<div class="main container-fluid"> >+ <div class="row"> >+ <div class="col-sm-10 col-sm-push-2"> >+ <main> > > [% IF ( job_add_failed ) %] > <div class="dialog message">Failed to add scheduled task</div> >@@ -84,20 +81,21 @@ > [% END %] > </table>[% END %] > >+ </main> >+ </div> <!-- /.col-sm-10.col-sm-push-2 --> > >-</div> >-</div> >-</div> >-<div class="yui-b noprint"> >-[% INCLUDE 'tools-menu.inc' %] >-[% INCLUDE 'guided-reports-view.inc' %] >-</div> >-</div> >+ <div class="col-sm-2 col-sm-pull-10"> >+ <aside> >+ [% INCLUDE 'tools-menu.inc' %] >+ [% INCLUDE 'guided-reports-view.inc' %] >+ </aside> >+ </div> <!-- /.col-sm-2.col-sm-pull-10 --> >+ </div> <!-- /.row --> > > [% MACRO jsinclude BLOCK %] > [% Asset.js("js/tools-menu.js") | $raw %] > [% INCLUDE 'calendar.inc' %] >- <script type="text/javascript"> >+ <script> > $(document).ready(function(){ > $("#startdate").datepicker({ minDate: "+0D" }); > }); >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/showdiffmarc.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/showdiffmarc.tt >index 3087d0afe8..b884a960ee 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/showdiffmarc.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/showdiffmarc.tt >@@ -4,7 +4,7 @@ > [% INCLUDE 'doc-head-open.inc' %] > <title>Koha › Tools › Manage staged MARC records › Compare matched records</title> > [% INCLUDE 'doc-head-close.inc' %] >-<style type="text/css"> >+<style> > ins { background-color: #e6ffe6; } > del { background-color: #ffe6e6; } > #col1 ins, #col2 del { display: none; } >@@ -20,9 +20,11 @@ > <a href="/cgi-bin/koha/mainpage.pl">Home</a> › <a href="/cgi-bin/koha/tools/tools-home.pl">Tools</a> › <a href="/cgi-bin/koha/tools/manage-marc-import.pl">Manage staged MARC records</a> › <a href="/cgi-bin/koha/tools/manage-marc-import.pl?import_batch_id=[% batchid | html %]">Batch [% batchid | html %]</a> › Compare matched records > </div> > >-<div id="doc3"> >- <div class="yui-g"> >- <div id="col1" class="yui-u first"> >+<div class="main container-fluid"> >+ <div class="row"> >+ <main> >+ >+ <div id="col1" class="col-sm-6"> > <h1>Original</h1> > [% IF ( ERROR_FORMATTED1 ) %] > <div class="dialog alert"> >@@ -33,7 +35,7 @@ > <pre>[% MARC_FORMATTED1 | html %]</pre> > [% END %] > </div> >- <div id="col2" class="yui-u"> >+ <div id="col2" class="col-sm-6"> > <h1>Imported</h1> > [% IF ( ERROR_FORMATTED2 ) %] > <div class="dialog alert"> >@@ -48,10 +50,13 @@ > > <p><a href="/cgi-bin/koha/tools/manage-marc-import.pl?import_batch_id=[% batchid | uri %]">Return to staged MARC batch [% batchid | html %]</a></p> > >+ </main> >+ </div> >+ > [% MACRO jsinclude BLOCK %] > [% Asset.js("js/tools-menu.js") | $raw %] > [% Asset.js("lib/jsdiff/jsdiff.min.js") | $raw %] >- <script type="text/javascript"> >+ <script> > $(document).ready(function(){ > var diff1 = $("#col1 pre").text(); > var diff2 = $("#col2 pre").text(); >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/stage-marc-import.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/stage-marc-import.tt >index e407ec77b2..e169bcd12d 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/stage-marc-import.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/stage-marc-import.tt >@@ -4,7 +4,7 @@ > [% INCLUDE 'doc-head-open.inc' %] > <title>Koha › Tools › Stage MARC records for import</title> > [% INCLUDE 'doc-head-close.inc' %] >-<style type="text/css"> >+<style> > #fileuploadstatus,#fileuploadfailed,#fileuploadcancel,#jobpanel,#jobstatus,#jobfailed { display : none; } > </style> > >@@ -15,11 +15,10 @@ > > <div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> › <a href="/cgi-bin/koha/tools/tools-home.pl">Tools</a> › [% IF ( uploadmarc ) %]<a href="/cgi-bin/koha/tools/stage-marc-import.pl">Stage MARC records for import</a> › Upload Results[% ELSE %]Stage MARC records for import[% 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 ( uploadmarc ) %] > <div id="toolbar" class="btn-toolbar"> >@@ -200,18 +199,21 @@ > </form> > [% END %] > >-</div> >-</div> >-<div class="yui-b"> >-[% INCLUDE 'tools-menu.inc' %] >-</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 %] > [% Asset.js("js/tools-menu.js") | $raw %] > [% Asset.js("js/background-job-progressbar.js") | $raw %] > [% Asset.js("js/file-upload.js") | $raw %] >- <script type="text/javascript"> >+ <script> > var xhr; > $(document).ready(function(){ > $("#processfile").hide(); >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/upload-images.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/upload-images.tt >index e90113a149..e895d95153 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/upload-images.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/upload-images.tt >@@ -4,7 +4,7 @@ > [% INCLUDE 'doc-head-open.inc' %] > <title>Koha › Tools › Upload images</title> > [% INCLUDE 'doc-head-close.inc' %] >-<style type="text/css"> >+<style> > #fileuploadstatus,#fileuploadfailed,#jobpanel,#jobstatus,#jobfailed { display : none; } > </style> > </head> >@@ -15,11 +15,10 @@ > > <div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> › <a href="/cgi-bin/koha/tools/tools-home.pl">Tools</a> › [% IF ( uploadimage ) %]<a href="/cgi-bin/koha/tools/upload-cover-image.pl">Upload local cover image</a> › Upload results[% ELSE %]Upload local cover image[% 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> > > <h1>Upload local cover image</h1> > [% IF ( uploadimage ) %] >@@ -46,7 +45,7 @@ > <li>Select an image file or ZIP file to upload. The tool will accept images in GIF, JPEG, PNG, and XPM formats.</li> > </ul> > <form method="post" action="/cgi-bin/koha/tools/upload-cover-image.pl" id="uploadfile" enctype="multipart/form-data"> >-<fieldset class="rows" id="uploadform"> >+<fieldset class="rows" > > <legend>Upload images</legend> > <ol> > <li> >@@ -103,18 +102,21 @@ > <fieldset class="action"><button type="submit" class="btn btn-default btn-sm">Process images</button></fieldset> > </form> > >-</div> >-</div> >-<div class="yui-b"> >-[% INCLUDE 'tools-menu.inc' %] >-</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 %] > [% Asset.js("js/tools-menu.js") | $raw %] > [% Asset.js("js/background-job-progressbar.js") | $raw %] > [% Asset.js("js/file-upload.js") | $raw %] >- <script type="text/javascript"> >+ <script> > function StartUpload() { > if( $('#fileToUpload').prop('files').length == 0 ) return; > $('#uploadform button.submit').prop('disabled',true); >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/upload.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/upload.tt >index 518692336a..443e25b4b6 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/upload.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/upload.tt >@@ -189,7 +189,7 @@ > </table> > [% END %] > >-<style type="text/css"> >+<style> > #fileuploadstatus,#fileuploadfailed { display : none; } > #fileuploadstatus { margin:.4em; } > #fileuploadprogress { width:150px;height:10px;border:1px solid #666;background:url('[% interface | html %]/[% theme | html %]/img/progress.png') -300px 0px no-repeat; } >@@ -200,21 +200,21 @@ > > [% IF ( plugin ) %] > <body id="tools_upload" class="tools"> >- <div class="yui-t7"> >- <div id="bd"> >- <div class="yui-g"> >+ <div class="main container-fluid"> >+ <div class="row"> >+ <div class="col-sm-12"> >+ <main> > [% ELSE %] > <body id="tools_upload" class="tools"> > [% INCLUDE 'header.inc' %] > [% INCLUDE 'cat-search.inc' %] > [% PROCESS breadcrumbs %] >- <div id="doc3" class="yui-t2"> >- <div id="bd"> >- <div id="yui-main"> >- <div class="yui-b"> >-[% END %] >- > >+ <div class="main container-fluid"> >+ <div class="row"> >+ <div class="col-sm-10 col-sm-push-2"> >+ <main> >+[% END %] > > <h1>Upload</h1> > <div class="dialog alert" id="myalerts" style="display:none;"></div> >@@ -236,22 +236,28 @@ > [% END %] > [% END %] > >-</div> >- > [% IF !plugin %] >-</div> >- <div class="yui-b noprint"> >- [% INCLUDE 'tools-menu.inc' %] >- </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 --> >+[% ELSE %] >+ </main> >+ </div> <!-- .col-sm-12 --> >+ </div> <!-- /.row --> > [% END %] > >-</div> > > [% MACRO jsinclude BLOCK %] > [% Asset.js("js/tools-menu.js") | $raw %] > [% INCLUDE 'datatables.inc' %] > [% Asset.js("js/file-upload.js") | $raw %] >- <script type="text/javascript"> >+ <script> > function StartUpload() { > if( $('#fileToUpload').prop('files').length == 0 ) return; > $('#fileToUpload').prop('disabled',true); >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/viewlog.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/viewlog.tt >index d56cd0afb0..7513169557 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/viewlog.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/viewlog.tt >@@ -77,10 +77,11 @@ > [% 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> >+ > <h1>Browse system logs</h1> > <form method="post" action="/cgi-bin/koha/tools/viewlog.pl"> > [% IF ( do_it ) %] >@@ -271,20 +272,25 @@ > </div> > [% END %] > [% END %] >- </div> >- </div> >- <div class="yui-b noprint"> >- [% IF ( circulation ) %] >- [% INCLUDE 'circ-menu.inc' %] >- [% ELSE %] >- [% IF ( CATALOGUING ) %] >- [% INCLUDE 'biblio-view-menu.inc' %] >- [% ELSE %] >- [% INCLUDE 'tools-menu.inc' %] >- [% END %] >- [% END %] >- </div> >- </div> >+ >+ >+ </main> >+ </div> <!-- /.col-sm-10.col-sm-push-2 --> >+ >+ <div class="col-sm-2 col-sm-pull-10"> >+ <aside> >+ [% IF ( circulation ) %] >+ [% INCLUDE 'circ-menu.inc' %] >+ [% ELSE %] >+ [% IF ( CATALOGUING ) %] >+ [% INCLUDE 'biblio-view-menu.inc' %] >+ [% ELSE %] >+ [% INCLUDE 'tools-menu.inc' %] >+ [% END %] >+ [% END %] >+ </aside> >+ </div> <!-- /.col-sm-2.col-sm-pull-10 --> >+ </div> <!-- /.row --> > > [% MACRO jsinclude BLOCK %] > [% INCLUDE 'calendar.inc' %] >-- >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 21436
:
79521
|
82180
|
83191