Changeset 8815
- Timestamp:
- 09/05/2008 04:29:03 PM (17 years ago)
- Location:
- trunk
- Files:
-
- 5 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/wp-admin/admin-header.php
r8785 r8815 101 101 <h3 class="info-box-title"><?php _e('Gears Status'); ?></h3> 102 102 <p><?php _e('Gears is installed on this computer, but is not enabled for use with WordPress.'); ?></p> 103 <p><?php 104 105 if ( $is_safari ) 106 _e('To enable it, ensure this web site is not on the denied list in Gears Settings under the Safari menu, then click the button below.'); 107 else 108 _e('To enable it, ensure this web site is not on the denied list in Gears Settings under your browser’s Tools menu, then click the button below.'); 109 110 ?></p> 103 <p><?php _e('To enable it click the button below.'); ?></p> 111 104 <p><strong><?php _e('However, Gears should not be enabled if this is a public or shared computer.'); ?></strong></p> 112 105 <div class="submit"><button class="button" onclick="wpGears.getPermission();"><?php _e('Enable Gears'); ?></button> … … 118 111 <p><?php 119 112 120 if ( $is_safari ) 113 if ( $is_chrome ) 114 _e('Gears is installed and enabled on this computer. You can disable it from your browser’s Options, Under the Hood menu.'); 115 elseif ( $is_safari ) 121 116 _e('Gears is installed and enabled on this computer. You can disable it from the Safari menu.'); 122 117 else … … 125 120 ?></p> 126 121 <p><?php _e('If there are any errors try disabling Gears, reloading the page, and re-enabling Gears.'); ?></p> 127 <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>122 <p><?php _e('Local storage status:'); ?> <span id="gears-wait"><span style="color:#f00;"><?php _e('Updating files:'); ?></span> <span id="gears-upd-number"></span></span></p> 128 123 <div class="submit"><button class="button" onclick="document.getElementById('gears-info-box').style.display='none';"><?php _e('Close'); ?></button></div> 129 124 </div> 125 126 <div id="gears-msg4" style="display:none;"> 127 <h3 class="info-box-title"><?php _e('Gears Status'); ?></h3> 128 <p><?php _e('This web site is denied to use Gears.'); ?></p> 129 <p><?php 130 131 if ( $is_chrome ) 132 _e('To allow it, change the Gears settings from your browser’s Options, Under the Hood menu and reload this page.'); 133 elseif ( $is_safari ) 134 _e('To allow it, change the Gears settings from the Safari menu and reload this page.'); 135 else 136 _e('To allow it, change the Gears settings from your browser’s Tools menu and reload this page.'); 137 138 ?></p> 139 <p><strong><?php _e('However, Gears should not be enabled if this is a public or shared computer.'); ?></strong></p> 140 <div class="submit"><button class="button" onclick="document.getElementById('gears-info-box').style.display='none';"><?php _e('Cancel'); ?></button></div> 141 </div> 142 130 143 </div> 131 144 <?php } ?> -
trunk/wp-admin/gears-manifest.php
r8720 r8815 209 209 { "url" : "../wp-includes/js/tinymce/plugins/inlinepopups/template.htm?ver=311b" }, 210 210 { "url" : "../wp-includes/js/tinymce/plugins/wpeditimage/editimage.html?ver=311f" }, 211 { "url" : "../wp-includes/js/tinymce/wp-mce-help.php?ver=311b" },212 211 213 212 { "url" : "../wp-includes/js/tinymce/themes/advanced/skins/wp_theme/ui.css?ver=311b" }, … … 277 276 { "url" : "../wp-includes/images/rss.png" }, 278 277 { "url" : "../wp-includes/js/thickbox/loadingAnimation.gif" }, 279 { "url" : "../wp-includes/js/thickbox/tb-close.png" }, 280 { "url" : "../wp-includes/js/swfupload/swfupload_f9.swf" } 278 { "url" : "../wp-includes/js/thickbox/tb-close.png" } 281 279 ]} -
trunk/wp-admin/js/wp-gears.js
r8600 r8815 11 11 store.manifestUrl = "gears-manifest.php"; 12 12 store.checkForUpdate(); 13 this.message( );13 this.message(3); 14 14 }, 15 15 16 16 getPermission : function() { 17 var perm = true; 18 17 19 if ( 'undefined' != typeof google && google.gears ) { 18 20 if ( ! google.gears.factory.hasPermission ) 19 google.gears.factory.getPermission( 'WordPress', 'images/logo.gif' );21 perm = google.gears.factory.getPermission( 'WordPress', 'images/logo.gif' ); 20 22 21 try { 22 this.createStore(); 23 } catch(e) {} // silence if canceled 23 if ( perm ) 24 try { this.createStore(); } catch(e) { this.message(); } // silence if canceled 25 else 26 this.message(4); 24 27 } 25 28 }, … … 35 38 36 39 message : function(show) { 37 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');40 var t = this, msg1 = t.I('gears-msg1'), msg2 = t.I('gears-msg2'), msg3 = t.I('gears-msg3'), msg4 = t.I('gears-msg4'), num = t.I('gears-upd-number'), wait = t.I('gears-wait'); 38 41 39 42 if ( ! msg1 ) return; 40 43 41 44 if ( 'undefined' != typeof google && google.gears ) { 42 if ( google.gears.factory.hasPermission ) { 43 msg1.style.display = msg2.style.display = 'none'; 45 if ( show && show == 4 ) { 46 msg1.style.display = msg2.style.display = msg3.style.display = 'none'; 47 msg4.style.display = 'block'; 48 } else if ( google.gears.factory.hasPermission ) { 49 msg1.style.display = msg2.style.display = msg4.style.display = 'none'; 44 50 msg3.style.display = 'block'; 45 51 … … 51 57 store.onprogress = function(e){if(num) num.innerHTML = (' ' + e.filesComplete + ' / ' + e.filesTotal);}; 52 58 } else { 53 msg1.style.display = msg3.style.display = 'none';59 msg1.style.display = msg3.style.display = msg4.style.display = 'none'; 54 60 msg2.style.display = 'block'; 55 61 } … … 57 63 58 64 if ( show ) t.I('gears-info-box').style.display = 'block'; 65 else t.I('gears-info-box').style.display = 'none'; 59 66 }, 60 67 -
trunk/wp-includes/script-loader.php
r8789 r8815 235 235 )); 236 236 237 $scripts->add( 'wp-gears', '/wp-admin/js/wp-gears.js', false, '20080 721' );237 $scripts->add( 'wp-gears', '/wp-admin/js/wp-gears.js', false, '20080905' ); 238 238 $scripts->localize( 'wp-gears', 'wpGearsL10n', array( 239 239 'updateCompleted' => __('Update completed.'), -
trunk/wp-includes/vars.php
r8406 r8815 39 39 if (strpos($_SERVER['HTTP_USER_AGENT'], 'Lynx') !== false) { 40 40 $is_lynx = true; 41 } elseif ( strpos(strtolower($_SERVER['HTTP_USER_AGENT']), 'chrome') !== false ) { 42 $is_chrome = true; 41 43 } elseif ( strpos(strtolower($_SERVER['HTTP_USER_AGENT']), 'webkit') !== false ) { 42 44 $is_safari = true;
Note: See TracChangeset
for help on using the changeset viewer.