Bugzilla – Attachment 78358 Details for
Bug 21307
Switch two-column templates to Bootstrap grid: Cataloging
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 21307: Switch two-column templates to Bootstrap grid: Cataloging
Bug-21307-Switch-two-column-templates-to-Bootstrap.patch (text/plain), 6.94 KB, created by
Owen Leonard
on 2018-08-31 18:28:50 UTC
(
hide
)
Description:
Bug 21307: Switch two-column templates to Bootstrap grid: Cataloging
Filename:
MIME Type:
Creator:
Owen Leonard
Created:
2018-08-31 18:28:50 UTC
Size:
6.94 KB
patch
obsolete
>From 2eb0ebee7958137623a30fdffa2dc9d59a22bf66 Mon Sep 17 00:00:00 2001 >From: Owen Leonard <oleonard@myacpl.org> >Date: Wed, 2 May 2018 14:35:05 +0000 >Subject: [PATCH] Bug 21307: Switch two-column templates to Bootstrap grid: > Cataloging > >This patch modifies two cataloging templates to use the Bootstrap grid >instead of YUI. > >This patch also removes obsolete "text/javascript" attributes from ><script> tags in the modified templates and updates a couple of ><script>s to use the Asset plugin. > >To test, apply the patch and view the following pages, confirming that >they look correct at various browser widths: > > - Cataloging -> Edit record using the advanced editor > - Cataloging -> Edit items >--- > .../prog/en/modules/cataloguing/additem.tt | 42 ++++++++++-------- > .../prog/en/modules/cataloguing/editor.tt | 51 +++++++++++----------- > 2 files changed, 51 insertions(+), 42 deletions(-) > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/additem.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/additem.tt >index 8f14152..828b0cd 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/additem.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/additem.tt >@@ -12,7 +12,7 @@ > [% INCLUDE 'columns_settings.inc' %] > [% INCLUDE 'browser-strings.inc' %] > [% Asset.js("js/browser.js") | $raw %] >-<script type="text/javascript"> >+<script> > //<![CDATA[ > var browser = KOHA.browser('[% searchid | html %]', parseInt('[% biblionumber | html %]', 10)); > browser.show(); >@@ -134,7 +134,7 @@ function confirm_deletion() { > [% Asset.css("css/addbiblio.css") | $raw %] > > [% INCLUDE 'select2.inc' %] >-<script type="text/javascript"> >+<script> > $(document).ready(function() { > $('.subfield_line select').select2(); > }); >@@ -155,10 +155,10 @@ function confirm_deletion() { > › <a href="/cgi-bin/koha/cataloguing/additem.pl?biblionumber=[% biblionumber | html %]">Items</a> > </div> > >-<div id="doc3" class="yui-t7"> >- >- <div id="bd"> >- <div id="yui-main"> >+<div class="main container-fluid"> >+ <div class="row"> >+ <div class="col-sm-12"> >+ <main> > > <h1>Items for [% title | html %] [% IF ( author ) %] by [% author | html %][% END %] (Record #[% biblionumber | html %])</h1> > >@@ -240,12 +240,12 @@ function confirm_deletion() { > </table> > </div> > [% END %] >-</div> >-<div class="yui-gf"> >-<div class="yui-u first"> >-[% INCLUDE 'biblio-view-menu.inc' %] >-</div> >-<div class="yui-u"> >+ >+<div class="row"> >+ <div class="col-sm-2"> >+ [% INCLUDE 'biblio-view-menu.inc' %] >+ </div> >+ <div class="col-sm-10"> > <div id="cataloguing_additem_newitem"> > <form id="f" method="post" action="/cgi-bin/koha/cataloguing/additem.pl" name="f"> > <input type="hidden" name="op" value="[% op | html %]" /> >@@ -374,10 +374,18 @@ function confirm_deletion() { > > > </form> >-</div> >-</div><!-- /yui-u --> >-</div><!-- /yui-gf --> >+ </div> <!-- /.col-sm-10 --> >+ </div> <!-- /.row --> >+ </div> <!-- /div --> >+ </div> <!-- /#cataloguing_additem_itemlist --> >+ </main> >+ </div> <!-- /.col-sm-10.col-sm-push-2 --> >+ >+ <div class="col-sm-2 col-sm-pull-10"> >+ <aside> >+ [% INCLUDE 'admin-menu.inc' %] >+ </aside> >+ </div> <!-- /.col-sm-2.col-sm-pull-10 --> >+ </div> <!-- /.row --> > >-</div> >-</div> > [% INCLUDE 'intranet-bottom.inc' %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/editor.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/editor.tt >index b282489..e4b912f 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/editor.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/editor.tt >@@ -23,13 +23,13 @@ > > <div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> › <a href="/cgi-bin/koha/cataloguing/addbooks.pl">Cataloging</a> › Editor</div> > >-<div id="doc3" class="yui-t2"> >-<div id="bd"> >+<div class="main container-fluid"> >+ <div class="row"> >+ <div class="col-sm-10 col-sm-push-2"> >+ <main> > > <h1 id="title">Cataloging editor</h1> > >-<div id="yui-main"><div class="yui-b"> >- > <div id="editor"> > <input id="import-records-input" type="file" style="display: none"> > <div id="toolbar" class="btn-toolbar"> >@@ -75,31 +75,32 @@ > </div> > </div> > >-</div></div> >- >-<div class="yui-b" id="sidebar"> >+ </main> >+ </div> <!-- /.col-sm-10.col-sm-push-2 --> > >-<h3>Search</h3> >-<form id="quicksearch"> >- <fieldset class="brief"> >- <ol> >- <li><label for="search-by-keywords">Keywords:</label></li> >- <li><input class="search-box" data-qualifier="term" id="search-by-keywords" placeholder="(Ctrl-Alt-K)" /></li> >- <li><label for="search-by-author">Author:</label></li> >- <li><input class="search-box" data-qualifier="author" id="search-by-author" placeholder="(Ctrl-Alt-A)" /></li> >- <li><label for="search-by-isbn">ISBN:</label></li> >- <li><input class="search-box" data-qualifier="isbn" id="search-by-isbn" placeholder="(Ctrl-Alt-I)" /></li> >- <li><label for="search-by-title">Title:</label></li> >- <li><input class="search-box" data-qualifier="title" id="search-by-title" placeholder="(Ctrl-Alt-T)" /></li> >- <li><a href="#" id="show-advanced-search" title="Show advanced search (Ctrl-Alt-S)">Advanced »</a></li> >- </fieldset> >-</form> >+ <div class="col-sm-2 col-sm-pull-10"> >+ <aside> >+ <h3>Search</h3> >+ <form id="quicksearch"> >+ <fieldset class="brief"> >+ <ol> >+ <li><label for="search-by-keywords">Keywords:</label></li> >+ <li><input class="search-box" data-qualifier="term" id="search-by-keywords" placeholder="(Ctrl-Alt-K)" /></li> >+ <li><label for="search-by-author">Author:</label></li> >+ <li><input class="search-box" data-qualifier="author" id="search-by-author" placeholder="(Ctrl-Alt-A)" /></li> >+ <li><label for="search-by-isbn">ISBN:</label></li> >+ <li><input class="search-box" data-qualifier="isbn" id="search-by-isbn" placeholder="(Ctrl-Alt-I)" /></li> >+ <li><label for="search-by-title">Title:</label></li> >+ <li><input class="search-box" data-qualifier="title" id="search-by-title" placeholder="(Ctrl-Alt-T)" /></li> >+ <li><a href="#" id="show-advanced-search" title="Show advanced search (Ctrl-Alt-S)">Advanced »</a></li> >+ </fieldset> >+ </form> >+ </aside> >+ </div> <!-- /.col-sm-2.col-sm-pull-10 --> >+ </div> <!-- /.row --> > > </div> > >-</div> >-</div> >- > <div id="advanced-search-ui" class="modal fade" tabindex="-1" role="dialog" aria-labelledby="advanced-search-title" aria-hidden="true"> > <div class="modal-dialog modal-lg"> > <div class="modal-content"> >-- >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 21307
:
78358
|
78428
|
86085
|
86086
|
86109
|
86462
|
86463
|
86464
|
87949
|
87950
|
87951
|
88134
|
88135
|
88136