diff options
| author | Josse Colpaert <jco@odoo.com> | 2014-07-07 14:33:01 +0200 |
|---|---|---|
| committer | Josse Colpaert <jco@odoo.com> | 2014-07-07 14:33:01 +0200 |
| commit | af0e9b8aa6c2083fd483979975e81c7bf868d574 (patch) | |
| tree | bb2aa28096ed18fe28f02bc17898f77df44a6614 /addons/website/static/src/xml/website.editor.xml | |
| parent | e905fdfa3a277f86948067d7dae19ea5f89576eb (diff) | |
| parent | 7f9d1f42bf3ad7a734ed5f317bbb4a8a9df639c5 (diff) | |
[MERGE] Fix copy_data for merge
Diffstat (limited to 'addons/website/static/src/xml/website.editor.xml')
| -rw-r--r-- | addons/website/static/src/xml/website.editor.xml | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/addons/website/static/src/xml/website.editor.xml b/addons/website/static/src/xml/website.editor.xml index 669d5f42e2f..d61b6ed2664 100644 --- a/addons/website/static/src/xml/website.editor.xml +++ b/addons/website/static/src/xml/website.editor.xml @@ -1,18 +1,19 @@ <templates id="template" xml:space="preserve"> - <t t-extend="website.editorbar"> - <t t-jquery="#website-top-view" t-operation="after"> - <div class="navbar-inner" id="website-top-edit"> - <form class="navbar-form pull-left text-muted"> + <t t-name="website.editorbar"> + <div id="website-top-navbar" class="navbar navbar-inverse navbar-fixed-top hidden-xs" style="display: none;"> + <div class="navbar-header" id="website-top-edit"> + <ul class="nav navbar-nav js_editor_placeholder pull-right"> + </ul> + <form class="navbar-form text-muted"> <button type="button" data-action="save" - class="btn btn-primary">Save</button> + class="btn btn-primary btn-xs">Save</button> or - <a href="#" data-action="cancel" class="btn btn-link">Discard</a> + <a href="#" data-action="cancel" class="btn btn-link btn-xs">Discard</a> </form> - <ul class="nav navbar-nav pull-right"> - </ul> </div> - </t> + </div> </t> + <t t-name="website.editor.dialog"> <div class="modal" tabindex="-1" role="dialog" aria-hidden="true"> <div class="modal-dialog"> |