From 97ab599dd8aebd14e6f7369a59d415fdeca914bc Mon Sep 17 00:00:00 2001 From: Walter Purcaro Date: Fri, 28 Mar 2014 22:37:38 +0100 Subject: Fix EOF Merged vuolter/pyload@2635efd --- module/web/filters.py | 2 +- module/web/media/default/css/MooDialog.css | 1 - module/web/media/default/css/default.css | 2 +- module/web/media/default/css/log.css | 2 +- module/web/media/js/admin.coffee | 2 +- module/web/media/js/admin.js | 2 +- module/web/media/js/base.coffee | 2 +- module/web/media/js/base.js | 2 +- module/web/media/js/mootools-core-1.4.1.js | 2 +- module/web/media/js/mootools-more-1.4.0.1.js | 2 +- module/web/media/js/package_ui.js | 1 - module/web/media/js/purr_static.js | 2 +- module/web/media/js/settings.coffee | 2 +- module/web/media/js/settings.js | 2 +- module/web/media/js/tinytab_static.js | 2 +- module/web/middlewares.py | 2 +- module/web/servers/lighttpd_default.conf | 2 +- module/web/templates/default/captcha.html | 2 +- module/web/templates/default/downloads.html | 2 +- module/web/templates/default/folder.html | 2 +- module/web/templates/default/home.html | 2 +- module/web/templates/default/info.html | 2 +- module/web/templates/default/logout.html | 2 +- module/web/templates/default/logs.html | 2 +- module/web/templates/default/pathchooser.html | 2 +- module/web/templates/default/queue.html | 2 +- module/web/templates/default/settings.html | 2 +- module/web/templates/default/settings_item.html | 2 +- module/web/templates/default/setup.html | 2 +- module/web/templates/default/window.html | 2 +- 30 files changed, 28 insertions(+), 30 deletions(-) (limited to 'module/web') diff --git a/module/web/filters.py b/module/web/filters.py index 13b8345fc..bc253d170 100644 --- a/module/web/filters.py +++ b/module/web/filters.py @@ -59,4 +59,4 @@ def truncate(value, n): return value def date(date, format): - return date \ No newline at end of file + return date diff --git a/module/web/media/default/css/MooDialog.css b/module/web/media/default/css/MooDialog.css index 48c9166ad..c313a5292 100644 --- a/module/web/media/default/css/MooDialog.css +++ b/module/web/media/default/css/MooDialog.css @@ -89,4 +89,3 @@ .MooDialog .MooDialogError { background: url(/media/img/dialog-error.png) no-repeat; } - diff --git a/module/web/media/default/css/default.css b/module/web/media/default/css/default.css index 116f9725a..aa050fef3 100644 --- a/module/web/media/default/css/default.css +++ b/module/web/media/default/css/default.css @@ -905,4 +905,4 @@ table.system td { table.system tr > td:first-child { font-weight: bold; padding-right: 10px; -} \ No newline at end of file +} diff --git a/module/web/media/default/css/log.css b/module/web/media/default/css/log.css index 27ed7a8ad..26449b244 100644 --- a/module/web/media/default/css/log.css +++ b/module/web/media/default/css/log.css @@ -68,4 +68,4 @@ td.loglevel { text-align: center; color: red; -} \ No newline at end of file +} diff --git a/module/web/media/js/admin.coffee b/module/web/media/js/admin.coffee index 82b0dd3ec..c4ab86911 100644 --- a/module/web/media/js/admin.coffee +++ b/module/web/media/js/admin.coffee @@ -55,4 +55,4 @@ window.addEvent "domready", -> onSuccess: (data) -> alert "{{_('pyLoad restarted')}}" }).send() , -> - e.stop() \ No newline at end of file + e.stop() diff --git a/module/web/media/js/admin.js b/module/web/media/js/admin.js index d34d310a0..94a5e494d 100644 --- a/module/web/media/js/admin.js +++ b/module/web/media/js/admin.js @@ -1,3 +1,3 @@ {% autoescape true %} var root;root=this;window.addEvent("domready",function(){var f,c,b,e,a,d;root.passwordDialog=new MooDialog({destroyOnHide:false});root.passwordDialog.setContent($("password_box"));$("login_password_reset").addEvent("click",function(g){return root.passwordDialog.close()});$("login_password_button").addEvent("click",function(j){var h,i,g;i=$("login_new_password").get("value");g=$("login_new_password2").get("value");if(i===g){h=$("password_form");h.set("send",{onSuccess:function(k){return root.notify.alert("Success",{className:"success"})},onFailure:function(k){return root.notify.alert("Error",{className:"error"})}});h.send();root.passwordDialog.close()}else{alert('{{_("Passwords did not match.")}}')}return j.stop()});d=$$(".change_password");for(e=0,a=d.length;e x = e.page.x - position.x y = e.page.y - position.y $('cap_result').value = x + "," + y - submit_captcha() \ No newline at end of file + submit_captcha() diff --git a/module/web/media/js/base.js b/module/web/media/js/base.js index c68b1047a..1ba1d73f9 100644 --- a/module/web/media/js/base.js +++ b/module/web/media/js/base.js @@ -1,3 +1,3 @@ {% autoescape true %} var LoadJsonToContent,clear_captcha,humanFileSize,load_captcha,on_captcha_click,parseUri,root,set_captcha,submit_captcha;root=this;humanFileSize=function(f){var c,d,e,b;d=new Array("B","KiB","MiB","GiB","TiB","PiB");b=Math.log(f)/Math.log(1024);e=Math.floor(b);c=Math.pow(1024,e);if(f===0){return"0 B"}else{return Math.round(f*100/c)/100+" "+d[e]}};parseUri=function(){var b,c,g,e,d,f,a;b=$("add_links").value;g=new RegExp("(ht|f)tp(s?)://[a-zA-Z0-9-./?=_&%#]+[<| |\"|'|\r|\n|\t]{1}","g");d=b.match(g);if(d===null){return}e="";for(f=0,a=d.length;f';}}build+="";this.object=((container)?container.empty():new Element("div")).set("html",build).firstChild; },replaces:function(element){element=document.id(element,true);element.parentNode.replaceChild(this.toElement(),element);return this;},inject:function(element){document.id(element,true).appendChild(this.toElement()); return this;},remote:function(){return Swiff.remote.apply(Swiff,[this.toElement()].append(arguments));}});Swiff.CallBacks={};Swiff.remote=function(obj,fn){var rs=obj.CallFunction(''+__flash__argumentsToXML(arguments,2)+""); -return eval(rs);};})(); \ No newline at end of file +return eval(rs);};})(); diff --git a/module/web/media/js/mootools-more-1.4.0.1.js b/module/web/media/js/mootools-more-1.4.0.1.js index f3f8e4ee1..cf1f041be 100644 --- a/module/web/media/js/mootools-more-1.4.0.1.js +++ b/module/web/media/js/mootools-more-1.4.0.1.js @@ -213,4 +213,4 @@ if(g!=0){var e=(j-c)/l;var b=(j-d)/l;var m=(j-k)/l;if(c==j){h=m-b;}else{if(d==j) },hsbToRgb:function(){var d=Math.round(this[2]/100*255);if(this[1]==0){return[d,d,d];}else{var b=this[0]%360;var g=b%60;var h=Math.round((this[2]*(100-this[1]))/10000*255); var e=Math.round((this[2]*(6000-this[1]*g))/600000*255);var c=Math.round((this[2]*(6000-this[1]*(60-g)))/600000*255);switch(Math.floor(b/60)){case 0:return[d,c,h]; case 1:return[e,d,h];case 2:return[h,d,c];case 3:return[h,e,d];case 4:return[c,h,d];case 5:return[d,h,e];}}return false;}});String.implement({rgbToHsb:function(){var b=this.match(/\d{1,3}/g); -return(b)?b.rgbToHsb():null;},hsbToRgb:function(){var b=this.match(/\d{1,3}/g);return(b)?b.hsbToRgb():null;}});})(); \ No newline at end of file +return(b)?b.rgbToHsb():null;},hsbToRgb:function(){var b=this.match(/\d{1,3}/g);return(b)?b.hsbToRgb():null;}});})(); diff --git a/module/web/media/js/package_ui.js b/module/web/media/js/package_ui.js index 3ea965649..8b4df7927 100644 --- a/module/web/media/js/package_ui.js +++ b/module/web/media/js/package_ui.js @@ -374,4 +374,3 @@ var Package = new Class({ } }); - diff --git a/module/web/media/js/purr_static.js b/module/web/media/js/purr_static.js index 7e0aee949..504fac038 100644 --- a/module/web/media/js/purr_static.js +++ b/module/web/media/js/purr_static.js @@ -305,4 +305,4 @@ Element.implement({ } -}); \ No newline at end of file +}); diff --git a/module/web/media/js/settings.coffee b/module/web/media/js/settings.coffee index 0fc908d46..68ca6c6a0 100644 --- a/module/web/media/js/settings.coffee +++ b/module/web/media/js/settings.coffee @@ -104,4 +104,4 @@ class SettingsUI } form.send() - e.stop() \ No newline at end of file + e.stop() diff --git a/module/web/media/js/settings.js b/module/web/media/js/settings.js index 9191fac72..41d1cb25a 100644 --- a/module/web/media/js/settings.js +++ b/module/web/media/js/settings.js @@ -1,3 +1,3 @@ {% autoescape true %} var SettingsUI,root;var __bind=function(a,b){return function(){return a.apply(b,arguments)}};root=this;window.addEvent("domready",function(){root.accountDialog=new MooDialog({destroyOnHide:false});root.accountDialog.setContent($("account_box"));new TinyTab($$("#toptabs li a"),$$("#tabs-body > span"));$$("ul.nav").each(function(a){return new MooDropMenu(a,{onOpen:function(b){return b.fade("in")},onClose:function(b){return b.fade("out")},onInitialize:function(b){return b.fade("hide").set("tween",{duration:500})}})});return new SettingsUI()});SettingsUI=(function(){function a(){var c,e,b,d;this.menu=$$("#general-menu li");this.menu.append($$("#plugin-menu li"));this.name=$("tabsback");this.general=$("general_form_content");this.plugin=$("plugin_form_content");d=this.menu;for(e=0,b=d.length;e "/pyload.fcgi$1", ) -%(ssl) \ No newline at end of file +%(ssl) diff --git a/module/web/templates/default/captcha.html b/module/web/templates/default/captcha.html index 288375b76..541fe99da 100644 --- a/module/web/templates/default/captcha.html +++ b/module/web/templates/default/captcha.html @@ -39,4 +39,4 @@ - \ No newline at end of file + diff --git a/module/web/templates/default/downloads.html b/module/web/templates/default/downloads.html index 20ff9a120..122ca1b82 100644 --- a/module/web/templates/default/downloads.html +++ b/module/web/templates/default/downloads.html @@ -26,4 +26,4 @@ -{% endblock %} \ No newline at end of file +{% endblock %} diff --git a/module/web/templates/default/folder.html b/module/web/templates/default/folder.html index b385e80cb..86132fee5 100644 --- a/module/web/templates/default/folder.html +++ b/module/web/templates/default/folder.html @@ -12,4 +12,4 @@
{{ _("Folder is empty") }}
- \ No newline at end of file + diff --git a/module/web/templates/default/home.html b/module/web/templates/default/home.html index ddba9077b..3702893d0 100644 --- a/module/web/templates/default/home.html +++ b/module/web/templates/default/home.html @@ -263,4 +263,4 @@ var LinkEntry = new Class({ -{% endblock %} \ No newline at end of file +{% endblock %} diff --git a/module/web/templates/default/info.html b/module/web/templates/default/info.html index 77ae57376..839e18a98 100644 --- a/module/web/templates/default/info.html +++ b/module/web/templates/default/info.html @@ -78,4 +78,4 @@ -{% endblock %} \ No newline at end of file +{% endblock %} diff --git a/module/web/templates/default/logout.html b/module/web/templates/default/logout.html index d3f07472b..83dba3bf4 100644 --- a/module/web/templates/default/logout.html +++ b/module/web/templates/default/logout.html @@ -6,4 +6,4 @@ {% block content %}

{{_("You were successfully logged out.")}}

-{% endblock %} \ No newline at end of file +{% endblock %} diff --git a/module/web/templates/default/logs.html b/module/web/templates/default/logs.html index d6288df0e..857598a78 100644 --- a/module/web/templates/default/logs.html +++ b/module/web/templates/default/logs.html @@ -38,4 +38,4 @@
 
-{% endblock %} \ No newline at end of file +{% endblock %} diff --git a/module/web/templates/default/pathchooser.html b/module/web/templates/default/pathchooser.html index 1467fe926..3cd211a03 100644 --- a/module/web/templates/default/pathchooser.html +++ b/module/web/templates/default/pathchooser.html @@ -73,4 +73,4 @@ - \ No newline at end of file + diff --git a/module/web/templates/default/queue.html b/module/web/templates/default/queue.html index fff3d9ce9..53fd45219 100644 --- a/module/web/templates/default/queue.html +++ b/module/web/templates/default/queue.html @@ -101,4 +101,4 @@ document.addEvent("domready", function(){ -{% endblock %} \ No newline at end of file +{% endblock %} diff --git a/module/web/templates/default/settings.html b/module/web/templates/default/settings.html index 8f084c352..da0b535ac 100644 --- a/module/web/templates/default/settings.html +++ b/module/web/templates/default/settings.html @@ -201,4 +201,4 @@ -{% endblock %} \ No newline at end of file +{% endblock %} diff --git a/module/web/templates/default/settings_item.html b/module/web/templates/default/settings_item.html index 813383343..28de1a1a9 100644 --- a/module/web/templates/default/settings_item.html +++ b/module/web/templates/default/settings_item.html @@ -45,4 +45,4 @@ {% endif %} {% endfor %} - \ No newline at end of file + diff --git a/module/web/templates/default/setup.html b/module/web/templates/default/setup.html index 39ef6f1e8..37b1c0e0e 100644 --- a/module/web/templates/default/setup.html +++ b/module/web/templates/default/setup.html @@ -10,4 +10,4 @@ {% block content %} Comming Soon. -{% endblock %} \ No newline at end of file +{% endblock %} diff --git a/module/web/templates/default/window.html b/module/web/templates/default/window.html index a11323fe0..841cda553 100644 --- a/module/web/templates/default/window.html +++ b/module/web/templates/default/window.html @@ -43,4 +43,4 @@ - \ No newline at end of file + -- cgit v1.2.3