Changeset 3810
- Timestamp:
- 01/22/2011 10:13:25 AM (14 years ago)
- Location:
- trunk/bp-themes/bp-default
- Files:
-
- 24 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/bp-themes/bp-default/_inc/css/default.css
r3805 r3810 804 804 805 805 div.pagination { 806 margin: -20px -19px 9px -19px; 807 border-bottom: 1px solid #eaeaea; 808 padding: 10px 20px 10px 20px; 806 margin: -20px -19px 0px -19px; 807 padding: 8px 20px; 809 808 color: #888; 810 809 font-size: 11px; 811 810 height: 19px; 812 } 813 814 div.pagination#user-pag, 815 .friends div.pagination, 816 .mygroups div.pagination, 817 .myblogs div.pagination, 818 noscript div.pagination { 819 background: #f8f8f8; 811 background: #f4f4f4; 820 812 border: none; 821 p adding: 8px 15px;813 position: relative; 822 814 } 823 815 … … 841 833 842 834 div#pag-bottom { 843 margin-top: 0;835 margin-top: -1px; 844 836 } 845 837 -
trunk/bp-themes/bp-default/activity/activity-loop.php
r3771 r3810 1 <?php /* Querystring is set via AJAX in _inc/ajax.php - bp_dtheme_activity_loop() */ ?>1 <?php 2 2 3 <?php do_action( 'bp_before_activity_loop' ) ?> 3 /** 4 * BuddyPress - Activity Loop 5 * 6 * Querystring is set via AJAX in _inc/ajax.php - bp_dtheme_object_filter() 7 * 8 * @package BuddyPress 9 * @subpackage bp-default 10 */ 11 12 ?> 13 14 <?php do_action( 'bp_before_activity_loop' ); ?> 4 15 5 16 <?php if ( bp_has_activities( bp_ajax_querystring( 'activity' ) ) ) : ?> … … 8 19 <noscript> 9 20 <div class="pagination"> 10 <div class="pag-count"><?php bp_activity_pagination_count() ?></div>11 <div class="pagination-links"><?php bp_activity_pagination_links() ?></div>21 <div class="pag-count"><?php bp_activity_pagination_count(); ?></div> 22 <div class="pagination-links"><?php bp_activity_pagination_links(); ?></div> 12 23 </div> 13 24 </noscript> 14 25 15 26 <?php if ( empty( $_POST['page'] ) ) : ?> 27 16 28 <ul id="activity-stream" class="activity-list item-list"> 29 17 30 <?php endif; ?> 18 31 19 32 <?php while ( bp_activities() ) : bp_the_activity(); ?> 20 33 21 <?php include( locate_template( array( 'activity/entry.php' ), false ) ) ?>34 <?php include( locate_template( array( 'activity/entry.php' ), false ) ); ?> 22 35 23 36 <?php endwhile; ?> 24 37 25 38 <?php if ( bp_activity_has_more_items() ) : ?> 39 26 40 <li class="load-more"> 27 <a href="#more"><?php _e( 'Load More', 'buddypress' ) ?></a> <span class="ajax-loader"></span>41 <a href="#more"><?php _e( 'Load More', 'buddypress' ); ?></a> <span class="ajax-loader"></span> 28 42 </li> 43 29 44 <?php endif; ?> 30 45 31 46 <?php if ( empty( $_POST['page'] ) ) : ?> 47 32 48 </ul> 49 33 50 <?php endif; ?> 34 51 35 52 <?php else : ?> 53 36 54 <div id="message" class="info"> 37 <p><?php _e( 'Sorry, there was no activity found. Please try a different filter.', 'buddypress' ) ?></p>55 <p><?php _e( 'Sorry, there was no activity found. Please try a different filter.', 'buddypress' ); ?></p> 38 56 </div> 57 39 58 <?php endif; ?> 40 59 41 <?php do_action( 'bp_after_activity_loop' ) ?>60 <?php do_action( 'bp_after_activity_loop' ); ?> 42 61 43 62 <form action="" name="activity-loop-form" id="activity-loop-form" method="post"> 44 <?php wp_nonce_field( 'activity_filter', '_wpnonce_activity_filter' ) ?> 63 64 <?php wp_nonce_field( 'activity_filter', '_wpnonce_activity_filter' ); ?> 65 45 66 </form> -
trunk/bp-themes/bp-default/activity/entry.php
r3771 r3810 1 <?php /* This template is used by activity-loop.php and AJAX functions to show each activity */ ?>1 <?php 2 2 3 <?php do_action( 'bp_before_activity_entry' ) ?> 3 /** 4 * BuddyPress - Activity Stream (Single Item) 5 * 6 * This template is used by activity-loop.php and AJAX functions to show 7 * each activity. 8 * 9 * @package BuddyPress 10 * @subpackage bp-default 11 */ 4 12 5 <li class="<?php bp_activity_css_class() ?>" id="activity-<?php bp_activity_id() ?>"> 13 ?> 14 15 <?php do_action( 'bp_before_activity_entry' ); ?> 16 17 <li class="<?php bp_activity_css_class(); ?>" id="activity-<?php bp_activity_id(); ?>"> 6 18 <div class="activity-avatar"> 7 <a href="<?php bp_activity_user_link() ?>"> 8 <?php bp_activity_avatar( 'type=full&width=100&height=100' ) ?> 19 <a href="<?php bp_activity_user_link(); ?>"> 20 21 <?php bp_activity_avatar( 'type=full&width=100&height=100' ); ?> 22 9 23 </a> 10 24 </div> … … 13 27 14 28 <div class="activity-header"> 15 <?php bp_activity_action() ?> 29 30 <?php bp_activity_action(); ?> 31 16 32 </div> 17 33 18 34 <?php if ( bp_activity_has_content() ) : ?> 35 19 36 <div class="activity-inner"> 20 <?php bp_activity_content_body() ?> 37 38 <?php bp_activity_content_body(); ?> 39 21 40 </div> 41 22 42 <?php endif; ?> 23 43 24 <?php do_action( 'bp_activity_entry_content' ) ?>44 <?php do_action( 'bp_activity_entry_content' ); ?> 25 45 26 46 <div class="activity-meta"> 47 27 48 <?php if ( is_user_logged_in() && bp_activity_can_comment() ) : ?> 28 <a href="<?php bp_activity_comment_link() ?>" class="acomment-reply" id="acomment-comment-<?php bp_activity_id() ?>"><?php _e( 'Reply', 'buddypress' ) ?> (<span><?php bp_activity_comment_count() ?></span>)</a> 49 50 <a href="<?php bp_activity_comment_link(); ?>" class="acomment-reply" id="acomment-comment-<?php bp_activity_id(); ?>"><?php _e( 'Reply', 'buddypress' ); ?> (<span><?php bp_activity_comment_count(); ?></span>)</a> 51 29 52 <?php endif; ?> 30 53 31 <?php if ( is_user_logged_in() && bp_activity_can_favorite() ) : ?> 32 <?php if ( !bp_get_activity_is_favorite() ) : ?> 54 <?php if ( is_user_logged_in() && bp_activity_can_favorite() ) : 55 if ( !bp_get_activity_is_favorite() ) : ?> 56 33 57 <a href="<?php bp_activity_favorite_link() ?>" class="fav" title="<?php _e( 'Mark as Favorite', 'buddypress' ) ?>"><?php _e( 'Favorite', 'buddypress' ) ?></a> 58 34 59 <?php else : ?> 60 35 61 <a href="<?php bp_activity_unfavorite_link() ?>" class="unfav" title="<?php _e( 'Remove Favorite', 'buddypress' ) ?>"><?php _e( 'Remove Favorite', 'buddypress' ) ?></a> 36 <?php endif; ?>37 <?php endif;?>38 62 39 <?php do_action( 'bp_activity_entry_meta' ) ?> 63 <?php endif; 64 endif; ?> 65 66 <?php do_action( 'bp_activity_entry_meta' ); ?> 40 67 </div> 41 68 </div> 42 69 43 70 <?php if ( 'activity_comment' == bp_get_activity_type() ) : ?> 71 44 72 <div class="activity-inreplyto"> 45 <strong><?php _e( 'In reply to', 'buddypress' ) ?></strong> - <?php bp_activity_parent_content()?> ·46 <a href="<?php bp_activity_thread_permalink() ?>" class="view" title="<?php _e( 'View Thread / Permalink', 'buddypress' ) ?>"><?php _e( 'View', 'buddypress' )?></a>73 <strong><?php _e( 'In reply to', 'buddypress' ); ?></strong> - <?php bp_activity_parent_content(); ?> · 74 <a href="<?php bp_activity_thread_permalink(); ?>" class="view" title="<?php _e( 'View Thread / Permalink', 'buddypress' ); ?>"><?php _e( 'View', 'buddypress' ); ?></a> 47 75 </div> 76 48 77 <?php endif; ?> 49 78 50 <?php do_action( 'bp_before_activity_entry_comments' ) ?>79 <?php do_action( 'bp_before_activity_entry_comments' ); ?> 51 80 52 81 <?php if ( bp_activity_can_comment() ) : ?> 53 82 <div class="activity-comments"> 54 <?php bp_activity_comments() ?> 83 84 <?php bp_activity_comments(); ?> 55 85 56 86 <?php if ( is_user_logged_in() ) : ?> 57 <form action="<?php bp_activity_comment_form_action() ?>" method="post" id="ac-form-<?php bp_activity_id() ?>" class="ac-form"<?php bp_activity_comment_form_nojs_display() ?>> 58 <div class="ac-reply-avatar"><?php bp_loggedin_user_avatar( 'width=' . BP_AVATAR_THUMB_WIDTH . '&height=' . BP_AVATAR_THUMB_HEIGHT ) ?></div> 87 88 <form action="<?php bp_activity_comment_form_action(); ?>" method="post" id="ac-form-<?php bp_activity_id(); ?>" class="ac-form"<?php bp_activity_comment_form_nojs_display(); ?>> 89 <div class="ac-reply-avatar"><?php bp_loggedin_user_avatar( 'width=' . BP_AVATAR_THUMB_WIDTH . '&height=' . BP_AVATAR_THUMB_HEIGHT ); ?></div> 59 90 <div class="ac-reply-content"> 60 91 <div class="ac-textarea"> 61 <textarea id="ac-input-<?php bp_activity_id() ?>" class="ac-input" name="ac_input_<?php bp_activity_id()?>"></textarea>92 <textarea id="ac-input-<?php bp_activity_id(); ?>" class="ac-input" name="ac_input_<?php bp_activity_id(); ?>"></textarea> 62 93 </div> 63 <input type="submit" name="ac_form_submit" value="<?php _e( 'Post', 'buddypress' ) ?> →" /> <?php _e( 'or press esc to cancel.', 'buddypress' )?>64 <input type="hidden" name="comment_form_id" value="<?php bp_activity_id() ?>" />94 <input type="submit" name="ac_form_submit" value="<?php _e( 'Post', 'buddypress' ); ?> →" /> <?php _e( 'or press esc to cancel.', 'buddypress' ); ?> 95 <input type="hidden" name="comment_form_id" value="<?php bp_activity_id(); ?>" /> 65 96 </div> 66 <?php wp_nonce_field( 'new_activity_comment', '_wpnonce_new_activity_comment' ) ?> 97 98 <?php wp_nonce_field( 'new_activity_comment', '_wpnonce_new_activity_comment' ); ?> 99 67 100 </form> 101 68 102 <?php endif; ?> 103 69 104 </div> 105 70 106 <?php endif; ?> 71 107 72 <?php do_action( 'bp_after_activity_entry_comments' ) ?> 108 <?php do_action( 'bp_after_activity_entry_comments' ); ?> 109 73 110 </li> 74 111 75 <?php do_action( 'bp_after_activity_entry' ) ?> 76 112 <?php do_action( 'bp_after_activity_entry' ); ?> -
trunk/bp-themes/bp-default/activity/index.php
r3797 r3810 4 4 * Template Name: BuddyPress - Activity Directory 5 5 * 6 * @package bbPress6 * @package BuddyPress 7 7 * @subpackage Theme 8 8 */ -
trunk/bp-themes/bp-default/activity/post-form.php
r3771 r3810 1 < form action="<?php bp_activity_post_form_action() ?>" method="post" id="whats-new-form" name="whats-new-form" role="complementary">1 <?php 2 2 3 <?php do_action( 'bp_before_activity_post_form' ) ?> 3 /** 4 * BuddyPress - Activity Post Form 5 * 6 * @package BuddyPress 7 * @subpackage bp-default 8 */ 9 10 ?> 11 12 <form action="<?php bp_activity_post_form_action(); ?>" method="post" id="whats-new-form" name="whats-new-form" role="complementary"> 13 14 <?php do_action( 'bp_before_activity_post_form' ); ?> 4 15 5 16 <?php if ( isset( $_GET['r'] ) ) : ?> 6 17 <div id="message" class="info"> 7 <p><?php printf( __( 'You are mentioning %s in a new update, this user will be sent a notification of your message.', 'buddypress' ), bp_get_mentioned_user_display_name( $_GET['r'] ) ) ?></p>18 <p><?php printf( __( 'You are mentioning %s in a new update, this user will be sent a notification of your message.', 'buddypress' ), bp_get_mentioned_user_display_name( $_GET['r'] ) ); ?></p> 8 19 </div> 9 20 <?php endif; ?> 10 21 11 22 <div id="whats-new-avatar"> 12 <a href="<?php echo bp_loggedin_user_domain() ?>">13 <?php bp_loggedin_user_avatar( 'width=' . BP_AVATAR_THUMB_WIDTH . '&height=' . BP_AVATAR_THUMB_HEIGHT ) ?>23 <a href="<?php echo bp_loggedin_user_domain(); ?>"> 24 <?php bp_loggedin_user_avatar( 'width=' . BP_AVATAR_THUMB_WIDTH . '&height=' . BP_AVATAR_THUMB_HEIGHT ); ?> 14 25 </a> 15 26 </div> 16 27 17 <h5> 18 <?php if ( bp_is_group() ) : ?> 19 <?php printf( __( "What's new in %s, %s?", 'buddypress' ), bp_get_group_name(), bp_get_user_firstname() ) ?> 20 <?php else : ?> 21 <?php printf( __( "What's new, %s?", 'buddypress' ), bp_get_user_firstname() ) ?> 22 <?php endif; ?> 23 </h5> 28 <h5><?php if ( bp_is_group() ) 29 printf( __( "What's new in %s, %s?", 'buddypress' ), bp_get_group_name(), bp_get_user_firstname() ); 30 else 31 printf( __( "What's new, %s?", 'buddypress' ), bp_get_user_firstname() ); 32 ?></h5> 24 33 25 34 <div id="whats-new-content"> 26 35 <div id="whats-new-textarea"> 27 <textarea name="whats-new" id="whats-new" cols="50" rows="10"><?php if ( isset( $_GET['r'] ) ) : ?>@<?php echo esc_attr( $_GET['r'] ) ?> <?php endif; ?></textarea>36 <textarea name="whats-new" id="whats-new" cols="50" rows="10"><?php if ( isset( $_GET['r'] ) ) : ?>@<?php echo esc_attr( $_GET['r'] ); ?> <?php endif; ?></textarea> 28 37 </div> 29 38 … … 31 40 <div id="whats-new-submit"> 32 41 <span class="ajax-loader"></span> 33 <input type="submit" name="aw-whats-new-submit" id="aw-whats-new-submit" value="<?php _e( 'Post Update', 'buddypress' ) ?>" />42 <input type="submit" name="aw-whats-new-submit" id="aw-whats-new-submit" value="<?php _e( 'Post Update', 'buddypress' ); ?>" /> 34 43 </div> 35 44 36 45 <?php if ( bp_is_active( 'groups' ) && !bp_is_my_profile() && !bp_is_group() ) : ?> 46 37 47 <div id="whats-new-post-in-box"> 48 38 49 <?php _e( 'Post in', 'buddypress' ) ?>: 39 50 40 51 <select id="whats-new-post-in" name="whats-new-post-in"> 41 <option selected="selected" value="0"><?php _e( 'My Profile', 'buddypress' ) ?></option>52 <option selected="selected" value="0"><?php _e( 'My Profile', 'buddypress' ); ?></option> 42 53 43 <?php if ( bp_has_groups( 'user_id=' . bp_loggedin_user_id() . '&type=alphabetical&max=100&per_page=100&populate_extras=0' ) ) : while ( bp_groups() ) : bp_the_group(); ?> 44 <option value="<?php bp_group_id() ?>"><?php bp_group_name() ?></option> 45 <?php endwhile; endif; ?> 54 <?php if ( bp_has_groups( 'user_id=' . bp_loggedin_user_id() . '&type=alphabetical&max=100&per_page=100&populate_extras=0' ) ) : 55 while ( bp_groups() ) : bp_the_group(); ?> 56 57 <option value="<?php bp_group_id(); ?>"><?php bp_group_name(); ?></option> 58 59 <?php endwhile; 60 endif; ?> 61 46 62 </select> 47 63 </div> 48 64 <input type="hidden" id="whats-new-post-object" name="whats-new-post-object" value="groups" /> 65 49 66 <?php elseif ( bp_is_group_home() ) : ?> 67 50 68 <input type="hidden" id="whats-new-post-object" name="whats-new-post-object" value="groups" /> 51 <input type="hidden" id="whats-new-post-in" name="whats-new-post-in" value="<?php bp_group_id() ?>" /> 69 <input type="hidden" id="whats-new-post-in" name="whats-new-post-in" value="<?php bp_group_id(); ?>" /> 70 52 71 <?php endif; ?> 53 72 54 <?php do_action( 'bp_activity_post_form_options' ) ?>73 <?php do_action( 'bp_activity_post_form_options' ); ?> 55 74 56 75 </div><!-- #whats-new-options --> … … 58 77 59 78 <?php wp_nonce_field( 'post_update', '_wpnonce_post_update' ); ?> 60 <?php do_action( 'bp_after_activity_post_form' ) ?>79 <?php do_action( 'bp_after_activity_post_form' ); ?> 61 80 62 81 </form><!-- #whats-new-form --> -
trunk/bp-themes/bp-default/blogs/blogs-loop.php
r3771 r3810 1 <?php /* Querystring is set via AJAX in _inc/ajax.php - bp_dtheme_object_filter() */ ?>1 <?php 2 2 3 <?php do_action( 'bp_before_blogs_loop' ) ?> 3 /** 4 * BuddyPress - Blogs Loop 5 * 6 * Querystring is set via AJAX in _inc/ajax.php - bp_dtheme_object_filter() 7 * 8 * @package BuddyPress 9 * @subpackage bp-default 10 */ 11 12 ?> 13 14 <?php do_action( 'bp_before_blogs_loop' ); ?> 4 15 5 16 <?php if ( bp_has_blogs( bp_ajax_querystring( 'blogs' ) ) ) : ?> … … 8 19 9 20 <div class="pag-count" id="blog-dir-count-top"> 10 <?php bp_blogs_pagination_count() ?>21 <?php bp_blogs_pagination_count(); ?> 11 22 </div> 12 23 13 24 <div class="pagination-links" id="blog-dir-pag-top"> 14 <?php bp_blogs_pagination_links() ?>25 <?php bp_blogs_pagination_links(); ?> 15 26 </div> 16 27 17 28 </div> 18 29 19 <?php do_action( 'bp_before_directory_blogs_list' ) ?>30 <?php do_action( 'bp_before_directory_blogs_list' ); ?> 20 31 21 32 <ul id="blogs-list" class="item-list" role="main"> 33 22 34 <?php while ( bp_blogs() ) : bp_the_blog(); ?> 23 35 24 36 <li> 25 37 <div class="item-avatar"> 26 <a href="<?php bp_blog_permalink() ?>"><?php bp_blog_avatar('type=thumb')?></a>38 <a href="<?php bp_blog_permalink(); ?>"><?php bp_blog_avatar( 'type=thumb' ); ?></a> 27 39 </div> 28 40 29 41 <div class="item"> 30 <div class="item-title"><a href="<?php bp_blog_permalink() ?>"><?php bp_blog_name()?></a></div>31 <div class="item-meta"><span class="activity"><?php bp_blog_last_active() ?></span></div>42 <div class="item-title"><a href="<?php bp_blog_permalink(); ?>"><?php bp_blog_name(); ?></a></div> 43 <div class="item-meta"><span class="activity"><?php bp_blog_last_active(); ?></span></div> 32 44 33 <?php do_action( 'bp_directory_blogs_item' ) ?>45 <?php do_action( 'bp_directory_blogs_item' ); ?> 34 46 </div> 35 47 36 48 <div class="action"> 37 49 38 <?php do_action( 'bp_directory_blogs_actions' ) ?>50 <?php do_action( 'bp_directory_blogs_actions' ); ?> 39 51 40 52 <div class="meta"> 41 <?php bp_blog_latest_post() ?> 53 54 <?php bp_blog_latest_post(); ?> 55 42 56 </div> 43 57 … … 48 62 49 63 <?php endwhile; ?> 64 50 65 </ul> 51 66 52 <?php do_action( 'bp_after_directory_blogs_list' ) ?>67 <?php do_action( 'bp_after_directory_blogs_list' ); ?> 53 68 54 <?php bp_blog_hidden_fields() ?>69 <?php bp_blog_hidden_fields(); ?> 55 70 56 71 <div id="pag-bottom" class="pagination"> 57 72 58 73 <div class="pag-count" id="blog-dir-count-bottom"> 59 <?php bp_blogs_pagination_count() ?> 74 75 <?php bp_blogs_pagination_count(); ?> 76 60 77 </div> 61 78 62 79 <div class="pagination-links" id="blog-dir-pag-bottom"> 63 <?php bp_blogs_pagination_links() ?> 80 81 <?php bp_blogs_pagination_links(); ?> 82 64 83 </div> 65 84 … … 69 88 70 89 <div id="message" class="info"> 71 <p><?php _e( 'Sorry, there were no blogs found.', 'buddypress' ) ?></p>90 <p><?php _e( 'Sorry, there were no blogs found.', 'buddypress' ); ?></p> 72 91 </div> 73 92 74 93 <?php endif; ?> 75 94 76 <?php do_action( 'bp_after_blogs_loop' ) ?>95 <?php do_action( 'bp_after_blogs_loop' ); ?> -
trunk/bp-themes/bp-default/blogs/create.php
r3771 r3810 1 <?php get_header() ?>1 <?php 2 2 3 <?php do_action( 'bp_before_directory_blogs_content' ) ?> 3 /** 4 * BuddyPress - Create Blog 5 * 6 * @package BuddyPress 7 * @subpackage bp-default 8 */ 9 10 ?> 11 12 <?php get_header(); ?> 13 14 <?php do_action( 'bp_before_directory_blogs_content' ); ?> 4 15 5 16 <div id="content"> 6 17 <div class="padder" role="main"> 7 18 8 <?php do_action( 'template_notices' ) ?>19 <?php do_action( 'template_notices' ); ?> 9 20 10 <h3><?php _e( 'Create a Blog', 'buddypress' ) ?> <a class="button" href="<?php echo bp_get_root_domain() . '/' . BP_BLOGS_SLUG . '/' ?>"><?php _e( 'Blogs Directory', 'buddypress' )?></a></h3>21 <h3><?php _e( 'Create a Blog', 'buddypress' ); ?> <a class="button" href="<?php echo trailingslashit( bp_get_root_domain() . '/' . bp_get_blogs_root_slug() ) ?>"><?php _e( 'Blogs Directory', 'buddypress' ); ?></a></h3> 11 22 12 <?php do_action( 'bp_before_create_blog_content' ) ?>23 <?php do_action( 'bp_before_create_blog_content' ); ?> 13 24 14 25 <?php if ( bp_blog_signup_enabled() ) : ?> 15 26 16 <?php bp_show_blog_signup_form() ?>27 <?php bp_show_blog_signup_form(); ?> 17 28 18 29 <?php else: ?> … … 24 35 <?php endif; ?> 25 36 26 <?php do_action( 'bp_after_create_blog_content' ) ?>37 <?php do_action( 'bp_after_create_blog_content' ); ?> 27 38 28 39 </div><!-- .padder --> 29 40 </div><!-- #content --> 30 41 31 <?php get_sidebar()?>42 <?php do_action( 'bp_after_directory_blogs_content' ); ?> 32 43 33 <?php do_action( 'bp_after_directory_blogs_content' ) ?> 44 <?php get_sidebar(); ?> 45 <?php get_footer(); ?> 34 46 35 <?php get_footer() ?>36 -
trunk/bp-themes/bp-default/blogs/index.php
r3771 r3810 1 <?php get_header() ?> 1 <?php 2 3 /** 4 * BuddyPress - Blogs Directory 5 * 6 * @package BuddyPress 7 * @subpackage bp-default 8 */ 9 10 ?> 11 12 <?php get_header(); ?> 13 14 <?php do_action( 'bp_before_directory_blogs_content' ); ?> 2 15 3 16 <div id="content"> … … 6 19 <form action="" method="post" id="blogs-directory-form" class="dir-form"> 7 20 8 <h3><?php _e( 'Blogs Directory', 'buddypress' ) ?><?php if ( is_user_logged_in() && bp_blog_signup_enabled() ) : ?> <a class="button" href="<?php echo bp_get_root_domain() . '/' . BP_BLOGS_SLUG . '/create/' ?>"><?php _e( 'Create a Blog', 'buddypress' ) ?></a><?php endif; ?></h3> 9 10 <?php do_action( 'bp_before_directory_blogs_content' ) ?> 21 <h3><?php _e( 'Blogs Directory', 'buddypress' ); ?><?php if ( is_user_logged_in() && bp_blog_signup_enabled() ) : ?> <a class="button" href="<?php echo bp_get_root_domain() . '/' . BP_BLOGS_SLUG . '/create/' ?>"><?php _e( 'Create a Blog', 'buddypress' ); ?></a><?php endif; ?></h3> 11 22 12 23 <div id="blog-dir-search" class="dir-search" role="search"> 13 <?php bp_directory_blogs_search_form() ?> 24 25 <?php bp_directory_blogs_search_form(); ?> 26 14 27 </div><!-- #blog-dir-search --> 15 28 16 29 <div class="item-list-tabs" role="navigation"> 17 30 <ul> 18 <li class="selected" id="blogs-all"><a href="<?php bp_root_domain() ?>"><?php printf( __( 'All Blogs (%s)', 'buddypress' ), bp_get_total_blog_count() )?></a></li>31 <li class="selected" id="blogs-all"><a href="<?php bp_root_domain(); ?>"><?php printf( __( 'All Blogs (%s)', 'buddypress' ), bp_get_total_blog_count() ); ?></a></li> 19 32 20 33 <?php if ( is_user_logged_in() && bp_get_total_blog_count_for_user( bp_loggedin_user_id() ) ) : ?> 21 <li id="blogs-personal"><a href="<?php echo bp_loggedin_user_domain() . BP_BLOGS_SLUG . '/my-blogs/' ?>"><?php printf( __( 'My Blogs (%s)', 'buddypress' ), bp_get_total_blog_count_for_user( bp_loggedin_user_id() ) ) ?></a></li> 34 35 <li id="blogs-personal"><a href="<?php echo bp_loggedin_user_domain() . BP_BLOGS_SLUG . '/my-blogs/' ?>"><?php printf( __( 'My Blogs (%s)', 'buddypress' ), bp_get_total_blog_count_for_user( bp_loggedin_user_id() ) ); ?></a></li> 36 22 37 <?php endif; ?> 23 38 24 <?php do_action( 'bp_blogs_directory_blog_types' ) ?> 39 <?php do_action( 'bp_blogs_directory_blog_types' ); ?> 40 41 </ul> 42 </div><!-- .item-list-tabs --> 43 44 <div class="item-list-tabs" id="subnav" role="navigation"> 45 <ul> 46 47 <?php do_action( 'bp_blogs_directory_blog_sub_types' ); ?> 25 48 26 49 <li id="blogs-order-select" class="last filter"> 27 50 28 <?php _e( 'Order By:', 'buddypress' ) ?> 51 <?php _e( 'Order By:', 'buddypress' ); ?> 52 29 53 <select> 30 <option value="active"><?php _e( 'Last Active', 'buddypress' ) ?></option>31 <option value="newest"><?php _e( 'Newest', 'buddypress' ) ?></option>32 <option value="alphabetical"><?php _e( 'Alphabetical', 'buddypress' ) ?></option>54 <option value="active"><?php _e( 'Last Active', 'buddypress' ); ?></option> 55 <option value="newest"><?php _e( 'Newest', 'buddypress' ); ?></option> 56 <option value="alphabetical"><?php _e( 'Alphabetical', 'buddypress' ); ?></option> 33 57 34 <?php do_action( 'bp_blogs_directory_order_options' ) ?> 58 <?php do_action( 'bp_blogs_directory_order_options' ); ?> 59 35 60 </select> 36 61 </li> 37 62 </ul> 38 </div> <!-- .item-list-tabs -->63 </div> 39 64 40 <?php do_action( 'bp_before_directory_blogs_list' ) ?>65 <?php do_action( 'bp_before_directory_blogs_list' ); ?> 41 66 42 67 <div id="blogs-dir-list" class="blogs dir-list"> 43 <?php locate_template( array( 'blogs/blogs-loop.php' ), true ) ?> 68 69 <?php locate_template( array( 'blogs/blogs-loop.php' ), true ); ?> 70 44 71 </div><!-- #blogs-dir-list --> 45 72 46 <?php do_action( 'bp_directory_blogs_content' ) ?>73 <?php do_action( 'bp_directory_blogs_content' ); ?> 47 74 48 <?php wp_nonce_field( 'directory_blogs', '_wpnonce-blogs-filter' ) ?> 49 50 <?php do_action( 'bp_after_directory_blogs_content' ) ?> 75 <?php wp_nonce_field( 'directory_blogs', '_wpnonce-blogs-filter' ); ?> 51 76 52 77 </form><!-- #blogs-directory-form --> … … 55 80 </div><!-- #content --> 56 81 57 <?php get_sidebar()?>82 <?php do_action( 'bp_after_directory_blogs_content' ); ?> 58 83 59 <?php get_footer() ?> 84 <?php get_sidebar(); ?> 85 <?php get_footer(); ?> -
trunk/bp-themes/bp-default/forums/forums-loop.php
r3771 r3810 1 <?php /* Querystring is set via AJAX in _inc/ajax.php - bp_dtheme_object_filter() */ ?>1 <?php 2 2 3 <?php do_action( 'bp_before_forums_loop' ) ?> 3 /** 4 * BuddyPress - Forums Loop 5 * 6 * Querystring is set via AJAX in _inc/ajax.php - bp_dtheme_object_filter() 7 * 8 * @package BuddyPress 9 * @subpackage bp-default 10 */ 11 12 ?> 13 14 <?php do_action( 'bp_before_forums_loop' ); ?> 4 15 5 16 <?php if ( bp_has_forum_topics( bp_ajax_querystring( 'forums' ) ) ) : ?> … … 8 19 9 20 <div class="pag-count" id="topic-count-top"> 10 <?php bp_forum_pagination_count() ?> 21 22 <?php bp_forum_pagination_count(); ?> 23 11 24 </div> 12 25 13 26 <div class="pagination-links" id="topic-pag-top"> 14 <?php bp_forum_pagination() ?> 27 28 <?php bp_forum_pagination(); ?> 29 15 30 </div> 16 31 17 32 </div> 18 33 19 <?php do_action( 'bp_before_directory_forums_list' ) ?>34 <?php do_action( 'bp_before_directory_forums_list' ); ?> 20 35 21 36 <table class="forum zebra"> 22 37 <thead> 23 38 <tr> 24 <th id="th-title"><?php _e( 'Topic Title', 'buddypress' ) ?></th>25 <th id="th-poster"><?php _e( 'Latest Poster', 'buddypress' ) ?></th>39 <th id="th-title"><?php _e( 'Topic Title', 'buddypress' ); ?></th> 40 <th id="th-poster"><?php _e( 'Latest Poster', 'buddypress' ); ?></th> 26 41 27 42 <?php if ( !bp_is_group_forum() ) : ?> 28 <th id="th-group"><?php _e( 'Posted In Group', 'buddypress' ) ?></th> 43 44 <th id="th-group"><?php _e( 'Posted In Group', 'buddypress' ); ?></th> 45 29 46 <?php endif; ?> 30 47 31 <th id="th-postcount"><?php _e( 'Posts', 'buddypress' ) ?></th>32 <th id="th-freshness"><?php _e( 'Freshness', 'buddypress' ) ?></th>48 <th id="th-postcount"><?php _e( 'Posts', 'buddypress' ); ?></th> 49 <th id="th-freshness"><?php _e( 'Freshness', 'buddypress' ); ?></th> 33 50 34 <?php do_action( 'bp_directory_forums_extra_cell_head' ) ?>51 <?php do_action( 'bp_directory_forums_extra_cell_head' ); ?> 35 52 36 53 </tr> … … 41 58 <?php while ( bp_forum_topics() ) : bp_the_forum_topic(); ?> 42 59 43 <tr class="<?php bp_the_topic_css_class() ?>">60 <tr class="<?php bp_the_topic_css_class(); ?>"> 44 61 <td class="td-title"> 45 <a class="topic-title" href="<?php bp_the_topic_permalink() ?>" title="<?php bp_the_topic_title() ?> - <?php _e( 'Permalink', 'buddypress' ) ?>"> 46 <?php bp_the_topic_title() ?> 62 <a class="topic-title" href="<?php bp_the_topic_permalink(); ?>" title="<?php bp_the_topic_title(); ?> - <?php _e( 'Permalink', 'buddypress' ); ?>"> 63 64 <?php bp_the_topic_title(); ?> 65 47 66 </a> 48 67 </td> 49 68 <td class="td-poster"> 50 <a href="<?php bp_the_topic_permalink() ?>"><?php bp_the_topic_last_poster_avatar( 'type=thumb&width=20&height=20' )?></a>51 <div class="poster-name"><?php bp_the_topic_last_poster_name() ?></div>69 <a href="<?php bp_the_topic_permalink(); ?>"><?php bp_the_topic_last_poster_avatar( 'type=thumb&width=20&height=20' ); ?></a> 70 <div class="poster-name"><?php bp_the_topic_last_poster_name(); ?></div> 52 71 </td> 53 72 54 73 <?php if ( !bp_is_group_forum() ) : ?> 74 55 75 <td class="td-group"> 56 <a href="<?php bp_the_topic_object_permalink() ?>"><?php bp_the_topic_object_avatar( 'type=thumb&width=20&height=20' )?></a>57 <div class="object-name"><a href="<?php bp_the_topic_object_permalink() ?>" title="<?php bp_the_topic_object_name() ?>"><?php bp_the_topic_object_name()?></a></div>76 <a href="<?php bp_the_topic_object_permalink(); ?>"><?php bp_the_topic_object_avatar( 'type=thumb&width=20&height=20' ); ?></a> 77 <div class="object-name"><a href="<?php bp_the_topic_object_permalink(); ?>" title="<?php bp_the_topic_object_name(); ?>"><?php bp_the_topic_object_name(); ?></a></div> 58 78 </td> 79 59 80 <?php endif; ?> 60 81 61 82 <td class="td-postcount"> 62 <?php bp_the_topic_total_posts() ?> 83 84 <?php bp_the_topic_total_posts(); ?> 85 63 86 </td> 64 87 <td class="td-freshness"> 65 <?php bp_the_topic_time_since_last_post() ?>88 <?php bp_the_topic_time_since_last_post(); ?> 66 89 </td> 67 90 68 <?php do_action( 'bp_directory_forums_extra_cell' ) ?> 91 <?php do_action( 'bp_directory_forums_extra_cell' ); ?> 92 69 93 </tr> 70 94 71 <?php do_action( 'bp_directory_forums_extra_row' ) ?>95 <?php do_action( 'bp_directory_forums_extra_row' ); ?> 72 96 73 97 <?php endwhile; ?> … … 76 100 </table> 77 101 78 <?php do_action( 'bp_after_directory_forums_list' ) ?>102 <?php do_action( 'bp_after_directory_forums_list' ); ?> 79 103 80 104 <div id="pag-bottom" class="pagination"> 81 105 82 106 <div class="pag-count" id="topic-count-bottom"> 83 <?php bp_forum_pagination_count() ?>107 <?php bp_forum_pagination_count(); ?> 84 108 </div> 85 109 86 110 <div class="pagination-links" id="topic-pag-bottom"> 87 <?php bp_forum_pagination() ?>111 <?php bp_forum_pagination(); ?> 88 112 </div> 89 113 … … 93 117 94 118 <div id="message" class="info"> 95 <p><?php _e( 'Sorry, there were no forum topics found.', 'buddypress' ) ?></p>119 <p><?php _e( 'Sorry, there were no forum topics found.', 'buddypress' ); ?></p> 96 120 </div> 97 121 98 <?php endif; ?>122 <?php endif; ?> 99 123 100 <?php do_action( 'bp_after_forums_loop' ) ?>124 <?php do_action( 'bp_after_forums_loop' ); ?> -
trunk/bp-themes/bp-default/forums/index.php
r3771 r3810 1 <?php get_header() ?> 1 <?php 2 3 /** 4 * BuddyPress - Forums Directory 5 * 6 * @package BuddyPress 7 * @subpackage bp-default 8 */ 9 10 ?> 11 12 <?php get_header(); ?> 13 14 <?php do_action( 'bp_before_directory_forums_content' ); ?> 2 15 3 16 <div id="content"> 4 17 <div class="padder"> 5 18 6 <?php do_action( 'bp_before_directory_forums' ) ?>19 <?php do_action( 'bp_before_directory_forums' ); ?> 7 20 8 21 <form action="" method="post" id="forums-search-form" class="dir-form"> 9 22 10 <h3><?php _e( 'Group Forums Directory', 'buddypress' ) ?><?php if ( is_user_logged_in() ) : ?> <a class="button" href="#new-topic" id="new-topic-button"><?php _e( 'New Topic', 'buddypress' ) ?></a><?php endif; ?></h3> 11 12 <?php do_action( 'bp_before_directory_forums_content' ) ?> 23 <h3><?php _e( 'Group Forums Directory', 'buddypress' ); ?><?php if ( is_user_logged_in() ) : ?> <a class="button" href="#new-topic" id="new-topic-button"><?php _e( 'New Topic', 'buddypress' ); ?></a><?php endif; ?></h3> 13 24 14 25 <div id="forums-dir-search" class="dir-search" role="search"> 15 <?php bp_directory_forums_search_form() ?> 26 27 <?php bp_directory_forums_search_form(); ?> 28 16 29 </div> 17 30 </form> 18 31 32 <?php do_action( 'bp_before_new_topic_form' ); ?> 33 19 34 <div id="new-topic-post"> 35 20 36 <?php if ( is_user_logged_in() ) : ?> 21 37 … … 27 43 28 44 <a name="post-new"></a> 29 <h5><?php _e( 'Post a New Topic:', 'buddypress' ) ?></h5>45 <h5><?php _e( 'Post a New Topic:', 'buddypress' ); ?></h5> 30 46 31 <label><?php _e( 'Title:', 'buddypress' ) ?></label>47 <label><?php _e( 'Title:', 'buddypress' ); ?></label> 32 48 <input type="text" name="topic_title" id="topic_title" value="" /> 33 49 34 <label><?php _e( 'Content:', 'buddypress' ) ?></label>50 <label><?php _e( 'Content:', 'buddypress' ); ?></label> 35 51 <textarea name="topic_text" id="topic_text"></textarea> 36 52 37 <label><?php _e( 'Tags (comma separated):', 'buddypress' ) ?></label>53 <label><?php _e( 'Tags (comma separated):', 'buddypress' ); ?></label> 38 54 <input type="text" name="topic_tags" id="topic_tags" value="" /> 39 55 40 <label><?php _e( 'Post In Group Forum:', 'buddypress' ) ?></label>56 <label><?php _e( 'Post In Group Forum:', 'buddypress' ); ?></label> 41 57 <select id="topic_group_id" name="topic_group_id"> 42 58 … … 47 63 <?php if ( bp_group_is_forum_enabled() && 'public' == bp_get_group_status() ) : ?> 48 64 49 <option value="<?php bp_group_id() ?>"><?php bp_group_name()?></option>65 <option value="<?php bp_group_id(); ?>"><?php bp_group_name(); ?></option> 50 66 51 67 <?php endif; ?> … … 55 71 </select><!-- #topic_group_id --> 56 72 57 <?php do_action( 'groups_forum_new_topic_after' ) ?>73 <?php do_action( 'groups_forum_new_topic_after' ); ?> 58 74 59 75 <div class="submit"> 60 <input type="submit" name="submit_topic" id="submit" value="<?php _e( 'Post Topic', 'buddypress' ) ?>" />61 <input type="button" name="submit_topic_cancel" id="submit_topic_cancel" value="<?php _e( 'Cancel', 'buddypress' ) ?>" />76 <input type="submit" name="submit_topic" id="submit" value="<?php _e( 'Post Topic', 'buddypress' ); ?>" /> 77 <input type="button" name="submit_topic_cancel" id="submit_topic_cancel" value="<?php _e( 'Cancel', 'buddypress' ); ?>" /> 62 78 </div> 63 79 64 <?php wp_nonce_field( 'bp_forums_new_topic' ) ?>80 <?php wp_nonce_field( 'bp_forums_new_topic' ); ?> 65 81 66 82 </form><!-- #forum-topic-form --> … … 69 85 70 86 <div id="message" class="info"> 87 71 88 <p><?php printf( __( "You are not a member of any groups so you don't have any group forums you can post in. To start posting, first find a group that matches the topic subject you'd like to start. If this group does not exist, why not <a href='%s'>create a new group</a>? Once you have joined or created the group you can post your topic in that group's forum.", 'buddypress' ), site_url( BP_GROUPS_SLUG . '/create/' ) ) ?></p> 89 72 90 </div> 73 91 … … 77 95 </div><!-- #new-topic-post --> 78 96 97 <?php do_action( 'bp_before_topics' ); ?> 98 79 99 <form action="" method="post" id="forums-directory-form" class="dir-form"> 80 100 81 101 <div class="item-list-tabs" role="navigation"> 82 102 <ul> 83 <li class="selected" id="forums-all"><a href="<?php bp_root_domain() ?>"><?php printf( __( 'All Topics (%s)', 'buddypress' ), bp_get_forum_topic_count() )?></a></li>103 <li class="selected" id="forums-all"><a href="<?php bp_root_domain(); ?>"><?php printf( __( 'All Topics (%s)', 'buddypress' ), bp_get_forum_topic_count() ); ?></a></li> 84 104 85 105 <?php if ( is_user_logged_in() && bp_get_forum_topic_count_for_user( bp_loggedin_user_id() ) ) : ?> 86 <li id="forums-personal"><a href="<?php echo bp_loggedin_user_domain() . BP_GROUPS_SLUG . '/' ?>"><?php printf( __( 'My Topics (%s)', 'buddypress' ), bp_get_forum_topic_count_for_user( bp_loggedin_user_id() ) ) ?></a></li> 106 107 <li id="forums-personal"><a href="<?php echo trailingslashit( bp_loggedin_user_domain() . bp_get_groups_slug() ); ?>"><?php printf( __( 'My Topics (%s)', 'buddypress' ), bp_get_forum_topic_count_for_user( bp_loggedin_user_id() ) ); ?></a></li> 108 87 109 <?php endif; ?> 88 110 89 <?php do_action( 'bp_forums_directory_group_types' ) ?> 111 <?php do_action( 'bp_forums_directory_group_types' ); ?> 112 113 </ul> 114 </div> 115 116 <div class="item-list-tabs" id="subnav" role="navigation"> 117 <ul> 118 119 <?php do_action( 'bp_forums_directory_group_sub_types' ); ?> 90 120 91 121 <li id="forums-order-select" class="last filter"> 92 122 93 <?php _e( 'Order By:', 'buddypress' ) ?> 123 <?php _e( 'Order By:', 'buddypress' ); ?> 124 94 125 <select> 95 <option value="active"><?php _e( 'Last Active', 'buddypress' ) ?></option>96 <option value="popular"><?php _e( 'Most Posts', 'buddypress' ) ?></option>97 <option value="unreplied"><?php _e( 'Unreplied', 'buddypress' ) ?></option>126 <option value="active"><?php _e( 'Last Active', 'buddypress' ); ?></option> 127 <option value="popular"><?php _e( 'Most Posts', 'buddypress' ); ?></option> 128 <option value="unreplied"><?php _e( 'Unreplied', 'buddypress' ); ?></option> 98 129 99 <?php do_action( 'bp_forums_directory_order_options' ) ?> 130 <?php do_action( 'bp_forums_directory_order_options' ); ?> 131 100 132 </select> 101 133 </li> … … 103 135 </div> 104 136 105 <?php do_action( 'bp_before_directory_forums_list' ) ?>137 <?php do_action( 'bp_before_directory_forums_list' ); ?> 106 138 107 139 <div id="forums-dir-list" class="forums dir-list" role="main"> 108 <?php locate_template( array( 'forums/forums-loop.php' ), true ) ?> 140 141 <?php locate_template( array( 'forums/forums-loop.php' ), true ); ?> 142 109 143 </div> 110 144 111 <?php do_action( 'bp_directory_forums_content' ) ?>145 <?php do_action( 'bp_directory_forums_content' ); ?> 112 146 113 <?php wp_nonce_field( 'directory_forums', '_wpnonce-forums-filter' ) ?> 114 115 <?php do_action( 'bp_after_directory_forums_content' ) ?> 147 <?php wp_nonce_field( 'directory_forums', '_wpnonce-forums-filter' ); ?> 116 148 117 149 </form> 118 150 119 <?php do_action( 'bp_after_directory_forums' ) ?>151 <?php do_action( 'bp_after_directory_forums' ); ?> 120 152 121 153 </div><!-- .padder --> 122 154 </div><!-- #content --> 123 155 124 <?php get_sidebar()?>156 <?php do_action( 'bp_after_directory_forums_content' ); ?> 125 157 126 <?php get_footer() ?> 158 <?php get_sidebar(); ?> 159 <?php get_footer(); ?> -
trunk/bp-themes/bp-default/groups/create.php
r3771 r3810 1 <?php get_header() ?> 1 <?php 2 3 /** 4 * BuddyPress - Create Group 5 * 6 * @package BuddyPress 7 * @subpackage bp-default 8 */ 9 10 ?> 11 12 <?php get_header(); ?> 2 13 3 14 <div id="content"> 4 15 <div class="padder"> 5 16 6 <form action="<?php bp_group_creation_form_action() ?>" method="post" id="create-group-form" class="standard-form" enctype="multipart/form-data">7 <h3><?php _e( 'Create a Group', 'buddypress' ) ?> <a class="button" href="<?php echo bp_get_root_domain() . '/' . BP_GROUPS_SLUG . '/' ?>"><?php _e( 'Groups Directory', 'buddypress' )?></a></h3>8 9 <?php do_action( 'bp_before_create_group' ) ?>17 <form action="<?php bp_group_creation_form_action(); ?>" method="post" id="create-group-form" class="standard-form" enctype="multipart/form-data"> 18 <h3><?php _e( 'Create a Group', 'buddypress' ); ?> <a class="button" href="<?php echo trailingslashit( bp_get_root_domain() . '/' . bp_get_groups_root_slug() ); ?>"><?php _e( 'Groups Directory', 'buddypress' ); ?></a></h3> 19 20 <?php do_action( 'bp_before_create_group' ); ?> 10 21 11 22 <div class="item-list-tabs no-ajax" id="group-create-tabs" role="navigation"> 12 23 <ul> 24 13 25 <?php bp_group_creation_tabs(); ?> 26 14 27 </ul> 15 28 </div> 16 29 17 <?php do_action( 'template_notices' ) ?>30 <?php do_action( 'template_notices' ); ?> 18 31 19 32 <div class="item-body" id="group-create-body"> … … 24 37 <?php do_action( 'bp_before_group_details_creation_step' ); ?> 25 38 26 <label for="group-name"><?php _e('* Group Name', 'buddypress') ?> <?php _e( '(required)', 'buddypress' )?></label> 27 <input type="text" name="group-name" id="group-name" value="<?php bp_new_group_name() ?>" /> 28 29 <label for="group-desc"><?php _e('* Group Description', 'buddypress') ?> <?php _e( '(required)', 'buddypress' )?></label> 30 <textarea name="group-desc" id="group-desc"><?php bp_new_group_description() ?></textarea> 31 32 <?php do_action( 'bp_after_group_details_creation_step' ); /* Deprecated -> */ do_action( 'groups_custom_group_fields_editable' ); ?> 33 34 <?php wp_nonce_field( 'groups_create_save_group-details' ) ?> 39 <label for="group-name"><?php _e('* Group Name', 'buddypress'); ?> <?php _e( '(required)', 'buddypress' ); ?></label> 40 <input type="text" name="group-name" id="group-name" value="<?php bp_new_group_name(); ?>" /> 41 42 <label for="group-desc"><?php _e('* Group Description', 'buddypress') ?> <?php _e( '(required)', 'buddypress' ); ?></label> 43 <textarea name="group-desc" id="group-desc"><?php bp_new_group_description(); ?></textarea> 44 45 <?php 46 do_action( 'bp_after_group_details_creation_step' ); 47 do_action( 'groups_custom_group_fields_editable' ); // @Deprecated 48 49 wp_nonce_field( 'groups_create_save_group-details' ); ?> 35 50 36 51 <?php endif; ?> … … 43 58 <?php if ( bp_is_active( 'forums' ) ) : ?> 44 59 <?php if ( bp_forums_is_installed_correctly() ) : ?> 60 45 61 <div class="checkbox"> 46 <label><input type="checkbox" name="group-show-forum" id="group-show-forum" value="1"<?php if ( bp_get_new_group_enable_forum() ) { ?> checked="checked"<?php } ?> /> <?php _e('Enable discussion forum', 'buddypress')?></label>62 <label><input type="checkbox" name="group-show-forum" id="group-show-forum" value="1"<?php checked( bp_get_new_group_enable_forum(), true, true ); ?> /> <?php _e( 'Enable discussion forum', 'buddypress' ); ?></label> 47 63 </div> 64 48 65 <?php else : ?> 49 66 <?php if ( is_super_admin() ) : ?> 67 50 68 <div class="checkbox"> 51 <label><input type="checkbox" disabled="disabled" name="disabled" id="disabled" value="0" /> <?php printf( __( '<strong>Attention Site Admin:</strong> Group forums require the <a href="%s">correct setup and configuration</a> of a bbPress installation.', 'buddypress' ), bp_get_root_domain() . '/wp-admin/admin.php?page=bb-forums-setup' )?></label>69 <label><input type="checkbox" disabled="disabled" name="disabled" id="disabled" value="0" /> <?php printf( __( '<strong>Attention Site Admin:</strong> Group forums require the <a href="%s">correct setup and configuration</a> of a bbPress installation.', 'buddypress' ), bp_get_root_domain() . '/wp-admin/admin.php?page=bb-forums-setup' ); ?></label> 52 70 </div> 71 53 72 <?php endif; ?> 54 73 <?php endif; ?> … … 61 80 <div class="radio"> 62 81 <label><input type="radio" name="group-status" value="public"<?php if ( 'public' == bp_get_new_group_status() || !bp_get_new_group_status() ) { ?> checked="checked"<?php } ?> /> 63 <strong><?php _e( 'This is a public group', 'buddypress' ) ?></strong>82 <strong><?php _e( 'This is a public group', 'buddypress' ); ?></strong> 64 83 <ul> 65 <li><?php _e( 'Any site member can join this group.', 'buddypress' ) ?></li>66 <li><?php _e( 'This group will be listed in the groups directory and in search results.', 'buddypress' ) ?></li>67 <li><?php _e( 'Group content and activity will be visible to any site member.', 'buddypress' ) ?></li>84 <li><?php _e( 'Any site member can join this group.', 'buddypress' ); ?></li> 85 <li><?php _e( 'This group will be listed in the groups directory and in search results.', 'buddypress' ); ?></li> 86 <li><?php _e( 'Group content and activity will be visible to any site member.', 'buddypress' ); ?></li> 68 87 </ul> 69 88 </label> 70 89 71 90 <label><input type="radio" name="group-status" value="private"<?php if ( 'private' == bp_get_new_group_status() ) { ?> checked="checked"<?php } ?> /> 72 <strong><?php _e( 'This is a private group', 'buddypress' ) ?></strong>91 <strong><?php _e( 'This is a private group', 'buddypress' ); ?></strong> 73 92 <ul> 74 <li><?php _e( 'Only users who request membership and are accepted can join the group.', 'buddypress' ) ?></li>75 <li><?php _e( 'This group will be listed in the groups directory and in search results.', 'buddypress' ) ?></li>76 <li><?php _e( 'Group content and activity will only be visible to members of the group.', 'buddypress' ) ?></li>93 <li><?php _e( 'Only users who request membership and are accepted can join the group.', 'buddypress' ); ?></li> 94 <li><?php _e( 'This group will be listed in the groups directory and in search results.', 'buddypress' ); ?></li> 95 <li><?php _e( 'Group content and activity will only be visible to members of the group.', 'buddypress' ); ?></li> 77 96 </ul> 78 97 </label> 79 98 80 99 <label><input type="radio" name="group-status" value="hidden"<?php if ( 'hidden' == bp_get_new_group_status() ) { ?> checked="checked"<?php } ?> /> 81 <strong><?php _e('This is a hidden group', 'buddypress') ?></strong>100 <strong><?php _e('This is a hidden group', 'buddypress'); ?></strong> 82 101 <ul> 83 <li><?php _e( 'Only users who are invited can join the group.', 'buddypress' ) ?></li>84 <li><?php _e( 'This group will not be listed in the groups directory or search results.', 'buddypress' ) ?></li>85 <li><?php _e( 'Group content and activity will only be visible to members of the group.', 'buddypress' ) ?></li>102 <li><?php _e( 'Only users who are invited can join the group.', 'buddypress' ); ?></li> 103 <li><?php _e( 'This group will not be listed in the groups directory or search results.', 'buddypress' ); ?></li> 104 <li><?php _e( 'Group content and activity will only be visible to members of the group.', 'buddypress' ); ?></li> 86 105 </ul> 87 106 </label> … … 90 109 <?php do_action( 'bp_after_group_settings_creation_step' ); ?> 91 110 92 <?php wp_nonce_field( 'groups_create_save_group-settings' ) ?>111 <?php wp_nonce_field( 'groups_create_save_group-settings' ); ?> 93 112 94 113 <?php endif; ?> … … 102 121 103 122 <div class="left-menu"> 104 <?php bp_new_group_avatar() ?> 123 124 <?php bp_new_group_avatar(); ?> 125 105 126 </div><!-- .left-menu --> 106 127 107 128 <div class="main-column"> 108 <p><?php _e( "Upload an image to use as an avatar for this group. The image will be shown on the main group page, and in search results.", 'buddypress')?></p>129 <p><?php _e( "Upload an image to use as an avatar for this group. The image will be shown on the main group page, and in search results.", 'buddypress' ); ?></p> 109 130 110 131 <p> 111 132 <input type="file" name="file" id="file" /> 112 <input type="submit" name="upload" id="upload" value="<?php _e( 'Upload Image', 'buddypress' ) ?>" />133 <input type="submit" name="upload" id="upload" value="<?php _e( 'Upload Image', 'buddypress' ); ?>" /> 113 134 <input type="hidden" name="action" id="action" value="bp_avatar_upload" /> 114 135 </p> 115 136 116 <p><?php _e( 'To skip the avatar upload process, hit the "Next Step" button.', 'buddypress' ) ?></p>137 <p><?php _e( 'To skip the avatar upload process, hit the "Next Step" button.', 'buddypress' ); ?></p> 117 138 </div><!-- .main-column --> 118 139 … … 121 142 <?php if ( 'crop-image' == bp_get_avatar_admin_step() ) : ?> 122 143 123 <h3><?php _e( 'Crop Group Avatar', 'buddypress' ) ?></h3>124 125 <img src="<?php bp_avatar_to_crop() ?>" id="avatar-to-crop" class="avatar" alt="<?php _e( 'Avatar to crop', 'buddypress' )?>" />144 <h3><?php _e( 'Crop Group Avatar', 'buddypress' ); ?></h3> 145 146 <img src="<?php bp_avatar_to_crop(); ?>" id="avatar-to-crop" class="avatar" alt="<?php _e( 'Avatar to crop', 'buddypress' ); ?>" /> 126 147 127 148 <div id="avatar-crop-pane"> 128 <img src="<?php bp_avatar_to_crop() ?>" id="avatar-crop-preview" class="avatar" alt="<?php _e( 'Avatar preview', 'buddypress' )?>" />149 <img src="<?php bp_avatar_to_crop(); ?>" id="avatar-crop-preview" class="avatar" alt="<?php _e( 'Avatar preview', 'buddypress' ); ?>" /> 129 150 </div> 130 151 131 <input type="submit" name="avatar-crop-submit" id="avatar-crop-submit" value="<?php _e( 'Crop Image', 'buddypress' ) ?>" />132 133 <input type="hidden" name="image_src" id="image_src" value="<?php bp_avatar_to_crop_src() ?>" />152 <input type="submit" name="avatar-crop-submit" id="avatar-crop-submit" value="<?php _e( 'Crop Image', 'buddypress' ); ?>" /> 153 154 <input type="hidden" name="image_src" id="image_src" value="<?php bp_avatar_to_crop_src(); ?>" /> 134 155 <input type="hidden" name="upload" id="upload" /> 135 156 <input type="hidden" id="x" name="x" /> … … 142 163 <?php do_action( 'bp_after_group_avatar_creation_step' ); ?> 143 164 144 <?php wp_nonce_field( 'groups_create_save_group-avatar' ) ?>165 <?php wp_nonce_field( 'groups_create_save_group-avatar' ); ?> 145 166 146 167 <?php endif; ?> … … 152 173 153 174 <?php if ( bp_is_active( 'friends' ) && bp_get_total_friend_count( bp_loggedin_user_id() ) ) : ?> 175 154 176 <div class="left-menu"> 155 177 156 178 <div id="invite-list"> 157 179 <ul> 158 <?php bp_new_group_invite_friend_list() ?>180 <?php bp_new_group_invite_friend_list(); ?> 159 181 </ul> 160 182 161 <?php wp_nonce_field( 'groups_invite_uninvite_user', '_wpnonce_invite_uninvite_user' ) ?>183 <?php wp_nonce_field( 'groups_invite_uninvite_user', '_wpnonce_invite_uninvite_user' ); ?> 162 184 </div> 163 185 … … 172 194 <?php /* The ID 'friend-list' is important for AJAX support. */ ?> 173 195 <ul id="friend-list" class="item-list" role="main"> 196 174 197 <?php if ( bp_group_has_invites() ) : ?> 175 198 176 199 <?php while ( bp_group_invites() ) : bp_group_the_invite(); ?> 177 200 178 <li id="<?php bp_group_invite_item_id() ?>"> 179 <?php bp_group_invite_user_avatar() ?> 180 181 <h4><?php bp_group_invite_user_link() ?></h4> 182 <span class="activity"><?php bp_group_invite_user_last_active() ?></span> 201 <li id="<?php bp_group_invite_item_id(); ?>"> 202 203 <?php bp_group_invite_user_avatar(); ?> 204 205 <h4><?php bp_group_invite_user_link(); ?></h4> 206 <span class="activity"><?php bp_group_invite_user_last_active(); ?></span> 183 207 184 208 <div class="action"> 185 <a class="remove" href="<?php bp_group_invite_user_remove_invite_url() ?>" id="<?php bp_group_invite_item_id() ?>"><?php _e( 'Remove Invite', 'buddypress' )?></a>209 <a class="remove" href="<?php bp_group_invite_user_remove_invite_url(); ?>" id="<?php bp_group_invite_item_id(); ?>"><?php _e( 'Remove Invite', 'buddypress' ); ?></a> 186 210 </div> 187 211 </li> … … 189 213 <?php endwhile; ?> 190 214 191 <?php wp_nonce_field( 'groups_send_invites', '_wpnonce_send_invites' ) ?> 215 <?php wp_nonce_field( 'groups_send_invites', '_wpnonce_send_invites' ); ?> 216 192 217 <?php endif; ?> 218 193 219 </ul> 194 220 … … 203 229 <?php endif; ?> 204 230 205 <?php wp_nonce_field( 'groups_create_save_group-invites' ) ?> 231 <?php wp_nonce_field( 'groups_create_save_group-invites' ); ?> 232 206 233 <?php do_action( 'bp_after_group_invites_creation_step' ); ?> 207 234 208 235 <?php endif; ?> 209 236 210 <?php do_action( 'groups_custom_create_steps' ) // Allow plugins to add custom group creation steps ?>237 <?php do_action( 'groups_custom_create_steps' ); // Allow plugins to add custom group creation steps ?> 211 238 212 239 <?php do_action( 'bp_before_group_creation_step_buttons' ); ?> 213 240 214 241 <?php if ( 'crop-image' != bp_get_avatar_admin_step() ) : ?> 242 215 243 <div class="submit" id="previous-next"> 244 216 245 <?php /* Previous Button */ ?> 217 246 <?php if ( !bp_is_first_group_creation_step() ) : ?> 218 <input type="button" value="← <?php _e('Previous Step', 'buddypress') ?>" id="group-creation-previous" name="previous" onclick="location.href='<?php bp_group_creation_previous_link() ?>'" /> 247 248 <input type="button" value="← <?php _e( 'Previous Step', 'buddypress' ); ?>" id="group-creation-previous" name="previous" onclick="location.href='<?php bp_group_creation_previous_link(); ?>'" /> 249 219 250 <?php endif; ?> 220 251 221 252 <?php /* Next Button */ ?> 222 253 <?php if ( !bp_is_last_group_creation_step() && !bp_is_first_group_creation_step() ) : ?> 223 <input type="submit" value="<?php _e('Next Step', 'buddypress') ?> →" id="group-creation-next" name="save" /> 254 255 <input type="submit" value="<?php _e( 'Next Step', 'buddypress' ); ?> →" id="group-creation-next" name="save" /> 256 224 257 <?php endif;?> 225 258 226 259 <?php /* Create Button */ ?> 227 260 <?php if ( bp_is_first_group_creation_step() ) : ?> 228 <input type="submit" value="<?php _e('Create Group and Continue', 'buddypress') ?> →" id="group-creation-create" name="save" /> 261 262 <input type="submit" value="<?php _e( 'Create Group and Continue', 'buddypress' ); ?> →" id="group-creation-create" name="save" /> 263 229 264 <?php endif; ?> 230 265 231 266 <?php /* Finish Button */ ?> 232 267 <?php if ( bp_is_last_group_creation_step() ) : ?> 233 <input type="submit" value="<?php _e('Finish', 'buddypress') ?> →" id="group-creation-finish" name="save" /> 268 269 <input type="submit" value="<?php _e( 'Finish', 'buddypress' ); ?> →" id="group-creation-finish" name="save" /> 270 234 271 <?php endif; ?> 235 272 </div> 273 236 274 <?php endif;?> 237 275 … … 239 277 240 278 <?php /* Don't leave out this hidden field */ ?> 241 <input type="hidden" name="group_id" id="group_id" value="<?php bp_new_group_id() ?>" />242 243 <?php do_action( 'bp_directory_groups_content' ) ?>279 <input type="hidden" name="group_id" id="group_id" value="<?php bp_new_group_id(); ?>" /> 280 281 <?php do_action( 'bp_directory_groups_content' ); ?> 244 282 245 283 </div><!-- .item-body --> 246 284 247 <?php do_action( 'bp_after_create_group' ) ?>285 <?php do_action( 'bp_after_create_group' ); ?> 248 286 249 287 </form> … … 252 290 </div><!-- #content --> 253 291 254 <?php get_sidebar() ?> 255 256 <?php get_footer() ?> 292 <?php get_sidebar(); ?> 293 <?php get_footer(); ?> -
trunk/bp-themes/bp-default/groups/groups-loop.php
r3771 r3810 1 <?php /* Querystring is set via AJAX in _inc/ajax.php - bp_dtheme_object_filter() */ ?>1 <?php 2 2 3 <?php do_action( 'bp_before_groups_loop' ) ?> 3 /** 4 * BuddyPress - Groups Loop 5 * 6 * Querystring is set via AJAX in _inc/ajax.php - bp_dtheme_object_filter() 7 * 8 * @package BuddyPress 9 * @subpackage bp-default 10 */ 11 12 ?> 13 14 <?php do_action( 'bp_before_groups_loop' ); ?> 4 15 5 16 <?php if ( bp_has_groups( bp_ajax_querystring( 'groups' ) ) ) : ?> … … 8 19 9 20 <div class="pag-count" id="group-dir-count-top"> 10 <?php bp_groups_pagination_count() ?> 21 22 <?php bp_groups_pagination_count(); ?> 23 11 24 </div> 12 25 13 26 <div class="pagination-links" id="group-dir-pag-top"> 14 <?php bp_groups_pagination_links() ?> 27 28 <?php bp_groups_pagination_links(); ?> 29 15 30 </div> 16 31 17 32 </div> 18 33 19 <?php do_action( 'bp_before_directory_groups_list' ) ?>34 <?php do_action( 'bp_before_directory_groups_list' ); ?> 20 35 21 36 <ul id="groups-list" class="item-list" role="main"> 37 22 38 <?php while ( bp_groups() ) : bp_the_group(); ?> 23 39 24 40 <li> 25 41 <div class="item-avatar"> 26 <a href="<?php bp_group_permalink() ?>"><?php bp_group_avatar( 'type=thumb&width=50&height=50' )?></a>42 <a href="<?php bp_group_permalink(); ?>"><?php bp_group_avatar( 'type=thumb&width=50&height=50' ); ?></a> 27 43 </div> 28 44 29 45 <div class="item"> 30 <div class="item-title"><a href="<?php bp_group_permalink() ?>"><?php bp_group_name()?></a></div>31 <div class="item-meta"><span class="activity"><?php printf( __( 'active %s ago', 'buddypress' ), bp_get_group_last_active() ) ?></span></div>46 <div class="item-title"><a href="<?php bp_group_permalink(); ?>"><?php bp_group_name(); ?></a></div> 47 <div class="item-meta"><span class="activity"><?php printf( __( 'active %s ago', 'buddypress' ), bp_get_group_last_active() ); ?></span></div> 32 48 33 <div class="item-desc"><?php bp_group_description_excerpt() ?></div>49 <div class="item-desc"><?php bp_group_description_excerpt(); ?></div> 34 50 35 <?php do_action( 'bp_directory_groups_item' ) ?>51 <?php do_action( 'bp_directory_groups_item' ); ?> 36 52 37 53 </div> … … 39 55 <div class="action"> 40 56 41 <?php do_action( 'bp_directory_groups_actions' ) ?>57 <?php do_action( 'bp_directory_groups_actions' ); ?> 42 58 43 59 <div class="meta"> 44 60 45 <?php bp_group_type() ?> / <?php bp_group_member_count()?>61 <?php bp_group_type(); ?> / <?php bp_group_member_count(); ?> 46 62 47 63 </div> … … 53 69 54 70 <?php endwhile; ?> 71 55 72 </ul> 56 73 57 <?php do_action( 'bp_after_directory_groups_list' ) ?>74 <?php do_action( 'bp_after_directory_groups_list' ); ?> 58 75 59 76 <div id="pag-bottom" class="pagination"> 60 77 61 78 <div class="pag-count" id="group-dir-count-bottom"> 62 <?php bp_groups_pagination_count() ?> 79 80 <?php bp_groups_pagination_count(); ?> 81 63 82 </div> 64 83 65 84 <div class="pagination-links" id="group-dir-pag-bottom"> 66 <?php bp_groups_pagination_links() ?> 85 86 <?php bp_groups_pagination_links(); ?> 87 67 88 </div> 68 89 … … 72 93 73 94 <div id="message" class="info"> 74 <p><?php _e( 'There were no groups found.', 'buddypress' ) ?></p>95 <p><?php _e( 'There were no groups found.', 'buddypress' ); ?></p> 75 96 </div> 76 97 77 98 <?php endif; ?> 78 99 79 <?php do_action( 'bp_after_groups_loop' ) ?>100 <?php do_action( 'bp_after_groups_loop' ); ?> -
trunk/bp-themes/bp-default/groups/index.php
r3771 r3810 1 <?php get_header() ?> 1 <?php 2 3 /** 4 * BuddyPress - Groups Directory 5 * 6 * @package BuddyPress 7 * @subpackage bp-default 8 */ 9 10 ?> 11 12 <?php get_header(); ?> 13 14 <?php do_action( 'bp_before_directory_groups_content' ); ?> 2 15 3 16 <div id="content"> … … 5 18 6 19 <form action="" method="post" id="groups-directory-form" class="dir-form"> 7 <h3><?php _e( 'Groups Directory', 'buddypress' ) ?><?php if ( is_user_logged_in() ) : ?> <a class="button" href="<?php echo bp_get_root_domain() . '/' . bp_get_root_slug() . '/create/' ?>"><?php _e( 'Create a Group', 'buddypress' ) ?></a><?php endif; ?></h3>8 20 9 < ?php do_action( 'bp_before_directory_groups_content' ) ?>21 <h3><?php _e( 'Groups Directory', 'buddypress' ); ?><?php if ( is_user_logged_in() ) : ?> <a class="button" href="<?php echo trailingslashit( bp_get_root_domain() . '/' . bp_get_groups_root_slug() . '/create' ); ?>"><?php _e( 'Create a Group', 'buddypress' ); ?></a><?php endif; ?></h3> 10 22 11 23 <div id="group-dir-search" class="dir-search" role="search"> 24 12 25 <?php bp_directory_groups_search_form() ?> 26 13 27 </div><!-- #group-dir-search --> 14 28 15 29 <div class="item-list-tabs" role="navigation"> 16 30 <ul> 17 <li class="selected" id="groups-all"><a href="<?php echo bp_get_root_domain() . '/' . BP_GROUPS_SLUG ?>"><?php printf( __( 'All Groups (%s)', 'buddypress' ), bp_get_total_group_count() )?></a></li>31 <li class="selected" id="groups-all"><a href="<?php echo trailingslashit( bp_get_root_domain() . '/' . bp_get_groups_root_slug() ); ?>"><?php printf( __( 'All Groups (%s)', 'buddypress' ), bp_get_total_group_count() ); ?></a></li> 18 32 19 33 <?php if ( is_user_logged_in() && bp_get_total_group_count_for_user( bp_loggedin_user_id() ) ) : ?> 20 <li id="groups-personal"><a href="<?php echo bp_loggedin_user_domain() . BP_GROUPS_SLUG . '/my-groups/' ?>"><?php printf( __( 'My Groups (%s)', 'buddypress' ), bp_get_total_group_count_for_user( bp_loggedin_user_id() ) ) ?></a></li> 34 35 <li id="groups-personal"><a href="<?php echo trailingslashit( bp_loggedin_user_domain() . bp_get_groups_slug() . '/my-groups' ); ?>"><?php printf( __( 'My Groups (%s)', 'buddypress' ), bp_get_total_group_count_for_user( bp_loggedin_user_id() ) ); ?></a></li> 36 21 37 <?php endif; ?> 22 38 23 <?php do_action( 'bp_groups_directory_group_types' ) ?> 39 <?php do_action( 'bp_groups_directory_group_types' ); ?> 40 41 </ul> 42 </div><!-- .item-list-tabs --> 43 44 <div class="item-list-tabs" id="subnav" role="navigation"> 45 <ul> 46 47 <?php do_action( 'bp_groups_directory_group_types' ); ?> 24 48 25 49 <li id="groups-order-select" class="last filter"> 26 50 27 <?php _e( 'Order By:', 'buddypress' ) ?> 51 <?php _e( 'Order By:', 'buddypress' ); ?> 52 28 53 <select> 29 <option value="active"><?php _e( 'Last Active', 'buddypress' ) ?></option>30 <option value="popular"><?php _e( 'Most Members', 'buddypress' ) ?></option>31 <option value="newest"><?php _e( 'Newly Created', 'buddypress' ) ?></option>32 <option value="alphabetical"><?php _e( 'Alphabetical', 'buddypress' ) ?></option>54 <option value="active"><?php _e( 'Last Active', 'buddypress' ); ?></option> 55 <option value="popular"><?php _e( 'Most Members', 'buddypress' ); ?></option> 56 <option value="newest"><?php _e( 'Newly Created', 'buddypress' ); ?></option> 57 <option value="alphabetical"><?php _e( 'Alphabetical', 'buddypress' ); ?></option> 33 58 34 <?php do_action( 'bp_groups_directory_order_options' ) ?> 59 <?php do_action( 'bp_groups_directory_order_options' ); ?> 60 35 61 </select> 36 62 </li> 37 63 </ul> 38 </div><!-- .item-list-tabs --> 64 </div> 65 66 <?php do_action( 'bp_before_directory_groups_list' ); ?> 39 67 40 68 <div id="groups-dir-list" class="groups dir-list"> 41 <?php locate_template( array( 'groups/groups-loop.php' ), true ) ?> 69 70 <?php locate_template( array( 'groups/groups-loop.php' ), true ); ?> 71 42 72 </div><!-- #groups-dir-list --> 43 73 44 <?php do_action( 'bp_directory_groups_content' ) ?>74 <?php do_action( 'bp_directory_groups_content' ); ?> 45 75 46 <?php wp_nonce_field( 'directory_groups', '_wpnonce-groups-filter' ) ?>76 <?php wp_nonce_field( 'directory_groups', '_wpnonce-groups-filter' ); ?> 47 77 48 78 </form><!-- #groups-directory-form --> 49 50 <?php do_action( 'bp_after_directory_groups_content' ) ?>51 79 52 80 </div><!-- .padder --> 53 81 </div><!-- #content --> 54 82 55 <?php get_sidebar()?>83 <?php do_action( 'bp_after_directory_groups_content' ); ?> 56 84 57 <?php get_footer() ?> 85 <?php get_sidebar(); ?> 86 <?php get_footer(); ?> 87 -
trunk/bp-themes/bp-default/members/index.php
r3790 r3810 1 <?php get_header() ?> 1 <?php 2 3 /** 4 * BuddyPress - Members Directory 5 * 6 * @package BuddyPress 7 * @subpackage bp-default 8 */ 9 10 ?> 11 12 <?php get_header(); ?> 13 14 <?php do_action( 'bp_before_directory_groups_content' ); ?> 2 15 3 16 <div id="content"> … … 6 19 <form action="" method="post" id="members-directory-form" class="dir-form"> 7 20 8 <h3><?php _e( 'Members Directory', 'buddypress' ) ?></h3> 9 10 <?php do_action( 'bp_before_directory_members_content' ) ?> 21 <h3><?php _e( 'Members Directory', 'buddypress' ); ?></h3> 11 22 12 23 <div id="members-dir-search" class="dir-search" role="search"> 13 <?php bp_directory_members_search_form() ?> 24 25 <?php bp_directory_members_search_form(); ?> 26 14 27 </div><!-- #members-dir-search --> 15 28 16 29 <div class="item-list-tabs" role="navigation"> 17 30 <ul> 18 <li class="selected" id="members-all"><a href="<?php bp_root_domain() ?>"><?php printf( __( 'All Members (%s)', 'buddypress' ), bp_get_total_member_count() )?></a></li>31 <li class="selected" id="members-all"><a href="<?php bp_root_domain(); ?>"><?php printf( __( 'All Members (%s)', 'buddypress' ), bp_get_total_member_count() ); ?></a></li> 19 32 20 33 <?php if ( is_user_logged_in() && bp_is_active( 'friends' ) && bp_get_total_friend_count( bp_loggedin_user_id() ) ) : ?> 21 <li id="members-personal"><a href="<?php echo bp_loggedin_user_domain() . BP_FRIENDS_SLUG . '/my-friends/' ?>"><?php printf( __( 'My Friends (%s)', 'buddypress' ), bp_get_total_friend_count( bp_loggedin_user_id() ) ) ?></a></li> 34 35 <li id="members-personal"><a href="<?php echo bp_loggedin_user_domain() . BP_FRIENDS_SLUG . '/my-friends/' ?>"><?php printf( __( 'My Friends (%s)', 'buddypress' ), bp_get_total_friend_count( bp_loggedin_user_id() ) ); ?></a></li> 36 22 37 <?php endif; ?> 23 38 24 <?php do_action( 'bp_members_directory_member_types' ) ?> 39 <?php do_action( 'bp_members_directory_member_types' ); ?> 40 41 </ul> 42 </div><!-- .item-list-tabs --> 43 44 <div class="item-list-tabs" id="subnav" role="navigation"> 45 <ul> 46 47 <?php do_action( 'bp_members_directory_member_sub_types' ); ?> 25 48 26 49 <li id="members-order-select" class="last filter"> 27 50 28 <?php _e( 'Order By:', 'buddypress' ) ?> 51 <?php _e( 'Order By:', 'buddypress' ); ?> 52 29 53 <select> 30 <option value="active"><?php _e( 'Last Active', 'buddypress' ) ?></option>31 <option value="newest"><?php _e( 'Newest Registered', 'buddypress' ) ?></option>54 <option value="active"><?php _e( 'Last Active', 'buddypress' ); ?></option> 55 <option value="newest"><?php _e( 'Newest Registered', 'buddypress' ); ?></option> 32 56 33 57 <?php if ( bp_is_active( 'profile' ) ) : ?> 34 <option value="alphabetical"><?php _e( 'Alphabetical', 'buddypress' ) ?></option> 58 59 <option value="alphabetical"><?php _e( 'Alphabetical', 'buddypress' ); ?></option> 60 35 61 <?php endif; ?> 36 62 37 <?php do_action( 'bp_members_directory_order_options' ) ?> 63 <?php do_action( 'bp_members_directory_order_options' ); ?> 64 38 65 </select> 39 66 </li> 40 67 </ul> 41 </div><!-- .item-list-tabs --> 68 </div> 69 70 <?php do_action( 'bp_before_directory_members_list' ); ?> 42 71 43 72 <div id="members-dir-list" class="members dir-list"> 44 <?php locate_template( array( 'members/members-loop.php' ), true ) ?> 73 74 <?php locate_template( array( 'members/members-loop.php' ), true ); ?> 75 45 76 </div><!-- #members-dir-list --> 46 77 47 <?php do_action( 'bp_directory_members_content' ) ?>78 <?php do_action( 'bp_directory_members_content' ); ?> 48 79 49 <?php wp_nonce_field( 'directory_members', '_wpnonce-member-filter' ) ?> 50 51 <?php do_action( 'bp_after_directory_members_content' ) ?> 80 <?php wp_nonce_field( 'directory_members', '_wpnonce-member-filter' ); ?> 52 81 53 82 </form><!-- #members-directory-form --> … … 56 85 </div><!-- #content --> 57 86 58 <?php get_sidebar()?>87 <?php do_action( 'bp_after_directory_members_content' ); ?> 59 88 60 <?php get_footer() ?> 89 <?php get_sidebar(); ?> 90 <?php get_footer(); ?> -
trunk/bp-themes/bp-default/members/members-loop.php
r3771 r3810 1 <?php /* Querystring is set via AJAX in _inc/ajax.php - bp_dtheme_object_filter() */ ?>1 <?php 2 2 3 <?php do_action( 'bp_before_members_loop' ) ?> 3 /** 4 * BuddyPress - Members Loop 5 * 6 * Querystring is set via AJAX in _inc/ajax.php - bp_dtheme_object_filter() 7 * 8 * @package BuddyPress 9 * @subpackage bp-default 10 */ 11 12 ?> 13 14 <?php do_action( 'bp_before_members_loop' ); ?> 4 15 5 16 <?php if ( bp_has_members( bp_ajax_querystring( 'members' ) ) ) : ?> … … 8 19 9 20 <div class="pag-count" id="member-dir-count-top"> 10 <?php bp_members_pagination_count() ?> 21 22 <?php bp_members_pagination_count(); ?> 23 11 24 </div> 12 25 13 26 <div class="pagination-links" id="member-dir-pag-top"> 14 <?php bp_members_pagination_links() ?> 27 28 <?php bp_members_pagination_links(); ?> 29 15 30 </div> 16 31 17 32 </div> 18 33 19 <?php do_action( 'bp_before_directory_members_list' ) ?>34 <?php do_action( 'bp_before_directory_members_list' ); ?> 20 35 21 36 <ul id="members-list" class="item-list" role="main"> 37 22 38 <?php while ( bp_members() ) : bp_the_member(); ?> 23 39 24 40 <li> 25 41 <div class="item-avatar"> 26 <a href="<?php bp_member_permalink() ?>"><?php bp_member_avatar()?></a>42 <a href="<?php bp_member_permalink(); ?>"><?php bp_member_avatar(); ?></a> 27 43 </div> 28 44 29 45 <div class="item"> 30 46 <div class="item-title"> 31 <a href="<?php bp_member_permalink() ?>"><?php bp_member_name()?></a>47 <a href="<?php bp_member_permalink(); ?>"><?php bp_member_name(); ?></a> 32 48 33 49 <?php if ( bp_get_member_latest_update() ) : ?> 34 50 35 <span class="update"> - <?php bp_member_latest_update( 'length=10' ) ?></span>51 <span class="update"> - <?php bp_member_latest_update( 'length=10' ); ?></span> 36 52 37 53 <?php endif; ?> … … 39 55 </div> 40 56 41 <div class="item-meta"><span class="activity"><?php bp_member_last_active() ?></span></div>57 <div class="item-meta"><span class="activity"><?php bp_member_last_active(); ?></span></div> 42 58 43 <?php do_action( 'bp_directory_members_item' ) ?>59 <?php do_action( 'bp_directory_members_item' ); ?> 44 60 45 61 <?php … … 64 80 65 81 <?php endwhile; ?> 82 66 83 </ul> 67 84 68 <?php do_action( 'bp_after_directory_members_list' ) ?>85 <?php do_action( 'bp_after_directory_members_list' ); ?> 69 86 70 <?php bp_member_hidden_fields() ?>87 <?php bp_member_hidden_fields(); ?> 71 88 72 89 <div id="pag-bottom" class="pagination"> 73 90 74 91 <div class="pag-count" id="member-dir-count-bottom"> 75 <?php bp_members_pagination_count() ?> 92 93 <?php bp_members_pagination_count(); ?> 94 76 95 </div> 77 96 78 97 <div class="pagination-links" id="member-dir-pag-bottom"> 79 <?php bp_members_pagination_links() ?> 98 99 <?php bp_members_pagination_links(); ?> 100 80 101 </div> 81 102 … … 85 106 86 107 <div id="message" class="info"> 87 <p><?php _e( "Sorry, no members were found.", 'buddypress' ) ?></p>108 <p><?php _e( "Sorry, no members were found.", 'buddypress' ); ?></p> 88 109 </div> 89 110 90 111 <?php endif; ?> 91 112 92 <?php do_action( 'bp_after_members_loop' ) ?>113 <?php do_action( 'bp_after_members_loop' ); ?> -
trunk/bp-themes/bp-default/members/single/activity.php
r3808 r3810 1 <?php 2 3 /** 4 * BuddyPress - Users Activity 5 * 6 * @package BuddyPress 7 * @subpackage bp-default 8 */ 9 10 ?> 11 1 12 <div class="item-list-tabs no-ajax" id="subnav" role="navigation"> 2 13 <ul> -
trunk/bp-themes/bp-default/members/single/blogs.php
r3808 r3810 1 <?php 2 3 /** 4 * BuddyPress - Users Blogs 5 * 6 * @package BuddyPress 7 * @subpackage bp-default 8 */ 9 10 ?> 11 1 12 <div class="item-list-tabs" id="subnav" role="navigation"> 2 13 <ul> -
trunk/bp-themes/bp-default/members/single/friends.php
r3808 r3810 1 <?php 2 3 /** 4 * BuddyPress - Users Friends 5 * 6 * @package BuddyPress 7 * @subpackage bp-default 8 */ 9 10 ?> 11 1 12 <div class="item-list-tabs no-ajax" id="subnav" role="navigation"> 2 13 <ul> -
trunk/bp-themes/bp-default/members/single/groups.php
r3808 r3810 1 <?php 2 3 /** 4 * BuddyPress - Users Groups 5 * 6 * @package BuddyPress 7 * @subpackage bp-default 8 */ 9 10 ?> 11 1 12 <div class="item-list-tabs no-ajax" id="subnav" role="navigation"> 2 13 <ul> -
trunk/bp-themes/bp-default/members/single/home.php
r3808 r3810 1 <?php 2 3 /** 4 * BuddyPress - Users Home 5 * 6 * @package BuddyPress 7 * @subpackage bp-default 8 */ 9 10 ?> 11 1 12 <?php get_header(); ?> 2 13 -
trunk/bp-themes/bp-default/members/single/member-header.php
r3808 r3810 1 <?php 2 3 /** 4 * BuddyPress - Users Header 5 * 6 * @package BuddyPress 7 * @subpackage bp-default 8 */ 9 10 ?> 11 1 12 <?php do_action( 'bp_before_member_header' ); ?> 2 13 -
trunk/bp-themes/bp-default/members/single/messages.php
r3808 r3810 1 <?php 2 3 /** 4 * BuddyPress - Users Messages 5 * 6 * @package BuddyPress 7 * @subpackage bp-default 8 */ 9 10 ?> 11 1 12 <div class="item-list-tabs no-ajax" id="subnav" role="navigation"> 2 13 <ul> -
trunk/bp-themes/bp-default/members/single/plugins.php
r3808 r3810 1 <?php 2 3 /** 4 * BuddyPress - Users Plugins 5 * 6 * This is a fallback file that external plugins can use if the template they 7 * need is not installed in the current theme. Use the actions in this template 8 * to output everything your plugin needs. 9 * 10 * @package BuddyPress 11 * @subpackage bp-default 12 */ 13 14 ?> 15 1 16 <?php get_header(); ?> 2 17 -
trunk/bp-themes/bp-default/members/single/profile.php
r3808 r3810 1 <?php 2 3 /** 4 * BuddyPress - Users Profile 5 * 6 * @package BuddyPress 7 * @subpackage bp-default 8 */ 9 10 ?> 11 1 12 <?php if ( bp_is_my_profile() ) : ?> 2 13 … … 16 27 17 28 <?php 29 // Profile Edit 18 30 if ( bp_is_current_action( 'edit' ) ) 19 31 locate_template( array( 'members/single/profile/edit.php' ), true ); 32 33 // Change Avatar 20 34 elseif ( bp_is_current_action( 'change-avatar' ) ) 21 35 locate_template( array( 'members/single/profile/change-avatar.php' ), true ); 36 37 // Display XProfile 22 38 elseif ( bp_is_active( 'profile' ) ) 23 39 locate_template( array( 'members/single/profile/profile-loop.php' ), true ); 40 41 // Display WordPress profile (fallback) 24 42 else 25 43 locate_template( array( 'members/single/profile/profile-wp.php' ), true );
Note: See TracChangeset
for help on using the changeset viewer.