diff --git a/wp-admin/admin-header.php b/wp-admin/admin-header.php index 74633fde1..1ca03911c 100644 --- a/wp-admin/admin-header.php +++ b/wp-admin/admin-header.php @@ -5,6 +5,7 @@ if ( $editing ) { if ( user_can_richedit() ) wp_enqueue_script( 'wp_tiny_mce' ); } +wp_enqueue_script( 'wp-gears' ); $min_width_pages = array( 'post.php', 'post-new.php', 'page.php', 'page-new.php', 'widgets.php', 'comment.php', 'link.php' ); $the_current_page = preg_replace('|^.*/wp-admin/|i', '', $_SERVER['PHP_SELF']); @@ -63,7 +64,46 @@ do_action('admin_head'); -

%2$s!'), 'profile.php', $user_identity) ?> | | Help') ?> | Forums') ?>

+ + +
+ +
+

+


+

+

+

+
+
+
+ + + + +
+ + + +

%2$s!'), 'profile.php', $user_identity) ?> | | Help') ?> | Forums') ?> |

- -gearsinfobox) ) { - update_usermeta($current_user->ID, 'gearsinfobox', '1'); ?> - -
-

-

-

-

-
Cancel
-
- - -


-

-

- - - - - diff --git a/wp-admin/js/wp-gears.js b/wp-admin/js/wp-gears.js index 7a1fea81c..22b5c0058 100644 --- a/wp-admin/js/wp-gears.js +++ b/wp-admin/js/wp-gears.js @@ -1,31 +1,27 @@ wpGears = { - init : function() { - if ( 'undefined' != typeof google && google.gears ) { - try { - localServer = google.gears.factory.create("beta.localserver"); - this.createStore(); - } catch(e) { // silence if canceled - this.message(); - } - } - }, - createStore : function() { if ( 'undefined' == typeof google || ! google.gears ) return; + if ( 'undefined' == typeof localServer ) + localServer = google.gears.factory.create("beta.localserver"); + store = localServer.createManagedStore(this.storeName()); store.manifestUrl = "gears-manifest.php"; store.checkForUpdate(); this.message(); }, - removeStore : function() { - if ( 'undefined' == typeof google || ! google.gears ) return; + getPermission : function() { + if ( 'undefined' != typeof google && google.gears ) { + if ( ! google.gears.factory.hasPermission ) + google.gears.factory.getPermission( 'WordPress', 'images/logo.gif' ); - localServer.removeManagedStore(this.storeName()); - this.message(); + try { + this.createStore(); + } catch(e) {} // silence if canceled + } }, storeName : function() { @@ -37,31 +33,36 @@ wpGears = { return name; }, - message : function() { + message : function(show) { 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'); if ( ! msg1 ) return; - if ( 'undefined' != typeof store ) { - msg1.style.display = msg2.style.display = 'none'; - msg3.style.display = 'block'; + if ( 'undefined' != typeof google && google.gears ) { + if ( google.gears.factory.hasPermission ) { + msg1.style.display = msg2.style.display = 'none'; + msg3.style.display = 'block'; - store.oncomplete = function(){wait.innerHTML = (' ' + wpGearsL10n.updateCompleted);}; - store.onerror = function(){wait.innerHTML = (' ' + wpGearsL10n.error + ' ' + store.lastErrorMessage);}; - store.onprogress = function(e){if(num) num.innerHTML = (' ' + e.filesComplete + ' / ' + e.filesTotal);}; - } else if ( 'undefined' != typeof google && google.gears ) { - msg1.style.display = 'none'; - msg2.style.display = 'block'; + if ( 'undefined' == typeof store ) + t.createStore(); + + store.oncomplete = function(){wait.innerHTML = (' ' + wpGearsL10n.updateCompleted);}; + store.onerror = function(){wait.innerHTML = (' ' + wpGearsL10n.error + ' ' + store.lastErrorMessage);}; + store.onprogress = function(e){if(num) num.innerHTML = (' ' + e.filesComplete + ' / ' + e.filesTotal);}; + } else { + msg1.style.display = msg3.style.display = 'none'; + msg2.style.display = 'block'; + } } + + if ( show ) t.I('gears-info-box').style.display = 'block'; }, - + I : function(id) { return document.getElementById(id); } } -addLoadEvent( function(){wpGears.init()} ); - function gearsInit() { if ( 'undefined' != typeof google && google.gears ) return; diff --git a/wp-admin/wp-admin.css b/wp-admin/wp-admin.css index 9e0446a99..edb1f5581 100644 --- a/wp-admin/wp-admin.css +++ b/wp-admin/wp-admin.css @@ -1500,21 +1500,33 @@ fieldset { } .info-box { - top: 120px; + top: 100px; left: 50%; - margin-left: -200px; + margin-left: -225px; height: 300px; - width: 400px; + width: 450px; border: 5px solid #ddd; background: #f8f8f8; position: absolute; padding: 15px 15px 10px; z-index: 1000; + display: none; } .info-box .submit { position: absolute; bottom: 15px; - width: 400px; - padding: 20px 0 5px; + width: 450px; + padding: 15px 0 0; +} + +.info-box .gears-img { + float: right; + margin: 10px; +} + +.info-box-title { + line-height: 2; + margin: 0; + padding: 0 7px; }