<!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][6297] trunk/bp-xprofile/bp-xprofile-classes.php: XProfile:</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, #logmsg > ol { margin-left: 0; 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/6297">6297</a></dd>
<dt>Author</dt> <dd>johnjamesjacoby</dd>
<dt>Date</dt> <dd>2012-09-03 03:30:32 +0000 (Mon, 03 Sep 2012)</dd>
</dl>
<h3>Log Message</h3>
<pre>XProfile:
* Hardcode BP_XProfile_Group::render_admin_form() to look like traditional post form.
* @todo: use metabox API.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkbpxprofilebpxprofileclassesphp">trunk/bp-xprofile/bp-xprofile-classes.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkbpxprofilebpxprofileclassesphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-xprofile/bp-xprofile-classes.php (6296 => 6297)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-xprofile/bp-xprofile-classes.php 2012-09-03 02:36:26 UTC (rev 6296)
+++ trunk/bp-xprofile/bp-xprofile-classes.php 2012-09-03 03:30:32 UTC (rev 6297)
</span><span class="lines">@@ -224,9 +224,9 @@
</span><span class="cx">
</span><span class="cx"> // Assign correct data value to the field
</span><span class="cx"> if ( $field->id == $data->field_id ) {
</span><del>- $fields[$field_key]->data = new stdClass;
- $fields[$field_key]->data->value = $data->value;
- $fields[$field_key]->data->id = $data->id;
</del><ins>+ $fields[$field_key]->data = new stdClass;
+ $fields[$field_key]->data->value = $data->value;
+ $fields[$field_key]->data->id = $data->id;
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="lines">@@ -294,7 +294,6 @@
</span><span class="cx"> * @return array $fields The database results, with field_visibility added
</span><span class="cx"> */
</span><span class="cx"> function fetch_visibility_level( $user_id, $fields ) {
</span><del>- global $wpdb, $bp;
</del><span class="cx">
</span><span class="cx"> // Get the user's visibility level preferences
</span><span class="cx"> $visibility_levels = bp_get_user_meta( $user_id, 'bp_xprofile_visibility_levels', true );
</span><span class="lines">@@ -346,10 +345,6 @@
</span><span class="cx"> return $default_visibility_levels;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- /* ADMIN AREA HTML.
- * TODO: Get this out of here and replace with standard loops
- */
-
</del><span class="cx"> function render_admin_form() {
</span><span class="cx"> global $message;
</span><span class="cx">
</span><span class="lines">@@ -358,7 +353,7 @@
</span><span class="cx"> $action = "admin.php?page=bp-profile-setup&amp;mode=add_group";
</span><span class="cx"> $button = __( 'Create Field Group', 'buddypress' );
</span><span class="cx"> } else {
</span><del>- $title = __( 'Edit Field Group', 'buddypress' );
</del><ins>+ $title = __( 'Edit Field Group', 'buddypress' );
</ins><span class="cx"> $action = "admin.php?page=bp-profile-setup&amp;mode=edit_group&amp;group_id=" . $this->id;
</span><span class="cx"> $button = __( 'Save Changes', 'buddypress' );
</span><span class="cx"> } ?>
</span><span class="lines">@@ -367,45 +362,61 @@
</span><span class="cx">
</span><span class="cx"> <?php screen_icon( 'users' ); ?>
</span><span class="cx">
</span><del>- <h2><?php echo $title; ?></h2>
- <p><?php _e( 'Fields marked * are required', 'buddypress' ) ?></p>
</del><ins>+ <h2><?php echo esc_html( $title ); ?></h2>
</ins><span class="cx">
</span><span class="cx"> <?php if ( !empty( $message ) ) :
</span><span class="cx"> $type = ( 'error' == $type ) ? 'error' : 'updated'; ?>
</span><span class="cx">
</span><del>- <div id="message" class="<?php echo $type; ?> fade">
- <p><?php echo $message; ?></p>
</del><ins>+ <div id="message" class="<?php echo esc_attr( $type ); ?> fade">
+ <p><?php echo esc_html( $message ); ?></p>
</ins><span class="cx"> </div>
</span><span class="cx">
</span><span class="cx"> <?php endif; ?>
</span><span class="cx">
</span><del>- <div id="poststuff">
- <form action="<?php echo esc_url( $action ); ?>" method="post">
- <div id="titlediv">
- <h3><label for="group_name"><?php _e( "Field Group Title", 'buddypress') ?> *</label></h3>
- <div id="titlewrap">
- <input type="text" name="group_name" id="title" value="<?php echo esc_attr( $this->name ); ?>" style="width:50%" />
- </div>
- </div>
</del><ins>+ <form action="<?php echo esc_url( $action ); ?>" method="post">
+ <div id="poststuff">
+ <div id="post-body" class="metabox-holder columns-2">
+ <div id="post-body-content">
+ <div id="titlediv">
+ <div id="titlewrap">
+ <label class="screen-reader-text" id="title-prompt-text" for="title"><?php _e( 'Field Group Title', 'buddypress') ?></label>
+ <input type="text" name="group_name" id="title" value="<?php echo esc_attr( $this->name ); ?>" />
+ </div>
+ </div>
</ins><span class="cx">
</span><del>- <?php if ( '0' != $this->can_delete ) : ?>
-
- <div id="titlediv">
- <h3><label for="description"><?php _e( "Group Description", 'buddypress' ); ?></label></h3>
- <div id="titlewrap">
- <textarea name="group_description" id="group_description" rows="8" cols="60"><?php echo htmlspecialchars( $this->description ); ?></textarea>
</del><ins>+ <div id="postdiv" class="postarea">
+ <div class="postbox">
+ <div id="titlediv"><h3 class="hndle"><?php _e( 'Group Description', 'buddypress' ); ?></h3></div>
+ <div class="inside">
+ <textarea name="group_description" id="group_description" rows="8" cols="60"><?php echo esc_textarea( $this->description ); ?></textarea>
+ </div>
+ </div>
</ins><span class="cx"> </div>
</span><span class="cx"> </div>
</span><del>-
- <?php endif; ?>
-
- <p class="submit">
- <input type="hidden" name="group_order" id="group_order" value="<?php echo esc_attr( $this->group_order ); ?>" />
- <input type="submit" name="save_group" value="<?php echo esc_attr( $button ); ?>" class="button-primary"/>
- <?php _e( 'or', 'buddypress' ); ?> <a href="admin.php?page=bp-profile-setup" class="deletion"><?php _e( 'Cancel', 'buddypress' ); ?></a>
- </p>
- </form>
- </div>
</del><ins>+ <div id="postbox-container-1" class="postbox-container">
+ <div id="side-sortables" class="meta-box-sortables ui-sortable">
+ <div id="submitdiv" class="postbox">
+ <div id="handlediv"><h3 class="hndle"><?php _e( 'Save', 'buddypress' ); ?></h3></div>
+ <div class="inside">
+ <div id="submitcomment" class="submitbox">
+ <div id="major-publishing-actions">
+ <div id="delete-action">
+ <a href="admin.php?page=bp-profile-setup" class="submitdelete deletion"><?php _e( 'Cancel', 'buddypress' ); ?></a>
+ </div>
+ <div id="publishing-action">
+ <input type="submit" name="save_group" value="<?php echo esc_attr( $button ); ?>" class="button-primary"/>
+ </div>
+ <input type="hidden" name="group_order" id="group_order" value="<?php echo esc_attr( $this->group_order ); ?>" />
+ <div class="clear"></div>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ </form>
</ins><span class="cx"> </div>
</span><span class="cx">
</span><span class="cx"> <?php
</span></span></pre>
</div>
</div>
</body>
</html>