diff options
Diffstat (limited to 'module/web')
| -rw-r--r-- | module/web/templates/default/queue.html | 16 | ||||
| -rw-r--r-- | module/web/templates/default/settings.html | 78 |
2 files changed, 43 insertions, 51 deletions
diff --git a/module/web/templates/default/queue.html b/module/web/templates/default/queue.html index 62d0be777..28386354c 100644 --- a/module/web/templates/default/queue.html +++ b/module/web/templates/default/queue.html @@ -53,19 +53,17 @@ document.addEvent("domready", function(){ {% 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 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;"> + {{ 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> - <ul id="sort_children_{{package.pid}}" style="list-style: none; padding-left: 0"> - </ul> + <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> + <ul id="sort_children_{{package.pid}}" style="list-style: none; padding-left: 0"></ul> </div> </div> </li> @@ -106,4 +104,4 @@ document.addEvent("domready", function(){ </form> </div> -{% endblock %}
\ No newline at end of file +{% endblock %} diff --git a/module/web/templates/default/settings.html b/module/web/templates/default/settings.html index 5be7be516..1841fe485 100644 --- a/module/web/templates/default/settings.html +++ b/module/web/templates/default/settings.html @@ -13,9 +13,9 @@ {% block content %} <ul id="toptabs" class="nav nav-tabs"> - <li role="presentation" class"active"><a href="#">{{ _("General") }}</a></li> - <li role="presentation"><a href="#">{{ _("Plugins") }}</a></li> - <li role="presentation"><a href="#">{{ _("Accounts") }}</a></li> + <li role="presentation" class"active"><a href="#">{{ _("General") }}</a></li> + <li role="presentation"><a href="#">{{ _("Plugins") }}</a></li> + <li role="presentation"><a href="#">{{ _("Accounts") }}</a></li> </ul> <div id="tabsback" style="height: 20px; padding-left: 150px; color: white; font-weight: bold;"> @@ -29,11 +29,9 @@ <li class> <div class="panel panel-default" > <div class="panel-body"> - <ul id="general-menu" style="float: left; height: 600px; overflow: auto; overflow-x: hidden; width: 100%"> + <ul id="general-menu" style="float: left; max-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> + <li style="list-style-type: none; cursor: pointer; margin-top: 10px; white-space: nowrap;" id="general|{{ entry }}">{{ name }}</li> {% endfor %} </ul> </div> @@ -58,11 +56,9 @@ <li class> <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%"> + <ul id="plugin-menu" style="float: left; max-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> + <li style="list-style-type: none; cursor: pointer; margin-top: 10px; white-space: nowrap;" id="plugin|{{ entry }}">{{ name }}</li> {% endfor %} </ul> <div> @@ -177,36 +173,34 @@ {% endblock %} {% block hidden %} <div id="account_box" style="z-index: 2"> -<form id="add_account_form" action="/json/add_account" method="POST" enctype="multipart/form-data"> -<h3>{{_("Add Account")}}</h3> -<p>{{_("Enter your account data to use premium features.")}}</p> - -<div class="form-group"> -<label for="account_login">{{_("Login")}}</label> -<input class="form-control" id="account_login" name="account_login" type="text" /> -<p >{{_("Your username.")}}</p> -</div> -<div class="form-group"> -<label for="account_password">{{_("Password")}}</label> -<input class="form-control" id="account_password" name="account_password" type="password" size="20" /> -<p >{{_("The password for this account.")}}</p> -</div> -<div class="form-group"> -<label for="account_type">{{_("Type")}}</label> -<p>{{_("Choose the hoster for your account.")}}</p> -</div> -<div class="form-group"> - <select name=account_type id="account_type"> - {% for type in types|sort %} - <option value="{{ type }}">{{ type }}</option> - {% endfor %} - </select> -</div> -<button class="btn btn-primary" style="float: right; margin-left: 5px;" id="account_add_button" type="submit">{{_("Add")}}</button> -<button class="btn btn-default" style="float: right;" id="account_reset" style="margin-left: 0" type="reset">{{_("Reset")}}</button> -<div class="spacer"></div> - -</form> - + <form id="add_account_form" action="/json/add_account" method="POST" enctype="multipart/form-data"> + <h3>{{_("Add Account")}}</h3> + <p>{{_("Enter your account data to use premium features.")}}</p> + + <div class="form-group"> + <label for="account_login">{{_("Login")}}</label> + <input class="form-control" id="account_login" name="account_login" type="text" /> + <p >{{_("Your username.")}}</p> + </div> + <div class="form-group"> + <label for="account_password">{{_("Password")}}</label> + <input class="form-control" id="account_password" name="account_password" type="password" size="20" /> + <p >{{_("The password for this account.")}}</p> + </div> + <div class="form-group"> + <label for="account_type">{{_("Type")}}</label> + <p>{{_("Choose the hoster for your account.")}}</p> + </div> + <div class="form-group"> + <select name=account_type id="account_type"> + {% for type in types|sort %} + <option value="{{ type }}">{{ type }}</option> + {% endfor %} + </select> + </div> + <button class="btn btn-primary" style="float: right; margin-left: 5px;" id="account_add_button" type="submit">{{_("Add")}}</button> + <button class="btn btn-default" style="float: right;" id="account_reset" style="margin-left: 0" type="reset">{{_("Reset")}}</button> + <div class="spacer"></div> + </form> </div> {% endblock %} |