mirror of
https://github.com/moparisthebest/wallabag
synced 2024-11-30 12:52:24 -05:00
Merge branch 'master' of github.com:inthepoche/poche
This commit is contained in:
commit
8444bb0600
@ -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).
|
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).
|
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)
|
[![flattr](http://api.flattr.com/button/flattr-badge-large.png)](http://flattr.com/thing/1265480/poche-a-read-it-later-open-source-system)
|
||||||
|
@ -8,6 +8,16 @@ a, a:hover, a:visited {
|
|||||||
color: #000;
|
color: #000;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.bouton {
|
||||||
|
background-color: #000;
|
||||||
|
color: #fff;
|
||||||
|
border: none;
|
||||||
|
}
|
||||||
|
.bouton:hover {
|
||||||
|
background-color: #222222;
|
||||||
|
color: #F1F1F1;
|
||||||
|
}
|
||||||
|
|
||||||
#main ul#links li a.current {
|
#main ul#links li a.current {
|
||||||
background-color: #000;
|
background-color: #000;
|
||||||
color: #fff;
|
color: #fff;
|
||||||
|
@ -4,11 +4,14 @@ body {
|
|||||||
margin: 10px;
|
margin: 10px;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
header {
|
header {
|
||||||
text-align: center;
|
text-align: center;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.bouton {
|
||||||
|
border-radius: 2px;
|
||||||
|
}
|
||||||
|
|
||||||
#main ul#links {
|
#main ul#links {
|
||||||
padding: 0;
|
padding: 0;
|
||||||
list-style-type: none;
|
list-style-type: none;
|
||||||
@ -56,11 +59,6 @@ footer {
|
|||||||
text-align: right;
|
text-align: right;
|
||||||
}
|
}
|
||||||
|
|
||||||
/*** ***/
|
|
||||||
/*** LOGIN FORM ***/
|
|
||||||
ul#login li {
|
|
||||||
list-style-type: none;
|
|
||||||
}
|
|
||||||
/*** ***/
|
/*** ***/
|
||||||
/*** LINKS DISPLAY ***/
|
/*** LINKS DISPLAY ***/
|
||||||
|
|
||||||
@ -117,7 +115,7 @@ input[type=submit].delete {
|
|||||||
text-align: left;
|
text-align: left;
|
||||||
}
|
}
|
||||||
|
|
||||||
#article.tools ul li{
|
#article .tools ul li{
|
||||||
display: inline;
|
display: inline;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -8,7 +8,7 @@
|
|||||||
* @license http://www.wtfpl.net/ see COPYING file
|
* @license http://www.wtfpl.net/ see COPYING file
|
||||||
*/
|
*/
|
||||||
|
|
||||||
define ('POCHE_VERSION', '0.2');
|
define ('POCHE_VERSION', '0.2.1');
|
||||||
|
|
||||||
if (!is_dir('db/')) {
|
if (!is_dir('db/')) {
|
||||||
@mkdir('db/',0705);
|
@mkdir('db/',0705);
|
||||||
|
@ -27,6 +27,7 @@ if (isset($_GET['login'])) {
|
|||||||
if (!empty($_POST['login']) && !empty($_POST['password'])) {
|
if (!empty($_POST['login']) && !empty($_POST['password'])) {
|
||||||
if (Session::login('poche', 'poche', $_POST['login'], $_POST['password'])) {
|
if (Session::login('poche', 'poche', $_POST['login'], $_POST['password'])) {
|
||||||
logm('login successful');
|
logm('login successful');
|
||||||
|
$msg->add('s', 'welcome in your pocket!');
|
||||||
if (!empty($_POST['longlastingsession'])) {
|
if (!empty($_POST['longlastingsession'])) {
|
||||||
$_SESSION['longlastingsession'] = 31536000;
|
$_SESSION['longlastingsession'] = 31536000;
|
||||||
$_SESSION['expires_on'] = time() + $_SESSION['longlastingsession'];
|
$_SESSION['expires_on'] = time() + $_SESSION['longlastingsession'];
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
<body class="light-style">
|
<body class="light-style">
|
||||||
<header>
|
<header>
|
||||||
<h1><img src="./img/logo.png" alt="logo poche" />poche</h1>
|
<h1><a href="index.php"><img src="./img/logo.png" alt="logo poche" /></a>poche</h1>
|
||||||
</header>
|
</header>
|
||||||
<div id="main">
|
<div id="main">
|
||||||
<ul id="links">
|
<ul id="links">
|
||||||
|
@ -1,31 +1,33 @@
|
|||||||
{include="head"}
|
{include="head"}
|
||||||
<body class="light-style">
|
<body class="light-style">
|
||||||
<header>
|
<header>
|
||||||
<h1><img src="./img/logo.png" alt="logo poche" />poche</h1>
|
<h1><a href="index.php"><img src="./img/logo.png" alt="logo poche" /></a>poche</h1>
|
||||||
</header>
|
</header>
|
||||||
<div id="main">
|
<div id="main">
|
||||||
<form method="post" action="?login" name="loginform">
|
<form method="post" action="?login" name="loginform">
|
||||||
<fieldset>
|
<fieldset class="w500p center">
|
||||||
<h2>login to your poche</h2>
|
<h2 class="mbs txtcenter">login to your poche</h2>
|
||||||
<ul id="login">
|
<div class="row">
|
||||||
<li>
|
<label class="col w150p" for="login">Login</label>
|
||||||
<label for="login">Login</label> <input type="text" id="login" name="login" placeholder="Login" tabindex="1">
|
<input class="col" type="text" id="login" name="login" placeholder="Login" tabindex="1" autofocus />
|
||||||
</li>
|
</div>
|
||||||
<li>
|
<div class="row">
|
||||||
<label for="password">Password</label> <input type="password" id="password" name="password" placeholder="Password" tabindex="2">
|
<label class="col w150p" for="password" >Password</label>
|
||||||
</li>
|
<input class="col" type="password" id="password" name="password" placeholder="Password" tabindex="2">
|
||||||
<li>
|
</div>
|
||||||
<label><input type="checkbox" name="longlastingsession" tabindex="3"> Stay signed in (Do not check on public computers)</label>
|
<div class="row">
|
||||||
</li>
|
<label class="col w150p">Stay signed in</label>
|
||||||
<li>
|
<div class="col">
|
||||||
<button type="submit" tabindex="4">Sign in</button>
|
<input type="checkbox" name="longlastingsession" tabindex="3">
|
||||||
</li>
|
<small class="inbl">(Do not check on public computers)</small>
|
||||||
</ul>
|
</div>
|
||||||
|
</div>
|
||||||
|
<div class="row mts txtcenter">
|
||||||
|
<button class="bouton" type="submit" tabindex="4">Sign in</button>
|
||||||
|
</div>
|
||||||
</fieldset>
|
</fieldset>
|
||||||
<input type="hidden" name="returnurl" value="<?php echo htmlspecialchars($referer);?>">
|
<input type="hidden" name="returnurl" value="<?php echo htmlspecialchars($referer);?>">
|
||||||
<input type="hidden" name="token" value="<?php echo Session::getToken(); ?>">
|
<input type="hidden" name="token" value="<?php echo Session::getToken(); ?>">
|
||||||
</form>
|
</form>
|
||||||
<script type="text/javascript">
|
|
||||||
window.onload = document.loginform.login.focus();
|
|
||||||
</script>
|
|
||||||
{include="footer"}
|
{include="footer"}
|
||||||
|
Loading…
Reference in New Issue
Block a user