log view, progressbar test

3 files changed, 16 insertions, 4 deletions

diff --git a/module/web/templates/default/base.html b/module/web/templates/default/base.html
index 94d8c3dd2..98858b9df 100644
--- a/module/web/templates/default/base.html
+++ b/module/web/templates/default/base.html
@@ -8,7 +8,7 @@
 <link rel="stylesheet" type="text/css" href="{{ MEDIA_URL }}css/default.css">

 <link rel="stylesheet" type="text/css" href="{{ MEDIA_URL }}css/jquery-ui-1.7.2.custom.css">

 <script src="{{ MEDIA_URL }}js/jquery-1.3.2.min.js"></script>

-<script src="{{ MEDIA_URL }}js/jquery-ui-1.7.2.custom.min.js"></script>

+<!--<script src="{{ MEDIA_URL }}js/jquery-ui-1.7.2.custom.min.js"></script>-->

 <script src="{{ MEDIA_URL }}js/sprintf.js"></script>

 <script src="{{ MEDIA_URL }}js/funktions.js"></script>

 <script src="{{ MEDIA_URL }}js/jquery.progressbar.js"></script>

@@ -67,7 +67,7 @@ function LinksToContent(data)
 	setTimeout(function()

    {

     $.getJSON('/json/links', LinksToContent );

-   }, 4000);

+   }, 1000);

 	

 }

 </script>

diff --git a/module/web/templates/default/home.html b/module/web/templates/default/home.html
index acc185444..58c2c5c79 100644
--- a/module/web/templates/default/home.html
+++ b/module/web/templates/default/home.html
@@ -26,11 +26,14 @@ Active Downloads
     <td id="link_{{ link.id }}_percent"><font id="link_{{ link.id }}_aktiv_percent">{{ link.percent }}</font>% / <font id="link_{{ link.id }}_aktiv_percent">{{ link.kbleft }}</font><a href="#" onclick="javascript:$('#link_{{ link.id }}_pgb').progressBar(50);">load</a></td>

   </tr>

   <tr>

-    <td colspan="5" class="ui-progressbar ui-widget ui-widget-content ui-corner-all">

-        <div id="link_{{ link.id }}_pgb" class="ui-progressbar-value ui-widget-header ui-corner-left" style="overflow: hidden; width: {{ link.percent }}%; display: block;">&nbsp;</div>

+    <td colspan="5">

+        

     </td>

   </tr>

   {% endfor %}

+  

+  <span id="pb1" class="progressBar">75%</span>

+  

   <tbody>

 </table>

 {% endblock %}
\ No newline at end of file
diff --git a/module/web/templates/default/logs.html b/module/web/templates/default/logs.html
index 39f4b8660..f9b0504d9 100644
--- a/module/web/templates/default/logs.html
+++ b/module/web/templates/default/logs.html
@@ -13,4 +13,13 @@
 <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>
 </li>
+{% endblock %}
+
+{% block content %}
+<ul>
+{% for line in log %}
+    <li>{{line.line}}: {{line.content}}</li>
+{% endfor %}
+</ul>
+<a href="{% url logs %}"><< Start</a>  <a href="{% url logs prev %}">< prev</a>  <a href="{% url logs next %}">next ></a>
 {% endblock %}
\ No newline at end of file