From 57cce481460efd7c9897c59652b544ef65063837 Mon Sep 17 00:00:00 2001 From: RaNaN Date: Sun, 9 Oct 2011 18:18:23 +0200 Subject: updated js/mootools, some parts now coffeescript --- module/web/templates/default/admin.html | 109 +++--- module/web/templates/default/base.html | 174 +-------- module/web/templates/default/captcha.html | 73 +--- module/web/templates/default/edit_package.html | 27 -- module/web/templates/default/package_ui.js | 400 --------------------- module/web/templates/default/queue.html | 37 +- module/web/templates/default/rename_directory.html | 28 -- module/web/templates/default/settings.html | 45 +-- module/web/templates/default/window.html | 7 +- 9 files changed, 100 insertions(+), 800 deletions(-) delete mode 100644 module/web/templates/default/edit_package.html delete mode 100644 module/web/templates/default/package_ui.js delete mode 100644 module/web/templates/default/rename_directory.html (limited to 'module/web/templates') diff --git a/module/web/templates/default/admin.html b/module/web/templates/default/admin.html index 96c5e7ef3..df1843997 100644 --- a/module/web/templates/default/admin.html +++ b/module/web/templates/default/admin.html @@ -3,66 +3,54 @@ {% block head %} {% endblock %} @@ -117,9 +105,9 @@ - - -
+{% endblock %} +{% block hidden %} +

{{ _("Change Password") }}

@@ -152,5 +140,4 @@
- -{% endblock %} \ No newline at end of file +{% endblock %} diff --git a/module/web/templates/default/base.html b/module/web/templates/default/base.html index c7014e6b6..dfc61339d 100644 --- a/module/web/templates/default/base.html +++ b/module/web/templates/default/base.html @@ -6,168 +6,18 @@ - + - - - + + + + - -{% block title %}pyLoad {{_("Webinterface")}}{% endblock %} + - +{% block title %}pyLoad {{_("Webinterface")}}{% endblock %} {% block head %} {% endblock %} @@ -264,7 +114,7 @@ function AddBox(){
  • {{_("Start")}}
  • {{_("Stop")}}
  • {{_("Cancel")}}
    • -
  • {{_("Add")}}
    • +
  • {{_("Add")}}
    • {% endif %} @@ -320,7 +170,11 @@ function AddBox(){
    -{% include "default/window.html" %} -{% include "default/captcha.html" %} +
    + {% include "default/window.html" %} + {% include "default/captcha.html" %} + {% block hidden %} + {% endblock %} +
    diff --git a/module/web/templates/default/captcha.html b/module/web/templates/default/captcha.html index 6c0099773..332a9c102 100644 --- a/module/web/templates/default/captcha.html +++ b/module/web/templates/default/captcha.html @@ -1,76 +1,5 @@ - - - - - -
    +
    diff --git a/module/web/templates/default/edit_package.html b/module/web/templates/default/edit_package.html deleted file mode 100644 index 2b82c4027..000000000 --- a/module/web/templates/default/edit_package.html +++ /dev/null @@ -1,27 +0,0 @@ -
    - -

    {{_("Edit Package")}}

    -

    {{_("Edit the package detais below.")}}

    - - - - - - - - - - - - -
    - - - -
    \ No newline at end of file diff --git a/module/web/templates/default/package_ui.js b/module/web/templates/default/package_ui.js deleted file mode 100644 index bb282a546..000000000 --- a/module/web/templates/default/package_ui.js +++ /dev/null @@ -1,400 +0,0 @@ -var load, pack_box; - -document.addEvent("domready", function() { - load = new Fx.Tween($("load-indicator"), {link: "cancel"}); - confirmDeleteDialog = new Fx.Tween($("confirmDelete_box")); - load.set("opacity", 0); - - pack_box = new Fx.Tween($('pack_box')); - $('pack_reset').addEvent('click', function() { - hide_pack() - }); - - $('confirm_reset').addEvent('click', function() { - hide_pack() - }); -}); - -function indicateLoad() { - //$("load-indicator").reveal(); - 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_pack() { - bg_show(); - $("pack_box").setStyle('display', 'block'); - pack_box.start('opacity', 1) -} - -function hide_pack() { - bg_hide(); - pack_box.start('opacity', 0).chain(function() { - $$('.window_box').setStyle('display', 'none'); - }); -} - -var PackageUI = new Class({ - initialize: function(url, type) { - this.url = url; - this.type = type; - this.packages = []; - this.parsePackages(); - - this.sorts = new Sortables($("package-list"), { - constrain: false, - clone: true, - revert: true, - opacity: 0.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(ele) { - var id = ele.getFirst().get("id").match(/[0-9]+/); - this.packages.push(new Package(this, id, ele)) - }.bind(this)) - }, - - loadPackages: function() { - }, - - deleteFinished: function() { - indicateLoad(); - new Request.JSON({ - method: 'get', - url: '/json/delete_finished', - onSuccess: function(data) { - if (data.del.length > 0) { - window.location.reload() - } else { - this.packages.each(function(pack) { - pack.close(); - }); - indicateSuccess(); - } - }.bind(this), - onFailure: indicateFail - }).send(); - }, - - restartFailed: function() { - indicateLoad(); - new Request.JSON({ - method: 'get', - url: '/json/restart_failed', - onSuccess: function(data) { - this.packages.each(function(pack) { - pack.close(); - }); - indicateSuccess(); - }.bind(this), - onFailure: indicateFail - }).send(); - }, - - startSort: function(ele, copy) { - }, - - saveSort: function(ele, copy) { - var order = []; - this.sorts.serialize(function(li, pos) { - if (li == ele && ele.retrieve("order") != pos) { - order.push(ele.retrieve("pid") + "|" + pos) - } - li.store("order", pos) - }); - if (order.length > 0) { - indicateLoad(); - new Request.JSON({ - method: 'get', - url: '/json/package_order/' + order[0], - onSuccess: indicateFinish, - onFailure: indicateFail - }).send(); - } - } - -}); - -var Package = new Class({ - initialize: function(ui, id, ele, data) { - this.ui = ui; - this.id = id; - this.linksLoaded = false; - - if (!ele) { - this.createElement(data); - } else { - this.ele = ele; - this.order = ele.getElements("div.order")[0].get("html"); - this.ele.store("order", this.order); - this.ele.store("pid", this.id); - this.parseElement(); - } - - var pname = this.ele.getElements(".packagename")[0]; - this.buttons = new Fx.Tween(this.ele.getElements(".buttons")[0], {link: "cancel"}); - this.buttons.set("opacity", 0); - - pname.addEvent("mouseenter", function(e) { - this.buttons.start("opacity", 1) - }.bind(this)); - - pname.addEvent("mouseleave", function(e) { - this.buttons.start("opacity", 0) - }.bind(this)); - - - }, - - createElement: function() { - alert("create") - }, - - parseElement: function() { - var imgs = 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]; - - imgs[1].addEvent('click', this.deletePackage.bind(this)); - //imgs[1].addEvent('click', this.confirmDeletePackage.bind(this)); - imgs[2].addEvent('click', this.restartPackage.bind(this)); - imgs[3].addEvent('click', this.editPackage.bind(this)); - imgs[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(data) { - var ul = $("sort_children_{id}".substitute({"id": this.id})); - ul.erase("html"); - data.links.each(function(link) { - link.id = link.fid; - var li = new Element("li", { - "style": { - "margin-left": 0 - } - }); - - var html = "\n".substitute({"icon": link.icon}); - html += "{name}
    ".substitute({"name": link.name}); - html += "{statusmsg}{error} ".substitute({"statusmsg": link.statusmsg, "error":link.error}); - html += "{format_size}".substitute({"format_size": link.format_size}); - html += "{plugin}  ".substitute({"plugin": link.plugin}); - html += "  "; - html += "
    "; - - var div = new Element("div", { - "id": "file_" + link.id, - "class": "child", - "html": html - }); - - li.store("order", link.order); - li.store("lid", link.id); - - li.adopt(div); - ul.adopt(li); - }); - this.sorts = new Sortables(ul, { - constrain: false, - clone: true, - revert: true, - opacity: 0.4, - handle: ".sorthandle", - onComplete: this.saveSort.bind(this) - }); - this.registerLinkEvents(); - this.linksLoaded = true; - indicateFinish(); - this.toggle(); - }, - - registerLinkEvents: function() { - this.ele.getElements('.child').each(function(child) { - var lid = child.get('id').match(/[0-9]+/); - var imgs = child.getElements('.child_secrow img'); - imgs[0].addEvent('click', function(e) { - new Request({ - method: 'get', - url: '/json/remove_link/' + this, - onSuccess: function() { - $('file_' + this).nix() - }.bind(this), - onFailure: indicateFail - }).send(); - }.bind(lid)); - - imgs[1].addEvent('click', function(e) { - new Request({ - method: 'get', - url: '/json/restart_link/' + this, - onSuccess: function() { - var ele = $('file_' + this); - var imgs = ele.getElements("img"); - imgs[0].set("src", "/media/default/img/status_queue.png"); - var spans = ele.getElements(".child_status"); - spans[1].set("html", "queued"); - indicateSuccess(); - }.bind(this), - onFailure: indicateFail - }).send(); - }.bind(lid)); - }); - }, - - toggle: function() { - var child = this.ele.getElement('.children'); - if (child.getStyle('display') == "block") { - child.dissolve(); - } else { - if (!this.linksLoaded) { - this.loadLinks(); - } else { - child.reveal(); - } - } - }, - - confirmDeletePackage: function(event) { - bg_show(); - $('confirmDelete_box').setStyle('display', 'block'); - confirmDeleteDialog.start('opacity', 1) - - $('confirmDelete_button').addEvent('click', this.deletePackage.bind(this)); - event.stop(); - }, - - deletePackage: function(event) { - indicateLoad(); - new Request({ - method: 'get', - url: '/json/remove_package/' + this.id, - onSuccess: function() { - this.ele.nix(); - indicateFinish(); - }.bind(this), - onFailure: indicateFail - }).send(); - //hide_pack(); - event.stop(); - }, - - restartPackage: function(event) { - indicateLoad(); - new Request({ - method: 'get', - url: '/json/restart_package/' + this.id, - onSuccess: function() { - this.close(); - indicateSuccess(); - }.bind(this), - onFailure: indicateFail - }).send(); - event.stop(); - }, - - close: function() { - var child = this.ele.getElement('.children'); - if (child.getStyle('display') == "block") { - child.dissolve(); - } - var ul = $("sort_children_{id}".substitute({"id": this.id})); - ul.erase("html"); - this.linksLoaded = false; - }, - - movePackage: function(event) { - 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(); - event.stop(); - }, - - editPackage: function(event) { - $("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")); - - show_pack(); - event.stop(); - }, - - savePackage: function(event) { - $("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")); - hide_pack(); - event.stop(); - }, - - saveSort: function(ele, copy) { - var order = []; - this.sorts.serialize(function(li, pos) { - if (li == ele && ele.retrieve("order") != pos) { - order.push(ele.retrieve("lid") + "|" + pos) - } - li.store("order", pos) - }); - if (order.length > 0) { - indicateLoad(); - new Request.JSON({ - method: 'get', - url: '/json/link_order/' + order[0], - onSuccess: indicateFinish, - onFailure: indicateFail - }).send(); - } - } - -}); - diff --git a/module/web/templates/default/queue.html b/module/web/templates/default/queue.html index dddfb055c..b11910bac 100644 --- a/module/web/templates/default/queue.html +++ b/module/web/templates/default/queue.html @@ -1,7 +1,7 @@ {% extends 'default/base.html' %} {% block head %} - + - - - - + + + {% endblock %} @@ -200,9 +169,9 @@ - - -
    +{% endblock %} +{% block hidden %} +

    {{_("Add Account")}}

    {{_("Enter your account data to use premium features.")}}

    @@ -232,4 +201,4 @@
    -{% endblock %} +{% endblock %} \ No newline at end of file diff --git a/module/web/templates/default/window.html b/module/web/templates/default/window.html index 49de965a1..b61fa7149 100644 --- a/module/web/templates/default/window.html +++ b/module/web/templates/default/window.html @@ -1,9 +1,6 @@ - - - - -
    + +

    {{_("Add Package")}}

    {{_("Paste your links or upload a container.")}}

    -- cgit v1.2.3