Changeset 9860

Timestamp:

05/10/2015 12:24:24 PM (10 years ago)

Author:

imath

Message:

Avatar UI : improve the camera feature

• Change the name of the tab: "Camera" is now replaced by "Take Photo"
• Improve the user feedback messages
• Completely disable the feature for Internet Explorer and Safari as they do not support getUserMedia.

Props r-a-y, boonebgorges.

Fixes #6425

Location:

trunk/src

Files:

• bp-core/bp-core-attachments.php (modified) (1 diff)
• bp-core/bp-core-avatars.php (modified) (2 diffs)
• bp-templates/bp-legacy/buddypress/assets/_attachments/avatars/camera.php (modified) (1 diff)

trunk/src/bp-core/bp-core-attachments.php

@@ -224 +224 @@
         // Create the Camera Nav if the WebCam capture feature is enabled
         if ( bp_avatar_use_webcam() && 'user' === $object ) {
-            $avatar_nav['camera'] = array( 'id' => 'camera', 'caption' => __( 'Camera', 'buddypress' ), 'order' => 10 );
+            $avatar_nav['camera'] = array( 'id' => 'camera', 'caption' => __( 'Take Photo', 'buddypress' ), 'order' => 10 );
 
             // Set warning messages
             $strings['camera_warnings'] = array(
-                'requesting'  => __( 'Requesting video stream, please authorize this website to access to your camera.', 'buddypress'),
-                'loading'     => __( 'Please wait for the video to load.', 'buddypress' ),
-                'loaded'      => __( 'Video stream loaded. You can use the capture button to display the profile photo preview.', 'buddypress' ),
-                'noaccess'    => __( 'You denied this website to access to your camera. Please use the upload form.', 'buddypress' ),
-                'errormsg'    => __( 'Your browser is not supported. Please use the upload form.', 'buddypress' ),
-                'videoerror'  => __( 'Video error. Please use the upload form.', 'buddypress' ),
-                'ready'       => __( 'Your profile photo is ready, use the save button to validate.', 'buddypress' ),
-                'nocapture'   => __( 'No profile photo was captured, please use the capture button first.', 'buddypress' ),
+                'requesting'  => __( 'Please allow us to access to your camera.', 'buddypress'),
+                'loading'     => __( 'Please wait as we access your camera.', 'buddypress' ),
+                'loaded'      => __( 'Camera loaded. Click on the "Capture" button to take your photo.', 'buddypress' ),
+                'noaccess'    => __( 'It looks like you do not have a webcam or we were unable to get permission to use your webcam. Please upload a photo instead.', 'buddypress' ),
+                'errormsg'    => __( 'Your browser is not supported. Please upload a photo instead.', 'buddypress' ),
+                'videoerror'  => __( 'Video error. Please upload a photo instead.', 'buddypress' ),
+                'ready'       => __( 'Your profile photo is ready. Click on the "Save" button to use this photo.', 'buddypress' ),
+                'nocapture'   => __( 'No photo was captured. Click on the "Capture" button to take your photo.', 'buddypress' ),
             );
         }

trunk/src/bp-core/bp-core-avatars.php

@@ -1839 +1839 @@
  * @since  BuddyPress (2.3.0)
  *
+ * @global $is_safari
+ * @global $is_IE
  * @return bool True to load the Webcam Avatar UI part. False otherwise.
  */
 function bp_avatar_use_webcam() {
+    global $is_safari, $is_IE;
+
     /**
      * Do not use the webcam feature for mobile devices
@@ -1847 +1851 @@
      */
     if ( wp_is_mobile() ) {
+        return false;
+    }
+
+    /**
+     * Bail when the browser does not support getUserMedia.
+     *
+     * @see  http://caniuse.com/#feat=stream
+     */
+    if ( $is_safari || $is_IE ) {
         return false;
     }

trunk/src/bp-templates/bp-legacy/buddypress/assets/_attachments/avatars/camera.php

@@ -14 +14 @@
     <# if ( ! data.user_media ) { #>
         <div id="bp-webcam-message">
-            <p class="warning"><?php esc_html_e( 'Your browser does not support the camera feature', 'buddypress' );?></p>
+            <p class="warning"><?php esc_html_e( 'Your browser does not support this feature.', 'buddypress' );?></p>
         </div>
     <# } else { #>