diff options
| author | Quentin (OpenERP) <qdp-launchpad@openerp.com> | 2014-03-26 16:27:51 +0100 |
|---|---|---|
| committer | Quentin (OpenERP) <qdp-launchpad@openerp.com> | 2014-03-26 16:27:51 +0100 |
| commit | e0b27b4ee8e2d26eeae98a4dbc69a3485f39a8a8 (patch) | |
| tree | a3887e48d1bdeaf27b04c5c4e636e677b9e1c586 /addons/website/static/src/xml/website.snippets.xml | |
| parent | 78457a17ea7175c02baf823c296b5cefe1a52a03 (diff) | |
| parent | 0d4d9af5f4b7ca695e33af370848350b437c132e (diff) | |
[MERGE] merged trunk up to revision 9251
bzr revid: qdp-launchpad@openerp.com-20140326152751-b6bo0fawrzmd71f0
Diffstat (limited to 'addons/website/static/src/xml/website.snippets.xml')
| -rw-r--r-- | addons/website/static/src/xml/website.snippets.xml | 19 |
1 files changed, 11 insertions, 8 deletions
diff --git a/addons/website/static/src/xml/website.snippets.xml b/addons/website/static/src/xml/website.snippets.xml index d73e0c3934a..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 class='oe_handle e'></div> - <div class='oe_handle w'></div> - <div class='oe_handle size'><div class="oe_handle_button size">Resize</div><div class="oe_border"/></div> - <div class='oe_handle s'></div> - </div> <div class='oe_snippet_thumbnail'>Margin resize</div> </div> |