Changeset 3745
- Timestamp:
- 01/19/2011 02:55:32 PM (13 years ago)
- Location:
- trunk
- Files:
-
- 7 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/bp-core.php
r3743 r3745 362 362 return false; 363 363 364 $hooks = array(); 365 364 366 // Add the administration tab under the "Site Admin" tab for site administrators 365 $hook = bp_core_add_admin_menu_page( array(367 $hooks[] = bp_core_add_admin_menu_page( array( 366 368 'menu_title' => __( 'BuddyPress', 'buddypress' ), 367 369 'page_title' => __( 'BuddyPress', 'buddypress' ), … … 372 374 ) ); 373 375 374 add_submenu_page( 'bp-general-settings', __( 'BuddyPress Dashboard', 'buddypress' ), __( 'Dashboard', 'buddypress' ), 'manage_options', 'bp-general-settings', 'bp_core_admin_dashboard' ); 375 add_submenu_page( 'bp-general-settings', __( 'Settings', 'buddypress' ), __( 'Settings', 'buddypress' ), 'manage_options', 'bp-settings', 'bp_core_admin_settings' ); 376 $hooks[] = add_submenu_page( 'bp-general-settings', __( 'BuddyPress Dashboard', 'buddypress' ), __( 'Dashboard', 'buddypress' ), 'manage_options', 'bp-general-settings', 'bp_core_admin_dashboard' ); 377 $hooks[] = add_submenu_page( 'bp-general-settings', __( 'Settings', 'buddypress' ), __( 'Settings', 'buddypress' ), 'manage_options', 'bp-settings', 'bp_core_admin_settings' ); 378 $hooks[] = add_submenu_page( 'bp-general-settings', __( 'Component Setup', 'buddypress' ), __( 'Component Setup', 'buddypress' ), 'manage_options', 'bp-component-setup', 'bp_core_admin_component_setup' ); 376 379 377 380 // Add a hook for css/js 378 add_action( "admin_print_styles-$hook", 'bp_core_add_admin_menu_styles' ); 381 foreach( $hooks as $hook ) { 382 add_action( "admin_print_styles-$hook", 'bp_core_add_admin_menu_styles' ); 383 } 379 384 } 380 385 add_action( is_multisite() ? 'network_admin_menu' : 'admin_menu', 'bp_core_add_admin_menu', 9 ); -
trunk/bp-core/admin/bp-core-admin.php
r3728 r3745 185 185 186 186 <?php $disabled_components = get_site_option( 'bp-deactivated-components' ); ?> 187 188 <table class="form-table" style="width: 80%"> 189 <tbody> 190 191 <?php if ( file_exists( BP_PLUGIN_DIR . '/bp-activity.php') ) : ?> 192 193 <tr> 194 <td><h3><?php _e( 'Activity Streams', 'buddypress' ) ?></h3><p><?php _e( 'Allow users to post activity updates and track all activity across the entire site.', 'buddypress' ) ?></p></td> 195 <td> 196 <input type="radio" name="bp_components[bp-activity.php]" value="1"<?php if ( !isset( $disabled_components['bp-activity.php'] ) ) : ?> checked="checked" <?php endif; ?>/> <?php _e( 'Enabled', 'buddypress' ) ?> 197 <input type="radio" name="bp_components[bp-activity.php]" value="0"<?php if ( isset( $disabled_components['bp-activity.php'] ) ) : ?> checked="checked" <?php endif; ?>/> <?php _e( 'Disabled', 'buddypress' ) ?> 198 </td> 199 </tr> 200 201 <?php endif; ?> 202 203 <?php if ( file_exists( BP_PLUGIN_DIR . '/bp-blogs.php') && is_multisite() ) : ?> 204 205 <tr> 206 <td><h3><?php _e( 'Blog Tracking', 'buddypress' ) ?></h3><p><?php _e( 'Tracks blogs, blog posts and blogs comments for a user across a WPMU installation.', 'buddypress' ) ?></p></td> 207 <td> 208 <input type="radio" name="bp_components[bp-blogs.php]" value="1"<?php if ( !isset( $disabled_components['bp-blogs.php'] ) ) : ?> checked="checked" <?php endif; ?>/> <?php _e( 'Enabled', 'buddypress' ) ?> 209 <input type="radio" name="bp_components[bp-blogs.php]" value="0"<?php if ( isset( $disabled_components['bp-blogs.php'] ) ) : ?> checked="checked" <?php endif; ?>/> <?php _e( 'Disabled', 'buddypress' ) ?> 210 </td> 211 </tr> 212 213 <?php else: ?> 214 215 <input type="hidden" name="bp_components[bp-blogs.php]" value="0" /> 216 217 <?php endif; ?> 218 219 <?php if ( file_exists( BP_PLUGIN_DIR . '/bp-forums.php') ) : ?> 220 221 <tr> 222 <td><h3><?php _e( 'bbPress Forums', 'buddypress' ) ?></h3><p><?php _e( 'Activates bbPress forum support within BuddyPress groups or any other custom component.', 'buddypress' ) ?></p></td> 223 <td> 224 <input type="radio" name="bp_components[bp-forums.php]" value="1"<?php if ( !isset( $disabled_components['bp-forums.php'] ) ) : ?> checked="checked" <?php endif; ?>/> <?php _e( 'Enabled', 'buddypress' ) ?> 225 <input type="radio" name="bp_components[bp-forums.php]" value="0"<?php if ( isset( $disabled_components['bp-forums.php'] ) ) : ?> checked="checked" <?php endif; ?>/> <?php _e( 'Disabled', 'buddypress' ) ?> 226 </td> 227 </tr> 228 229 <?php endif; ?> 230 231 <?php if ( file_exists( BP_PLUGIN_DIR . '/bp-friends.php') ) : ?> 232 233 <tr> 234 <td><h3><?php _e( 'Friends', 'buddypress' ) ?></h3><p><?php _e( 'Allows the creation of friend connections between users.', 'buddypress' ) ?></p></td> 235 <td> 236 <input type="radio" name="bp_components[bp-friends.php]" value="1"<?php if ( !isset( $disabled_components['bp-friends.php'] ) ) : ?> checked="checked" <?php endif; ?>/> <?php _e( 'Enabled', 'buddypress' ) ?> 237 <input type="radio" name="bp_components[bp-friends.php]" value="0"<?php if ( isset( $disabled_components['bp-friends.php'] ) ) : ?> checked="checked" <?php endif; ?>/> <?php _e( 'Disabled', 'buddypress' ) ?> 238 </td> 239 </tr> 240 241 <?php endif; ?> 242 243 <?php if ( file_exists( BP_PLUGIN_DIR . '/bp-groups.php') ) : ?> 244 245 <tr> 246 <td><h3><?php _e( 'Groups', 'buddypress' ) ?></h3><p><?php _e( 'Let users create, join and participate in groups.', 'buddypress' ) ?></p></td> 247 <td> 248 <input type="radio" name="bp_components[bp-groups.php]" value="1"<?php if ( !isset( $disabled_components['bp-groups.php'] ) ) : ?> checked="checked" <?php endif; ?>/> <?php _e( 'Enabled', 'buddypress' ) ?> 249 <input type="radio" name="bp_components[bp-groups.php]" value="0"<?php if ( isset( $disabled_components['bp-groups.php'] ) ) : ?> checked="checked" <?php endif; ?>/> <?php _e( 'Disabled', 'buddypress' ) ?> 250 </td> 251 </tr> 252 253 <?php endif; ?> 254 255 <?php if ( file_exists( BP_PLUGIN_DIR . '/bp-messages.php') ) : ?> 256 257 <tr> 258 <td><h3><?php _e( 'Private Messaging', 'buddypress' ) ?></h3><p><?php _e( 'Let users send private messages to one another. Site admins can also send site-wide notices.', 'buddypress' ) ?></p></td> 259 <td> 260 <input type="radio" name="bp_components[bp-messages.php]" value="1"<?php if ( !isset( $disabled_components['bp-messages.php'] ) ) : ?> checked="checked" <?php endif; ?>/> <?php _e( 'Enabled', 'buddypress' ) ?> 261 <input type="radio" name="bp_components[bp-messages.php]" value="0"<?php if ( isset( $disabled_components['bp-messages.php'] ) ) : ?> checked="checked" <?php endif; ?>/> <?php _e( 'Disabled', 'buddypress' ) ?> 262 </td> 263 </tr> 264 265 <?php endif; ?> 266 267 <?php if ( file_exists( BP_PLUGIN_DIR . '/bp-xprofile.php') ) : ?> 268 269 <tr> 270 <td><h3><?php _e( 'Extended Profiles', 'buddypress' ) ?></h3><p><?php _e( 'Activates customizable profiles and avatars for site users.', 'buddypress' ) ?></p></td> 271 <td width="45%"> 272 <input type="radio" name="bp_components[bp-xprofile.php]" value="1"<?php if ( !isset( $disabled_components['bp-xprofile.php'] ) ) : ?> checked="checked" <?php endif; ?>/> <?php _e( 'Enabled', 'buddypress' ) ?> 273 <input type="radio" name="bp_components[bp-xprofile.php]" value="0"<?php if ( isset( $disabled_components['bp-xprofile.php'] ) ) : ?> checked="checked" <?php endif; ?>/> <?php _e( 'Disabled', 'buddypress' ) ?> 274 </td> 275 </tr> 276 277 <?php endif; ?> 278 279 </tbody> 280 </table> 281 282 <p class="submit"> 187 188 <?php bp_core_admin_component_options() ?> 189 190 <p class="submit clear"> 283 191 <input class="button-primary" type="submit" name="bp-admin-component-submit" id="bp-admin-component-submit" value="<?php _e( 'Save Settings', 'buddypress' ) ?>"/> 284 192 </p> … … 290 198 291 199 <?php 200 } 201 202 function bp_core_admin_component_options() { 203 $disabled_components = apply_filters( 'bp_deactivated_components', get_site_option( 'bp-deactivated-components' ) ); 204 ?> 205 206 <div class="component"> 207 <h5><?php _e( "Extended Profiles", 'buddypress' ) ?></h5> 208 209 <div class="radio"> 210 <input type="radio" name="bp_components[bp-xprofile.php]" value="1"<?php if ( !isset( $disabled_components['bp-xprofile.php'] ) ) : ?> checked="checked" <?php endif; ?>/> <?php _e( 'Enabled', 'buddypress' ) ?> 211 <input type="radio" name="bp_components[bp-xprofile.php]" value="0"<?php if ( isset( $disabled_components['bp-xprofile.php'] ) ) : ?> checked="checked" <?php endif; ?>/> <?php _e( 'Disabled', 'buddypress' ) ?> 212 </div> 213 214 <img src="<?php echo plugins_url( 'buddypress/screenshot-2.gif' ) ?>" alt="Activity Streams" /> 215 <p><?php _e( "Fully editable profile fields allow you to define the fields users can fill in to describe themselves. Tailor profile fields to suit your audience.", 'buddypress' ) ?></p> 216 </div> 217 218 <div class="component"> 219 <h5><?php _e( "Friend Connections", 'buddypress' ) ?></h5> 220 221 <div class="radio"> 222 <input type="radio" name="bp_components[bp-friends.php]" value="1"<?php if ( !isset( $disabled_components['bp-friends.php'] ) ) : ?> checked="checked" <?php endif; ?>/> <?php _e( 'Enabled', 'buddypress' ) ?> 223 <input type="radio" name="bp_components[bp-friends.php]" value="0"<?php if ( isset( $disabled_components['bp-friends.php'] ) ) : ?> checked="checked" <?php endif; ?>/> <?php _e( 'Disabled', 'buddypress' ) ?> 224 </div> 225 226 <img src="<?php echo plugins_url( 'buddypress/screenshot-4.gif' ) ?>" alt="Activity Streams" /> 227 <p><?php _e( "Let your users make connections so they can track the activity of others, or filter on only those users they care about the most.", 'buddypress' ) ?></p> 228 </div> 229 230 <div class="component"> 231 <h5><?php _e( "Discussion Forums", 'buddypress' ) ?></h5> 232 233 <div class="radio"> 234 <input type="radio" name="bp_components[bp-forums.php]" value="1"<?php if ( !isset( $disabled_components['bp-forums.php'] ) ) : ?> checked="checked" <?php endif; ?>/> <?php _e( 'Enabled', 'buddypress' ) ?> 235 <input type="radio" name="bp_components[bp-forums.php]" value="0"<?php if ( isset( $disabled_components['bp-forums.php'] ) ) : ?> checked="checked" <?php endif; ?>/> <?php _e( 'Disabled', 'buddypress' ) ?> 236 </div> 237 238 <img src="<?php echo plugins_url( 'buddypress/screenshot-6.gif' ) ?>" alt="Activity Streams" /> 239 <p><?php _e( "Full powered discussion forums built directly into groups allow for more conventional in-depth conversations. <strong>NOTE: This will require an extra (but easy) setup step.</strong>", 'buddypress' ) ?></p> 240 </div> 241 242 <div class="component"> 243 <h5><?php _e( "Activity Streams", 'buddypress' ) ?></h5> 244 245 <div class="radio"> 246 <input type="radio" name="bp_components[bp-activity.php]" value="1"<?php if ( !isset( $disabled_components['bp-activity.php'] ) ) : ?> checked="checked" <?php endif; ?>/> <?php _e( 'Enabled', 'buddypress' ) ?> 247 <input type="radio" name="bp_components[bp-activity.php]" value="0"<?php if ( isset( $disabled_components['bp-activity.php'] ) ) : ?> checked="checked" <?php endif; ?>/> <?php _e( 'Disabled', 'buddypress' ) ?> 248 </div> 249 250 <img src="<?php echo plugins_url( 'buddypress/screenshot-1.gif' ) ?>" alt="Activity Streams" /> 251 <p><?php _e( "Global, personal and group activity streams with threaded commenting, direct posting, favoriting and @mentions. All with full RSS feed and email notification support.", 'buddypress' ) ?></p> 252 </div> 253 254 <div class="component"> 255 <h5><?php _e( "Extensible Groups", 'buddypress' ) ?></h5> 256 257 <div class="radio"> 258 <input type="radio" name="bp_components[bp-groups.php]" value="1"<?php if ( !isset( $disabled_components['bp-groups.php'] ) ) : ?> checked="checked" <?php endif; ?>/> <?php _e( 'Enabled', 'buddypress' ) ?> 259 <input type="radio" name="bp_components[bp-groups.php]" value="0"<?php if ( isset( $disabled_components['bp-groups.php'] ) ) : ?> checked="checked" <?php endif; ?>/> <?php _e( 'Disabled', 'buddypress' ) ?> 260 </div> 261 262 <img src="<?php echo plugins_url( 'buddypress/screenshot-3.gif' ) ?>" alt="Activity Streams" /> 263 <p><?php _e( "Powerful public, private or hidden groups allow your users to break the discussion down into specific topics with a separate activity stream and member listing.", 'buddypress' ) ?></p> 264 </div> 265 266 <div class="component"> 267 <h5><?php _e( "Private Messaging", 'buddypress' ) ?></h5> 268 269 <div class="radio"> 270 <input type="radio" name="bp_components[bp-messages.php]" value="1"<?php if ( !isset( $disabled_components['bp-messages.php'] ) ) : ?> checked="checked" <?php endif; ?>/> <?php _e( 'Enabled', 'buddypress' ) ?> 271 <input type="radio" name="bp_components[bp-messages.php]" value="0"<?php if ( isset( $disabled_components['bp-messages.php'] ) ) : ?> checked="checked" <?php endif; ?>/> <?php _e( 'Disabled', 'buddypress' ) ?> 272 </div> 273 274 <img src="<?php echo plugins_url( 'buddypress/screenshot-5.gif' ) ?>" alt="Activity Streams" /> 275 <p><?php _e( "Private messaging will allow your users to talk to each other directly, and in private. Not just limited to one on one discussions, your users can send messages to multiple recipients.", 'buddypress' ) ?></p> 276 </div> 277 278 <?php if ( is_multisite() ) : ?> 279 280 <div class="component"> 281 <h5><?php _e( "Blog Tracking", 'buddypress' ) ?></h5> 282 283 <div class="radio"> 284 <input type="radio" name="bp_components[bp-blogs.php]" value="1"<?php if ( !isset( $disabled_components['bp-blogs.php'] ) ) : ?> checked="checked" <?php endif; ?>/> <?php _e( 'Enabled', 'buddypress' ) ?> 285 <input type="radio" name="bp_components[bp-blogs.php]" value="0"<?php if ( isset( $disabled_components['bp-blogs.php'] ) ) : ?> checked="checked" <?php endif; ?>/> <?php _e( 'Disabled', 'buddypress' ) ?> 286 </div> 287 288 <img src="<?php echo plugins_url( 'buddypress/screenshot-7.gif' ) ?>" alt="Activity Streams" /> 289 <p><?php _e( "Track new blogs, new posts and new comments across your entire blog network.", 'buddypress' ) ?></p> 290 </div> 291 292 <?php else: ?> 293 294 <input type="hidden" name="bp_components[bp-blogs.php]" value="0" /> 295 296 <?php endif; ?> 297 298 <?php 292 299 } 293 300 -
trunk/bp-core/admin/bp-core-update.php
r3737 r3745 299 299 if ( !current_user_can( 'activate_plugins' ) ) 300 300 return false; 301 302 if ( !function_exists( 'bp_core_admin_component_options' ) ) 303 require ( WP_PLUGIN_DIR . '/buddypress/bp-core/admin/bp-core-admin.php' ); 301 304 302 305 $disabled_components = apply_filters( 'bp_deactivated_components', get_site_option( 'bp-deactivated-components' ) ); ?> … … 304 307 <p><?php _e( "BuddyPress is made up of a number of individual components, each one adding a distinct feature. The first step is to decide which of these features you'd like to enable on your site. All features are enabled by default, and don't worry, you can change your mind at any point in the future.", 'buddypress' ) ?></p> 305 308 306 <div class="component"> 307 <h5><?php _e( "Extended Profiles", 'buddypress' ) ?></h5> 308 309 <div class="radio"> 310 <input type="radio" name="bp_components[bp-xprofile.php]" value="1"<?php if ( !isset( $disabled_components['bp-xprofile.php'] ) ) : ?> checked="checked" <?php endif; ?>/> <?php _e( 'Enabled', 'buddypress' ) ?> 311 <input type="radio" name="bp_components[bp-xprofile.php]" value="0"<?php if ( isset( $disabled_components['bp-xprofile.php'] ) ) : ?> checked="checked" <?php endif; ?>/> <?php _e( 'Disabled', 'buddypress' ) ?> 312 </div> 313 314 <img src="<?php echo plugins_url( 'buddypress/screenshot-2.gif' ) ?>" alt="Activity Streams" /> 315 <p><?php _e( "Fully editable profile fields allow you to define the fields users can fill in to describe themselves. Tailor profile fields to suit your audience.", 'buddypress' ) ?></p> 316 </div> 317 318 <div class="component"> 319 <h5><?php _e( "Friend Connections", 'buddypress' ) ?></h5> 320 321 <div class="radio"> 322 <input type="radio" name="bp_components[bp-friends.php]" value="1"<?php if ( !isset( $disabled_components['bp-friends.php'] ) ) : ?> checked="checked" <?php endif; ?>/> <?php _e( 'Enabled', 'buddypress' ) ?> 323 <input type="radio" name="bp_components[bp-friends.php]" value="0"<?php if ( isset( $disabled_components['bp-friends.php'] ) ) : ?> checked="checked" <?php endif; ?>/> <?php _e( 'Disabled', 'buddypress' ) ?> 324 </div> 325 326 <img src="<?php echo plugins_url( 'buddypress/screenshot-4.gif' ) ?>" alt="Activity Streams" /> 327 <p><?php _e( "Let your users make connections so they can track the activity of others, or filter on only those users they care about the most.", 'buddypress' ) ?></p> 328 </div> 329 330 <div class="component"> 331 <h5><?php _e( "Discussion Forums", 'buddypress' ) ?></h5> 332 333 <div class="radio"> 334 <input type="radio" name="bp_components[bp-forums.php]" value="1"<?php if ( !isset( $disabled_components['bp-forums.php'] ) ) : ?> checked="checked" <?php endif; ?>/> <?php _e( 'Enabled', 'buddypress' ) ?> 335 <input type="radio" name="bp_components[bp-forums.php]" value="0"<?php if ( isset( $disabled_components['bp-forums.php'] ) ) : ?> checked="checked" <?php endif; ?>/> <?php _e( 'Disabled', 'buddypress' ) ?> 336 </div> 337 338 <img src="<?php echo plugins_url( 'buddypress/screenshot-6.gif' ) ?>" alt="Activity Streams" /> 339 <p><?php _e( "Full powered discussion forums built directly into groups allow for more conventional in-depth conversations. <strong>NOTE: This will require an extra (but easy) setup step.</strong>", 'buddypress' ) ?></p> 340 </div> 341 342 <div class="component"> 343 <h5><?php _e( "Activity Streams", 'buddypress' ) ?></h5> 344 345 <div class="radio"> 346 <input type="radio" name="bp_components[bp-activity.php]" value="1"<?php if ( !isset( $disabled_components['bp-activity.php'] ) ) : ?> checked="checked" <?php endif; ?>/> <?php _e( 'Enabled', 'buddypress' ) ?> 347 <input type="radio" name="bp_components[bp-activity.php]" value="0"<?php if ( isset( $disabled_components['bp-activity.php'] ) ) : ?> checked="checked" <?php endif; ?>/> <?php _e( 'Disabled', 'buddypress' ) ?> 348 </div> 349 350 <img src="<?php echo plugins_url( 'buddypress/screenshot-1.gif' ) ?>" alt="Activity Streams" /> 351 <p><?php _e( "Global, personal and group activity streams with threaded commenting, direct posting, favoriting and @mentions. All with full RSS feed and email notification support.", 'buddypress' ) ?></p> 352 </div> 353 354 <div class="component"> 355 <h5><?php _e( "Extensible Groups", 'buddypress' ) ?></h5> 356 357 <div class="radio"> 358 <input type="radio" name="bp_components[bp-groups.php]" value="1"<?php if ( !isset( $disabled_components['bp-groups.php'] ) ) : ?> checked="checked" <?php endif; ?>/> <?php _e( 'Enabled', 'buddypress' ) ?> 359 <input type="radio" name="bp_components[bp-groups.php]" value="0"<?php if ( isset( $disabled_components['bp-groups.php'] ) ) : ?> checked="checked" <?php endif; ?>/> <?php _e( 'Disabled', 'buddypress' ) ?> 360 </div> 361 362 <img src="<?php echo plugins_url( 'buddypress/screenshot-3.gif' ) ?>" alt="Activity Streams" /> 363 <p><?php _e( "Powerful public, private or hidden groups allow your users to break the discussion down into specific topics with a separate activity stream and member listing.", 'buddypress' ) ?></p> 364 </div> 365 366 <div class="component"> 367 <h5><?php _e( "Private Messaging", 'buddypress' ) ?></h5> 368 369 <div class="radio"> 370 <input type="radio" name="bp_components[bp-messages.php]" value="1"<?php if ( !isset( $disabled_components['bp-messages.php'] ) ) : ?> checked="checked" <?php endif; ?>/> <?php _e( 'Enabled', 'buddypress' ) ?> 371 <input type="radio" name="bp_components[bp-messages.php]" value="0"<?php if ( isset( $disabled_components['bp-messages.php'] ) ) : ?> checked="checked" <?php endif; ?>/> <?php _e( 'Disabled', 'buddypress' ) ?> 372 </div> 373 374 <img src="<?php echo plugins_url( 'buddypress/screenshot-5.gif' ) ?>" alt="Activity Streams" /> 375 <p><?php _e( "Private messaging will allow your users to talk to each other directly, and in private. Not just limited to one on one discussions, your users can send messages to multiple recipients.", 'buddypress' ) ?></p> 376 </div> 377 378 <?php if ( is_multisite() ) : ?> 379 380 <div class="component"> 381 <h5><?php _e( "Blog Tracking", 'buddypress' ) ?></h5> 382 383 <div class="radio"> 384 <input type="radio" name="bp_components[bp-blogs.php]" value="1"<?php if ( !isset( $disabled_components['bp-blogs.php'] ) ) : ?> checked="checked" <?php endif; ?>/> <?php _e( 'Enabled', 'buddypress' ) ?> 385 <input type="radio" name="bp_components[bp-blogs.php]" value="0"<?php if ( isset( $disabled_components['bp-blogs.php'] ) ) : ?> checked="checked" <?php endif; ?>/> <?php _e( 'Disabled', 'buddypress' ) ?> 386 </div> 387 388 <img src="<?php echo plugins_url( 'buddypress/screenshot-7.gif' ) ?>" alt="Activity Streams" /> 389 <p><?php _e( "Track new blogs, new posts and new comments across your entire blog network.", 'buddypress' ) ?></p> 390 </div> 391 392 <?php else: ?> 393 394 <input type="hidden" name="bp_components[bp-blogs.php]" value="0" /> 395 396 <?php endif; ?> 309 <?php bp_core_admin_component_options() ?> 397 310 398 311 <div class="submit clear"> -
trunk/bp-core/bp-core-templatetags.php
r3740 r3745 1800 1800 1801 1801 function bp_is_activity_component() { 1802 if ( bp_is_current_component( BP_ACTIVITY_SLUG ) )1802 if ( defined( 'BP_ACTIVITY_SLUG' ) && bp_is_current_component( BP_ACTIVITY_SLUG ) ) 1803 1803 return true; 1804 1804 … … 1807 1807 1808 1808 function bp_is_blogs_component() { 1809 if ( is_multisite() && bp_is_current_component( BP_BLOGS_SLUG ) )1809 if ( is_multisite() && defined( 'BP_BLOGS_SLUG' ) && bp_is_current_component( BP_BLOGS_SLUG ) ) 1810 1810 return true; 1811 1811 … … 1814 1814 1815 1815 function bp_is_messages_component() { 1816 if ( bp_is_current_component( BP_MESSAGES_SLUG ) )1816 if ( defined( 'BP_MESSAGES_SLUG' ) && bp_is_current_component( BP_MESSAGES_SLUG ) ) 1817 1817 return true; 1818 1818 … … 1821 1821 1822 1822 function bp_is_friends_component() { 1823 if ( bp_is_current_component( BP_FRIENDS_SLUG ) )1823 if ( defined( 'BP_FRIENDS_SLUG' ) && bp_is_current_component( BP_FRIENDS_SLUG ) ) 1824 1824 return true; 1825 1825 … … 1828 1828 1829 1829 function bp_is_groups_component() { 1830 if ( bp_is_current_component( BP_GROUPS_SLUG ) )1830 if ( defined( 'BP_GROUPS_SLUG' ) && bp_is_current_component( BP_GROUPS_SLUG ) ) 1831 1831 return true; 1832 1832 … … 1844 1844 global $bp; 1845 1845 1846 if ( $bp->displayed_user->id)1846 if ( !empty( $bp->displayed_user->id ) ) 1847 1847 return true; 1848 1848 … … 1853 1853 global $bp; 1854 1854 1855 if ( bp_is_current_component( $bp->activity->slug ) )1855 if ( !empty( $bp->activity->slug ) && bp_is_current_component( $bp->activity->slug ) ) 1856 1856 return true; 1857 1857 … … 1862 1862 global $bp; 1863 1863 1864 if ( bp_is_current_component( $bp->activity->slug ) && 'my-friends' == $bp->current_action )1864 if ( !empty( $bp->activity->slug ) && bp_is_current_component( $bp->activity->slug ) && 'my-friends' == $bp->current_action ) 1865 1865 return true; 1866 1866 … … 1871 1871 global $bp; 1872 1872 1873 if ( bp_is_current_component( BP_ACTIVITY_SLUG ) && is_numeric( $bp->current_action ) )1873 if ( defined( 'BP_ACTIVITY_SLUG' ) && bp_is_current_component( BP_ACTIVITY_SLUG ) && is_numeric( $bp->current_action ) ) 1874 1874 return true; 1875 1875 … … 1889 1889 global $bp; 1890 1890 1891 if ( bp_is_current_component( BP_XPROFILE_SLUG ) && 'edit' == $bp->current_action )1891 if ( defined( 'BP_XPROFILE_SLUG' ) && bp_is_current_component( BP_XPROFILE_SLUG ) && 'edit' == $bp->current_action ) 1892 1892 return true; 1893 1893 … … 1898 1898 global $bp; 1899 1899 1900 if ( bp_is_current_component( BP_XPROFILE_SLUG ) && 'change-avatar' == $bp->current_action )1900 if ( defined( 'BP_XPROFILE_SLUG' ) && bp_is_current_component( BP_XPROFILE_SLUG ) && 'change-avatar' == $bp->current_action ) 1901 1901 return true; 1902 1902 … … 1907 1907 global $bp; 1908 1908 1909 if ( bp_is_current_component( BP_GROUPS_SLUG ) )1909 if ( defined( 'BP_GROUPS_SLUG' ) && bp_is_current_component( BP_GROUPS_SLUG ) ) 1910 1910 return true; 1911 1911 … … 1916 1916 global $bp; 1917 1917 1918 if ( bp_is_current_component( BP_GROUPS_SLUG ) && isset( $bp->groups->current_group ) && $bp->groups->current_group )1918 if ( defined( 'BP_GROUPS_SLUG' ) && bp_is_current_component( BP_GROUPS_SLUG ) && isset( $bp->groups->current_group ) && $bp->groups->current_group ) 1919 1919 return true; 1920 1920 … … 1925 1925 global $bp; 1926 1926 1927 if ( bp_is_current_component( BP_GROUPS_SLUG ) && $bp->is_single_item && ( !$bp->current_action || 'home' == $bp->current_action ) )1927 if ( defined( 'BP_GROUPS_SLUG' ) && bp_is_current_component( BP_GROUPS_SLUG ) && $bp->is_single_item && ( !$bp->current_action || 'home' == $bp->current_action ) ) 1928 1928 return true; 1929 1929 … … 1934 1934 global $bp; 1935 1935 1936 if ( bp_is_current_component( BP_GROUPS_SLUG ) && 'create' == $bp->current_action )1936 if ( defined( 'BP_GROUPS_SLUG' ) && bp_is_current_component( BP_GROUPS_SLUG ) && 'create' == $bp->current_action ) 1937 1937 return true; 1938 1938 … … 1944 1944 global $bp; 1945 1945 1946 if ( bp_is_current_component( BP_GROUPS_SLUG ) && $bp->is_single_item && 'admin' == $bp->current_action )1946 if ( defined( 'BP_GROUPS_SLUG' ) && bp_is_current_component( BP_GROUPS_SLUG ) && $bp->is_single_item && 'admin' == $bp->current_action ) 1947 1947 return true; 1948 1948 … … 1953 1953 global $bp; 1954 1954 1955 if ( bp_is_current_component( BP_GROUPS_SLUG ) && $bp->is_single_item && 'forum' == $bp->current_action )1955 if ( defined( 'BP_GROUPS_SLUG' ) && bp_is_current_component( BP_GROUPS_SLUG ) && $bp->is_single_item && 'forum' == $bp->current_action ) 1956 1956 return true; 1957 1957 … … 1962 1962 global $bp; 1963 1963 1964 if ( bp_is_current_component( BP_GROUPS_SLUG ) && $bp->is_single_item && 'activity' == $bp->current_action )1964 if ( defined( 'BP_GROUPS_SLUG' ) && bp_is_current_component( BP_GROUPS_SLUG ) && $bp->is_single_item && 'activity' == $bp->current_action ) 1965 1965 return true; 1966 1966 … … 1971 1971 global $bp; 1972 1972 1973 if ( bp_is_current_component( BP_GROUPS_SLUG ) && $bp->is_single_item && 'forum' == $bp->current_action && isset( $bp->action_variables[0] ) && 'topic' == $bp->action_variables[0] )1973 if ( defined( 'BP_GROUPS_SLUG' ) && bp_is_current_component( BP_GROUPS_SLUG ) && $bp->is_single_item && 'forum' == $bp->current_action && isset( $bp->action_variables[0] ) && 'topic' == $bp->action_variables[0] ) 1974 1974 return true; 1975 1975 … … 1980 1980 global $bp; 1981 1981 1982 if ( bp_is_current_component( BP_GROUPS_SLUG ) && $bp->is_single_item && 'forum' == $bp->current_action && isset( $bp->action_variables[0] ) && 'topic' == $bp->action_variables[0] && isset( $bp->action_variables[2] ) && 'edit' == $bp->action_variables[2] )1982 if ( defined( 'BP_GROUPS_SLUG' ) && bp_is_current_component( BP_GROUPS_SLUG ) && $bp->is_single_item && 'forum' == $bp->current_action && isset( $bp->action_variables[0] ) && 'topic' == $bp->action_variables[0] && isset( $bp->action_variables[2] ) && 'edit' == $bp->action_variables[2] ) 1983 1983 return true; 1984 1984 … … 1989 1989 global $bp; 1990 1990 1991 if ( bp_is_current_component( BP_GROUPS_SLUG ) && $bp->is_single_item && 'members' == $bp->current_action )1991 if ( defined( 'BP_GROUPS_SLUG' ) && bp_is_current_component( BP_GROUPS_SLUG ) && $bp->is_single_item && 'members' == $bp->current_action ) 1992 1992 return true; 1993 1993 … … 1998 1998 global $bp; 1999 1999 2000 if ( bp_is_current_component( BP_GROUPS_SLUG ) && 'send-invites' == $bp->current_action )2000 if ( defined( 'BP_GROUPS_SLUG' ) && bp_is_current_component( BP_GROUPS_SLUG ) && 'send-invites' == $bp->current_action ) 2001 2001 return true; 2002 2002 … … 2007 2007 global $bp; 2008 2008 2009 if ( bp_is_current_component( BP_GROUPS_SLUG ) && 'request-membership' == $bp->current_action )2009 if ( defined( 'BP_GROUPS_SLUG' ) && bp_is_current_component( BP_GROUPS_SLUG ) && 'request-membership' == $bp->current_action ) 2010 2010 return true; 2011 2011 … … 2016 2016 global $bp; 2017 2017 2018 if ( bp_is_current_component( BP_GROUPS_SLUG ) && $bp->is_single_item && 'leave-group' == $bp->current_action )2018 if ( defined( 'BP_GROUPS_SLUG' ) && bp_is_current_component( BP_GROUPS_SLUG ) && $bp->is_single_item && 'leave-group' == $bp->current_action ) 2019 2019 return true; 2020 2020 … … 2025 2025 global $bp; 2026 2026 2027 if ( bp_is_current_component( BP_GROUPS_SLUG ) && $bp->is_single_item )2027 if ( defined( 'BP_GROUPS_SLUG' ) && bp_is_current_component( BP_GROUPS_SLUG ) && $bp->is_single_item ) 2028 2028 return true; 2029 2029 … … 2034 2034 global $bp; 2035 2035 2036 if ( is_multisite() && bp_is_current_component( BP_BLOGS_SLUG ) )2036 if ( is_multisite() && defined( 'BP_BLOGS_SLUG' ) && bp_is_current_component( BP_BLOGS_SLUG ) ) 2037 2037 return true; 2038 2038 … … 2043 2043 global $bp; 2044 2044 2045 if ( is_multisite() && bp_is_current_component( BP_BLOGS_SLUG ) && 'recent-posts' == $bp->current_action )2045 if ( is_multisite() && defined( 'BP_BLOGS_SLUG' ) && bp_is_current_component( BP_BLOGS_SLUG ) && 'recent-posts' == $bp->current_action ) 2046 2046 return true; 2047 2047 … … 2052 2052 global $bp; 2053 2053 2054 if ( is_multisite() && bp_is_current_component( BP_BLOGS_SLUG ) && 'recent-comments' == $bp->current_action )2054 if ( is_multisite() && defined( 'BP_BLOGS_SLUG' ) && bp_is_current_component( BP_BLOGS_SLUG ) && 'recent-comments' == $bp->current_action ) 2055 2055 return true; 2056 2056 … … 2061 2061 global $bp; 2062 2062 2063 if ( is_multisite() && bp_is_current_component( BP_BLOGS_SLUG ) && 'create' == $bp->current_action )2063 if ( is_multisite() && defined( 'BP_BLOGS_SLUG' ) && bp_is_current_component( BP_BLOGS_SLUG ) && 'create' == $bp->current_action ) 2064 2064 return true; 2065 2065 … … 2068 2068 2069 2069 function bp_is_user_friends() { 2070 if ( bp_is_current_component( BP_FRIENDS_SLUG ) )2070 if ( defined( 'BP_FRIENDS_SLUG' ) && bp_is_current_component( BP_FRIENDS_SLUG ) ) 2071 2071 return true; 2072 2072 … … 2077 2077 global $bp; 2078 2078 2079 if ( bp_is_current_component( BP_FRIENDS_SLUG ) && 'requests' == $bp->current_action )2079 if ( defined( 'BP_FRIENDS_SLUG' ) && bp_is_current_component( BP_FRIENDS_SLUG ) && 'requests' == $bp->current_action ) 2080 2080 return true; 2081 2081 … … 2084 2084 2085 2085 function bp_is_user_messages() { 2086 if ( bp_is_current_component( BP_MESSAGES_SLUG ) )2086 if ( defined( 'BP_MESSAGES_SLUG' ) && bp_is_current_component( BP_MESSAGES_SLUG ) ) 2087 2087 return true; 2088 2088 … … 2093 2093 global $bp; 2094 2094 2095 if ( bp_is_current_component( BP_MESSAGES_SLUG ) && ( !$bp->current_action || 'inbox' == $bp->current_action ) )2095 if ( defined( 'BP_MESSAGES_SLUG' ) && bp_is_current_component( BP_MESSAGES_SLUG ) && ( !$bp->current_action || 'inbox' == $bp->current_action ) ) 2096 2096 return true; 2097 2097 … … 2102 2102 global $bp; 2103 2103 2104 if ( bp_is_current_component( BP_MESSAGES_SLUG ) && 'sentbox' == $bp->current_action )2104 if ( defined( 'BP_MESSAGES_SLUG' ) && bp_is_current_component( BP_MESSAGES_SLUG ) && 'sentbox' == $bp->current_action ) 2105 2105 return true; 2106 2106 … … 2112 2112 global $bp; 2113 2113 2114 if ( bp_is_current_component( BP_MESSAGES_SLUG ) && 'notices' == $bp->current_action )2114 if ( defined( 'BP_MESSAGES_SLUG' ) && bp_is_current_component( BP_MESSAGES_SLUG ) && 'notices' == $bp->current_action ) 2115 2115 return true; 2116 2116 … … 2122 2122 global $bp; 2123 2123 2124 if ( bp_is_current_component( BP_MESSAGES_SLUG ) && 'compose' == $bp->current_action )2124 if ( defined( 'BP_MESSAGES_SLUG' ) && bp_is_current_component( BP_MESSAGES_SLUG ) && 'compose' == $bp->current_action ) 2125 2125 return true; 2126 2126 -
trunk/bp-core/css/admin.dev.css
r3728 r3745 123 123 top: 5px; 124 124 } 125 125 126 126 div#bp-admin div.prev-next, div#bp-admin div.prev-next p, 127 127 div#bp-admin div.submit, div#bp-admin div.submit p { -
trunk/bp-themes/bp-default/functions.php
r3742 r3745 511 511 ); 512 512 513 if ( bp_forum_directory_is_disabled() ) {513 if ( !bp_is_active( 'forums' ) || bp_forum_directory_is_disabled() ) { 514 514 if ( !empty( $pages_args['exclude'] ) ) 515 515 $pages_args['exclude'] .= ','; -
trunk/bp-themes/bp-default/sidebar.php
r3698 r3745 57 57 58 58 <?php /* Show forum tags on the forums directory */ 59 if ( BP_FORUMS_SLUG == bp_current_component() && bp_is_directory() ) : ?>59 if ( bp_is_current_component( 'forums' ) && bp_is_directory() ) : ?> 60 60 <div id="forum-directory-tags" class="widget tags"> 61 61
Note: See TracChangeset
for help on using the changeset viewer.