summaryrefslogtreecommitdiffstats
path: root/module/web/templates/default
diff options
context:
space:
mode:
authorGravatar RaNaN <Mast3rRaNaN@hotmail.de> 2012-09-17 17:39:26 +0200
committerGravatar RaNaN <Mast3rRaNaN@hotmail.de> 2012-09-17 17:39:26 +0200
commit6b4ef3af1319efd8e2069f4c67332378b8a1c64e (patch)
treef2b3fec7854925f53d6e9cc610d55b6f7f57d625 /module/web/templates/default
parentbreadcrumbs for dashboard (diff)
downloadpyload-6b4ef3af1319efd8e2069f4c67332378b8a1c64e.tar.xz
removed unneeded css, new login style
Diffstat (limited to 'module/web/templates/default')
-rw-r--r--module/web/templates/default/base.html3
-rw-r--r--module/web/templates/default/dashboard.html4
-rw-r--r--module/web/templates/default/login.html36
3 files changed, 26 insertions, 17 deletions
diff --git a/module/web/templates/default/base.html b/module/web/templates/default/base.html
index 3a5a6e83e..1a8bb6af5 100644
--- a/module/web/templates/default/base.html
+++ b/module/web/templates/default/base.html
@@ -3,7 +3,7 @@
<head>
<meta charset="utf-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
- <title>{% block title %}pyLoad {{ _("Webinterface") }}{% endblock %}</title>
+ <title>{% block title %}pyLoad {{ _("WebUI") }}{% endblock %}</title>
<meta name="description" content="pyLoad {{ _("Webinterface") }}">
<meta name="viewport" content="width=device-width">
@@ -12,7 +12,6 @@
<link href="static/css/bootstrap.css" rel="stylesheet" type="text/css"/>
<link href="static/css/font.css" rel="stylesheet" type="text/css"/>
<link href="static/css/default/style.css" rel="stylesheet" type="text/css" media="screen"/>
- <link href="static/css/black-tie/jquery-ui-1.8.22.custom.css" rel="stylesheet" type="text/css" media="screen"/>
<script type="text/javascript" data-main="static/js/default" src="static/js/libs/require-2.0.6.js"></script>
<script>
diff --git a/module/web/templates/default/dashboard.html b/module/web/templates/default/dashboard.html
index 6bfa2eb5a..777e73ae7 100644
--- a/module/web/templates/default/dashboard.html
+++ b/module/web/templates/default/dashboard.html
@@ -1,4 +1,8 @@
{% extends 'default/base.html' %}
+{% block title %}
+ {{_("Dashboard")}} - {{ super()}}}
+{% endblock %}
+
{% block require %}
App.initPackageTree();
{% endblock %}
diff --git a/module/web/templates/default/login.html b/module/web/templates/default/login.html
index 9454b709d..c8cd78a33 100644
--- a/module/web/templates/default/login.html
+++ b/module/web/templates/default/login.html
@@ -9,25 +9,31 @@
{% endif %}
<br>
<div class="login">
- <div class="login_title">
- {{_("Login")}}
- </div>
- <form action="/login" method="post" accept-charset="utf-8" id="login">
- <input type="hidden" name="do" value="login" />
- <div class="login_user">
- <span>{{_("Username")}}</span>
- <input type="text" size="20" name="username" />
+ <form action="/login" method="post" class="form-horizontal">
+ <legend>Login</legend>
+ <div class="control-group">
+ <label class="control-label" for="inputEmail">Username</label>
+ <div class="controls">
+ <input type="text" id="inputEmail" placeholder="Username" name="username">
+ </div>
</div>
- <div class="login_password">
- <span>{{_("Password")}}</span>
- <input type="password" size="20" name="password" />
+ <div class="control-group">
+ <label class="control-label" for="inputPassword">Password</label>
+ <div class="controls">
+ <input type="password" id="inputPassword" placeholder="Password" name="password">
+ </div>
</div>
- <div class="login_submit">
- <input type="submit" value="Login" class="button" />
+ <div class="control-group">
+ <div class="controls">
+ <label class="checkbox">
+ <input type="checkbox"> Remember me
+ </label>
+ <button type="submit" class="btn">Login</button>
+ </div>
</div>
- </form>
+ </form>
</div>
-
+<br>
<div style="text-align: center">
{% if errors %}
<p>{{_("Your username and password didn't match. Please try again.")}}</p>