Module: deluge Branch: master Commit: 5ea7e219434c6d0ccd968aacec0757ec5aa15b0a
Author: Damien Churchill <[email protected]> Date: Tue May 4 00:09:20 2010 +0100 add some icon preloading and improve the statusbar css classes --- deluge/ui/web/css/deluge.css | 14 +++++++++----- deluge/ui/web/index.html | 4 ++++ deluge/ui/web/js/deluge-all/Statusbar.js | 4 ++-- deluge/ui/web/js/deluge-all/UI.js | 6 ++++-- 4 files changed, 19 insertions(+), 9 deletions(-) diff --git a/deluge/ui/web/css/deluge.css b/deluge/ui/web/css/deluge.css index 7dc2246..c1da56f 100644 --- a/deluge/ui/web/css/deluge.css +++ b/deluge/ui/web/css/deluge.css @@ -162,13 +162,17 @@ dl.singleline dd { } /* Statusbar */ -#deluge-statusbar .x-not-connected { - background: url('../icons/error.png') no-repeat 2px; - padding-left: 20px; +.x-deluge-statusbar { + background: no-repeat 2px !important; + padding-left: 20px !important; +} + +.x-not-connected { + background-image: url('../icons/error.png') !important; } -#deluge-statusbar .x-connected { - background: transparent; +.x-connected { + background-image: transparent !important; } /* Styles for renderered progress bars */ diff --git a/deluge/ui/web/index.html b/deluge/ui/web/index.html index 0ba4462..c2897a4 100644 --- a/deluge/ui/web/index.html +++ b/deluge/ui/web/index.html @@ -29,5 +29,9 @@ </head> <body> <div style="background-image: url('${base}themes/default/tree/loading.gif');"></div> + + <!-- Preload icon classes --> + <div class="ext-mb-error"></div> + <div class="icon-ok"></div> </body> </html> diff --git a/deluge/ui/web/js/deluge-all/Statusbar.js b/deluge/ui/web/js/deluge-all/Statusbar.js index a578d92..300766b 100644 --- a/deluge/ui/web/js/deluge-all/Statusbar.js +++ b/deluge/ui/web/js/deluge-all/Statusbar.js @@ -35,8 +35,8 @@ Deluge.Statusbar = Ext.extend(Ext.ux.StatusBar, { constructor: function(config) { config = Ext.apply({ id: 'deluge-statusbar', - defaultIconCls: 'x-not-connected', - defaultText: _('Not Connected') + defaultIconCls: 'x-deluge-statusbar x-not-connected', + defaultText: _('Not Connected'), }, config); Deluge.Statusbar.superclass.constructor.call(this, config); }, diff --git a/deluge/ui/web/js/deluge-all/UI.js b/deluge/ui/web/js/deluge-all/UI.js index 50a129e..84e8c56 100644 --- a/deluge/ui/web/js/deluge-all/UI.js +++ b/deluge/ui/web/js/deluge-all/UI.js @@ -126,7 +126,10 @@ deluge.ui = { }, onConnectionSuccess: function(result) { - deluge.statusbar.setStatus('Connection restored'); + deluge.statusbar.setStatus({ + iconCls: 'x-deluge-statusbar icon-ok', + text: _('Connection restored') + }); clearInterval(this.checking); if (!result) { deluge.connectionManager.show(); @@ -143,7 +146,6 @@ deluge.ui = { }); deluge.events.fire('disconnect'); deluge.statusbar.setStatus({ - iconCls: 'icon-ok', text: 'Lost connection to webserver'} ); this.checking = setInterval(this.checkConnection, 2000); -- You received this message because you are subscribed to the Google Groups "deluge-commit" group. To post to this group, send email to [email protected]. To unsubscribe from this group, send email to [email protected]. For more options, visit this group at http://groups.google.com/group/deluge-commit?hl=en.
