From 03be7a6d8fff91e9c3a654de200456e93b306fac Mon Sep 17 00:00:00 2001 From: Martijn Voncken Date: Fri, 11 Jul 2008 19:22:52 +0000 Subject: [PATCH] remove advanced template, rename deluge to classic --- deluge/ui/webui/render.py | 3 +- .../ui/webui/templates/advanced/header.html | 25 -- deluge/ui/webui/templates/advanced/index.html | 43 --- deluge/ui/webui/templates/advanced/meta.cfg | 10 - .../advanced/static/scrolling_table.css | 106 ----- .../templates/advanced/template_style.css | 365 ------------------ deluge/ui/webui/templates/ajax_demo/meta.cfg | 2 +- .../templates/{deluge => classic}/about.html | 0 .../{deluge => classic}/admin_toolbar.html | 0 .../templates/{deluge => classic}/authors.txt | 0 .../templates/{deluge => classic}/config.html | 0 .../{deluge => classic}/connect.html | 0 .../templates/{deluge => classic}/error.html | 0 .../templates/{deluge => classic}/footer.html | 0 .../templates/{deluge => classic}/header.html | 0 .../templates/{deluge => classic}/index.html | 0 .../templates/{deluge => classic}/login.html | 0 .../templates/{deluge => classic}/meta.cfg | 0 .../{deluge => classic}/part_button.html | 0 .../{deluge => classic}/part_organize.html | 0 .../{deluge => classic}/part_stats.html | 0 .../{deluge => classic}/refresh_form.html | 0 .../{deluge => classic}/sort_column_head.html | 0 .../{deluge => classic}/tab_details.html | 0 .../{deluge => classic}/tab_files.html | 0 .../{deluge => classic}/tab_options.html | 0 .../{deluge => classic}/tab_peers.html | 0 .../{deluge => classic}/tab_statistics.html | 0 .../{deluge => classic}/tab_trackers.html | 0 .../{deluge => classic}/torrent_add.html | 0 .../{deluge => classic}/torrent_delete.html | 0 .../{deluge => classic}/torrent_files.html | 0 .../{deluge => classic}/torrent_info.html | 0 .../{deluge => classic}/torrent_move.html | 0 deluge/ui/webui/templates/white/meta.cfg | 2 +- .../part_auto_refresh.html | 0 .../{advanced => white}/part_stats.html | 0 .../{advanced => white}/part_tab_button.html | 0 .../{advanced => white}/part_tb_button.html | 0 .../{advanced => white}/part_toolbar.html | 0 .../part_torrent_list.html | 0 .../torrent_info_inner.html | 0 42 files changed, 4 insertions(+), 552 deletions(-) delete mode 100644 deluge/ui/webui/templates/advanced/header.html delete mode 100644 deluge/ui/webui/templates/advanced/index.html delete mode 100644 deluge/ui/webui/templates/advanced/meta.cfg delete mode 100644 deluge/ui/webui/templates/advanced/static/scrolling_table.css delete mode 100644 deluge/ui/webui/templates/advanced/template_style.css rename deluge/ui/webui/templates/{deluge => classic}/about.html (100%) rename deluge/ui/webui/templates/{deluge => classic}/admin_toolbar.html (100%) rename deluge/ui/webui/templates/{deluge => classic}/authors.txt (100%) rename deluge/ui/webui/templates/{deluge => classic}/config.html (100%) rename deluge/ui/webui/templates/{deluge => classic}/connect.html (100%) rename deluge/ui/webui/templates/{deluge => classic}/error.html (100%) rename deluge/ui/webui/templates/{deluge => classic}/footer.html (100%) rename deluge/ui/webui/templates/{deluge => classic}/header.html (100%) rename deluge/ui/webui/templates/{deluge => classic}/index.html (100%) rename deluge/ui/webui/templates/{deluge => classic}/login.html (100%) rename deluge/ui/webui/templates/{deluge => classic}/meta.cfg (100%) rename deluge/ui/webui/templates/{deluge => classic}/part_button.html (100%) rename deluge/ui/webui/templates/{deluge => classic}/part_organize.html (100%) rename deluge/ui/webui/templates/{deluge => classic}/part_stats.html (100%) rename deluge/ui/webui/templates/{deluge => classic}/refresh_form.html (100%) rename deluge/ui/webui/templates/{deluge => classic}/sort_column_head.html (100%) rename deluge/ui/webui/templates/{deluge => classic}/tab_details.html (100%) rename deluge/ui/webui/templates/{deluge => classic}/tab_files.html (100%) rename deluge/ui/webui/templates/{deluge => classic}/tab_options.html (100%) rename deluge/ui/webui/templates/{deluge => classic}/tab_peers.html (100%) rename deluge/ui/webui/templates/{deluge => classic}/tab_statistics.html (100%) rename deluge/ui/webui/templates/{deluge => classic}/tab_trackers.html (100%) rename deluge/ui/webui/templates/{deluge => classic}/torrent_add.html (100%) rename deluge/ui/webui/templates/{deluge => classic}/torrent_delete.html (100%) rename deluge/ui/webui/templates/{deluge => classic}/torrent_files.html (100%) rename deluge/ui/webui/templates/{deluge => classic}/torrent_info.html (100%) rename deluge/ui/webui/templates/{deluge => classic}/torrent_move.html (100%) rename deluge/ui/webui/templates/{advanced => white}/part_auto_refresh.html (100%) rename deluge/ui/webui/templates/{advanced => white}/part_stats.html (100%) rename deluge/ui/webui/templates/{advanced => white}/part_tab_button.html (100%) rename deluge/ui/webui/templates/{advanced => white}/part_tb_button.html (100%) rename deluge/ui/webui/templates/{advanced => white}/part_toolbar.html (100%) rename deluge/ui/webui/templates/{advanced => white}/part_torrent_list.html (100%) rename deluge/ui/webui/templates/{advanced => white}/torrent_info_inner.html (100%) diff --git a/deluge/ui/webui/render.py b/deluge/ui/webui/render.py index 610157891..aec76c9de 100644 --- a/deluge/ui/webui/render.py +++ b/deluge/ui/webui/render.py @@ -87,7 +87,8 @@ class subclassed_render(object): if hasattr(renderer, attr): self.template_cache[attr] = getattr(renderer, attr) return getattr(renderer, attr) - raise AttributeError, 'no template named "%s" in base path "%s"' % (attr, self.webui_path) + raise AttributeError, 'no template named "%s" in template-dirs:%s' % (attr, + [r.loc for r in self.renderers + self.plugin_renderers] ) def __getitem__(self, item): "for plugins/templates" diff --git a/deluge/ui/webui/templates/advanced/header.html b/deluge/ui/webui/templates/advanced/header.html deleted file mode 100644 index 4533bcbdb..000000000 --- a/deluge/ui/webui/templates/advanced/header.html +++ /dev/null @@ -1,25 +0,0 @@ -$def with (title, active_tab=None) - - - Deluge:$title - - - - - - - - - -
- - - - -
- -
-
diff --git a/deluge/ui/webui/templates/advanced/index.html b/deluge/ui/webui/templates/advanced/index.html deleted file mode 100644 index e42c81519..000000000 --- a/deluge/ui/webui/templates/advanced/index.html +++ /dev/null @@ -1,43 +0,0 @@ -$def with (torrent_list, organize_filters) -$:render.header(_('Torrent list')) - - -
-$:render.part_toolbar() -$if organize_filters: - $:render.part_organize(organize_filters) -
- -$:render.part_torrent_list(torrent_list, organize_filters) - -$:render.part_auto_refresh() -$:part_stats() - -
- -
- -
- - - - - -
- -
- -$:render.footer() - - diff --git a/deluge/ui/webui/templates/advanced/meta.cfg b/deluge/ui/webui/templates/advanced/meta.cfg deleted file mode 100644 index 0ceae245a..000000000 --- a/deluge/ui/webui/templates/advanced/meta.cfg +++ /dev/null @@ -1,10 +0,0 @@ -{ - 'authors':['Martijn Voncken '], - 'inherits':['deluge'], - 'comment':""" - The default template. - Uses advanced css/javascript. - You need a newer standards compliant browser. - """ -} - diff --git a/deluge/ui/webui/templates/advanced/static/scrolling_table.css b/deluge/ui/webui/templates/advanced/static/scrolling_table.css deleted file mode 100644 index b046bd9c4..000000000 --- a/deluge/ui/webui/templates/advanced/static/scrolling_table.css +++ /dev/null @@ -1,106 +0,0 @@ -/*Taken from: -http://www.imaputz.com/cssStuff/bigFourVersion.html -*/ - -/* define height and width of scrollable area. Add 16px to width for scrollbar */ -div.tableContainer { - clear: both; - /*border: 1px solid #963;*/ - height: 285px; - overflow: auto; - width: 756px; -} - -/* Reset overflow value to hidden for all non-IE browsers. */ -html>body div.tableContainer { - overflow: hidden; - width: 756px -} - -/* define width of table. IE browsers only */ -div.tableContainer table { - float: left; - width: 740px; -} - -/* define width of table. Add 16px to width for scrollbar. */ -/* All other non-IE browsers. */ -html>body div.tableContainer table { - width: 756px -} - -/* set table header to a fixed position. WinIE 6.x only */ -/* In WinIE 6.x, any element with a position property set to relative and is a child of */ -/* an element that has an overflow property set, the relative value translates into fixed. */ -/* Ex: parent element DIV with a class of tableContainer has an overflow property set to auto */ -thead.fixedHeader tr { - position: relative -} - -/* set THEAD element to have block level attributes. All other non-IE browsers */ -/* this enables overflow to work on TBODY element. All other non-IE, non-Mozilla browsers */ -html>body thead.fixedHeader tr { - display: block -} - -/* define the table content to be scrollable */ -/* set TBODY element to have block level attributes. All other non-IE browsers */ -/* this enables overflow to work on TBODY element. All other non-IE, non-Mozilla browsers */ -/* induced side effect is that child TDs no longer accept width: auto */ -html>body tbody.scrollContent { - display: block; - height: 262px; - overflow: auto; - width: 100% -} - -/* make TD elements pretty. Provide alternating classes for striping the table */ -/* http://www.alistapart.com/articles/zebratables/ */ -tbody.scrollContent td, tbody.scrollContent tr.normalRow td { - /*background: #FFF;*/ - - border-bottom: none; - border-left: none; - /*border-right: 1px solid #CCC; - border-top: 1px solid #DDD;*/ - padding: 2px 3px 3px 4px -} - -tbody.scrollContent tr.alternateRow td { - /*background: #EEE;*/ - border-bottom: none; - border-left: none; - /*border-right: 1px solid #CCC; - border-top: 1px solid #DDD;*/ - padding: 2px 3px 3px 4px -} - -/* define width of TH elements: 1st, 2nd, and 3rd respectively. */ -/* Add 16px to last TH for scrollbar padding. All other non-IE browsers. */ -/* http://www.w3.org/TR/REC-CSS2/selector.html#adjacent-selectors */ -html>body thead.fixedHeader th { - width: 200px -} - -html>body thead.fixedHeader th + th { - width: 240px -} - -html>body thead.fixedHeader th + th + th { - width: 316px -} - -/* define width of TD elements: 1st, 2nd, and 3rd respectively. */ -/* All other non-IE browsers. */ -/* http://www.w3.org/TR/REC-CSS2/selector.html#adjacent-selectors */ -html>body tbody.scrollContent td { - width: 200px -} - -html>body tbody.scrollContent td + td { - width: 240px -} - -html>body tbody.scrollContent td + td + td { - width: 300px -} \ No newline at end of file diff --git a/deluge/ui/webui/templates/advanced/template_style.css b/deluge/ui/webui/templates/advanced/template_style.css deleted file mode 100644 index 574f970fb..000000000 --- a/deluge/ui/webui/templates/advanced/template_style.css +++ /dev/null @@ -1,365 +0,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;} -tr {font-family: Bitstream Vera,Verdana;} -table {font-family: Bitstream Vera,Verdana;} div {font-family: Bitstream Vera,Verdana;} /* STRUCTURE */ #page { min-width: 800px; margin-left: auto; margin-right: auto; - margin: 0; - padding:0; - font-family: Bitstream Vera,Verdana; } #main_content { background:url(../../static/images/simple_line.jpg) repeat-x; - margin: 0; - padding:0; } #simple_logo { background:url(../../static/images/simple_logo.jpg) no-repeat; } #main { - margin: 0; - padding:0; padding-top: 6px; color: #fff; } #main form table { border: #2a425c 1px solid; } #main form table tr { border: 0px; } #main form table tr { font-size: 16px; border: 0px; - white-space: nowrap; } #main form table tr td{ border: 0px; color: #fff; font-size: 12px; white-space: nowrap; - font-family: Bitstream Vera,Verdana; } #main form table tr a { color: #8fa6c3; font-size: 16px; white-space: nowrap; } #main form table tr th a, a:active, a:visited { color: #8fa6c3; text-decoration: none; } #main form table tr th a:hover {color: #fff; text-decoration: underline;} #main form table tr td a { color: #fff; font-size: 12px; white-space: nowrap; - font-family: Bitstream Vera,Verdana; } #main form table tr td a, a:active, a:visited { color: #fff; text-decoration: none;} #main form table tr td a:hover {color: #fff; text-decoration: underline;} #main a { color: #fff; font-size: 12px; } #main a, a:active, a:visited { color: #fff; text-decoration: none;} #main a:hover {color: #fff; text-decoration: underline;} .info { text-align: right; padding: 0 50px 0 0; color: #8fa6c3; font-size: 16px; letter-spacing: 4px; font-weight: bold; } .title { color: #dce4ee; font-size: 32px; padding: 10px 50px 0 0; text-align: right; } .title a, a:active, a:visited { color: #dce4ee; text-decoration: none;} .title a:hover {color: #fff; text-decoration: underline;} /*DISABLED! -input{ - background-color: #37506f; - border:1px solid #68a; - background: #99acc3; - color: #000; - -moz-border-radius:5px; } - -input:hover { - background-color:#68a; -} TEXTAREA{ border:1px solid #23344b; background: #99acc3; width:480px; } */ .footertext a { color: #c0c0c0; text-decoration:none;} .footertext a:visited { color: #c0c0c0; text-decoration:none;} .footertext a:active { color: #c0c0c0; text-decoration:none;} .footertext a:hover {color: #fff; text-decoration: underline;} .footertext { text-align: center; padding: 60px 0 0 0; font-size: 8pt; left: -100px; font-family: Bitstream Vera,Verdana; color: #fff; position: relative; } .clearfix:after { content: "."; display: block; height: 0; clear: both; visibility: hidden; } div.progress_bar{ background-color:#4573a5; overflow:visible; - white-space: nowrap; -moz-border-radius:5px; /*ff only setting*/ } - -div.progress_bar_outer { /*used in table-view*/ - width:150px; -} - td.progress_bar { white-space: nowrap; } td.info_label { font-weight: bold; } td { font-size: 10pt; color: #d1dae5; white-space: nowrap; } tr { font-size: 10pt; color: #d1dae5; } - -div.panel { - padding:10px; - width:750px; - background-color: #37506f; - -moz-border-radius:10px; /*ff-only!*/ - margin-top:10px; - margin-bottom:10px; -} - - -/*New styles:*/ - -div.deluge_button { - display:inline; -} -form.deluge_button { - display:inline; -} -button.deluge_button { - background-color: #37506f; - border:1px solid #68a; - - background: #99acc3; - color: #000; - vertical-align:middle; - -moz-border-radius:7px; -} -button.deluge_button:hover { - background-color:#68a; -} -div.error { - background-color:#FFFFFF; - color:#AA0000; - font-weight:bold; - -moz-border-radius:10px; - width:200px; - margin-bottom:20px; - padding:10px; - -} - -#torrent_table tr:hover { - background-color:#68a; -} - -tr.altrow0:hover { - background-color:#68a; -} -tr.altrow1:hover { - background-color:#68a; -} - -tr.altrow1{ - background-color: #37506f; -} - -tr.tab_altrow0{ - background-color: #304663; -} - -tr.tab_altrow1{ - background-color: #37506f; -} - - - -tr.torrent_table_selected { - background-color:#900; -} - -th.torrent_table:hover { - background-color:#68a; -} -th.torrent_table { - background-color: #37506f; -} - -img.button { - margin-bottom:0px; - padding:0px; - position:relative; - top:2px; -} - -body.inner { - background:none; -} - -#stats_panel { - -moz-border-radius:0px; - width:100%; - position:fixed; - bottom:0px; - left:0px; - background-color:#304663; - margin: 0; - padding:0; - text-align:left; - height:20px; - background-color:#ddd; - color:#000; - border-style:solid; - border:0; - border-top:1px; - border-color:#000; -} - -#about { - position:fixed; - bottom:0px; - right:10px; -} - -#info_panel_div2 { - position:fixed; - bottom:10px; - right:0px; - width:100%; - background-color:#304663; -} - -#refresh_panel { - -moz-border-radius:0px; - width:500px; - position:fixed; - bottom:0px; - right:0px; - background-color:#304663; - margin: 0; - padding:0; - text-align:right; - height:20px; - background-color:#ddd; - color:#000; - z-index:999; -} - -#refresh_panel a { - color:0000FF; - text-decoration:none; -} - -#refresh_panel a:visited { - color:0000FF; -} - -#refresh_panel a:hover { - color:0000FF; -} - -#stats_panel button { - background-color:#304663; - color:#FFFFFF; - border:0; - position:relative; - top:-2px; - height:15px; - background-color:#ddd; - color:#00F; -} -#stats_panel button:hover { - text-decoration: underline; -} -#stats_panel img{ - position:relative; - top:3px; - margin-right:3px; -} - - -#category_panel { - margin-bottom:0; - padding-bottom:0; - -moz-border-radius-bottomleft:0px; - -moz-border-radius-bottomright:0px; - padding-right:32px; -} - -#toolbar { - text-align:left; - margin-top:0; - padding-top:0; - margin-bottom: 30px; - -moz-border-radius-topleft:0px; - -moz-border-radius-topright:0px; - padding-top:5px; - padding-bottom:5px; - margin-bottom: 15px; - padding-left:32px; - height:20px; -} - -/* -#toolbar select{ - border:1px solid #68a; - border:0; - background-color: #37506f; - color: #FFF; -} -#toolbar select:hover{ - background-color:#68a; -} -*/ -a.toolbar_btn { - width:20px; - height:20px; - padding-left:3px; - padding-top:7px; - padding-right:3px; - text-decoration: none; - margin-bottom:3px; -} -a.toolbar_btn:hover { - background-color:#68a; - -moz-border-radius:5px; - text-decoration: none; -} - - -#toolbar_refresh { - margin:0; - border:0; - background-color:none; - padding-left:2px; - padding-top:2px; - padding-right:2px; - text-decoration: none; - background-color: #37506f; - position:relative; - top:5px; -} -#toolbar_refresh:hover { - background-color:#68a; - -moz-border-radius:5px; - text-decoration: none; -} -#category_form{ - display:inline; - position:relative; - top:-3px; - padding-left:20px; -} - - -form { /*all forms!*/ - margin:0; - padding:0; - border:0; -} - -#config_chooser { - margin-left:20px; - float: left; - width:150px; - text-align:left; - height:none; -} - -#config_chooser ul { - list-style-type: none; -} - - -#config_chooser li:hover { - background-color:#68a; -} - -#config_chooser li.selected { - background-color:#900; -} - -#config_panel { - height:none; - float:left; - width:500px; - margin-left:20px; -} -#config_panel th { - font-size: 12px; - text-align:right; - color:#FFFFFF; -} - -#config_panel table { - background-color:none; -} - -ul.errorlist { - display:hidden; -} - - -#torrent_list { - -moz-border-radius:7px; -} - -th.newforms { - font-size: 12px; - text-align:right; - color:#FFFFFF; -} - -a.tab_button { - color:#FFFFFF; - text-decoration:none; -} -a.tab_button:visited { - color:#FFFFFF; -} -a.tab_button:hover { - background-color:#68a; -} - -a.tab_button_active { - background-color:#900; - text-decoration:none; - color:#FFFFFF; -} -a.tab_button_active:visited { - background-color:#900; - color:#FFFFFF; -} - -h3 { - background-color:#68a; - text-align:left; -} - /* Hides from IE-mac \*/ * html .clearfix {height: 1%;} .clearfix {display: block;} /* End hide from IE-mac */ - - diff --git a/deluge/ui/webui/templates/ajax_demo/meta.cfg b/deluge/ui/webui/templates/ajax_demo/meta.cfg index 83408b046..fa7dfa9b2 100644 --- a/deluge/ui/webui/templates/ajax_demo/meta.cfg +++ b/deluge/ui/webui/templates/ajax_demo/meta.cfg @@ -1,6 +1,6 @@ { 'authors':['Martijn Voncken '], - 'inherits':['deluge','advanced','white'], + 'inherits':['classic', 'white'], 'comment':""" Demo template for external ajax devs. """ diff --git a/deluge/ui/webui/templates/deluge/about.html b/deluge/ui/webui/templates/classic/about.html similarity index 100% rename from deluge/ui/webui/templates/deluge/about.html rename to deluge/ui/webui/templates/classic/about.html diff --git a/deluge/ui/webui/templates/deluge/admin_toolbar.html b/deluge/ui/webui/templates/classic/admin_toolbar.html similarity index 100% rename from deluge/ui/webui/templates/deluge/admin_toolbar.html rename to deluge/ui/webui/templates/classic/admin_toolbar.html diff --git a/deluge/ui/webui/templates/deluge/authors.txt b/deluge/ui/webui/templates/classic/authors.txt similarity index 100% rename from deluge/ui/webui/templates/deluge/authors.txt rename to deluge/ui/webui/templates/classic/authors.txt diff --git a/deluge/ui/webui/templates/deluge/config.html b/deluge/ui/webui/templates/classic/config.html similarity index 100% rename from deluge/ui/webui/templates/deluge/config.html rename to deluge/ui/webui/templates/classic/config.html diff --git a/deluge/ui/webui/templates/deluge/connect.html b/deluge/ui/webui/templates/classic/connect.html similarity index 100% rename from deluge/ui/webui/templates/deluge/connect.html rename to deluge/ui/webui/templates/classic/connect.html diff --git a/deluge/ui/webui/templates/deluge/error.html b/deluge/ui/webui/templates/classic/error.html similarity index 100% rename from deluge/ui/webui/templates/deluge/error.html rename to deluge/ui/webui/templates/classic/error.html diff --git a/deluge/ui/webui/templates/deluge/footer.html b/deluge/ui/webui/templates/classic/footer.html similarity index 100% rename from deluge/ui/webui/templates/deluge/footer.html rename to deluge/ui/webui/templates/classic/footer.html diff --git a/deluge/ui/webui/templates/deluge/header.html b/deluge/ui/webui/templates/classic/header.html similarity index 100% rename from deluge/ui/webui/templates/deluge/header.html rename to deluge/ui/webui/templates/classic/header.html diff --git a/deluge/ui/webui/templates/deluge/index.html b/deluge/ui/webui/templates/classic/index.html similarity index 100% rename from deluge/ui/webui/templates/deluge/index.html rename to deluge/ui/webui/templates/classic/index.html diff --git a/deluge/ui/webui/templates/deluge/login.html b/deluge/ui/webui/templates/classic/login.html similarity index 100% rename from deluge/ui/webui/templates/deluge/login.html rename to deluge/ui/webui/templates/classic/login.html diff --git a/deluge/ui/webui/templates/deluge/meta.cfg b/deluge/ui/webui/templates/classic/meta.cfg similarity index 100% rename from deluge/ui/webui/templates/deluge/meta.cfg rename to deluge/ui/webui/templates/classic/meta.cfg diff --git a/deluge/ui/webui/templates/deluge/part_button.html b/deluge/ui/webui/templates/classic/part_button.html similarity index 100% rename from deluge/ui/webui/templates/deluge/part_button.html rename to deluge/ui/webui/templates/classic/part_button.html diff --git a/deluge/ui/webui/templates/deluge/part_organize.html b/deluge/ui/webui/templates/classic/part_organize.html similarity index 100% rename from deluge/ui/webui/templates/deluge/part_organize.html rename to deluge/ui/webui/templates/classic/part_organize.html diff --git a/deluge/ui/webui/templates/deluge/part_stats.html b/deluge/ui/webui/templates/classic/part_stats.html similarity index 100% rename from deluge/ui/webui/templates/deluge/part_stats.html rename to deluge/ui/webui/templates/classic/part_stats.html diff --git a/deluge/ui/webui/templates/deluge/refresh_form.html b/deluge/ui/webui/templates/classic/refresh_form.html similarity index 100% rename from deluge/ui/webui/templates/deluge/refresh_form.html rename to deluge/ui/webui/templates/classic/refresh_form.html diff --git a/deluge/ui/webui/templates/deluge/sort_column_head.html b/deluge/ui/webui/templates/classic/sort_column_head.html similarity index 100% rename from deluge/ui/webui/templates/deluge/sort_column_head.html rename to deluge/ui/webui/templates/classic/sort_column_head.html diff --git a/deluge/ui/webui/templates/deluge/tab_details.html b/deluge/ui/webui/templates/classic/tab_details.html similarity index 100% rename from deluge/ui/webui/templates/deluge/tab_details.html rename to deluge/ui/webui/templates/classic/tab_details.html diff --git a/deluge/ui/webui/templates/deluge/tab_files.html b/deluge/ui/webui/templates/classic/tab_files.html similarity index 100% rename from deluge/ui/webui/templates/deluge/tab_files.html rename to deluge/ui/webui/templates/classic/tab_files.html diff --git a/deluge/ui/webui/templates/deluge/tab_options.html b/deluge/ui/webui/templates/classic/tab_options.html similarity index 100% rename from deluge/ui/webui/templates/deluge/tab_options.html rename to deluge/ui/webui/templates/classic/tab_options.html diff --git a/deluge/ui/webui/templates/deluge/tab_peers.html b/deluge/ui/webui/templates/classic/tab_peers.html similarity index 100% rename from deluge/ui/webui/templates/deluge/tab_peers.html rename to deluge/ui/webui/templates/classic/tab_peers.html diff --git a/deluge/ui/webui/templates/deluge/tab_statistics.html b/deluge/ui/webui/templates/classic/tab_statistics.html similarity index 100% rename from deluge/ui/webui/templates/deluge/tab_statistics.html rename to deluge/ui/webui/templates/classic/tab_statistics.html diff --git a/deluge/ui/webui/templates/deluge/tab_trackers.html b/deluge/ui/webui/templates/classic/tab_trackers.html similarity index 100% rename from deluge/ui/webui/templates/deluge/tab_trackers.html rename to deluge/ui/webui/templates/classic/tab_trackers.html diff --git a/deluge/ui/webui/templates/deluge/torrent_add.html b/deluge/ui/webui/templates/classic/torrent_add.html similarity index 100% rename from deluge/ui/webui/templates/deluge/torrent_add.html rename to deluge/ui/webui/templates/classic/torrent_add.html diff --git a/deluge/ui/webui/templates/deluge/torrent_delete.html b/deluge/ui/webui/templates/classic/torrent_delete.html similarity index 100% rename from deluge/ui/webui/templates/deluge/torrent_delete.html rename to deluge/ui/webui/templates/classic/torrent_delete.html diff --git a/deluge/ui/webui/templates/deluge/torrent_files.html b/deluge/ui/webui/templates/classic/torrent_files.html similarity index 100% rename from deluge/ui/webui/templates/deluge/torrent_files.html rename to deluge/ui/webui/templates/classic/torrent_files.html diff --git a/deluge/ui/webui/templates/deluge/torrent_info.html b/deluge/ui/webui/templates/classic/torrent_info.html similarity index 100% rename from deluge/ui/webui/templates/deluge/torrent_info.html rename to deluge/ui/webui/templates/classic/torrent_info.html diff --git a/deluge/ui/webui/templates/deluge/torrent_move.html b/deluge/ui/webui/templates/classic/torrent_move.html similarity index 100% rename from deluge/ui/webui/templates/deluge/torrent_move.html rename to deluge/ui/webui/templates/classic/torrent_move.html diff --git a/deluge/ui/webui/templates/white/meta.cfg b/deluge/ui/webui/templates/white/meta.cfg index 3bd3a320f..50a73e48f 100644 --- a/deluge/ui/webui/templates/white/meta.cfg +++ b/deluge/ui/webui/templates/white/meta.cfg @@ -1,6 +1,6 @@ { 'authors':['Martijn Voncken '], - 'inherits':['deluge','advanced'], + 'inherits':['classic'], 'comment':""" A more conventional template. css written from scratch diff --git a/deluge/ui/webui/templates/advanced/part_auto_refresh.html b/deluge/ui/webui/templates/white/part_auto_refresh.html similarity index 100% rename from deluge/ui/webui/templates/advanced/part_auto_refresh.html rename to deluge/ui/webui/templates/white/part_auto_refresh.html diff --git a/deluge/ui/webui/templates/advanced/part_stats.html b/deluge/ui/webui/templates/white/part_stats.html similarity index 100% rename from deluge/ui/webui/templates/advanced/part_stats.html rename to deluge/ui/webui/templates/white/part_stats.html diff --git a/deluge/ui/webui/templates/advanced/part_tab_button.html b/deluge/ui/webui/templates/white/part_tab_button.html similarity index 100% rename from deluge/ui/webui/templates/advanced/part_tab_button.html rename to deluge/ui/webui/templates/white/part_tab_button.html diff --git a/deluge/ui/webui/templates/advanced/part_tb_button.html b/deluge/ui/webui/templates/white/part_tb_button.html similarity index 100% rename from deluge/ui/webui/templates/advanced/part_tb_button.html rename to deluge/ui/webui/templates/white/part_tb_button.html diff --git a/deluge/ui/webui/templates/advanced/part_toolbar.html b/deluge/ui/webui/templates/white/part_toolbar.html similarity index 100% rename from deluge/ui/webui/templates/advanced/part_toolbar.html rename to deluge/ui/webui/templates/white/part_toolbar.html diff --git a/deluge/ui/webui/templates/advanced/part_torrent_list.html b/deluge/ui/webui/templates/white/part_torrent_list.html similarity index 100% rename from deluge/ui/webui/templates/advanced/part_torrent_list.html rename to deluge/ui/webui/templates/white/part_torrent_list.html diff --git a/deluge/ui/webui/templates/advanced/torrent_info_inner.html b/deluge/ui/webui/templates/white/torrent_info_inner.html similarity index 100% rename from deluge/ui/webui/templates/advanced/torrent_info_inner.html rename to deluge/ui/webui/templates/white/torrent_info_inner.html