Module: deluge Branch: master Commit: 4005003003d8ec5fd093a4a2de273d1a988e2af0
Author: Damien Churchill <[email protected]> Date: Tue Mar 23 23:20:03 2010 +0000 remove the last of the resources that used absolute paths and move them to css with relative paths --- deluge/ui/web/css/deluge.css | 38 ++++++++++++++++++++ deluge/ui/web/js/deluge-all/Deluge.Add.js | 6 ++-- .../web/js/deluge-all/Deluge.ConnectionManager.js | 6 ++-- deluge/ui/web/js/deluge-all/Deluge.EditTrackers.js | 15 +++----- deluge/ui/web/js/deluge-all/Deluge.Menus.js | 12 +++--- 5 files changed, 55 insertions(+), 22 deletions(-) diff --git a/deluge/ui/web/css/deluge.css b/deluge/ui/web/css/deluge.css index 256eb3d..4dec6b1 100644 --- a/deluge/ui/web/css/deluge.css +++ b/deluge/ui/web/css/deluge.css @@ -296,6 +296,16 @@ dl.singleline dd { background-image: url('../icons/add.png') !important; } +.icon-add-url { + background-image: url('../icons/add_url.png') !important; +} + +.icon-add-magnet { + background-image: url('../icons/add_magnet.png') !important; +} + + + .icon-pause { background-image: url('../icons/pause.png') !important; } @@ -367,3 +377,31 @@ dl.singleline dd { .icon-home { background-image: url('../icons/home.png') !important; } + +.icon-error { + background-image: url('../icons/error.png') !important; +} + +.icon-upload-slots { + background-image: url('../icons/upload_slots.png') !important; +} + +.icon-expand-all { + background-image: url('../icons/expand_all.png') !important; +} + +.icon-do-not-download { + background-image: url('../icons/no_download.png') !important; +} + +.icon-normal { + background-image: url('../icons/normal.png') !important; +} + +.icon-high { + background-image: url('../icons/high.png') !important; +} + +.icon-highest { + background-image: url('../icons/highest.png') !important; +} diff --git a/deluge/ui/web/js/deluge-all/Deluge.Add.js b/deluge/ui/web/js/deluge-all/Deluge.Add.js index 668bbd5..ace772f 100644 --- a/deluge/ui/web/js/deluge-all/Deluge.Add.js +++ b/deluge/ui/web/js/deluge-all/Deluge.Add.js @@ -433,20 +433,20 @@ Deluge.add.AddWindow = Ext.extend(Deluge.add.Window, { id: 'url', cls: 'x-btn-text-icon', text: _('Url'), - icon: '/icons/add_url.png', + iconCls: 'icon-add-url', handler: this.onUrl, scope: this }, { id: 'infohash', cls: 'x-btn-text-icon', text: _('Infohash'), - icon: '/icons/add_magnet.png', + iconCls: 'icon-add-magnet', disabled: true }, '->', { id: 'remove', cls: 'x-btn-text-icon', text: _('Remove'), - icon: '/icons/remove.png', + iconCls: 'icon-remove', handler: this.onRemove, scope: this }] diff --git a/deluge/ui/web/js/deluge-all/Deluge.ConnectionManager.js b/deluge/ui/web/js/deluge-all/Deluge.ConnectionManager.js index 9ed17dd..18fee3f 100644 --- a/deluge/ui/web/js/deluge-all/Deluge.ConnectionManager.js +++ b/deluge/ui/web/js/deluge-all/Deluge.ConnectionManager.js @@ -219,14 +219,14 @@ Copyright: id: 'cm-add', cls: 'x-btn-text-icon', text: _('Add'), - icon: '/icons/add.png', + iconCls: 'icon-add', handler: this.onAddClick, scope: this }, { id: 'cm-remove', cls: 'x-btn-text-icon', text: _('Remove'), - icon: '/icons/remove.png', + iconCls: 'icon-remove', handler: this.onRemove, disabled: true, scope: this @@ -234,7 +234,7 @@ Copyright: id: 'cm-stop', cls: 'x-btn-text-icon', text: _('Stop Daemon'), - icon: '/icons/error.png', + iconCls: 'icon-error', handler: this.onStop, disabled: true, scope: this diff --git a/deluge/ui/web/js/deluge-all/Deluge.EditTrackers.js b/deluge/ui/web/js/deluge-all/Deluge.EditTrackers.js index e62202b..55e7bd6 100644 --- a/deluge/ui/web/js/deluge-all/Deluge.EditTrackers.js +++ b/deluge/ui/web/js/deluge-all/Deluge.EditTrackers.js @@ -221,33 +221,28 @@ Copyright: bbar: new Ext.Toolbar({ items: [ { - cls: 'x-btn-text-icon', text: _('Up'), - icon: '/icons/up.png', + iconCls: 'icon-up', handler: this.onUpClick, scope: this }, { - cls: 'x-btn-text-icon', text: _('Down'), - icon: '/icons/down.png', + iconCls: 'icon-down', handler: this.onDownClick, scope: this }, '->', { - cls: 'x-btn-text-icon', text: _('Add'), - icon: '/icons/add.png', + iconCls: 'icon-add', handler: this.onAddClick, scope: this }, { - cls: 'x-btn-text-icon', text: _('Edit'), - icon: '/icons/edit_trackers.png', + iconCls: 'icon-edit-trackers', handler: this.onEditClick, scope: this }, { - cls: 'x-btn-text-icon', text: _('Remove'), - icon: '/icons/remove.png', + iconCls: 'icon-remove', handler: this.onRemoveClick, scope: this } diff --git a/deluge/ui/web/js/deluge-all/Deluge.Menus.js b/deluge/ui/web/js/deluge-all/Deluge.Menus.js index 2acb7ad..a6c9dcc 100644 --- a/deluge/ui/web/js/deluge-all/Deluge.Menus.js +++ b/deluge/ui/web/js/deluge-all/Deluge.Menus.js @@ -161,7 +161,7 @@ deluge.menus.torrent = new Ext.menu.Menu({ }) }, { text: _('Upload Slot Limit'), - icon: '/icons/upload_slots.png', + iconCls: 'icon-upload-slots', menu: new Ext.menu.Menu({ items: [{ text: _('0') @@ -422,26 +422,26 @@ deluge.menus.filePriorities = new Ext.menu.Menu({ items: [{ id: 'expandAll', text: _('Expand All'), - icon: '/icons/expand_all.png' + iconCls: 'icon-expand-all' }, '-', { id: 'no_download', text: _('Do Not Download'), - icon: '/icons/no_download.png', + iconCls: 'icon-do-not-download', filePriority: 0 }, { id: 'normal', text: _('Normal Priority'), - icon: '/icons/normal.png', + iconCls: 'icon-normal', filePriority: 1 }, { id: 'high', text: _('High Priority'), - icon: '/icons/high.png', + iconCls: 'icon-high', filePriority: 2 }, { id: 'highest', text: _('Highest Priority'), - icon: '/icons/highest.png', + iconCls: 'icon-highest', filePriority: 5 }] }); -- 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.
