working login

3 files changed, 19 insertions, 7 deletions

diff --git a/module/web/templates/default/base.html b/module/web/templates/default/base.html
index bbbefb4b6..e1fe81f1b 100644
--- a/module/web/templates/default/base.html
+++ b/module/web/templates/default/base.html
@@ -27,16 +27,17 @@
             <div class="logo"></div>

             <span class="title">pyLoad</span>

 

+            {% if user %}

             <div id="notification_div">

                 <h1>Important Stuff will be here!</h1>

             </div>

 

             <div class="header_block">

                 <div class="icon_info">

-                    <img src="static/img/default/icon_user_small_white.png" height="20px"/><span>User</span>

+                    <img src="static/img/default/icon_user_small_white.png" height="20px"/><span>{{ user.name }}</span>

                 </div>

                 <div class="icon_info" style="text-align: center">

-                    Logout

+                    <a href="logout">Logout</a>

                 </div>

             </div>

             <div id="speedgraph"></div>

@@ -48,16 +49,17 @@
                     <img src="static/img/default/icon_clock_small_white.png" height="20px"/><span>5 / 125</span>

                 </div>

             </div>

+            {% endif %}

         </div>

     </header>

     <div id="push"></div>

     <div id="content">

         {% for message in messages %}

-            <b><p>{{ message }}</p></b>

+            <div style="text-align: center">

+            <b>{{ message }}</b><br/>

+            </div>

         {% endfor %}

 

-        <h1>Test!</h1>

-

         {% block content %}

         {% endblock content %}

     </div>

diff --git a/module/web/templates/default/login.html b/module/web/templates/default/login.html
index 914ec6f16..95c62a992 100644
--- a/module/web/templates/default/login.html
+++ b/module/web/templates/default/login.html
@@ -3,7 +3,7 @@
 {% block title %}{{_("Login")}} - {{super()}} {% endblock %}
 
 {% block content %}
-
+<br>
 <div class="login">
 	<div class="login_title">
 	    {{_("Login")}}
@@ -24,11 +24,12 @@
    </form>
 </div>
 
-
+<div style="text-align: center">
 {% if errors %}
 <p>{{_("Your username and password didn't match. Please try again.")}}</p>
   {{ _("To reset your login data or add an user run:") }} <b> python pyLoadCore.py -u</b>
 {% endif %}
+</div>
 
     
 {% endblock %}
\ No newline at end of file
diff --git a/module/web/templates/default/logout.html b/module/web/templates/default/logout.html
new file mode 100644
index 000000000..a100c7004
--- /dev/null
+++ b/module/web/templates/default/logout.html
@@ -0,0 +1,9 @@
+{% extends 'default/base.html' %}
+
+{% block head %}
+    <meta http-equiv="refresh" content="3; url=/">
+{% endblock %}
+
+{% block content %}
+    <p><b>{{_("fYou were successfully logged out.")}}</b></p>
+{% endblock %}