From 653d637b4ee1aa6fd112c11bf082883c3252c928 Mon Sep 17 00:00:00 2001 From: Walter Purcaro Date: Thu, 28 Aug 2014 04:51:53 +0200 Subject: [webui] Improve and fix --- module/webui/themes/dark/tml/admin.html | 2 +- module/webui/themes/dark/tml/base.html | 16 +++++++-------- module/webui/themes/dark/tml/downloads.html | 2 +- module/webui/themes/dark/tml/home.html | 28 +++++++++++++-------------- module/webui/themes/dark/tml/login.html | 2 +- module/webui/themes/dark/tml/logs.html | 2 +- module/webui/themes/dark/tml/pathchooser.html | 6 +++--- module/webui/themes/dark/tml/queue.html | 2 +- module/webui/themes/dark/tml/settings.html | 6 +++--- 9 files changed, 33 insertions(+), 33 deletions(-) (limited to 'module/webui/themes/dark/tml') 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 %} - + {{_("Quit pyLoad")}} | {{_("Restart pyLoad")}}
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 @@ - - - + + + - - - - + + + + @@ -68,7 +68,7 @@ {% endblock %} - + {% if user.is_authenticated %}
{% endfor %} - + {% for file in files.files %}
  • {{ file }}
    • {% 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({ - + {% for link in content %} {{ link.name }} @@ -260,7 +260,7 @@ var LinkEntry = new Class({ {% endfor %} - + {% 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 @@

    - + {% 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 %} - + {% 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(); - + } - +
    @@ -34,7 +34,7 @@ - + {% if type == 'folder' %} {{_("Path")}}: {{_("absolute")}} | {{_("relative")}} {% 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(){
  • - +
    {{package.name}} 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 %} - - + + {% endblock %} @@ -107,7 +107,7 @@ {{ plugin }} - + -- cgit v1.2.3