From dc9f942e0a2b8ef7022be1e6fd60d683017d6af3 Mon Sep 17 00:00:00 2001
From: qsm-odoo <qsm@odoo.com>
Date: Thu, 12 Jul 2018 15:10:47 +0200
Subject: [PATCH] [FIX] website, *: restore publish buttons' design

* web

Those were broken with https://github.com/odoo/odoo/commit/9de1bc0eef6f5bfaa2a8d745431caa361ae91548
This commit takes advantage of the bug to also improve their design and
html validity a little bit.
---
 addons/web/static/src/scss/navbar.scss        | 11 +++--
 addons/web/static/src/scss/ui.scss            |  5 ---
 .../website/static/src/scss/website.ui.scss   |  2 +-
 .../static/src/xml/website.pageProperties.xml | 40 ++++++++-----------
 .../views/website_navbar_templates.xml        | 14 +++----
 5 files changed, 30 insertions(+), 42 deletions(-)

diff --git a/addons/web/static/src/scss/navbar.scss b/addons/web/static/src/scss/navbar.scss
index 79b89c7ba2d..770532d6693 100644
--- a/addons/web/static/src/scss/navbar.scss
+++ b/addons/web/static/src/scss/navbar.scss
@@ -64,6 +64,13 @@
 
             > a {
                 display: block;
+
+                &:focus, &:active, &:focus:active {
+                    outline: none;
+                }
+            }
+
+            > a, > label {
                 height: $o-navbar-height;
                 padding: 0 10px;
                 color: white;
@@ -72,10 +79,6 @@
                 &:hover {
                     background-color: $o-navbar-inverse-link-hover-bg;
                 }
-
-                &:focus, &:active, &:focus:active {
-                    outline: none;
-                }
             }
 
             &.o_extra_menu_items {
diff --git a/addons/web/static/src/scss/ui.scss b/addons/web/static/src/scss/ui.scss
index 88c79c8018a..d88f21f83a1 100644
--- a/addons/web/static/src/scss/ui.scss
+++ b/addons/web/static/src/scss/ui.scss
@@ -13,8 +13,3 @@
 [aria-hidden="true"], [aria-hidden="1"] {
     display: none!important;
 }
-
-.bg-transparent {
-    background: inherit;
-    border: none;
-}
diff --git a/addons/website/static/src/scss/website.ui.scss b/addons/website/static/src/scss/website.ui.scss
index 319dc591dbb..3f2e65f7fb3 100644
--- a/addons/website/static/src/scss/website.ui.scss
+++ b/addons/website/static/src/scss/website.ui.scss
@@ -518,7 +518,7 @@ body .modal {
 // Pages Management
 .o_page_management_info {
     .o_switch {
-        padding-top: 7px;
+        padding-top: 9px;
     }
 }
 #edit_website_pages {
diff --git a/addons/website/static/src/xml/website.pageProperties.xml b/addons/website/static/src/xml/website.pageProperties.xml
index 357ff5cbfd9..61c0c507cf4 100644
--- a/addons/website/static/src/xml/website.pageProperties.xml
+++ b/addons/website/static/src/xml/website.pageProperties.xml
@@ -89,23 +89,19 @@
                 <div class="form-group">
                     <label class="control-label col-sm-3" for="is_menu">Show in Top Menu</label>
                     <div class="col-sm-2">
-                        <a>
-                            <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/>
-                            </label>
-                        </a>
+                        <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/>
+                        </label>
                     </div>
                 </div>
                 <div class="form-group">
                     <label class="control-label col-sm-3" for="is_homepage">Use as Homepage</label>
                     <div class="col-sm-2">
-                        <a>
-                            <label class="o_switch" for="is_homepage" >
-                                <input type="checkbox" t-att-checked="widget.page.is_homepage ? true : undefined" id="is_homepage"/>
-                                <span/>
-                            </label>
-                        </a>
+                        <label class="o_switch" for="is_homepage" >
+                            <input type="checkbox" t-att-checked="widget.page.is_homepage ? true : undefined" id="is_homepage"/>
+                            <span/>
+                        </label>
                     </div>
                 </div>
                 <div class="form-group">
@@ -114,23 +110,19 @@
                         <i class="fa fa-question-circle-o" title="Hide this page from search results" role="img" aria-label="Info"></i>
                     </label>
                     <div class="col-sm-2">
-                        <a>
-                            <label class="o_switch" for="is_indexed" >
-                                <input type="checkbox" t-att-checked="widget.page.website_indexed ? true : undefined" id="is_indexed"/>
-                                <span/>
-                            </label>
-                        </a>
+                        <label class="o_switch" for="is_indexed" >
+                            <input type="checkbox" t-att-checked="widget.page.website_indexed ? true : undefined" id="is_indexed"/>
+                            <span/>
+                        </label>
                     </div>
                 </div>
                 <div class="form-group">
                     <label class="control-label col-sm-3" for="is_published">Publish</label>
                     <div class="col-sm-2">
-                        <a>
-                            <button class="o_switch js_publish_btn bg-transparent">
-                                <input type="checkbox" t-att-checked="widget.page.website_published ? true : undefined" id="is_published"/>
-                                <span/>
-                            </button>
-                        </a>
+                        <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 class="form-group">
diff --git a/addons/website/views/website_navbar_templates.xml b/addons/website/views/website_navbar_templates.xml
index 0c843139a73..c2886439db3 100644
--- a/addons/website/views/website_navbar_templates.xml
+++ b/addons/website/views/website_navbar_templates.xml
@@ -60,14 +60,12 @@
 
                 <ul class="o_menu_systray hidden-xs" groups="website.group_website_publisher">
                     <li t-if="'website_published' in main_object.fields_get()" t-attf-class="js_publish_management #{main_object.website_published and 'css_published' or 'css_unpublished'}" t-att-data-id="main_object.id" t-att-data-object="main_object._name" t-att-data-controller="publish_controller">
-                        <a>
-                            <button class="o_switch o_switch_danger js_publish_btn bg-transparent">
-                                <input type="checkbox" t-att-checked="main_object.website_published" id="id"/>
-                                <span/>
-                                <span class="css_publish">Unpublished</span>
-                                <span class="css_unpublish">Published</span>
-                            </button>
-                        </a>
+                        <label class="o_switch o_switch_danger js_publish_btn" for="id">
+                            <input type="checkbox" t-att-checked="main_object.website_published" id="id"/>
+                            <span/>
+                            <span class="css_publish">Unpublished</span>
+                            <span class="css_unpublish">Published</span>
+                        </label>
                     </li>
                     <!-- Mobile preview -->
                     <li class="o_mobile_preview" id="mobile-menu">