Merge ba30954 into 8590118

OCA · Jul 30, 2019 · ea95000 · ea95000
2 parents 8590118 + ba30954
commit ea95000
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 31 deletions.
diff --git a/website_legal_page/__manifest__.py b/website_legal_page/__manifest__.py
@@ -5,7 +5,7 @@
 {
     'name': "Website Legal Page",
     'category': 'Website',
-    'version': '12.0.1.0.0',
+    'version': '12.0.1.0.1',
     'depends': [
         'website',
     ],

diff --git a/website_legal_page/views/website_legal.xml b/website_legal_page/views/website_legal.xml
@@ -10,13 +10,7 @@
         </xpath>
     </template>
 
-
-    <record id="advice" model="ir.ui.view">
-        <field name="name">Legal Advice</field>
-        <field name="type">qweb</field>
-        <field name="key">website.advice</field>
-        <field name="arch" type="xml">
-            <t name="About us" t-name="website.aboutus">
+    <template id="advice">
                 <t t-call="website.layout">
                     <div id="wrap">
                         <div class="oe_structure">
@@ -93,9 +87,7 @@
                         <div class="oe_structure"/>
                     </div>
                 </t>
-            </t>
-        </field>
-    </record>
+    </template>
 
 
     <record id="advise_page" model="website.page">

diff --git a/website_legal_page/views/website_privacy.xml b/website_legal_page/views/website_privacy.xml
@@ -12,13 +12,7 @@
         </xpath>
     </template>
 
-
-    <record id="privacy-policy" model="ir.ui.view">
-        <field name="name">Legal Advice</field>
-        <field name="type">qweb</field>
-        <field name="key">website.advice</field>
-        <field name="arch" type="xml">
-            <t name="About us" t-name="website.aboutus">
+    <template id="privacy-policy">
                 <t t-call="website.layout">
                     <div id="wrap">
                         <div class="oe_structure">
@@ -231,9 +225,7 @@
                         </div>
                     </div>
                 </t>
-            </t>
-        </field>
-    </record>
+    </template>
 
 
     <record id="privacy_page" model="website.page">

diff --git a/website_legal_page/views/website_terms.xml b/website_legal_page/views/website_terms.xml
@@ -12,13 +12,7 @@
         </xpath>
     </template>
 
-
-    <record id="terms-of-use" model="ir.ui.view">
-        <field name="name">Legal Advice</field>
-        <field name="type">qweb</field>
-        <field name="key">website.advice</field>
-        <field name="arch" type="xml">
-            <t name="About us" t-name="website.aboutus">
+    <template id="terms-of-use" name="Terms">
                 <t t-call="website.layout">
                     <div id="wrap">
                         <div class="oe_structure">
@@ -242,9 +236,7 @@
                         </div>
                     </div>
                 </t>
-            </t>
-        </field>
-    </record>
+    </template>
 
 
     <record id="terms_page" model="website.page">