Merge lp:~openerp-dev/openerp-web/7.0-opw-605557-fka into lp:openerp-web/7.0

[Foram Katharotiya (OpenERP)]

Hello sir,

I have fixed the issue of warning dialog box which is display black portion.
steps to reproduce:
1) sales -> customers -> select customer -> warnings tab -> Warning on the Sales Order -> select warning -> write message "Hello"
2) create sale order from 'Quotations and Sales' button.

Regards,
FKA

Unmerged revisions

4163. By Foram Katharotiya (OpenERP) on 2014-03-24

[IMP] remove black portion from message warning dialogbox

=== modified file 'addons/web/static/src/js/chrome.js'
--- addons/web/static/src/js/chrome.js	2014-02-21 16:57:06 +0000
+++ addons/web/static/src/js/chrome.js	2014-03-24 13:08:03 +0000
@@ -271,7 +271,7 @@
         if (!this.active) {
             return;
         }
-        instance.web.dialog($('<div>' + QWeb.render('CrashManager.warning', {error: error}) + '</div>'), {
+        instance.web.dialog($(QWeb.render('CrashManager.warning', {error: error})), {
             title: "OpenERP " + _.str.capitalize(error.type),
             buttons: [
                 {text: _t("Ok"), click: function() { $(this).dialog("close"); }}
 
=== modified file 'addons/web/static/src/xml/base.xml'
--- addons/web/static/src/xml/base.xml	2013-10-22 16:25:19 +0000
+++ addons/web/static/src/xml/base.xml	2014-03-24 13:08:03 +0000
@@ -34,21 +34,23 @@
 </t>
 
 <t t-name="CrashManager.warning">
-    <table cellspacing="0" cellpadding="0" border="0" class="oe_dialog_warning">
-    <tr>
-        <td class="oe_dialog_icon"><img t-att-src='_s + "/web/static/src/img/warning.png"'/></td>
-        <td>
-            <p>
-                <t t-js="d">
-                    var message = d.message ? d.message : d.error.data.fault_code;
-                    d.html_error = context.engine.tools.html_escape(message)
-                        .replace(/\n/g, '<br/>');
-                </t>
-                <t t-raw="html_error"/>
-            </p>
-        </td>
-    </tr>
-    </table>
+    <div>
+        <table cellspacing="0" cellpadding="0" border="0" class="oe_dialog_warning">
+            <tr>
+                <td class="oe_dialog_icon"><img t-att-src='_s + "/web/static/src/img/warning.png"'/></td>
+                <td>
+                    <p>
+                        <t t-js="d">
+                            var message = d.message ? d.message : d.error.data.fault_code;
+                            d.html_error = context.engine.tools.html_escape(message)
+                                .replace(/\n/g, '<br/>');
+                        </t>
+                        <t t-raw="html_error"/>
+                    </p>
+                </td>
+            </tr>
+        </table>
+    </div>
 </t>
 <t t-name="CrashManager.error">
     <div class="oe_error_detail">