summaryrefslogtreecommitdiffstats
path: root/module/web
diff options
context:
space:
mode:
Diffstat (limited to 'module/web')
-rw-r--r--module/web/json_app.py2
-rw-r--r--module/web/media/default/css/log.css3
-rw-r--r--module/web/media/js/settings.coffee2
-rw-r--r--module/web/pyload_app.py1
-rw-r--r--module/web/templates/default/admin.html2
-rw-r--r--module/web/templates/default/downloads.html2
-rw-r--r--module/web/templates/default/filemanager_ui.js22
-rw-r--r--module/web/templates/default/home.html28
-rw-r--r--module/web/templates/default/login.html2
-rw-r--r--module/web/templates/default/pathchooser.html4
-rw-r--r--module/web/templates/default/queue.html2
-rw-r--r--module/web/templates/default/settings.html2
12 files changed, 35 insertions, 37 deletions
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 %}
-
+
<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/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 @@
</ul>
</li>
{% endfor %}
-
+
{% for file in files.files %}
<li> <a href='get/{{ file|escape }}'>{{ file }}</a></li>
{% 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({
</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/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 @@
</div>
<br>
-
+
{% 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();
-
+
}
</script>
<link rel="stylesheet" type="text/css" href="/media/default/css/pathchooser.css"/>
@@ -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/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(){
<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="/media/default/img/folder.png" style="cursor: move; margin-bottom: -2px">
<span class="name">{{package.name}}</span>
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 @@
<td>
<span style="padding:5px">{{ plugin }}</span>
</td>
-
+
<td><label for="{{plugin}}|password;{{account.login}}"
style="color:#424242;">{{ account.login }}</label></td>
<td>
generated by cgit v1.2.3 (git 2.25.1) at 2025-01-27 18:05:01 +0100