<!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][8643] trunk/src/bp-xprofile: More UI improvements to admin area XProfile field 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">
<dt>Revision</dt> <dd><a href="http://buddypress.trac.wordpress.org/changeset/8643">8643</a></dd>
<dt>Author</dt> <dd>johnjamesjacoby</dd>
<dt>Date</dt> <dd>2014-07-17 19:37:07 +0000 (Thu, 17 Jul 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>More UI improvements to admin area XProfile field options.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcbpxprofileadmincssadminrtlcss">trunk/src/bp-xprofile/admin/css/admin-rtl.css</a></li>
<li><a href="#trunksrcbpxprofileadmincssadmincss">trunk/src/bp-xprofile/admin/css/admin.css</a></li>
<li><a href="#trunksrcbpxprofileadminjsadminjs">trunk/src/bp-xprofile/admin/js/admin.js</a></li>
<li><a href="#trunksrcbpxprofilebpxprofileclassesphp">trunk/src/bp-xprofile/bp-xprofile-classes.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcbpxprofileadmincssadminrtlcss"></a>
<div class="modfile"><h4>Modified: trunk/src/bp-xprofile/admin/css/admin-rtl.css (8642 => 8643)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/bp-xprofile/admin/css/admin-rtl.css 2014-07-17 19:19:23 UTC (rev 8642)
+++ trunk/src/bp-xprofile/admin/css/admin-rtl.css 2014-07-17 19:37:07 UTC (rev 8643)
</span><span class="lines">@@ -205,14 +205,14 @@
</span><span class="cx"> margin: 0;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-p.bp-option {
</del><ins>+div.bp-option {
</ins><span class="cx"> background: #fafafa;
</span><span class="cx"> border: 1px solid #dfdfdf;
</span><span class="cx"> margin: 10px 0;
</span><span class="cx"> padding: 10px 5px;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-p.bp-option:hover {
</del><ins>+div.bp-option:hover {
</ins><span class="cx"> border: 1px solid #999;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -230,7 +230,7 @@
</span><span class="cx"> color: #888;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-p.bp-option .grabber:before {
</del><ins>+div.bp-option .grabber:before {
</ins><span class="cx"> content: "\f329";
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunksrcbpxprofileadmincssadmincss"></a>
<div class="modfile"><h4>Modified: trunk/src/bp-xprofile/admin/css/admin.css (8642 => 8643)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/bp-xprofile/admin/css/admin.css 2014-07-17 19:19:23 UTC (rev 8642)
+++ trunk/src/bp-xprofile/admin/css/admin.css 2014-07-17 19:37:07 UTC (rev 8643)
</span><span class="lines">@@ -205,14 +205,14 @@
</span><span class="cx"> margin: 0;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-p.bp-option {
</del><ins>+div.bp-option {
</ins><span class="cx"> background: #fafafa;
</span><span class="cx"> border: 1px solid #dfdfdf;
</span><span class="cx"> margin: 10px 0;
</span><span class="cx"> padding: 10px 5px;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-p.bp-option:hover {
</del><ins>+div.bp-option:hover {
</ins><span class="cx"> border: 1px solid #999;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -230,7 +230,7 @@
</span><span class="cx"> color: #888;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-p.bp-option .grabber:before {
</del><ins>+div.bp-option .grabber:before {
</ins><span class="cx"> content: "\f329";
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunksrcbpxprofileadminjsadminjs"></a>
<div class="modfile"><h4>Modified: trunk/src/bp-xprofile/admin/js/admin.js (8642 => 8643)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/bp-xprofile/admin/js/admin.js 2014-07-17 19:19:23 UTC (rev 8642)
+++ trunk/src/bp-xprofile/admin/js/admin.js 2014-07-17 19:37:07 UTC (rev 8643)
</span><span class="lines">@@ -10,14 +10,14 @@
</span><span class="cx"> function add_option(forWhat) {
</span><span class="cx"> var holder = document.getElementById(forWhat + '_more'),
</span><span class="cx"> theId = document.getElementById(forWhat + '_option_number').value,
</span><del>- newDiv = document.createElement('p'),
</del><ins>+ newDiv = document.createElement( 'div' ),
</ins><span class="cx"> grabber = document.createElement( 'span' ),
</span><span class="cx"> newOption = document.createElement( 'input' ),
</span><span class="cx"> label = document.createElement( 'label' ),
</span><span class="cx"> isDefault = document.createElement( 'input' ),
</span><span class="cx"> txt1 = document.createTextNode( 'Default Value' ),
</span><span class="cx"> toDeleteText = document.createTextNode( 'Delete' ),
</span><del>- toDeleteWrap = document.createElement( 'div' );
</del><ins>+ toDeleteWrap = document.createElement( 'div' ),
</ins><span class="cx"> toDelete = document.createElement( 'a' );
</span><span class="cx">
</span><span class="cx"> newDiv.setAttribute('id', forWhat + '_div' + theId);
</span><span class="lines">@@ -106,7 +106,7 @@
</span><span class="cx"> function enableSortableFieldOptions( forWhat ) {
</span><span class="cx"> jQuery( '.bp-options-box' ).sortable( {
</span><span class="cx"> cursor: 'move',
</span><del>- items: 'p.sortable',
</del><ins>+ items: 'div.sortable',
</ins><span class="cx"> tolerance: 'intersect',
</span><span class="cx"> axis: 'y'
</span><span class="cx"> });
</span></span></pre></div>
<a id="trunksrcbpxprofilebpxprofileclassesphp"></a>
<div class="modfile"><h4>Modified: trunk/src/bp-xprofile/bp-xprofile-classes.php (8642 => 8643)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/bp-xprofile/bp-xprofile-classes.php 2014-07-17 19:19:23 UTC (rev 8642)
+++ trunk/src/bp-xprofile/bp-xprofile-classes.php 2014-07-17 19:37:07 UTC (rev 8643)
</span><span class="lines">@@ -2703,8 +2703,7 @@
</span><span class="cx"> $link = strip_tags( $field_value );
</span><span class="cx"> $no_scheme = preg_replace( '#^https?://#', '', rtrim( $link, '/' ) );
</span><span class="cx"> $url_text = str_replace( $link, $no_scheme, $field_value );
</span><del>- $retval = '<a href="' . esc_url( $field_value ) . '" rel="nofollow">' . esc_html( $url_text ) . '</a>';
- return $field_value;
</del><ins>+ return '<a href="' . esc_url( $field_value ) . '" rel="nofollow">' . esc_html( $url_text ) . '</a>';
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -3034,12 +3033,22 @@
</span><span class="cx"> }
</span><span class="cx"> ?>
</span><span class="cx">
</span><del>- <p class="sortable">
- <span> Ξ </span>
</del><ins>+ <div id="<?php echo esc_attr( "{$type}_div{$j}" ); ?>" class="bp-option sortable">
+ <span class="bp-option-icon grabber"></span>
</ins><span class="cx"> <input type="text" name="<?php echo esc_attr( "{$type}_option[{$j}]" ); ?>" id="<?php echo esc_attr( "{$type}_option{$j}" ); ?>" value="<?php echo esc_attr( $options[$i]->name ); ?>" />
</span><del>- <input type="<?php echo esc_attr( $control_type ); ?>" name="<?php echo esc_attr( "isDefault_{$type}_option{$default_name}" ); ?>" <?php checked( $options[$i]->is_default_option, true ); ?> value="<?php echo esc_attr( $j ); ?>" />
- <span><?php _e( 'Default Value', 'buddypress' ); ?></span>
- </p>
</del><ins>+ <label>
+ <input type="<?php echo esc_attr( $control_type ); ?>" name="<?php echo esc_attr( "isDefault_{$type}_option{$default_name}" ); ?>" <?php checked( $options[$i]->is_default_option, true ); ?> value="<?php echo esc_attr( $j ); ?>" />
+ <?php _e( 'Default Value', 'buddypress' ); ?>
+ </label>
+
+ <?php if ( 1 !== $j ) : ?>
+ <div class ="delete-button">
+ <a href='javascript:hide("<?php echo esc_attr( "{$type}_div{$j}" ); ?>")' class="delete"><?php esc_html_e( 'Delete', 'buddypress' ); ?></a>
+ </div>
+ <?php endif; ?>
+
+ </div>
+
</ins><span class="cx"> <?php endfor; ?>
</span><span class="cx">
</span><span class="cx"> <input type="hidden" name="<?php echo esc_attr( "{$type}_option_number" ); ?>" id="<?php echo esc_attr( "{$type}_option_number" ); ?>" value="<?php echo esc_attr( $j + 1 ); ?>" />
</span></span></pre>
</div>
</div>
</body>
</html>