From a4565e88edbc8e3bd092a475469769c86a4c350c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nicolas=20L=C5=93uillet?= <nicolas.loeuillet@gmail.com>
Date: Fri, 2 Aug 2013 22:40:51 +0200
Subject: add Twig & refactor poche

---
 tpl/login.twig | 31 +++++++++++++++++++++++++++++++
 1 file changed, 31 insertions(+)
 create mode 100644 tpl/login.twig

(limited to 'tpl/login.twig')

diff --git a/tpl/login.twig b/tpl/login.twig
new file mode 100644
index 00000000..390718b6
--- /dev/null
+++ b/tpl/login.twig
@@ -0,0 +1,31 @@
+{% extends "layout.twig" %}
+{% block title %}Login{% endblock %}
+{% block content %}
+            <form method="post" action="?login" name="loginform">
+                <fieldset class="w500p center">
+                    <h2 class="mbs txtcenter">{% trans "login to your poche" %}</h2>
+                    {% if demo == 1 %}<p>{% trans "you are in demo mode, some features may be disabled." %}</p>{% endif %}
+					<div class="row">
+						<label class="col w150p" for="login">{% trans "Login" %}</label>
+						<input class="col" type="text" id="login" name="login" placeholder="Login" tabindex="1" autofocus {% if demo == 1 %}value="poche"{% endif %} />
+					</div>
+
+					<div class="row">
+						<label class="col w150p" for="password">{% trans "Password" %}</label>
+						<input class="col" type="password" id="password" name="password" placeholder="Password" tabindex="2" {% if demo == 1 %}value="poche"{% endif %} />
+					</div>
+					<div class="row">
+						<label class="col w150p">{% trans "Stay signed in" %}</label>
+						<div class="col">
+							<input type="checkbox" name="longlastingsession" tabindex="3">
+							<small class="inbl">(Do not check on public computers)</small>
+						</div>
+					</div>
+					<div class="row mts txtcenter">
+						<button class="bouton" type="submit" tabindex="4">{% trans "Sign in" %}</button>
+					</div>
+                </fieldset>
+                <input type="hidden" name="returnurl" value="{{ referer }}">
+                <input type="hidden" name="token" value="{{ token }}">
+            </form>
+{% endblock %}
\ No newline at end of file
-- 
cgit v1.2.3


From 8cbb2a88024969f7efd90f8053f3b0805fa2f8fa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nicolas=20L=C5=93uillet?= <nicolas.loeuillet@gmail.com>
Date: Sat, 3 Aug 2013 08:25:11 +0200
Subject: twig implementation

---
 tpl/login.twig | 10 ++++++++++
 1 file changed, 10 insertions(+)

(limited to 'tpl/login.twig')

diff --git a/tpl/login.twig b/tpl/login.twig
index 390718b6..c95a5f02 100644
--- a/tpl/login.twig
+++ b/tpl/login.twig
@@ -1,5 +1,15 @@
 {% extends "layout.twig" %}
+
 {% block title %}Login{% endblock %}
+{% block messages %}
+            <div class="messages">
+                <ul>
+                {% for error in errors %}
+                    <li>{{ error.value|e }}</li>
+                {% endfor %}
+                </ul>
+            </div>
+{% endblock %}
 {% block content %}
             <form method="post" action="?login" name="loginform">
                 <fieldset class="w500p center">
-- 
cgit v1.2.3


From 2b840e0cfb63a453bea67a98541f3df9c273c5f5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nicolas=20L=C5=93uillet?= <nicolas.loeuillet@gmail.com>
Date: Sat, 3 Aug 2013 08:57:35 +0200
Subject: twig implementation

---
 tpl/login.twig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'tpl/login.twig')

diff --git a/tpl/login.twig b/tpl/login.twig
index c95a5f02..d1080530 100644
--- a/tpl/login.twig
+++ b/tpl/login.twig
@@ -1,6 +1,6 @@
 {% extends "layout.twig" %}
 
-{% block title %}Login{% endblock %}
+{% block title %}{% trans "login to your poche" %}{% endblock %}
 {% block messages %}
             <div class="messages">
                 <ul>
-- 
cgit v1.2.3


From 4f5b44bd3bd490309eb2ba7b44df4769816ba729 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nicolas=20L=C5=93uillet?= <nicolas.loeuillet@gmail.com>
Date: Sat, 3 Aug 2013 19:26:54 +0200
Subject: twig implementation

---
 tpl/login.twig | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'tpl/login.twig')

diff --git a/tpl/login.twig b/tpl/login.twig
index d1080530..fcb9b4d6 100644
--- a/tpl/login.twig
+++ b/tpl/login.twig
@@ -1,11 +1,11 @@
 {% extends "layout.twig" %}
 
 {% block title %}{% trans "login to your poche" %}{% endblock %}
-{% block messages %}
+{% block notices %}
             <div class="messages">
                 <ul>
-                {% for error in errors %}
-                    <li>{{ error.value|e }}</li>
+                {% for notice in notices %}
+                    <li>{{ notice.value|e }}</li>
                 {% endfor %}
                 </ul>
             </div>
@@ -28,7 +28,7 @@
 						<label class="col w150p">{% trans "Stay signed in" %}</label>
 						<div class="col">
 							<input type="checkbox" name="longlastingsession" tabindex="3">
-							<small class="inbl">(Do not check on public computers)</small>
+							<small class="inbl">{% trans "(Do not check on public computers)" %}</small>
 						</div>
 					</div>
 					<div class="row mts txtcenter">
-- 
cgit v1.2.3


From c765c3679fee3ed9e4bad9954a808116187a7e83 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nicolas=20L=C5=93uillet?= <nicolas.loeuillet@gmail.com>
Date: Sun, 4 Aug 2013 21:42:46 +0200
Subject: import in poche and not in an external file

---
 tpl/login.twig | 9 ---------
 1 file changed, 9 deletions(-)

(limited to 'tpl/login.twig')

diff --git a/tpl/login.twig b/tpl/login.twig
index fcb9b4d6..70c2190c 100644
--- a/tpl/login.twig
+++ b/tpl/login.twig
@@ -1,15 +1,6 @@
 {% extends "layout.twig" %}
 
 {% block title %}{% trans "login to your poche" %}{% endblock %}
-{% block notices %}
-            <div class="messages">
-                <ul>
-                {% for notice in notices %}
-                    <li>{{ notice.value|e }}</li>
-                {% endfor %}
-                </ul>
-            </div>
-{% endblock %}
 {% block content %}
             <form method="post" action="?login" name="loginform">
                 <fieldset class="w500p center">
-- 
cgit v1.2.3


From 63c35580c7d60e2278ee6fe9ba2d4440ff0308d6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nicolas=20L=C5=93uillet?= <nicolas.loeuillet@gmail.com>
Date: Sun, 4 Aug 2013 22:35:08 +0200
Subject: twig implementation

---
 tpl/login.twig | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'tpl/login.twig')

diff --git a/tpl/login.twig b/tpl/login.twig
index 70c2190c..c3028795 100644
--- a/tpl/login.twig
+++ b/tpl/login.twig
@@ -16,9 +16,9 @@
 						<input class="col" type="password" id="password" name="password" placeholder="Password" tabindex="2" {% if demo == 1 %}value="poche"{% endif %} />
 					</div>
 					<div class="row">
-						<label class="col w150p">{% trans "Stay signed in" %}</label>
+						<label class="col w150p" for="longlastingsession">{% trans "Stay signed in" %}</label>
 						<div class="col">
-							<input type="checkbox" name="longlastingsession" tabindex="3">
+							<input type="checkbox" id="longlastingsession" name="longlastingsession" tabindex="3">
 							<small class="inbl">{% trans "(Do not check on public computers)" %}</small>
 						</div>
 					</div>
-- 
cgit v1.2.3


From a62788c61ef80e6b0f1cf0b6304b2dfd2223aa38 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nicolas=20L=C5=93uillet?= <nicolas.loeuillet@gmail.com>
Date: Mon, 5 Aug 2013 09:43:33 +0200
Subject: #100: welcome to you, instapaper users

---
 tpl/login.twig | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'tpl/login.twig')

diff --git a/tpl/login.twig b/tpl/login.twig
index c3028795..b24674e2 100644
--- a/tpl/login.twig
+++ b/tpl/login.twig
@@ -5,15 +5,15 @@
             <form method="post" action="?login" name="loginform">
                 <fieldset class="w500p center">
                     <h2 class="mbs txtcenter">{% trans "login to your poche" %}</h2>
-                    {% if demo == 1 %}<p>{% trans "you are in demo mode, some features may be disabled." %}</p>{% endif %}
+                    {% if constant('MODE_DEMO') == 1 %}<p>{% trans "you are in demo mode, some features may be disabled." %}</p>{% endif %}
 					<div class="row">
 						<label class="col w150p" for="login">{% trans "Login" %}</label>
-						<input class="col" type="text" id="login" name="login" placeholder="Login" tabindex="1" autofocus {% if demo == 1 %}value="poche"{% endif %} />
+						<input class="col" type="text" id="login" name="login" placeholder="Login" tabindex="1" autofocus {% if constant('MODE_DEMO') == 1 %}value="poche"{% endif %} />
 					</div>
 
 					<div class="row">
 						<label class="col w150p" for="password">{% trans "Password" %}</label>
-						<input class="col" type="password" id="password" name="password" placeholder="Password" tabindex="2" {% if demo == 1 %}value="poche"{% endif %} />
+						<input class="col" type="password" id="password" name="password" placeholder="Password" tabindex="2" {% if constant('MODE_DEMO') == 1 %}value="poche"{% endif %} />
 					</div>
 					<div class="row">
 						<label class="col w150p" for="longlastingsession">{% trans "Stay signed in" %}</label>
-- 
cgit v1.2.3


From 7ce7ec4c942e0a3567858ad0ec8e654000b49a3f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nicolas=20L=C5=93uillet?= <nicolas.loeuillet@gmail.com>
Date: Tue, 6 Aug 2013 14:18:03 +0200
Subject: prepare to multi users

---
 tpl/login.twig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'tpl/login.twig')

diff --git a/tpl/login.twig b/tpl/login.twig
index b24674e2..0ae130bc 100644
--- a/tpl/login.twig
+++ b/tpl/login.twig
@@ -23,7 +23,7 @@
 						</div>
 					</div>
 					<div class="row mts txtcenter">
-						<button class="bouton" type="submit" tabindex="4">{% trans "Sign in" %}</button>
+						<button class="bouton" type="submit" tabindex="4">{% trans "Login" %}</button>
 					</div>
                 </fieldset>
                 <input type="hidden" name="returnurl" value="{{ referer }}">
-- 
cgit v1.2.3