Bugzilla – Attachment 88621 Details for
Bug 22764
More YUI grid cleanup
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 22764: More YUI grid cleanup
Bug-22764-More-YUI-grid-cleanup.patch (text/plain), 8.19 KB, created by
Owen Leonard
on 2019-04-24 13:32:10 UTC
(
hide
)
Description:
Bug 22764: More YUI grid cleanup
Filename:
MIME Type:
Creator:
Owen Leonard
Created:
2019-04-24 13:32:10 UTC
Size:
8.19 KB
patch
obsolete
>From 1e9a13f487cf2bd12f0878d62231db498b1c2a5a Mon Sep 17 00:00:00 2001 >From: Owen Leonard <oleonard@myacpl.org> >Date: Wed, 24 Apr 2019 13:19:38 +0000 >Subject: [PATCH] Bug 22764: More YUI grid cleanup > >This patch cleans up a few places where templates still contain YUI grid >markup. Some other minor markup problems are also fixed. > > - additional-fields.tt: > - Converts YUI grid to Bootstrap > - Replaces obsolete <tt> tag with styled <span> > - Adds _() function to string in embedded JavaScript > > - detail.tt: > - Fixes some stray YUI grid classes > - Fixes corresponding JavaScript to enable page adjustments > > - moredetail.tt: > - Removes unnecessary YUI grid markup > >To test, apply the patch and view the affected pages, confirming that >everything looks correct and that the page adjusts well to various >browser widthds. > >When testing the bibliographic detail page, enable AmazonCoverImages and >view a record with and without an Amazon cover image. The layout should >work in both cases. >--- > .../prog/en/modules/admin/additional-fields.tt | 28 ++++++++++++---------- > .../prog/en/modules/catalogue/detail.tt | 21 +++++++--------- > .../prog/en/modules/catalogue/moredetail.tt | 3 +-- > 3 files changed, 26 insertions(+), 26 deletions(-) > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/additional-fields.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/additional-fields.tt >index d8f3f0d..a20264c 100755 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/additional-fields.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/additional-fields.tt >@@ -26,10 +26,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> >+ > [% IF op == 'list' %] > <div id="toolbar" class="btn-toolbar"> > <a class="btn btn-default" id="newfields" href="?op=add_form&tablename=[% tablename | uri %]"><i class="fa fa-plus"></i> Create field</a> >@@ -65,7 +66,7 @@ > <h3>Additional fields</h3> > <p>Select a table:</p> > [% BLOCK table_option %] >- <li><a href="?tablename=[% value | uri %]">[% content | html %] (<tt>[% value | html %]</tt>)</a></li> >+ <li><a href="?tablename=[% value | uri %]">[% content | html %] (<span class="ex">[% value | html %]</span>)</a></li> > [% END %] > <ul> > [% IF CAN_user_acquisition_order_manage %] >@@ -164,13 +165,16 @@ > </form> > [% END %] > >- </div> >- </div> >+ </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 class="yui-b"> >-[% INCLUDE 'admin-menu.inc' %] >-</div> >-</div> > > [% MACRO jsinclude BLOCK %] > [% INCLUDE "datatables.inc" %] >@@ -198,7 +202,7 @@ > if ( $("#marcfield").length && $("select[name='authorised_value_category']").length ) { > if ( $("#marcfield").val().length > 0 > && $("select[name='authorised_value_category']" ).val().length > 0 ) { >- alert("You cannot select an authorised value category and a marcfield"); >+ alert(_("You cannot select an authorised value category and a marcfield") ); > return false; > } > } >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt >index 0ffe432..4b4c1da 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt >@@ -57,6 +57,7 @@ > <div class="row"> > <div class="col-sm-10 col-sm-push-2"> > <main> >+ <div class="row"> > > [% IF ( unknownbiblionumber ) %] > <div class="dialog message">The record you requested does not exist ([% biblionumber | html %]).</div> >@@ -69,11 +70,9 @@ > [% END %] > > [% IF ( AmazonCoverImages || LocalCoverImages || AdlibrisEnabled ) %] >- <div class="yui-gc"> >- <div id="catalogue_detail_biblio" class="yui-u first"> >+ <div id="catalogue_detail_biblio" class="col-xs-9"> > [% ELSE %] >- <div class="yui-g"> >- <div id="catalogue_detail_biblio"> >+ <div id="catalogue_detail_biblio" class="col-xs-12"> > [% END %] > > [% XSLTBloc | $raw %] >@@ -123,7 +122,7 @@ > [% END %] > > [% IF ( AmazonCoverImages || LocalCoverImages || AdlibrisEnabled ) %] >- </div><div class="yui-u" id="bookcoverimg"> >+ </div><div class="col-xs-3" id="bookcoverimg"> > [% IF ( LocalCoverImages ) %] > <div title="[% biblionumber |url %]" class="[% biblionumber | html %]" id="local-thumbnail-preview"></div> > [% END %] >@@ -493,7 +492,6 @@ > > [% IF ( subscriptionsnumber ) %] > <div id="subscriptions"> >-<div class="yui-g"> > <div id="catalogue_detail_subscriptions"> > <h2>This is a serial subscription</h2> > <p> (There are [% subscriptionsnumber | html %] subscriptions associated with this title).</p> >@@ -545,7 +543,6 @@ > [% END %] > </div> > </div> >-</div> > [% END %] > > [% IF Koha.Preference('AcquisitionDetails') %] >@@ -703,17 +700,17 @@ > > </div><!-- /bibliodetails --> > >-<div class="yui-g" id="export" style="margin-top: 1em;"> >+<div id="export" style="margin-top: 1em;"> > <form method="get" action="/cgi-bin/koha/catalogue/export.pl"> > <table> <tr> >- <th>Save Record</th> </tr> >+ <th>Save record</th> </tr> > <tr><td> Select download format: <select name="format"> > <option value="mods">MODS (XML)</option> > <option data-toggle="modal" data-target="#exportModal_">Dublin Core</option> > <option value="marcxml">MARCXML</option> > <option value="marc8">MARC (non-Unicode/MARC-8)</option> > <option value="utf8">MARC (Unicode/UTF-8)</option> </select> >- <input type="submit" name="save" value="Download Record" /></td> >+ <input type="submit" name="save" value="Download record" /></td> > </tr> > <tr><td> > <input type="hidden" name="op" value="export" /><input type="hidden" name="bib" value="[% biblionumber | html %]" /> >@@ -767,10 +764,10 @@ > h = this.height; > if ((w == 1) || (h == 1)) { > $("#amazon-bookcoverimg").remove(); >- $(".yui-gb").attr("class","yui-g"); >+ $("#catalogue_detail_biblio").attr("class","col-xs-12"); > } else if ((this.complete != null) && (!this.complete)) { > $("#amazon-bookcoverimg").remove(); >- $(".yui-gb").attr("class","yui-g"); >+ $("#catalogue_detail_biblio").attr("class","col-xs-12"); > } > } > }); >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/moredetail.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/moredetail.tt >index c104cf3..28066ce 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/moredetail.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/moredetail.tt >@@ -52,8 +52,8 @@ > [% IF ( ONLY_ONE ) %] > <div class="dialog message">You are only viewing one item. <a href="/cgi-bin/koha/catalogue/moredetail.pl?biblionumber=[% biblionumber | uri %]&bi=[% biblioitemnumber | uri %]#item[% itemnumber | uri %]">View All</a></div> > [% END %] >+ > [% FOREACH ITEM_DAT IN ITEM_DATA %] >- <div class="yui-g"> > <h3 id="item[% ITEM_DAT.itemnumber | html %]">Barcode [% ITEM_DAT.barcode | html %] [% IF ( ITEM_DAT.notforloantext ) %][% ITEM_DAT.notforloantext | html %] [% END %]</h3> > <div class="listgroup"><h4>Item information [% IF ( CAN_user_editcatalogue_edit_catalogue ) %][% UNLESS ( ITEM_DAT.nomod ) %] > [% IF ( CAN_user_editcatalogue_edit_items ) %] >@@ -271,7 +271,6 @@ > </li> > </ol> > </div> >- </div> > </div> > [% END %] > >-- >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 22764
:
88621
|
88674
|
88677
|
88678