diff options
| author | vta vta@openerp.com <> | 2012-08-30 09:05:01 +0200 |
|---|---|---|
| committer | vta vta@openerp.com <> | 2012-08-30 09:05:01 +0200 |
| commit | e2d9e9e2f7f1e0728e46836fcaacebaf38d7bed1 (patch) | |
| tree | 252b9180aa13d5fe3ec601911d62a88f63c47b17 /addons/web/static/src/xml/base.xml | |
| parent | c7264344a838575b62be221a6df004b1bcfd0f83 (diff) | |
| parent | 6e943465be4c6df2a356b93e7be8a1da4eb8d74f (diff) | |
[MERGE] Merged latest trunk.
bzr revid: vta@openerp.com-20120830070501-qy3am8pj7q3xm0oi
Diffstat (limited to 'addons/web/static/src/xml/base.xml')
| -rw-r--r-- | addons/web/static/src/xml/base.xml | 26 |
1 files changed, 2 insertions, 24 deletions
diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml index c91c156a2c4..8478ffeda22 100644 --- a/addons/web/static/src/xml/base.xml +++ b/addons/web/static/src/xml/base.xml @@ -51,29 +51,6 @@ </table> </t> <t t-name="CrashManager.error"> - <t t-if="!session.openerp_entreprise"> - <span>Your version of OpenERP is unsupported. Support & maintenance services are available here: <a href="http://www.openerp.com/support-or-publisher-warranty-contract" target="_blank">OpenERP Entreprise</a>.</span> - </t> - <t t-if="session.openerp_entreprise"> - <div class="oe_error_send"> - <div> - <div class="oe_centeralign"><b>OpenERP Enterprise Contract.</b></div> - <div><br/>Your report will be sent to the OpenERP Enterprise team.<br/></div><br/> - <div> - <label>Summary:</label><br/> - <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> - <label>What you did:</label><br/> - <textarea id="remark" rows="6" ></textarea> - </div> - </div> - </div><br/> - </t> <div class="oe_error_detail"> <pre><t t-esc="error.message"/></pre> <hr/> @@ -563,6 +540,7 @@ <t t-foreach="widget.sections" t-as="section"> <div class="oe_form_dropdown_section"> <button class="oe_dropdown_toggle oe_dropdown_arrow"> + <t t-if="section.name == 'files'" t-raw="widget.items[section.name].length || ''"/> <t t-esc="section.label"/> </button> <ul class="oe_dropdown_menu"> @@ -1736,7 +1714,7 @@ <div class="oe_blockui_spin" style="height: 50px"> </div> <br /> - <div style="color:white">Loading...</div> + <div class="oe_throbber_message" style="color:white"></div> </div> </t> </templates> |