diff options
| author |  Walter Purcaro <vuolter@users.noreply.github.com>
| 2015-04-08 03:06:04 +0200 |
|---|---|---|
| committer | Walter Purcaro <vuolter@users.noreply.github.com>
| 2015-04-08 03:06:04 +0200 |
| commit | 623f8823402895cf880ac9c6e22429248b93fbfa (patch) | |
| tree | 5381596a3bc086699df5e4d40223a45f299cfa92 | |
| parent | [README] Update (diff) | |
| parent | Recreated the chhanges of pr/2 m4xcube (diff) | |
| download | pyload-623f8823402895cf880ac9c6e22429248b93fbfa.tar.xz | |
Merge branch 'pr/n1006_mariusbaumann' into 0.4.10
Conflicts:
pyload/webui/themes/Next/tml/queue.html
pyload/webui/themes/Next/tml/settings.html
| -rw-r--r-- | pyload/webui/themes/Next/tml/queue.html | 12 | ||||
| -rw-r--r-- | pyload/webui/themes/Next/tml/settings.html | 41 |
2 files changed, 24 insertions, 29 deletions
diff --git a/pyload/webui/themes/Next/tml/queue.html b/pyload/webui/themes/Next/tml/queue.html index 6f50d740c..1706c7567 100644 --- a/pyload/webui/themes/Next/tml/queue.html +++ b/pyload/webui/themes/Next/tml/queue.html @@ -52,15 +52,15 @@ document.addEvent("domready", function(){ </div> {% set progress = (package.linksdone * 100) / package.linkstotal %} - <div id="progress" class="progress" style="float:left; width: 50%; margin-top: -5px;"> - <div class="progress-bar" role="progressbar" style="width: {{ progress }}%; height: 100%;"> - <label> - {{ package.linksdone }} / {{ package.linkstotal }}</label> + <div id="progress" class="progress" style="float:left; width: 50%; margin-top: -5px; color:#fff; font-weight: 700; font-size:12px;"> + <div class="progress-bar" role="progressbar" style="width: {{ progress }}%; height: 100%; position: relative; z-index: 1;"> + <label>{{ package.linksdone }} / {{ package.linkstotal }}</label> </div> - <label style="padding-right: 5px ;float: right;"> - {{ package.sizedone|formatsize }} / {{ package.sizetotal|formatsize }}</label> + <label style="right: 30px; position: absolute; z-index: 2; color:#fff;"> + {{ package.sizedone|formatsize }} / {{ package.sizetotal|formatsize }}</label> </div> <div style="clear: both; margin-bottom: -10px"></div> + <div id="children_{{package.pid}}" style="display: none; margin-bottom: 15px;" class="children"> <span class="child_secrow" style="margin-bottom: 30px; margin-top: 5px;">{{_("Folder:")}} <span class="folder">{{package.folder}}</span> | {{_("Password:")}} <span class="password">{{package.password}}</span></span> diff --git a/pyload/webui/themes/Next/tml/settings.html b/pyload/webui/themes/Next/tml/settings.html index 6d097f49d..805340057 100644 --- a/pyload/webui/themes/Next/tml/settings.html +++ b/pyload/webui/themes/Next/tml/settings.html @@ -28,17 +28,14 @@ <ul class="nav tabs" style="width: 20%; float:left;"> <li class> <div class="panel panel-default" > - <div class="panel-body" style="overlow-y: scroll; "> - - - <ul id="general-menu" style=" float: left;"> - {% for entry,name in conf.general %} - <nobr> - <li style="list-style-type: none;" id="general|{{ entry }}">{{ name }}</li> - </nobr> - <br> - {% endfor %} - </ul> + <div class="panel-body"> + <ul id="general-menu" style="float: left; height: 600px; overflow: auto; overflow-x: hidden; width: 100%"> + {% for entry,name in conf.general %} + <nobr> + <li style="list-style-type: none; cursor: pointer; margin-top: 10px;" id="general|{{ entry }}">{{ name }}</li> + </nobr> + {% endfor %} + </ul> </div> </div> </li> @@ -59,18 +56,16 @@ <span id="plugins" class="tabContent"> <ul class="nav tabs" style="width: 20%; float:left; hight:300px;"> <li class> - <div class="panel panel-default" style="overflow-y: scroll; "> - <div class="panel-body" > - - <ul id="plugin-menu" style=" float: left;"> - {% for entry,name in conf.plugin %} - <nobr> - <li style="list-style-type: none;" id="plugin|{{ entry }}">{{ name }}</li> - </nobr> - <br> - {% endfor %} - </ul> - <div> + <div class="panel panel-default"> + <div class="panel-body"> + <ul id="plugin-menu" style="float: left; height: 600px; overflow: auto; overflow-x: hidden; width: 100%"> + {% for entry,name in conf.plugin %} + <nobr> + <li style="list-style-type: none; cursor: pointer; margin-top: 10px;" id="plugin|{{ entry }}">{{ name }}</li> + </nobr> + {% endfor %} + </ul> + <div> </div> </li> </ul> |