diff options
| author | Thibault Delavallée <tde@openerp.com> | 2014-04-15 11:40:06 +0200 |
|---|---|---|
| committer | Thibault Delavallée <tde@openerp.com> | 2014-04-15 11:40:06 +0200 |
| commit | 654700fb36e3d81ec55c5c5caa99ce94ac89237d (patch) | |
| tree | 6f8ea42d367c692fa03e2cf4745efa3579fa0db0 /addons/web/static/src/xml/base.xml | |
| parent | ab12151b58748b6b87972bf1129dd4ab4ed493a3 (diff) | |
| parent | 6b020549f8e9e12acd0385e4dd0708137042bf20 (diff) | |
[MERGE] Sync with trunk
bzr revid: tde@openerp.com-20140408150638-saavkesrvi58jce1
bzr revid: tde@openerp.com-20140411075558-bhjojsbsivb6erq3
bzr revid: tde@openerp.com-20140414090314-jt83lipdphehyz4e
bzr revid: tde@openerp.com-20140415094006-3zmwct81mqx17mb8
Diffstat (limited to 'addons/web/static/src/xml/base.xml')
| -rw-r--r-- | addons/web/static/src/xml/base.xml | 16 |
1 files changed, 15 insertions, 1 deletions
diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml index 06d5ed58552..3dcc00c9d7e 100644 --- a/addons/web/static/src/xml/base.xml +++ b/addons/web/static/src/xml/base.xml @@ -32,7 +32,20 @@ <t t-esc="message"/> </div> </t> - +<t t-name="Dialog"> + <div class="modal" tabindex="-1" data-backdrop="static" role="dialog" aria-hidden="true"> + <div class="modal-dialog modal-lg"> + <div class="modal-content"> + <div class="modal-header"> + <button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button> + <h3 class="modal-title"><t t-raw="title"/></h3> + </div> + <div class="modal-body"> + </div> + </div> + </div> + </div> +</t> <t t-name="CrashManager.warning"> <table cellspacing="0" cellpadding="0" border="0" class="oe_dialog_warning"> <tr> @@ -1283,6 +1296,7 @@ <td> <t t-call="HiddenInputFile"> <t t-set="fileupload_id" t-value="widget.fileupload_id"/> + <t t-set="fileupload_style" t-translation="off">overflow-x: hidden</t> <button class="oe_button oe_field_button" type="button"> <img t-att-src='_s + "/web/static/src/img/icons/STOCK_DIRECTORY.png"'/> <span>Select</span> |