<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" /><style type="text/css"><!--
#msg dl { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fc0 solid; padding: 6px; }
#msg ul, pre { overflow: auto; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<title>[BuddyPress] [3402] trunk: Adds editable title to core and group widgets.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd>3402</dd>
<dt>Author</dt> <dd>boonebgorges</dd>
<dt>Date</dt> <dd>2010-11-12 21:38:13 +0000 (Fri, 12 Nov 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Adds editable title to core and group widgets. Other miscellaneous widget improvements. Fixes #1928</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkbpcorebpcorewidgetsphp">trunk/bp-core/bp-core-widgets.php</a></li>
<li><a href="#trunkbpgroupsbpgroupswidgetsphp">trunk/bp-groups/bp-groups-widgets.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkbpcorebpcorewidgetsphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-core/bp-core-widgets.php (3401 => 3402)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-core/bp-core-widgets.php        2010-11-12 15:21:08 UTC (rev 3401)
+++ trunk/bp-core/bp-core-widgets.php        2010-11-12 21:38:13 UTC (rev 3402)
</span><span class="lines">@@ -12,7 +12,8 @@
</span><span class="cx">
</span><span class="cx"> class BP_Core_Members_Widget extends WP_Widget {
</span><span class="cx">         function bp_core_members_widget() {
</span><del>-                parent::WP_Widget( false, $name = __( 'Members', 'buddypress' ) );
</del><ins>+                $widget_ops = array( 'description' => __( 'A dynamic list of recently active, popular, and newest members', 'buddypress' ) );
+                parent::WP_Widget( false, $name = __( 'Members', 'buddypress' ), $widget_ops );
</ins><span class="cx">
</span><span class="cx">                 if ( is_active_widget( false, false, $this->id_base ) )
</span><span class="cx">                         wp_enqueue_script( 'bp_core_widget_members-js', BP_PLUGIN_URL . '/bp-core/js/widget-members.js', array('jquery') );
</span><span class="lines">@@ -28,7 +29,7 @@
</span><span class="cx">
</span><span class="cx">                 echo $before_widget;
</span><span class="cx">                 echo $before_title
</span><del>-                 . $widget_name
</del><ins>+                 . $instance['title']
</ins><span class="cx">                  . $after_title; ?>
</span><span class="cx">
</span><span class="cx">                 <?php if ( bp_has_members( 'user_id=0&type=' . $instance['member_default'] . '&max=' . $instance['max_members'] . '&populate_extras=0' ) ) : ?>
</span><span class="lines">@@ -88,6 +89,7 @@
</span><span class="cx">
</span><span class="cx">         function update( $new_instance, $old_instance ) {
</span><span class="cx">                 $instance = $old_instance;
</span><ins>+                $instance['title'] = strip_tags( $new_instance['title'] );
</ins><span class="cx">                 $instance['max_members'] = strip_tags( $new_instance['max_members'] );
</span><span class="cx">                 $instance['member_default'] = strip_tags( $new_instance['member_default'] );
</span><span class="cx">
</span><span class="lines">@@ -95,11 +97,20 @@
</span><span class="cx">         }
</span><span class="cx">
</span><span class="cx">         function form( $instance ) {
</span><del>-                $instance = wp_parse_args( (array) $instance, array( 'max_members' => 5, 'member_default' => 'active' ) );
</del><ins>+                $defaults = array(
+                        'title' => __( 'Members', 'buddypress' ),
+                        'max_members' => 5,
+                        'member_default' => 'active'
+                );
+                $instance = wp_parse_args( (array) $instance, $defaults );
+                
+                $title = strip_tags( $instance['title'] );
</ins><span class="cx">                 $max_members = strip_tags( $instance['max_members'] );
</span><span class="cx">                 $member_default = strip_tags( $instance['member_default'] );
</span><span class="cx">                 ?>
</span><span class="cx">
</span><ins>+                <p><label for="bp-core-widget-title"><?php _e('Title:', 'buddypress'); ?> <input class="widefat" id="<?php echo $this->get_field_id( 'title' ); ?>" name="<?php echo $this->get_field_name( 'title' ); ?>" type="text" value="<?php echo esc_attr( $title ); ?>" style="width: 100%" /></label></p>
+
</ins><span class="cx">                 <p><label for="bp-core-widget-members-max"><?php _e('Max members to show:', 'buddypress'); ?> <input class="widefat" id="<?php echo $this->get_field_id( 'max_members' ); ?>" name="<?php echo $this->get_field_name( 'max_members' ); ?>" type="text" value="<?php echo esc_attr( $max_members ); ?>" style="width: 30%" /></label></p>
</span><span class="cx">                                 
</span><span class="cx">                 <p>
</span><span class="lines">@@ -120,7 +131,8 @@
</span><span class="cx">
</span><span class="cx"> class BP_Core_Whos_Online_Widget extends WP_Widget {
</span><span class="cx">         function bp_core_whos_online_widget() {
</span><del>-                parent::WP_Widget( false, $name = __( "Who's Online Avatars", 'buddypress' ) );
</del><ins>+                $widget_ops = array( 'description' => __( 'Avatars of users who are currently online', 'buddypress' ) );
+                parent::WP_Widget( false, $name = __( "Who's Online Avatars", 'buddypress' ), $widget_ops );
</ins><span class="cx">         }
</span><span class="cx">
</span><span class="cx">         function widget($args, $instance) {
</span><span class="lines">@@ -130,7 +142,7 @@
</span><span class="cx">
</span><span class="cx">                 echo $before_widget;
</span><span class="cx">                 echo $before_title
</span><del>-                 . $widget_name
</del><ins>+                 . $instance['title']
</ins><span class="cx">                  . $after_title; ?>
</span><span class="cx">
</span><span class="cx">                 <?php if ( bp_has_members( 'user_id=0&type=online&per_page=' . $instance['max_members'] . '&max=' . $instance['max_members'] . '&populate_extras=0' ) ) : ?>
</span><span class="lines">@@ -155,16 +167,25 @@
</span><span class="cx">
</span><span class="cx">         function update( $new_instance, $old_instance ) {
</span><span class="cx">                 $instance = $old_instance;
</span><ins>+                $instance['title'] = strip_tags( $new_instance['title'] );
</ins><span class="cx">                 $instance['max_members'] = strip_tags( $new_instance['max_members'] );
</span><span class="cx">
</span><span class="cx">                 return $instance;
</span><span class="cx">         }
</span><span class="cx">
</span><span class="cx">         function form( $instance ) {
</span><del>-                $instance = wp_parse_args( (array) $instance, array( 'max_members' => 15 ) );
</del><ins>+                $defaults = array(
+                        'title' => __( "Who's Online", 'buddypress' ),
+                        'max_members' => 15
+                );
+                $instance = wp_parse_args( (array) $instance, $defaults );
+                
+                $title = strip_tags( $instance['title'] );
</ins><span class="cx">                 $max_members = strip_tags( $instance['max_members'] );
</span><span class="cx">                 ?>
</span><span class="cx">
</span><ins>+                <p><label for="bp-core-widget-title"><?php _e('Title:', 'buddypress'); ?> <input class="widefat" id="<?php echo $this->get_field_id( 'title' ); ?>" name="<?php echo $this->get_field_name( 'title' ); ?>" type="text" value="<?php echo esc_attr( $title ); ?>" style="width: 100%" /></label></p>
+
</ins><span class="cx">                 <p><label for="bp-core-widget-members-max"><?php _e('Max Members to show:', 'buddypress'); ?> <input class="widefat" id="<?php echo $this->get_field_id( 'max_members' ); ?>" name="<?php echo $this->get_field_name( 'max_members' ); ?>" type="text" value="<?php echo esc_attr( $max_members ); ?>" style="width: 30%" /></label></p>
</span><span class="cx">         <?php
</span><span class="cx">         }
</span><span class="lines">@@ -174,7 +195,8 @@
</span><span class="cx">
</span><span class="cx"> class BP_Core_Recently_Active_Widget extends WP_Widget {
</span><span class="cx">         function bp_core_recently_active_widget() {
</span><del>-                parent::WP_Widget( false, $name = __( 'Recently Active Member Avatars', 'buddypress' ) );
</del><ins>+                $widget_ops = array( 'description' => __( 'Avatars of recently active members', 'buddypress' ) );
+                parent::WP_Widget( false, $name = __( 'Recently Active Member Avatars', 'buddypress' ), $widget_ops );
</ins><span class="cx">         }
</span><span class="cx">
</span><span class="cx">         function widget($args, $instance) {
</span><span class="lines">@@ -184,7 +206,7 @@
</span><span class="cx">
</span><span class="cx">                 echo $before_widget;
</span><span class="cx">                 echo $before_title
</span><del>-                 . $widget_name
</del><ins>+                 . $instance['title']
</ins><span class="cx">                  . $after_title; ?>
</span><span class="cx">
</span><span class="cx">                 <?php if ( bp_has_members( 'user_id=0&type=active&per_page=' . $instance['max_members'] . '&max=' . $instance['max_members'] . '&populate_extras=0' ) ) : ?>
</span><span class="lines">@@ -209,16 +231,25 @@
</span><span class="cx">
</span><span class="cx">         function update( $new_instance, $old_instance ) {
</span><span class="cx">                 $instance = $old_instance;
</span><ins>+                $instance['title'] = strip_tags( $new_instance['title'] );
</ins><span class="cx">                 $instance['max_members'] = strip_tags( $new_instance['max_members'] );
</span><span class="cx">
</span><span class="cx">                 return $instance;
</span><span class="cx">         }
</span><span class="cx">
</span><span class="cx">         function form( $instance ) {
</span><del>-                $instance = wp_parse_args( (array) $instance, array( 'max_members' => 15 ) );
</del><ins>+                $defaults = array(
+                        'title' => 'Recently Active Members',
+                        'max_members' => 15
+                );
+                $instance = wp_parse_args( (array) $instance, $defaults );
+                
+                $title = strip_tags( $instance['title'] );
</ins><span class="cx">                 $max_members = strip_tags( $instance['max_members'] );
</span><span class="cx">                 ?>
</span><span class="cx">
</span><ins>+                <p><label for="bp-core-widget-members-title"><?php _e('Title:', 'buddypress'); ?> <input class="widefat" id="<?php echo $this->get_field_id( 'title' ); ?>" name="<?php echo $this->get_field_name( 'title' ); ?>" type="text" value="<?php echo esc_attr( $title ); ?>" style="width: 100%" /></label></p>
+
</ins><span class="cx">                 <p><label for="bp-core-widget-members-max"><?php _e('Max Members to show:', 'buddypress'); ?> <input class="widefat" id="<?php echo $this->get_field_id( 'max_members' ); ?>" name="<?php echo $this->get_field_name( 'max_members' ); ?>" type="text" value="<?php echo esc_attr( $max_members ); ?>" style="width: 30%" /></label></p>
</span><span class="cx">         <?php
</span><span class="cx">         }
</span></span></pre></div>
<a id="trunkbpgroupsbpgroupswidgetsphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-groups/bp-groups-widgets.php (3401 => 3402)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-groups/bp-groups-widgets.php        2010-11-12 15:21:08 UTC (rev 3401)
+++ trunk/bp-groups/bp-groups-widgets.php        2010-11-12 21:38:13 UTC (rev 3402)
</span><span class="lines">@@ -10,7 +10,8 @@
</span><span class="cx">
</span><span class="cx"> class BP_Groups_Widget extends WP_Widget {
</span><span class="cx">         function bp_groups_widget() {
</span><del>-                parent::WP_Widget( false, $name = __( 'Groups', 'buddypress' ) );
</del><ins>+                $widget_ops = array( 'description' => __( 'A dynamic list of recently active, popular, and newest groups', 'buddypress' ) );
+                parent::WP_Widget( false, $name = __( 'Groups', 'buddypress' ), $widget_ops );
</ins><span class="cx">
</span><span class="cx">                 if ( is_active_widget( false, false, $this->id_base ) )
</span><span class="cx">                         wp_enqueue_script( 'groups_widget_groups_list-js', BP_PLUGIN_URL . '/bp-groups/js/widget-groups.js', array('jquery') );
</span><span class="lines">@@ -26,7 +27,7 @@
</span><span class="cx">
</span><span class="cx">                 echo $before_widget;
</span><span class="cx">                 echo $before_title
</span><del>-                 . $widget_name
</del><ins>+                 . $instance['title']
</ins><span class="cx">                  . $after_title; ?>
</span><span class="cx">
</span><span class="cx">                 <?php if ( bp_has_groups( 'type=' . $instance['group_default'] . '&max=' . $instance['max_groups'] ) ) : ?>
</span><span class="lines">@@ -80,6 +81,7 @@
</span><span class="cx">
</span><span class="cx">         function update( $new_instance, $old_instance ) {
</span><span class="cx">                 $instance = $old_instance;
</span><ins>+                $instance['title'] = strip_tags( $new_instance['title'] );
</ins><span class="cx">                 $instance['max_groups'] = strip_tags( $new_instance['max_groups'] );
</span><span class="cx">                 $instance['group_default'] = strip_tags( $new_instance['group_default'] );
</span><span class="cx">
</span><span class="lines">@@ -87,10 +89,19 @@
</span><span class="cx">         }
</span><span class="cx">
</span><span class="cx">         function form( $instance ) {
</span><del>-                $instance = wp_parse_args( (array) $instance, array( 'max_groups' => 5, 'group_default' => 'active' ) );
</del><ins>+                $defaults = array(
+                        'title' => __( 'Groups', 'buddypress' ),
+                        'max_members' => 5,
+                        'group_default' => 'active'
+                );        
+                $instance = wp_parse_args( (array) $instance, $defaults );
+                
+                $title = strip_tags( $instance['title'] );
</ins><span class="cx">                 $max_groups = strip_tags( $instance['max_groups'] );
</span><span class="cx">                 $group_default = strip_tags( $instance['group_default'] );
</span><span class="cx">                 ?>
</span><ins>+                
+                <p><label for="bp-groups-widget-title"><?php _e('Title:', 'buddypress'); ?> <input class="widefat" id="<?php echo $this->get_field_id( 'title' ); ?>" name="<?php echo $this->get_field_name( 'title' ); ?>" type="text" value="<?php echo esc_attr( $title ); ?>" style="width: 100%" /></label></p>
</ins><span class="cx">
</span><span class="cx">                 <p><label for="bp-groups-widget-groups-max"><?php _e('Max groups to show:', 'buddypress'); ?> <input class="widefat" id="<?php echo $this->get_field_id( 'max_groups' ); ?>" name="<?php echo $this->get_field_name( 'max_groups' ); ?>" type="text" value="<?php echo esc_attr( $max_groups ); ?>" style="width: 30%" /></label></p>
</span><span class="cx">                 
</span></span></pre>
</div>
</div>
</body>
</html>