From e858ac27768ae7b5cc1f76d356c66f8872bfc666 Mon Sep 17 00:00:00 2001
From: nicosomb <nicolas@loeuillet.org>
Date: Mon, 22 Apr 2013 08:32:30 +0200
Subject: login & password dans le readme

---
 README.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/README.md b/README.md
index 0bcce535..6700415a 100644
--- a/README.md
+++ b/README.md
@@ -5,6 +5,8 @@ Abandon Pocket, Instapaper and other Readability service : adopt poche. It is th
 
 The website of poche is [inthepoche.com](http://inthepoche.com).
 
+To test poche, a demo website is online : [demo.inthepoche.com](http://demo.inthepoche.com) (login poche, password poche).
+
 To get news from poche, [follow us on twitter](http://twitter.com/getpoche) or [read the poche blog](http://inthepoche.com/blog).
 
 [![flattr](http://api.flattr.com/button/flattr-badge-large.png)](http://flattr.com/thing/1265480/poche-a-read-it-later-open-source-system)
-- 
cgit v1.2.3


From d3607de9297d1af9a788c90b1297e644ce882ca7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nicolas=20L=C5=93uillet?= <nicolas@loeuillet.org>
Date: Mon, 22 Apr 2013 20:27:23 +0300
Subject: Update style.css

coquille pour l'affichage des liens sur la page view
---
 css/style.css | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/css/style.css b/css/style.css
index 36ebf85d..b8327c30 100644
--- a/css/style.css
+++ b/css/style.css
@@ -117,7 +117,7 @@ input[type=submit].delete {
     text-align: left;
 }
 
-#article.tools ul li{
+#article .tools ul li{
     display: inline;
 }
 
@@ -214,4 +214,4 @@ body.article {
 .messages.warning p { background: url(../img/messages/warning.png ) no-repeat 0px 50%; color: #5F4E01; }
 .messages.information, .messages.info { background: #DFEBFB; border: 1px solid #82AEE7; }
 .messages.information p, .messages.info p { background: url(../img/messages/help.png ) no-repeat 0px 50%; color: #064393; }
-.messages.information a { text-decoration: underline; }
\ No newline at end of file
+.messages.information a { text-decoration: underline; }
-- 
cgit v1.2.3


From 9acfade8294755cce6c1170364f2669cb73edbbe Mon Sep 17 00:00:00 2001
From: silvus <silvus@silvus.fr>
Date: Mon, 22 Apr 2013 22:58:07 +0200
Subject: =?UTF-8?q?Reprise=20du=20style=20de=20l'=C3=A9cran=20de=20connexi?=
 =?UTF-8?q?on?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 css/style-light.css | 10 ++++++++++
 css/style.css       | 12 +++++-------
 tpl/home.html       |  2 +-
 tpl/login.html      | 40 +++++++++++++++++++++-------------------
 4 files changed, 37 insertions(+), 27 deletions(-)

diff --git a/css/style-light.css b/css/style-light.css
index 5b9c6c11..926a5cc7 100644
--- a/css/style-light.css
+++ b/css/style-light.css
@@ -8,6 +8,16 @@ a, a:hover, a:visited {
     color: #000;
 }
 
+.bouton {
+	background-color: #000;
+    color: #fff;
+    border: none;
+}
+.bouton:hover {
+	background-color: #040707;
+    color: #F1F1F1;
+}
+
 #main ul#links li a.current {
     background-color: #000;
     color: #fff;
diff --git a/css/style.css b/css/style.css
index b8327c30..9fadfa96 100644
--- a/css/style.css
+++ b/css/style.css
@@ -4,11 +4,14 @@ body {
     margin: 10px;
 }
 
-
 header {
     text-align: center;
 }
 
+.bouton {
+	border-radius: 2px;
+}
+
 #main ul#links {
     padding: 0;
     list-style-type: none;
@@ -56,11 +59,6 @@ footer {
     text-align: right;
 }
 
-/*** ***/
-/*** LOGIN FORM ***/
-ul#login li {
-    list-style-type: none;
-}
 /*** ***/
 /*** LINKS DISPLAY ***/
 
@@ -208,7 +206,7 @@ body.article {
 .messages p { margin: 3px 0 3px 10px !important; padding: 0 10px 0 23px !important; font-size: 14px; line-height: 16px; }
 .messages.error { border: 1px solid #C42608; color: #c00 !important; background: #FFF0EF; }
 .messages.error p { background: url(../img/messages/cross.png ) no-repeat 0px 50%; color:#c00 !important; }
-.messages.success {background: #E0FBCC; border: 1px solid #6DC70C; } 
+.messages.success {background: #E0FBCC; border: 1px solid #6DC70C; }
 .messages.success p { background: url(../img/messages/tick.png) no-repeat 0px 50%; color: #2B6301 !important; }
 .messages.warning { background: #FFFCD3; border: 1px solid #EBCD41; color: #000; }
 .messages.warning p { background: url(../img/messages/warning.png ) no-repeat 0px 50%; color: #5F4E01; }
diff --git a/tpl/home.html b/tpl/home.html
index ad881997..75367e2f 100644
--- a/tpl/home.html
+++ b/tpl/home.html
@@ -10,7 +10,7 @@
                 <li><a href="?view=config" {if="$view == 'config'"}class="current"{/if}>config</a></li>
                 <li><a href="?logout" title="Logout">logout</a></li>
             </ul>
-            {if condition="isset($entries)"} 
+            {if condition="isset($entries)"}
             <ul id="sort">
                 <li><img src="img/up.png" onclick="sort_links('{$view}', 'ia');" title="by date asc" /> by date <img src="img/down.png" onclick="sort_links('{$view}', 'id');" title="by date desc" /></li>
                 <li><img src="img/up.png" onclick="sort_links('{$view}', 'ta');" title="by title asc" /> by title <img src="img/down.png" onclick="sort_links('{$view}', 'td');" title="by title desc" /></li>
diff --git a/tpl/login.html b/tpl/login.html
index 12927692..3f77e379 100644
--- a/tpl/login.html
+++ b/tpl/login.html
@@ -5,27 +5,29 @@
         </header>
         <div id="main">
             <form method="post" action="?login" name="loginform">
-                <fieldset>
-                    <h2>login to your poche</h2>
-                    <ul id="login">
-                        <li>
-                            <label for="login">Login</label> <input type="text" id="login" name="login" placeholder="Login" tabindex="1">
-                        </li>
-                        <li>
-                            <label for="password">Password</label> <input type="password" id="password" name="password" placeholder="Password" tabindex="2">
-                        </li>
-                        <li>
-                            <label><input type="checkbox" name="longlastingsession" tabindex="3">&nbsp;Stay signed in (Do not check on public computers)</label>
-                        </li>
-                        <li>
-                            <button type="submit" tabindex="4">Sign in</button>
-                        </li>
-                    </ul>
+                <fieldset class="w500p center">
+                    <h2 class="mbs txtcenter">login to your poche</h2>
+					<div class="row">
+						<label class="col w150p" for="login">Login</label>
+						<input class="col" type="text" id="login" name="login" placeholder="Login" tabindex="1" autofocus />
+					</div>
+					<div class="row">
+						<label class="col w150p" for="password" >Password</label>
+						<input class="col" type="password" id="password" name="password" placeholder="Password" tabindex="2">
+					</div>
+					<div class="row">
+						<label class="col w150p">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">Sign in</button>
+					</div>
                 </fieldset>
                 <input type="hidden" name="returnurl" value="<?php echo htmlspecialchars($referer);?>">
                 <input type="hidden" name="token" value="<?php echo Session::getToken(); ?>">
             </form>
-            <script type="text/javascript">
-            window.onload = document.loginform.login.focus();
-            </script>
+
 {include="footer"}
-- 
cgit v1.2.3


From 8af1077265829b1f10623c5c1348089bada9c775 Mon Sep 17 00:00:00 2001
From: silvus <silvus@silvus.fr>
Date: Mon, 22 Apr 2013 23:02:04 +0200
Subject: Le logo poche renvoie vers l'accueil

---
 tpl/home.html  | 2 +-
 tpl/login.html | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/tpl/home.html b/tpl/home.html
index 75367e2f..e99e1680 100644
--- a/tpl/home.html
+++ b/tpl/home.html
@@ -1,6 +1,6 @@
     <body class="light-style">
         <header>
-            <h1><img src="./img/logo.png" alt="logo poche" />poche</h1>
+            <h1><a href="/"><img src="./img/logo.png" alt="logo poche" /></a>poche</h1>
         </header>
         <div id="main">
             <ul id="links">
diff --git a/tpl/login.html b/tpl/login.html
index 3f77e379..66dac99b 100644
--- a/tpl/login.html
+++ b/tpl/login.html
@@ -1,7 +1,7 @@
 {include="head"}
     <body class="light-style">
         <header>
-            <h1><img src="./img/logo.png" alt="logo poche" />poche</h1>
+            <h1><a href="/"><img src="./img/logo.png" alt="logo poche" /></a>poche</h1>
         </header>
         <div id="main">
             <form method="post" action="?login" name="loginform">
-- 
cgit v1.2.3


From d2beefd27c814acdfa248e4ca469e6cad06288a4 Mon Sep 17 00:00:00 2001
From: silvus <silvus@silvus.fr>
Date: Mon, 22 Apr 2013 23:10:35 +0200
Subject: Petit correctif des couleurs de la classe "bouton" au hover

---
 css/style-light.css | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/css/style-light.css b/css/style-light.css
index 926a5cc7..cd2384c3 100644
--- a/css/style-light.css
+++ b/css/style-light.css
@@ -14,7 +14,7 @@ a, a:hover, a:visited {
     border: none;
 }
 .bouton:hover {
-	background-color: #040707;
+	background-color: #222222;
     color: #F1F1F1;
 }
 
-- 
cgit v1.2.3


From 88958248fab89c8bfa0014c6e4c300cb27a522b2 Mon Sep 17 00:00:00 2001
From: nicosomb <nicolas@loeuillet.org>
Date: Tue, 23 Apr 2013 08:07:47 +0200
Subject: message de bienvenue

---
 index.php      | 1 +
 tpl/home.html  | 2 +-
 tpl/login.html | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/index.php b/index.php
index 6eefd277..829d5513 100644
--- a/index.php
+++ b/index.php
@@ -27,6 +27,7 @@ if (isset($_GET['login'])) {
     if (!empty($_POST['login']) && !empty($_POST['password'])) {
         if (Session::login('poche', 'poche', $_POST['login'], $_POST['password'])) {
             logm('login successful');
+            $msg->add('s', 'welcome in your pocket!');
             if (!empty($_POST['longlastingsession'])) {
                 $_SESSION['longlastingsession'] = 31536000;
                 $_SESSION['expires_on'] = time() + $_SESSION['longlastingsession'];
diff --git a/tpl/home.html b/tpl/home.html
index e99e1680..90e247f7 100644
--- a/tpl/home.html
+++ b/tpl/home.html
@@ -1,6 +1,6 @@
     <body class="light-style">
         <header>
-            <h1><a href="/"><img src="./img/logo.png" alt="logo poche" /></a>poche</h1>
+            <h1><a href="index.php"><img src="./img/logo.png" alt="logo poche" /></a>poche</h1>
         </header>
         <div id="main">
             <ul id="links">
diff --git a/tpl/login.html b/tpl/login.html
index 66dac99b..ebe4b5e5 100644
--- a/tpl/login.html
+++ b/tpl/login.html
@@ -1,7 +1,7 @@
 {include="head"}
     <body class="light-style">
         <header>
-            <h1><a href="/"><img src="./img/logo.png" alt="logo poche" /></a>poche</h1>
+            <h1><a href="index.php"><img src="./img/logo.png" alt="logo poche" /></a>poche</h1>
         </header>
         <div id="main">
             <form method="post" action="?login" name="loginform">
-- 
cgit v1.2.3


From 69ca1455d13e27de9e3f506f294010889a560fb9 Mon Sep 17 00:00:00 2001
From: nicosomb <nicolas@loeuillet.org>
Date: Tue, 23 Apr 2013 08:08:42 +0200
Subject: v0.2.1

---
 inc/config.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/inc/config.php b/inc/config.php
index 9d4b7fae..8bafd595 100644
--- a/inc/config.php
+++ b/inc/config.php
@@ -8,7 +8,7 @@
  * @license    http://www.wtfpl.net/ see COPYING file
  */
 
-define ('POCHE_VERSION', '0.2');
+define ('POCHE_VERSION', '0.2.1');
 
 if (!is_dir('db/')) {
     @mkdir('db/',0705);
-- 
cgit v1.2.3