@@ -, +, @@ Notices and slips - The main page listing notices and slips - The add/edit form - The notice preview modal available when editing CHECKIN, CHECKOUT and HOLD_SLIP. --- .../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(-) --- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/letter.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/letter.tt @@ -8,7 +8,7 @@ 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 %] [% INCLUDE 'doc-head-close.inc' %] [% Asset.css("css/datatables.css") | $raw %] - + @@ -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 %] --- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/preview_letter.tt +++ a/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 %] -
+
--- a/koha-tmpl/intranet-tmpl/prog/js/letter.js +++ a/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); }); --