diff options
| author | Vidhin Mehta (OpenERP) <vme@tinyerp.com> | 2014-03-24 10:51:06 +0530 |
|---|---|---|
| committer | Vidhin Mehta (OpenERP) <vme@tinyerp.com> | 2014-03-24 10:51:06 +0530 |
| commit | 8ad6ea8e76d8ed72b71ecf92da4894a67736c2d2 (patch) | |
| tree | 9f7fce6be84279a02bb253efc5b1a994b8551b6b /addons/website/static/src/xml | |
| parent | d43c76de65e75aa7fc18f7c8d358d5cb4e7ced0d (diff) | |
| parent | 54d8cd1e866d1a6dc0b594588a6d900d6404728c (diff) | |
[MERGE]trunk.
bzr revid: vme@tinyerp.com-20140324052106-8671bunhx2of7ysa
Diffstat (limited to 'addons/website/static/src/xml')
| -rw-r--r-- | addons/website/static/src/xml/website.editor.xml | 4 | ||||
| -rw-r--r-- | addons/website/static/src/xml/website.snippets.xml | 19 |
2 files changed, 13 insertions, 10 deletions
diff --git a/addons/website/static/src/xml/website.editor.xml b/addons/website/static/src/xml/website.editor.xml index 1010ec05127..6edf553b7cb 100644 --- a/addons/website/static/src/xml/website.editor.xml +++ b/addons/website/static/src/xml/website.editor.xml @@ -6,7 +6,7 @@ <button type="button" data-action="save" class="btn btn-primary">Save</button> or - <a href="#" data-action="cancel">Discard</a> + <a href="#" data-action="cancel" class="btn btn-link">Discard</a> </form> <ul class="nav navbar-nav pull-right"> </ul> @@ -97,7 +97,7 @@ target="fileframe" class="col-sm-8"> <div class="text-center"> - <input type="file" name="upload" style="position: absolute; opacity: 0; width: 1px; height: 1px;"/> + <input type="file" name="upload" accept="image/*" style="position: absolute; opacity: 0; width: 1px; height: 1px;"/> <button type="button" class="btn btn-primary btn-lg filepicker"> Upload an image from your computer </button> diff --git a/addons/website/static/src/xml/website.snippets.xml b/addons/website/static/src/xml/website.snippets.xml index ae109139e3c..c5cf94d4791 100644 --- a/addons/website/static/src/xml/website.snippets.xml +++ b/addons/website/static/src/xml/website.snippets.xml @@ -22,7 +22,7 @@ <t t-name="website.snippet_overlay"> <div class="oe_overlay"> - <div class="oe_overlay_options"> + <div class="oe_overlay_options" contentEditable="false"> <div class="btn-group"> <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"> @@ -34,6 +34,16 @@ <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 class='oe_handles'> + <div class='oe_handle n readonly'><div></div></div> + <div class='oe_handle e readonly'><div></div></div> + <div class='oe_handle w readonly'><div></div></div> + <div class='oe_handle size readonly'> + <div class="oe_handle_button size">Resize</div> + <div class="oe_handle_button auto_size">x</div> + </div> + <div class='oe_handle s readonly'><div></div></div> + </div> </div> </t> @@ -45,13 +55,6 @@ <div t-name="website.snippets.resize" data-snippet-id='resize'> <!-- custom data for the widget --> - <div class='oe_handles'> - <div class='oe_handle n'><div></div></div> - <div class='oe_handle e'><div></div></div> - <div class='oe_handle w'><div></div></div> - <div class='oe_handle size'><div class="oe_handle_button size">Resize</div></div> - <div class='oe_handle s'><div></div></div> - </div> <div class='oe_snippet_thumbnail'>Margin resize</div> </div> |