Ticket #4869: 4869.03b.patch

bp-core/bp-core-widgets.php

@@ -17 +17 @@
         function __construct() {
                 $widget_ops = array(
                         'description' => __( 'A dynamic list of recently active, popular, and newest members', 'buddypress' ),
-                        'classname' => 'buddypress',
+                        'classname' => 'widget-buddypress',
                 );
                 parent::__construct( false, $name = _x( '(BuddyPress) Members', 'widget name', 'buddypress' ), $widget_ops );
 
@@ -148 +148 @@
         function __construct() {
                 $widget_ops = array(
                         'description' => __( 'Avatars of users who are currently online', 'buddypress' ),
-                        'classname' => 'buddypress',
+                        'classname' => 'widget-buddypress',
                 );
                 parent::__construct( false, $name = _x( "(BuddyPress) Who's Online", 'widget name', 'buddypress' ), $widget_ops );
         }
@@ -215 +215 @@
         function __construct() {
                 $widget_ops = array(
                         'description' => __( 'Avatars of recently active members', 'buddypress' ),
-                        'classname' => 'buddypress',
+                        'classname' => 'widget-buddypress',
                 );
                 parent::__construct( false, $name = _x( '(BuddyPress) Recently Active Members', 'widget name', 'buddypress' ), $widget_ops );
         }

bp-core/js/widget-members.js

@@ -1 +1 @@
 jQuery(document).ready( function() {
-        jQuery(".widget div#members-list-options a").on('click',
+        var widget = jQuery(".widget #members-list-options a, .widget-buddypress #members-list-options a");
+
+        widget.on('click',
                 function() {
-                        var link = this;
-                        jQuery(link).addClass('loading');
+                        jQuery(this).addClass('loading');
 
-                        jQuery(".widget div#members-list-options a").removeClass("selected");
+                        widget.removeClass("selected");
                         jQuery(this).addClass('selected');
 
                         jQuery.post( ajaxurl, {
@@ -16 +17 @@
                         },
                         function(response)
                         {
-                                jQuery(link).removeClass('loading');
+                                widget.removeClass('loading');
                                 member_wiget_response(response);
                         });
 
@@ -30 +31 @@
         response = response.split('[[SPLIT]]');
 
         if ( response[0] != "-1" ) {
-                jQuery(".widget ul#members-list").fadeOut(200,
+                jQuery(".widget #members-list, .widget-buddypress #members-list").fadeOut(200,
                         function() {
-                                jQuery(".widget ul#members-list").html(response[1]);
-                                jQuery(".widget ul#members-list").fadeIn(200);
+                                jQuery(this).html(response[1]);
+                                jQuery(this).fadeIn(200);
                         }
                 );
 
         } else {
-                jQuery(".widget ul#members-list").fadeOut(200,
+                jQuery(".widget #members-list, .widget-buddypress #members-list").fadeOut(200,
                         function() {
                                 var message = '<p>' + response[1] + '</p>';
-                                jQuery(".widget ul#members-list").html(message);
-                                jQuery(".widget ul#members-list").fadeIn(200);
+                                jQuery(this).html(message);
+                                jQuery(this).fadeIn(200);
                         }
                 );
         }

bp-core/js/widget-members.min.js

@@ -1 @@
-jQuery(document).ready(function(){jQuery(".widget div#members-list-options a").on("click",function(){var a=this;jQuery(a).addClass("loading");jQuery(".widget div#members-list-options a").removeClass("selected");jQuery(this).addClass("selected");jQuery.post(ajaxurl,{action:"widget_members",cookie:encodeURIComponent(document.cookie),_wpnonce:jQuery("input#_wpnonce-members").val(),"max-members":jQuery("input#members_widget_max").val(),filter:jQuery(this).attr("id")},function(b){jQuery(a).removeClass("loading");member_wiget_response(b)});return false})});function member_wiget_response(a){a=a.substr(0,a.length-1);a=a.split("[[SPLIT]]");if(a[0]!="-1"){jQuery(".widget ul#members-list").fadeOut(200,function(){jQuery(".widget ul#members-list").html(a[1]);jQuery(".widget ul#members-list").fadeIn(200)})}else{jQuery(".widget ul#members-list").fadeOut(200,function(){var b="<p>"+a[1]+"</p>";jQuery(".widget ul#members-list").html(b);jQuery(".widget ul#members-list").fadeIn(200)})}};
- No newline at end of file
+function member_wiget_response(e){e=e.substr(0,e.length-1);e=e.split("[[SPLIT]]");if(e[0]!="-1"){jQuery(".widget #members-list, .widget-buddypress #members-list").fadeOut(200,function(){jQuery(this).html(e[1]);jQuery(this).fadeIn(200)})}else{jQuery(".widget #members-list, .widget-buddypress #members-list").fadeOut(200,function(){var t="<p>"+e[1]+"</p>";jQuery(this).html(t);jQuery(this).fadeIn(200)})}}jQuery(document).ready(function(){var e=jQuery(".widget #members-list-options a, .widget-buddypress #members-list-options a");e.on("click",function(){jQuery(this).addClass("loading");e.removeClass("selected");jQuery(this).addClass("selected");jQuery.post(ajaxurl,{action:"widget_members",cookie:encodeURIComponent(document.cookie),_wpnonce:jQuery("input#_wpnonce-members").val(),"max-members":jQuery("input#members_widget_max").val(),filter:jQuery(this).attr("id")},function(t){e.removeClass("loading");member_wiget_response(t)});return false})})
+ No newline at end of file

bp-groups/bp-groups-widgets.php

@@ -26 +26 @@
         function __construct() {
                 $widget_ops = array(
                         'description' => __( 'A dynamic list of recently active, popular, and newest groups', 'buddypress' ),
-                        'classname' => 'buddypress',
+                        'classname' => 'widget-buddypress',
                 );
                 parent::__construct( false, _x( '(BuddyPress) Groups', 'widget name', 'buddypress' ), $widget_ops );
 

bp-groups/js/widget-groups.js

@@ -1 +1 @@
 jQuery(document).ready( function() {
-        jQuery(".widget div#groups-list-options a").on('click',
+        var widget = jQuery(".widget #groups-list-options a, .widget-buddypress #groups-list-options a");
+
+        widget.on('click',
                 function() {
-                        var link = this;
-                        jQuery(link).addClass('loading');
+                        jQuery(this).addClass('loading');
 
-                        jQuery(".widget div#groups-list-options a").removeClass("selected");
+                        widget.removeClass("selected");
                         jQuery(this).addClass('selected');
 
                         jQuery.post( ajaxurl, {
@@ -16 +17 @@
                         },
                         function(response)
                         {
-                                jQuery(link).removeClass('loading');
+                                widget.removeClass('loading');
                                 groups_wiget_response(response);
                         });
 
@@ -30 +31 @@
         response = response.split('[[SPLIT]]');
 
         if ( response[0] != "-1" ) {
-                jQuery(".widget ul#groups-list").fadeOut(200,
+                jQuery(".widget #groups-list, .widget-buddypress #groups-list").fadeOut(200,
                         function() {
-                                jQuery(".widget ul#groups-list").html(response[1]);
-                                jQuery(".widget ul#groups-list").fadeIn(200);
+                                jQuery(this).html(response[1]);
+                                jQuery(this).fadeIn(200);
                         }
                 );
 
         } else {
-                jQuery(".widget ul#groups-list").fadeOut(200,
+                jQuery(".widget ul#groups-list, .widget-buddypress #groups-list").fadeOut(200,
                         function() {
                                 var message = '<p>' + response[1] + '</p>';
-                                jQuery(".widget ul#groups-list").html(message);
-                                jQuery(".widget ul#groups-list").fadeIn(200);
+                                jQuery(this).html(message);
+                                jQuery(this).fadeIn(200);
                         }
                 );
         }

bp-groups/js/widget-groups.min.js

@@ -1 @@
-jQuery(document).ready(function(){jQuery(".widget div#groups-list-options a").on("click",function(){var a=this;jQuery(a).addClass("loading");jQuery(".widget div#groups-list-options a").removeClass("selected");jQuery(this).addClass("selected");jQuery.post(ajaxurl,{action:"widget_groups_list",cookie:encodeURIComponent(document.cookie),_wpnonce:jQuery("input#_wpnonce-groups").val(),max_groups:jQuery("input#groups_widget_max").val(),filter:jQuery(this).attr("id")},function(b){jQuery(a).removeClass("loading");groups_wiget_response(b)});return false})});function groups_wiget_response(a){a=a.substr(0,a.length-1);a=a.split("[[SPLIT]]");if(a[0]!="-1"){jQuery(".widget ul#groups-list").fadeOut(200,function(){jQuery(".widget ul#groups-list").html(a[1]);jQuery(".widget ul#groups-list").fadeIn(200)})}else{jQuery(".widget ul#groups-list").fadeOut(200,function(){var b="<p>"+a[1]+"</p>";jQuery(".widget ul#groups-list").html(b);jQuery(".widget ul#groups-list").fadeIn(200)})}};
- No newline at end of file
+function groups_wiget_response(e){e=e.substr(0,e.length-1);e=e.split("[[SPLIT]]");if(e[0]!="-1"){jQuery(".widget #groups-list, .widget-buddypress #groups-list").fadeOut(200,function(){jQuery(this).html(e[1]);jQuery(this).fadeIn(200)})}else{jQuery(".widget ul#groups-list, .widget-buddypress #groups-list").fadeOut(200,function(){var t="<p>"+e[1]+"</p>";jQuery(this).html(t);jQuery(this).fadeIn(200)})}}jQuery(document).ready(function(){var e=jQuery(".widget #groups-list-options a, .widget-buddypress #groups-list-options a");e.on("click",function(){jQuery(this).addClass("loading");e.removeClass("selected");jQuery(this).addClass("selected");jQuery.post(ajaxurl,{action:"widget_groups_list",cookie:encodeURIComponent(document.cookie),_wpnonce:jQuery("input#_wpnonce-groups").val(),max_groups:jQuery("input#groups_widget_max").val(),filter:jQuery(this).attr("id")},function(t){e.removeClass("loading");groups_wiget_response(t)});return false})})
+ No newline at end of file

bp-templates/bp-legacy/css/buddypress.css

@@ -1394 +1394 @@
 6.11 - Widgets
 --------------------------------------------------------------*/
 
-.widget.buddypress div.item-avatar img.avatar {
+.widget-buddypress div.item-avatar img.avatar {
         float: left;
         margin: 0 10px 15px 0;
 }
 
-.widget.buddypress span.activity {
+.widget-buddypress span.activity {
         display: inline-block;
         font-size: 80%;
         opacity: 0.8;
         padding: 0;
 }
 
-.widget.buddypress div.item-options {
+.widget-buddypress div.item-options {
         font-size: 90%;
         margin: 0 0 1em 0;
         padding: 1em 0;
 }
 
-.widget.buddypress div.item{
+.widget-buddypress div.item{
         margin:0 0 1em 0;
 }
 
-.widget.buddypress div.item-meta,
-.widget.buddypress div.item-content {
+.widget-buddypress .item-meta,
+.widget-buddypress .item-content {
         font-size: 11px;
-        margin-left: 38px;
+        margin-left: 2.8em;
 }
 
-.widget.buddypress ul.item-list img.avatar {
+.widget-buddypress ul.item-list img {
         height: 20px;
-        margin-right: 10px;
         width: 20px;
 }
-.widget.buddypress div.item-avatar img {
+.widget-buddypress .item-avatar img {
         height: 40px;
-        margin: 1px;
         width: 40px;
 }
 
-.widget.buddypress div.avatar-block{
+.widget-buddypress ul {
+        margin: 0 !important;
+        padding: 0 !important;
+}
+
+.widget-buddypress li {
+        list-style: none;
+}
+
+.widget-buddypress .avatar-block{
         overflow: hidden;
 }