20 files changed, 23 insertions, 29 deletions

diff --git a/module/webui/themes/default/css/MooDialog/MooDialog.css b/module/webui/themes/default/css/MooDialog.css
index c88773ae9..d26bf2ff2 100644
--- a/module/webui/themes/default/css/MooDialog/MooDialog.css
+++ b/module/webui/themes/default/css/MooDialog.css
@@ -1,13 +1,15 @@
 /* Created by Arian Stolwijk <http://www.aryweb.nl> */
 
 .MooDialog {
-	position: fixed;
-	width: 300px;
-	height: 100px;
-	top: 50%;
+/*	position: fixed;*/
+    margin: 0 auto 0 -350px;
+    width:600px;
+    padding:14px;
+    left:50%;
+    top: 100px;
+
+	position: absolute;
 	left: 50%;
-	margin: -150px 0 0 -150px;
-	padding: 10px;
 	z-index: 50000;
 
 	background: #eef5f8;
@@ -25,17 +27,12 @@
 	padding-top: 30px;
 }
 
-.MooDialog .content {
-	height: 100px;
-}
-
 .MooDialog .title {
 	position: absolute;
 	top: 0;
 	left: 0;
 	right: 0;
 	padding: 3px 20px;
-
 	background: #b7c4dc;
 	border-bottom: 1px solid #a1aec5;
 	font-weight: bold;
@@ -47,23 +44,22 @@
 }
 
 .MooDialog .close {
-	position: absolute;
+	background: url(../img/MooDialog/dialog-close.png) no-repeat;
 	width: 16px;
 	height: 16px;
-	top: -5px;
-	left: -5px;
-
-	background: url(dialog-close.png) no-repeat;
 	display: block;
 	cursor: pointer;
+	top: -5px;
+	left: -5px;
+	position: absolute;
 }
 
 .MooDialog .buttons {
+	text-align: right;
 	margin: 0;
 	padding: 0;
 	border: 0;
 	background: none;
-	text-align: right;
 }
 
 .MooDialog .iframe {
@@ -80,16 +76,16 @@
 .MooDialog .MooDialogConfirm,
 .MooDialog .MooDialogPrompt,
 .MooDialog .MooDialogError {
+	background: url(../img/MooDialog/dialog-warning.png) no-repeat;
 	padding-left: 40px;
 	min-height: 40px;
-	background: url(dialog-warning.png) no-repeat;
 }
 
 .MooDialog .MooDialogConfirm,
-.MooDialog .MooDialogPrompt {
-	background: url(dialog-question.png) no-repeat;
+.MooDialog .MooDialogPromt {
+	background: url(../img/MooDialog/dialog-question.png) no-repeat;
 }
 
 .MooDialog .MooDialogError {
-	background: url(dialog-error.png) no-repeat;
+	background: url(../img/MooDialog/dialog-error.png) no-repeat;
 }
diff --git a/module/webui/themes/default/css/MooDialog/dialog-close.png b/module/webui/themes/default/img/MooDialog/dialog-close.png
index 81ebb88b2..81ebb88b2 100644
--- a/module/webui/themes/default/css/MooDialog/dialog-close.png
+++ b/module/webui/themes/default/img/MooDialog/dialog-close.png
diff --git a/module/webui/themes/default/css/MooDialog/dialog-error.png b/module/webui/themes/default/img/MooDialog/dialog-error.png
index d70328403..d70328403 100644
--- a/module/webui/themes/default/css/MooDialog/dialog-error.png
+++ b/module/webui/themes/default/img/MooDialog/dialog-error.png
diff --git a/module/webui/themes/default/css/MooDialog/dialog-question.png b/module/webui/themes/default/img/MooDialog/dialog-question.png
index b0af3db5b..b0af3db5b 100644
--- a/module/webui/themes/default/css/MooDialog/dialog-question.png
+++ b/module/webui/themes/default/img/MooDialog/dialog-question.png
diff --git a/module/webui/themes/default/css/MooDialog/dialog-warning.png b/module/webui/themes/default/img/MooDialog/dialog-warning.png
index aad64d4be..aad64d4be 100644
--- a/module/webui/themes/default/css/MooDialog/dialog-warning.png
+++ b/module/webui/themes/default/img/MooDialog/dialog-warning.png
diff --git a/module/webui/themes/default/js/filemanager.min.js b/module/webui/themes/default/js/filemanager.min.js
deleted file mode 100644
index d518e44ea..000000000
--- a/module/webui/themes/default/js/filemanager.min.js
+++ /dev/null
@@ -1 +0,0 @@
-function indicateLoad(){load.start("opacity",1)}function indicateFinish(){load.start("opacity",0)}function indicateSuccess(){indicateFinish(),notify.alert('{{_("Success")}}.',{className:"success"})}function indicateFail(){indicateFinish(),notify.alert('{{_("Failed")}}.',{className:"error"})}function show_rename_box(){bg_show(),$("rename_box").setStyle("display","block"),rename_box.start("opacity",1)}function hide_rename_box(){bg_hide(),rename_box.start("opacity",0).chain(function(){$("rename_box").setStyle("display","none")})}function show_confirm_box(){bg_show(),$("confirm_box").setStyle("display","block"),confirm_box.start("opacity",1)}function hide_confirm_box(){bg_hide(),confirm_box.start("opacity",0).chain(function(){$("confirm_box").setStyle("display","none")})}var load,rename_box,confirm_box;document.addEvent("domready",function(){load=new Fx.Tween($("load-indicator"),{link:"cancel"}),load.set("opacity",0),rename_box=new Fx.Tween($("rename_box")),confirm_box=new Fx.Tween($("confirm_box")),$("rename_reset").addEvent("click",function(){hide_rename_box()}),$("delete_reset").addEvent("click",function(){hide_confirm_box()})});var FilemanagerUI=new Class({initialize:function(e,t){this.url=e,this.type=t,this.directories=[],this.files=[],this.parseChildren()},parseChildren:function(){$("directories-list").getChildren("li.folder").each(function(e){var t=e.getElements("input.path")[0].get("value"),i=e.getElements("input.name")[0].get("value");this.directories.push(new Item(this,t,i,e))}.bind(this)),$("directories-list").getChildren("li.file").each(function(e){var t=e.getElements("input.path")[0].get("value"),i=e.getElements("input.name")[0].get("value");this.files.push(new Item(this,t,i,e))}.bind(this))}}),Item=new Class({initialize:function(e,t,i,n){this.ui=e,this.path=t,this.name=i,this.ele=n,this.directories=[],this.files=[],this.actions=new Array,this.actions["delete"]=this.del,this.actions.rename=this.rename,this.actions.mkdir=this.mkdir,this.parseElement();var s=this.ele.getElements("span")[0];this.buttons=new Fx.Tween(this.ele.getElements(".buttons")[0],{link:"cancel"}),this.buttons.set("opacity",0),s.addEvent("mouseenter",function(){this.buttons.start("opacity",1)}.bind(this)),s.addEvent("mouseleave",function(){this.buttons.start("opacity",0)}.bind(this))},parseElement:function(){this.ele.getChildren("span span.buttons img").each(function(e){e.addEvent("click",this.actions[e.className].bind(this))},this),this.ele.getElements("b")[0].addEvent("click",this.toggle.bind(this));var e=this.ele.getElements("ul");e.length>0&&(e[0].getChildren("li.folder").each(function(e){var t=e.getElements("input.path")[0].get("value"),i=e.getElements("input.name")[0].get("value");this.directories.push(new Item(this,t,i,e))}.bind(this)),e[0].getChildren("li.file").each(function(e){var t=e.getElements("input.path")[0].get("value"),i=e.getElements("input.name")[0].get("value");this.files.push(new Item(this,t,i,e))}.bind(this)))},reorderElements:function(){},del:function(e){$("confirm_form").removeEvents("submit"),$("confirm_form").addEvent("submit",this.deleteDirectory.bind(this)),$$("#confirm_form p").set("html",'{{_(("Are you sure you want to delete the selected item?"))}}'),show_confirm_box(),e.stop()},deleteDirectory:function(e){hide_confirm_box(),new Request.JSON({method:"POST",url:"/json/filemanager/delete",data:{path:this.path,name:this.name},onSuccess:function(e){if("success"==e.response){new Fx.Tween(this.ele).start("opacity",0);var t=this.ele.parentNode;if(this.ele.dispose(),!t.getChildren("li")[0]){var i=new Element("div",{html:'{{ _("Folder is empty") }}'});i.replaces(t)}indicateSuccess()}else indicateFail()}.bind(this),onFailure:indicateFail}).send(),e.stop()},rename:function(e){$("rename_form").removeEvents("submit"),$("rename_form").addEvent("submit",this.renameDirectory.bind(this)),$("path").set("value",this.path),$("old_name").set("value",this.name),$("new_name").set("value",this.name),show_rename_box(),e.stop()},renameDirectory:function(e){hide_rename_box(),new Request.JSON({method:"POST",url:"/json/filemanager/rename",onSuccess:function(e){"success"==e.response?(this.name=$("new_name").get("value"),this.ele.getElements("b")[0].set("html",$("new_name").get("value")),this.reorderElements(),indicateSuccess()):indicateFail()}.bind(this),onFailure:indicateFail}).send($("rename_form").toQueryString()),e.stop()},mkdir:function(e){new Request.JSON({method:"POST",url:"/json/filemanager/mkdir",data:{path:this.path+"/"+this.name,name:'{{_("New folder")}}'},onSuccess:function(e){"success"==e.response?(new Request.HTML({method:"POST",url:"/filemanager/get_dir",data:{path:e.path,name:e.name},onSuccess:function(t){var i=this.ele.getChildren("ul")[0];i||(this.ele.getChildren("div").dispose(),i=new Element("ul"),i.inject(this.ele,"bottom")),t[0].inject(i,"top"),this.directories.push(new Item(this.ui,e.path,e.name,i.firstChild))}.bind(this),onFailure:indicateFail}).send(),indicateSuccess()):indicateFail()}.bind(this),onFailure:indicateFail}).send(),e.stop()},toggle:function(){var e=this.ele.getElement("ul");null==e&&(e=this.ele.getElement("div")),null!=e&&("block"==e.getStyle("display")?e.dissolve():e.reveal())}});
\ No newline at end of file
diff --git a/module/webui/themes/default/js/package.min.js b/module/webui/themes/default/js/package.min.js
deleted file mode 100644
index fa12f7817..000000000
--- a/module/webui/themes/default/js/package.min.js
+++ /dev/null
@@ -1 +0,0 @@
-function indicateLoad(){root.load.start("opacity",1)}function indicateFinish(){root.load.start("opacity",0)}function indicateSuccess(){indicateFinish(),root.notify.alert('{{_("Success")}}.',{className:"success"})}function indicateFail(){indicateFinish(),root.notify.alert('{{_("Failed")}}.',{className:"error"})}var root=this;document.addEvent("domready",function(){root.load=new Fx.Tween($("load-indicator"),{link:"cancel"}),root.load.set("opacity",0),root.packageBox=new MooDialog({destroyOnHide:!1}),root.packageBox.setContent($("pack_box")),$("pack_reset").addEvent("click",function(){$("pack_form").reset(),root.packageBox.close()})});var PackageUI=new Class({initialize:function(e,t){this.url=e,this.type=t,this.packages=[],this.parsePackages(),this.sorts=new Sortables($("package-list"),{constrain:!1,clone:!0,revert:!0,opacity:.4,handle:".package_drag",onComplete:this.saveSort.bind(this)}),$("del_finished").addEvent("click",this.deleteFinished.bind(this)),$("restart_failed").addEvent("click",this.restartFailed.bind(this))},parsePackages:function(){$("package-list").getChildren("li").each(function(e){var t=e.getFirst().get("id").match(/[0-9]+/);this.packages.push(new Package(this,t,e))}.bind(this))},loadPackages:function(){},deleteFinished:function(){indicateLoad(),new Request.JSON({method:"get",url:"/api/deleteFinished",onSuccess:function(e){e.length>0?window.location.reload():(this.packages.each(function(e){e.close()}),indicateSuccess())}.bind(this),onFailure:indicateFail}).send()},restartFailed:function(){indicateLoad(),new Request.JSON({method:"get",url:"/api/restartFailed",onSuccess:function(){this.packages.each(function(e){e.close()}),indicateSuccess()}.bind(this),onFailure:indicateFail}).send()},startSort:function(){},saveSort:function(e){var t=[];this.sorts.serialize(function(i,s){i==e&&e.retrieve("order")!=s&&t.push(e.retrieve("pid")+"|"+s),i.store("order",s)}),t.length>0&&(indicateLoad(),new Request.JSON({method:"get",url:"/json/package_order/"+t[0],onSuccess:indicateFinish,onFailure:indicateFail}).send())}}),Package=new Class({initialize:function(e,t,i,s){this.ui=e,this.id=t,this.linksLoaded=!1,i?(this.ele=i,this.order=i.getElements("div.order")[0].get("html"),this.ele.store("order",this.order),this.ele.store("pid",this.id),this.parseElement()):this.createElement(s);var n=this.ele.getElements(".packagename")[0];this.buttons=new Fx.Tween(this.ele.getElements(".buttons")[0],{link:"cancel"}),this.buttons.set("opacity",0),n.addEvent("mouseenter",function(){this.buttons.start("opacity",1)}.bind(this)),n.addEvent("mouseleave",function(){this.buttons.start("opacity",0)}.bind(this))},createElement:function(){alert("create")},parseElement:function(){var e=this.ele.getElements("img");this.name=this.ele.getElements(".name")[0],this.folder=this.ele.getElements(".folder")[0],this.password=this.ele.getElements(".password")[0],e[1].addEvent("click",this.deletePackage.bind(this)),e[2].addEvent("click",this.restartPackage.bind(this)),e[3].addEvent("click",this.editPackage.bind(this)),e[4].addEvent("click",this.movePackage.bind(this)),this.ele.getElement(".packagename").addEvent("click",this.toggle.bind(this))},loadLinks:function(){indicateLoad(),new Request.JSON({method:"get",url:"/json/package/"+this.id,onSuccess:this.createLinks.bind(this),onFailure:indicateFail}).send()},createLinks:function(e){var t=$("sort_children_{id}".substitute({id:this.id}));t.set("html",""),e.links.each(function(e){e.id=e.fid;var i=new Element("li",{style:{"margin-left":0}}),s="<span style='cursor: move' class='child_status sorthandle'><img src='../img/{icon}' style='width: 12px; height:12px;'/></span>\n".substitute({icon:e.icon});s+="<span style='font-size: 15px'><a href=\"{url}\" target=\"_blank\">{name}</a></span><br /><div class='child_secrow'>".substitute({url:e.url,name:e.name}),s+="<span class='child_status'>{statusmsg}</span>{error}&nbsp;".substitute({statusmsg:e.statusmsg,error:e.error}),s+="<span class='child_status'>{format_size}</span>".substitute({format_size:e.format_size}),s+="<span class='child_status'>{plugin}</span>&nbsp;&nbsp;".substitute({plugin:e.plugin}),s+="<img title='{{_(\"Delete Link\")}}' style='cursor: pointer;' width='10px' height='10px' src='../img/delete.png' />&nbsp;&nbsp;",s+="<img title='{{_(\"Restart Link\")}}' style='cursor: pointer;margin-left: -4px' width='10px' height='10px' src='../img/arrow_refresh.png' /></div>";var n=new Element("div",{id:"file_"+e.id,"class":"child",html:s});i.store("order",e.order),i.store("lid",e.id),i.adopt(n),t.adopt(i)}),this.sorts=new Sortables(t,{constrain:!1,clone:!0,revert:!0,opacity:.4,handle:".sorthandle",onComplete:this.saveSort.bind(this)}),this.registerLinkEvents(),this.linksLoaded=!0,indicateFinish(),this.toggle()},registerLinkEvents:function(){this.ele.getElements(".child").each(function(e){var t=e.get("id").match(/[0-9]+/),i=e.getElements(".child_secrow img");i[0].addEvent("click",function(){new Request({method:"get",url:"/api/deleteFiles/["+this+"]",onSuccess:function(){$("file_"+this).nix()}.bind(this),onFailure:indicateFail}).send()}.bind(t)),i[1].addEvent("click",function(){new Request({method:"get",url:"/api/restartFile/"+this,onSuccess:function(){var e=$("file_"+this),t=e.getElements("img");t[0].set("src","../img/status_queue.png");var i=e.getElements(".child_status");i[1].set("html","queued"),indicateSuccess()}.bind(this),onFailure:indicateFail}).send()}.bind(t))})},toggle:function(){var e=this.ele.getElement(".children");"block"==e.getStyle("display")?e.dissolve():this.linksLoaded?e.reveal():this.loadLinks()},deletePackage:function(e){indicateLoad(),new Request({method:"get",url:"/api/deletePackages/["+this.id+"]",onSuccess:function(){this.ele.nix(),indicateFinish()}.bind(this),onFailure:indicateFail}).send(),e.stop()},restartPackage:function(e){indicateLoad(),new Request({method:"get",url:"/api/restartPackage/"+this.id,onSuccess:function(){this.close(),indicateSuccess()}.bind(this),onFailure:indicateFail}).send(),e.stop()},close:function(){var e=this.ele.getElement(".children");"block"==e.getStyle("display")&&e.dissolve();var t=$("sort_children_{id}".substitute({id:this.id}));t.erase("html"),this.linksLoaded=!1},movePackage:function(e){indicateLoad(),new Request({method:"get",url:"/json/move_package/"+(this.ui.type+1)%2+"/"+this.id,onSuccess:function(){this.ele.nix(),indicateFinish()}.bind(this),onFailure:indicateFail}).send(),e.stop()},editPackage:function(e){$("pack_form").removeEvents("submit"),$("pack_form").addEvent("submit",this.savePackage.bind(this)),$("pack_id").set("value",this.id),$("pack_name").set("value",this.name.get("text")),$("pack_folder").set("value",this.folder.get("text")),$("pack_pws").set("value",this.password.get("text")),root.packageBox.open(),e.stop()},savePackage:function(e){$("pack_form").send(),this.name.set("text",$("pack_name").get("value")),this.folder.set("text",$("pack_folder").get("value")),this.password.set("text",$("pack_pws").get("value")),root.packageBox.close(),e.stop()},saveSort:function(e){var t=[];this.sorts.serialize(function(i,s){i==e&&e.retrieve("order")!=s&&t.push(e.retrieve("lid")+"|"+s),i.store("order",s)}),t.length>0&&(indicateLoad(),new Request.JSON({method:"get",url:"/json/link_order/"+t[0],onSuccess:indicateFinish,onFailure:indicateFail}).send())}});
\ No newline at end of file
diff --git a/module/webui/themes/default/js/admin.coffee b/module/webui/themes/default/js/render/admin.coffee
index 5afbcbb66..5afbcbb66 100644
--- a/module/webui/themes/default/js/admin.coffee
+++ b/module/webui/themes/default/js/render/admin.coffee
diff --git a/module/webui/themes/default/js/admin.min.js b/module/webui/themes/default/js/render/admin.min.js
index 94a5e494d..94a5e494d 100644
--- a/module/webui/themes/default/js/admin.min.js
+++ b/module/webui/themes/default/js/render/admin.min.js
diff --git a/module/webui/themes/default/js/base.coffee b/module/webui/themes/default/js/render/base.coffee
index 07b8bfb6f..07b8bfb6f 100644
--- a/module/webui/themes/default/js/base.coffee
+++ b/module/webui/themes/default/js/render/base.coffee
diff --git a/module/webui/themes/default/js/base.min.js b/module/webui/themes/default/js/render/base.min.js
index 1ba1d73f9..1ba1d73f9 100644
--- a/module/webui/themes/default/js/base.min.js
+++ b/module/webui/themes/default/js/render/base.min.js
diff --git a/module/webui/themes/default/js/filemanager.js b/module/webui/themes/default/js/render/filemanager.js
index f1ebed93f..f1ebed93f 100644
--- a/module/webui/themes/default/js/filemanager.js
+++ b/module/webui/themes/default/js/render/filemanager.js
diff --git a/module/webui/themes/default/js/package.js b/module/webui/themes/default/js/render/package.js
index 659a8e6fc..659a8e6fc 100644
--- a/module/webui/themes/default/js/package.js
+++ b/module/webui/themes/default/js/render/package.js
diff --git a/module/webui/themes/default/js/settings.coffee b/module/webui/themes/default/js/render/settings.coffee
index d522741b9..d522741b9 100644
--- a/module/webui/themes/default/js/settings.coffee
+++ b/module/webui/themes/default/js/render/settings.coffee
diff --git a/module/webui/themes/default/js/settings.min.js b/module/webui/themes/default/js/render/settings.min.js
index 41d1cb25a..41d1cb25a 100644
--- a/module/webui/themes/default/js/settings.min.js
+++ b/module/webui/themes/default/js/render/settings.min.js
diff --git a/module/webui/themes/default/tml/admin.html b/module/webui/themes/default/tml/admin.html
index 05f0811f6..c165f2a98 100644
--- a/module/webui/themes/default/tml/admin.html
+++ b/module/webui/themes/default/tml/admin.html
@@ -1,7 +1,7 @@
 {% extends '/default/tml/base.html' %}
 
 {% block head %}
-    <script type="text/javascript" src="/default/js/admin.min.js"></script>
+    <script type="text/javascript" src="/default/js/render/admin.min.js"></script>
 {% endblock %}
 
 
diff --git a/module/webui/themes/default/tml/base.html b/module/webui/themes/default/tml/base.html
index 32b63aea9..dfc311e47 100644
--- a/module/webui/themes/default/tml/base.html
+++ b/module/webui/themes/default/tml/base.html
@@ -7,7 +7,7 @@
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
 <link rel="stylesheet" type="text/css" href="/default/css/default.min.css"/>
 <link rel="stylesheet" type="text/css" href="/default/css/window.min.css"/>
-<link rel="stylesheet" type="text/css" href="/default/css/MooDialog/MooDialog.min.css"/>
+<link rel="stylesheet" type="text/css" href="/default/css/MooDialog.min.css"/>
 
 <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>
@@ -15,7 +15,7 @@
 <script type="text/javascript" src="/default/js/static/purr.min.js"></script>
 
 
-<script type="text/javascript" src="/default/js/base.min.js"></script>
+<script type="text/javascript" src="/default/js/render/base.min.js"></script>
 
 <title>{% block title %}pyLoad {{_("Webinterface")}}{% endblock %}</title>
 
diff --git a/module/webui/themes/default/tml/filemanager.html b/module/webui/themes/default/tml/filemanager.html
index 13027529c..7a370d04c 100644
--- a/module/webui/themes/default/tml/filemanager.html
+++ b/module/webui/themes/default/tml/filemanager.html
@@ -2,7 +2,7 @@
 
 {% block head %}
 
-<script type="text/javascript" src="/default/js/filemanager.min.js"></script>
+<script type="text/javascript" src="/default/js/render/filemanager.min.js"></script>
 
 <script type="text/javascript">
 
diff --git a/module/webui/themes/default/tml/queue.html b/module/webui/themes/default/tml/queue.html
index 181f9575a..035ee1808 100644
--- a/module/webui/themes/default/tml/queue.html
+++ b/module/webui/themes/default/tml/queue.html
@@ -1,7 +1,7 @@
 {% extends '/default/tml/base.html' %}
 {% block head %}
 
-<script type="text/javascript" src="/default/js/package.min.js"></script>
+<script type="text/javascript" src="/default/js/render/package.min.js"></script>
 
 <script type="text/javascript">
 
diff --git a/module/webui/themes/default/tml/settings.html b/module/webui/themes/default/tml/settings.html
index 1fa4396e9..fddc6e35c 100644
--- a/module/webui/themes/default/tml/settings.html
+++ b/module/webui/themes/default/tml/settings.html
@@ -6,7 +6,7 @@
 {% block head %}
     <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>
+    <script type="text/javascript" src="/default/js/render/settings.min.js"></script>
 
 {% endblock %}