<!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][9639] trunk/src/bp-xprofile: XProfile: First pass at refreshing the the "Profile Fields" UI to better match current WordPress design direction.</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/9639">9639</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/9639","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>johnjamesjacoby</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2015-03-24 03:02:10 +0000 (Tue, 24 Mar 2015)</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'>XProfile: First pass at refreshing the the "Profile Fields" UI to better match current WordPress design direction.
Likely more iteration needed here, as everyone is a critic. See <a href="http://buddypress.trac.wordpress.org/ticket/6318">#6318</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcbpxprofileadmincssadmincss">trunk/src/bp-xprofile/admin/css/admin.css</a></li>
<li><a href="#trunksrcbpxprofilebpxprofileadminphp">trunk/src/bp-xprofile/bp-xprofile-admin.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcbpxprofileadmincssadmincss"></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/admin/css/admin.css</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/bp-xprofile/admin/css/admin.css 2015-03-24 02:48:42 UTC (rev 9638)
+++ trunk/src/bp-xprofile/admin/css/admin.css 2015-03-24 03:02:10 UTC (rev 9639)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,15 +1,24 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /* Profile field group main admin page */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-#tabs-bottom {
- background: #f5f5f5;
- height: 32px;
- border: 1px solid #dedede;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+@-webkit-keyframes tab-throb {
+ from { box-shadow: 0 0 10px #1e8cbe; }
+ 50% { box-shadow: 0 0 00px #1e8cbe; }
+ to { box-shadow: 0 0 10px #1e8cbe; }
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+@-moz-keyframes tab-throb {
+ from { box-shadow: 0 0 10px #1e8cbe; }
+ 50% { box-shadow: 0 0 00px #1e8cbe; }
+ to { box-shadow: 0 0 10px #1e8cbe; }
+}
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+#profile-field-form {
+ margin-top: 12px;
+}
+
</ins><span class="cx" style="display: block; padding: 0 10px"> #tabs {
</span><span class="cx" style="display: block; padding: 0 10px"> position: relative;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> p.nofields {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- margin: 20px 20px 0;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ margin: 20px 0 0;
</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"> /* Field group tabs */
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -24,30 +33,24 @@
</span><span class="cx" style="display: block; padding: 0 10px"> margin-right: 8px;
</span><span class="cx" style="display: block; padding: 0 10px"> margin-bottom: -1px;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ul#field-group-tabs li.ui-state-hover a {
- background-color: #fafafa;
- }
</del><span class="cx" style="display: block; padding: 0 10px"> ul#field-group-tabs li.ui-state-hover a.ui-tab {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- border-color: #dedede #dedede #f5f5f5 #dedede;
</del><span class="cx" style="display: block; padding: 0 10px"> color: #d54e21;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ul#field-group-tabs li.ui-state-acceptable a.ui-tab {
- border-color: #5a5 #5a5 #ccc #5a5;
- color: #8a8;
- background-color: #efe;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ul#field-group-tabs li.ui-state-acceptable:not(.ui-state-active) a.ui-tab {
+ -webkit-animation: tab-throb 2s infinite;
+ animation: tab-throb 2s infinite;
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> ul#field-group-tabs li.drop-candidate a.ui-tab {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- background-color: #ffc;
- border-color: #aa5 #aa5 #ccc #aa5;
- color: #aa8;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ background-color: transparent;
+ border-color: #000 #000 #ccc #000;
+ color: #000;
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> ul#field-group-tabs li a.ui-tab {
</span><span class="cx" style="display: block; padding: 0 10px"> font-size: 14px;
</span><span class="cx" style="display: block; padding: 0 10px"> display: block;
</span><span class="cx" style="display: block; padding: 0 10px"> margin-top: 3px;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- padding: 5px 10px 5px;
- border: 1px solid #dedede;
- border-bottom: none;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ padding: 5px 10px 6px;
+ border: 1px solid #e5e5e5;
</ins><span class="cx" style="display: block; padding: 0 10px"> background-color: #f5f5f5;
</span><span class="cx" style="display: block; padding: 0 10px"> text-decoration: none;
</span><span class="cx" style="display: block; padding: 0 10px"> color: #000;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -56,21 +59,24 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /* Selected tab */
</span><span class="cx" style="display: block; padding: 0 10px"> ul#field-group-tabs li.ui-state-active a.ui-tab {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- background-color: #f5f5f5;
- margin-top: -1px;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ background-color: #fff;
+ margin-top: 0px;
</ins><span class="cx" style="display: block; padding: 0 10px"> padding: 7px 10px 7px;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- border: 1px solid #dedede;
</del><span class="cx" style="display: block; padding: 0 10px"> border-bottom: 1px solid transparent;
</span><span class="cx" style="display: block; padding: 0 10px"> color: #000;
</span><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"> /* Toolbar */
</span><span class="cx" style="display: block; padding: 0 10px"> .tab-toolbar {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- background: #f5f5f5;
- border-width: 0 0 1px;
- border-color: #dedede;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ clear: left;
+ background: #fff;
+ border-width: 1px;
+ border-color: #e5e5e5;
</ins><span class="cx" style="display: block; padding: 0 10px"> border-style: solid;
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ -webkit-box-shadow: 0 1px 1px rgba(0,0,0,0.04);
+ box-shadow: 0 1px 1px rgba(0,0,0,0.04);
</ins><span class="cx" style="display: block; padding: 0 10px"> padding: 10px;
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ margin-bottom: 10px;
</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"> .bp-option a.delete,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -85,47 +91,38 @@
</span><span class="cx" style="display: block; padding: 0 10px"> div.delete-button {
</span><span class="cx" style="display: block; padding: 0 10px"> float: right;
</span><span class="cx" style="display: block; padding: 0 10px"> line-height: 28px;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- margin: 0 10px 0 0;
</del><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">- div.tab-wrapper {
- background-color: #fff;
- border: 1px solid #dedede;
- border-bottom: none;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ div.field-group {
</ins><span class="cx" style="display: block; padding: 0 10px"> clear: left;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- padding-bottom: 20px;
</del><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">- .tab-wrapper fieldset {
- position: relative;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ .field-group {
</ins><span class="cx" style="display: block; padding: 0 10px"> cursor: default;
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ border: 1px solid #e5e5e5;
+ background: #fff;
+ -webkit-box-shadow: 0 1px 1px rgba(0,0,0,0.04);
+ box-shadow: 0 1px 1px rgba(0,0,0,0.04);
+ margin-top: 10px;
+ padding: 0 20px 20px;
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- .tab-wrapper fieldset legend {
- font-weight: bold;
- }
- .tab-wrapper .xprofile-field {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ .field-group .xprofile-field {
</ins><span class="cx" style="display: block; padding: 0 10px"> position: relative;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- .tab-wrapper fieldset fieldset {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ .field-group fieldset {
</ins><span class="cx" style="display: block; padding: 0 10px"> position: relative;
</span><span class="cx" style="display: block; padding: 0 10px"> border: 1px solid #ddd;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- margin: 20px 20px 0;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ margin: 20px 0 0;
</ins><span class="cx" style="display: block; padding: 0 10px"> cursor: move;
</span><span class="cx" style="display: block; padding: 0 10px"> background: #fafafa;
</span><span class="cx" style="display: block; padding: 0 10px"> padding: 10px 0 0 ;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- .tab-wrapper fieldset fieldset legend {
- position: absolute;
- top: 10px;
- left: 10px;
- padding: 0;
- }
- .field-group fieldset:hover {
- border-color: #999;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ .field-group fieldset legend {
+ position: absolute;
+ top: 10px;
+ left: 10px;
+ padding: 0;
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- fieldset div.field-wrapper {
- padding: 25px 10px 10px;
- }
</del><span class="cx" style="display: block; padding: 0 10px"> fieldset.radio div div label,
</span><span class="cx" style="display: block; padding: 0 10px"> fieldset.checkbox div label {
</span><span class="cx" style="display: block; padding: 0 10px"> margin-right: 20px;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -134,6 +131,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> fieldset.clear-value {
</span><span class="cx" style="display: block; padding: 0 10px"> margin-left: 10px;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ fieldset div.field-wrapper {
+ padding: 25px 10px 10px;
+ }
</ins><span class="cx" style="display: block; padding: 0 10px"> .field-group div.actions {
</span><span class="cx" style="display: block; padding: 0 10px"> float: none;
</span><span class="cx" style="display: block; padding: 0 10px"> border-top: 1px solid #ddd;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -145,6 +145,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> .field-group div.actions input {
</span><span class="cx" style="display: block; padding: 0 10px"> float: none;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ .field-group fieldset:hover {
+ border-color: #999;
+ }
</ins><span class="cx" style="display: block; padding: 0 10px"> .field-group fieldset:hover div.actions {
</span><span class="cx" style="display: block; padding: 0 10px"> display: block;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre></div>
<a id="trunksrcbpxprofilebpxprofileadminphp"></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/bp-xprofile-admin.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/bp-xprofile/bp-xprofile-admin.php 2015-03-24 02:48:42 UTC (rev 9638)
+++ trunk/src/bp-xprofile/bp-xprofile-admin.php 2015-03-24 03:02:10 UTC (rev 9639)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -72,8 +72,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <a id="add_group" class="add-new-h2" href="users.php?page=bp-profile-setup&mode=add_group"><?php _e( 'Add New Field Group', 'buddypress' ); ?></a>
</span><span class="cx" style="display: block; padding: 0 10px"> </h2>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <p><?php echo sprintf( __( 'Fields in the "%s" group will appear on the signup page.', 'buddypress' ), esc_html( stripslashes( bp_get_option( 'bp-xprofile-base-group-name' ) ) ) ) ?></p>
-
</del><span class="cx" style="display: block; padding: 0 10px"> <form action="" id="profile-field-form" method="post">
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -85,7 +83,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $type = ( $type == 'error' ) ? 'error' : 'updated'; ?>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <div id="message" class="<?php echo $type; ?> fade">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <p><?php echo esc_html( esc_attr( $message ) ); ?></p>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <p><?php echo esc_html( $message ); ?></p>
</ins><span class="cx" style="display: block; padding: 0 10px"> </div>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php endif; ?>
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -95,8 +93,18 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php if ( !empty( $groups ) ) : foreach ( $groups as $group ) : ?>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <li id="group_<?php echo $group->id; ?>"><a href="#tabs-<?php echo $group->id; ?>" class="ui-tab"><?php echo esc_attr( $group->name ); ?><?php if ( !$group->can_delete ) : ?> <?php _e( '(Primary)', 'buddypress'); endif; ?></a></li>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <li id="group_<?php echo esc_attr( $group->id ); ?>">
+ <a href="#tabs-<?php echo esc_attr( $group->id ); ?>" class="ui-tab">
+ <?php echo esc_attr( $group->name ); ?>
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php if ( !$group->can_delete ) : ?>
+ <?php _e( '(Primary)', 'buddypress'); ?>
+ <?php endif; ?>
+
+ <span class="spinner"></span>
+ </a>
+ </li>
+
</ins><span class="cx" style="display: block; padding: 0 10px"> <?php endforeach; endif; ?>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> </ul>
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -107,7 +115,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <h3><?php echo esc_attr( $group->name ); ?></h3>
</span><span class="cx" style="display: block; padding: 0 10px"> </noscript>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <div id="tabs-<?php echo $group->id; ?>" class="tab-wrapper">
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <div id="tabs-<?php echo esc_attr( $group->id ); ?>" class="tab-wrapper">
</ins><span class="cx" style="display: block; padding: 0 10px"> <div class="tab-toolbar">
</span><span class="cx" style="display: block; padding: 0 10px"> <div class="tab-toolbar-left">
</span><span class="cx" style="display: block; padding: 0 10px"> <a class="button-primary" href="users.php?page=bp-profile-setup&group_id=<?php echo esc_attr( $group->id ); ?>&mode=add_field"><?php _e( 'Add New Field', 'buddypress' ); ?></a>
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -115,7 +123,9 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php if ( $group->can_delete ) : ?>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <a class="confirm submitdelete deletion ajax-option-delete" href="users.php?page=bp-profile-setup&mode=delete_group&group_id=<?php echo esc_attr( $group->id ); ?>"><?php _e( 'Delete Group', 'buddypress' ); ?></a>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <div class="delete-button">
+ <a class="confirm submitdelete deletion ajax-option-delete" href="users.php?page=bp-profile-setup&mode=delete_group&group_id=<?php echo esc_attr( $group->id ); ?>"><?php _e( 'Delete Group', 'buddypress' ); ?></a>
+ </div>
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php endif; ?>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -134,14 +144,17 @@
</span><span class="cx" style="display: block; padding: 0 10px"> </div>
</span><span class="cx" style="display: block; padding: 0 10px"> </div>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <fieldset id="<?php echo $group->id; ?>" class="connectedSortable field-group">
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php if ( ! empty( $group->description ) ) : ?>
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?php if ( $group->description ) : ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <p><?php echo esc_html( $group->description ); ?></p>
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <legend><?php echo esc_attr( $group->description ) ?></legend>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php endif; ?>
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?php endif;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <fieldset id="<?php echo esc_attr( $group->id ); ?>" class="connectedSortable field-group">
+ <legend class="screen-reader-text"><?php printf( esc_html__( 'Fields for "%s" Group', 'buddypress' ), $group->name ); ?></legend>
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php
+
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( !empty( $group->fields ) ) :
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $group->fields as $field ) {
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -149,12 +162,14 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $field = new BP_XProfile_Field( $field->id );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $class = '';
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( !$field->can_delete )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( empty( $field->can_delete ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $class = ' core nodrag';
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ }
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- /* This function handles the WYSIWYG profile field
- * display for the xprofile admin setup screen
- */
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /**
+ * This function handles the WYSIWYG profile field
+ * display for the xprofile admin setup screen
+ */
</ins><span class="cx" style="display: block; padding: 0 10px"> xprofile_admin_field( $field, $group, $class );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> } // end for
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -166,6 +181,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <?php endif; // end $group->fields ?>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> </fieldset>
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ <?php if ( empty( $group->can_delete ) ) : ?>
+
+ <p><?php esc_html_e( '* Fields in this group appear on the signup page.', 'buddypress' ); ?></p>
+
+ <?php endif; ?>
+
</ins><span class="cx" style="display: block; padding: 0 10px"> </div>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php endforeach; else : ?>
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -175,7 +197,6 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php endif; ?>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <div id="tabs-bottom"> </div>
</del><span class="cx" style="display: block; padding: 0 10px"> </div>
</span><span class="cx" style="display: block; padding: 0 10px"> </form>
</span><span class="cx" style="display: block; padding: 0 10px"> </div>
</span></span></pre>
</div>
</div>
</body>
</html>