From de214e37429213fe9f329ff3f11885fee3e271c4 Mon Sep 17 00:00:00 2001
From: qsm-odoo <qsm@odoo.com>
Date: Thu, 15 Mar 2018 14:06:31 +0100
Subject: [REF] *: BS4, 'img-responsive' -> 'img-fluid'

---
 addons/web_settings_dashboard/static/src/xml/dashboard.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'addons/web_settings_dashboard/static/src/xml/dashboard.xml')

diff --git a/addons/web_settings_dashboard/static/src/xml/dashboard.xml b/addons/web_settings_dashboard/static/src/xml/dashboard.xml
index a98a557d66d..35fff93174f 100644
--- a/addons/web_settings_dashboard/static/src/xml/dashboard.xml
+++ b/addons/web_settings_dashboard/static/src/xml/dashboard.xml
@@ -148,7 +148,7 @@
             <div class="text-center o_web_settings_dashboard_enterprise">
                 <div class="text-center o_web_settings_dashboard_header">Odoo Enterprise</div>
                 <div class="mb16"><a href="http://www.odoo.com/editions" target="_blank">Get more features with the Enterprise Edition!</a></div>
-                <div><img class="img img-responsive" t-att-src='_s + "/web/static/src/img/enterprise_upgrade.jpg"' alt="Upgrade to enterprise"/></div>
+                <div><img class="img img-fluid" t-att-src='_s + "/web/static/src/img/enterprise_upgrade.jpg"' alt="Upgrade to enterprise"/></div>
                 <div>
                     <a class="btn btn-primary btn-block o_confirm_upgrade" role="button"><strong>Upgrade Now</strong></a>
                 </div>
-- 
cgit v1.2.3


From ed1b18f10348244ce26b8b27edbd59d91cee7772 Mon Sep 17 00:00:00 2001
From: qsm-odoo <qsm@odoo.com>
Date: Wed, 16 May 2018 12:24:30 +0200
Subject: [REF] *: BS4, adapt col-related classes

col-lg-* -> col-xl-*
col-md-* -> col-lg-*
col-sm-* -> col-md-*
col-xs-* -> col-*

col-lg-offset-* -> offset-xl-*
col-md-offset-* -> offset-lg-*
col-sm-offset-* -> offset-md-*
col-xs-offset-* -> offset-*

col-lg-pull-* -> order-xl-1
col-md-pull-* -> order-lg-1
col-sm-pull-* -> order-md-1
col-xs-pull-* -> order-1

col-lg-push-* -> order-xl-2
col-md-push-* -> order-lg-2
col-sm-push-* -> order-md-2
col-xs-push-* -> order-2
---
 .../web_settings_dashboard/static/src/xml/dashboard.xml  | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

(limited to 'addons/web_settings_dashboard/static/src/xml/dashboard.xml')

diff --git a/addons/web_settings_dashboard/static/src/xml/dashboard.xml b/addons/web_settings_dashboard/static/src/xml/dashboard.xml
index 35fff93174f..55d191fe3c1 100644
--- a/addons/web_settings_dashboard/static/src/xml/dashboard.xml
+++ b/addons/web_settings_dashboard/static/src/xml/dashboard.xml
@@ -5,16 +5,16 @@
         <div class="container-fluid o_web_settings_dashboard">
             <div class="row">
                 <div class="o_web_settings_dashboard_enterprise"/>
-                <div class="col-sm-12 o_web_settings_dashboard_container" >
-                   <div class="col-lg-4 col-md-4 col-sm-12 col-xs-12 o_web_settings_dashboard_col">
+                <div class="col-md-12 o_web_settings_dashboard_container" >
+                   <div class="col-xl-4 col-lg-4 col-md-12 col-12 o_web_settings_dashboard_col">
                         <div class="text-center o_web_settings_dashboard_apps"></div>
                         <div class="text-center o_web_settings_dashboard_translations"></div>
                     </div>
-                   <div class="col-lg-4 col-md-4 col-sm-12 col-xs-12 o_web_settings_dashboard_col">
+                   <div class="col-xl-4 col-lg-4 col-md-12 col-12 o_web_settings_dashboard_col">
                         <div class="text-center o_web_settings_dashboard_invitations"></div>
                         <div class="text-center o_web_settings_dashboard_company"></div>
                     </div>
-                   <div class="col-lg-4 col-md-4 col-sm-12 col-xs-12 o_web_settings_dashboard_col">
+                   <div class="col-xl-4 col-lg-4 col-md-12 col-12 o_web_settings_dashboard_col">
                         <div class="text-center o_web_settings_dashboard_share"></div>
                     </div>
                 </div>
@@ -102,9 +102,9 @@
                 </small>
             </div>
             <div class="row mt16">
-                <div class="col-xs-4"><a href="#" aria-label="Twitter" title="Twitter"><i class="fa fa-twitter-square fa-4x tw_share"/></a></div>
-                <div class="col-xs-4"><a href="#" aria-label="Facebook" title="Facebook"><i class="fa fa-facebook-square fa-4x fb_share"/></a></div>
-                <div class="col-xs-4"><a href="#" aria-label="LinkedIn" title="LinkedIn"><i class="fa fa-linkedin-square fa-4x li_share"/></a></div>
+                <div class="col-4"><a href="#" aria-label="Twitter" title="Twitter"><i class="fa fa-twitter-square fa-4x tw_share"/></a></div>
+                <div class="col-4"><a href="#" aria-label="Facebook" title="Facebook"><i class="fa fa-facebook-square fa-4x fb_share"/></a></div>
+                <div class="col-4"><a href="#" aria-label="LinkedIn" title="LinkedIn"><i class="fa fa-linkedin-square fa-4x li_share"/></a></div>
             </div>
             <hr/>
             <t t-set="server_version" t-value="widget.data.server_version"/>
@@ -129,7 +129,7 @@
             </div>
             <hr/>
             <div class="row">
-                <div class="col-md-12">
+                <div class="col-lg-12">
                     <a t-if="debug != true" class="oe_activate_debug_mode pull-right" href="?debug" >Activate the developer mode</a>
                     <br t-if="debug != true"/>
                     <a t-if="debug != 'assets'" class="oe_activate_debug_mode pull-right" href="?debug=assets" >Activate the developer mode (with assets)</a>
-- 
cgit v1.2.3


From 7285e152c11ea8cc359e0710a24cf14ff6675d39 Mon Sep 17 00:00:00 2001
From: qsm-odoo <qsm@odoo.com>
Date: Thu, 24 May 2018 17:59:12 +0200
Subject: [REF] *: BS4, adapt the badge component structure

The '.badge' elements must now also use the 'badge-pill' class to get
the same style as before as '.badge' elements without it are meant to
replace the old 'label' component.
---
 addons/web_settings_dashboard/static/src/xml/dashboard.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'addons/web_settings_dashboard/static/src/xml/dashboard.xml')

diff --git a/addons/web_settings_dashboard/static/src/xml/dashboard.xml b/addons/web_settings_dashboard/static/src/xml/dashboard.xml
index 55d191fe3c1..d718b314d67 100644
--- a/addons/web_settings_dashboard/static/src/xml/dashboard.xml
+++ b/addons/web_settings_dashboard/static/src/xml/dashboard.xml
@@ -48,7 +48,7 @@
     </t>
 
     <t t-name="EmailBadge">
-        <span t-foreach="emails" t-as="email" class="badge">
+        <span t-foreach="emails" t-as="email" class="badge badge-pill">
             <span class="o_badge_text">
                 <t t-esc='email'/>
             </span>
@@ -81,7 +81,7 @@
                 <t t-if="pending_users.length">
                     <p><strong>Pending invitations:</strong></p>
                     <span t-foreach="pending_users" t-as="pending">
-                        <a href="#" class="badge o_web_settings_dashboard_user" t-att-data-user-id="pending[0]"> <t t-esc="pending[1]"/> </a>
+                        <a href="#" class="badge badge-pill o_web_settings_dashboard_user" t-att-data-user-id="pending[0]"> <t t-esc="pending[1]"/> </a>
                     </span>
                     <t t-if="pending_users.length &lt; widget.data.pending_count">
                         <br/>
-- 
cgit v1.2.3


From d48b8593dde7c6adf679359e2dd64dee288e9544 Mon Sep 17 00:00:00 2001
From: qsm-odoo <qsm@odoo.com>
Date: Fri, 25 May 2018 17:00:00 +0200
Subject: [REF] *: BS4, 'pull-left/right' -> 'float-left/right'

---
 addons/web_settings_dashboard/static/src/xml/dashboard.xml | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'addons/web_settings_dashboard/static/src/xml/dashboard.xml')

diff --git a/addons/web_settings_dashboard/static/src/xml/dashboard.xml b/addons/web_settings_dashboard/static/src/xml/dashboard.xml
index d718b314d67..205aa73e253 100644
--- a/addons/web_settings_dashboard/static/src/xml/dashboard.xml
+++ b/addons/web_settings_dashboard/static/src/xml/dashboard.xml
@@ -40,8 +40,8 @@
                 <a class="btn btn-primary btn-block o_browse_apps" role="button"><strong>Browse Apps</strong></a>
             </div>
             <div class="o_web_settings_dashboard_pills">
-                <a href="https://www.odoo.com/apps/modules" target="_blank" class="pull-left"><i class="fa fa-rocket fa-2x text-muted"/> App store</a>
-                <a href="https://www.odoo.com/apps/themes" target="_blank" class="pull-right"><i class="fa fa-picture-o fa-2x text-muted"/> Theme store</a>
+                <a href="https://www.odoo.com/apps/modules" target="_blank" class="float-left"><i class="fa fa-rocket fa-2x text-muted"/> App store</a>
+                <a href="https://www.odoo.com/apps/themes" target="_blank" class="float-right"><i class="fa fa-picture-o fa-2x text-muted"/> Theme store</a>
             </div>
             <div class="clearfix"/>
         </div>
@@ -130,13 +130,13 @@
             <hr/>
             <div class="row">
                 <div class="col-lg-12">
-                    <a t-if="debug != true" class="oe_activate_debug_mode pull-right" href="?debug" >Activate the developer mode</a>
+                    <a t-if="debug != true" class="oe_activate_debug_mode float-right" href="?debug" >Activate the developer mode</a>
                     <br t-if="debug != true"/>
-                    <a t-if="debug != 'assets'" class="oe_activate_debug_mode pull-right" href="?debug=assets" >Activate the developer mode (with assets)</a>
+                    <a t-if="debug != 'assets'" class="oe_activate_debug_mode float-right" href="?debug=assets" >Activate the developer mode (with assets)</a>
                     <br t-if="debug != 'assets'"/>
-                    <a t-if="debug != false" class="oe_activate_debug_mode pull-right" href="/web" >Deactivate the developer mode</a>
+                    <a t-if="debug != false" class="oe_activate_debug_mode float-right" href="/web" >Deactivate the developer mode</a>
                     <br t-if="debug != false"/>
-                    <a t-if="(debug) and !(demo_active)" class="oe_activate_debug_mode pull-right o_web_settings_dashboard_force_demo" href="#">Load demo data</a>
+                    <a t-if="(debug) and !(demo_active)" class="oe_activate_debug_mode float-right o_web_settings_dashboard_force_demo" href="#">Load demo data</a>
                 </div>
             </div>
         </div>
-- 
cgit v1.2.3


From e1a734df3af3a44ab2ad592af35ba8d871288e86 Mon Sep 17 00:00:00 2001
From: qsm-odoo <qsm@odoo.com>
Date: Fri, 13 Jul 2018 12:41:49 +0200
Subject: [FIX] web_settings_dashboard, *: try restoring settings dashboard
 design

* iap

The layout is still not ok and should be improved but this commit at least
make it functional.
---
 .../static/src/xml/dashboard.xml                   | 93 ++++++++++------------
 1 file changed, 41 insertions(+), 52 deletions(-)

(limited to 'addons/web_settings_dashboard/static/src/xml/dashboard.xml')

diff --git a/addons/web_settings_dashboard/static/src/xml/dashboard.xml b/addons/web_settings_dashboard/static/src/xml/dashboard.xml
index 205aa73e253..7dd037a465f 100644
--- a/addons/web_settings_dashboard/static/src/xml/dashboard.xml
+++ b/addons/web_settings_dashboard/static/src/xml/dashboard.xml
@@ -2,21 +2,18 @@
 
 <templates xml:space="preserve">
     <t t-name="DashboardMain">
-        <div class="container-fluid o_web_settings_dashboard">
-            <div class="row">
-                <div class="o_web_settings_dashboard_enterprise"/>
-                <div class="col-md-12 o_web_settings_dashboard_container" >
-                   <div class="col-xl-4 col-lg-4 col-md-12 col-12 o_web_settings_dashboard_col">
-                        <div class="text-center o_web_settings_dashboard_apps"></div>
-                        <div class="text-center o_web_settings_dashboard_translations"></div>
-                    </div>
-                   <div class="col-xl-4 col-lg-4 col-md-12 col-12 o_web_settings_dashboard_col">
-                        <div class="text-center o_web_settings_dashboard_invitations"></div>
-                        <div class="text-center o_web_settings_dashboard_company"></div>
-                    </div>
-                   <div class="col-xl-4 col-lg-4 col-md-12 col-12 o_web_settings_dashboard_col">
-                        <div class="text-center o_web_settings_dashboard_share"></div>
-                    </div>
+        <div class="container-fluid py-2 o_web_settings_dashboard">
+            <div class="form-row">
+               <div class="col-12 col-lg-4 o_web_settings_dashboard_col">
+                    <div class="o_web_settings_dashboard_apps"></div>
+                    <div class="o_web_settings_dashboard_translations"></div>
+                </div>
+               <div class="col-12 col-lg-4 o_web_settings_dashboard_col">
+                    <div class="o_web_settings_dashboard_invitations"></div>
+                    <div class="o_web_settings_dashboard_company"></div>
+                </div>
+               <div class="col-12 col-lg-4 o_web_settings_dashboard_col">
+                    <div class="o_web_settings_dashboard_share"></div>
                 </div>
             </div>
         </div>
@@ -37,11 +34,11 @@
                 </t>
             </div>
             <div>
-                <a class="btn btn-primary btn-block o_browse_apps" role="button"><strong>Browse Apps</strong></a>
+                <a href="#" class="btn btn-primary btn-block o_browse_apps" role="button"><strong>Browse Apps</strong></a>
             </div>
-            <div class="o_web_settings_dashboard_pills">
-                <a href="https://www.odoo.com/apps/modules" target="_blank" class="float-left"><i class="fa fa-rocket fa-2x text-muted"/> App store</a>
-                <a href="https://www.odoo.com/apps/themes" target="_blank" class="float-right"><i class="fa fa-picture-o fa-2x text-muted"/> Theme store</a>
+            <div class="d-flex mt-2 o_web_settings_dashboard_pills">
+                <a href="https://www.odoo.com/apps/modules" target="_blank" class="flex-grow-1 w-25"><i class="fa fa-lg fa-rocket text-muted"/> App store</a>
+                <a href="https://www.odoo.com/apps/themes" target="_blank" class="flex-grow-1 w-25"><i class="fa fa-lg fa-picture-o text-muted"/> Theme store</a>
             </div>
             <div class="clearfix"/>
         </div>
@@ -110,48 +107,40 @@
             <t t-set="server_version" t-value="widget.data.server_version"/>
             <t t-set="debug" t-value="widget.data.debug"/>
             <t t-set="demo_active" t-value="widget.data.demo_active"/>
-            <div class="row">
-                <div class="text-center">
-                    <div class="user-heading">
-                        <h3>
-                            Odoo <t t-esc="server_version"/>
-                            (Community Edition)
-                        </h3>
-                    </div>
-                    <div>
-                        <div class="tab-content">
-                            <div role="tabpanel" id="settings" class="tab-pane active text-muted text-center o_web_settings_dashboard_compact_subtitle">
-                                <small>Copyright © 2004-2016 <a target="_blank" href="https://www.odoo.com" style="text-decoration: underline;">Odoo S.A.</a> <a target="_blank" href="http://www.gnu.org/licenses/lgpl.html" style="text-decoration: underline;">GNU LGPL Licensed</a></small>
-                            </div>
+            <div class="text-center">
+                <div class="user-heading">
+                    <h3>
+                        Odoo <t t-esc="server_version"/>
+                        (Community Edition)
+                    </h3>
+                </div>
+                <div>
+                    <div class="tab-content">
+                        <div role="tabpanel" id="settings" class="tab-pane active text-muted text-center o_web_settings_dashboard_compact_subtitle">
+                            <small>Copyright © 2004-2016 <a target="_blank" href="https://www.odoo.com" style="text-decoration: underline;">Odoo S.A.</a> <a target="_blank" href="http://www.gnu.org/licenses/lgpl.html" style="text-decoration: underline;">GNU LGPL Licensed</a></small>
                         </div>
                     </div>
                 </div>
             </div>
             <hr/>
-            <div class="row">
-                <div class="col-lg-12">
-                    <a t-if="debug != true" class="oe_activate_debug_mode float-right" href="?debug" >Activate the developer mode</a>
-                    <br t-if="debug != true"/>
-                    <a t-if="debug != 'assets'" class="oe_activate_debug_mode float-right" href="?debug=assets" >Activate the developer mode (with assets)</a>
-                    <br t-if="debug != 'assets'"/>
-                    <a t-if="debug != false" class="oe_activate_debug_mode float-right" href="/web" >Deactivate the developer mode</a>
-                    <br t-if="debug != false"/>
-                    <a t-if="(debug) and !(demo_active)" class="oe_activate_debug_mode float-right o_web_settings_dashboard_force_demo" href="#">Load demo data</a>
-                </div>
-            </div>
+            <a t-if="debug != true" class="oe_activate_debug_mode float-right" href="?debug" >Activate the developer mode</a>
+            <br t-if="debug != true"/>
+            <a t-if="debug != 'assets'" class="oe_activate_debug_mode float-right" href="?debug=assets" >Activate the developer mode (with assets)</a>
+            <br t-if="debug != 'assets'"/>
+            <a t-if="debug != false" class="oe_activate_debug_mode float-right" href="/web" >Deactivate the developer mode</a>
+            <br t-if="debug != false"/>
+            <a t-if="(debug) and !(demo_active)" class="oe_activate_debug_mode float-right o_web_settings_dashboard_force_demo" href="#">Load demo data</a>
         </div>
     </t>
 
     <t t-name="DashboardEnterprise">
         <hr class="mt16"/>
         <div class="text-center o_web_settings_dashboard_enterprise">
-            <div class="text-center o_web_settings_dashboard_enterprise">
-                <div class="text-center o_web_settings_dashboard_header">Odoo Enterprise</div>
-                <div class="mb16"><a href="http://www.odoo.com/editions" target="_blank">Get more features with the Enterprise Edition!</a></div>
-                <div><img class="img img-fluid" t-att-src='_s + "/web/static/src/img/enterprise_upgrade.jpg"' alt="Upgrade to enterprise"/></div>
-                <div>
-                    <a class="btn btn-primary btn-block o_confirm_upgrade" role="button"><strong>Upgrade Now</strong></a>
-                </div>
+            <div class="o_web_settings_dashboard_header">Odoo Enterprise</div>
+            <div class="mb16"><a href="http://www.odoo.com/editions" target="_blank">Get more features with the Enterprise Edition!</a></div>
+            <div><img class="img img-fluid" t-att-src='_s + "/web/static/src/img/enterprise_upgrade.jpg"' alt="Upgrade to enterprise"/></div>
+            <div>
+                <a href="#" class="btn btn-primary btn-block o_confirm_upgrade" role="button"><strong>Upgrade Now</strong></a>
             </div>
         </div>
     </t>
@@ -168,7 +157,7 @@
                 </small>
             </div>
             <div class="mt16">
-                <a role="button" class="btn btn-primary btn-block o_load_translations"><strong>Load a Translation</strong></a>
+                <a href="#" role="button" class="btn btn-primary btn-block o_load_translations"><strong>Load a Translation</strong></a>
             </div>
         </div>
     </t>
@@ -185,7 +174,7 @@
                 </small>
             </div>
             <div class="mt16">
-                <a role="button" class="btn btn-primary btn-block o_setup_company"><strong>Set Up</strong></a>
+                <a href="#" role="button" class="btn btn-primary btn-block o_setup_company"><strong>Set Up</strong></a>
             </div>
         </div>
     </t>
-- 
cgit v1.2.3