aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorNicolas Lœuillet <nicolas@loeuillet.org>2013-04-22 23:34:55 -0700
committerNicolas Lœuillet <nicolas@loeuillet.org>2013-04-22 23:34:55 -0700
commit37f2773aa548a92456570083abcf9776f5774906 (patch)
treed56ca95f3725c5d52c3088a53d4c85e062f6a783
parent37c6ed4e7a75238504a28d6be5fbaad475689526 (diff)
parent69ca1455d13e27de9e3f506f294010889a560fb9 (diff)
downloadwallabag-37f2773aa548a92456570083abcf9776f5774906.tar.gz
wallabag-37f2773aa548a92456570083abcf9776f5774906.tar.zst
wallabag-37f2773aa548a92456570083abcf9776f5774906.zip
Merge pull request #74 from inthepoche/dev
v0.2.1
Diffstat
-rw-r--r--README.md2
-rw-r--r--css/style-light.css10
-rw-r--r--css/style.css16
-rw-r--r--inc/config.php2
-rw-r--r--index.php1
-rw-r--r--tpl/home.html4
-rw-r--r--tpl/login.html42
7 files changed, 45 insertions, 32 deletions
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
5 5
6The website of poche is [inthepoche.com](http://inthepoche.com). 6The website of poche is [inthepoche.com](http://inthepoche.com).
7 7
8To test poche, a demo website is online : [demo.inthepoche.com](http://demo.inthepoche.com) (login poche, password poche).
9
8To get news from poche, [follow us on twitter](http://twitter.com/getpoche) or [read the poche blog](http://inthepoche.com/blog). 10To get news from poche, [follow us on twitter](http://twitter.com/getpoche) or [read the poche blog](http://inthepoche.com/blog).
9 11
10[![flattr](http://api.flattr.com/button/flattr-badge-large.png)](http://flattr.com/thing/1265480/poche-a-read-it-later-open-source-system) 12[![flattr](http://api.flattr.com/button/flattr-badge-large.png)](http://flattr.com/thing/1265480/poche-a-read-it-later-open-source-system)
diff --git a/css/style-light.css b/css/style-light.css
index 5b9c6c11..cd2384c3 100644
--- a/css/style-light.css
+++ b/css/style-light.css
@@ -8,6 +8,16 @@ a, a:hover, a:visited {
8 color: #000; 8 color: #000;
9} 9}
10 10
11.bouton {
12 background-color: #000;
13 color: #fff;
14 border: none;
15}
16.bouton:hover {
17 background-color: #222222;
18 color: #F1F1F1;
19}
20
11#main ul#links li a.current { 21#main ul#links li a.current {
12 background-color: #000; 22 background-color: #000;
13 color: #fff; 23 color: #fff;
diff --git a/css/style.css b/css/style.css
index 36ebf85d..9fadfa96 100644
--- a/css/style.css
+++ b/css/style.css
@@ -4,11 +4,14 @@ body {
4 margin: 10px; 4 margin: 10px;
5} 5}
6 6
7
8header { 7header {
9 text-align: center; 8 text-align: center;
10} 9}
11 10
11.bouton {
12 border-radius: 2px;
13}
14
12#main ul#links { 15#main ul#links {
13 padding: 0; 16 padding: 0;
14 list-style-type: none; 17 list-style-type: none;
@@ -57,11 +60,6 @@ footer {
57} 60}
58 61
59/*** ***/ 62/*** ***/
60/*** LOGIN FORM ***/
61ul#login li {
62 list-style-type: none;
63}
64/*** ***/
65/*** LINKS DISPLAY ***/ 63/*** LINKS DISPLAY ***/
66 64
67#main a.tool { 65#main a.tool {
@@ -117,7 +115,7 @@ input[type=submit].delete {
117 text-align: left; 115 text-align: left;
118} 116}
119 117
120#article.tools ul li{ 118#article .tools ul li{
121 display: inline; 119 display: inline;
122} 120}
123 121
@@ -208,10 +206,10 @@ body.article {
208.messages p { margin: 3px 0 3px 10px !important; padding: 0 10px 0 23px !important; font-size: 14px; line-height: 16px; } 206.messages p { margin: 3px 0 3px 10px !important; padding: 0 10px 0 23px !important; font-size: 14px; line-height: 16px; }
209.messages.error { border: 1px solid #C42608; color: #c00 !important; background: #FFF0EF; } 207.messages.error { border: 1px solid #C42608; color: #c00 !important; background: #FFF0EF; }
210.messages.error p { background: url(../img/messages/cross.png ) no-repeat 0px 50%; color:#c00 !important; } 208.messages.error p { background: url(../img/messages/cross.png ) no-repeat 0px 50%; color:#c00 !important; }
211.messages.success {background: #E0FBCC; border: 1px solid #6DC70C; } 209.messages.success {background: #E0FBCC; border: 1px solid #6DC70C; }
212.messages.success p { background: url(../img/messages/tick.png) no-repeat 0px 50%; color: #2B6301 !important; } 210.messages.success p { background: url(../img/messages/tick.png) no-repeat 0px 50%; color: #2B6301 !important; }
213.messages.warning { background: #FFFCD3; border: 1px solid #EBCD41; color: #000; } 211.messages.warning { background: #FFFCD3; border: 1px solid #EBCD41; color: #000; }
214.messages.warning p { background: url(../img/messages/warning.png ) no-repeat 0px 50%; color: #5F4E01; } 212.messages.warning p { background: url(../img/messages/warning.png ) no-repeat 0px 50%; color: #5F4E01; }
215.messages.information, .messages.info { background: #DFEBFB; border: 1px solid #82AEE7; } 213.messages.information, .messages.info { background: #DFEBFB; border: 1px solid #82AEE7; }
216.messages.information p, .messages.info p { background: url(../img/messages/help.png ) no-repeat 0px 50%; color: #064393; } 214.messages.information p, .messages.info p { background: url(../img/messages/help.png ) no-repeat 0px 50%; color: #064393; }
217.messages.information a { text-decoration: underline; } \ No newline at end of file 215.messages.information a { text-decoration: underline; }
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 @@
8 * @license http://www.wtfpl.net/ see COPYING file 8 * @license http://www.wtfpl.net/ see COPYING file
9 */ 9 */
10 10
11define ('POCHE_VERSION', '0.2'); 11define ('POCHE_VERSION', '0.2.1');
12 12
13if (!is_dir('db/')) { 13if (!is_dir('db/')) {
14 @mkdir('db/',0705); 14 @mkdir('db/',0705);
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'])) {
27 if (!empty($_POST['login']) && !empty($_POST['password'])) { 27 if (!empty($_POST['login']) && !empty($_POST['password'])) {
28 if (Session::login('poche', 'poche', $_POST['login'], $_POST['password'])) { 28 if (Session::login('poche', 'poche', $_POST['login'], $_POST['password'])) {
29 logm('login successful'); 29 logm('login successful');
30 $msg->add('s', 'welcome in your pocket!');
30 if (!empty($_POST['longlastingsession'])) { 31 if (!empty($_POST['longlastingsession'])) {
31 $_SESSION['longlastingsession'] = 31536000; 32 $_SESSION['longlastingsession'] = 31536000;
32 $_SESSION['expires_on'] = time() + $_SESSION['longlastingsession']; 33 $_SESSION['expires_on'] = time() + $_SESSION['longlastingsession'];
diff --git a/tpl/home.html b/tpl/home.html
index ad881997..90e247f7 100644
--- a/tpl/home.html
+++ b/tpl/home.html
@@ -1,6 +1,6 @@
1 <body class="light-style"> 1 <body class="light-style">
2 <header> 2 <header>
3 <h1><img src="./img/logo.png" alt="logo poche" />poche</h1> 3 <h1><a href="index.php"><img src="./img/logo.png" alt="logo poche" /></a>poche</h1>
4 </header> 4 </header>
5 <div id="main"> 5 <div id="main">
6 <ul id="links"> 6 <ul id="links">
@@ -10,7 +10,7 @@
10 <li><a href="?view=config" {if="$view == 'config'"}class="current"{/if}>config</a></li> 10 <li><a href="?view=config" {if="$view == 'config'"}class="current"{/if}>config</a></li>
11 <li><a href="?logout" title="Logout">logout</a></li> 11 <li><a href="?logout" title="Logout">logout</a></li>
12 </ul> 12 </ul>
13 {if condition="isset($entries)"} 13 {if condition="isset($entries)"}
14 <ul id="sort"> 14 <ul id="sort">
15 <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> 15 <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>
16 <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> 16 <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..ebe4b5e5 100644
--- a/tpl/login.html
+++ b/tpl/login.html
@@ -1,31 +1,33 @@
1{include="head"} 1{include="head"}
2 <body class="light-style"> 2 <body class="light-style">
3 <header> 3 <header>
4 <h1><img src="./img/logo.png" alt="logo poche" />poche</h1> 4 <h1><a href="index.php"><img src="./img/logo.png" alt="logo poche" /></a>poche</h1>
5 </header> 5 </header>
6 <div id="main"> 6 <div id="main">
7 <form method="post" action="?login" name="loginform"> 7 <form method="post" action="?login" name="loginform">
8 <fieldset> 8 <fieldset class="w500p center">
9 <h2>login to your poche</h2> 9 <h2 class="mbs txtcenter">login to your poche</h2>
10 <ul id="login"> 10 <div class="row">
11 <li> 11 <label class="col w150p" for="login">Login</label>
12 <label for="login">Login</label> <input type="text" id="login" name="login" placeholder="Login" tabindex="1"> 12 <input class="col" type="text" id="login" name="login" placeholder="Login" tabindex="1" autofocus />
13 </li> 13 </div>
14 <li> 14 <div class="row">
15 <label for="password">Password</label> <input type="password" id="password" name="password" placeholder="Password" tabindex="2"> 15 <label class="col w150p" for="password" >Password</label>
16 </li> 16 <input class="col" type="password" id="password" name="password" placeholder="Password" tabindex="2">
17 <li> 17 </div>
18 <label><input type="checkbox" name="longlastingsession" tabindex="3">&nbsp;Stay signed in (Do not check on public computers)</label> 18 <div class="row">
19 </li> 19 <label class="col w150p">Stay signed in</label>
20 <li> 20 <div class="col">
21 <button type="submit" tabindex="4">Sign in</button> 21 <input type="checkbox" name="longlastingsession" tabindex="3">
22 </li> 22 <small class="inbl">(Do not check on public computers)</small>
23 </ul> 23 </div>
24 </div>
25 <div class="row mts txtcenter">
26 <button class="bouton" type="submit" tabindex="4">Sign in</button>
27 </div>
24 </fieldset> 28 </fieldset>
25 <input type="hidden" name="returnurl" value="<?php echo htmlspecialchars($referer);?>"> 29 <input type="hidden" name="returnurl" value="<?php echo htmlspecialchars($referer);?>">
26 <input type="hidden" name="token" value="<?php echo Session::getToken(); ?>"> 30 <input type="hidden" name="token" value="<?php echo Session::getToken(); ?>">
27 </form> 31 </form>
28 <script type="text/javascript"> 32
29 window.onload = document.loginform.login.focus();
30 </script>
31{include="footer"} 33{include="footer"}
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-29 01:38:22 +0000