diff --git a/deluge/ui/webui/pages.py b/deluge/ui/webui/pages.py index 706e3e552..bf5a10257 100644 --- a/deluge/ui/webui/pages.py +++ b/deluge/ui/webui/pages.py @@ -478,6 +478,16 @@ class template_style: class pixmaps: "use the deluge-images. located in data/pixmaps" def GET(self, name): + if not name.endswith('.png'): + if name == 'paused': + name = 'inactive' + if name == 'error': + name = 'alert' + name = name + '16.png' + + if not os.path.exists(get_pixmap(name)): + name = 'dht16.png' + web.header("Content-Type", "image/png") f = open(get_pixmap(name) ,'rb') print f.read() diff --git a/deluge/ui/webui/templates/advanced/header.html b/deluge/ui/webui/templates/advanced/header.html index eba913d7f..0bab1d04b 100644 --- a/deluge/ui/webui/templates/advanced/header.html +++ b/deluge/ui/webui/templates/advanced/header.html @@ -4,12 +4,9 @@ $def with (title, active_tab=None) Deluge:$title - + - - diff --git a/deluge/ui/webui/templates/advanced/static/advanced.css b/deluge/ui/webui/templates/advanced/template_style.css similarity index 95% rename from deluge/ui/webui/templates/advanced/static/advanced.css rename to deluge/ui/webui/templates/advanced/template_style.css index f94c64068..7c1aa8f47 100644 --- a/deluge/ui/webui/templates/advanced/static/advanced.css +++ b/deluge/ui/webui/templates/advanced/template_style.css @@ -1,4 +1,6 @@ -/* ----------------------------------------------------------- Theme Name: Simple Theme URI: http://deluge-torrent.org Description: Deluge Theme Version: 1.0 ----------------------------------------------------------- */ BODY { background: #304663 url(../../static/images/simple_bg.jpg) repeat-x; font-family: Bitstream Vera,Verdana; font-size: 10pt; margin: 0; +$def with (style) +/* dirty css. +*/ BODY { background: #304663 url(../../static/images/simple_bg.jpg) repeat-x; font-family: Bitstream Vera,Verdana; font-size: 10pt; margin: 0; padding:0; border:0; } /* GENERIC STYLES */ a img {border: 0px} hr {color: #627082; margin: 15px 0 15px 0;} td {font-family: Bitstream Vera,Verdana;} diff --git a/deluge/ui/webui/templates/advanced/torrent_info_inner.html b/deluge/ui/webui/templates/advanced/torrent_info_inner.html index 91f28b508..3054e8508 100644 --- a/deluge/ui/webui/templates/advanced/torrent_info_inner.html +++ b/deluge/ui/webui/templates/advanced/torrent_info_inner.html @@ -3,7 +3,7 @@ $def with (torrent, active_tab) Deluge:$torrent.name - + diff --git a/deluge/ui/webui/templates/white/footer.html b/deluge/ui/webui/templates/white/footer.html new file mode 100644 index 000000000..9943ff0f8 --- /dev/null +++ b/deluge/ui/webui/templates/white/footer.html @@ -0,0 +1,3 @@ + + + diff --git a/deluge/ui/webui/templates/white/header.html b/deluge/ui/webui/templates/white/header.html index 281fa0093..7fc35594e 100644 --- a/deluge/ui/webui/templates/white/header.html +++ b/deluge/ui/webui/templates/white/header.html @@ -41,6 +41,6 @@ $for id, title, url in admin_pages: $:part_stats() - +
diff --git a/deluge/ui/webui/templates/white/index.html b/deluge/ui/webui/templates/white/index.html index 0767c04b8..443e31004 100644 --- a/deluge/ui/webui/templates/white/index.html +++ b/deluge/ui/webui/templates/white/index.html @@ -27,31 +27,33 @@ $def with (torrent_list, organize_filters) $:part_stats() - +
-
+ $if organize_filters: $:render.part_organize(organize_filters) -
- + + +
$:render.part_toolbar()
$:render.part_torrent_list(torrent_list, organize_filters) + +
+ + +
- - - -