From 121691e90026dcfaaecef0a1db07d40cd43a9278 Mon Sep 17 00:00:00 2001
From: Thomas Citharel <tcit@tcit.fr>
Date: Fri, 23 Jan 2015 16:34:56 +0100
Subject: working on registration support

---
 themes/baggy/login.twig      |  5 +++++
 themes/baggy/register.twig   | 25 +++++++++++++++++++++++++
 themes/default/login.twig    |  5 +++++
 themes/default/register.twig | 20 ++++++++++++++++++++
 4 files changed, 55 insertions(+)
 create mode 100644 themes/baggy/register.twig
 create mode 100644 themes/default/register.twig

(limited to 'themes')

diff --git a/themes/baggy/login.twig b/themes/baggy/login.twig
index 58290e9c..7906cc20 100644
--- a/themes/baggy/login.twig
+++ b/themes/baggy/login.twig
@@ -31,4 +31,9 @@
                 <input type="hidden" name="token" value="{{ token }}">
             </form>
     {% endif %}
+    {% if constant('ALLOW_REGISTER') == 1 %}
+    	<div class="register">
+    		<a href="?registerform">{% trans "Register" %}</a>
+    	</div>
+    {% endif %}
 {% endblock %}
diff --git a/themes/baggy/register.twig b/themes/baggy/register.twig
new file mode 100644
index 00000000..5744a481
--- /dev/null
+++ b/themes/baggy/register.twig
@@ -0,0 +1,25 @@
+{% extends "layout-login.twig" %}
+{% block content %}
+
+<h2>{% trans 'Add user' %}</h2>
+    <form method="post" action="?register">
+        <fieldset class="w500p">
+        <div class="row">
+            <label class="col w150p" for="newusername">{% trans 'Login' %}</label>
+            <input class="col" type="text" id="newusername" name="newusername" placeholder="{% trans 'Login' %}" required>
+        </div>
+        <div class="row">
+            <label class="col w150p" for="password4newuser">{% trans "Password" %}</label>
+            <input class="col" type="password" id="password4newuser" name="password4newuser" placeholder="{% trans 'Password' %}" required>
+        </div>
+        <div class="row">
+            <label class="col w150p" for="newuseremail">{% trans 'Email' %}</label>
+            <input class="col" type="email" id="newuseremail" name="newuseremail" placeholder="{% trans 'Email' %}">
+        </div>
+        <div class="row mts txtcenter">
+            <button type="submit">{% trans "Register" %}</button>
+        </div>
+        </fieldset>
+    </form>
+
+{% endblock %}
\ No newline at end of file
diff --git a/themes/default/login.twig b/themes/default/login.twig
index b9f8b497..d4f44019 100644
--- a/themes/default/login.twig
+++ b/themes/default/login.twig
@@ -31,4 +31,9 @@
                 <input type="hidden" name="token" value="{{ token }}">
             </form>
     {% endif %}
+    {% if constant('ALLOW_REGISTER') == 1 %}
+    	<div class="registerform">
+    		<a href="?register">{% trans "Register" %}</a>
+    	</div>
+    {% endif %}
 {% endblock %}
diff --git a/themes/default/register.twig b/themes/default/register.twig
new file mode 100644
index 00000000..755ae132
--- /dev/null
+++ b/themes/default/register.twig
@@ -0,0 +1,20 @@
+<h2>{% trans 'Add user' %}</h2>
+    <form method="post" action="?newuser">
+        <fieldset class="w500p">
+        <div class="row">
+            <label class="col w150p" for="newusername">{% trans 'Login' %}</label>
+            <input class="col" type="text" id="newusername" name="newusername" placeholder="{% trans 'Login' %}" required>
+        </div>
+        <div class="row">
+            <label class="col w150p" for="password4newuser">{% trans "Password" %}</label>
+            <input class="col" type="password" id="password4newuser" name="password4newuser" placeholder="{% trans 'Password' %}" required>
+        </div>
+        <div class="row">
+            <label class="col w150p" for="newuseremail">{% trans 'Email' %}</label>
+            <input class="col" type="email" id="newuseremail" name="newuseremail" placeholder="{% trans 'Email' %}">
+        </div>
+        <div class="row mts txtcenter">
+            <button type="submit">{% trans "Register" %}</button>
+        </div>
+        </fieldset>
+    </form>
\ No newline at end of file
-- 
cgit v1.2.3


From 698eda739e705f5605711af927eb5e3720c7c97c Mon Sep 17 00:00:00 2001
From: Thomas Citharel <tcit@tcit.fr>
Date: Sat, 14 Feb 2015 12:35:22 +0100
Subject: mainly css improvements

---
 themes/baggy/login.twig    | 10 +++++-----
 themes/baggy/register.twig | 41 ++++++++++++++++++++++-------------------
 2 files changed, 27 insertions(+), 24 deletions(-)

(limited to 'themes')

diff --git a/themes/baggy/login.twig b/themes/baggy/login.twig
index 7906cc20..d941ca93 100644
--- a/themes/baggy/login.twig
+++ b/themes/baggy/login.twig
@@ -26,14 +26,14 @@
 					<div class="row mts txtcenter">
 						<button class="bouton" type="submit" tabindex="4">{% trans "Sign in" %}</button>
 					</div>
+					{% if constant('ALLOW_REGISTER') == 1 %}
+    				<div class="register">
+    					<a href="?registerform">{% trans "Register" %}</a>
+    				</div>
+    {% endif %}
                 </fieldset>
                 <input type="hidden" name="returnurl" value="{{ referer }}">
                 <input type="hidden" name="token" value="{{ token }}">
             </form>
     {% endif %}
-    {% if constant('ALLOW_REGISTER') == 1 %}
-    	<div class="register">
-    		<a href="?registerform">{% trans "Register" %}</a>
-    	</div>
-    {% endif %}
 {% endblock %}
diff --git a/themes/baggy/register.twig b/themes/baggy/register.twig
index 5744a481..e2c56c73 100644
--- a/themes/baggy/register.twig
+++ b/themes/baggy/register.twig
@@ -1,25 +1,28 @@
 {% extends "layout-login.twig" %}
 {% block content %}
 
+<form method="post" action="?register">
 <h2>{% trans 'Add user' %}</h2>
-    <form method="post" action="?register">
-        <fieldset class="w500p">
-        <div class="row">
-            <label class="col w150p" for="newusername">{% trans 'Login' %}</label>
-            <input class="col" type="text" id="newusername" name="newusername" placeholder="{% trans 'Login' %}" required>
-        </div>
-        <div class="row">
-            <label class="col w150p" for="password4newuser">{% trans "Password" %}</label>
-            <input class="col" type="password" id="password4newuser" name="password4newuser" placeholder="{% trans 'Password' %}" required>
-        </div>
-        <div class="row">
-            <label class="col w150p" for="newuseremail">{% trans 'Email' %}</label>
-            <input class="col" type="email" id="newuseremail" name="newuseremail" placeholder="{% trans 'Email' %}">
-        </div>
-        <div class="row mts txtcenter">
-            <button type="submit">{% trans "Register" %}</button>
-        </div>
-        </fieldset>
-    </form>
+    <fieldset class="w500p">
+    <div class="row">
+        <label class="col w150p" for="newusername">{% trans 'Login' %}</label>
+        <input class="col" type="text" id="newusername" name="newusername" placeholder="{% trans 'Login' %}" required>
+    </div>
+    <div class="row">
+        <label class="col w150p" for="password4newuser">{% trans "Password" %}</label>
+        <input class="col" type="password" id="password4newuser" name="password4newuser" placeholder="{% trans 'Password' %}" required>
+    </div>
+    <div class="row">
+        <label class="col w150p" for="newuseremail">{% trans 'Email (not required)' %}</label>
+        <input class="col" type="email" id="newuseremail" name="newuseremail" placeholder="{% trans 'Email' %}">
+    </div>
+    <div class="row mts txtcenter">
+        <button type="submit">{% trans "Register" %}</button>
+    </div>
+    <div class="register">
+        <a href="?">{% trans "Back" %}</a>
+    </div>
+    </fieldset>
+</form>
 
 {% endblock %}
\ No newline at end of file
-- 
cgit v1.2.3