fix the button css adding !important to ensure that the background-image from them is used

use iconCls for the toolbar rather than fixed paths
This commit is contained in:
Damien Churchill 2010-03-09 22:13:03 +00:00
commit ae5071d6cb
2 changed files with 36 additions and 34 deletions

View file

@ -289,57 +289,69 @@ dl.singleline dd {
*/ */
.icon-create { .icon-create {
background-image: url('../icons/create.png'); background-image: url('../icons/create.png') !important;
} }
.icon-add { .icon-add {
background-image: url('../icons/add.png'); background-image: url('../icons/add.png') !important;
} }
.icon-pause { .icon-pause {
background-image: url('../icons/pause.png'); background-image: url('../icons/pause.png') !important;
} }
.icon-resume { .icon-resume {
background-image: url('../icons/start.png'); background-image: url('../icons/start.png') !important;
} }
.icon-options { .icon-options {
background-image: url('../icons/preferences.png'); background-image: url('../icons/preferences.png') !important;
} }
.icon-queue { .icon-queue {
background-image: url('../icons/queue.png'); background-image: url('../icons/queue.png') !important;
} }
.icon-top { .icon-top {
background-image: url('../icons/top.png'); background-image: url('../icons/top.png') !important;
} }
.icon-up { .icon-up {
background-image: url('../icons/up.png'); background-image: url('../icons/up.png') !important;
} }
.icon-down { .icon-down {
background-image: url('../icons/down.png'); background-image: url('../icons/down.png') !important;
} }
.icon-bottom { .icon-bottom {
background-image: url('../icons/bottom.png'); background-image: url('../icons/bottom.png') !important;
} }
.icon-update-tracker { .icon-update-tracker {
background-image: url('../icons/update.png'); background-image: url('../icons/update.png') !important;
} }
.icon-edit-trackers { .icon-edit-trackers {
background-image: url('../icons/edit_trackers.png'); background-image: url('../icons/edit_trackers.png') !important;
} }
.icon-remove { .icon-remove {
background-image: url('../icons/remove.png'); background-image: url('../icons/remove.png') !important;
} }
.icon-recheck { .icon-recheck {
background-image: url('../icons/recheck.png'); background-image: url('../icons/recheck.png') !important;
} }
.icon-move { .icon-move {
background-image: url('../icons/move.png'); background-image: url('../icons/move.png') !important;
}
.icon-help {
background-image: url('../icons/help.png') !important;
}
.icon-logout {
background-image: url('../icons/logout.png') !important;
} }

View file

@ -43,78 +43,68 @@ Ext.deluge.Toolbar = Ext.extend(Ext.Toolbar, {
items: [ items: [
{ {
id: 'create', id: 'create',
cls: 'x-btn-text-icon',
disabled: true, disabled: true,
text: _('Create'), text: _('Create'),
icon: '/icons/create.png', iconCls: 'icon-create',
handler: this.onTorrentAction handler: this.onTorrentAction
},{ },{
id: 'add', id: 'add',
cls: 'x-btn-text-icon',
disabled: true, disabled: true,
text: _('Add'), text: _('Add'),
icon: '/icons/add.png', iconCls: 'icon-add',
handler: this.onTorrentAdd handler: this.onTorrentAdd
},{ },{
id: 'remove', id: 'remove',
cls: 'x-btn-text-icon',
disabled: true, disabled: true,
text: _('Remove'), text: _('Remove'),
icon: '/icons/remove.png', iconCls: 'icon-remove',
handler: this.onTorrentAction handler: this.onTorrentAction
},'|',{ },'|',{
id: 'pause', id: 'pause',
cls: 'x-btn-text-icon',
disabled: true, disabled: true,
text: _('Pause'), text: _('Pause'),
icon: '/icons/pause.png', iconCls: 'icon-pause',
handler: this.onTorrentAction handler: this.onTorrentAction
},{ },{
id: 'resume', id: 'resume',
cls: 'x-btn-text-icon',
disabled: true, disabled: true,
text: _('Resume'), text: _('Resume'),
icon: '/icons/start.png', iconCls: 'icon-resume',
handler: this.onTorrentAction handler: this.onTorrentAction
},'|',{ },'|',{
id: 'up', id: 'up',
cls: 'x-btn-text-icon', cls: 'x-btn-text-icon',
disabled: true, disabled: true,
text: _('Up'), text: _('Up'),
icon: '/icons/up.png', iconCls: 'icon-up',
handler: this.onTorrentAction handler: this.onTorrentAction
},{ },{
id: 'down', id: 'down',
cls: 'x-btn-text-icon',
disabled: true, disabled: true,
text: _('Down'), text: _('Down'),
icon: '/icons/down.png', iconCls: 'icon-down',
handler: this.onTorrentAction handler: this.onTorrentAction
},'|',{ },'|',{
id: 'preferences', id: 'preferences',
cls: 'x-btn-text-icon',
text: _('Preferences'), text: _('Preferences'),
iconCls: 'x-deluge-preferences', iconCls: 'x-deluge-preferences',
handler: this.onPreferencesClick, handler: this.onPreferencesClick,
scope: this scope: this
},{ },{
id: 'connectionman', id: 'connectionman',
cls: 'x-btn-text-icon',
text: _('Connection Manager'), text: _('Connection Manager'),
iconCls: 'x-deluge-connection-manager', iconCls: 'x-deluge-connection-manager',
handler: this.onConnectionManagerClick, handler: this.onConnectionManagerClick,
scope: this scope: this
},'->',{ },'->',{
id: 'help', id: 'help',
cls: 'x-btn-text-icon', iconCls: 'icon-help',
icon: '/icons/help.png',
text: _('Help'), text: _('Help'),
handler: this.onHelpClick, handler: this.onHelpClick,
scope: this scope: this
},{ },{
id: 'logout', id: 'logout',
cls: 'x-btn-text-icon', iconCls: 'icon-logout',
icon: '/icons/logout.png',
disabled: true, disabled: true,
text: _('Logout'), text: _('Logout'),
handler: this.onLogout, handler: this.onLogout,