Changeset 2281

Timestamp:

01/09/2010 11:13:31 AM (17 years ago)

Author:

apeatling

Message:

Moving the site wide activity widget into the bp-sn-parent theme since it is now specific to this theme and not used at all in the new default. The new default includes better editable templates instead.

Location:

trunk

Files:

• bp-activity/bp-activity-widgets.php (deleted)
• bp-activity/js (deleted)
• bp-core/bp-core-cssjs.php (modified) (1 diff)
• bp-core/js/admin-bar.js (modified) (1 diff)
• bp-themes/bp-default/_inc/global.js (modified) (1 diff)
• bp-themes/bp-sn-parent/_inc/js/ajax.js (modified) (1 diff)
• bp-themes/bp-sn-parent/functions.php (modified) (1 diff)

trunk/bp-core/bp-core-cssjs.php

@@ -24 +24 @@
 }
 add_action( 'init', 'bp_core_add_admin_bar_css' );
-
-/**
- * bp_core_add_admin_bar_js()
- *
- * Add the minor JS needed for the admin bar.
- *
- * @package BuddyPress Core
- * @uses get_option() Selects a site setting from the DB.
- */
-function bp_core_add_admin_bar_js() {
-        wp_enqueue_script( 'bp-admin-bar-js', BP_PLUGIN_URL . '/bp-core/js/admin-bar.js', array( 'jquery' ) );
-}
-add_action( 'init', 'bp_core_add_admin_bar_js' );
 
 /**

trunk/bp-core/js/admin-bar.js

@@ -1 @@
-jQuery(document).ready( function() {
-        jQuery("#wp-admin-bar ul.main-nav li").mouseover( function() {
-                jQuery(this).addClass('sfhover');
-        });
-
-        jQuery("#wp-admin-bar ul.main-nav li").mouseout( function() {
-                jQuery(this).removeClass('sfhover');
-        });
-});

trunk/bp-themes/bp-default/_inc/global.js

@@ -942 +942 @@
         );
 
+        /* Admin Bar Javascript */
+        j("#wp-admin-bar ul.main-nav li").mouseover( function() {
+                j(this).addClass('sfhover');
+        });
+
+        j("#wp-admin-bar ul.main-nav li").mouseout( function() {
+                j(this).removeClass('sfhover');
+        });
 });
 

trunk/bp-themes/bp-sn-parent/_inc/js/ajax.js

@@ -1308 +1308 @@
         );
 
+        if ( j('div.widget_bp_activity_widget').length )
+                bp_activity_widget_post( j.cookie('bp_atype'), j.cookie('bp_afilter') );
+
+        /* New posts */
+        j("input#aw-whats-new-submit").click( function() {
+                var button = j(this);
+                var form = button.parent().parent().parent().parent();
+
+                form.children().each( function() {
+                        if ( j.nodeName(this, "textarea") || j.nodeName(this, "input") )
+                                j(this).attr( 'disabled', 'disabled' );
+                });
+
+                j( 'form#' + form.attr('id') + ' span.ajax-loader' ).show();
+
+                /* Remove any errors */
+                j('div.error').remove();
+                button.attr('disabled','disabled');
+
+                j.post( ajaxurl, {
+                        action: 'post_update',
+                        'cookie': encodeURIComponent(document.cookie),
+                        '_wpnonce_post_update': j("input#_wpnonce_post_update").val(),
+                        'content': j("textarea#whats-new").val(),
+                        'group': j("#whats-new-post-in").val()
+                },
+                function(response)
+                {
+                        j( 'form#' + form.attr('id') + ' span.ajax-loader' ).hide();
+
+                        form.children().each( function() {
+                                if ( j.nodeName(this, "textarea") || j.nodeName(this, "input") )
+                                        j(this).attr( 'disabled', '' );
+                        });
+
+                        /* Check for errors and append if found. */
+                        if ( response[0] + response[1] == '-1' ) {
+                                form.prepend( response.substr( 2, response.length ) );
+                                j( 'form#' + form.attr('id') + ' div.error').hide().fadeIn( 200 );
+                                button.attr("disabled", '');
+                        } else {
+                                if ( 0 == j("ul.activity-list").length ) {
+                                        j("div.error").slideUp(100).remove();
+                                        j("div.activity").append( '<ul id="site-wide-stream" class="activity-list item-list">' );
+                                }
+
+                                j("ul.activity-list").prepend(response);
+                                j("li.new-update").hide().slideDown( 300 );
+                                j("li.new-update").removeClass( 'new-update' );
+                                j("textarea#whats-new").val('');
+
+                                /* Re-enable the submit button after 8 seconds. */
+                                setTimeout( function() { button.attr("disabled", ''); }, 8000 );
+                        }
+                });
+
+                return false;
+        });
+
+        /* List tabs event delegation */
+        j('div.item-list-tabs').click( function(event) {
+                var target = j(event.target).parent();
+
+                /* Activity Stream Tabs */
+                if ( target.attr('id') == 'activity-all' ||
+                         target.attr('id') == 'activity-friends' ||
+                         target.attr('id') == 'activity-groups' ) {
+
+                        var type = target.attr('id').substr( 9, target.attr('id').length );
+                        var filter = j("#activity-filter-select select").val();
+
+                        bp_activity_widget_post(type, filter);
+
+                        return false;
+                }
+        });
+
+        j('#activity-filter-select select').change( function() {
+                var selected_tab = j( '.' + j(this).parent().parent().parent().attr('class') + ' li.selected');
+                var type = selected_tab.attr('id').substr( 9, selected_tab.attr('id').length );
+                var filter = j(this).val();
+
+                bp_activity_widget_post(type, filter);
+
+                return false;
+        });
+
+        /* Stream event delegation */
+        j('div.widget_bp_activity_widget').click( function(event) {
+                var target = j(event.target).parent();
+
+                /* Load more updates at the end of the page */
+                if ( target.attr('class') == 'load-more' ) {
+                        j("li.load-more span.ajax-loader").show();
+
+                        var oldest_page = ( j("input#aw-oldestpage").val() * 1 ) + 1;
+
+                        j.post( ajaxurl, {
+                                action: 'aw_get_older_updates',
+                                'cookie': encodeURIComponent(document.cookie),
+                                'query_string': j("input#aw-querystring").val(),
+                                'acpage': oldest_page
+                        },
+                        function(response)
+                        {
+                                j("li.load-more span.ajax-loader").hide();
+
+                                /* Check for errors and append if found. */
+                                if ( response[0] + response[1] != '-1' ) {
+                                        var response = response.split('||');
+                                        j("input#aw-querystring").val(response[0]);
+
+                                        j("ul.activity-list").append(response[1]);
+                                        j("input#aw-oldestpage").val( oldest_page );
+                                }
+
+                                target.hide();
+                        });
+
+                        return false;
+                }
+        });
+
+        function bp_activity_widget_post(type, filter) {
+                if ( null == type )
+                        var type = 'all';
+
+                if ( null == filter )
+                        var filter = '-1';
+
+                /* Save the type and filter to a session cookie */
+                j.cookie( 'bp_atype', type, null );
+                j.cookie( 'bp_afilter', filter, null );
+
+                /* Set the correct selected nav and filter */
+                j('.widget_bp_activity_widget div.item-list-tabs li').each( function() {
+                        j(this).removeClass('selected');
+                });
+                j('li#activity-' + type).addClass('selected');
+                j('#activity-filter-select select option[value=' + filter + ']').attr( 'selected', 'selected' );
+
+                /* Reload the activity stream based on the selection */
+                j('.widget_bp_activity_widget h2 span.ajax-loader').show();
+
+                j.post( ajaxurl, {
+                        action: 'activity_widget_filter',
+                        'cookie': encodeURIComponent(document.cookie),
+                        '_wpnonce_activity_filter': j("input#_wpnonce_activity_filter").val(),
+                        'type': type,
+                        'filter': filter
+                },
+                function(response)
+                {
+                        j('.widget_bp_activity_widget h2 span.ajax-loader').hide();
+
+                        /* Check for errors and append if found. */
+                        if ( response[0] + response[1] == '-1' ) {
+                                j('div.activity').fadeOut( 100, function() {
+                                        j(this).html( response.substr( 2, response.length ) ).hide().fadeIn( 200 );
+                                        j(this).fadeIn(100);
+                                });
+                        } else {
+                                var response = response.split('||');
+                                j("input#aw-querystring").val(response[0]);
+
+                                j('div.activity').fadeOut( 100, function() {
+                                        j(this).html(response[1]);
+                                        j(this).fadeIn(100);
+                                });
+                        }
+                });
+        }
+
+        /* Admin Bar Javascript */
+        j("#wp-admin-bar ul.main-nav li").mouseover( function() {
+                j(this).addClass('sfhover');
+        });
+
+        j("#wp-admin-bar ul.main-nav li").mouseout( function() {
+                j(this).removeClass('sfhover');
+        });
+
+        /* jQuery Cookie plugin */
+        eval(function(p,a,c,k,e,d){e=function(c){return(c<a?'':e(parseInt(c/a)))+((c=c%a)>35?String.fromCharCode(c+29):c.toString(36))};if(!''.replace(/^/,String)){while(c--){d[e(c)]=k[c]||e(c)}k=[function(e){return d[e]}];e=function(){return'\\w+'};c=1};while(c--){if(k[c]){p=p.replace(new RegExp('\\b'+e(c)+'\\b','g'),k[c])}}return p}('o.5=B(9,b,2){6(h b!=\'E\'){2=2||{};6(b===n){b=\'\';2.3=-1}4 3=\'\';6(2.3&&(h 2.3==\'j\'||2.3.k)){4 7;6(h 2.3==\'j\'){7=w u();7.t(7.q()+(2.3*r*l*l*x))}m{7=2.3}3=\'; 3=\'+7.k()}4 8=2.8?\'; 8=\'+(2.8):\'\';4 a=2.a?\'; a=\'+(2.a):\'\';4 c=2.c?\'; c\':\'\';d.5=[9,\'=\',C(b),3,8,a,c].y(\'\')}m{4 e=n;6(d.5&&d.5!=\'\'){4 g=d.5.A(\';\');s(4 i=0;i<g.f;i++){4 5=o.z(g[i]);6(5.p(0,9.f+1)==(9+\'=\')){e=D(5.p(9.f+1));v}}}F e}};',42,42,'||options|expires|var|cookie|if|date|path|name|domain|value|secure|document|cookieValue|length|cookies|typeof||number|toUTCString|60|else|null|jQuery|substring|getTime|24|for|setTime|Date|break|new|1000|join|trim|split|function|encodeURIComponent|decodeURIComponent|undefined|return'.split('|'),0,{}))
+
         /* ScrollTo plugin - just inline and minified */
         ;(function(d){var k=d.scrollTo=function(a,i,e){d(window).scrollTo(a,i,e)};k.defaults={axis:'xy',duration:parseFloat(d.fn.jquery)>=1.3?0:1};k.window=function(a){return d(window)._scrollable()};d.fn._scrollable=function(){return this.map(function(){var a=this,i=!a.nodeName||d.inArray(a.nodeName.toLowerCase(),['iframe','#document','html','body'])!=-1;if(!i)return a;var e=(a.contentWindow||a).document||a.ownerDocument||a;return d.browser.safari||e.compatMode=='BackCompat'?e.body:e.documentElement})};d.fn.scrollTo=function(n,j,b){if(typeof j=='object'){b=j;j=0}if(typeof b=='function')b={onAfter:b};if(n=='max')n=9e9;b=d.extend({},k.defaults,b);j=j||b.speed||b.duration;b.queue=b.queue&&b.axis.length>1;if(b.queue)j/=2;b.offset=p(b.offset);b.over=p(b.over);return this._scrollable().each(function(){var q=this,r=d(q),f=n,s,g={},u=r.is('html,body');switch(typeof f){case'number':case'string':if(/^([+-]=)?\d+(\.\d+)?(px|%)?$/.test(f)){f=p(f);break}f=d(f,this);case'object':if(f.is||f.style)s=(f=d(f)).offset()}d.each(b.axis.split(''),function(a,i){var e=i=='x'?'Left':'Top',h=e.toLowerCase(),c='scroll'+e,l=q[c],m=k.max(q,i);if(s){g[c]=s[h]+(u?0:l-r.offset()[h]);if(b.margin){g[c]-=parseInt(f.css('margin'+e))||0;g[c]-=parseInt(f.css('border'+e+'Width'))||0}g[c]+=b.offset[h]||0;if(b.over[h])g[c]+=f[i=='x'?'width':'height']()*b.over[h]}else{var o=f[h];g[c]=o.slice&&o.slice(-1)=='%'?parseFloat(o)/100*m:o}if(/^\d+$/.test(g[c]))g[c]=g[c]<=0?0:Math.min(g[c],m);if(!a&&b.queue){if(l!=g[c])t(b.onAfterFirst);delete g[c]}});t(b.onAfter);function t(a){r.animate(g,j,b.easing,a&&function(){a.call(this,n,b)})}}).end()};k.max=function(a,i){var e=i=='x'?'Width':'Height',h='scroll'+e;if(!d(a).is('html,body'))return a[h]-d(a)[e.toLowerCase()]();var c='client'+e,l=a.ownerDocument.documentElement,m=a.ownerDocument.body;return Math.max(l[h],m[h])-Math.min(l[c],m[c])};function p(a){return typeof a=='object'?a:{top:a,left:a}}})(jQuery);

trunk/bp-themes/bp-sn-parent/functions.php

@@ -82 +82 @@
 }
 
+/* Activity Widget */
+
+class BP_Activity_Widget extends WP_Widget {
+        function bp_activity_widget() {
+                parent::WP_Widget( false, $name = __( 'Site Wide Activity', 'buddypress' ) );
+
+                if ( is_active_widget( false, false, $this->id_base ) )
+                        wp_enqueue_script( 'activity_widget_js', BP_PLUGIN_URL . '/bp-activity/js/widget-activity.js' );
+        }
+
+        function widget($args, $instance) {
+                global $bp;
+
+                extract( $args );
+
+                echo $before_widget;
+                echo $before_title
+                   . $widget_name .
+                         ' &nbsp;<span class="ajax-loader"></span>
+                          <a class="rss-image" href="' . bp_get_sitewide_activity_feed_link() . '" title="' . __( 'Site Wide Activity RSS Feed', 'buddypress' ) . '">' . __( '[RSS]', 'buddypress' ) . '</a>'
+                   . $after_title; ?>
+
+                <?php if ( is_user_logged_in() ) : ?>
+                <form action="" method="post" id="whats-new-form" name="whats-new-form">
+                        <div id="whats-new-avatar">
+                                <?php bp_loggedin_user_avatar('width=40&height=40') ?>
+                                <span class="loading"></span>
+                        </div>
+
+                        <h5>
+                                <?php
+                                        $fullname = (array)explode( ' ', $bp->loggedin_user->fullname );
+                                        printf( __( "What's new %s?", 'buddypress' ), $fullname[0] )
+                                ?>
+                        </h5>
+
+                        <div id="whats-new-content">
+                                <div id="whats-new-textarea">
+                                        <textarea name="whats-new" id="whats-new" value="" /></textarea>
+                                </div>
+
+                                <div id="whats-new-options">
+                                        <div id="whats-new-submit">
+                                                <span class="ajax-loader"></span> &nbsp;
+                                                <input type="submit" name="aw-whats-new-submit" id="aw-whats-new-submit" value="<?php _e( 'Post Update', 'callisto' ) ?>" />
+                                        </div>
+
+                                        <div id="whats-new-post-in-box">
+                                                <?php _e( 'Post in', 'callisto' ) ?>:
+
+                                                <select id="whats-new-post-in" name="whats-new-post-in">
+                                                        <option selected="selected" value="0"><?php _e( 'My Profile', 'buddypress' ) ?></option>
+                                                        <?php if ( bp_has_groups( 'user_id=' . bp_loggedin_user_id() . '&type=alphabetical&max=100&per_page=100' ) ) : while ( bp_groups() ) : bp_the_group(); ?>
+                                                                <option value="<?php bp_group_id() ?>"><?php bp_group_name() ?></option>
+                                                        <?php endwhile; endif; ?>
+                                                </select>
+                                        </div>
+                                </div>
+
+                                <div class="clear"></div>
+
+                        </div>
+
+                        <?php wp_nonce_field( 'post_update', '_wpnonce_post_update' ); ?>
+                </form>
+                <?php endif; ?>
+
+                <div class="item-list-tabs">
+                        <ul>
+                                <li class="selected" id="activity-all"><a href="<?php bp_root_domain() ?>"><?php _e( 'All Members', 'buddypress' ) ?></a></li>
+
+                                <?php if ( is_user_logged_in() ) : ?>
+                                        <li id="activity-friends"><a href="<?php echo bp_loggedin_user_domain() . BP_ACTIVITY_SLUG . '/my-friends/' ?>"><?php _e( 'My Friends', 'buddypress') ?></a></li>
+                                        <li id="activity-groups"><a href="<?php echo bp_loggedin_user_domain() . BP_ACTIVITY_SLUG . '/my-groups/' ?>"><?php _e( 'My Groups', 'buddypress') ?></a></li>
+                                <?php endif; ?>
+
+                                <?php do_action( 'bp_activity_types' ) ?>
+
+                                <li id="activity-filter-select">
+                                        <select>
+                                                <option value="-1"><?php _e( 'No Filter', 'buddypress' ) ?></option>
+                                                <option value="new_wire_post"><?php _e( 'Updates Only', 'buddypress' ) ?></option>
+                                                <option value="new_forum_post,new_forum_topic"><?php _e( 'Group Forum Activity Only', 'buddypress' ) ?></option>
+                                                <option value="new_blog_post,new_blog_comment"><?php _e( 'Blog Activity Only', 'buddypress' ) ?></option>
+
+                                                <?php do_action( 'bp_activity_filter_options' ) ?>
+                                        </select>
+                                </li>
+                        </ul>
+                </div>
+
+                <div class="activity">
+                        <?php // The loop will be loaded here via AJAX on page load to retain settings. ?>
+                </div>
+
+                <form action="" name="activity-widget-form" id="activity-widget-form" method="post">
+                        <?php wp_nonce_field( 'activity_filter', '_wpnonce_activity_filter' ) ?>
+                        <input type="hidden" id="aw-querystring" name="aw-querystring" value="" />
+                        <input type="hidden" id="aw-oldestpage" name="aw-oldestpage" value="1" />
+                </div>
+
+        <?php echo $after_widget; ?>
+        <?php
+        }
+
+        function update( $new_instance, $old_instance ) {
+                $instance = $old_instance;
+                $instance['max_items'] = strip_tags( $new_instance['max_items'] );
+                $instance['per_page'] = strip_tags( $new_instance['per_page'] );
+
+                return $instance;
+        }
+
+        function form( $instance ) {
+                $instance = wp_parse_args( (array) $instance, array( 'max_items' => 200, 'per_page' => 25 ) );
+                $per_page = strip_tags( $instance['per_page'] );
+                $max_items = strip_tags( $instance['max_items'] );
+                ?>
+
+                <p><label for="bp-activity-widget-sitewide-per-page"><?php _e('Number of Items Per Page:', 'buddypress'); ?> <input class="widefat" id="<?php echo $this->get_field_id( 'per_page' ); ?>" name="<?php echo $this->get_field_name( 'per_page' ); ?>" type="text" value="<?php echo attribute_escape( $per_page ); ?>" style="width: 30%" /></label></p>
+                <p><label for="bp-core-widget-members-max"><?php _e('Max items to show:', 'buddypress'); ?> <input class="widefat" id="<?php echo $this->get_field_id( 'max_items' ); ?>" name="<?php echo $this->get_field_name( 'max_items' ); ?>" type="text" value="<?php echo attribute_escape( $max_items ); ?>" style="width: 30%" /></label></p>
+        <?php
+        }
+}
+register_widget( "BP_Activity_Widget" );
+
+function bp_activity_widget_loop( $type = 'all', $filter = false, $query_string = false, $per_page = 20 ) {
+        global $bp;
+
+        if ( !$query_string ) {
+                /* Set a valid type */
+                if ( !$type || ( 'all' != $type && 'friends' != $type && 'groups' != $type ) )
+                        $type = 'all';
+
+                if ( ( 'friends' == $type || 'groups' == $type ) && !is_user_logged_in() )
+                        $type = 'all';
+
+                switch( $type ) {
+                        case 'friends':
+                                $friend_ids = implode( ',', friends_get_friend_user_ids( $bp->loggedin_user->id ) );
+                                $query_string = 'user_id=' . $friend_ids;
+                                break;
+                        case 'groups':
+                                $groups = groups_get_user_groups( $bp->loggedin_user->id );
+                                $group_ids = implode( ',', $groups['groups'] );
+                                $query_string = 'object=groups&primary_id=' . $group_ids;
+                                break;
+                }
+
+                /* Build the filter */
+                if ( $filter && $filter != '-1' )
+                        $query_string .= '&action=' . $filter;
+
+                /* Add the per_page param */
+                $query_string .= '&per_page=' . $per_page;
+        }
+
+        if ( bp_has_activities( $query_string . '&display_comments=threaded' ) ) : ?>
+                <?php echo $query_string . '&display_comments=threaded||'; // Pass the qs back to the JS. ?>
+
+                <?php if ( !$_POST['acpage'] || 1 == $_POST['acpage'] ) : ?>
+                        <ul id="site-wide-stream" class="activity-list item-list">
+                <?php endif; ?>
+
+                <?php while ( bp_activities() ) : bp_the_activity(); ?>
+                        <li class="<?php bp_activity_css_class() ?>" id="activity-<?php bp_activity_id() ?>">
+                                <div class="activity-avatar">
+                                        <?php bp_activity_avatar('type=full&width=40&height=40') ?>
+                                </div>
+
+                                <div class="activity-content">
+                                        <?php bp_activity_content() ?>
+
+                                        <?php if ( is_user_logged_in() ) : ?>
+                                        <div class="activity-meta">
+                                                <a href="#acomment-<?php bp_activity_id() ?>" class="acomment-reply" id="acomment-comment-<?php bp_activity_id() ?>"><?php _e( 'Comment', 'buddypress' ) ?> (<?php bp_activity_comment_count() ?>)</a>
+                                        </div>
+                                        <?php endif; ?>
+                                </div>
+
+                                <div class="activity-comments">
+                                        <?php bp_activity_comments() ?>
+
+                                        <?php if ( is_user_logged_in() ) : ?>
+                                        <form action="" method="post" name="activity-comment-form" id="ac-form-<?php bp_activity_id() ?>" class="ac-form">
+                                                <div class="ac-reply-avatar"><?php bp_loggedin_user_avatar( 'width=25&height=25' ) ?></div>
+                                                <div class="ac-reply-content">
+                                                        <div class="ac-textarea">
+                                                                <textarea id="ac-input-<?php bp_activity_id() ?>" class="ac-input" name="ac-input-<?php bp_activity_id() ?>"></textarea>
+                                                        </div>
+                                                        <input type="submit" name="ac-form-submit" value="<?php _e( 'Post', 'buddypress' ) ?> &rarr;" />
+                                                </div>
+                                                <?php wp_nonce_field( 'new_activity_comment', '_wpnonce_new_activity_comment' ) ?>
+                                        </form>
+                                        <?php endif; ?>
+                                </div>
+
+                        </li>
+                <?php endwhile; ?>
+                        <li class="load-more">
+                                <a href="#more"><?php _e( 'Load More', 'buddypress' ) ?></a> &nbsp; <span class="ajax-loader"></span>
+                        </li>
+
+                <?php if ( !$_POST['acpage'] || 1 == $_POST['acpage']  ) : ?>
+                        </ul>
+                <?php endif; ?>
+
+        <?php else: ?>
+<?php echo "-1<div id='message' class='info'><p>" . __( 'No activity found', 'buddypress' ) . '</p></div>'; ?>
+        <?php endif;
+}
+
+/* The ajax function to reload the activity widget. In here because this is a self contained widget. */
+function bp_activity_ajax_widget_filter() {
+        bp_activity_widget_loop( $_POST['type'], $_POST['filter'] );
+}
+add_action( 'wp_ajax_activity_widget_filter', 'bp_activity_ajax_widget_filter' );
+
+/* The ajax function to load older updates at the end of the list */
+function bp_activity_ajax_load_older_updates() {
+        bp_activity_widget_loop( false, false, $_POST['query_string'] );
+}
+add_action( 'wp_ajax_aw_get_older_updates', 'bp_activity_ajax_load_older_updates' );
+
 ?>