From 2ba07aa53d2af572af2c5a43e77725abd46e1b13 Mon Sep 17 00:00:00 2001
From: RaNaN <Mast3rRaNaN@hotmail.de>
Date: Thu, 29 Jul 2010 12:09:42 +0200
Subject: many new stuff, some things already working

---
 module/web/templates/default/collector.html | 16 ++++++++--------
 module/web/templates/default/queue.html     | 20 ++++++++++----------
 2 files changed, 18 insertions(+), 18 deletions(-)

(limited to 'module/web/templates/default')

diff --git a/module/web/templates/default/collector.html b/module/web/templates/default/collector.html
index 73625136c..b0d5b1839 100644
--- a/module/web/templates/default/collector.html
+++ b/module/web/templates/default/collector.html
@@ -106,10 +106,10 @@ document.addEvent("domready", function(){
 </li>{% endblock %}
 
 {% block content %}
-{% for package in content %}
-<div id="package_{{package.id}}" class="package">
+{% for id,package in content.iteritems %}
+<div id="package_{{id}}" class="package">
     <div class="packagename" style="cursor: pointer;">
-        {{ package.package_name }}
+        {{ package.name }}
         &nbsp;&nbsp;
         <img title="{% trans "Delete Package" %}" width="12px" height="12px" src="{{ MEDIA_URL }}img/delete.png" />
         &nbsp;&nbsp;
@@ -117,15 +117,15 @@ document.addEvent("domready", function(){
         &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}}">
+    <div id="children_{{id}}" style="display: none;" class="children">
+    {% for lid, child in package.links.iteritems %}
+    <div class="child" id="file_{{lid}}">
         <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 />
+        <span style="font-size: 15px">{{ child.name }}</span><br />
     <div class="child_secrow">
-        <span class="child_status">{{ child.status_type }}</span>{{child.status_error}}&nbsp;
+        <span class="child_status">{{ child.status }}</span>{{child.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>
diff --git a/module/web/templates/default/queue.html b/module/web/templates/default/queue.html
index d33a11032..d149853d5 100644
--- a/module/web/templates/default/queue.html
+++ b/module/web/templates/default/queue.html
@@ -96,27 +96,27 @@ document.addEvent("domready", function(){
 </li>{% endblock %}
 
 {% block content %}
-{% for package in content %}
-<div id="package_{{package.data.id}}" class="package">
+{% for id, package in content.iteritems %}
+<div id="package_{{id}}" class="package">
     <div class="packagename" style="cursor: pointer;">
-        {{ package.data.package_name }}
+        {{ package.name }}
         &nbsp;&nbsp;
         <img title="{% trans "Delete Package" %}" width="12px" height="12px" src="{{ MEDIA_URL }}img/delete.png" />
         &nbsp;&nbsp;
         <img title="{% trans "Restart Package" %}" style="margin-left: -10px" height="12px" src="{{ MEDIA_URL }}img/arrow_refresh.png" />
     </div>
-    <div id="children_{{package.data.id}}" style="display: none;" class="children">
-    {% for child in package.children %}
-    <div class="child" id="file_{{child.id}}">
+    <div id="children_{{id}}" style="display: none;" class="children">
+    {% for lid, child in package.links.iteritems %}
+    <div class="child" id="file_{{lid}}">
         <span class="child_status">
-            <img src="/media/default/img/status_{{child.status_type}}.png" style="width: 12px; height:12px;"/>
+            <img src="/media/default/img/status_{{child.status}}.png" style="width: 12px; height:12px;"/>
         </span>
-        <span style="font-size: 15px">{{ child.filename }}</span><br />
+        <span style="font-size: 15px">{{ child.name }}</span><br />
     <div class="child_secrow">
-        <span class="child_status">{{ child.status_type }}</span>{{child.status_error}}&nbsp;
+        <span class="child_status">{{ child.status }}</span>{{child.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>
+        <span class="child_status">{% trans "Folder:" %} {{package.folder}}</span>
         &nbsp;&nbsp;
         <img title="{% trans "Delete Link" %}" style="cursor: pointer;" width="10px" height="10px" src="{{ MEDIA_URL }}img/delete.png" />
         &nbsp;&nbsp;
-- 
cgit v1.2.3