FlashGot + ClickNLoad Support + Webif. improvm.!! pyLoad FTW !!

6 files changed, 244 insertions, 23 deletions

diff --git a/module/web/templates/default/base.html b/module/web/templates/default/base.html
index bb44433ce..6f9157ecd 100644
--- a/module/web/templates/default/base.html
+++ b/module/web/templates/default/base.html
@@ -147,12 +147,20 @@ function AddBox()
 		    <a href="/" title=""><img src="{{ MEDIA_URL }}img/head-menu-home.png" alt="" /> {% trans "Home" %}</a>

 		</li>

 		<li>

-		    <a href="/queue/" title=""><img src="{{ MEDIA_URL }}img/head-menu-download.png" alt="" /> {% trans "Queue" %}</a></li>

+		    <a href="/queue/" title=""><img src="{{ MEDIA_URL }}img/head-menu-queue.png" alt="" /> {% trans "Queue" %}</a>

+		</li>

+		<li>

+		    <a href="/collector/" title=""><img src="{{ MEDIA_URL }}img/head-menu-collector.png" alt="" /> {% trans "Collector" %}</a>

+		</li>

 		<li>

-		    <a href="/downloads/" title=""><img src="{{ MEDIA_URL }}img/head-menu-development.png" alt="" /> {% trans "Downloads" %}</a></li>

+		    <a href="/downloads/" title=""><img src="{{ MEDIA_URL }}img/head-menu-development.png" alt="" /> {% trans "Downloads" %}</a>

+		</li>

 		<li class="right">

 		    <a href="/logs/"  class="action index" accesskey="x" rel="nofollow"><img src="{{ MEDIA_URL }}img/head-menu-index.png" alt="" />{% trans "Logs" %}</a>

 		</li>

+		<li class="right">

+		    <a href="/settings/"  class="action index" accesskey="x" rel="nofollow"><img src="{{ MEDIA_URL }}img/head-menu-config.png" alt="" />{% trans "Config" %}</a>

+		</li>

 		{% endblock %}

 		

 		</ul>

diff --git a/module/web/templates/default/collector.html b/module/web/templates/default/collector.html
new file mode 100644
index 000000000..73625136c
--- /dev/null
+++ b/module/web/templates/default/collector.html
@@ -0,0 +1,152 @@
+{% extends 'default/base.html' %}

+{% load i18n %}

+

+{% block head %}

+<script type="text/javascript">

+

+document.addEvent("domready", function(){

+    $$('.package').each(function(item){

+        id = item.get('id').match(/[0-9]+/)

+        

+        imgs = item.getElements('img');

+        imgs[0].addEvent('click', function(e){

+            new Request({

+                method: 'get',

+                url: '/json/remove_package/'+this,

+                onSuccess: function(){

+                    $('package_'+this).nix()

+                    }.bind(this)

+                }).send();

+            e.stop();

+        }.bind(id));

+        

+        imgs[1].addEvent('click', function(e){

+            new Request({

+                method: 'get',

+                url: '/json/restart_package/'+this,

+                onSuccess: function(){

+                    $('package_'+this).nix()

+                    }.bind(this)

+                }).send();

+            e.stop();

+        }.bind(id));

+        

+         imgs[2].addEvent('click', function(e){

+            new Request({

+                method: 'get',

+                url: '/json/push_to_queue/'+this,

+                onSuccess: function(){

+                    $('package_'+this).nix()

+                    }.bind(this)

+                }).send();

+            e.stop();

+        }.bind(id));

+        

+        item.getElement('.packagename').addEvent('click', function(){

+            

+            child = item.getElement('.children')

+            if (child.getStyle('display') == "block"){

+                child.dissolve();

+            }else{

+                child.reveal();

+            }

+        }.bind(item));

+        

+        

+        item.getElements('.child').each(function(child){

+            id = child.get('id').match(/[0-9]+/)

+            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)

+                }).send();

+        }.bind(id));

+        

+        imgs[1].addEvent('click', function(e){

+                        new Request({

+                method: 'get',

+                url: '/json/restart_link/'+this,

+                onSuccess: function(){

+                    $('file_'+this).nix()

+                    }.bind(this)

+                }).send();

+        }.bind(id));

+        });

+        

+    })

+});

+</script>

+{% endblock %}

+

+{% block title %}{% trans "Collector" %} - {{block.super}} {% endblock %}

+{% block subtitle %}{% trans "Collector" %}{% endblock %}

+

+{% block menu %}

+<li>

+    <a href="/" title=""><img src="{{ MEDIA_URL }}img/head-menu-home.png" alt="" /> {% trans "Home" %}</a>

+</li>

+<li>

+    <a href="/queue/" title=""><img src="{{ MEDIA_URL }}img/head-menu-queue.png" alt="" /> {% trans "Queue" %}</a>

+</li>

+<li class="selected">

+    <a href="/collector/" title=""><img src="{{ MEDIA_URL }}img/head-menu-collector.png" alt="" /> {% trans "Collector" %}</a>

+</li>

+<li>

+    <a href="/downloads/" title=""><img src="{{ MEDIA_URL }}img/head-menu-development.png" alt="" /> {% trans "Downloads" %}</a>

+</li>

+<li class="right">

+    <a href="/logs/"  class="action index" accesskey="x" rel="nofollow"><img src="{{ MEDIA_URL }}img/head-menu-index.png" alt="" />{% trans "Logs" %}</a>

+</li>

+<li class="right">

+    <a href="/settings/"  class="action index" accesskey="x" rel="nofollow"><img src="{{ MEDIA_URL }}img/head-menu-config.png" alt="" />{% trans "Config" %}</a>

+</li>{% endblock %}

+

+{% block content %}

+{% for package in content %}

+<div id="package_{{package.id}}" class="package">

+    <div class="packagename" style="cursor: pointer;">

+        {{ package.package_name }}

+        &nbsp;&nbsp;

+        <img title="{% trans "Delete Package" %}" width="12px" height="12px" src="{{ MEDIA_URL }}img/delete.png" />

+        &nbsp;&nbsp;

+        <img title="{% trans "Reset Package" %}" style="margin-left: -10px" height="12px" src="{{ MEDIA_URL }}img/arrow_refresh.png" />

+        &nbsp;&nbsp;

+        <img title="{% trans "Push Package to Queue" %}" style="margin-left: -10px" height="12px" src="{{ MEDIA_URL }}img/package_go.png" />

+    </div>

+    <div id="children_{{package.id}}" style="display: none;" class="children">

+    {% for child in package.children %}

+    <div class="child" id="file_{{child.id}}">

+        <span class="child_status">

+            <img src="/media/default/img/status_{{child.status_type}}.png" style="width: 12px; height:12px;"/>

+        </span>

+        <span style="font-size: 15px">{{ child.filename }}</span><br />

+    <div class="child_secrow">

+        <span class="child_status">{{ child.status_type }}</span>{{child.status_error}}&nbsp;

+        <span class="child_status">{{ child.size }} KB</span>

+        <span class="child_status">{{ child.plugin }}</span>

+        <span class="child_status">{% trans "Folder:" %} {{child.folder}}</span>

+        &nbsp;&nbsp;

+        <img title="{% trans "Delete Link" %}" style="cursor: pointer;" width="10px" height="10px" src="{{ MEDIA_URL }}img/delete.png" />

+        &nbsp;&nbsp;

+        <img title="{% trans "Restart Link" %}" style="cursor: pointer;margin-left: -4px" width="10px" height="10px" src="{{ MEDIA_URL }}img/arrow_refresh.png" />

+    </div>

+    </div>

+    {% endfor %}

+    </div>

+</div>

+{% endfor %}

+<!--table >

+  <tr>

+    <td colspan="3"><h1>!Paketname!</h1></td>

+  </tr>

+  <tr>

+    <td><h2>test.png</h2></td>

+    <td>loading</td>

+    <td><a href="/"><img id="button" src="/img/button-delete.gif" alt="delete" /></a><a href="/"><img id="button" src="/img/button-unpause.gif" alt="unpause" /></a></td>

+  </tr>

+</table-->

+{% endblock %} 
\ No newline at end of file
diff --git a/module/web/templates/default/downloads.html b/module/web/templates/default/downloads.html
index 3c370aaa2..b9cffa955 100644
--- a/module/web/templates/default/downloads.html
+++ b/module/web/templates/default/downloads.html
@@ -5,14 +5,22 @@
 
 {% block menu %}
 <li>
-    <a href="{% url home %}" title=""><img src="{{ MEDIA_URL }}img/head-menu-home.png" alt="" /> Home</a>
+    <a href="/" title=""><img src="{{ MEDIA_URL }}img/head-menu-home.png" alt="" /> {% trans "Home" %}</a>
 </li>
 <li>
-    <a href="{% url queue %}" title=""><img src="{{ MEDIA_URL }}img/head-menu-download.png" alt="" /> Queue</a></li>
+    <a href="/queue/" title=""><img src="{{ MEDIA_URL }}img/head-menu-queue.png" alt="" /> {% trans "Queue" %}</a>
+</li>
+<li>
+    <a href="/collector/" title=""><img src="{{ MEDIA_URL }}img/head-menu-collector.png" alt="" /> {% trans "Collector" %}</a>
+</li>
 <li class="selected">
-    <a href="{% url downloads %}" title=""><img src="{{ MEDIA_URL }}img/head-menu-development.png" alt="" /> Downloads</a></li>
+    <a href="/downloads/" title=""><img src="{{ MEDIA_URL }}img/head-menu-development.png" alt="" /> {% trans "Downloads" %}</a>
+</li>
+<li class="right">
+    <a href="/logs/"  class="action index" accesskey="x" rel="nofollow"><img src="{{ MEDIA_URL }}img/head-menu-index.png" alt="" />{% trans "Logs" %}</a>
+</li>
 <li class="right">
-    <a href="{% url logs %}"  class="action index" accesskey="x" rel="nofollow"><img src="{{ MEDIA_URL }}img/head-menu-index.png" alt="" />Logs</a>
+    <a href="/settings/"  class="action index" accesskey="x" rel="nofollow"><img src="{{ MEDIA_URL }}img/head-menu-config.png" alt="" />{% trans "Config" %}</a>
 </li>
 {% endblock %}
 
diff --git a/module/web/templates/default/logs.html b/module/web/templates/default/logs.html
index 8dbe5a382..52120ffc4 100644
--- a/module/web/templates/default/logs.html
+++ b/module/web/templates/default/logs.html
@@ -6,14 +6,22 @@
 
 {% block menu %}
 <li>
-    <a href="{% url home %}" title=""><img src="{{ MEDIA_URL }}img/head-menu-home.png" alt="" /> Home</a>
+    <a href="/" title=""><img src="{{ MEDIA_URL }}img/head-menu-home.png" alt="" /> {% trans "Home" %}</a>
 </li>
 <li>
-    <a href="{% url queue %}" title=""><img src="{{ MEDIA_URL }}img/head-menu-download.png" alt="" /> Queue</a></li>
+    <a href="/queue/" title=""><img src="{{ MEDIA_URL }}img/head-menu-queue.png" alt="" /> {% trans "Queue" %}</a>
+</li>
+<li>
+    <a href="/collector/" title=""><img src="{{ MEDIA_URL }}img/head-menu-collector.png" alt="" /> {% trans "Collector" %}</a>
+</li>
 <li>
-    <a href="{% url downloads %}" title=""><img src="{{ MEDIA_URL }}img/head-menu-development.png" alt="" /> Downloads</a></li>
-<li class="right" class="selected">
-    <a href="{% url logs %}"  class="action index" accesskey="x" rel="nofollow"><img src="{{ MEDIA_URL }}img/head-menu-index.png" alt="" />Logs</a>
+    <a href="/downloads/" title=""><img src="{{ MEDIA_URL }}img/head-menu-development.png" alt="" /> {% trans "Downloads" %}</a>
+</li>
+<li class="right selected">
+    <a href="/logs/"  class="action index" accesskey="x" rel="nofollow"><img src="{{ MEDIA_URL }}img/head-menu-index.png" alt="" />{% trans "Logs" %}</a>
+</li>
+<li class="right">
+    <a href="/settings/"  class="action index" accesskey="x" rel="nofollow"><img src="{{ MEDIA_URL }}img/head-menu-config.png" alt="" />{% trans "Config" %}</a>
 </li>
 {% endblock %}
 
diff --git a/module/web/templates/default/queue.html b/module/web/templates/default/queue.html
index 4cc01eeef..d33a11032 100644
--- a/module/web/templates/default/queue.html
+++ b/module/web/templates/default/queue.html
@@ -76,23 +76,36 @@ document.addEvent("domready", function(){
 {% block subtitle %}{% trans "Queue" %}{% endblock %}

 

 {% block menu %}

-<li> <a href="{% url home %}" title=""><img src="{{ MEDIA_URL }}img/head-menu-home.png" alt="" /> {% trans "Home" %}</a> </li>

-<li class="selected"> <a href="{% url queue %}" title=""><img src="{{ MEDIA_URL }}img/head-menu-download.png" alt="" /> {% trans "Queue" %}</a></li>

-<li> <a href="{% url downloads %}" title=""><img src="{{ MEDIA_URL }}img/head-menu-development.png" alt="" /> {% trans "Downloads" %}</a></li>

-<li class="right"> <a href="{% url logs %}"  class="action index" accesskey="x" rel="nofollow"><img src="{{ MEDIA_URL }}img/head-menu-index.png" alt="" />{% trans "Logs" %}</a> </li>

-{% endblock %}

+<li>

+    <a href="/" title=""><img src="{{ MEDIA_URL }}img/head-menu-home.png" alt="" /> {% trans "Home" %}</a>

+</li>

+<li class="selected">

+    <a href="/queue/" title=""><img src="{{ MEDIA_URL }}img/head-menu-queue.png" alt="" /> {% trans "Queue" %}</a>

+</li>

+<li>

+    <a href="/collector/" title=""><img src="{{ MEDIA_URL }}img/head-menu-collector.png" alt="" /> {% trans "Collector" %}</a>

+</li>

+<li>

+    <a href="/downloads/" title=""><img src="{{ MEDIA_URL }}img/head-menu-development.png" alt="" /> {% trans "Downloads" %}</a>

+</li>

+<li class="right">

+    <a href="/logs/"  class="action index" accesskey="x" rel="nofollow"><img src="{{ MEDIA_URL }}img/head-menu-index.png" alt="" />{% trans "Logs" %}</a>

+</li>

+<li class="right">

+    <a href="/settings/"  class="action index" accesskey="x" rel="nofollow"><img src="{{ MEDIA_URL }}img/head-menu-config.png" alt="" />{% trans "Config" %}</a>

+</li>{% endblock %}

 

 {% block content %}

 {% for package in content %}

-<div id="package_{{package.id}}" class="package">

+<div id="package_{{package.data.id}}" class="package">

     <div class="packagename" style="cursor: pointer;">

-        {{ package.package_name }}

+        {{ package.data.package_name }}

         &nbsp;&nbsp;

-        <img width="12px" height="12px" src="{{ MEDIA_URL }}img/delete.png" />

+        <img title="{% trans "Delete Package" %}" width="12px" height="12px" src="{{ MEDIA_URL }}img/delete.png" />

         &nbsp;&nbsp;

-        <img style="margin-left: -10px" height="12px" src="{{ MEDIA_URL }}img/arrow_refresh.png" />

+        <img title="{% trans "Restart Package" %}" style="margin-left: -10px" height="12px" src="{{ MEDIA_URL }}img/arrow_refresh.png" />

     </div>

-    <div id="children_{{package.id}}" style="display: none;" class="children">

+    <div id="children_{{package.data.id}}" style="display: none;" class="children">

     {% for child in package.children %}

     <div class="child" id="file_{{child.id}}">

         <span class="child_status">

@@ -105,9 +118,9 @@ document.addEvent("domready", function(){
         <span class="child_status">{{ child.plugin }}</span>

         <span class="child_status">{% trans "Folder:" %} {{child.folder}}</span>

         &nbsp;&nbsp;

-        <img style="cursor: pointer;" width="10px" height="10px" src="{{ MEDIA_URL }}img/delete.png" />

+        <img title="{% trans "Delete Link" %}" style="cursor: pointer;" width="10px" height="10px" src="{{ MEDIA_URL }}img/delete.png" />

         &nbsp;&nbsp;

-        <img style="cursor: pointer;margin-left: -4px" width="10px" height="10px" src="{{ MEDIA_URL }}img/arrow_refresh.png" />

+        <img title="{% trans "Restart Link" %}" style="cursor: pointer;margin-left: -4px" width="10px" height="10px" src="{{ MEDIA_URL }}img/arrow_refresh.png" />

     </div>

     </div>

     {% endfor %}

diff --git a/module/web/templates/default/settings.html b/module/web/templates/default/settings.html
new file mode 100644
index 000000000..ab144bed6
--- /dev/null
+++ b/module/web/templates/default/settings.html
@@ -0,0 +1,32 @@
+{% extends 'default/base.html' %}
+{% load i18n %}
+
+{% block title %}{% trans "Config" %} - {{block.super}} {% endblock %}
+{% block subtitle %}{% trans "Config" %}{% endblock %}
+
+{% block menu %}
+<li>
+    <a href="/" title=""><img src="{{ MEDIA_URL }}img/head-menu-home.png" alt="" /> {% trans "Home" %}</a>
+</li>
+<li>
+    <a href="/queue/" title=""><img src="{{ MEDIA_URL }}img/head-menu-queue.png" alt="" /> {% trans "Queue" %}</a>
+</li>
+<li>
+    <a href="/collector/" title=""><img src="{{ MEDIA_URL }}img/head-menu-collector.png" alt="" /> {% trans "Collector" %}</a>
+</li>
+<li>
+    <a href="/downloads/" title=""><img src="{{ MEDIA_URL }}img/head-menu-development.png" alt="" /> {% trans "Downloads" %}</a>
+</li>
+<li class="right">
+    <a href="/logs/"  class="action index" accesskey="x" rel="nofollow"><img src="{{ MEDIA_URL }}img/head-menu-index.png" alt="" />{% trans "Logs" %}</a>
+</li>
+<li class="right selected">
+    <a href="/settings/"  class="action index" accesskey="x" rel="nofollow"><img src="{{ MEDIA_URL }}img/head-menu-config.png" alt="" />{% trans "Config" %}</a>
+</li>
+{% endblock %}
+
+{% block content %}
+
+<h3>Coming Soon.</h3>
+
+{% endblock %}
\ No newline at end of file