diff options
Diffstat (limited to 'addons/website/static/src/xml')
| -rw-r--r-- | addons/website/static/src/xml/website.backend.xml | 25 | ||||
| -rw-r--r-- | addons/website/static/src/xml/website.editor.xml | 64 | ||||
| -rw-r--r-- | addons/website/static/src/xml/website.menu.xml | 20 | ||||
| -rw-r--r-- | addons/website/static/src/xml/website.seo.xml | 5 | ||||
| -rw-r--r-- | addons/website/static/src/xml/website.snippets.xml | 8 | ||||
| -rw-r--r-- | addons/website/static/src/xml/website.translator.xml | 23 | ||||
| -rw-r--r-- | addons/website/static/src/xml/website.xml | 30 |
7 files changed, 106 insertions, 69 deletions
diff --git a/addons/website/static/src/xml/website.backend.xml b/addons/website/static/src/xml/website.backend.xml new file mode 100644 index 00000000000..385b7ffa99a --- /dev/null +++ b/addons/website/static/src/xml/website.backend.xml @@ -0,0 +1,25 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- vim:fdl=1: +--> +<templates id="template" xml:space="preserve"> + + <t t-name="WidgetWebsiteButton"> + + <div class="btn-group oe_WidgetWebsiteButton"> + <button class="btn btn-sm btn-success"> + <span class="oe_unpublish">Not Published</span> + <span class="oe_publish">Published</span> + </button> + <button id="dopprod-0" data-toggle="dropdown" type="button" class="btn btn-sm btn-default dropdown-toggle"> + <span class="caret"></span> + </button> + <ul role="menu" class="dropdown-menu" aria-labelledby="dopprod-0"> + <li> + <a href="#" title="View in frontend">Website</a> + </li> + </ul> + </div> + + </t> + +</templates> diff --git a/addons/website/static/src/xml/website.editor.xml b/addons/website/static/src/xml/website.editor.xml index 66b82ae7cbe..15f1fec8bbd 100644 --- a/addons/website/static/src/xml/website.editor.xml +++ b/addons/website/static/src/xml/website.editor.xml @@ -2,11 +2,11 @@ <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"> + <form class="navbar-form pull-left text-muted"> <button type="button" data-action="save" class="btn btn-primary">Save</button> - <button type="button" data-action="cancel" - class="btn">Cancel</button> + or + <a href="#" data-action="cancel">Discard</a> </form> <ul class="nav navbar-nav pull-right"> </ul> @@ -23,9 +23,10 @@ </div> <div class="modal-body"><t t-raw="__content__"/></div> <div class="modal-footer"> - <button type="button" class="btn" data-dismiss="modal" aria-hidden="true">Discard</button> + <button type="button" class="btn btn-primary save">Save</button> <button type="button" class="btn hidden wait" disabled="disabled"/> - <button type="button" class="btn btn-primary save">Save Changes</button> + or + <a href="#" data-dismiss="modal" aria-hidden="true">Discard</a> </div> </div> </div> @@ -41,23 +42,12 @@ <ul class="list-group"> <li class="list-group-item form-group active"> <h4 class="list-group-item-heading"> - <label for="link-existing" class="control-label"> - Existing page + <label for="link-page" class="control-label"> + Page </label> </h4> - <select class="existing form-control url-source" - id="link-existing"> - <option/> - </select> - </li> - <li class="list-group-item form-group"> - <h4 class="list-group-item-heading"> - <label for="link-new" class="control-label"> - New page - </label> - </h4> - <input type="text" class="form-control pages url-source" - id="link-new" placeholder="Page Name"/> + <input class="page form-control url-source" + id="link-page" type="hidden"/> </li> <li class="list-group-item form-group clearfix"> <div class="pull-right"> @@ -149,7 +139,7 @@ <div class="existing-attachments"/> </div> <div class="modal-footer"> - <button type="button" class="btn btn-default" data-dismiss="modal" aria-hidden="true">Discard</button> + <a href="#" data-dismiss="modal" aria-hidden="true">Discard</a> </div> </div> </div> @@ -181,4 +171,36 @@ </table> </t> + <t t-name="website.editor.discard"> + <div class="modal" tabindex="-1" role="dialog" aria-hidden="true"> + <div class="modal-dialog"> + <div class="modal-content"> + <div class="modal-header"> + <button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button> + <h3 class="modal-title">Discard edition</h3> + </div> + <div class="modal-body"> + <p> + If you discard the current edition, <em>all</em> + unsaved changes will be lost. + </p> + <p>You can cancel to return to the edition mode.</p> + </div> + <div class="modal-footer"> + <button type="button" class="btn btn-danger">Discard</button> + or + <a href="#" data-dismiss="modal" aria-hidden="true">Cancel</a> + </div> + </div> + </div> + </div> + </t> + + <t t-name="website.editor.hoverbutton"> + <button type="button" contenteditable="false" + t-attf-class="btn btn-primary hover-edition-button #{classes or ''}"> + <t t-esc="label"/> + </button> + </t> + </templates> diff --git a/addons/website/static/src/xml/website.menu.xml b/addons/website/static/src/xml/website.menu.xml index ea505d94b28..9277b0d4bc2 100644 --- a/addons/website/static/src/xml/website.menu.xml +++ b/addons/website/static/src/xml/website.menu.xml @@ -2,18 +2,16 @@ <t t-name="website.menu.dialog.submenu"> <li t-att-data-menu-id="submenu.id"> <div class="input-group"> - <span class="input-group-addon icon-reorder"/> + <span class="input-group-addon fa fa-bars"/> <span class="form-control" style="padding-top: 0; padding-bottom: 0;"> - <t t-esc="submenu.name"/> - <i class="pull-right icon-home" style="margin-top: 3px"/> + <span class="js_menu_label"> + <t t-esc="submenu.name"/> + </span> + <i class="pull-right fa fa-home" style="margin-top: 3px"/> </span> <span class="input-group-btn"> - <button type="button" class="btn btn-primary js_edit_menu"> - <i class="icon-edit"/> - </button> - <button type="button" class="btn btn-danger js_delete_menu"> - <i class="icon-trash"/> - </button> + <button type="button" class="btn btn-primary js_edit_menu fa fa-edit"/> + <button type="button" class="btn btn-danger js_delete_menu fa fa-trash-o"/> </span> </div> <t t-set="children" t-value="submenu.children"/> @@ -34,11 +32,11 @@ </ul> <div class="mt16"> <div class="pull-right text-muted"> - <span class="icon-indent-right"/> right indent for multi-level menus + <span class="fa fa-indent"/> right indent for multi-level menus </div> <div> <a href="#" class="js_add_menu"> - <i class="icon-plus-sign"/> Add Menu Entry + <i class="fa fa-plus-circle"/> Add Menu Entry </a> </div> </div> diff --git a/addons/website/static/src/xml/website.seo.xml b/addons/website/static/src/xml/website.seo.xml index 2c3f8cab52a..be9414ca37f 100644 --- a/addons/website/static/src/xml/website.seo.xml +++ b/addons/website/static/src/xml/website.seo.xml @@ -56,8 +56,9 @@ </section> --> </div><div class="modal-footer"> - <button data-action="discard" data-dismiss="modal" href="#" class="btn btn-default">Discard</button> - <button type="button" data-action="update" class="btn btn-primary">Apply Changes</button> + <button type="button" data-action="update" class="btn btn-primary">Save</button> + or + <a data-action="discard" data-dismiss="modal" href="#" >Discard</a> </div> </div> </div> diff --git a/addons/website/static/src/xml/website.snippets.xml b/addons/website/static/src/xml/website.snippets.xml index 587c36a71bc..ecc3bb8cc38 100644 --- a/addons/website/static/src/xml/website.snippets.xml +++ b/addons/website/static/src/xml/website.snippets.xml @@ -61,14 +61,14 @@ <div class="oe_overlay"> <div class="oe_overlay_options"> <div class="btn-group"> - <a href="#" class="btn btn-default btn-sm oe_snippet_parent" title="Select Container Block"><span class="icon-upload-alt"/></a> + <a href="#" class="btn btn-default btn-sm oe_snippet_parent" title="Select Container Block"><i class="fa fa-upload"></i></a> <div class="dropdown oe_options hidden btn-group"> <a href="#" data-toggle="dropdown" class="btn btn-primary btn-sm" title="Customize">Customize <span class="caret"/></a> <ul class="dropdown-menu" role="menu"></ul> </div> - <a href="#" class="btn btn-default btn-sm oe_snippet_move" title="Drag to Move">&nbsp; <span class="icon-move"/> &nbsp;</a> - <a href="#" class="btn btn-default btn-sm oe_snippet_clone" title="Duplicate Container"><span class="icon-copy"/></a> - <a href="#" class="btn btn-default btn-sm oe_snippet_remove" title="Remove Block"><span class="icon-remove"/></a> + <a href="#" class="btn btn-default btn-sm oe_snippet_move" title="Drag to Move">&nbsp;<i class="fa fa-arrows"></i>&nbsp;</a> + <a href="#" class="btn btn-default btn-sm oe_snippet_clone" title="Duplicate Container">&nbsp;<i class="fa fa-files-o"></i>&nbsp; </a> + <a href="#" class="btn btn-default btn-sm oe_snippet_remove" title="Remove Block">&nbsp;<i class="fa fa-trash-o"></i>&nbsp; </a> </div> </div> </div> diff --git a/addons/website/static/src/xml/website.translator.xml b/addons/website/static/src/xml/website.translator.xml index dc5f93e87bf..d1d9ab14a39 100644 --- a/addons/website/static/src/xml/website.translator.xml +++ b/addons/website/static/src/xml/website.translator.xml @@ -36,20 +36,15 @@ versions. </p> </section> - <hr/> - <section class="row"> - <div class="col-md-6"> - <button type="button" data-action="activate" class="btn btn-primary">Ok</button> - or - <a data-action="discard" data-dismiss="modal" href="#">Cancel</a> - </div> - <div class="col-md-6"> - <label> - <input type="checkbox" name="do_not_show"/> - Do not show this dialog later. - </label> - </div> - </section> + </div> + <div class="modal-footer"> + <div class="pull-left"> + <input type="checkbox" name="do_not_show"/> + Do not show this dialog later. + </div> + <button type="button" data-action="activate" class="btn btn-primary">Ok</button> + or + <a data-action="discard" data-dismiss="modal" href="#">Cancel</a> </div> </div> </div> diff --git a/addons/website/static/src/xml/website.xml b/addons/website/static/src/xml/website.xml index 1b4254ca19b..ceec9c161d8 100644 --- a/addons/website/static/src/xml/website.xml +++ b/addons/website/static/src/xml/website.xml @@ -19,7 +19,7 @@ </div> <div class="collapse navbar-collapse navbar-edit-collapse"> <ul class="nav navbar-nav navbar-right"> - <li><a data-action="show-mobile-preview" href="#"><span title="Mobile preview" class="icon-mobile-phone"/></a></li> + <li><a data-action="show-mobile-preview" href="#"><span title="Mobile preview"><i class="fa fa-mobile"/></span></a></li> <li class="divider-vertical"></li> <li><a data-action="promote-current-page" href="#"><span title="Promote page on the web">Promote</span></a></li> <li class="dropdown js_hide_on_translate"> @@ -36,7 +36,7 @@ <!-- filled in JS --> </ul> </li> - <li class="dropdown"> + <li class="dropdown js_hide_on_translate"> <a id="help-menu-button" class="dropdown-toggle" data-toggle="dropdown" href="#">Help <span class="caret"></span></a> <ul class="dropdown-menu" role="menu" id="help-menu"> <!-- filled in JS --> @@ -57,16 +57,7 @@ <h3 class="modal-title">Mobile preview</h3> </div> <div class="modal-body"> - <iframe id="mobile-viewport" class="oe_mobile_viewport" src="?mobile-preview=true"></iframe> - <script> - var $o = $('<div style="width:50px; overflow:scroll;"><div style="width:100%;"></div></div>'); - $o.appendTo("body"); - var scrollSize = 50 - $o.find("div").innerWidth(); - $o.remove(); - - $(".modal-body").css({'overflow': 'hidden', 'margin-right': '5px'}); - $(".oe_mobile_viewport").css({'width': (320 + scrollSize + 5) + 'px'}); - </script> + <iframe id="mobile-viewport" class="oe_mobile_viewport" src="?mobile-preview=true" style="width: 326px"></iframe> </div> </div> </div> @@ -81,16 +72,21 @@ <button title="Close" type="button" class="close" data-dismiss="modal">×</button> <div class="h2"><t t-esc="title"/></div> </div> - <div class="modal-body"> + <div class="modal-body" t-if="message or backend_url"> <section> <t t-esc="message"/> </section> - <section class="mt32"> - You have encountered an error. You can edit in the <a t-att-href="backend_url">backend</a> this data. + <section class="mt32" t-if="backend_url"> + <p>The web site has encountered an error.</p> + <p> + It might be possible to edit the relevant items + or fix the issue in <a t-href="#{backend_url}"> + the classic OpenERP interface</a>. + </p> </section> </div> <div class="modal-footer"> - <button type="button" data-dismiss="modal" href="#" class="close btn btn-default">Close</button> + <button type="button" data-dismiss="modal" class="btn btn-primary">Close</button> </div> </div> </div> @@ -120,8 +116,8 @@ </form> </div> <div class="modal-footer"> - <button type="button" class="btn" data-dismiss="modal" aria-hidden="true">Cancel</button> <button type="button" class="btn btn-primary">Continue</button> + <button type="button" class="btn" data-dismiss="modal" aria-hidden="true">Cancel</button> </div> </div> </div> |