[IMP] Cleaning code of followers and website_published, 200 lines removed

[IMP] CSS and design of options and follow, avoid custom CSS

bzr revid: fp@openerp.com-20131116150927-4mjk1zdcgfzt4e95

3 files changed, 15 insertions, 105 deletions

diff --git a/addons/website/static/src/css/website.css b/addons/website/static/src/css/website.css
index e0ca7104dc4..99ba04e2a96 100644
--- a/addons/website/static/src/css/website.css
+++ b/addons/website/static/src/css/website.css
@@ -389,54 +389,19 @@ ul.nav-stacked > li > a {
 }
 
 /* ---- PUBLISH ---- */
-a[data-publish] {
-  text-decoration: none !important;
-}
-a[data-publish] .css_unpublish, a[data-publish] .css_publish, a[data-publish] .css_unpublished, a[data-publish] .css_published {
-  display: none;
-}
-a[data-publish][data-publish='off'] .css_unpublished, a[data-publish][data-publish='off']:hover .css_publish {
-  display: inline;
-}
-a[data-publish][data-publish='off']:hover .css_unpublished {
-  display: none;
-}
-a[data-publish][data-publish='on'] .css_published, a[data-publish][data-publish='on']:hover .css_unpublish {
-  display: inline;
-}
-a[data-publish][data-publish='on']:hover .css_published {
-  display: none;
-}
-
-.dropdown .css_unpublish, .dropdown .css_publish {
+.css_unpublish, .css_publish {
   display: none;
 }
 
-.dropdown.css_publish .css_unpublish, .dropdown.css_unpublish .css_publish {
+.css_published .css_unpublish, .css_unpublished .css_publish {
   display: block;
 }
 
-.unpublish {
+[data-publish='off'] {
   opacity: 0.5;
 }
 
-[data-publish='off']:not(a) > :not(.js_publish) {
-  opacity: 0.5;
-}
-
-[data-publish]:not(a) {
-  position: relative;
-  overflow: visible;
-  /*&:hover .js_publish */
-  /*     display: block */
-}
-[data-publish]:not(a) .js_publish {
-  position: absolute;
-  right: -6px;
-  top: -10px;
-  display: none;
-}
-
+/* ---- END of PUBLISH ---- */
 ::selection {
   background: rgba(150, 150, 220, 0.3);
 }
diff --git a/addons/website/static/src/css/website.sass b/addons/website/static/src/css/website.sass
index f0a9d9b8d3c..f947a163a28 100644
--- a/addons/website/static/src/css/website.sass
+++ b/addons/website/static/src/css/website.sass
@@ -296,41 +296,17 @@ ul.nav-stacked > li > a
     text-transform: uppercase
 
 /* ---- PUBLISH ---- */
-a[data-publish]
-    text-decoration: none !important
-    .css_unpublish, .css_publish, .css_unpublished, .css_published
-        display: none
-    &[data-publish='off']
-        .css_unpublished, &:hover .css_publish
-            display: inline
-        &:hover .css_unpublished
-            display: none
-    &[data-publish='on']
-        .css_published, &:hover .css_unpublish
-            display: inline
-        &:hover .css_published
-            display: none
-
-.dropdown .css_unpublish, .dropdown .css_publish
+.css_unpublish, .css_publish
     display: none
-.dropdown.css_publish .css_unpublish, .dropdown.css_unpublish .css_publish
+.css_published .css_unpublish, .css_unpublished .css_publish
     display: block
 
-.unpublish
+[data-publish='off']
     opacity: 0.5
-[data-publish='off']:not(a)
-    >:not(.js_publish)
-        opacity: 0.5
-[data-publish]:not(a)
-    position: relative
-    overflow: visible
-    .js_publish
-        position: absolute
-        right: -6px
-        top: -10px
-        display: none
-    /*&:hover .js_publish*/
-    /*     display: block*/
+
+/* ---- END of PUBLISH ---- */
+
+
 
 ::selection
     background: rgba(150, 150, 220, 0.3)
diff --git a/addons/website/static/src/js/website.js b/addons/website/static/src/js/website.js
index 0653a278b86..b1ba9b801fc 100644
--- a/addons/website/static/src/js/website.js
+++ b/addons/website/static/src/js/website.js
@@ -224,44 +224,13 @@
         $('.js_tooltip').bstooltip();
 
         /* ----- PUBLISHING STUFF ---- */
-        $('[data-publish]:has(.js_publish)').each(function () {
-            var $pub = $("[data-publish]", this);
-            if($pub.size())
-                $(this).attr("data-publish", $pub.attr("data-publish"));
-            else
-                $(this).removeAttr("data-publish");
-        });
-
-        $('[data-publish]:has(.js_publish_management)').each(function () {
-            $(this).attr("data-publish", $(".js_publish_management .btn-success", this).size() ? "on" : 'off');
-            $(this).attr("data-publish", $(".js_publish_management .btn-success", this).size() ? "on" : 'off');
-        });
-
-        $(document).on('click', '.js_publish', function (e) {
-            e.preventDefault();
-            var $a = $(this);
-            var $data = $a.find(":first").parents("[data-publish]");
-            openerp.jsonRpc($a.data('controller') || '/website/publish', 'call', {'id': +$a.data('id'), 'object': $a.data('object')})
-                .then(function (result) {
-                    $data.attr("data-publish", +result ? 'on' : 'off');
-                }).fail(function (err, data) {
-                    website.error(data, '/web#model='+$a.data('object')+'&id='+$a.data('id'));
-                });
-            return false;
-        });
-
         $(document).on('click', '.js_publish_management .js_publish_btn', function () {
-            var $data = $(this).parents(".js_publish_management:first");
-            var $btn = $data.find('.btn:first');
-            var publish = $btn.hasClass("btn-success");
-
-            $data.toggleClass("css_unpublish css_publish");
-            $btn.removeClass("btn-default btn-success");
-
+            var $data = $(this).parent(".js_publish_management");
+	    var self=this;
             openerp.jsonRpc($data.data('controller') || '/website/publish', 'call', {'id': +$data.data('id'), 'object': $data.data('object')})
                 .then(function (result) {
-                    $btn.toggleClass("btn-default", !result).toggleClass("btn-success", result);
-                    $data.toggleClass("css_unpublish", !result).toggleClass("css_publish", result);
+                    $data.toggleClass("css_unpublished css_published");
+                    $(self).toggleClass("btn-success btn-danger");
                     $data.parents("[data-publish]").attr("data-publish", +result ? 'on' : 'off');
                 }).fail(function (err, data) {
                     website.error(data, '/web#model='+$data.data('object')+'&id='+$data.data('id'));