diff options
| -rw-r--r-- | module/web/templates/default/admin.html | 78 | ||||
| -rw-r--r-- | module/web/templates/default/home.html | 15 | ||||
| -rw-r--r-- | module/web/templates/default/info.html | 20 |
3 files changed, 56 insertions, 57 deletions
diff --git a/module/web/templates/default/admin.html b/module/web/templates/default/admin.html index b049411fd..be624f555 100644 --- a/module/web/templates/default/admin.html +++ b/module/web/templates/default/admin.html @@ -9,18 +9,20 @@ {% block subtitle %}{{ _("Administrate") }}{% endblock %} {% block content %} - - <a href="#" id="quit-pyload" style="font-size: large; font-weight: bold;">{{_("Quit pyLoad")}}</a> | - <a href="#" id="restart-pyload" style="font-size: large; font-weight: bold;">{{_("Restart pyLoad")}}</a> + <div class="btn-group"> + <a href="#" id="quit-pyload" class="btn btn-default"><span class="glyphicon glyphicon-off"></span> {{_("Quit pyLoad")}}</a> + <a href="#" id="restart-pyload" class="btn btn-default"><span class="glyphicon glyphicon-repeat"></span> {{_("Restart pyLoad")}}</a> +</div> <br> <br> {{ _("To add user or change passwords use:") }} <b>python pyLoadCore.py -u</b><br> {{ _("Important: Admin user have always all permissions!") }} - - <form action="" method="POST"> - <table class="settable wide"> - <thead style="font-size: 11px"> +<br> +<br> + <form action="" method="POST" > + <table class="settable table" style="width:50%;"> + <thead> <th> {{ _("Name") }} </th> @@ -38,9 +40,8 @@ {% for name, data in users.iteritems() %} <tr> <td>{{ name }}</td> - <td><a class="change_password" href="#" id="change_pw|{{name}}">{{ _("change") }}</a></td> - <td><input name="{{ name }}|admin" type="checkbox" {% if data.perms.admin %} - checked="True" {% endif %}"></td> + <td><a class="change_password btn btn-default btn-xs" href="#" id="change_pw|{{name}}"><span class="glyphicon glyphicon-pencil"></span> {{ _("change") }}</a></td> + <td><input name="{{ name }}|admin" type="checkbox" {% if data.perms.admin %} checked="True" {% endif %}></td> <td> <select multiple="multiple" size="{{ permlist|length }}" name="{{ name }}|perms"> {% for perm in permlist %} @@ -58,40 +59,41 @@ </table> - <button class="styled_button" type="submit">{{ _("Submit") }}</button> + <button class="btn btn-primary" type="submit">{{ _("Submit") }}</button> </form> {% endblock %} {% block hidden %} - <div id="password_box" class="window_box" style="z-index: 2"> - <form id="password_form" action="/json/change_password" method="POST" enctype="multipart/form-data"> - <h1>{{ _("Change Password") }}</h1> - + <div id="password_box" style="z-index: 2"> + <form id="password_form" class="from-group" action="/json/change_password" method="POST" enctype="multipart/form-data"> + <h3>{{ _("Change Password") }}</h3> <p>{{ _("Enter your current and desired Password.") }}</p> - <label for="user_login">{{ _("User") }} - <span class="small">{{ _("Your username.") }}</span> - </label> - <input id="user_login" name="user_login" type="text" size="20"/> - - <label for="login_current_password">{{ _("Current password") }} - <span class="small">{{ _("The password for this account.") }}</span> - </label> - <input id="login_current_password" name="login_current_password" type="password" size="20"/> - - <label for="login_new_password">{{ _("New password") }} - <span class="small">{{ _("The new password.") }}</span> - </label> - <input id="login_new_password" name="login_new_password" type="password" size="20"/> - <label for="login_new_password2">{{ _("New password (repeat)") }} - <span class="small">{{ _("Please repeat the new password.") }}</span> - </label> - <input id="login_new_password2" name="login_new_password2" type="password" size="20"/> - - - <button id="login_password_button" type="submit">{{ _("Submit") }}</button> - <button id="login_password_reset" style="margin-left: 0" type="reset">{{ _("Reset") }}</button> +<div class="form-group"> + <label for="user_login">{{ _("User") }}</label> + <input class="form-control" id="user_login" name="user_login" type="text"/> + <p class="help-block">{{ _("Your username.") }}</p> + </div> + <div class="form-group"> + <label for="login_current_password">{{ _("Current password") }}</label> + <input class="form-control" id="login_current_password" name="login_current_password" type="password"/> + <p class="help-block">{{ _("The password for this account.") }}</p> + </div> + <div class="form-group"> + <label for="login_new_password">{{ _("New password") }}</label> + <input class="form-control" id="login_new_password" name="login_new_password" type="password"/> + <p class="help-block">{{ _("The new password.") }}</p> + </div> + <div class="form-group"> + <label for="login_new_password2">{{ _("New password (repeat)") }}</label> + <input class="form-control" id="login_new_password2" name="login_new_password2" type="password" /> + <p class="help-block">{{ _("Please repeat the new password.") }}</p> + </div> + + + + <button class="btn btn-primary" id="login_password_button" type="submit" style="float: right">{{ _("Submit") }}</button> + <button class="btn btn-default" id="login_password_reset" style="margin-right: 5px; float: right" type="reset">{{ _("Reset") }}</button> <div class="spacer"></div> - </form> </div> diff --git a/module/web/templates/default/home.html b/module/web/templates/default/home.html index 89074dd26..0cbbca280 100644 --- a/module/web/templates/default/home.html +++ b/module/web/templates/default/home.html @@ -138,15 +138,12 @@ var LinkEntry = new Class({ percent: new Element('span', { 'html': item.percent+ '% / '+ humanFileSize(item.size-item.bleft) }), - remove: new Element('img',{ - 'src': 'media/default/img/control_cancel.png', - 'styles':{ - 'vertical-align': 'middle', - 'margin-right': '-20px', - 'margin-left': '5px', - 'margin-top': '-2px', - 'cursor': 'pointer' - } + remove: new Element('span',{ + 'html': '', + 'class': 'glyphicon glyphicon-remove', + 'styles':{ + 'margin-left': '3px', + } }), pgbTr: new Element('tr', { 'html':'', diff --git a/module/web/templates/default/info.html b/module/web/templates/default/info.html index 77ae57376..792490329 100644 --- a/module/web/templates/default/info.html +++ b/module/web/templates/default/info.html @@ -37,43 +37,43 @@ <h3>{{ _("System") }}</h3> <table class="system"> <tr> - <td>{{ _("Python:") }}</td> + <td><b>{{ _("Python:") }}</b></td> <td>{{ python }}</td> </tr> <tr> - <td>{{ _("OS:") }}</td> + <td><b>{{ _("OS:") }}</b></td> <td>{{ os }}</td> </tr> <tr> - <td>{{ _("pyLoad version:") }}</td> + <td><b>{{ _("pyLoad version:") }}</b></td> <td>{{ version }}</td> </tr> <tr> - <td>{{ _("Installation Folder:") }}</td> + <td><b>{{ _("Installation Folder:") }}</b></td> <td>{{ folder }}</td> </tr> <tr> - <td>{{ _("Config Folder:") }}</td> + <td><b>{{ _("Config Folder:") }}</b></td> <td>{{ config }}</td> </tr> <tr> - <td>{{ _("Download Folder:") }}</td> + <td><b>{{ _("Download Folder:") }}</b></td> <td>{{ download }}</td> </tr> <tr> - <td>{{ _("Free Space:") }}</td> + <td><b>{{ _("Free Space:") }}</b></td> <td>{{ freespace }}</td> </tr> <tr> - <td>{{ _("Language:") }}</td> + <td><b>{{ _("Language:") }}</b></td> <td>{{ language }}</td> </tr> <tr> - <td>{{ _("Webinterface Port:") }}</td> + <td><b>{{ _("Webinterface Port:") }}</b></td> <td>{{ webif }}</td> </tr> <tr> - <td>{{ _("Remote Interface Port:") }}</td> + <td><b>{{ _("Remote Interface Port:") }}</b></td> <td>{{ remote }}</td> </tr> </table> |