[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

4 files changed, 15 insertions, 91 deletions

diff --git a/addons/website_mail/static/src/css/Makefile b/addons/website_mail/static/src/css/Makefile
deleted file mode 100644
index d7c1ea77439..00000000000
--- a/addons/website_mail/static/src/css/Makefile
+++ /dev/null
@@ -1,2 +0,0 @@
-sass:
-	sass -t expanded --unix-newlines --watch website_mail.sass:website_mail.css&
diff --git a/addons/website_mail/static/src/css/website_mail.css b/addons/website_mail/static/src/css/website_mail.css
deleted file mode 100644
index a93199a2ddf..00000000000
--- a/addons/website_mail/static/src/css/website_mail.css
+++ /dev/null
@@ -1,40 +0,0 @@
-/* ---- FOLLOW ---- */
-a[data-follow] {
-  text-decoration: none !important;
-  z-index: 2;
-}
-a[data-follow] .label {
-  padding: 5px 8px;
-}
-a[data-follow] .css_unfollow, a[data-follow] .css_follow, a[data-follow] .css_unfollowed, a[data-follow] .css_followed {
-  display: none;
-}
-a[data-follow][data-follow='off'] .css_unfollowed, a[data-follow][data-follow='off']:hover .css_follow {
-  display: inline;
-}
-a[data-follow][data-follow='off']:hover .css_unfollowed {
-  display: none;
-}
-a[data-follow][data-follow='on'] .css_followed, a[data-follow][data-follow='on']:hover .css_unfollow {
-  display: inline;
-}
-a[data-follow][data-follow='on']:hover .css_followed {
-  display: none;
-}
-
-[data-follow='off']:not(a) > :not([data-follow]) {
-  opacity: 0.5;
-}
-
-[data-follow]:not(a) {
-  position: relative;
-  overflow: visible;
-  /*&:hover > [data-follow] */
-  /*     display: block */
-}
-[data-follow]:not(a) > [data-follow] {
-  position: absolute;
-  right: -6px;
-  top: -10px;
-  display: none;
-}
diff --git a/addons/website_mail/static/src/css/website_mail.sass b/addons/website_mail/static/src/css/website_mail.sass
deleted file mode 100644
index b648270ec04..00000000000
--- a/addons/website_mail/static/src/css/website_mail.sass
+++ /dev/null
@@ -1,33 +0,0 @@
-
-/* ---- FOLLOW ---- */
-a[data-follow]
-    text-decoration: none !important
-    z-index: 2
-    .label
-        padding: 5px 8px
-    .css_unfollow, .css_follow, .css_unfollowed, .css_followed
-        display: none
-    &[data-follow='off']
-        .css_unfollowed, &:hover .css_follow
-            display: inline
-        &:hover .css_unfollowed
-            display: none
-    &[data-follow='on']
-        .css_followed, &:hover .css_unfollow
-            display: inline
-        &:hover .css_followed
-            display: none
-
-[data-follow='off']:not(a)
-    >:not([data-follow])
-        opacity: 0.5
-[data-follow]:not(a)
-    position: relative
-    overflow: visible
-    >[data-follow]
-        position: absolute
-        right: -6px
-        top: -10px
-        display: none
-    /*&:hover > [data-follow]*/
-    /*     display: block*/
diff --git a/addons/website_mail/static/src/js/website_mail.js b/addons/website_mail/static/src/js/website_mail.js
index d0ce8276308..cfd3e16d1ec 100644
--- a/addons/website_mail/static/src/js/website_mail.js
+++ b/addons/website_mail/static/src/js/website_mail.js
@@ -1,27 +1,26 @@
 $(document).ready(function () {
 
-    /* ----- FOLLOWING STUFF ---- */
-    $('[data-follow]:has([data-follow])').each(function () {
-        var $pub = $("[data-follow]", this);
-        if($pub.size())
-            $(this).attr("data-follow", $pub.attr("data-follow"));
-        else
-            $(this).removeAttr("data-follow");
-    });
-
-    $(document).on('click', '.js_follow', function (ev) {
+    $(document).on('click', '.js_follow_btn', function (ev) {
         ev.preventDefault();
-        var $data = $(":first", this).parents("[data-follow]");
-        var $email = $data.first().siblings(".js_follow_email");
-        var message_is_follower = $data.first().attr("data-follow");
+
+	var self = this;
+        var $data = $(this).parents("div.js_follow");
+        var $email = $(".js_follow_email", $data);
+        var message_is_follower = $data.attr("data-follow");
         $data.attr("data-follow", message_is_follower == 'off' ? 'on' : 'off');
+
         openerp.jsonRpc('/website_mail/follow', 'call', {
-            'id': $(this).data('id'),
-            'object': $(this).data('object'),
+            'id': $data.data('id'),
+            'object': $data.data('object'),
             'message_is_follower': message_is_follower,
             'email': $email && $email.val() || false,
         }).then(function (result) {
-            $data.attr("data-follow", + result ? 'on' : 'off');
+	    if (result) {
+	        $data.html('<div class="alert alert-success mb0">Thanks for your subscription!</div>')
+	    } else {
+                $data.attr("data-follow", + result ? 'on' : 'off');
+	        $(self).text('Subscribe')
+	    }
         });
     });