diff options
| author | Roberto López López (OpenERP) <rlo@openerp.com> | 2011-12-22 15:04:58 +0100 |
|---|---|---|
| committer | Roberto López López (OpenERP) <rlo@openerp.com> | 2011-12-22 15:04:58 +0100 |
| commit | df0457762d20d47728a40a56d200fa6ac324c5dc (patch) | |
| tree | aa048e24a533183256fa76de2fb6b1b186ac385e /addons/web/static/src | |
| parent | 2d45a0b80c7bf2c857402740d2a47209bdb1642a (diff) | |
modified according to review
bzr revid: rlo@openerp.com-20111222140458-vrbsremb9lgj8r86
Diffstat (limited to 'addons/web/static/src')
| -rw-r--r-- | addons/web/static/src/css/base.css | 26 | ||||
| -rw-r--r-- | addons/web/static/src/js/chrome.js | 10 | ||||
| -rw-r--r-- | addons/web/static/src/xml/base.xml | 27 |
3 files changed, 16 insertions, 47 deletions
diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css index abe91bedef4..54ba44f2473 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -1884,20 +1884,8 @@ ul.oe-arrow-list li.oe-arrow-list-selected .oe-arrow-list-after { } /* Dialog traceback cases */ -.openerp .oe_expandcase { - background: transparent url(/web/static/src/img/expand.gif) 0 50% no-repeat; - margin-top:10px; -} -.openerp .oe_collapsecase { - background: transparent url(/web/static/src/img/collapse.gif) 0 50% no-repeat; - margin-top:10px; -} -.openerp .oe_case_head{ - padding-left:18px; - margin-top:5px; -} .openerp .oe_error_detail{ - display:none; + display:block; } .openerp .oe_error_send{ display:block; @@ -1908,18 +1896,10 @@ ul.oe-arrow-list li.oe-arrow-list-selected .oe-arrow-list-after { } .openerp .oe_fielddiv{ display:inline-block; -} -.openerp .oe_fielddiv label{ - /* width:20%; */ - float:left; - text-align:right; -} -.openerp .oe_fielddiv div{ - width:79%; - float:right; + width:100%; } .openerp .oe_fielddiv input[type=text],textarea{ - width:200px; + width:100%; } /* for Alignment center */ .openerp .oe_centeralign{ diff --git a/addons/web/static/src/js/chrome.js b/addons/web/static/src/js/chrome.js index df56bff9a7b..87d996a65e0 100644 --- a/addons/web/static/src/js/chrome.js +++ b/addons/web/static/src/js/chrome.js @@ -214,16 +214,8 @@ openerp.web.ServerError = openerp.web.Dialog.extend({ }); if (!self.session.has_pwc) { - $('.oe_error_send').html('<span><a href="http://www.openerp.com/support-or-publisher-warranty-contract" target="_blank">Unsupported/Community Version</a></span>'); + $('.oe_error_send').html('<span>You have an unsupported version. <a href="http://www.openerp.com/support-or-publisher-warranty-contract" target="_blank">Click here</a> to get support & maintenance service.</span>'); } - - dialog.$element.find('.oe_expandcase').each(function() { - var $this = $(this); - - $this.click( function() { - $this.next().toggle().prev().toggleClass("oe_expandcase oe_collapsecase"); - }); - }); } }); diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml index c5ffedd157b..7ab3a5a2d83 100644 --- a/addons/web/static/src/xml/base.xml +++ b/addons/web/static/src/xml/base.xml @@ -1347,32 +1347,29 @@ </t> <t t-name="DialogTraceback"> <form> - <div class="oe_expandcase"> - <span class="oe_case_head"><t t-esc="'Let me fix it'" /></span> - </div> - <div class="oe_error_detail oe_error_fix"> - <pre><t t-esc="error.message"/></pre> - <hr/> - <pre><t t-esc="error.data.debug"/></pre> - </div> <div class="oe_error_send"> <div> <div class="oe_centeralign"><b>OpenERP Enterprise Contract.</b></div> - <div><br/>Your request will be sent to OpenERP and OpenERP Enterprise team will reply you shortly.<br/></div> - <span class="oe_fielddiv"> + <div><br/>Your request will be sent to OpenERP and OpenERP Enterprise team will reply you shortly.<br/></div><br/> + <div> <label>Summary:</label><br/> - <input id="issuename" type="text"/> - </span><br/><br/> - <div class="oe_fielddiv"> + <input id="issuename" type="text" class="oe_fielddiv"/> + </div><br/><br/> + <div> <label>Description:</label><br/> <textarea id="explanation" rows="6"></textarea> </div><br/><br/> - <div class="oe_fielddiv"> + <div> <label>What you did:</label><br/> <textarea id="remark" rows="6" ></textarea> </div> - <div><br/><input type="button" value="Send To OpenERP Enterprise Team" id="button_send_error"/></div> + <div align="right"><br/><input type="button" value="Send To OpenERP Enterprise Team" id="button_send_error"/></div> </div> + </div><br/> + <div class="oe_error_detail oe_error_fix"> + <pre><t t-esc="error.message"/></pre> + <hr/> + <pre><t t-esc="error.data.debug"/></pre> </div> </form> </t> |
