summaryrefslogtreecommitdiffstats
path: root/module/webui/themes/dark/tml
diff options
context:
space:
mode:
authorGravatar Walter Purcaro <vuolter@gmail.com> 2014-08-28 04:51:53 +0200
committerGravatar Walter Purcaro <vuolter@gmail.com> 2014-08-28 04:51:53 +0200
commit653d637b4ee1aa6fd112c11bf082883c3252c928 (patch)
tree644f2f253d9a9ad16eaf75a534b9f21215237fd2 /module/webui/themes/dark/tml
parentMove ServerThread and PluginThread to threads directory (diff)
downloadpyload-653d637b4ee1aa6fd112c11bf082883c3252c928.tar.xz
[webui] Improve and fix
Diffstat (limited to 'module/webui/themes/dark/tml')
-rw-r--r--module/webui/themes/dark/tml/admin.html2
-rw-r--r--module/webui/themes/dark/tml/base.html16
-rw-r--r--module/webui/themes/dark/tml/downloads.html2
-rw-r--r--module/webui/themes/dark/tml/home.html28
-rw-r--r--module/webui/themes/dark/tml/login.html2
-rw-r--r--module/webui/themes/dark/tml/logs.html2
-rw-r--r--module/webui/themes/dark/tml/pathchooser.html6
-rw-r--r--module/webui/themes/dark/tml/queue.html2
-rw-r--r--module/webui/themes/dark/tml/settings.html6
9 files changed, 33 insertions, 33 deletions
diff --git a/module/webui/themes/dark/tml/admin.html b/module/webui/themes/dark/tml/admin.html
index b9d3a8d1e..a5fc16b86 100644
--- a/module/webui/themes/dark/tml/admin.html
+++ b/module/webui/themes/dark/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/dark/tml/base.html b/module/webui/themes/dark/tml/base.html
index ebfb1ba3e..76a0c4322 100644
--- a/module/webui/themes/dark/tml/base.html
+++ b/module/webui/themes/dark/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="/dark/css/default.css"/>
-<link rel="stylesheet" type="text/css" href="/dark/css/window.css"/>
-<link rel="stylesheet" type="text/css" href="/dark/css/MooDialog.css"/>
+<link rel="stylesheet" type="text/css" href="/dark/css/default.min.css"/>
+<link rel="stylesheet" type="text/css" href="/dark/css/window.min.css"/>
+<link rel="stylesheet" type="text/css" href="/dark/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="/dark/img/pyload-logo-edited3.5-new-font-small.png" alt="pyLoad" /></a>
+ <a href="/"><img id="head-logo" src="/dark/img/pyload-logo.png" alt="pyLoad" /></a>
{% if user.is_authenticated %}
<div id="head-menu">
<ul>
diff --git a/module/webui/themes/dark/tml/downloads.html b/module/webui/themes/dark/tml/downloads.html
index 8a68d3f99..0c7fb9209 100644
--- a/module/webui/themes/dark/tml/downloads.html
+++ b/module/webui/themes/dark/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/dark/tml/home.html b/module/webui/themes/dark/tml/home.html
index 68bf387af..340a905cf 100644
--- a/module/webui/themes/dark/tml/home.html
+++ b/module/webui/themes/dark/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/dark/tml/login.html b/module/webui/themes/dark/tml/login.html
index 9ddb308df..9f5e2cb2f 100644
--- a/module/webui/themes/dark/tml/login.html
+++ b/module/webui/themes/dark/tml/login.html
@@ -33,5 +33,5 @@
</div>
<br>
-
+
{% endblock %}
diff --git a/module/webui/themes/dark/tml/logs.html b/module/webui/themes/dark/tml/logs.html
index 86983f2af..e178c6c5c 100644
--- a/module/webui/themes/dark/tml/logs.html
+++ b/module/webui/themes/dark/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="/dark/css/log.css"/>
+<link rel="stylesheet" type="text/css" href="/dark/css/log.min.css"/>
{% endblock %}
{% block content %}
diff --git a/module/webui/themes/dark/tml/pathchooser.html b/module/webui/themes/dark/tml/pathchooser.html
index a38c0614b..2b94f1019 100644
--- a/module/webui/themes/dark/tml/pathchooser.html
+++ b/module/webui/themes/dark/tml/pathchooser.html
@@ -22,10 +22,10 @@
{
document.forms[0].p.value = file;
setValid();
-
+
}
</script>
- <link rel="stylesheet" type="text/css" href="/dark/css/pathchooser.css"/>
+ <link rel="stylesheet" type="text/css" href="/dark/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/dark/tml/queue.html b/module/webui/themes/dark/tml/queue.html
index 30c621466..5159ba5f5 100644
--- a/module/webui/themes/dark/tml/queue.html
+++ b/module/webui/themes/dark/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="/dark/img/folder.png" style="cursor: move; margin-bottom: -2px">
<span class="name">{{package.name}}</span>
diff --git a/module/webui/themes/dark/tml/settings.html b/module/webui/themes/dark/tml/settings.html
index 502eb8130..d606f45ef 100644
--- a/module/webui/themes/dark/tml/settings.html
+++ b/module/webui/themes/dark/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:grey;">{{ account.login }}</label></td>
<td>