From 763b142db70ce77952cb46cfccf84d9800f15651 Mon Sep 17 00:00:00 2001
From: RaNaN <Mast3rRaNaN@hotmail.de>
Date: Mon, 11 Mar 2013 19:49:20 +0100
Subject: websocket login via session, websocket pushes server status, webui
 renders server status

---
 module/web/templates/default/base.html      | 21 +++++++++++++--------
 module/web/templates/default/dashboard.html |  1 +
 2 files changed, 14 insertions(+), 8 deletions(-)

(limited to 'module/web/templates')

diff --git a/module/web/templates/default/base.html b/module/web/templates/default/base.html
index 621059c8c..e8661cbbc 100644
--- a/module/web/templates/default/base.html
+++ b/module/web/templates/default/base.html
@@ -21,6 +21,9 @@
     <script src="/static/js/libs/less-1.3.0.min.js" type="text/javascript"></script>
     <script type="text/javascript" data-main="static/js/config" src="/static/js/libs/require-2.1.5.js"></script>
     <script>
+        window.wsAddress = "{{ ws }}";
+        window.pathPrefix = ""; // TODO
+
         require(['default'], function(App) {
             App.init();
             {% block require %}
@@ -28,6 +31,13 @@
         });
     </script>
 
+    <script type="text/template" id="template-header-status">
+        <span class="pull-right eta"><% formatTime files.eta %></span><br>
+        <span class="pull-right remeaning"><% formatSize files.sizeleft %></span><br>
+        <span class="pull-right"><span
+                style="font-weight:bold;color: #fff !important;"><% files.linksleft %></span> of <% files.linkstotal %></span>
+    </script>
+
     {% block head %}
     {% endblock %}
 </head>
@@ -67,16 +77,11 @@
 
                 <div id="speedgraph" class="visible-desktop"></div>
 
-                <div class="header_block right-border">
-                    <span class="pull-right">8:15:01</span><br>
-                    <span class="pull-right">Started</span><br>
-                        <span class="pull-right"><span
-                                style="font-weight:bold;color: #fff !important;">5</span> of 12</span>
-
+                <div class="header_block right-border status-block">
                 </div>
                 <div class="header_block left-border">
-                    <i class="icon-time icon-white"></i> Remaining:<br>
-                    <i class="icon-retweet icon-white"></i> Status:<br>
+                    <i class="icon-time icon-white"></i> approx. ETA :<br>
+                    <i class=" icon-hdd icon-white"></i> Remeaning:<br>
                     <i class="icon-download-alt icon-white"></i> Downloads: <br>
                 </div>
 
diff --git a/module/web/templates/default/dashboard.html b/module/web/templates/default/dashboard.html
index 8c20973e4..7fe9c9635 100644
--- a/module/web/templates/default/dashboard.html
+++ b/module/web/templates/default/dashboard.html
@@ -177,6 +177,7 @@
         <div class="sidebar-header">
             <i class="iconf-hdd"></i> Local
             <div class="pull-right" style="font-size: medium; line-height: normal">
+{#                <input type="text" class="input">#}
                 <i class="iconf-chevron-down" style="font-size: 20px"></i>
             </div>
             <div class="clearfix"></div>
-- 
cgit v1.2.3