diff options
| author | Olivier Dony <odo@openerp.com> | 2012-08-29 17:54:00 +0200 |
|---|---|---|
| committer | Olivier Dony <odo@openerp.com> | 2012-08-29 17:54:00 +0200 |
| commit | bc74fc920cd159ebcbcee62d0b3e99eaac15641e (patch) | |
| tree | c4c1d4633be52a442420d27251035321eb5ab801 /addons/pad/static/src/xml | |
| parent | ba7aee832d999b940c1139218d6966db660510fe (diff) | |
| parent | 6e80e425d1626d46c0f48054a5beb339fa1cd557 (diff) | |
[MERGE] Rebase incorrect top-level merge of `pad/wiki` refactoring + extra merge of product form simplification
To be completed by an extra merge containing the remaining
work-in-progress stuff of pad/wiki refactoring.
bzr revid: odo@openerp.com-20120829155400-memirrjghutw5pl7
Diffstat (limited to 'addons/pad/static/src/xml')
| -rw-r--r-- | addons/pad/static/src/xml/pad.xml | 22 |
1 files changed, 12 insertions, 10 deletions
diff --git a/addons/pad/static/src/xml/pad.xml b/addons/pad/static/src/xml/pad.xml index e128fb183fb..58266a2594a 100644 --- a/addons/pad/static/src/xml/pad.xml +++ b/addons/pad/static/src/xml/pad.xml @@ -2,17 +2,19 @@ <!-- vim:fdl=1: --> <templates id="template" xml:space="preserve"> - <t t-name="FieldPad"> - <t t-if="!widget.get('effective_readonly')"> - <div class="oe_form_field_text oe_etherpad_normal"> - <div class="oe_etherpad_head"> - <span class="oe_normal">Fullscreen</span> - <span class="oe_fullscreen">Return to Record</span> - </div> - <div class="oe_etherpad_default" ></div> + <div class="oe_form_field_text oe_pad"> + <div class="oe_pad_head"> + <span class="oe_pad_switch">Fullscreen</span> </div> - </t> + <div class="oe_pad_content"></div> + </div> +</t> +<t t-name="FieldPad.unconfigured"> + Please configure your etherpad server.<br/> + OpenERP Entreprise customers may safely use pad.openerp.com as a server using the following template:<br/> + <blockquote> + http://pad.openerp.com/p/%(db)s-%(model)s-%(salt)s + </blockquote> </t> - </templates> |