Changeset 24695

Timestamp:

07/12/2013 11:32:32 PM (13 years ago)

Author:

azaozz

Message:

Logged out warnings:

• Replace the Close button with an always visible "X" icon in the top/right corner.
• Check if the user is still logged in every 3 min. by default.
• Add 'wp_auth_check_interval' filter so the interval can be set from PHP.

See #23295.

Location:

trunk

Files:

• wp-admin/css/wp-admin.css (modified) (1 diff)
• wp-includes/css/wp-auth-check.css (modified) (5 diffs)
• wp-includes/functions.php (modified) (3 diffs)
• wp-includes/js/wp-auth-check.js (modified) (5 diffs)
• wp-includes/script-loader.php (modified) (1 diff)

trunk/wp-admin/css/wp-admin.css

@@ -7188 +7188 @@
 .interim-login #login {
     padding: 0;
-    margin: 25px auto 20px;
+    margin: 5px auto 20px;
 }
 

trunk/wp-includes/css/wp-auth-check.css

@@ -25 +25 @@
     top: 40px;
     bottom: 20px;
-    max-height: 435px;
+    max-height: 415px;
     width: 380px;
     margin: 0 0 0 -190px;
-    padding: 0;
+    padding: 30px 0 0;
     background-color: #fbfbfb;
     -webkit-border-radius: 3px;
@@ -41 +41 @@
 
 #wp-auth-check-wrap #wp-auth-check-form {
-    background: url('../images/wpspin-2x.gif') no-repeat center center;
+    background: url(../images/wpspin-2x.gif) no-repeat center center;
     background-size: 16px 16px;
     height: 100%;
@@ -53 +53 @@
 
 #wp-auth-check-wrap .wp-auth-check-close {
-    bottom: 10px;
-    display: none;
     position: absolute;
-    right: 30px;
+    top: 8px;
+    right: 8px;
+    height: 14px;
+    width: 14px;
+    cursor: pointer;
+    background-image: url(../images/uploader-icons.png);
+    background-repeat: no-repeat;
+    background-position: -100px 0;
+}
+
+#wp-auth-check-wrap .wp-auth-check-close:focus {
+    outline: 1px dotted #888;
 }
 
@@ -66 +75 @@
     font-size: 14px;
     line-height: 21px;
-    padding: 10px 25px;
+    padding: 0 25px;
     display: none;
 }
@@ -75 +84 @@
 }
 
+@media print,
+  (-o-min-device-pixel-ratio: 5/4),
+  (-webkit-min-device-pixel-ratio: 1.25),
+  (min-resolution: 120dpi) {
+    #wp-auth-check-wrap .wp-auth-check-close {
+        background-image: url(../images/uploader-icons-2x.png);
+        background-size: 134px 15px;
+    }
+}

trunk/wp-includes/functions.php

@@ -3944 +3944 @@
     <div id="wp-auth-check-bg"></div>
     <div id="wp-auth-check">
+    <div class="wp-auth-check-close" tabindex="0" title="<?php esc_attr_e('Close'); ?>"></div>
     <?php
 
@@ -3958 +3959 @@
         <?php _e('The login page will open in a new window. After logging in you can close it and return to this page.'); ?></p>
     </div>
-    <p class="wp-auth-check-close"><a href="#" class="button button-primary"><?php _e('Close'); ?></a></p>
     </div>
     </div>
@@ -3975 +3975 @@
     // If the user is logged in and we are outside the login grace period, bail.
     if ( is_user_logged_in() && empty( $GLOBALS['login_grace_period'] ) )
-        return $response;
-
-    return array_merge( $response, array( 'wp-auth-check' => '1' ) );
+        return array_merge( $response, array( 'wp-auth-check' => '1' ) );
+
+    return array_merge( $response, array( 'wp-auth-check' => 'show' ) );
 }
 

trunk/wp-includes/js/wp-auth-check.js

@@ -1 +1 @@
 // Interim login dialog
 (function($){
-    var wrap, check, scheduleTimeout;
+    var wrap, check, next;
 
     function show() {
@@ -33 +33 @@
                         hide();
                     else
-                        parent.css( 'max-height', height + 60 + 'px' );
+                        parent.css( 'max-height', height + 40 + 'px' );
                 } else if ( ! body || ! body.length ) {
                     // Catch "silent" iframe origin exceptions in WebKit after another page is loaded in the iframe
@@ -75 +75 @@
 
         wrap.fadeOut( 200, function() {
-            wrap.addClass('hidden').css('display', '').find('.wp-auth-check-close').css('display', '');
+            wrap.addClass('hidden').css('display', '');
             $('#wp-auth-check-frame').remove();
         });
@@ -81 +81 @@
 
     function schedule() {
-        check = false;
-        window.clearTimeout( scheduleTimeout );
-        scheduleTimeout = window.setTimeout( function(){ check = 1; }, 300000 ); // 5 min.
+        var interval = parseInt( window.authcheckL10n.interval, 10 ) || 180; // in seconds, default 3 min.
+        next = ( new Date() ).getTime() + ( interval * 1000 );
     }
 
     $( document ).on( 'heartbeat-tick.wp-auth-check', function( e, data ) {
-        if ( check === 2 )
+        if ( data['wp-auth-check'] ) {
             schedule();
 
-        if ( data['wp-auth-check'] && wrap.hasClass('hidden') ) {
-            show();
-        } else if ( ! data['wp-auth-check'] && ! wrap.hasClass('hidden') ) {
-            hide();
+            if ( data['wp-auth-check'] == 'show' && wrap.hasClass('hidden') )
+                show();
+            else if ( data['wp-auth-check'] != 'show' && ! wrap.hasClass('hidden') )
+                hide();
         }
+    }).on( 'heartbeat-send.wp-auth-check', function( e, data ) {
+        if ( ( new Date() ).getTime() > next )
+            data['wp-auth-check'] = 1;
     }).ready( function() {
         schedule();
@@ -101 +103 @@
             hide();
         });
-        // Bind later
-        $( document ).on( 'heartbeat-send.wp-auth-check', function( e, data ) {
-            var i, empty = true;
-            // Check if something is using heartbeat. If yes, trigger the logged out check too.
-            for ( i in data ) {
-                if ( data.hasOwnProperty( i ) ) {
-                    empty = false;
-                    break;
-                }
-            }
-
-            if ( check || ! empty )
-                data['wp-auth-check'] = 1;
-
-            if ( check )
-                check = 2;
-        });
     });
 

trunk/wp-includes/script-loader.php

@@ -114 +114 @@
     did_action( 'init' ) && $scripts->localize( 'wp-auth-check', 'authcheckL10n', array(
         'beforeunload' => __('Your session has expired. You can log in again from this page or go to the login page.'),
+        'interval' => apply_filters( 'wp_auth_check_interval', 3 * MINUTE_IN_SECONDS ),
     ) );