diff options
| author | Simon Lejeune <sle@openerp.com> | 2014-06-27 11:03:34 +0200 |
|---|---|---|
| committer | Antony Lesuisse <al@openerp.com> | 2014-06-27 11:03:34 +0200 |
| commit | 195fa931685a5f32a638246160a21647ba501431 (patch) | |
| tree | 01a42d72533d1b13875acfce63aabd9ce29fc2e2 /addons/website/static/src/xml/website.editor.xml | |
| parent | 864e94a1dc7ecea23bd5a8b47da3055afc278cee (diff) | |
[MERGE] backend front end integration
Render the top-menu (backend menu or frontend editbar) server-side.
Use Fontawesome icons (mail, timezone, chat).
Refactor website widgets, split Website.editorBarin editorbar, ace, editorbar- content, editorbarCustomize.
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"> |