Bugzilla – Attachment 82115 Details for
Bug 21795
Switch two-column templates to Bootstrap grid: Notices and slips
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
[SIGNED OFF] Bug 21795: Switch two-column templates to Bootstrap grid: Notices and slips
SIGNED-OFF-Bug-21795-Switch-two-column-templates-t.patch (text/plain), 6.42 KB, created by
Christopher Brannon
on 2018-11-08 20:05:23 UTC
(
hide
)
Description:
[SIGNED OFF] Bug 21795: Switch two-column templates to Bootstrap grid: Notices and slips
Filename:
MIME Type:
Creator:
Christopher Brannon
Created:
2018-11-08 20:05:23 UTC
Size:
6.42 KB
patch
obsolete
>From 511b0b2ad4a5a4a8c37398b3510d08f6532720e3 Mon Sep 17 00:00:00 2001 >From: Owen Leonard <oleonard@myacpl.org> >Date: Thu, 8 Nov 2018 17:53:51 +0000 >Subject: [PATCH] [SIGNED OFF] Bug 21795: Switch two-column templates to > Bootstrap grid: Notices and slips > >This patch updates notices and slips templates to use Bootstrap grids >instead of YUI. > >This patch also removes obsolete "text/css" attributes from <style> tags >in the modified templates. > >To test, apply the patch and go to Tools -> Notices and slips. Test that >these pages look correct and adujst well to various browser widths. > > - The main page listing notices and slips > - The add/edit form > - The notice preview modal available when editing CHECKIN, CHECKOUT and > HOLD_SLIP. > >Signed-off-by: Christopher Brannon <cbrannon@cdalibrary.org> >--- > .../intranet-tmpl/prog/en/modules/tools/letter.tt | 30 +++++++++++++--------- > .../prog/en/modules/tools/preview_letter.tt | 16 ++++++------ > koha-tmpl/intranet-tmpl/prog/js/letter.js | 2 +- > 3 files changed, 27 insertions(+), 21 deletions(-) > >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 c72b4ed2bf..dff6c17dee 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/letter.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/letter.tt >@@ -8,7 +8,7 @@ > <title>Koha › Tools › Notices[% IF ( add_form or copy_form ) %][% IF ( modify ) %] › Modify notice[% ELSE %] › Add notice[% END %][% END %][% IF ( add_validate or copy_validate) %] › Notice added[% END %][% IF ( delete_confirm ) %] › Confirm deletion[% END %]</title> > [% INCLUDE 'doc-head-close.inc' %] > [% Asset.css("css/datatables.css") | $raw %] >-<style type="text/css">#preview_template .modal-dialog { width : 80%; } .spinner { display: none; } @media (max-width: 767px) { #preview_template { margin: 0; width : auto; } }</style> >+<style>#preview_template .modal-dialog { width : 80%; } .spinner { display: none; } @media (max-width: 767px) { #preview_template { margin: 0; width : auto; } }</style> > </head> > > <body id="tools_letter" class="tools"> >@@ -40,10 +40,10 @@ > <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 ( no_op_set ) %] >@@ -449,14 +449,20 @@ > </form> > [% END %] > >-</div> >-</div> >-[% UNLESS add_form or copy_form %] >- <div class="yui-b noprint"> >- [% INCLUDE 'tools-menu.inc' %] >- </div> >+[% IF add_form or copy_form %] >+ </div> <!-- /.col-md-8 --> >+ </div> <!-- /.row --> >+[% ELSE %] >+ </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 --> > [% END %] >-</div> > > [% MACRO jsinclude BLOCK %] > [% Asset.js("js/tools-menu.js") | $raw %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/preview_letter.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/preview_letter.tt >index 787cce9133..73c32ee4b4 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/preview_letter.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/preview_letter.tt >@@ -3,7 +3,7 @@ > <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> > </head> > <body id="preview_letter" class="catalog"> >- <div id="main"> >+ <div class="main container-fluid"> > [% FOR m IN messages %] > [%# FIXME The message block does not appear at the top of the modal! %] > <div class="dialog [% m.type | html %]"> >@@ -29,8 +29,8 @@ > [% END %] > > [% IF rendered_message %] >- <div class="yui-g"> >- <div class="yui-u first"> >+ <div class="row"> >+ <div class="col-xs-6"> > <h3>Original version</h3> > <span style="font-family:monospace"> > [% FILTER html_line_break %] >@@ -38,7 +38,7 @@ > [% END %] > </span> > </div> >- <div class="yui-u"> >+ <div class="col-xs-6"> > <h3>Original message, rendered:</h3> > <span style="font-family:monospace"> > [% FILTER html_line_break %] >@@ -52,8 +52,8 @@ > > [% IF rendered_tt_message %] > <hr /> >- <div class="yui-g"> >- <div class="yui-u first"> >+ <div class="row"> >+ <div class="col-xs-6"> > <h3>Converted version</h3> > <span style="font-family:monospace"> > [% FILTER html_line_break %] >@@ -61,7 +61,7 @@ > [% END %] > </span> > </div> >- <div class="yui-u"> >+ <div class="col-xs-6"> > <h3>Converted message, rendered:</h3> > <span style="font-family:monospace"> > [% FILTER html_line_break %] >@@ -71,7 +71,7 @@ > </div> > </div> > [% END %] >- </div> >+ </div> <!-- /.main --> > > </body> > </html> >diff --git a/koha-tmpl/intranet-tmpl/prog/js/letter.js b/koha-tmpl/intranet-tmpl/prog/js/letter.js >index 968b0d10a1..76789646a6 100644 >--- a/koha-tmpl/intranet-tmpl/prog/js/letter.js >+++ b/koha-tmpl/intranet-tmpl/prog/js/letter.js >@@ -162,7 +162,7 @@ $(document).ready(function() { > page += '&content='+encodeURIComponent(content); > page += '&data_preview='+encodeURIComponent(data_preview); > page += '&is_html='+encodeURIComponent(is_html); >- $("#preview_template .modal-body").load(page + " #main"); >+ $("#preview_template .modal-body").load(page + " .main"); > $('#preview_template').modal('show'); > $("#preview_template_button").attr("href", "/cgi-bin/koha/svc/letters/convert?module="+module+"&code="+code+"&mtt="+mtt+"&lang="+lang); > }); >-- >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 21795
:
82108
|
82114
|
82115
|
82174