Changeset 8643

Timestamp:

07/17/2014 07:37:07 PM (11 years ago)

Author:

johnjamesjacoby

Message:

More UI improvements to admin area XProfile field options.

Location:

trunk/src/bp-xprofile

Files:

• admin/css/admin-rtl.css (modified) (3 diffs)
• admin/css/admin.css (modified) (3 diffs)
• admin/js/admin.js (modified) (3 diffs)
• bp-xprofile-classes.php (modified) (2 diffs)

trunk/src/bp-xprofile/admin/css/admin-rtl.css

@@ -206 +206 @@
 }
 
-p.bp-option {
+div.bp-option {
     background: #fafafa;
     border: 1px solid #dfdfdf;
@@ -213 +213 @@
 }
 
-p.bp-option:hover {
+div.bp-option:hover {
     border: 1px solid #999;
 }
@@ -231 +231 @@
 }
 
-p.bp-option .grabber:before {
+div.bp-option .grabber:before {
     content: "\f329";
 }

trunk/src/bp-xprofile/admin/css/admin.css

@@ -206 +206 @@
 }
 
-p.bp-option {
+div.bp-option {
     background: #fafafa;
     border: 1px solid #dfdfdf;
@@ -213 +213 @@
 }
 
-p.bp-option:hover {
+div.bp-option:hover {
     border: 1px solid #999;
 }
@@ -231 +231 @@
 }
 
-p.bp-option .grabber:before {
+div.bp-option .grabber:before {
     content: "\f329";
 }

trunk/src/bp-xprofile/admin/js/admin.js

@@ -11 +11 @@
     var holder       = document.getElementById(forWhat + '_more'),
         theId        = document.getElementById(forWhat + '_option_number').value,
-        newDiv       = document.createElement('p'),
+        newDiv       = document.createElement( 'div' ),
         grabber      = document.createElement( 'span' ),
         newOption    = document.createElement( 'input' ),
@@ -18 +18 @@
         txt1         = document.createTextNode( 'Default Value' ),
         toDeleteText = document.createTextNode( 'Delete' ),
-        toDeleteWrap = document.createElement( 'div' );
+        toDeleteWrap = document.createElement( 'div' ),
         toDelete     = document.createElement( 'a' );
 
@@ -107 +107 @@
     jQuery( '.bp-options-box' ).sortable( {
         cursor: 'move',
-        items: 'p.sortable',
+        items: 'div.sortable',
         tolerance: 'intersect',
         axis: 'y'

trunk/src/bp-xprofile/bp-xprofile-classes.php

@@ -2704 +2704 @@
         $no_scheme = preg_replace( '#^https?://#', '', rtrim( $link, '/' ) );
         $url_text  = str_replace( $link, $no_scheme, $field_value );
-        $retval    = '<a href="' . esc_url( $field_value ) . '" rel="nofollow">' . esc_html( $url_text ) . '</a>';
-        return $field_value;
+        return '<a href="' . esc_url( $field_value ) . '" rel="nofollow">' . esc_html( $url_text ) . '</a>';
     }
 }
@@ -3035 +3034 @@
                         ?>
 
-                        <p class="sortable">
-                            <span>&nbsp;&Xi;&nbsp;</span>
+                        <div id="<?php echo esc_attr( "{$type}_div{$j}" ); ?>" class="bp-option sortable">
+                            <span class="bp-option-icon grabber"></span>
                             <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 ); ?>" />
-                            <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>
+                            <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>
+
                     <?php endfor; ?>