From 83a4073616f9821a8ebf1df0e18e332490503eca Mon Sep 17 00:00:00 2001
From: RaNaN <Mast3rRaNaN@hotmail.de>
Date: Thu, 25 Feb 2010 16:32:17 +0100
Subject: webinterface improvments + server crash fix

---
 module/web/templates/default/base.html |  3 ++-
 module/web/templates/default/home.html | 18 ++++++------------
 2 files changed, 8 insertions(+), 13 deletions(-)

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

diff --git a/module/web/templates/default/base.html b/module/web/templates/default/base.html
index 5771e64e5..82581da45 100644
--- a/module/web/templates/default/base.html
+++ b/module/web/templates/default/base.html
@@ -180,7 +180,8 @@ function AddBox()
 
 {% if perms.pyload.can_see_dl %}
 <ul id="page-actions">
-	<li><a class="action backlink">{% trans "Speed:" %} <b id="speed">{{ status.speed }}</b> kb/s</a></li>
+    <li><a class="time">{% trans "Download:" %}<a style=" background-color: #7CFC00; padding-left: 0cm; padding-right: 0.1cm; "> {% trans "on" %}</a></a></li>
+    <li><a class="action backlink">{% trans "Speed:" %} <b id="speed">{{ status.speed }}</b> kb/s</a></li>
     <li><a class="action cog">{% trans "Active:" %} <b id="aktiv">{{ status.activ }}</b> / <b id="aktiv_from">{{ status.queue }}</b></a></li>
     <li><a href=""  class="action revisions" accesskey="o" rel="nofollow">{% trans "Reload page" %}</a></li>
 </ul><br />
diff --git a/module/web/templates/default/home.html b/module/web/templates/default/home.html
index 08a7a85e6..f3d40b4e0 100644
--- a/module/web/templates/default/home.html
+++ b/module/web/templates/default/home.html
@@ -5,11 +5,6 @@
 
 <script type="text/javascript">
 
-/*function UpdateLinks( SetInver, index )
-{
-	$("#aktiv_percent").text(parseInt($("#aktiv_percent").text)+1)
-	setTimeout( UpdateLinks( SetInver, index+1 ), SetInver[index]*1000);
-}*/
 var em;
 
 document.addEvent("domready", function(){
@@ -83,7 +78,7 @@ var EntryManager = new Class({
                 
             }
             }, this)
-        }catch(e){alert(e)}
+        }catch(e){}
     }
 })
 
@@ -108,8 +103,7 @@ var LinkEntry = new Class({
         },
         insert: function(item){
             try{
-            info = SecToRightTime(item.eta) +' @ '+ Math.round(item.speed*100)/100+' kb/s' ;
-            
+
             this.elements = {
                 tr: new Element('tr', {
                 'html': '',
@@ -124,7 +118,7 @@ var LinkEntry = new Class({
                 'html': item.status
                 }),
                 info: new Element('td', {
-                'html': info
+                'html': item.info
                 }),
                 kbleft: new Element('td', {
                 'html': HumanFileSize(item.size)
@@ -176,7 +170,7 @@ var LinkEntry = new Class({
         update: function(item){
                 this.elements.name.set('text', item.name);
                 this.elements.status.set('text', item.status);
-                this.elements.info.set('text', SecToRightTime(item.eta)+' @ '+Math.round(item.speed*100)/100+' kb/s');
+                this.elements.info.set('text', item.info);
                 this.elements.kbleft.set('text', HumanFileSize(item.size));
                 this.elements.percent.set('text', item.percent+ '% / '+ HumanFileSize(item.size-item.kbleft));
                 this.bar.start({
@@ -204,7 +198,7 @@ var LinkEntry = new Class({
   <tr class="header">
     <th>{% trans "Name" %}</th>
     <th>{% trans "Status" %}</th>
-    <th>{% trans "Infos" %}</th>
+    <th>{% trans "Information" %}</th>
     <th>{% trans "Size" %}</th>
     <th>{% trans "Progress" %}</th>
   </tr>
@@ -229,6 +223,6 @@ var LinkEntry = new Class({
   </tr>
   {% endfor %}
   
-  <tbody>
+  </tbody>
 </table>
 {% endblock %}
\ No newline at end of file
-- 
cgit v1.2.3