<!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][9759] trunk/src: Avatar UI: use it in `wp-admin/extended` profile.</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/9759">9759</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/9759","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>imath</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2015-04-16 22:54:11 +0000 (Thu, 16 Apr 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'>Avatar UI: use it in `wp-admin/extended` profile.
Clicking on the "Edit Profile Photo" link from the avatar metabox will open a thickbox window in which the Avatar UI will be displayed.
See <a href="http://buddypress.trac.wordpress.org/ticket/6290">#6290</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcbpmembersadmincssadminrtlcss">trunk/src/bp-members/admin/css/admin-rtl.css</a></li>
<li><a href="#trunksrcbpmembersadmincssadmincss">trunk/src/bp-members/admin/css/admin.css</a></li>
<li><a href="#trunksrcbpmembersbpmembersadminphp">trunk/src/bp-members/bp-members-admin.php</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="trunksrcbpmembersadmincssadminrtlcss"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/bp-members/admin/css/admin-rtl.css</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/bp-members/admin/css/admin-rtl.css 2015-04-16 22:45:58 UTC (rev 9758)
+++ trunk/src/bp-members/admin/css/admin-rtl.css 2015-04-16 22:54:11 UTC (rev 9759)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -25,7 +25,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> div#community-profile-page li.bp-friends-profile-stats:before,
</span><span class="cx" style="display: block; padding: 0 10px"> div#community-profile-page li.bp-groups-profile-stats:before,
</span><span class="cx" style="display: block; padding: 0 10px"> div#community-profile-page li.bp-blogs-profile-stats:before,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-div#community-profile-page a.bp-xprofile-avatar-user-admin:before {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+div#community-profile-page a.bp-xprofile-avatar-user-admin:before,
+div#community-profile-page a.bp-xprofile-avatar-user-edit:before {
</ins><span class="cx" style="display: block; padding: 0 10px"> font: normal 20px/1 'dashicons';
</span><span class="cx" style="display: block; padding: 0 10px"> speak: none;
</span><span class="cx" style="display: block; padding: 0 10px"> display: inline-block;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -60,6 +61,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> content:"\f182";
</span><span class="cx" style="display: block; padding: 0 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">+div#community-profile-page a.bp-xprofile-avatar-user-edit:before {
+ content: "\f107";
+}
+
</ins><span class="cx" style="display: block; padding: 0 10px"> div#community-profile-page div#bp_xprofile_user_admin_avatar div.avatar {
</span><span class="cx" style="display: block; padding: 0 10px"> width:150px;
</span><span class="cx" style="display: block; padding: 0 10px"> margin:0 auto;
</span></span></pre></div>
<a id="trunksrcbpmembersadmincssadmincss"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/bp-members/admin/css/admin.css</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/bp-members/admin/css/admin.css 2015-04-16 22:45:58 UTC (rev 9758)
+++ trunk/src/bp-members/admin/css/admin.css 2015-04-16 22:54:11 UTC (rev 9759)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -25,7 +25,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> div#community-profile-page li.bp-friends-profile-stats:before,
</span><span class="cx" style="display: block; padding: 0 10px"> div#community-profile-page li.bp-groups-profile-stats:before,
</span><span class="cx" style="display: block; padding: 0 10px"> div#community-profile-page li.bp-blogs-profile-stats:before,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-div#community-profile-page a.bp-xprofile-avatar-user-admin:before {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+div#community-profile-page a.bp-xprofile-avatar-user-admin:before,
+div#community-profile-page a.bp-xprofile-avatar-user-edit:before {
</ins><span class="cx" style="display: block; padding: 0 10px"> font: normal 20px/1 'dashicons';
</span><span class="cx" style="display: block; padding: 0 10px"> speak: none;
</span><span class="cx" style="display: block; padding: 0 10px"> display: inline-block;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -60,6 +61,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> content:"\f182";
</span><span class="cx" style="display: block; padding: 0 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">+div#community-profile-page a.bp-xprofile-avatar-user-edit:before {
+ content: "\f107";
+}
+
</ins><span class="cx" style="display: block; padding: 0 10px"> div#community-profile-page div#bp_xprofile_user_admin_avatar div.avatar {
</span><span class="cx" style="display: block; padding: 0 10px"> width:150px;
</span><span class="cx" style="display: block; padding: 0 10px"> margin:0 auto;
</span></span></pre></div>
<a id="trunksrcbpmembersbpmembersadminphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/bp-members/bp-members-admin.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/bp-members/bp-members-admin.php 2015-04-16 22:45:58 UTC (rev 9758)
+++ trunk/src/bp-members/bp-members-admin.php 2015-04-16 22:54:11 UTC (rev 9759)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -217,14 +217,18 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @return int
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> private function get_user_id() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $user_id = get_current_user_id();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! empty( $this->user_id ) ) {
+ return $this->user_id;
+ }
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // We'll need a user ID when not on the user admin
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->user_id = (int) get_current_user_id();
+
+ // We'll need a user ID when not on self profile
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( ! empty( $_GET['user_id'] ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $user_id = $_GET['user_id'];
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->user_id = (int) $_GET['user_id'];
</ins><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">- return intval( $user_id );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ return $this->user_id;
</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="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-04-16 22:45:58 UTC (rev 9758)
+++ trunk/src/bp-xprofile/bp-xprofile-admin.php 2015-04-16 22:54:11 UTC (rev 9759)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -673,6 +673,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @since BuddyPress (2.0.0)
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> private function setup_actions() {
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Enqueue scripts
+ add_action( 'bp_members_admin_enqueue_scripts', array( $this, 'enqueue_scripts' ), 10, 1 );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Register the metabox in Member's community admin profile
</span><span class="cx" style="display: block; padding: 0 10px"> add_action( 'bp_members_admin_xprofile_metabox', array( $this, 'register_metaboxes' ), 10, 3 );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -682,6 +684,32 @@
</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"> /**
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Enqueue needed scripts.
+ *
+ * @access public
+ * @since BuddyPress (2.3.0)
+ */
+ public function enqueue_scripts( $screen_id ) {
+ if ( ( false === strpos( $screen_id, 'users_page_bp-profile-edit' ) && false === strpos( $screen_id, 'profile_page_bp-profile-edit' ) ) || bp_core_get_root_option( 'bp-disable-avatar-uploads' ) ) {
+ return;
+ }
+
+ /**
+ * Get Thickbox
+ *
+ * We cannot simply use add_thickbox() here as WordPress is not playing
+ * nice with Thickbox width/height see https://core.trac.wordpress.org/ticket/17249
+ * Using media-upload might be interesting in the future for the send to editor stuff
+ * and we make sure the tb_window is wide enougth
+ */
+ wp_enqueue_style ( 'thickbox' );
+ wp_enqueue_script( 'media-upload' );
+
+ // Get Avatar Uploader
+ bp_attachments_enqueue_scripts( 'BP_Attachment_Avatar' );
+ }
+
+ /**
</ins><span class="cx" style="display: block; padding: 0 10px"> * Register the xProfile metabox on Community Profile admin page.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @access public
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1037,6 +1065,14 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <a href="<?php echo esc_url( $delete_link ); ?>" title="<?php esc_attr_e( 'Delete Profile Photo', 'buddypress' ); ?>" class="bp-xprofile-avatar-user-admin"><?php esc_html_e( 'Delete Profile Photo', 'buddypress' ); ?></a></li>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php endif;
+
+ // Load the Avatar UI templates if user avatar uploads are enabled
+ if ( ! bp_core_get_root_option( 'bp-disable-avatar-uploads' ) ) : ?>
+ <a href="#TB_inline?width=800px&height=400px&inlineId=bp-xprofile-avatar-editor" title="<?php esc_attr_e( 'Edit Profile Photo', 'buddypress' );?>" class="thickbox bp-xprofile-avatar-user-edit"><?php esc_html_e( 'Edit Profile Photo', 'buddypress' ); ?></a>
+ <div id="bp-xprofile-avatar-editor" style="display:none;">
+ <?php bp_attachments_get_template_part( 'avatars/index' ); ?>
+ </div>
</ins><span class="cx" style="display: block; padding: 0 10px"> <?php endif; ?>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> </div>
</span></span></pre>
</div>
</div>
</body>
</html>