From 080643e89af62013d70bb574cd54cf4876628515 Mon Sep 17 00:00:00 2001
From: RaNaN <Mast3rRaNaN@hotmail.de>
Date: Sun, 11 Aug 2013 20:36:10 +0200
Subject: improved account list

---
 .../app/templates/default/accounts/account.html    | 44 +++++++++++++++++-----
 .../templates/default/accounts/editAccount.html    | 38 +++++++++++++++++++
 .../web/app/templates/default/accounts/layout.html |  2 +-
 .../templates/default/header/progressStatus.html   |  2 +-
 .../app/templates/default/header/progressSub.html  |  2 +-
 5 files changed, 76 insertions(+), 12 deletions(-)
 create mode 100755 pyload/web/app/templates/default/accounts/editAccount.html

(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 3b3875a3e..7039eae8c 100644
--- a/pyload/web/app/templates/default/accounts/account.html
+++ b/pyload/web/app/templates/default/accounts/account.html
@@ -1,15 +1,41 @@
-<div class="span3">
-    <img src="{{ pluginIcon plugin }}"> {{ plugin }}
+<div class="span3 account-type" style="background-image: url({{ pluginIcon plugin }})">
+    {{ plugin }} <br>
+    {{#if valid }}
+    <span class="text-success">
+        {{#if premium}}
+            {{_ "premium"}}
+        {{else}}
+            {{_ "valid" }}
+        {{/if}}
+    </span>
+    {{else}}
+    <span class="text-error">
+        {{_ "invalid" }}
+    </span>
+    {{/if}}
 </div>
-<div class="span3">
-   {{ loginname }}
+<div class="span2 account-name">
+    {{ loginname }}
+    {{# if shared}}
+        TODO: shared
+    {{/if}}
 </div>
-<div class="span3">
-    {{ premium }}
+<div class="span2 account-data">
+    {{_ "Traffic left:"}}<br>
     {{ formatSize trafficleft }}
-    {{ shared }}
-    {{ activated }}
+</div>
+<div class="span2 account-data">
+    {{_ "Valid until:"}}<br>
+    {{ formatTime validuntil }}
 </div>
 <div class="span3">
-        <button type="button" class="btn btn-danger"><i class="icon-trash"></i></button>
+    {{#if activated }}
+        <button type="button" class="btn btn-success"><i class="icon-check"></i></button>
+    {{else}}
+        <button type="button" class="btn btn-success"><i class="icon-check-empty"></i></button>
+    {{/if}}
+
+    <button type="button" class="btn btn-blue"><i class="icon-pencil"></i></button>
+    <button type="button" class="btn btn-yellow"><i class="icon-refresh"></i></button>
+    <button type="button" class="btn btn-danger"><i class="icon-trash"></i></button>
 </div>
\ No newline at end of file
diff --git a/pyload/web/app/templates/default/accounts/editAccount.html b/pyload/web/app/templates/default/accounts/editAccount.html
new file mode 100755
index 000000000..212f11e12
--- /dev/null
+++ b/pyload/web/app/templates/default/accounts/editAccount.html
@@ -0,0 +1,38 @@
+<div class="modal-header">
+    <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
+    <h3>{{_ "Edit account" }}</h3>
+</div>
+<div class="modal-body">
+    <form class="form-horizontal" autocomplete="off">
+        <div class="control-group">
+            <label class="control-label" for="pluginSelect">
+                Account
+            </label>
+
+            <div class="controls">
+                <img src="{{ pluginIcon plugin }}">
+                {{ loginname }}
+            </div>
+        </div>
+        <div class="control-group">
+            <label class="control-label" for="password">
+                Password
+            </label>
+
+            <div class="controls">
+                <input type="password" id="password">
+            </div>
+        </div>
+        {{#if options }}
+        <legend>
+            Options
+        </legend>
+        {{/if}}
+        <div class="account-options">
+        </div>
+    </form>
+</div>
+<div class="modal-footer">
+    <a class="btn btn-success btn-save">Save</a>
+    <a class="btn btn-close">Close</a>
+</div>
\ 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 bd8256659..6bb1a221f 100644
--- a/pyload/web/app/templates/default/accounts/layout.html
+++ b/pyload/web/app/templates/default/accounts/layout.html
@@ -3,7 +3,7 @@
         {{ _ "Accounts" }}
     </h1>
 </div>
-<div class="span9">
+<div class="span8">
     <div class="container-fluid account-list">
 
     </div>
diff --git a/pyload/web/app/templates/default/header/progressStatus.html b/pyload/web/app/templates/default/header/progressStatus.html
index 020ed2e96..2ee3719a5 100644
--- a/pyload/web/app/templates/default/header/progressStatus.html
+++ b/pyload/web/app/templates/default/header/progressStatus.html
@@ -4,5 +4,5 @@
     {{ statusmsg }}
 {{/if}}
 <span class="pull-right">
-    {{ formatTime eta }}
+    {{ formatTimeLeft eta }}
 </span>
\ No newline at end of file
diff --git a/pyload/web/app/templates/default/header/progressSub.html b/pyload/web/app/templates/default/header/progressSub.html
index 3400ee011..a3337e9bb 100644
--- a/pyload/web/app/templates/default/header/progressSub.html
+++ b/pyload/web/app/templates/default/header/progressSub.html
@@ -2,5 +2,5 @@
     {{ linksqueue }} downloads left ({{ formatSize sizequeue }})
 {{/if}}
 <span class="pull-right">
-    {{ formatTime etaqueue }}
+    {{ formatTimeLeft etaqueue }}
 </span>
\ No newline at end of file
-- 
cgit v1.2.3