From a8f763fb85756f69899f7b3b71c01bb01461ee3c Mon Sep 17 00:00:00 2001
From: RaNaN <Mast3rRaNaN@hotmail.de>
Date: Fri, 10 Aug 2012 22:12:10 +0200
Subject: beginning new pyload web-ui from scratch

---
 module/web/templates/default/login.html | 36 ---------------------------------
 1 file changed, 36 deletions(-)
 delete mode 100644 module/web/templates/default/login.html

(limited to 'module/web/templates/default/login.html')

diff --git a/module/web/templates/default/login.html b/module/web/templates/default/login.html
deleted file mode 100644
index 9e91ad309..000000000
--- a/module/web/templates/default/login.html
+++ /dev/null
@@ -1,36 +0,0 @@
-{% extends 'default/base.html' %}
-
-{% block title %}{{_("Login")}} - {{super()}} {% endblock %}
-
-{% block content %}
-
-<div class="centeralign">
-<form action="" method="post" accept-charset="utf-8" id="login">
-    <div class="no">
-        <input type="hidden" name="do" value="login" />
-        <fieldset>
-        <legend>Login</legend>
-        <label>
-            <span>{{_("Username")}}</span>
-            <input type="text" size="20" name="username" />
-        </label>
-        <br />
-        <label>
-            <span>{{_("Password")}}</span>
-            <input type="password" size="20" name="password" />
-        </label>
-        <br />
-        <input type="submit" value="Login" class="button" />
-        </fieldset>
-    </div>
-</form>
-
-{% 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>
-<br>
-    
-{% endblock %}
-- 
cgit v1.2.3


From d52fb0f7b6d0700ed43f715cf9abf3ae6e1b223c Mon Sep 17 00:00:00 2001
From: godofdream <soilfiction@gmail.com>
Date: Sun, 12 Aug 2012 19:52:01 +0200
Subject: added login.html

---
 module/web/templates/default/login.html | 34 +++++++++++++++++++++++++++++++++
 1 file changed, 34 insertions(+)
 create mode 100644 module/web/templates/default/login.html

(limited to 'module/web/templates/default/login.html')

diff --git a/module/web/templates/default/login.html b/module/web/templates/default/login.html
new file mode 100644
index 000000000..914ec6f16
--- /dev/null
+++ b/module/web/templates/default/login.html
@@ -0,0 +1,34 @@
+{% extends 'default/base.html' %}
+
+{% block title %}{{_("Login")}} - {{super()}} {% endblock %}
+
+{% block content %}
+
+<div class="login">
+	<div class="login_title">
+	    {{_("Login")}}
+	</div>
+   <form action="" 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" />
+        </div>
+        <div class="login_password">
+            <span>{{_("Password")}}</span>
+            <input type="password" size="20" name="password" />
+        </div>
+        <div class="login_submit">
+        <input type="submit" value="Login" class="button" />
+        </div>
+   </form>
+</div>
+
+
+{% 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 %}
+
+    
+{% endblock %}
\ No newline at end of file
-- 
cgit v1.2.3


From 941e3021000e59020f66419cc2156aee30972121 Mon Sep 17 00:00:00 2001
From: RaNaN <Mast3rRaNaN@hotmail.de>
Date: Mon, 13 Aug 2012 17:40:10 +0200
Subject: working login

---
 module/web/templates/default/login.html | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'module/web/templates/default/login.html')

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
-- 
cgit v1.2.3


From d8119f648e63a4728433e67e79d2a99296a8c2c1 Mon Sep 17 00:00:00 2001
From: godofdream <soilfiction@gmail.com>
Date: Thu, 16 Aug 2012 17:48:39 +0200
Subject: Added Mobile WebIf, some Layouting

---
 module/web/templates/default/login.html | 4 ----
 1 file changed, 4 deletions(-)

(limited to 'module/web/templates/default/login.html')

diff --git a/module/web/templates/default/login.html b/module/web/templates/default/login.html
index 95c62a992..035853a26 100644
--- a/module/web/templates/default/login.html
+++ b/module/web/templates/default/login.html
@@ -1,7 +1,5 @@
 {% extends 'default/base.html' %}
-
 {% block title %}{{_("Login")}} - {{super()}} {% endblock %}
-
 {% block content %}
 <br>
 <div class="login">
@@ -30,6 +28,4 @@
   {{ _("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
-- 
cgit v1.2.3


From 7bc7de7332670f692eda576787e671c2eba0e5bb Mon Sep 17 00:00:00 2001
From: godofdream <soilfiction@gmail.com>
Date: Fri, 17 Aug 2012 01:29:03 +0200
Subject: added division into default template and mobile template, added Base
 site

---
 module/web/templates/default/login.html | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

(limited to 'module/web/templates/default/login.html')

diff --git a/module/web/templates/default/login.html b/module/web/templates/default/login.html
index 035853a26..9454b709d 100644
--- a/module/web/templates/default/login.html
+++ b/module/web/templates/default/login.html
@@ -2,11 +2,17 @@
 {% block title %}{{_("Login")}} - {{super()}} {% endblock %}
 {% block content %}
 <br>
+{% if logout %}
+<div id="logged_out">
+	<b>{{_("You were successfully logged out.")}}</b>
+</div>
+{% endif %}
+<br>
 <div class="login">
 	<div class="login_title">
 	    {{_("Login")}}
 	</div>
-   <form action="" method="post" accept-charset="utf-8" id="login">
+   <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>
-- 
cgit v1.2.3


From 6b4ef3af1319efd8e2069f4c67332378b8a1c64e Mon Sep 17 00:00:00 2001
From: RaNaN <Mast3rRaNaN@hotmail.de>
Date: Mon, 17 Sep 2012 17:39:26 +0200
Subject: removed unneeded css, new login style

---
 module/web/templates/default/login.html | 36 +++++++++++++++++++--------------
 1 file changed, 21 insertions(+), 15 deletions(-)

(limited to 'module/web/templates/default/login.html')

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>
-- 
cgit v1.2.3