From b1fffc3a1b2dbbb807213b85f538e59251b9bf35 Mon Sep 17 00:00:00 2001 From: Walter Purcaro Date: Fri, 28 Mar 2014 22:32:14 +0100 Subject: Remove bad whitespaces Merged vuolter/pyload@00288e6 --- module/web/json_app.py | 2 +- module/web/media/default/css/log.css | 3 +-- module/web/media/js/settings.coffee | 2 +- module/web/pyload_app.py | 1 - module/web/templates/default/admin.html | 2 +- module/web/templates/default/downloads.html | 2 +- module/web/templates/default/filemanager_ui.js | 22 ++++++++++---------- module/web/templates/default/home.html | 28 +++++++++++++------------- module/web/templates/default/login.html | 2 +- module/web/templates/default/pathchooser.html | 4 ++-- module/web/templates/default/queue.html | 2 +- module/web/templates/default/settings.html | 2 +- 12 files changed, 35 insertions(+), 37 deletions(-) (limited to 'module/web') diff --git a/module/web/json_app.py b/module/web/json_app.py index f3626405c..792fa8fe0 100644 --- a/module/web/json_app.py +++ b/module/web/json_app.py @@ -284,7 +284,7 @@ def update_accounts(): for name, value in request.POST.iteritems(): value = value.strip() if not value: continue - + tmp, user = name.split(";") plugin, action = tmp.split("|") diff --git a/module/web/media/default/css/log.css b/module/web/media/default/css/log.css index 73786bfb4..27ed7a8ad 100644 --- a/module/web/media/default/css/log.css +++ b/module/web/media/default/css/log.css @@ -26,7 +26,7 @@ html, body, #content } .logtable { - + margin: 0px; } .logtable td @@ -34,7 +34,6 @@ html, body, #content border: none; white-space: nowrap; - font-family: monospace; font-size: 16px; margin: 0px; diff --git a/module/web/media/js/settings.coffee b/module/web/media/js/settings.coffee index 9205233e3..0fc908d46 100644 --- a/module/web/media/js/settings.coffee +++ b/module/web/media/js/settings.coffee @@ -91,7 +91,7 @@ class SettingsUI form.send() e.stop() - + submitAccounts: (e) -> form = $ "account_form" form.set "send", { diff --git a/module/web/pyload_app.py b/module/web/pyload_app.py index df4a4b3d4..671fd5000 100644 --- a/module/web/pyload_app.py +++ b/module/web/pyload_app.py @@ -492,7 +492,6 @@ def admin(): for perm in perms: user[name]["perms"][perm] = False - for perm in request.POST.getall("%s|perms" % name): user[name]["perms"][perm] = True diff --git a/module/web/templates/default/admin.html b/module/web/templates/default/admin.html index b049411fd..cd35275e0 100644 --- a/module/web/templates/default/admin.html +++ b/module/web/templates/default/admin.html @@ -9,7 +9,7 @@ {% block subtitle %}{{ _("Administrate") }}{% endblock %} {% block content %} - + {{_("Quit pyLoad")}} | {{_("Restart pyLoad")}}
diff --git a/module/web/templates/default/downloads.html b/module/web/templates/default/downloads.html index 450b8a102..20ff9a120 100644 --- a/module/web/templates/default/downloads.html +++ b/module/web/templates/default/downloads.html @@ -19,7 +19,7 @@ {% endfor %} - + {% for file in files.files %}
  • {{ file }}
    • {% endfor %} diff --git a/module/web/templates/default/filemanager_ui.js b/module/web/templates/default/filemanager_ui.js index ed64ab69d..be2f51e13 100644 --- a/module/web/templates/default/filemanager_ui.js +++ b/module/web/templates/default/filemanager_ui.js @@ -12,7 +12,7 @@ document.addEvent("domready", function() { $('delete_reset').addEvent('click', function() { hide_confirm_box() }); - + /*$('filemanager_actions_list').getChildren("li").each(function(action) { var action_name = action.className; if(functions[action.className] != undefined) @@ -108,7 +108,7 @@ var Item = new Class({ this.actions["rename"] = this.rename; this.actions["mkdir"] = this.mkdir; this.parseElement(); - + var pname = this.ele.getElements("span")[0]; this.buttons = new Fx.Tween(this.ele.getElements(".buttons")[0], {link: "cancel"}); this.buttons.set("opacity", 0); @@ -151,7 +151,7 @@ var Item = new Class({ reorderElements: function() { //TODO sort the main ul again (to keep data ordered after renaming something) }, - + del: function(event) { $("confirm_form").removeEvents("submit"); $("confirm_form").addEvent("submit", this.deleteDirectory.bind(this)); @@ -161,7 +161,7 @@ var Item = new Class({ show_confirm_box(); event.stop(); }, - + deleteDirectory: function(event) { hide_confirm_box(); new Request.JSON({ @@ -180,7 +180,7 @@ var Item = new Class({ var div = new Element("div", { 'html': '{{ _("Folder is empty") }}' }); div.replaces(ul); } - + indicateSuccess(); } else { @@ -193,7 +193,7 @@ var Item = new Class({ event.stop(); }, - + rename: function(event) { $("rename_form").removeEvents("submit"); $("rename_form").addEvent("submit", this.renameDirectory.bind(this)); @@ -201,7 +201,7 @@ var Item = new Class({ $("path").set("value", this.path); $("old_name").set("value", this.name); $("new_name").set("value", this.name); - + show_rename_box(); event.stop(); }, @@ -229,7 +229,7 @@ var Item = new Class({ event.stop(); }, - + mkdir: function(event) { new Request.JSON({ method: 'POST', @@ -249,7 +249,7 @@ var Item = new Class({ { //remove the "Folder Empty" div this.ele.getChildren('div').dispose(); - + //create new ul to contain subfolder ul = new Element("ul"); ul.inject(this.ele, 'bottom'); @@ -270,10 +270,10 @@ var Item = new Class({ }.bind(this), onFailure: indicateFail }).send(); - + event.stop(); }, - + toggle: function() { var child = this.ele.getElement('ul'); if(child == null) diff --git a/module/web/templates/default/home.html b/module/web/templates/default/home.html index 7359e326c..ddba9077b 100644 --- a/module/web/templates/default/home.html +++ b/module/web/templates/default/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/web/templates/default/login.html b/module/web/templates/default/login.html index 9e91ad309..0cbc5c1ad 100644 --- a/module/web/templates/default/login.html +++ b/module/web/templates/default/login.html @@ -32,5 +32,5 @@
    - + {% endblock %} diff --git a/module/web/templates/default/pathchooser.html b/module/web/templates/default/pathchooser.html index d00637055..1467fe926 100644 --- a/module/web/templates/default/pathchooser.html +++ b/module/web/templates/default/pathchooser.html @@ -22,7 +22,7 @@ { document.forms[0].p.value = file; setValid(); - + } @@ -34,7 +34,7 @@ - + {% if type == 'folder' %} {{_("Path")}}: {{_("absolute")}} | {{_("relative")}} {% else %} diff --git a/module/web/templates/default/queue.html b/module/web/templates/default/queue.html index 046abbe49..fff3d9ce9 100644 --- a/module/web/templates/default/queue.html +++ b/module/web/templates/default/queue.html @@ -35,7 +35,7 @@ document.addEvent("domready", function(){
  • - +
    {{package.name}} diff --git a/module/web/templates/default/settings.html b/module/web/templates/default/settings.html index a4443025a..8f084c352 100644 --- a/module/web/templates/default/settings.html +++ b/module/web/templates/default/settings.html @@ -107,7 +107,7 @@ {{ plugin }} - + -- cgit v1.2.3