From 5d56a255700c4d80a3c346d7ce4648c62e45d8f1 Mon Sep 17 00:00:00 2001
From: RaNaN <Mast3rRaNaN@hotmail.de>
Date: Fri, 9 Aug 2013 22:03:20 +0200
Subject: new account page layout, added translations for webui

---
 .../app/templates/default/accounts/account.html    | 25 ++++++++++++--------
 .../app/templates/default/accounts/actionbar.html  | 10 ++++----
 .../web/app/templates/default/accounts/layout.html | 27 ++++++++--------------
 .../app/templates/default/dashboard/actionbar.html |  7 +++---
 .../app/templates/default/dashboard/select.html    |  2 +-
 5 files changed, 34 insertions(+), 37 deletions(-)

(limited to 'pyload/web/app/templates/default')

diff --git a/pyload/web/app/templates/default/accounts/account.html b/pyload/web/app/templates/default/accounts/account.html
index 90bd632c8..927072350 100644
--- a/pyload/web/app/templates/default/accounts/account.html
+++ b/pyload/web/app/templates/default/accounts/account.html
@@ -1,10 +1,15 @@
-<td>{{ plugin }}</td>
-<td>{{ loginname }}</td>
-<td>{{ valid }}</td>
-<td>{{ premium }}</td>
-<td>{{ trafficleft }}</td>
-<td>{{ shared }}</td>
-<td>{{ activated }}</td>
-<td>
-    <button type="button" class="btn btn-danger">Delete</button>
-</td>
\ No newline at end of file
+<div class="span3">
+    <img src="{{ pluginIcon plugin }}"> {{ plugin }}
+</div>
+<div class="span3">
+   {{ loginname }}
+</div>
+<div class="span3">
+    {{ premium }}
+    {{ formatSize trafficleft }}
+    {{ shared }}
+    {{ activated }}
+</div>
+<div class="span3">
+        <button type="button" class="btn btn-danger">Delete</button>
+</div>
\ No newline at end of file
diff --git a/pyload/web/app/templates/default/accounts/actionbar.html b/pyload/web/app/templates/default/accounts/actionbar.html
index f4652ec42..239254dc1 100644
--- a/pyload/web/app/templates/default/accounts/actionbar.html
+++ b/pyload/web/app/templates/default/accounts/actionbar.html
@@ -1,5 +1,5 @@
-<div class="span2 offset1">
-</div>
-<span class="span9">
-    <button class="btn btn-small btn-blue btn-add">Add Account</button>
-</span>
\ No newline at end of file
+<ul class="actionbar nav span8 offset3">
+    <li>
+        <button class="btn btn-small btn-blue btn-add">Add Account</button>
+    </li>
+</ul>
\ No newline at end of file
diff --git a/pyload/web/app/templates/default/accounts/layout.html b/pyload/web/app/templates/default/accounts/layout.html
index e6627500d..bd8256659 100644
--- a/pyload/web/app/templates/default/accounts/layout.html
+++ b/pyload/web/app/templates/default/accounts/layout.html
@@ -1,19 +1,10 @@
-<!--{#  TODO: responsive layout instead of table  #}-->
-<div class="span10 offset2">
-    <table class="table table-striped">
-        <thead>
-        <tr>
-            <th>Plugin</th>
-            <th>Name</th>
-            <th>Valid</th>
-            <th>Premium</th>
-            <th>Traffic</th>
-            <th>Shared</th>
-            <th>Activated</th>
-            <th>Delete</th>
-        </tr>
-        </thead>
-        <tbody class="account-list">
-        </tbody>
-    </table>
+<div class="span3">
+    <h1 class="vertical-header">
+        {{ _ "Accounts" }}
+    </h1>
+</div>
+<div class="span9">
+    <div class="container-fluid account-list">
+
+    </div>
 </div>
\ No newline at end of file
diff --git a/pyload/web/app/templates/default/dashboard/actionbar.html b/pyload/web/app/templates/default/dashboard/actionbar.html
index ad9a1278d..341ece0bc 100644
--- a/pyload/web/app/templates/default/dashboard/actionbar.html
+++ b/pyload/web/app/templates/default/dashboard/actionbar.html
@@ -1,6 +1,10 @@
 <div class="span2 offset1">
 </div>
 <ul class="actionbar nav nav-pills span9">
+    <li class="li-check">
+        <a href="#"><i class="icon-check-empty btn-check"></i></a>
+    </li>
+
     <li>
         <ul class="breadcrumb">
             <li><a href="#">Local</a> <span class="divider">/</span></li>
@@ -16,9 +20,6 @@
             </div>
         </form>
     </li>
-    <li style="float: right" class="li-check">
-        <a href="#"><i class="icon-check-empty btn-check"></i></a>
-    </li>
     <li class="dropdown" style="float: right;">
         <a class="dropdown-toggle type"
            data-toggle="dropdown"
diff --git a/pyload/web/app/templates/default/dashboard/select.html b/pyload/web/app/templates/default/dashboard/select.html
index f4c696d11..8f04d410e 100644
--- a/pyload/web/app/templates/default/dashboard/select.html
+++ b/pyload/web/app/templates/default/dashboard/select.html
@@ -2,7 +2,7 @@
 {{#if packs }}{{ ngettext "1 package" "%d packages" packs }}{{/if}}
 {{#if files}}
 {{#if packs}}, {{/if}}
-{{ ngettext "1 file" "%d files" files }}
+{{ngettext "1 file" "%d files" files}}
 {{/if }}
 selected
 &nbsp;|&nbsp;
-- 
cgit v1.2.3