diff options
| author |  RaNaN <Mast3rRaNaN@hotmail.de>
| 2013-03-20 21:39:30 +0100 |
|---|---|---|
| committer | RaNaN <Mast3rRaNaN@hotmail.de>
| 2013-03-20 21:39:30 +0100 |
| commit | 63cef4c7d641ffddaeabcd768020674e2681ba05 (patch) | |
| tree | 10b9ee50b927a7673d93db15b896a15a1012f482 /module/web/templates/default | |
| parent | added ReadWrite lock, render file progress on dashboard (diff) | |
| download | pyload-63cef4c7d641ffddaeabcd768020674e2681ba05.tar.xz | |
improved ui, render waiting files
Diffstat (limited to 'module/web/templates/default')
| -rw-r--r-- | module/web/templates/default/base.html | 10 | ||||
| -rw-r--r-- | module/web/templates/default/dashboard.html | 14 |
2 files changed, 14 insertions, 10 deletions
diff --git a/module/web/templates/default/base.html b/module/web/templates/default/base.html index ebaac59e9..f8dd10c4e 100644 --- a/module/web/templates/default/base.html +++ b/module/web/templates/default/base.html @@ -40,7 +40,7 @@ </script>
<script type="text/template" id="template-header">
<%= if downloads %>
- <% downloads %> downloads running (<% formatSize speed %>/s)
+ <% downloads %> downloads running <%= if speed %>(<% formatSize speed %>/s)<%/if%>
<% else %>
No running tasks
<%/if%>
@@ -64,9 +64,13 @@ <div class="progress">
<div class="bar" style="width: <% percent %>%"></div>
</div>
- <% formatSize done %> of <% formatSize total %> (<% formatSize download.speed %>/s)
+ <%= if downloading %>
+ <% formatSize done %> of <% formatSize total %> (<% formatSize download.speed %>/s)
+ <% else %>
+ <% statusmsg %>
+ <%/if%>
<span class="pull-right">
- <% percent %>%
+{# <% percent %>%#}
<% formatTime eta %>
</span>
</script>
diff --git a/module/web/templates/default/dashboard.html b/module/web/templates/default/dashboard.html index 7fe9c9635..f0756cdfb 100644 --- a/module/web/templates/default/dashboard.html +++ b/module/web/templates/default/dashboard.html @@ -38,11 +38,11 @@ <i class="iconf-chevron-down" data-toggle="dropdown">
</i>
<ul class="dropdown-menu" role="menu">
- <li><a href="#"><i class="iconf-folder-open-alt"></i> Open</a></li>
+ <li><a href="#" class="btn-open"><i class="iconf-folder-open-alt"></i> Open</a></li>
<li><a href="#"><i class="iconf-plus-sign"></i> Add links</a></li>
<li><a href="#"><i class="iconf-edit"></i> Details</a></li>
- <li><a href="#"><i class="iconf-trash"></i> Delete</a></li>
- <li><a href="#"><i class="iconf-refresh"></i> Recheck</a></li>
+ <li><a href="#" class="btn-delete"><i class="iconf-trash"></i> Delete</a></li>
+ <li><a href="#" class="btn-recheck"><i class="iconf-refresh"></i> Recheck</a></li>
<li class="divider"></li>
<li class="dropdown-submenu">
<a>Addons</a>
@@ -83,10 +83,10 @@ <% download.plugin %>
<i class="iconf-chevron-down" data-toggle="dropdown"></i>
<ul class="dropdown-menu" role="menu">
- <li><a href="#"><i class="iconf-trash"></i> Delete</a></li>
- <li><a href="#"><i class="iconf-refresh"></i> Restart</a></li>
- <li><a href="#"><i class="iconf-download"></i> Download</a></li>
- <li><a href="#"><i class="iconf-share"></i> Share</a></li>
+ <li><a href="#" class="btn-delete"><i class="iconf-trash"></i> Delete</a></li>
+ <li><a href="#" class="btn-restart"><i class="iconf-refresh"></i> Restart</a></li>
+ <li><a href="#" class="btn-dowload"><i class="iconf-download"></i> Download</a></li>
+ <li><a href="#" class="btn-share"><i class="iconf-share"></i> Share</a></li>
<li class="divider"></li>
<li class="dropdown-submenu pull-left">
<a>Addons</a>
|