Skip to:
Content

BuddyPress.org

Changeset 1315


Ignore:
Timestamp:
04/05/2009 12:29:18 PM (15 years ago)
Author:
apeatling
Message:

Improving usability around themes and admin screens.

Location:
trunk
Files:
10 edited

Legend:

Unmodified
Added
Removed

  • trunk/bp-core.php

    r1311 r1315  
    12051205    if ( $themes ) {
    12061206        foreach ( $themes as $name => $values ) {
     1207            if ( $name == 'BuddyPress Default Home Theme' )
     1208                continue;
     1209           
    12071210            $member_themes[] = array(
    12081211                'name' => $name,
    1209                 'template' => $values['Template']
     1212                'template' => $values['Template'],
     1213                'version' => $values['Version']
    12101214            );
    12111215        }

  • trunk/bp-core/bp-core-admin.php

    r1314 r1315  
    7373                <?php } ?>
    7474                <tr>
    75                     <th scope="row"><?php _e('Select theme to use for member pages', 'buddypress' ) ?>:</th>
    76                     <td>
     75                    <th scope="row"><?php _e('Select theme to use for BuddyPress generated pages', 'buddypress' ) ?>:</th>
     76                    <td>
     77                        <?php $themes = bp_core_get_member_themes() ?>
     78                        <?php if ( $themes ) : ?>
    7779                        <select name="bp-admin[active-member-theme]" id="active-member-theme">
    78                             <?php $themes = bp_core_get_member_themes() ?>
    7980                            <?php
    80                                 if ( $themes ) {
    81                                     for ( $i = 0; $i < count($themes); $i++ ) {
    82                                         if ( $themes[$i]['template'] == get_site_option( 'active-member-theme' ) ) {
    83                                             $selected = ' selected="selected"';
    84                                         } else {
    85                                             $selected = '';
    86                                         }
    87                             ?>
    88                                         <option<?php echo $selected ?> value="<?php echo $themes[$i]['template'] ?>"><?php echo $themes[$i]['name'] ?></option>
    89                             <?php   
    90                                     }
     81                            for ( $i = 0; $i < count($themes); $i++ ) {
     82                                if ( $themes[$i]['template'] == get_site_option( 'active-member-theme' ) ) {
     83                                    $selected = ' selected="selected"';
     84                                } else {
     85                                    $selected = '';
    9186                                }
    9287                            ?>
    93 
     88                            <option<?php echo $selected ?> value="<?php echo $themes[$i]['template'] ?>"><?php echo $themes[$i]['name'] ?> (<?php echo $themes[$i]['version'] ?>)</option>
     89                            <?php } ?>
    9490                        </select>
     91                        <?php else : ?>
     92                            <div class="error">
     93                                <p><?php printf( __( '<strong>You do not have any BuddyPress themes installed.</strong><p style="line-height: 150%%">Please move the default BuddyPress themes to their correct location (move %s to %s) and reload this page. You can <a href="http://buddypress.org/extend/themes" title="Download">download more themes here</a>.</p>', 'buddypress' ), BP_PLUGIN_DIR . '/bp-themes/', WP_CONTENT_DIR . '/bp-themes/' ) ?></p>
     94                            </div>
     95                            <p><?php _e( 'No Themes Installed.', 'buddypress' ) ?></p>
     96                        <?php endif; ?>
    9597                    </td>           
    9698                </tr>
    … …  
    236238                        <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' ) ?>  &nbsp;
    237239                        <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' ) ?>
    238                     </td>           
     240                    </td>
    239241                </tr>
    240242                <?php endif; ?>

  • trunk/bp-core/bp-core-catchuri.php

    r1305 r1315  
    218218                load_template( TEMPLATEPATH . "/404.php" );
    219219            } else {
    220                 wp_die( __( '<strong>You do not have any BuddyPress themes installed.</strong><br />Please download the <a href="http://buddypress.org/extend/themes" title="Download">Default BuddyPress Theme</a> and install it in /wp-content/bp-themes/' ) );
     220                wp_die( __( '<strong>You do not have any BuddyPress themes installed.</strong><br />Please download at least one <a href="http://buddypress.org/extend/themes" title="Download">BuddyPress Theme</a> and install in /wp-content/bp-themes/' ) );
    221221            }
    222222        }

  • trunk/bp-forums/bp-forums-admin.php

    r1311 r1315  
    5252    <div class="wrap">
    5353
    54         <h2><?php _e( 'Group Forum Settings', 'buddypress' ) ?></h2>
     54        <h2><?php _e( 'Forums Setup', 'buddypress' ) ?></h2>
    5555       
    5656        <?php if ( isset( $_POST['submit'] ) ) : ?>

  • trunk/bp-groups/bp-groups-templatetags.php

    r1290 r1315  
    8989                            ?>
    9090                            <div class="checkbox">
    91                                 <label><input type="checkbox" disabled="disabled" name="disabled" id="disabled" value="0" /> <?php _e('<strong>Attention Site Admin:</strong> Group forums require correct setup and configuration of a bbPress installation.', 'buddypress') ?></label>
     91                                <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->root_domain . '/wp-admin/admin.php?page=' . BP_PLUGIN_DIR . '/bp-forums/bp-forums-admin.php' ) ?></label>
    9292                            </div>
    9393                            <?php

  • trunk/bp-loader.php

    r1311 r1315  
    1717 */
    1818
    19 require( 'bp-core.php' );
     19require_once( 'bp-core.php' );
    2020$deactivated = get_site_option( 'bp-deactivated-components' );
    2121

  • trunk/bp-themes/buddypress-home/style.css

    r1303 r1315  
    11/* 
    2 Theme Name: BuddyPress Home Theme
     2Theme Name: BuddyPress Default Home Theme
    33Theme URI: http://buddypress.com/
    44Description: A widget framework theme for the home of a BuddyPress enabled installation. This theme is not required to use BuddyPress.

  • trunk/bp-themes/buddypress-member/style.css

    r1303 r1315  
    11/* 
    2 Theme Name: BuddyPress Member Theme
     2Theme Name: BuddyPress Default Member Theme
    33Theme URI: http://buddypress.org
    44Description: The default member theme for BuddyPress. This theme handles all non-blog pages.

  • trunk/bp-xprofile/bp-xprofile-admin.php

    r1311 r1315  
    3434    <div class="wrap">
    3535       
    36         <h2><?php _e("Profile Settings", 'buddypress') ?></h2>
     36        <h2><?php _e( 'Profile Field Setup', 'buddypress') ?></h2>
    3737        <br />
    38         <p><?php _e('Your users will distinguish themselves through their profile page.
     38        <p><?php _e( 'Your users will distinguish themselves through their profile page.
    3939           You must give them profile fields that allow them to describe themselves
    4040            in a way that is relevant to the theme of your social network.', 'buddypress') ?></p>
    4141           
    42         <p><?php _e('NOTE: Fields in the \'Basic\' group appear on the signup page.', 'buddypress'); ?></p>
     42        <p><?php _e('NOTE: Any fields in the first group will appear on the signup page.', 'buddypress'); ?></p>
    4343       
    4444        <?php

  • trunk/bp-xprofile/bp-xprofile-signup.php

    r1273 r1315  
    4141    }
    4242   
     43    if ( '' == get_site_option( 'bp-enable-signup-avatar-uploads' ) || (int) get_site_option( 'bp-enable-signup-avatar-uploads' ) ) {
    4344    ?>
    4445        <div id="avatar-form-fields">
    … …  
    7071        </div>
    7172    <?php
     73    }
    7274}
    7375add_action( 'signup_extra_fields', 'xprofile_add_signup_fields' );
Note: See TracChangeset for help on using the changeset viewer.