From d153e728bb8fa677153281b9bdf8325e76358b4b Mon Sep 17 00:00:00 2001 From: Owen Leonard Date: Thu, 8 Nov 2018 17:53:51 +0000 Subject: [PATCH] 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 + @@ -40,10 +40,10 @@

[% ELSE %] -

[% END %] [% IF ( no_op_set ) %] @@ -449,14 +449,20 @@ [% END %] -

-[% UNLESS add_form or copy_form %] -

- [% INCLUDE 'tools-menu.inc' %] -

+[% IF add_form or copy_form %] +

+[% ELSE %] + +

+ +

[% END %] -

[% 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 @@ -

[% FOR m IN messages %] [%# FIXME The message block does not appear at the top of the modal! %]

@@ -29,8 +29,8 @@ [% END %] [% IF rendered_message %] -

Original version

[% FILTER html_line_break %] @@ -38,7 +38,7 @@ [% END %]

Original message, rendered:

[% FILTER html_line_break %] @@ -52,8 +52,8 @@ [% IF rendered_tt_message %]

Converted version

[% FILTER html_line_break %] @@ -61,7 +61,7 @@ [% END %]

Converted message, rendered:

[% FILTER html_line_break %] @@ -71,7 +71,7 @@

[% END %] -

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.39.5