Skip to:
Content

BuddyPress.org

Changeset 7199


Ignore:
Timestamp:
06/10/2013 01:56:58 AM (13 years ago)
Author:
boonebgorges
Message:

Remove <div id="buddypress"> wrappers from members/single/settings/ templates

The #buddypress div is added in the top-level template. It appears to have been
copied here by mistake when bp-legacy was first spawned from bp-default.

Fixes #5045

Props hnla

Location:
trunk/bp-templates/bp-legacy/buddypress/members/single/settings
Files:
4 edited

Legend:

Unmodified
Added
Removed

  • trunk/bp-templates/bp-legacy/buddypress/members/single/settings/capabilities.php

    r6284 r7199  
    1 <div id="buddypress">
     1<?php do_action( 'bp_before_member_settings_template' ); ?>
    22
    3         <?php do_action( 'bp_before_member_settings_template' ); ?>
     3<div id="item-body" role="main">
    44
    5         <div id="item-body" role="main">
     5        <?php do_action( 'bp_before_member_body' ); ?>
    66
    7                 <?php do_action( 'bp_before_member_body' ); ?>
     7        <form action="<?php echo bp_displayed_user_domain() . bp_get_settings_slug() . '/capabilities/'; ?>" name="account-capabilities-form" id="account-capabilities-form" class="standard-form" method="post">
    88
    9                 <form action="<?php echo bp_displayed_user_domain() . bp_get_settings_slug() . '/capabilities/'; ?>" name="account-capabilities-form" id="account-capabilities-form" class="standard-form" method="post">
     9                <?php do_action( 'bp_members_capabilities_account_before_submit' ); ?>
    1010
    11                         <?php do_action( 'bp_members_capabilities_account_before_submit' ); ?>
     11                <label>
     12                        <input type="checkbox" name="user-spammer" id="user-spammer" value="1" <?php checked( bp_is_user_spammer( bp_displayed_user_id() ) ); ?> />
     13                         <?php _e( 'This user is a spammer.', 'buddypress' ); ?>
     14                </label>
    1215
    13                         <label>
    14                                 <input type="checkbox" name="user-spammer" id="user-spammer" value="1" <?php checked( bp_is_user_spammer( bp_displayed_user_id() ) ); ?> />
    15                                  <?php _e( 'This user is a spammer.', 'buddypress' ); ?>
    16                         </label>
     16                <div class="submit">
     17                        <input type="submit" value="<?php _e( 'Save', 'buddypress' ); ?>" id="capabilities-submit" name="capabilities-submit" />
     18                </div>
    1719
    18                         <div class="submit">
    19                                 <input type="submit" value="<?php _e( 'Save', 'buddypress' ); ?>" id="capabilities-submit" name="capabilities-submit" />
    20                         </div>
     20                <?php do_action( 'bp_members_capabilities_account_after_submit' ); ?>
    2121
    22                         <?php do_action( 'bp_members_capabilities_account_after_submit' ); ?>
     22                <?php wp_nonce_field( 'capabilities' ); ?>
    2323
    24                         <?php wp_nonce_field( 'capabilities' ); ?>
     24        </form>
    2525
    26                 </form>
     26        <?php do_action( 'bp_after_member_body' ); ?>
    2727
    28                 <?php do_action( 'bp_after_member_body' ); ?>
     28</div><!-- #item-body -->
    2929
    30         </div><!-- #item-body -->
    31 
    32         <?php do_action( 'bp_after_member_settings_template' ); ?>
    33 
    34 </div><!-- #buddypress -->
     30<?php do_action( 'bp_after_member_settings_template' ); ?>

  • trunk/bp-templates/bp-legacy/buddypress/members/single/settings/delete-account.php

    r6284 r7199  
    1 <div id="buddypress">
     1<?php do_action( 'bp_before_member_settings_template' ); ?>
    22
    3         <?php do_action( 'bp_before_member_settings_template' ); ?>
     3<div id="item-body" role="main">
    44
    5         <div id="item-body" role="main">
     5        <?php do_action( 'bp_before_member_body' ); ?>
    66
    7                 <?php do_action( 'bp_before_member_body' ); ?>
     7        <div id="message" class="info">
    88
    9                 <div id="message" class="info">
     9                <?php if ( bp_is_my_profile() ) : ?>
    1010
    11                         <?php if ( bp_is_my_profile() ) : ?>
     11                        <p><?php _e( 'Deleting your account will delete all of the content you have created. It will be completely irrecoverable.', 'buddypress' ); ?></p>
    1212
    13                                 <p><?php _e( 'Deleting your account will delete all of the content you have created. It will be completely irrecoverable.', 'buddypress' ); ?></p>
     13                <?php else : ?>
    1414
    15                         <?php else : ?>
     15                        <p><?php _e( 'Deleting this account will delete all of the content it has created. It will be completely irrecoverable.', 'buddypress' ); ?></p>
    1616
    17                                 <p><?php _e( 'Deleting this account will delete all of the content it has created. It will be completely irrecoverable.', 'buddypress' ); ?></p>
     17                <?php endif; ?>
    1818
    19                         <?php endif; ?>
     19        </div>
    2020
     21        <form action="<?php echo bp_displayed_user_domain() . bp_get_settings_slug() . '/delete-account'; ?>" name="account-delete-form" id="account-delete-form" class="standard-form" method="post">
     22
     23                <?php do_action( 'bp_members_delete_account_before_submit' ); ?>
     24
     25                <label>
     26                        <input type="checkbox" name="delete-account-understand" id="delete-account-understand" value="1" onclick="if(this.checked) { document.getElementById('delete-account-button').disabled = ''; } else { document.getElementById('delete-account-button').disabled = 'disabled'; }" />
     27                         <?php _e( 'I understand the consequences.', 'buddypress' ); ?>
     28                </label>
     29
     30                <div class="submit">
     31                        <input type="submit" disabled="disabled" value="<?php _e( 'Delete Account', 'buddypress' ); ?>" id="delete-account-button" name="delete-account-button" />
    2132                </div>
    2233
    23                 <form action="<?php echo bp_displayed_user_domain() . bp_get_settings_slug() . '/delete-account'; ?>" name="account-delete-form" id="account-delete-form" class="standard-form" method="post">
     34                <?php do_action( 'bp_members_delete_account_after_submit' ); ?>
    2435
    25                         <?php do_action( 'bp_members_delete_account_before_submit' ); ?>
     36                <?php wp_nonce_field( 'delete-account' ); ?>
    2637
    27                         <label>
    28                                 <input type="checkbox" name="delete-account-understand" id="delete-account-understand" value="1" onclick="if(this.checked) { document.getElementById('delete-account-button').disabled = ''; } else { document.getElementById('delete-account-button').disabled = 'disabled'; }" />
    29                                  <?php _e( 'I understand the consequences.', 'buddypress' ); ?>
    30                         </label>
     38        </form>
    3139
    32                         <div class="submit">
    33                                 <input type="submit" disabled="disabled" value="<?php _e( 'Delete Account', 'buddypress' ); ?>" id="delete-account-button" name="delete-account-button" />
    34                         </div>
     40        <?php do_action( 'bp_after_member_body' ); ?>
    3541
    36                         <?php do_action( 'bp_members_delete_account_after_submit' ); ?>
     42</div><!-- #item-body -->
    3743
    38                         <?php wp_nonce_field( 'delete-account' ); ?>
    39 
    40                 </form>
    41 
    42                 <?php do_action( 'bp_after_member_body' ); ?>
    43 
    44         </div><!-- #item-body -->
    45 
    46         <?php do_action( 'bp_after_member_settings_template' ); ?>
    47 
    48 </div><!-- #buddypress -->
     44<?php do_action( 'bp_after_member_settings_template' ); ?>

  • trunk/bp-templates/bp-legacy/buddypress/members/single/settings/general.php

    r6976 r7199  
    1 <div id="buddypress">
     1<?php do_action( 'bp_before_member_settings_template' ); ?>
    22
    3         <?php do_action( 'bp_before_member_settings_template' ); ?>
     3<div id="item-body" role="main">
    44
    5         <div id="item-body" role="main">
     5        <?php do_action( 'bp_before_member_body' ); ?>
    66
    7                 <?php do_action( 'bp_before_member_body' ); ?>
     7        <?php do_action( 'bp_template_content' ); ?>
    88
    9                 <?php do_action( 'bp_template_content' ); ?>
     9        <form action="<?php echo bp_displayed_user_domain() . bp_get_settings_slug() . '/general'; ?>" method="post" class="standard-form" id="settings-form">
    1010
    11                 <form action="<?php echo bp_displayed_user_domain() . bp_get_settings_slug() . '/general'; ?>" method="post" class="standard-form" id="settings-form">
     11                <?php if ( !is_super_admin() ) : ?>
    1212
    13                         <?php if ( !is_super_admin() ) : ?>
     13                        <label for="pwd"><?php _e( 'Current Password <span>(required to update email or change current password)</span>', 'buddypress' ); ?></label>
     14                        <input type="password" name="pwd" id="pwd" size="16" value="" class="settings-input small" /> &nbsp;<a href="<?php echo wp_lostpassword_url(); ?>" title="<?php _e( 'Password Lost and Found', 'buddypress' ); ?>"><?php _e( 'Lost your password?', 'buddypress' ); ?></a>
    1415
    15                                 <label for="pwd"><?php _e( 'Current Password <span>(required to update email or change current password)</span>', 'buddypress' ); ?></label>
    16                                 <input type="password" name="pwd" id="pwd" size="16" value="" class="settings-input small" /> &nbsp;<a href="<?php echo wp_lostpassword_url(); ?>" title="<?php _e( 'Password Lost and Found', 'buddypress' ); ?>"><?php _e( 'Lost your password?', 'buddypress' ); ?></a>
     16                <?php endif; ?>
    1717
    18                         <?php endif; ?>
     18                <label for="email"><?php _e( 'Account Email', 'buddypress' ); ?></label>
     19                <input type="text" name="email" id="email" value="<?php echo bp_get_displayed_user_email(); ?>" class="settings-input" />
    1920
    20                         <label for="email"><?php _e( 'Account Email', 'buddypress' ); ?></label>
    21                         <input type="text" name="email" id="email" value="<?php echo bp_get_displayed_user_email(); ?>" class="settings-input" />
     21                <label for="pass1"><?php _e( 'Change Password <span>(leave blank for no change)</span>', 'buddypress' ); ?></label>
     22                <input type="password" name="pass1" id="pass1" size="16" value="" class="settings-input small" /> &nbsp;<?php _e( 'New Password', 'buddypress' ); ?><br />
     23                <input type="password" name="pass2" id="pass2" size="16" value="" class="settings-input small" /> &nbsp;<?php _e( 'Repeat New Password', 'buddypress' ); ?>
    2224
    23                         <label for="pass1"><?php _e( 'Change Password <span>(leave blank for no change)</span>', 'buddypress' ); ?></label>
    24                         <input type="password" name="pass1" id="pass1" size="16" value="" class="settings-input small" /> &nbsp;<?php _e( 'New Password', 'buddypress' ); ?><br />
    25                         <input type="password" name="pass2" id="pass2" size="16" value="" class="settings-input small" /> &nbsp;<?php _e( 'Repeat New Password', 'buddypress' ); ?>
     25                <?php do_action( 'bp_core_general_settings_before_submit' ); ?>
    2626
    27                         <?php do_action( 'bp_core_general_settings_before_submit' ); ?>
     27                <div class="submit">
     28                        <input type="submit" name="submit" value="<?php _e( 'Save Changes', 'buddypress' ); ?>" id="submit" class="auto" />
     29                </div>
    2830
    29                         <div class="submit">
    30                                 <input type="submit" name="submit" value="<?php _e( 'Save Changes', 'buddypress' ); ?>" id="submit" class="auto" />
    31                         </div>
     31                <?php do_action( 'bp_core_general_settings_after_submit' ); ?>
    3232
    33                         <?php do_action( 'bp_core_general_settings_after_submit' ); ?>
     33                <?php wp_nonce_field( 'bp_settings_general' ); ?>
    3434
    35                         <?php wp_nonce_field( 'bp_settings_general' ); ?>
     35        </form>
    3636
    37                 </form>
     37        <?php do_action( 'bp_after_member_body' ); ?>
    3838
    39                 <?php do_action( 'bp_after_member_body' ); ?>
     39</div><!-- #item-body -->
    4040
    41         </div><!-- #item-body -->
    42 
    43         <?php do_action( 'bp_after_member_settings_template' ); ?>
    44 
    45 </div><!-- #buddypress -->
     41<?php do_action( 'bp_after_member_settings_template' ); ?>

  • trunk/bp-templates/bp-legacy/buddypress/members/single/settings/notifications.php

    r6284 r7199  
    1 <div id="buddypress">
     1<?php do_action( 'bp_before_member_settings_template' ); ?>
    22
    3         <?php do_action( 'bp_before_member_settings_template' ); ?>
     3<div id="item-body" role="main">
    44
    5         <div id="item-body" role="main">
     5        <?php do_action( 'bp_before_member_body' ); ?>
    66
    7                 <?php do_action( 'bp_before_member_body' ); ?>
     7        <?php do_action( 'bp_template_content' ); ?>
    88
    9                 <?php do_action( 'bp_template_content' ); ?>
     9        <form action="<?php echo bp_displayed_user_domain() . bp_get_settings_slug() . '/notifications'; ?>" method="post" class="standard-form" id="settings-form">
     10                <p><?php _e( 'Send a notification by email when:', 'buddypress' ); ?></p>
    1011
    11                 <form action="<?php echo bp_displayed_user_domain() . bp_get_settings_slug() . '/notifications'; ?>" method="post" class="standard-form" id="settings-form">
    12                         <p><?php _e( 'Send a notification by email when:', 'buddypress' ); ?></p>
     12                <?php do_action( 'bp_notification_settings' ); ?>
    1313
    14                         <?php do_action( 'bp_notification_settings' ); ?>
     14                <?php do_action( 'bp_members_notification_settings_before_submit' ); ?>
    1515
    16                         <?php do_action( 'bp_members_notification_settings_before_submit' ); ?>
     16                <div class="submit">
     17                        <input type="submit" name="submit" value="<?php _e( 'Save Changes', 'buddypress' ); ?>" id="submit" class="auto" />
     18                </div>
    1719
    18                         <div class="submit">
    19                                 <input type="submit" name="submit" value="<?php _e( 'Save Changes', 'buddypress' ); ?>" id="submit" class="auto" />
    20                         </div>
     20                <?php do_action( 'bp_members_notification_settings_after_submit' ); ?>
    2121
    22                         <?php do_action( 'bp_members_notification_settings_after_submit' ); ?>
     22                <?php wp_nonce_field('bp_settings_notifications' ); ?>
    2323
    24                         <?php wp_nonce_field('bp_settings_notifications' ); ?>
     24        </form>
    2525
    26                 </form>
     26        <?php do_action( 'bp_after_member_body' ); ?>
    2727
    28                 <?php do_action( 'bp_after_member_body' ); ?>
     28</div><!-- #item-body -->
    2929
    30         </div><!-- #item-body -->
    31 
    32         <?php do_action( 'bp_after_member_settings_template' ); ?>
    33 
    34 </div><!-- #buddypress -->
     30<?php do_action( 'bp_after_member_settings_template' ); ?>
Note: See TracChangeset for help on using the changeset viewer.