Attachment 65705 Details for Bug 17981 – Bug 17981: Move the divs to the top of the modal

[patch] Bug 17981: Move the divs to the top of the modal

Bug-17981-Move-the-divs-to-the-top-of-the-modal.patch (text/plain), 2.60 KB, created by Kyle M Hall (khall) on 2017-08-09 11:00:28 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Kyle M Hall (khall)

Created: 2017-08-09 11:00:28 UTC

Size: 2.60 KB

patch

obsolete

>From 25cb4562a68ebce6348382559c3d2e25e4d58686 Mon Sep 17 00:00:00 2001
>From: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
>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 <kyle@bywatersolutions.com>
>---
> koha-tmpl/intranet-tmpl/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 e9f33dd..4f072d9 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/letter.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/letter.tt
>@@ -140,7 +140,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 + " 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 4bde77d..b7aadd9 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 %]
>                 </div>
>             [% END %]
>+
>+            [% IF rendered_tt_message %]
>+                [% IF messages_are_similar %]
>+                    <div class="dialog message">The generated notices are exactly the same!</div>
>+                [% ELSE %]
>+                    <div class="dialog alert">The generated notices are different!</div>
>+                [% END %]
>+            [% END %]
>+
>             [% IF rendered_message %]
>                 <fieldset class="brief">
>                     <legend>Original version</legend>
>@@ -44,12 +53,5 @@
>             [% END %]
>         </div>
> 
>-        [% IF rendered_tt_message %]
>-            [% IF messages_are_similar %]
>-                <div class="dialog message">The generated notices are exactly the same!</div>
>-            [% ELSE %]
>-                <div class="dialog alert">The generated notices are different!</div>
>-            [% END %]
>-        [% END %]
>     </body>
> </html>
>-- 
>2.10.2

Actions: View | Diff | Splinter Review

Attachments on bug 17981: 59508 | 59509 | 59510 | 59514 | 59524 | 63978 | 63979 | 63980 | 63981 | 63982 | 65688 | 65689 | 65690 | 65701 | 65702 | 65703 | 65704 | 65705 | 67144 | 67145 | 67146 | 67147 | 67148 | 67152 | 70300 | 70301 | 70302 | 70303 | 70304 | 70305 | 73201 | 73202 | 73203 | 73204 | 73205 | 73206 | 73949 | 73950 | 73951 | 73952 | 74025 | 74027 | 74028 | 74029 | 74030 | 74031 | 74032 | 74033 | 74034