<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[BuddyPress][7202] trunk/bp-templates/bp-legacy/buddypress/members/single: Removes more redundant markup from bp-legacy members/single/settings/ templates</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://buddypress.trac.wordpress.org/changeset/7202">7202</a></dd>
<dt>Author</dt> <dd>boonebgorges</dd>
<dt>Date</dt> <dd>2013-06-10 14:55:09 +0000 (Mon, 10 Jun 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>Removes more redundant markup from bp-legacy members/single/settings/ templates
Fixes <a href="http://buddypress.trac.wordpress.org/ticket/5045">#5045</a> again
Props hnla</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkbptemplatesbplegacybuddypressmemberssinglehomephp">trunk/bp-templates/bp-legacy/buddypress/members/single/home.php</a></li>
<li><a href="#trunkbptemplatesbplegacybuddypressmemberssinglesettingscapabilitiesphp">trunk/bp-templates/bp-legacy/buddypress/members/single/settings/capabilities.php</a></li>
<li><a href="#trunkbptemplatesbplegacybuddypressmemberssinglesettingsdeleteaccountphp">trunk/bp-templates/bp-legacy/buddypress/members/single/settings/delete-account.php</a></li>
<li><a href="#trunkbptemplatesbplegacybuddypressmemberssinglesettingsgeneralphp">trunk/bp-templates/bp-legacy/buddypress/members/single/settings/general.php</a></li>
<li><a href="#trunkbptemplatesbplegacybuddypressmemberssinglesettingsnotificationsphp">trunk/bp-templates/bp-legacy/buddypress/members/single/settings/notifications.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkbptemplatesbplegacybuddypressmemberssinglehomephp"></a>
<div class="modfile"><h4>Modified: trunk/bp-templates/bp-legacy/buddypress/members/single/home.php (7201 => 7202)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-templates/bp-legacy/buddypress/members/single/home.php 2013-06-10 14:45:40 UTC (rev 7201)
+++ trunk/bp-templates/bp-legacy/buddypress/members/single/home.php 2013-06-10 14:55:09 UTC (rev 7202)
</span><span class="lines">@@ -20,7 +20,7 @@
</span><span class="cx"> </div>
</span><span class="cx"> </div><!-- #item-nav -->
</span><span class="cx">
</span><del>- <div id="item-body">
</del><ins>+ <div id="item-body" role="main">
</ins><span class="cx">
</span><span class="cx"> <?php do_action( 'bp_before_member_body' );
</span><span class="cx">
</span></span></pre></div>
<a id="trunkbptemplatesbplegacybuddypressmemberssinglesettingscapabilitiesphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-templates/bp-legacy/buddypress/members/single/settings/capabilities.php (7201 => 7202)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-templates/bp-legacy/buddypress/members/single/settings/capabilities.php 2013-06-10 14:45:40 UTC (rev 7201)
+++ trunk/bp-templates/bp-legacy/buddypress/members/single/settings/capabilities.php 2013-06-10 14:55:09 UTC (rev 7202)
</span><span class="lines">@@ -1,30 +1,22 @@
</span><span class="cx"> <?php do_action( 'bp_before_member_settings_template' ); ?>
</span><span class="cx">
</span><del>-<div id="item-body" role="main">
</del><ins>+<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">
</ins><span class="cx">
</span><del>- <?php do_action( 'bp_before_member_body' ); ?>
</del><ins>+ <?php do_action( 'bp_members_capabilities_account_before_submit' ); ?>
</ins><span class="cx">
</span><del>- <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">
</del><ins>+ <label>
+ <input type="checkbox" name="user-spammer" id="user-spammer" value="1" <?php checked( bp_is_user_spammer( bp_displayed_user_id() ) ); ?> />
+ <?php _e( 'This user is a spammer.', 'buddypress' ); ?>
+ </label>
</ins><span class="cx">
</span><del>- <?php do_action( 'bp_members_capabilities_account_before_submit' ); ?>
</del><ins>+ <div class="submit">
+ <input type="submit" value="<?php _e( 'Save', 'buddypress' ); ?>" id="capabilities-submit" name="capabilities-submit" />
+ </div>
</ins><span class="cx">
</span><del>- <label>
- <input type="checkbox" name="user-spammer" id="user-spammer" value="1" <?php checked( bp_is_user_spammer( bp_displayed_user_id() ) ); ?> />
- <?php _e( 'This user is a spammer.', 'buddypress' ); ?>
- </label>
</del><ins>+ <?php do_action( 'bp_members_capabilities_account_after_submit' ); ?>
</ins><span class="cx">
</span><del>- <div class="submit">
- <input type="submit" value="<?php _e( 'Save', 'buddypress' ); ?>" id="capabilities-submit" name="capabilities-submit" />
- </div>
</del><ins>+ <?php wp_nonce_field( 'capabilities' ); ?>
</ins><span class="cx">
</span><del>- <?php do_action( 'bp_members_capabilities_account_after_submit' ); ?>
</del><ins>+</form>
</ins><span class="cx">
</span><del>- <?php wp_nonce_field( 'capabilities' ); ?>
-
- </form>
-
- <?php do_action( 'bp_after_member_body' ); ?>
-
-</div><!-- #item-body -->
-
</del><span class="cx"> <?php do_action( 'bp_after_member_settings_template' ); ?>
</span></span></pre></div>
<a id="trunkbptemplatesbplegacybuddypressmemberssinglesettingsdeleteaccountphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-templates/bp-legacy/buddypress/members/single/settings/delete-account.php (7201 => 7202)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-templates/bp-legacy/buddypress/members/single/settings/delete-account.php 2013-06-10 14:45:40 UTC (rev 7201)
+++ trunk/bp-templates/bp-legacy/buddypress/members/single/settings/delete-account.php 2013-06-10 14:55:09 UTC (rev 7202)
</span><span class="lines">@@ -1,44 +1,36 @@
</span><span class="cx"> <?php do_action( 'bp_before_member_settings_template' ); ?>
</span><span class="cx">
</span><del>-<div id="item-body" role="main">
</del><ins>+<div id="message" class="info">
</ins><span class="cx">
</span><del>- <?php do_action( 'bp_before_member_body' ); ?>
</del><ins>+ <?php if ( bp_is_my_profile() ) : ?>
</ins><span class="cx">
</span><del>- <div id="message" class="info">
</del><ins>+ <p><?php _e( 'Deleting your account will delete all of the content you have created. It will be completely irrecoverable.', 'buddypress' ); ?></p>
</ins><span class="cx">
</span><del>- <?php if ( bp_is_my_profile() ) : ?>
</del><ins>+ <?php else : ?>
</ins><span class="cx">
</span><del>- <p><?php _e( 'Deleting your account will delete all of the content you have created. It will be completely irrecoverable.', 'buddypress' ); ?></p>
</del><ins>+ <p><?php _e( 'Deleting this account will delete all of the content it has created. It will be completely irrecoverable.', 'buddypress' ); ?></p>
</ins><span class="cx">
</span><del>- <?php else : ?>
</del><ins>+ <?php endif; ?>
</ins><span class="cx">
</span><del>- <p><?php _e( 'Deleting this account will delete all of the content it has created. It will be completely irrecoverable.', 'buddypress' ); ?></p>
</del><ins>+</div>
</ins><span class="cx">
</span><del>- <?php endif; ?>
</del><ins>+<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">
</ins><span class="cx">
</span><del>- </div>
</del><ins>+ <?php do_action( 'bp_members_delete_account_before_submit' ); ?>
</ins><span class="cx">
</span><del>- <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">
</del><ins>+ <label>
+ <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'; }" />
+ <?php _e( 'I understand the consequences.', 'buddypress' ); ?>
+ </label>
</ins><span class="cx">
</span><del>- <?php do_action( 'bp_members_delete_account_before_submit' ); ?>
</del><ins>+ <div class="submit">
+ <input type="submit" disabled="disabled" value="<?php _e( 'Delete Account', 'buddypress' ); ?>" id="delete-account-button" name="delete-account-button" />
+ </div>
</ins><span class="cx">
</span><del>- <label>
- <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'; }" />
- <?php _e( 'I understand the consequences.', 'buddypress' ); ?>
- </label>
</del><ins>+ <?php do_action( 'bp_members_delete_account_after_submit' ); ?>
</ins><span class="cx">
</span><del>- <div class="submit">
- <input type="submit" disabled="disabled" value="<?php _e( 'Delete Account', 'buddypress' ); ?>" id="delete-account-button" name="delete-account-button" />
- </div>
</del><ins>+ <?php wp_nonce_field( 'delete-account' ); ?>
</ins><span class="cx">
</span><del>- <?php do_action( 'bp_members_delete_account_after_submit' ); ?>
</del><ins>+</form>
</ins><span class="cx">
</span><del>- <?php wp_nonce_field( 'delete-account' ); ?>
-
- </form>
-
- <?php do_action( 'bp_after_member_body' ); ?>
-
-</div><!-- #item-body -->
-
</del><span class="cx"> <?php do_action( 'bp_after_member_settings_template' ); ?>
</span></span></pre></div>
<a id="trunkbptemplatesbplegacybuddypressmemberssinglesettingsgeneralphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-templates/bp-legacy/buddypress/members/single/settings/general.php (7201 => 7202)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-templates/bp-legacy/buddypress/members/single/settings/general.php 2013-06-10 14:45:40 UTC (rev 7201)
+++ trunk/bp-templates/bp-legacy/buddypress/members/single/settings/general.php 2013-06-10 14:55:09 UTC (rev 7202)
</span><span class="lines">@@ -1,41 +1,31 @@
</span><span class="cx"> <?php do_action( 'bp_before_member_settings_template' ); ?>
</span><span class="cx">
</span><del>-<div id="item-body" role="main">
</del><ins>+<form action="<?php echo bp_displayed_user_domain() . bp_get_settings_slug() . '/general'; ?>" method="post" class="standard-form" id="settings-form">
</ins><span class="cx">
</span><del>- <?php do_action( 'bp_before_member_body' ); ?>
</del><ins>+ <?php if ( !is_super_admin() ) : ?>
</ins><span class="cx">
</span><del>- <?php do_action( 'bp_template_content' ); ?>
</del><ins>+ <label for="pwd"><?php _e( 'Current Password <span>(required to update email or change current password)</span>', 'buddypress' ); ?></label>
+ <input type="password" name="pwd" id="pwd" size="16" value="" class="settings-input small" /> <a href="<?php echo wp_lostpassword_url(); ?>" title="<?php _e( 'Password Lost and Found', 'buddypress' ); ?>"><?php _e( 'Lost your password?', 'buddypress' ); ?></a>
</ins><span class="cx">
</span><del>- <form action="<?php echo bp_displayed_user_domain() . bp_get_settings_slug() . '/general'; ?>" method="post" class="standard-form" id="settings-form">
</del><ins>+ <?php endif; ?>
</ins><span class="cx">
</span><del>- <?php if ( !is_super_admin() ) : ?>
</del><ins>+ <label for="email"><?php _e( 'Account Email', 'buddypress' ); ?></label>
+ <input type="text" name="email" id="email" value="<?php echo bp_get_displayed_user_email(); ?>" class="settings-input" />
</ins><span class="cx">
</span><del>- <label for="pwd"><?php _e( 'Current Password <span>(required to update email or change current password)</span>', 'buddypress' ); ?></label>
- <input type="password" name="pwd" id="pwd" size="16" value="" class="settings-input small" /> <a href="<?php echo wp_lostpassword_url(); ?>" title="<?php _e( 'Password Lost and Found', 'buddypress' ); ?>"><?php _e( 'Lost your password?', 'buddypress' ); ?></a>
</del><ins>+ <label for="pass1"><?php _e( 'Change Password <span>(leave blank for no change)</span>', 'buddypress' ); ?></label>
+ <input type="password" name="pass1" id="pass1" size="16" value="" class="settings-input small" /> <?php _e( 'New Password', 'buddypress' ); ?><br />
+ <input type="password" name="pass2" id="pass2" size="16" value="" class="settings-input small" /> <?php _e( 'Repeat New Password', 'buddypress' ); ?>
</ins><span class="cx">
</span><del>- <?php endif; ?>
</del><ins>+ <?php do_action( 'bp_core_general_settings_before_submit' ); ?>
</ins><span class="cx">
</span><del>- <label for="email"><?php _e( 'Account Email', 'buddypress' ); ?></label>
- <input type="text" name="email" id="email" value="<?php echo bp_get_displayed_user_email(); ?>" class="settings-input" />
</del><ins>+ <div class="submit">
+ <input type="submit" name="submit" value="<?php _e( 'Save Changes', 'buddypress' ); ?>" id="submit" class="auto" />
+ </div>
</ins><span class="cx">
</span><del>- <label for="pass1"><?php _e( 'Change Password <span>(leave blank for no change)</span>', 'buddypress' ); ?></label>
- <input type="password" name="pass1" id="pass1" size="16" value="" class="settings-input small" /> <?php _e( 'New Password', 'buddypress' ); ?><br />
- <input type="password" name="pass2" id="pass2" size="16" value="" class="settings-input small" /> <?php _e( 'Repeat New Password', 'buddypress' ); ?>
</del><ins>+ <?php do_action( 'bp_core_general_settings_after_submit' ); ?>
</ins><span class="cx">
</span><del>- <?php do_action( 'bp_core_general_settings_before_submit' ); ?>
</del><ins>+ <?php wp_nonce_field( 'bp_settings_general' ); ?>
</ins><span class="cx">
</span><del>- <div class="submit">
- <input type="submit" name="submit" value="<?php _e( 'Save Changes', 'buddypress' ); ?>" id="submit" class="auto" />
- </div>
</del><ins>+</form>
</ins><span class="cx">
</span><del>- <?php do_action( 'bp_core_general_settings_after_submit' ); ?>
-
- <?php wp_nonce_field( 'bp_settings_general' ); ?>
-
- </form>
-
- <?php do_action( 'bp_after_member_body' ); ?>
-
-</div><!-- #item-body -->
-
</del><span class="cx"> <?php do_action( 'bp_after_member_settings_template' ); ?>
</span></span></pre></div>
<a id="trunkbptemplatesbplegacybuddypressmemberssinglesettingsnotificationsphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-templates/bp-legacy/buddypress/members/single/settings/notifications.php (7201 => 7202)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-templates/bp-legacy/buddypress/members/single/settings/notifications.php 2013-06-10 14:45:40 UTC (rev 7201)
+++ trunk/bp-templates/bp-legacy/buddypress/members/single/settings/notifications.php 2013-06-10 14:55:09 UTC (rev 7202)
</span><span class="lines">@@ -1,30 +1,20 @@
</span><span class="cx"> <?php do_action( 'bp_before_member_settings_template' ); ?>
</span><span class="cx">
</span><del>-<div id="item-body" role="main">
</del><ins>+<form action="<?php echo bp_displayed_user_domain() . bp_get_settings_slug() . '/notifications'; ?>" method="post" class="standard-form" id="settings-form">
+ <p><?php _e( 'Send a notification by email when:', 'buddypress' ); ?></p>
</ins><span class="cx">
</span><del>- <?php do_action( 'bp_before_member_body' ); ?>
</del><ins>+ <?php do_action( 'bp_notification_settings' ); ?>
</ins><span class="cx">
</span><del>- <?php do_action( 'bp_template_content' ); ?>
</del><ins>+ <?php do_action( 'bp_members_notification_settings_before_submit' ); ?>
</ins><span class="cx">
</span><del>- <form action="<?php echo bp_displayed_user_domain() . bp_get_settings_slug() . '/notifications'; ?>" method="post" class="standard-form" id="settings-form">
- <p><?php _e( 'Send a notification by email when:', 'buddypress' ); ?></p>
</del><ins>+ <div class="submit">
+ <input type="submit" name="submit" value="<?php _e( 'Save Changes', 'buddypress' ); ?>" id="submit" class="auto" />
+ </div>
</ins><span class="cx">
</span><del>- <?php do_action( 'bp_notification_settings' ); ?>
</del><ins>+ <?php do_action( 'bp_members_notification_settings_after_submit' ); ?>
</ins><span class="cx">
</span><del>- <?php do_action( 'bp_members_notification_settings_before_submit' ); ?>
</del><ins>+ <?php wp_nonce_field('bp_settings_notifications' ); ?>
</ins><span class="cx">
</span><del>- <div class="submit">
- <input type="submit" name="submit" value="<?php _e( 'Save Changes', 'buddypress' ); ?>" id="submit" class="auto" />
- </div>
</del><ins>+</form>
</ins><span class="cx">
</span><del>- <?php do_action( 'bp_members_notification_settings_after_submit' ); ?>
-
- <?php wp_nonce_field('bp_settings_notifications' ); ?>
-
- </form>
-
- <?php do_action( 'bp_after_member_body' ); ?>
-
-</div><!-- #item-body -->
-
</del><span class="cx"> <?php do_action( 'bp_after_member_settings_template' ); ?>
</span></span></pre>
</div>
</div>
</body>
</html>