diff options
| author | Vaibhav (OpenERP) <vda@tinyerp.com> | 2011-06-22 10:53:59 +0530 |
|---|---|---|
| committer | Vaibhav (OpenERP) <vda@tinyerp.com> | 2011-06-22 10:53:59 +0530 |
| commit | 30d315dfd95bccc1fb91c2fea9d7a31cf86ab6bf (patch) | |
| tree | 1d46c6a5e1c86fe051c19139014fa402d49f02ea /addons/base/static/src/xml | |
| parent | 68fdbd29122f085e128d9d93e3ea53ef18a6a12f (diff) | |
| parent | c57a3e0d98229ed66dde92c5caad39f6bc0efdbd (diff) | |
[MERGE] openerp-web
bzr revid: vda@tinyerp.com-20110622052359-n3tef8f89jo22cs9
Diffstat (limited to 'addons/base/static/src/xml')
| -rw-r--r-- | addons/base/static/src/xml/base.xml | 18 |
1 files changed, 11 insertions, 7 deletions
diff --git a/addons/base/static/src/xml/base.xml b/addons/base/static/src/xml/base.xml index 949b38e0115..b03bb044ba4 100644 --- a/addons/base/static/src/xml/base.xml +++ b/addons/base/static/src/xml/base.xml @@ -90,7 +90,7 @@ t-att-value="selected_password || ''"/></td> </tr> <tr t-if="has_local_storage"> - <td><label for="remember">Rember password:</label></td> + <td><label for="remember">Remember password:</label></td> <td class="oe_remember"> <t t-if="remember"> <input type="checkbox" name="remember" checked="yes"/> @@ -804,6 +804,7 @@ </div> <a class="searchview_extended_add_proposition" href="javascript:void(0)"> <span>Add condition</span></a> + <div class="oe_adv_filters_and"><span>and</span></div> </div> </t> <t t-name="SearchView.extended_search.proposition"> @@ -870,12 +871,15 @@ </div> </t> <t t-name="DialogWarning"> - <div id="dialog-message" t-att-title="title"> - <p> - <span class="ui-icon ui-icon-circle-check" style="float:left; margin:0 7px 50px 0;"></span> - <t t-esc="message"/> - </p> - </div> + <p class="oe-dialog-warning"> + <img src="/base/static/src/img/warning.png" class="oe-dialog-icon"/> + <t t-esc="error.data.fault_code.substr(18)"/> + </p> +</t> +<t t-name="DialogTraceback"> + <pre><t t-esc="error.message"/></pre> + <hr/> + <pre><t t-esc="error.data.debug"/></pre> </t> <t t-name="SelectCreatePopup"> <div t-att-id="element_id"> |