[MERGE] website: add multi-websites support

2 files changed, 37 insertions, 12 deletions

diff --git a/addons/website/static/src/xml/website.backend.xml b/addons/website/static/src/xml/website.backend.xml
index a1a0d24edb1..b4f2b9c6029 100644
--- a/addons/website/static/src/xml/website.backend.xml
+++ b/addons/website/static/src/xml/website.backend.xml
@@ -53,12 +53,14 @@
 
     <div t-name="website.ga_dialog_content">
         Your Tracking ID: <input type="text" name="ga_analytics_key" placeholder="UA-XXXXXXXX-Y" t-att-value="ga_analytics_key" style="width: 100%"></input>
-        <a href="https://www.odoo.com/documentation/user/online/website/optimize/google_analytics.html" class="fa fa-arrow-right" target="_blank">
+        <a href="https://www.odoo.com/documentation/user/online/website/optimize/google_analytics.html" target="_blank">
+            <i class="fa fa-arrow-right"/>
             How to get my Tracking ID
         </a>
         <br/><br/>
         Your Client ID: <input type="text" name="ga_client_id" t-att-value="ga_key" style="width: 100%"></input>
-        <a href="https://www.odoo.com/documentation/user/online/website/optimize/google_analytics_dashboard.html" class="fa fa-arrow-right" target="_blank">
+        <a href="https://www.odoo.com/documentation/user/online/website/optimize/google_analytics_dashboard.html" target="_blank">
+            <i class="fa fa-arrow-right"/>
             How to get my Client ID
         </a>
     </div>
@@ -70,6 +72,14 @@
             <button class="btn btn-secondary js_date_range" data-date="month">Last Month</button>
             <button class="btn btn-secondary js_date_range" data-date="year">Last Year</button>
         </div>
+        <div class="btn-group pull-right" style="margin-right: 20px;">
+            <t t-foreach="widget.websites" t-as="website">
+                <button t-attf-class="btn btn-secondary js_website #{website.selected ? 'active' : ''}"
+                        t-att-data-website-id="website.id">
+                    <t t-esc="website.name"/>
+                </button>
+            </t>
+        </div>
     </t>
 
     <t t-name="website.SalesChartTooltip">
diff --git a/addons/website/static/src/xml/website.pageProperties.xml b/addons/website/static/src/xml/website.pageProperties.xml
index 7f3b4cbfc64..cf4719d5951 100644
--- a/addons/website/static/src/xml/website.pageProperties.xml
+++ b/addons/website/static/src/xml/website.pageProperties.xml
@@ -45,7 +45,7 @@
             <li class="nav-item"><a aria-controls="advances_page_info" role="tab" data-toggle="tab" class="nav-link" href="#advances_page_info">Publish</a></li>
         </ul>
         <div class="tab-content mt16">
-            <div role="tabpanel" id="basic_page_info" class="tab-pane fade in active">
+            <div role="tabpanel" id="basic_page_info" class="tab-pane fade show active">
                 <div class="form-group row">
                     <label class="col-form-label col-md-3" for="page_name">Page Name</label>
                     <div class="col-md-9">
@@ -89,8 +89,8 @@
             </div>
             <div role="tabpanel" id="advances_page_info" class="tab-pane fade">
                 <div class="form-group row">
-                    <label class="col-form-label col-md-3" for="is_menu">Show in Top Menu</label>
-                    <div class="col-md-2">
+                    <label class="control-label col-md-5" for="is_menu">Show in Top Menu</label>
+                    <div class="col-sm-2">
                         <label class="o_switch" for="is_menu" >
                             <input type="checkbox" t-att-checked="widget.page.menu_ids.length > 0 ? true : undefined" id="is_menu"/>
                             <span/>
@@ -98,8 +98,8 @@
                     </div>
                 </div>
                 <div class="form-group row">
-                    <label class="col-form-label col-md-3" for="is_homepage">Use as Homepage</label>
-                    <div class="col-md-2">
+                    <label class="control-label col-md-5" for="is_homepage">Use as Homepage</label>
+                    <div class="col-sm-2">
                         <label class="o_switch" for="is_homepage" >
                             <input type="checkbox" t-att-checked="widget.page.is_homepage ? true : undefined" id="is_homepage"/>
                             <span/>
@@ -107,7 +107,7 @@
                     </div>
                 </div>
                 <div class="form-group row">
-                    <label class="col-form-label col-md-3" for="is_indexed">
+                    <label class="control-label col-md-5" for="is_indexed">
                         Indexed
                         <i class="fa fa-question-circle-o" title="Hide this page from search results" role="img" aria-label="Info"></i>
                     </label>
@@ -119,17 +119,32 @@
                     </div>
                 </div>
                 <div class="form-group row">
-                    <label class="col-form-label col-md-3" for="is_published">Publish</label>
-                    <div class="col-md-2">
+                    <label class="control-label col-md-5" for="is_published">Publish</label>
+                    <div class="col-sm-2">
                         <label class="o_switch js_publish_btn" for="is_published">
                             <input type="checkbox" t-att-checked="widget.page.website_published ? true : undefined" id="is_published"/>
                             <span/>
                         </label>
                     </div>
                 </div>
+                <div t-if='widget.page.website_id' class="form-group row" id="website_restriction">
+                    <!-- TODO hide with multi-website group -->
+                    <label class="control-label col-md-5" for="share_page_info">
+                        Share this page
+                        <i class="fa fa-question-circle-o" title="When enabled, this page will be shared between all the websites. This change is not reversible."></i>
+                    </label>
+                    <div class="col-md-2">
+                        <a>
+                            <label class="o_switch" for="share_page_info" >
+                                <input type="checkbox" t-att-checked="widget.page.website_id ? undefined : true" id="share_page_info"/>
+                                <span/>
+                            </label>
+                        </a>
+                    </div>
+                </div>
                 <div class="form-group row">
-                    <label class="col-form-label col-md-3" for="date_publish">Publishing Date</label>
-                    <div class="col-md-9">
+                    <label class="control-label col-md-5" for="date_publish">Publishing Date</label>
+                    <div class="col-md-7">
                         <div class='input-group date' id='date_publish_container'>
                             <input type='text' class="form-control" name="date_publish" id="date_publish" />
                             <div class="input-group-append">