From b962da6adbe03f9fda9121ab794ae9e511f2d529 Mon Sep 17 00:00:00 2001
From: RaNaN <Mast3rRaNaN@hotmail.de>
Date: Sat, 15 Dec 2012 18:01:19 +0100
Subject: worked on web-ui

---
 module/web/templates/default/base.html      | 30 ++++++++++++++++-------------
 module/web/templates/default/dashboard.html | 15 ++++++++++-----
 2 files changed, 27 insertions(+), 18 deletions(-)

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

diff --git a/module/web/templates/default/base.html b/module/web/templates/default/base.html
index d948a404a..2b50cc2ad 100644
--- a/module/web/templates/default/base.html
+++ b/module/web/templates/default/base.html
@@ -37,10 +37,10 @@
         </div>
         <div class="right">
             {% if user %}
-{#                <div class="btn-group btn-group-vertical">#}
-{#                    <a class="btn btn-mini" href="#"><i class="icon-align-left"></i></a>#}
-{#                    <a class="btn btn-mini" href="#"><i class="icon-align-center"></i></a>#}
-{#                </div>#}
+                {#                <div class="btn-group btn-group-vertical">#}
+                {#                    <a class="btn btn-mini" href="#"><i class="icon-align-left"></i></a>#}
+                {#                    <a class="btn btn-mini" href="#"><i class="icon-align-center"></i></a>#}
+                {#                </div>#}
                 <div id="notification_div">
                     <span class="label label-info" style="position: absolute; left: 0;">O Msg.</span>
                     <span class="label label-success" style="position: absolute; right: 0;">Started</span>
@@ -50,8 +50,12 @@
                     </div>
                 </div>
 
-                <div class="header_block" style="margin-top: 16px;">
-                    <div class="btn-group">
+                <div class="header_block">
+                    <span class="label label-info"
+                          style="width: 100%; display: inline-block; text-align: center">
+                        Info
+                    </span>
+                    <div class="btn-group" style="margin-top: 5px">
                         <a class="btn btn-blue btn-small" href="#"><i class="icon-user icon-white"></i> User</a>
                         <a class="btn btn-blue btn-small dropdown-toggle" data-toggle="dropdown" href="#"><span
                                 class="caret"></span></a>
@@ -63,13 +67,13 @@
                             <li><a href="#"><i class="i"></i> Make admin</a></li>
                         </ul>
                     </div>
-{#                    <div class="btn-toolbar">#}
-{#                        <div class="btn-group">#}
-{#                            <a class="btn btn-mini" href="#"><i class="icon-align-left"></i></a>#}
-{#                            <a class="btn btn-mini" href="#"><i class="icon-align-center"></i></a>#}
-{#                            <a class="btn btn-mini" href="#"><i class="icon-align-right"></i></a>#}
-{#                        </div>#}
-{#                    </div>#}
+                    {#                    <div class="btn-toolbar">#}
+                    {#                        <div class="btn-group">#}
+                    {#                            <a class="btn btn-mini" href="#"><i class="icon-align-left"></i></a>#}
+                    {#                            <a class="btn btn-mini" href="#"><i class="icon-align-center"></i></a>#}
+                    {#                            <a class="btn btn-mini" href="#"><i class="icon-align-right"></i></a>#}
+                    {#                        </div>#}
+                    {#                    </div>#}
                 </div>
                 <div id="speedgraph"></div>
                 <div class="header_block">
diff --git a/module/web/templates/default/dashboard.html b/module/web/templates/default/dashboard.html
index 67b3b8483..2ce97635e 100644
--- a/module/web/templates/default/dashboard.html
+++ b/module/web/templates/default/dashboard.html
@@ -9,19 +9,21 @@
 
 {% block head %}
     <script type="text/template" id="template-package">
-        <div>
+        <div class="package-header">
             <div class="package-row first">
                 Package <%= pid %>: <%= name %>
-                <div class="package-graph">3/5</div>
+                <div class="package-graph pull-right">3/5</div>
             </div>
             <div class="package-row second">
                 <span>
-                56 Files (xy Finished, z Active, t Total)
+                <%= stats.linkstotal %> Files (xy / z /t)
+                </span>
+                <span class="pull-right">
+                    <%= stats.sizedone %> / <%= stats.sizetotal %>
                 </span>
             </div>
 
             <div class="package-row third">
-                <a class="load"> Load</a>
                 <a class="delete"> Delete</a>
                 <a class="show-dialog"> Show</a>
             </div>
@@ -35,9 +37,13 @@
             </div>
             <div class="file-row second">
                 <%= download.statusmsg %>
+                <span class="pull-right">
+                    Size: <%= size %>
+                </span>
             </div>
 
             <div class="file-row third">
+                <%= download.plugin %>
             </div>
         </div>
     </script>
@@ -48,7 +54,6 @@
         <li>
             <ul class="breadcrumb">
                 <li><a href="#">{{ _("Home") }}</a> <span class="divider">/</span></li>
-                <li><a href="#">Library</a> <span class="divider">/</span></li>
                 <li class="active">Data</li>
             </ul>
         </li>
-- 
cgit v1.2.3