From 6fb448a461c973e599e975715d749dd3b99371a7 Mon Sep 17 00:00:00 2001
From: Franck Allimant <franck@cqfdev.fr>
Date: Thu, 16 Jan 2014 11:59:42 +0100
Subject: [PATCH] Form content is now integrated in the modal body

---
 .../default/includes/generic-confirm-dialog.html         | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/templates/backOffice/default/includes/generic-confirm-dialog.html b/templates/backOffice/default/includes/generic-confirm-dialog.html
index 63f59eca8..1bbdea465 100755
--- a/templates/backOffice/default/includes/generic-confirm-dialog.html
+++ b/templates/backOffice/default/includes/generic-confirm-dialog.html
@@ -25,13 +25,14 @@ Parameters:
                 <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
                 <h3>{$dialog_title}</h3>
             </div>
-            <div class="modal-body">
-                {$dialog_message nofilter}
-            </div>
 
             <form method="{$form_method|default:POST}" action="{$form_action}" id="{$form_id|default:"{$dialog_id}_form"}">
 
-                {$form_content nofilter}
+	            <div class="modal-body">
+	                {$dialog_message nofilter}
+
+                    {$form_content nofilter}
+                </div>
 
                 <div class="modal-footer">
                     <button type="button" class="btn btn-default" data-dismiss="modal" aria-hidden="true"><span class="glyphicon glyphicon-remove"></span> {$dialog_cancel_label|default:{intl l="No"}}</button>