diff options
| author |  RaNaN <Mast3rRaNaN@hotmail.de>
| 2010-01-06 15:58:35 +0100 |
|---|---|---|
| committer | RaNaN <Mast3rRaNaN@hotmail.de>
| 2010-01-06 15:58:35 +0100 |
| commit | f2d387f8a2915d7be11fe8741fe3b45a0252aa9d (patch) | |
| tree | 3addd8ba2e1e77c3b01852998df9752ee081e262 /module/web/templates/default/base.html | |
| parent | Webinterface (diff) | |
| download | pyload-f2d387f8a2915d7be11fe8741fe3b45a0252aa9d.tar.xz | |
webinterface fix
Diffstat (limited to 'module/web/templates/default/base.html')
| -rw-r--r-- | module/web/templates/default/base.html | 42 |
1 files changed, 7 insertions, 35 deletions
diff --git a/module/web/templates/default/base.html b/module/web/templates/default/base.html index 98858b9df..ecaec98f2 100644 --- a/module/web/templates/default/base.html +++ b/module/web/templates/default/base.html @@ -12,14 +12,12 @@ <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>
-{% block head %}
-{% endblock %}
+
<title>{% block title %}pyLoad Webinterface{% endblock %}</title>
-</head>
+
<script type="text/javascript">
$(document).ready(function(){
$.getJSON('/json/links', LinksToContent );
- $.getJSON('/json/status', LoadJsonToContent );
});
@@ -42,35 +40,10 @@ function LoadJsonToContent(data) $.getJSON('/json/status', LoadJsonToContent );
}, 2000);
}
-function LinksToContent(data)
-{
-
- $.each(data, function(i,item)
- {
- //$("#LinksAktiv").append('<tr id="link_'+item.id+'"><td id="link_'+item.id+'_name">'+item.name+'</td><td id="link_'+item.id+'_status">'+item.status+'</td><td>'+SecToRightTime(item.eta)+' @ '+Math.round(item.speed*100)/100+' kb/s</td><td>'+HumanFileSize(item.size)+'</td><td><font id="aktiv_percent">'+item.percent+'</font>% / '+HumanFileSize(item.size-item.kbleft)+'</td></tr>');
- //SetInver[i] = (item.size / 100 ) / item.speed ;
- //window.setInterval( $("#aktiv_percent").text(parseInt($("#aktiv_percent").text)+1), ((item.size / 100 ) / item.speed)*100);
- //$("#LinksAktiv").append('<tr><td colspan="5"><div class="progress_bar" style="width: '+(100/item.size)*(item.size-item.kbleft)+'%;"> </div></td></tr>');
- //$(".progress_bar").animate({ width: "100%"}, (item.size / item.speed)*1000, "linear" );
- //var width = (100/item.size)*(item.size-item.kbleft);
- //alert(width);
- //$(".link_"+item.id+"_pgb").animate({ width: +"%"}, /*(item.size / item.speed)*1000*/1500, "linear" );
- //$("#link_"+item.id+"_pgb").fadeIn();
- /*$("#link_"+item.id+"_pgb").progressBar();
- $("#link_"+item.id+"_pgb").progressBar('option' , 'width' , '100%');
- $("#link_"+item.id+"_pgb").progressBar('option' , 'showText' , true);
- $("#link_"+item.id+"_pgb").progressBar('option' , 'textFormat' , 'percentage');*/
- $("#link_"+item.id+"_pgb").progressBar((100/item.size)*(item.size-item.kbleft));
-
- });
- //UpdateLinks(SetInver, 0);
- setTimeout(function()
- {
- $.getJSON('/json/links', LinksToContent );
- }, 1000);
-
-}
</script>
+
+{% block head %}
+{% endblock %}
</head>
<a class="anchor" name="top" id="top"></a>
@@ -107,8 +80,6 @@ function LinksToContent(data) <li>
<a href="/queue/" title=""><img src="{{ MEDIA_URL }}img/head-menu-download.png" alt="" /> Queue</a></li>
<li>
- <a href="/add/" title=""><img src="{{ MEDIA_URL }}img/head-menu-development.png" alt="" />Add</a></li>
- <li>
<a href="/downloads/" title=""><img src="{{ MEDIA_URL }}img/head-menu-development.png" alt="" /> 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="" />Logs</a>
@@ -169,5 +140,6 @@ function LinksToContent(data) </div>
</div>
-</head>
+
+{% include "default/window.html" %}
<body>
|