<!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][10855] trunk/src/bp-xprofile/classes: Profile inputs: Add wrapper divs around options.</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" style="font-size: 105%">
<dt style="float: left; width: 6em; font-weight: bold">Revision</dt> <dd><a style="font-weight: bold" href="http://buddypress.trac.wordpress.org/changeset/10855">10855</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"http://buddypress.trac.wordpress.org/changeset/10855","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>dcavins</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2016-06-01 17:17:19 +0000 (Wed, 01 Jun 2016)</dd>
</dl>
<pre style='padding-left: 1em; margin: 2em 0; border-left: 2px solid #ccc; line-height: 1.25; font-size: 105%; font-family: sans-serif'>Profile inputs: Add wrapper divs around options.
Add a wrapper div around radio button options,
checkbox options, and datebook selects in
extended profile form inputs.
See <a href="http://buddypress.trac.wordpress.org/ticket/7083">#7083</a>.
Props dcavins, imath, offereins.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcbpxprofileclassesclassbpxprofilefieldtypecheckboxphp">trunk/src/bp-xprofile/classes/class-bp-xprofile-field-type-checkbox.php</a></li>
<li><a href="#trunksrcbpxprofileclassesclassbpxprofilefieldtypedateboxphp">trunk/src/bp-xprofile/classes/class-bp-xprofile-field-type-datebox.php</a></li>
<li><a href="#trunksrcbpxprofileclassesclassbpxprofilefieldtyperadiobuttonphp">trunk/src/bp-xprofile/classes/class-bp-xprofile-field-type-radiobutton.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcbpxprofileclassesclassbpxprofilefieldtypecheckboxphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/bp-xprofile/classes/class-bp-xprofile-field-type-checkbox.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/bp-xprofile/classes/class-bp-xprofile-field-type-checkbox.php 2016-06-01 17:02:06 UTC (rev 10854)
+++ trunk/src/bp-xprofile/classes/class-bp-xprofile-field-type-checkbox.php 2016-06-01 17:17:19 UTC (rev 10855)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -176,7 +176,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $html .= apply_filters( 'bp_get_the_profile_field_options_checkbox', $new_html, $options[$k], $this->field_obj->id, $selected, $k );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- echo $html;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ printf( '<div id="%1$s" class="input-options checkbox-options">%2$s</div>',
+ esc_attr( 'field_' . $this->field_obj->id ),
+ $html
+ );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span></span></pre></div>
<a id="trunksrcbpxprofileclassesclassbpxprofilefieldtypedateboxphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/bp-xprofile/classes/class-bp-xprofile-field-type-datebox.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/bp-xprofile/classes/class-bp-xprofile-field-type-datebox.php 2016-06-01 17:02:06 UTC (rev 10854)
+++ trunk/src/bp-xprofile/classes/class-bp-xprofile-field-type-datebox.php 2016-06-01 17:17:19 UTC (rev 10855)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -85,53 +85,57 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <?php bp_the_profile_field_required_label(); ?>
</span><span class="cx" style="display: block; padding: 0 10px"> </legend>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?php
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <div class="input-options datebox-selects">
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- /**
- * Fires after field label and displays associated errors for the field.
- *
- * This is a dynamic hook that is dependent on the associated
- * field ID. The hooks will be similar to `bp_field_12_errors`
- * where the 12 is the field ID. Simply replace the 12 with
- * your needed target ID.
- *
- * @since 1.8.0
- */
- do_action( bp_get_the_profile_field_errors_action() ); ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <label for="<?php bp_the_profile_field_input_name(); ?>_day" class="<?php echo is_admin() ? 'screen-reader-text' : 'bp-screen-reader-text' ;?>"><?php
- /* translators: accessibility text */
- esc_html_e( 'Select day', 'buddypress' );
- ?></label>
- <select <?php echo $this->get_edit_field_html_elements( $day_r ); ?>>
- <?php bp_the_profile_field_options( array(
- 'type' => 'day',
- 'user_id' => $user_id
- ) ); ?>
- </select>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /**
+ * Fires after field label and displays associated errors for the field.
+ *
+ * This is a dynamic hook that is dependent on the associated
+ * field ID. The hooks will be similar to `bp_field_12_errors`
+ * where the 12 is the field ID. Simply replace the 12 with
+ * your needed target ID.
+ *
+ * @since 1.8.0
+ */
+ do_action( bp_get_the_profile_field_errors_action() ); ?>
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <label for="<?php bp_the_profile_field_input_name(); ?>_month" class="<?php echo is_admin() ? 'screen-reader-text' : 'bp-screen-reader-text' ;?>"><?php
- /* translators: accessibility text */
- esc_html_e( 'Select month', 'buddypress' );
- ?></label>
- <select <?php echo $this->get_edit_field_html_elements( $month_r ); ?>>
- <?php bp_the_profile_field_options( array(
- 'type' => 'month',
- 'user_id' => $user_id
- ) ); ?>
- </select>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <label for="<?php bp_the_profile_field_input_name(); ?>_day" class="<?php echo is_admin() ? 'screen-reader-text' : 'bp-screen-reader-text' ;?>"><?php
+ /* translators: accessibility text */
+ esc_html_e( 'Select day', 'buddypress' );
+ ?></label>
+ <select <?php echo $this->get_edit_field_html_elements( $day_r ); ?>>
+ <?php bp_the_profile_field_options( array(
+ 'type' => 'day',
+ 'user_id' => $user_id
+ ) ); ?>
+ </select>
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <label for="<?php bp_the_profile_field_input_name(); ?>_year" class="<?php echo is_admin() ? 'screen-reader-text' : 'bp-screen-reader-text' ;?>"><?php
- /* translators: accessibility text */
- esc_html_e( 'Select year', 'buddypress' );
- ?></label>
- <select <?php echo $this->get_edit_field_html_elements( $year_r ); ?>>
- <?php bp_the_profile_field_options( array(
- 'type' => 'year',
- 'user_id' => $user_id
- ) ); ?>
- </select>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <label for="<?php bp_the_profile_field_input_name(); ?>_month" class="<?php echo is_admin() ? 'screen-reader-text' : 'bp-screen-reader-text' ;?>"><?php
+ /* translators: accessibility text */
+ esc_html_e( 'Select month', 'buddypress' );
+ ?></label>
+ <select <?php echo $this->get_edit_field_html_elements( $month_r ); ?>>
+ <?php bp_the_profile_field_options( array(
+ 'type' => 'month',
+ 'user_id' => $user_id
+ ) ); ?>
+ </select>
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <label for="<?php bp_the_profile_field_input_name(); ?>_year" class="<?php echo is_admin() ? 'screen-reader-text' : 'bp-screen-reader-text' ;?>"><?php
+ /* translators: accessibility text */
+ esc_html_e( 'Select year', 'buddypress' );
+ ?></label>
+ <select <?php echo $this->get_edit_field_html_elements( $year_r ); ?>>
+ <?php bp_the_profile_field_options( array(
+ 'type' => 'year',
+ 'user_id' => $user_id
+ ) ); ?>
+ </select>
+
+ </div>
+
</ins><span class="cx" style="display: block; padding: 0 10px"> </fieldset>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre></div>
<a id="trunksrcbpxprofileclassesclassbpxprofilefieldtyperadiobuttonphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/bp-xprofile/classes/class-bp-xprofile-field-type-radiobutton.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/bp-xprofile/classes/class-bp-xprofile-field-type-radiobutton.php 2016-06-01 17:02:06 UTC (rev 10854)
+++ trunk/src/bp-xprofile/classes/class-bp-xprofile-field-type-radiobutton.php 2016-06-01 17:17:19 UTC (rev 10855)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -111,7 +111,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $option_value = BP_XProfile_ProfileData::get_value_byid( $this->field_obj->id, $args['user_id'] );
</span><span class="cx" style="display: block; padding: 0 10px"> $options = $this->field_obj->get_children();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $html = sprintf( '<div id="%s">', esc_attr( 'field_' . $this->field_obj->id ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $html = '';
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> for ( $k = 0, $count = count( $options ); $k < $count; ++$k ) {
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -154,7 +154,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $html .= apply_filters( 'bp_get_the_profile_field_options_radio', $new_html, $options[$k], $this->field_obj->id, $selected, $k );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- echo $html . '</div>';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ printf( '<div id="%1$s" class="input-options radio-button-options">%2$s</div>',
+ esc_attr( 'field_' . $this->field_obj->id ),
+ $html
+ );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span></span></pre>
</div>
</div>
</body>
</html>