WordPress.org

Make WordPress Core

Changeset 7951


Ignore:
Timestamp:
05/19/08 15:41:31 (7 years ago)
Author:
ryan
Message:

Gears update from azaozz. see #6965

Location:
trunk/wp-admin
Files:
2 added
6 edited

Legend:

Unmodified
Added
Removed
  • trunk/wp-admin/admin-header.php

    r7600 r7951  
    66        wp_enqueue_script( 'wp_tiny_mce' ); 
    77} 
     8wp_enqueue_script( 'wp-gears' ); 
    89 
    910$min_width_pages = array( 'post.php', 'post-new.php', 'page.php', 'page-new.php', 'widgets.php', 'comment.php', 'link.php' ); 
     
    6465<h1><?php if ( '' == get_bloginfo('name') ) echo '&nbsp;'; else echo get_bloginfo('name'); ?><span id="viewsite"><a href="<?php echo trailingslashit( get_option('home') ); ?>"><?php _e('Visit Site') ?></a></span></h1> 
    6566</div> 
    66 <div id="user_info"><p><?php printf(__('Howdy, <a href="%1$s">%2$s</a>!'), 'profile.php', $user_identity) ?> | <a href="<?php echo get_option('siteurl'); ?>/wp-login.php?action=logout" title="<?php _e('Log Out') ?>"><?php _e('Log Out'); ?></a> | <?php _e('<a href="http://codex.wordpress.org/">Help</a>') ?> | <?php _e('<a href="http://wordpress.org/support/">Forums</a>') ?></p></div> 
     67 
     68<?php 
     69$gears_compat = false; 
     70 
     71if ( ($is_gecko || $is_winIE) && strpos(strtolower($_SERVER['HTTP_USER_AGENT']), 'webkit') === false ) {  
     72    $gears_compat = true; 
     73?> 
     74    <div id="gears-info-box" class="info-box"> 
     75    <img src="images/gear.png" title="Gear" alt="" class="gears-img" /> 
     76    <div id="gears-msg1"> 
     77    <h3 class="info-box-title"><?php _e('Speed up WordPress'); ?></h3> 
     78    <p><?php _e('WordPress has support for Google Gears that adds new features to your web browser.'); ?><br /> 
     79    <a href="http://gears.google.com/" target="_blank" style="font-weight:normal;"><?php _e('More information...'); ?></a></p> 
     80    <p><?php _e('After installing and enabling it, most of the WordPress images, scripts and CSS files will be stored on this computer. This will speed up page loading.'); ?></p> 
     81    <p><strong><?php _e('Please make sure you are not using a public or shared computer.'); ?></strong></p> 
     82    <div class="submit"><button onclick="window.location = 'http://gears.google.com/?action=install&return=<?php echo get_option('siteurl') . '/wp-admin/'; ?>';" class="button"><?php _e('Install Now'); ?></button> 
     83    <button class="button" style="margin-left:10px;" onclick="document.getElementById('gears-info-box').style.display='none';">Cancel</button></div> 
     84    </div> 
     85 
     86    <div id="gears-msg2" style="display:none;"> 
     87    <h3 class="info-box-title"><?php _e('Google Gears Status'); ?></h3> 
     88    <p><?php _e('Google Gears is installed on this computer but is not enabled for use with WordPress.'); ?></p>  
     89    <p><?php _e('To enable it, make sure this web site is not on the denied list in Google Gears Settings under your browser\'s Tools menu, then click the button below.'); ?></p> 
     90    <p><strong><?php _e('However if this is a public or shared computer, Google Gears should not be enabled.'); ?></strong></p> 
     91    <div class="submit"><button class="button" onclick="wpGears.getPermission();"><?php _e('Enable Google Gears'); ?></button> 
     92    <button class="button" style="margin-left:10px;" onclick="document.getElementById('gears-info-box').style.display='none';">Cancel</button></div> 
     93    </div> 
     94 
     95    <div id="gears-msg3" style="display:none;"> 
     96    <h3 class="info-box-title"><?php _e('Google Gears Status'); ?></h3> 
     97    <p><?php _e('Google Gears is installed and enabled on this computer. You can disable it from your browser Tools menu.'); ?></p> 
     98    <p><?php _e('If there are any errors, try disabling Gears, then reload the page and enable it again.'); ?></p> 
     99    <p><?php _e('Local storage status:'); ?> <span id="gears-wait"><span style="color:#f00;"><?php _e('Please wait! Updating files:'); ?></span> <span id="gears-upd-number"></span></span></p> 
     100    <div class="submit"><button class="button" onclick="document.getElementById('gears-info-box').style.display='none';"><?php _e('Close'); ?></button></div> 
     101    </div> 
     102    </div> 
     103 
     104<?php } ?> 
     105 
     106<div id="user_info"><p><?php printf(__('Howdy, <a href="%1$s">%2$s</a>!'), 'profile.php', $user_identity) ?> | <a href="<?php echo get_option('siteurl'); ?>/wp-login.php?action=logout" title="<?php _e('Log Out') ?>"><?php _e('Log Out'); ?></a> | <?php _e('<a href="http://codex.wordpress.org/">Help</a>') ?> | <?php _e('<a href="http://wordpress.org/support/">Forums</a>') ?> | <?php if ( $gears_compat ) { ?><span id="gears-menu"><a href="#" onclick="wpGears.message(1);return false;"><?php _e('Speed up!') ?></a></span><?php } ?></p></div> 
    67107 
    68108<?php 
  • trunk/wp-admin/css/colors-classic.css

    r7813 r7951  
    3838} 
    3939 
    40 ul#category-tabs li.ui-tabs-selected, li.widget-list-control-item, div.nav, .tablenav, .submitbox, h3.dashboard-widget-title, h3.dashboard-widget-title span, h3.dashboard-widget-title small, ul.view-switch li.current, .form-table tr, #poststuff h3, .login form { 
     40ul#category-tabs li.ui-tabs-selected, li.widget-list-control-item, div.nav, .tablenav, .submitbox, h3.dashboard-widget-title, h3.dashboard-widget-title span, h3.dashboard-widget-title small, ul.view-switch li.current, .form-table tr, #poststuff h3, .login form, h3.info-box-title { 
    4141    background-color: #cfebf7; 
    4242} 
  • trunk/wp-admin/css/colors-fresh.css

    r7813 r7951  
    4242} 
    4343 
    44 li.widget-list-control-item, div.nav, .tablenav, .submitbox, h3.dashboard-widget-title, h3.dashboard-widget-title span, h3.dashboard-widget-title small, ul.view-switch li.current, .form-table tr, #poststuff h3, .login form { 
     44li.widget-list-control-item, div.nav, .tablenav, .submitbox, h3.dashboard-widget-title, h3.dashboard-widget-title span, h3.dashboard-widget-title small, ul.view-switch li.current, .form-table tr, #poststuff h3, .login form, h3.info-box-title { 
    4545    background-color: #eaf3fa; 
    4646} 
  • trunk/wp-admin/index.php

    r7938 r7951  
    3333 
    3434wp_enqueue_script( 'jquery' ); 
    35 wp_enqueue_script( 'wp-gears' ); 
    3635 
    3736$title = __('Dashboard'); 
     
    118117    <?php update_right_now_message(); ?> 
    119118</p> 
    120  
    121 <?php 
    122 if ( ($is_gecko || $is_winIE) && strpos(strtolower($_SERVER['HTTP_USER_AGENT']), 'webkit') === false ) {  
    123     if ( ! isset($current_user) ) 
    124         $current_user = wp_get_current_user(); 
    125  
    126     if ( ! isset($current_user->gearsinfobox) ) { 
    127         update_usermeta($current_user->ID, 'gearsinfobox', '1'); ?> 
    128  
    129     <div id="gears-info-box" class="info-box"> 
    130     <h3 class="dashboard-widget-title"><?php _e('Install offline storage for WordPress'); ?></h3> 
    131     <p><?php _e('WordPress has support for Google Gears that adds new features to your web browser.'); ?> <a href="http://gears.google.com/" target="_blank" style="font-weight:normal;"><?php _e('More information...'); ?></a></p> 
    132     <p><?php _e('After installing and enabling it, most of the WordPress images, scripts and CSS files will be stored on this computer. This will speed up page loading considerably.'); ?></p> 
    133     <p><strong><?php _e('Please make sure you are not using a public or shared computer.'); ?></strong></p> 
    134     <div class="submit"><a href="http://gears.google.com/?action=install&return=<?php echo get_option('siteurl') . '/wp-admin/'; ?>" class="button"><?php _e('Install Now'); ?></a><a href="#" class="button" style="margin-left:10px;" onclick="document.getElementById('gears-info-box').style.display='none';return false;">Cancel</a></div> 
    135     </div> 
    136 <?php } ?> 
    137  
    138     <div id="gears-msg1"><p><?php _e('WordPress has support for Google Gears that adds new features to your web browser.'); ?> <a href="http://gears.google.com/" target="_blank" style="font-weight:normal;"><?php _e('More information...'); ?></a><br /> 
    139     <?php _e('After installing and enabling it, most of the WordPress images, scripts and CSS files will be stored on this computer. This will speed up page loading considerably.'); ?></p> 
    140     <p><a href="http://gears.google.com/?action=install&return=<?php echo get_option('siteurl') . '/wp-admin/'; ?>" class="rbutton"><?php _e('Install Google Gears'); ?></a> <strong><?php _e('Please make sure you are not using a public or shared computer.'); ?></strong></p></div> 
    141      
    142     <p id="gears-msg2" style="display:none;"><?php _e('Google Gears is installed on this computer but is not enabled for use with WordPress. To enable it, make sure this web site is not on the denied list under Tools - Google Gears Settings menu of your browser, then reload this page and allow the site to use Google Gears on this computer.'); ?><br /> 
    143     <strong><?php _e('However if this is a public or shared computer, Google Gears should not be enabled.'); ?></strong></p> 
    144      
    145     <p id="gears-msg3" style="display:none;"><?php _e('Google Gears is installed and enabled on this computer. You can disable it from your browser Tools menu.'); ?><br /> 
    146     <?php _e('Status:'); ?> <span id="gears-wait"><span style="color:#fff;background-color:#f00;"><?php _e('Please wait! Updating files:'); ?></span> <span id="gears-upd-number"></span></span></p> 
    147 <?php } ?> 
    148119<?php do_action( 'rightnow_end' ); ?> 
    149120<?php do_action( 'activity_box_end' ); ?> 
  • trunk/wp-admin/js/wp-gears.js

    r7938 r7951  
    22wpGears = { 
    33 
    4     init : function() { 
    5         if ( 'undefined' != typeof google && google.gears ) { 
    6             try {  
    7                 localServer = google.gears.factory.create("beta.localserver"); 
    8                 this.createStore(); 
    9             } catch(e) { // silence if canceled 
    10                 this.message(); 
    11             } 
    12         } 
    13     }, 
    14  
    154    createStore : function() { 
    165        if ( 'undefined' == typeof google || ! google.gears ) return; 
     6 
     7        if ( 'undefined' == typeof localServer )  
     8            localServer = google.gears.factory.create("beta.localserver"); 
    179 
    1810        store = localServer.createManagedStore(this.storeName()); 
     
    2214    }, 
    2315 
    24     removeStore : function() { 
    25         if ( 'undefined' == typeof google || ! google.gears ) return; 
     16    getPermission : function() { 
     17        if ( 'undefined' != typeof google && google.gears ) { 
     18            if ( ! google.gears.factory.hasPermission ) 
     19                google.gears.factory.getPermission( 'WordPress', 'images/logo.gif' ); 
    2620 
    27         localServer.removeManagedStore(this.storeName()); 
    28         this.message(); 
     21            try { 
     22                this.createStore(); 
     23            } catch(e) {} // silence if canceled 
     24        } 
    2925    }, 
    3026 
     
    3834    }, 
    3935 
    40     message : function() { 
     36    message : function(show) { 
    4137        var t = this, msg1 = t.I('gears-msg1'), msg2 = t.I('gears-msg2'), msg3 = t.I('gears-msg3'), num = t.I('gears-upd-number'), wait = t.I('gears-wait'); 
    4238 
    4339        if ( ! msg1 ) return; 
    4440 
    45         if ( 'undefined' != typeof store ) { 
    46             msg1.style.display = msg2.style.display = 'none'; 
    47             msg3.style.display = 'block'; 
     41        if ( 'undefined' != typeof google && google.gears ) { 
     42            if ( google.gears.factory.hasPermission ) { 
     43                msg1.style.display = msg2.style.display = 'none'; 
     44                msg3.style.display = 'block'; 
    4845 
    49             store.oncomplete = function(){wait.innerHTML = (' ' + wpGearsL10n.updateCompleted);}; 
    50             store.onerror = function(){wait.innerHTML = (' ' + wpGearsL10n.error + ' ' + store.lastErrorMessage);}; 
    51             store.onprogress = function(e){if(num) num.innerHTML = (' ' + e.filesComplete + ' / ' + e.filesTotal);}; 
    52         } else if ( 'undefined' != typeof google && google.gears ) { 
    53             msg1.style.display = 'none'; 
    54             msg2.style.display = 'block'; 
     46                if ( 'undefined' == typeof store ) 
     47                    t.createStore(); 
     48 
     49                store.oncomplete = function(){wait.innerHTML = (' ' + wpGearsL10n.updateCompleted);}; 
     50                store.onerror = function(){wait.innerHTML = (' ' + wpGearsL10n.error + ' ' + store.lastErrorMessage);}; 
     51                store.onprogress = function(e){if(num) num.innerHTML = (' ' + e.filesComplete + ' / ' + e.filesTotal);}; 
     52            } else { 
     53                msg1.style.display = msg3.style.display = 'none'; 
     54                msg2.style.display = 'block'; 
     55            } 
    5556        } 
     57 
     58        if ( show ) t.I('gears-info-box').style.display = 'block'; 
    5659    }, 
    57      
     60 
    5861    I : function(id) { 
    5962        return document.getElementById(id); 
    6063    } 
    6164} 
    62  
    63 addLoadEvent( function(){wpGears.init()} ); 
    6465 
    6566function gearsInit() { 
  • trunk/wp-admin/wp-admin.css

    r7942 r7951  
    15011501 
    15021502.info-box { 
    1503     top: 120px; 
     1503    top: 100px; 
    15041504    left: 50%; 
    1505     margin-left: -200px; 
     1505    margin-left: -225px; 
    15061506    height: 300px; 
    1507     width: 400px; 
     1507    width: 450px; 
    15081508    border: 5px solid #ddd; 
    15091509    background: #f8f8f8; 
     
    15111511    padding: 15px 15px 10px; 
    15121512    z-index: 1000; 
     1513    display: none; 
    15131514} 
    15141515 
     
    15161517    position: absolute; 
    15171518    bottom: 15px; 
    1518     width: 400px; 
    1519     padding: 20px 0 5px; 
    1520 } 
     1519    width: 450px; 
     1520    padding: 15px 0 0; 
     1521} 
     1522 
     1523.info-box .gears-img { 
     1524    float: right; 
     1525    margin: 10px; 
     1526} 
     1527 
     1528.info-box-title { 
     1529    line-height: 2; 
     1530    margin: 0; 
     1531    padding: 0 7px; 
     1532} 
Note: See TracChangeset for help on using the changeset viewer.