Bugzilla – Attachment 80822 Details for
Bug 21570
Switch two-column templates to Bootstrap grid: Various
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 21570: Update two-column templates with Bootstrap grid: Various
Bug-21570-Update-two-column-templates-with-Bootstr.patch (text/plain), 14.65 KB, created by
ByWater Sandboxes
on 2018-10-18 12:43:46 UTC
(
hide
)
Description:
Bug 21570: Update two-column templates with Bootstrap grid: Various
Filename:
MIME Type:
Creator:
ByWater Sandboxes
Created:
2018-10-18 12:43:46 UTC
Size:
14.65 KB
patch
obsolete
>From f0df722717aab27a23a053924f3c9c0f5dafa37d Mon Sep 17 00:00:00 2001 >From: Owen Leonard <oleonard@myacpl.org> >Date: Tue, 24 Jul 2018 13:00:21 +0000 >Subject: [PATCH] Bug 21570: Update two-column templates with Bootstrap grid: > Various > >This patch modifies several assorted 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: > > - Administration -> Plugins > - Tools -> Comments > - Acquisitions -> Suggestions > - Lists > >Signed-off-by: Katrin Fischer <katrin.fischer@bsz-bw.de> >--- > .../prog/en/modules/plugins/plugins-home.tt | 26 ++--- > .../prog/en/modules/reviews/reviewswaiting.tt | 26 ++--- > .../prog/en/modules/suggestion/suggestion.tt | 37 +++++--- > .../prog/en/modules/virtualshelves/shelves.tt | 105 +++++++++++---------- > 4 files changed, 105 insertions(+), 89 deletions(-) > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/plugins/plugins-home.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/plugins/plugins-home.tt >index 305f3eb473..fff57e2931 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/plugins/plugins-home.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/plugins/plugins-home.tt >@@ -17,10 +17,11 @@ > Plugins > </div> > >-<div id="doc3" class="yui-t1"> >- <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> >+ > <div class="details"> > > [% IF ( CAN_user_plugins_manage ) %] >@@ -125,18 +126,21 @@ > </table> > [% END %] > </div> >- </div> >- </div> > >- <div class="yui-b noprint"> >- [% 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 %] > [% INCLUDE 'calendar.inc' %] >- <script type="text/javascript"> >+ <script> > $(document).ready(function(){ > $(".uninstall_plugin").on("click", function(){ > $(".dropdown").removeClass("open"); >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reviews/reviewswaiting.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/reviews/reviewswaiting.tt >index dff9da3aef..85d5c30ca6 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reviews/reviewswaiting.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reviews/reviewswaiting.tt >@@ -12,11 +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> > › <a href="/cgi-bin/koha/reviews/reviewswaiting.pl">Comments</a> ›[% IF ( status ) %] Approved comments[% ELSE %] Comments awaiting moderation[% 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>Comments</h1> > >@@ -55,7 +54,7 @@ > <td> > [% review.review | html %] > </td> >- <td> >+ <td class="actions"> > [% IF ( status ) %]<a href="/cgi-bin/koha/reviews/reviewswaiting.pl?op=unapprove&reviewid=[% review.reviewid | html %]" class="btn btn-default btn-xs"><i class="fa fa-remove"></i> Unapprove</a>[% ELSE %]<a href="/cgi-bin/koha/reviews/reviewswaiting.pl?op=approve&reviewid=[% review.reviewid | html %]" class="btn btn-default btn-xs"><i class="fa fa-check"></i> Approve</a>[% END %] > <a href="/cgi-bin/koha/reviews/reviewswaiting.pl?op=delete&reviewid=[% review.reviewid | html %]" class="btn btn-default btn-xs"><i class="fa fa-trash" aria-hidden="true"></i> Delete</a> > </td> >@@ -69,12 +68,15 @@ > </div> > </div> > >-</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 %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/suggestion.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/suggestion.tt >index 03cde0a100..4caeb6e682 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/suggestion.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/suggestion.tt >@@ -24,7 +24,7 @@ > [% Asset.css("css/datatables.css") | $raw %] > [% END %] > [% IF ( op_else ) %] >- <style type="text/css"> >+ <style> > h4.local_collapse a { font-size : 80%; text-decoration: none; } fieldset.brief ol { display : none; } > .overlay { top: 180px; left: 50%; position: absolute; margin-left: -100px; width: 200px; text-align: center; display: none; margin-top: -10px; background: #eeffd4; padding: .5em; color: #000; } .note { -moz-border-radius: 3px; border-radius:3px; background: transparent url("[% interface | html %]/[% theme | html %]/img/famfamfam/silk/comment.png") top left no-repeat; padding : 1px 3px 1px 18px; font-size : 90%; } > </style> >@@ -50,10 +50,9 @@ > </div> > > [% IF ( op == 'show' ) %] >-<div id="doc" class="yui-t7"> <!-- <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-md-8 col-md-offset-2"> > > <div id="toolbar" class="btn-toolbar"> > <a class="btn btn-default btn-sm" id="editsuggestion" href="suggestion.pl?op=edit&suggestionid=[% suggestionid | html %]"><i class="fa fa-pencil"></i> Edit</a> >@@ -227,10 +226,11 @@ > <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"> >+ <div class="main container-fluid"> >+ <div class="row"> >+ <div class="col-sm-10 col-sm-push-2"> >+ <main> >+ > [% END %] > > [% IF ( op_save ) %] >@@ -602,10 +602,16 @@ > [% END %] > </div> > [% END %] >-</div> >-</div> > >- [% UNLESS ( op_save ) %] [% UNLESS ( op == 'show' ) %]<div class="yui-b"> >+[% UNLESS ( op_save ) %] >+ [% UNLESS ( op == 'show' ) %] >+ >+ </main> >+ </div> <!-- /.col-sm-10.col-sm-push-2 --> >+ >+ <div class="col-sm-2 col-sm-pull-10"> >+ <aside> >+ > <form name="suggestionfilter" action="suggestion.pl" method="get"> > <fieldset class="brief"><ol style="display:block;"><li><label for="displayby">Organize by: </label> > <select name="displayby" id="displayby" style="width:auto;"> >@@ -746,10 +752,13 @@ > [% END %] > </select></li><li><input type="submit" value="Go" /></li></ol> > </fieldset> >- </div> > </form> > [% INCLUDE 'acquisitions-menu.inc' %] >- </div> >+ >+ </aside> >+ </div> <!-- /.col-sm-2.col-sm-pull-10 --> >+ </div> <!-- /.row --> >+ > [% END %] > [% END %] > </div> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/shelves.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/shelves.tt >index b89db7687e..2dce377311 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/shelves.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/shelves.tt >@@ -9,7 +9,7 @@ > <title>Koha › [% IF op == 'view' %]Lists › Contents of [% shelf.shelfname | html %][% ELSE %]Lists[% END %][% IF op == 'add_form' %] › Create new list[% END %][% IF op == 'edit_form' %] › Edit list [% shelf.shelfname | html %][% END %]</title> > [% INCLUDE 'doc-head-close.inc' %] > [% Asset.css("css/datatables.css") | $raw %] >-<style type="text/css">textarea { width: 100%; }</style> >+<style>textarea { width: 100%; }</style> > > [% BLOCK list_permissions %] > <li> >@@ -59,13 +59,18 @@ > > [% IF op == 'view' %]› Contents of <i>[% shelf.shelfname | html %]</i>[% END %][% IF op == 'add_form' %] › Create new list[% END %][% IF op == 'edit_form' %] › Edit list <i>[% shelf.shelfname | html %]</i>[% END %]</div> > >-<div id="doc3" class="yui-t2"> >-<div id="bd"> >-<div id="yui-main"> >-<div class="yui-b"> >+[% IF ( can_add_biblios ) %] >+ <div class="main container-fluid"> >+ <div class="row"> >+ <div class="col-sm-10 col-sm-push-2"> >+[% ELSE %] >+ <div class="main container-fluid"> >+ <div class="row"> >+ <div class="col-md-8 col-md-offset-2"> >+[% END %] >+ <main> > >- <div class="yui-g">[% INCLUDE 'virtualshelves-toolbar.inc' %] >- </div> >+ [% INCLUDE 'virtualshelves-toolbar.inc' %] > > [% FOR m IN messages %] > <div class="dialog [% m.type | html %]"> >@@ -127,7 +132,6 @@ > [% END %] > > [% IF op == 'view' %] >- <div class="yui-g"> > [% IF itemsloop %] > > <h3>Contents of <i>[% shelf.shelfname | html %]</i></h3> >@@ -144,8 +148,8 @@ > [% SET new_direction = 'asc' %] > [% END %] > >-<div id="searchheader" class="noprint"> >- [% IF itemsloop %] >+[% IF itemsloop %] >+ <div id="searchheader" class="noprint"> > <div id="selection_ops"><span class="checkall"></span> | > <span class="clearall"></span> > >@@ -159,8 +163,8 @@ > [% END %] > [% IF ( CAN_user_editcatalogue_edit_catalogue ) %]<div class="btn-group"><button type="submit" class="btn btn-default btn-xs merge-items"><i class="fa fa-compress"></i> Merge selected</button></div>[% END %] > </div> >- [% END %] >-</div> >+ </div> >+[% END %] > > <table id="searchresults"> > <tr> >@@ -256,12 +260,10 @@ > </form> > > [% END %] >- </div> > [% END %] > > [% IF op == 'add_form' OR op == 'edit_form' %] >-<div class="yui-ge"> >- <div class="yui-u first"> >+ > <form method="post" action="/cgi-bin/koha/virtualshelves/shelves.pl" class="validated"> > <fieldset class="rows"> > >@@ -331,8 +333,7 @@ > [% END %] > </fieldset> > </form> >- </div> >-</div> >+ > [% END %] > > [% IF op == 'list' %] >@@ -390,45 +391,45 @@ > <input type="hidden" name="multi_hold" value="1"/> > </form> > >-</div> >-</div> >- >-[% IF ( can_add_biblios ) %] >-<div class="yui-b"> >- <form action="/cgi-bin/koha/virtualshelves/shelves.pl" method="post"> >- <fieldset class="brief noprint"> >- <h4>Add items</h4> >- <ol> >- <li> >- <label for="barcodes">Barcodes:</label> >- <textarea name="barcodes" id="barcodes" class="focus" autocomplete="off" rows="5"></textarea> >- <input type="hidden" name="op" value="add_biblio" /> >- <input type="hidden" name="referer" value="view" /> >- <input type="hidden" name="shelfnumber" value="[% shelf.shelfnumber | html %]" /> >- </li> >- <li> >- <label for="biblionumbers">Biblio numbers:</label> >- <textarea name="biblionumbers" id="biblionumbers" class="focus" autocomplete="off" rows="5"></textarea> >- <input type="hidden" name="op" value="add_biblio" /> >- <input type="hidden" name="referer" value="view" /> >- <input type="hidden" name="shelfnumber" value="[% shelf.shelfnumber | html %]" /> >- </li> >- </ol> >- <fieldset class="action"> >- <input type="submit" value="Add" /> >- </fieldset> >- </fieldset> >- </form> >-</div> >-[% END %] >- >-</div> >+ </main> >+ </div> <!-- /.col-sm-10.col-sm-push-2 --> >+ [% IF ( can_add_biblios ) %] >+ <div class="col-sm-2 col-sm-pull-10"> >+ <aside> >+ <form action="/cgi-bin/koha/virtualshelves/shelves.pl" method="post"> >+ <fieldset class="brief noprint"> >+ <h4>Add items</h4> >+ <ol> >+ <li> >+ <label for="barcodes">Barcodes:</label> >+ <textarea name="barcodes" id="barcodes" class="focus" autocomplete="off" rows="5"></textarea> >+ <input type="hidden" name="op" value="add_biblio" /> >+ <input type="hidden" name="referer" value="view" /> >+ <input type="hidden" name="shelfnumber" value="[% shelf.shelfnumber | html %]" /> >+ </li> >+ <li> >+ <label for="biblionumbers">Biblio numbers:</label> >+ <textarea name="biblionumbers" id="biblionumbers" class="focus" autocomplete="off" rows="5"></textarea> >+ <input type="hidden" name="op" value="add_biblio" /> >+ <input type="hidden" name="referer" value="view" /> >+ <input type="hidden" name="shelfnumber" value="[% shelf.shelfnumber | html %]" /> >+ </li> >+ </ol> >+ <fieldset class="action"> >+ <input type="submit" value="Add" /> >+ </fieldset> >+ </fieldset> >+ </form> >+ </aside> >+ </div> <!-- /.col-sm-2.col-sm-pull-10 --> >+ [% END %] >+ </div> <!-- /.row --> > > [% MACRO jsinclude BLOCK %] > [% INCLUDE 'datatables.inc' %] > [% Asset.js("lib/jquery/plugins/jquery.dataTables.columnFilter.js") | $raw %] > [% IF print %] >- <script type="text/javascript"> >+ <script> > $( document ).ready(function() { > window.print(); > setTimeout('window.close()', 1); >@@ -440,7 +441,7 @@ > [% Asset.js("lib/jquery/plugins/jquery.checkboxes.min.js") | $raw %] > [% Asset.js("lib/jquery/plugins/jquery.fixFloat.js") | $raw %] > [% END %] >- <script type="text/javascript"> >+ <script> > var MSG_NO_ITEM_SELECTED = _("Nothing is selected."); > var MSG_REMOVE_FROM_LIST = _("Are you sure you want to remove these items from the list?"); > var MSG_CONFIRM_DELETE_LIST = _("Are you sure you want to remove this list?"); >-- >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 21570
:
80594
|
80822
|
81030