diff options
Diffstat (limited to 'module/webui/themes/flat')
16 files changed, 36 insertions, 36 deletions
diff --git a/module/webui/themes/flat/css/log.css b/module/webui/themes/flat/css/log.css index 73786bfb4..af2ea4fe8 100644 --- a/module/webui/themes/flat/css/log.css +++ b/module/webui/themes/flat/css/log.css @@ -26,7 +26,7 @@ html, body, #content } .logtable { - + margin: 0px; } .logtable td @@ -34,7 +34,7 @@ html, body, #content border: none; white-space: nowrap; - + font-family: monospace; font-size: 16px; margin: 0px; diff --git a/module/webui/themes/flat/img/dialog-close.png b/module/webui/themes/flat/img/dialog-close.png Binary files differdeleted file mode 100644 index 81ebb88b2..000000000 --- a/module/webui/themes/flat/img/dialog-close.png +++ /dev/null diff --git a/module/webui/themes/flat/img/dialog-error.png b/module/webui/themes/flat/img/dialog-error.png Binary files differdeleted file mode 100644 index d70328403..000000000 --- a/module/webui/themes/flat/img/dialog-error.png +++ /dev/null diff --git a/module/webui/themes/flat/img/dialog-question.png b/module/webui/themes/flat/img/dialog-question.png Binary files differdeleted file mode 100644 index b0af3db5b..000000000 --- a/module/webui/themes/flat/img/dialog-question.png +++ /dev/null diff --git a/module/webui/themes/flat/img/dialog-warning.png b/module/webui/themes/flat/img/dialog-warning.png Binary files differdeleted file mode 100644 index aad64d4be..000000000 --- a/module/webui/themes/flat/img/dialog-warning.png +++ /dev/null diff --git a/module/webui/themes/flat/img/pyload-logo-edited3.5-new-font-small.png b/module/webui/themes/flat/img/pyload-logo.png Binary files differindex 2443cd8b1..2443cd8b1 100644 --- a/module/webui/themes/flat/img/pyload-logo-edited3.5-new-font-small.png +++ b/module/webui/themes/flat/img/pyload-logo.png diff --git a/module/webui/themes/flat/tml/admin.html b/module/webui/themes/flat/tml/admin.html index 882cd5a4e..8548cac3f 100644 --- a/module/webui/themes/flat/tml/admin.html +++ b/module/webui/themes/flat/tml/admin.html @@ -9,7 +9,7 @@ {% block subtitle %}{{ _("Administrate") }}{% endblock %} {% block content %} - + <a href="#" id="quit-pyload" style="font-size: large; font-weight: bold;">{{_("Quit pyLoad")}}</a> | <a href="#" id="restart-pyload" style="font-size: large; font-weight: bold;">{{_("Restart pyLoad")}}</a> <br> diff --git a/module/webui/themes/flat/tml/base.html b/module/webui/themes/flat/tml/base.html index 9f6a934fb..5dc601b88 100644 --- a/module/webui/themes/flat/tml/base.html +++ b/module/webui/themes/flat/tml/base.html @@ -5,14 +5,14 @@ <head> <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/> -<link rel="stylesheet" type="text/css" href="/flat/css/default.css"/> -<link rel="stylesheet" type="text/css" href="/flat/css/window.css"/> -<link rel="stylesheet" type="text/css" href="/flat/css/MooDialog.css"/> +<link rel="stylesheet" type="text/css" href="/flat/css/default.min.css"/> +<link rel="stylesheet" type="text/css" href="/flat/css/window.min.css"/> +<link rel="stylesheet" type="text/css" href="/flat/css/MooDialog/MooDialog.min.css"/> -<script type="text/javascript" src="/default/js/mootools-core.min.js"></script> -<script type="text/javascript" src="/default/js/mootools-more.min.js"></script> -<script type="text/javascript" src="/default/js/MooDialog.min.static.js"></script> -<script type="text/javascript" src="/default/js/purr.min.static.js"></script> +<script type="text/javascript" src="/default/js/static/mootools-core.min.js"></script> +<script type="text/javascript" src="/default/js/static/mootools-more.min.js"></script> +<script type="text/javascript" src="/default/js/static/MooDialog.min.js"></script> +<script type="text/javascript" src="/default/js/static/purr.min.js"></script> <script type="text/javascript" src="/default/js/base.min.js"></script> @@ -68,7 +68,7 @@ {% endblock %} </div> - <a href="/"><img id="head-logo" src="/flat/img/pyload-logo-edited3.5-new-font-small.png" alt="pyLoad" /></a> + <a href="/"><img id="head-logo" src="/flat/img/pyload-logo.png" alt="pyLoad" /></a> <div id="head-menu"> <ul> diff --git a/module/webui/themes/flat/tml/downloads.html b/module/webui/themes/flat/tml/downloads.html index be56b4915..445f8da37 100644 --- a/module/webui/themes/flat/tml/downloads.html +++ b/module/webui/themes/flat/tml/downloads.html @@ -19,7 +19,7 @@ </ul> </li> {% endfor %} - + {% for file in files.files %} <li> <a href='get/{{ file|escape }}'>{{ file }}</a></li> {% endfor %} diff --git a/module/webui/themes/flat/tml/home.html b/module/webui/themes/flat/tml/home.html index 377fc1359..052e0daca 100644 --- a/module/webui/themes/flat/tml/home.html +++ b/module/webui/themes/flat/tml/home.html @@ -29,12 +29,12 @@ var EntryManager = new Class({ {{ link.id }}, {% endif %} {% endfor %}]; - + this.entries = []; this.container = $('LinksAktiv'); - + this.parseFromContent(); - + this.json.startTimer(); }, parseFromContent: function(){ @@ -45,12 +45,12 @@ var EntryManager = new Class({ }, this); }, update: function(data){ - + try{ this.ids = this.entries.map(function(item){ return item.fid }); - + this.ids.filter(function(id){ return !this.ids.contains(id) },data).each(function(id){ @@ -59,13 +59,13 @@ var EntryManager = new Class({ this.entries = this.entries.filter(function(item){return item.fid != this},id); this.ids = this.ids.erase(id) }, this); - + data.links.each(function(link, i){ if (this.ids.contains(link.fid)){ - + var index = this.ids.indexOf(link.fid); this.entries[index].update(link) - + }else{ var entry = new LinkEntry(link.fid); entry.insert(link); @@ -74,7 +74,7 @@ var EntryManager = new Class({ this.container.adopt(entry.elements.tr,entry.elements.pgbTr); entry.fade.start('opacity', 1); entry.fadeBar.start('opacity', 1); - + } }, this) }catch(e){ @@ -150,7 +150,7 @@ var LinkEntry = new Class({ } }) }; - + this.elements.tr.adopt(this.elements.name,this.elements.status,this.elements.info,this.elements.bleft,new Element('td').adopt(this.elements.percent,this.elements.remove)); this.elements.pgbTr.adopt(new Element('td',{'colspan':5}).adopt(this.elements.pgb)); this.initEffects(); @@ -163,11 +163,11 @@ var LinkEntry = new Class({ this.bar = new Fx.Morph(this.elements.pgb, {unit: '%', duration: 5000, link: 'link', fps:30}); this.fade = new Fx.Tween(this.elements.tr); this.fadeBar = new Fx.Tween(this.elements.pgbTr); - + this.elements.remove.addEvent('click', function(){ new Request({method: 'get', url: '/json/abort_link/'+this.id}).send(); }.bind(this)); - + }, update: function(item){ this.elements.name.set('text', item.name); @@ -242,7 +242,7 @@ var LinkEntry = new Class({ </tr> </thead> <tbody id="LinksAktiv"> - + {% for link in content %} <tr id="link_{{ link.id }}"> <td id="link_{{ link.id }}_name">{{ link.name }}</td> @@ -260,7 +260,7 @@ var LinkEntry = new Class({ </td> </tr> {% endfor %} - + </tbody> </table> {% endblock %}
\ No newline at end of file diff --git a/module/webui/themes/flat/tml/info.html b/module/webui/themes/flat/tml/info.html index 5ff9bc804..26b46736d 100644 --- a/module/webui/themes/flat/tml/info.html +++ b/module/webui/themes/flat/tml/info.html @@ -4,7 +4,7 @@ <script type="text/javascript"> window.addEvent("domready", function() { var ul = new Element('ul#twitter_update_list'); - var script1 = new Element('script[src=http://twitter.com/javascripts/blogger.js][type=text/javascript]'); + var script1 = new Element('script[src=http://twitter.com/javascripts/blogger.min.js][type=text/javascript]'); var script2 = new Element('script[src=http://twitter.com/statuses/user_timeline/pyLoad.json?callback=twitterCallback2&count=6][type=text/javascript]'); $("twitter").adopt(ul, script1, script2); }); diff --git a/module/webui/themes/flat/tml/login.html b/module/webui/themes/flat/tml/login.html index de6c152d3..a7ef3c7c4 100644 --- a/module/webui/themes/flat/tml/login.html +++ b/module/webui/themes/flat/tml/login.html @@ -32,5 +32,5 @@ </div> <br> - + {% endblock %} diff --git a/module/webui/themes/flat/tml/logs.html b/module/webui/themes/flat/tml/logs.html index 24f2e3bb3..87e5a0f30 100644 --- a/module/webui/themes/flat/tml/logs.html +++ b/module/webui/themes/flat/tml/logs.html @@ -3,7 +3,7 @@ {% block title %}{{_("Logs")}} - {{super()}} {% endblock %} {% block subtitle %}{{_("Logs")}}{% endblock %} {% block head %} -<link rel="stylesheet" type="text/css" href="/flat/css/log.css"/> +<link rel="stylesheet" type="text/css" href="/flat/css/log.min.css"/> {% endblock %} {% block content %} diff --git a/module/webui/themes/flat/tml/pathchooser.html b/module/webui/themes/flat/tml/pathchooser.html index b19eb582f..95a1a3be5 100644 --- a/module/webui/themes/flat/tml/pathchooser.html +++ b/module/webui/themes/flat/tml/pathchooser.html @@ -22,10 +22,10 @@ { document.forms[0].p.value = file; setValid(); - + } </script> - <link rel="stylesheet" type="text/css" href="/flat/css/pathchooser.css"/> + <link rel="stylesheet" type="text/css" href="/flat/css/pathchooser.min.css"/> </head> <body{% if type == 'file' %}{% if not oldfile %} onload="setInvalid();"{% endif %}{% endif %}> <center> @@ -34,7 +34,7 @@ <input type="text" name="p" value="{{ oldfile|default(cwd) }}" size="60" onfocus="setValid();"> <input type="submit" value="Ok" name="send"> </form> - + {% if type == 'folder' %} <span class="path_abs_rel">{{_("Path")}}: <a href="{{ "/pathchooser" + cwd|path_make_absolute|quotepath }}"{% if absolute %} style="text-decoration: underline;"{% endif %}>{{_("absolute")}}</a> | <a href="{{ "/pathchooser/" + cwd|path_make_relative|quotepath }}"{% if not absolute %} style="text-decoration: underline;"{% endif %}>{{_("relative")}}</a></span> {% else %} diff --git a/module/webui/themes/flat/tml/queue.html b/module/webui/themes/flat/tml/queue.html index 31e8fef49..d7af22314 100644 --- a/module/webui/themes/flat/tml/queue.html +++ b/module/webui/themes/flat/tml/queue.html @@ -35,7 +35,7 @@ document.addEvent("domready", function(){ <li> <div id="package_{{package.pid}}" class="package"> <div class="order" style="display: none;">{{ package.order }}</div> - + <div class="packagename" style="cursor: pointer"> <img class="package_drag" src="/flat/img/folder.png" style="cursor: move; margin-bottom: -2px"> <span class="name">{{package.name}}</span> diff --git a/module/webui/themes/flat/tml/settings.html b/module/webui/themes/flat/tml/settings.html index 469947399..15615e9f0 100644 --- a/module/webui/themes/flat/tml/settings.html +++ b/module/webui/themes/flat/tml/settings.html @@ -4,8 +4,8 @@ {% block subtitle %}{{ _("Config") }}{% endblock %} {% block head %} - <script type="text/javascript" src="/default/js/tinytab.min.static.js"></script> - <script type="text/javascript" src="/default/js/MooDropMenu.min.static.js"></script> + <script type="text/javascript" src="/default/js/static/tinytab.min.js"></script> + <script type="text/javascript" src="/default/js/static/MooDropMenu.min.js"></script> <script type="text/javascript" src="/default/js/settings.min.js"></script> {% endblock %} @@ -107,7 +107,7 @@ <td> <span style="padding:5px">{{ plugin }}</span> </td> - + <td><label for="{{plugin}}|password;{{account.login}}" style="color:#424242;">{{ account.login }}</label></td> <td> |
