Merge branch 'master' of github.com:inthepoche/poche
This commit is contained in:
nicosomb
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).
|
||||
|
||||
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).
|
||||
|
||||
[](http://flattr.com/thing/1265480/poche-a-read-it-later-open-source-system)
|
||||
|
|
|
|||
|
|
@ -8,6 +8,16 @@ a, a:hover, a:visited {
|
|||
color: #000;
|
||||
}
|
||||
|
||||
.bouton {
|
||||
background-color: #000;
|
||||
color: #fff;
|
||||
border: none;
|
||||
}
|
||||
.bouton:hover {
|
||||
background-color: #222222;
|
||||
color: #F1F1F1;
|
||||
}
|
||||
|
||||
#main ul#links li a.current {
|
||||
background-color: #000;
|
||||
color: #fff;
|
||||
|
|
|
|||
|
|
@ -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 ***/
|
||||
|
||||
|
|
@ -117,7 +115,7 @@ input[type=submit].delete {
|
|||
text-align: left;
|
||||
}
|
||||
|
||||
#article.tools ul li{
|
||||
#article .tools ul li{
|
||||
display: inline;
|
||||
}
|
||||
|
||||
|
|
@ -208,10 +206,10 @@ 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; }
|
||||
.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; }
|
||||
.messages.information a { text-decoration: underline; }
|
||||
|
|
|
|||
|
|
@ -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);
|
||||
|
|
|
|||
|
|
@ -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'];
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
<body class="light-style">
|
||||
<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>
|
||||
<div id="main">
|
||||
<ul id="links">
|
||||
|
|
@ -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>
|
||||
|
|
|
|||
|
|
@ -1,31 +1,33 @@
|
|||
{include="head"}
|
||||
<body class="light-style">
|
||||
<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>
|
||||
<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"> 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"}
|
||||
|
|
|
|||
Loading…
Reference in New Issue