From d95305b7a433113cb33e58010a6718cc7504fcf0 Mon Sep 17 00:00:00 2001
From: Christophe Matthieu <chm@openerp.com>
Date: Mon, 2 Sep 2013 16:14:54 +0200
Subject: [PATCH] [IMP] website: publish button layout

bzr revid: chm@openerp.com-20130902141454-z3rec943y5tjcg92
---
 addons/website/static/src/css/website.css  | 20 ++++++++++++++++++++
 addons/website/static/src/css/website.sass | 19 +++++++++++++++++++
 addons/website/static/src/js/website.js    | 14 +++++---------
 addons/website/views/views.xml             |  6 +++---
 4 files changed, 47 insertions(+), 12 deletions(-)

diff --git a/addons/website/static/src/css/website.css b/addons/website/static/src/css/website.css
index bd06423baf5..80644222c1f 100644
--- a/addons/website/static/src/css/website.css
+++ b/addons/website/static/src/css/website.css
@@ -161,3 +161,23 @@ ul.nav-stacked > li > a {
 #customize-menu .dropdown-header {
   text-transform: uppercase;
 }
+
+/* ---- PUBLISH BUTTON ---- */
+a.css_unpublish .css_unpublish {
+  display: none;
+}
+a.css_unpublish:hover .css_unpublish {
+  display: inline;
+}
+a.css_unpublish:hover .css_publish {
+  display: none;
+}
+a.css_publish .css_publish {
+  display: none;
+}
+a.css_publish:hover .css_publish {
+  display: inline;
+}
+a.css_publish:hover .css_unpublish {
+  display: none;
+}
diff --git a/addons/website/static/src/css/website.sass b/addons/website/static/src/css/website.sass
index c0777f024d2..65e530e6ed9 100644
--- a/addons/website/static/src/css/website.sass
+++ b/addons/website/static/src/css/website.sass
@@ -125,3 +125,22 @@ ul.nav-stacked > li > a
 #customize-menu
     .dropdown-header
         text-transform: uppercase
+
+/* ---- PUBLISH BUTTON ---- */
+a
+    &.css_unpublish
+        .css_unpublish
+            display: none
+        &:hover
+            .css_unpublish
+                display: inline
+            .css_publish
+                display: none
+    &.css_publish
+        .css_publish
+            display: none
+        &:hover
+            .css_publish
+                display: inline
+            .css_unpublish
+                display: none
diff --git a/addons/website/static/src/js/website.js b/addons/website/static/src/js/website.js
index 8a7f396895f..4352129fe2f 100644
--- a/addons/website/static/src/js/website.js
+++ b/addons/website/static/src/js/website.js
@@ -138,19 +138,15 @@
 
     dom_ready.then(function () {
         /* ----- PUBLISHING STUFF ---- */
-        $(document).on('click', '.js_publish, .js_unpublish', function (e) {
+        $(document).on('click', '.js_publish', function (e) {
             e.preventDefault();
-            var $link = $(this).parent();
-            $link.find('.js_publish, .js_unpublish').addClass("hidden");
-            var $unp = $link.find(".js_unpublish");
-            var $p = $link.find(".js_publish");
+            var $link = $(this);
+            $link.toggleClass("css_publish").toggleClass("css_unpublish");
             $.post('/website/publish', {'id': $link.data('id'), 'object': $link.data('object')}, function (result) {
                 if (+result) {
-                    $p.addClass("hidden");
-                    $unp.removeClass("hidden");
+                    $link.addClass("css_publish").removeClass("css_unpublish");
                 } else {
-                    $p.removeClass("hidden");
-                    $unp.addClass("hidden");
+                    $link.removeClass("css_publish").addClass("css_unpublish");
                 }
             });
         });
diff --git a/addons/website/views/views.xml b/addons/website/views/views.xml
index a93062ef370..37575221153 100644
--- a/addons/website/views/views.xml
+++ b/addons/website/views/views.xml
@@ -380,9 +380,9 @@
         </template>
 
         <template id="publish">
-            <a href="#" t-att-data-id="object.id" t-att-data-object="object._name" class="pull-right" t-if="editable" t-ignore="true" style="text-decoration: none !important;">
-                <span t-attf-class="label label-success js_unpublish #{ '' if object.website_published else 'hidden' }">Unpublish</span>
-                <span t-attf-class="label label-danger js_publish #{ 'hidden' if object.website_published else '' }">Publish</span>
+            <a href="#" t-att-data-id="object.id" t-att-data-object="object._name" t-attf-class="pull-right js_publish #{ object.website_published and 'css_publish' or 'css_unpublish' }" t-if="editable" t-ignore="true" style="text-decoration: none !important;">
+                <span t-attf-class="label label-success css_unpublish">Publish</span>
+                <span t-attf-class="label label-danger css_publish">Unpublish</span>
             </a>
         </template>