Changeset 9759

Timestamp:

04/16/2015 10:54:11 PM (10 years ago)

Author:

imath

Message:

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 #6290

Location:

trunk/src

Files:

• bp-members/admin/css/admin-rtl.css (modified) (2 diffs)
• bp-members/admin/css/admin.css (modified) (2 diffs)
• bp-members/bp-members-admin.php (modified) (1 diff)
• bp-xprofile/bp-xprofile-admin.php (modified) (3 diffs)

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

@@ -26 +26 @@
 div#community-profile-page li.bp-groups-profile-stats:before,
 div#community-profile-page li.bp-blogs-profile-stats:before,
-div#community-profile-page a.bp-xprofile-avatar-user-admin:before {
+div#community-profile-page a.bp-xprofile-avatar-user-admin:before,
+div#community-profile-page a.bp-xprofile-avatar-user-edit:before {
     font: normal 20px/1 'dashicons';
     speak: none;
@@ -59 +60 @@
 div#community-profile-page a.bp-xprofile-avatar-user-admin:before {
     content:"\f182";
+}
+
+div#community-profile-page a.bp-xprofile-avatar-user-edit:before {
+    content: "\f107";
 }
 

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

@@ -26 +26 @@
 div#community-profile-page li.bp-groups-profile-stats:before,
 div#community-profile-page li.bp-blogs-profile-stats:before,
-div#community-profile-page a.bp-xprofile-avatar-user-admin:before {
+div#community-profile-page a.bp-xprofile-avatar-user-admin:before,
+div#community-profile-page a.bp-xprofile-avatar-user-edit:before {
     font: normal 20px/1 'dashicons';
     speak: none;
@@ -59 +60 @@
 div#community-profile-page a.bp-xprofile-avatar-user-admin:before {
     content:"\f182";
+}
+
+div#community-profile-page a.bp-xprofile-avatar-user-edit:before {
+    content: "\f107";
 }
 

trunk/src/bp-members/bp-members-admin.php

@@ -218 +218 @@
      */
     private function get_user_id() {
-        $user_id = get_current_user_id();
-
-        // We'll need a user ID when not on the user admin
+        if ( ! empty( $this->user_id ) ) {
+            return $this->user_id;
+        }
+
+        $this->user_id = (int) get_current_user_id();
+
+        // We'll need a user ID when not on self profile
         if ( ! empty( $_GET['user_id'] ) ) {
-            $user_id = $_GET['user_id'];
-        }
-
-        return intval( $user_id );
+            $this->user_id = (int) $_GET['user_id'];
+        }
+
+        return $this->user_id;
     }
 

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

@@ -674 +674 @@
      */
     private function setup_actions() {
+        // Enqueue scripts
+        add_action( 'bp_members_admin_enqueue_scripts',  array( $this, 'enqueue_scripts'    ), 10, 1 );
 
         // Register the metabox in Member's community admin profile
@@ -680 +682 @@
         // Saves the profile actions for user ( avatar, profile fields )
         add_action( 'bp_members_admin_update_user',      array( $this, 'user_admin_load'    ), 10, 4 );
+    }
+
+    /**
+     * 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' );
     }
 
@@ -1038 +1066 @@
                 <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>
 
+            <?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>
             <?php endif; ?>