[MERGE] forward port branch saas-11 up to 7ae5121

2016-07-25 17:17:15 +02:00
parent 77d231546d 7ae5121877
commit cfb0c0dead
948 changed files with 25498 additions and 17349 deletions
@@ -49,16 +49,4 @@
        </div>
    </div>
 </div>
-<t t-name="website.contentMenu.dialog.add" t-extend="web_editor.dialog.link">
-    <t t-jquery="t[t-set='title']" t-operation="inner">
-        <t t-if="!widget.update_mode">Add Menu Entry</t>
-        <t t-if="widget.update_mode">Edit Menu Entry</t>
-    </t>
-    <t t-jquery="form > div.form-horizontal" t-operation="replace"/>
-    <t t-jquery="form > div.list-group:first label" t-operation="replace">
-        <label for="link-new" class="control-label">
-            Menu Label
-        </label>
-    </t>
-</t>
 </templates>