From b44db114211fad704bdf80ae6e8f8471b57477d9 Mon Sep 17 00:00:00 2001 From: Jonathan Druart Date: Tue, 24 Jan 2017 17:38:17 +0100 Subject: [PATCH] Bug 17981: Move the divs to the top of the modal Signed-off-by: Kyle M Hall Signed-off-by: Josef Moravec Signed-off-by: Jonathan Druart --- .../prog/en/modules/tools/letter.tt | 2 +- .../prog/en/modules/tools/preview_letter.tt | 16 +++++++++------- 2 files changed, 10 insertions(+), 8 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 f2e3ef2739..4eaa6d0594 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/letter.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/letter.tt @@ -578,7 +578,7 @@ page += '&content='+encodeURIComponent(content); page += '&data_preview='+encodeURIComponent(data_preview); page += '&is_html='+encodeURIComponent(is_html); - $("#preview_template .modal-body").load(page + " div"); + $("#preview_template .modal-body").load(page); $('#preview_template').modal('show'); $("#preview_template_button").attr("href", "/cgi-bin/koha/svc/letters/convert?module="+module+"&code="+code+"&mtt="+mtt+"&lang="+lang); }); 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 4bde77d68d..b7aadd9ed1 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 @@ -19,6 +19,15 @@ [% END %] [% END %] + + [% IF rendered_tt_message %] + [% IF messages_are_similar %] +
The generated notices are exactly the same!
+ [% ELSE %] +
The generated notices are different!
+ [% END %] + [% END %] + [% IF rendered_message %]
Original version @@ -44,12 +53,5 @@ [% END %] - [% IF rendered_tt_message %] - [% IF messages_are_similar %] -
The generated notices are exactly the same!
- [% ELSE %] -
The generated notices are different!
- [% END %] - [% END %] -- 2.39.5