Ajout fonctionnalité connexion avec Persona (à améliorer sans doute)

5 files changed, 41 insertions, 16 deletions

diff --git a/app/views/configure/display.phtml b/app/views/configure/display.phtml
index 77c36ccca..089533aff 100644
--- a/app/views/configure/display.phtml
+++ b/app/views/configure/display.phtml
@@ -1,12 +1,20 @@
 <form method="post" action="">
+	<h1>Configuration générale</h1>
+	
+	<label for="old_entries">Supprimer les articles au bout de (mois)</label>
+	<input type="number" id="old_entries" name="old_entries" value="<?php echo $this->conf->oldEntries (); ?>" />
+	
+	<label for="mail_login">Adresse mail de connexion (utilise <a href="https://persona.org/">Persona</a>)</label>
+	<p><noscript>nécessite que javascript soit activé</noscript></p>
+	<?php $mail = $this->conf->mailLogin (); ?>
+	<input type="email" id="mail_login" name="mail_login" value="<?php echo $mail ? $mail : ''; ?>" placeholder="Laissez vide pour désactiver" />
+	<br />
+	
 	<h1>Configuration de l'affichage</h1>
 	
 	<label for="posts_per_page">Nombre d'articles par page</label>
 	<input type="number" id="posts_per_page" name="posts_per_page" value="<?php echo $this->conf->postsPerPage (); ?>" />
 	
-	<label for="old_entries">Supprimer les articles au bout de (mois)</label>
-	<input type="number" id="old_entries" name="old_entries" value="<?php echo $this->conf->oldEntries (); ?>" />
-	
 	<label>Vue par défaut</label>
 	<div class="radio_group">
 		<input type="radio" name="default_view" id="radio_all" value="all"<?php echo $this->conf->defaultView () == 'all' ? ' checked="checked"' : ''; ?> />
diff --git a/app/views/error/index.phtml b/app/views/error/index.phtml
index ffa156068..626102109 100644
--- a/app/views/error/index.phtml
+++ b/app/views/error/index.phtml
@@ -1,13 +1,7 @@
-<h1><?php echo Translate::t ('an error occured'); ?></h1>
+<div class="table">
+	<div class="nothing">
+		<h2><?php echo $this->code; ?></h2>
 
-<h2><?php echo $this->code; ?></h2>
-
-<?php if (!empty ($this->logs)) { ?>
-<ul>
-	<?php foreach ($this->logs as $log) { ?>
-	<li><?php echo $log; ?></li>
-	<?php } ?>
-</ul>
-<?php } ?>
-
-<p><a href="<?php echo Url::display (); ?>"><?php echo Translate::t ('go back home'); ?></a></p>
+		<p><a href="<?php echo Url::display (); ?>">Revenir à l'accueil</a></p>
+	</div>
+</div>
diff --git a/app/views/index/index.phtml b/app/views/index/index.phtml
index 27a6f9fe2..5e860b8f9 100644
--- a/app/views/index/index.phtml
+++ b/app/views/index/index.phtml
@@ -1,7 +1,8 @@
 <?php $items = $this->entryPaginator->items (); ?>
 <?php if (!empty ($items)) { ?>
 <div id="top">
-	<a class="read_all" href="<?php echo Url::display (array ('c' => 'entry', 'a' => 'read', 'params' => array ('is_read' => 1))); ?>">Tout marquer comme lu</a><!--
+	<?php if (!login_is_conf ($this->conf) || is_logged ()) { ?>
+	<a class="read_all" href="<?php echo Url::display (array ('c' => 'entry', 'a' => 'read', 'params' => array ('is_read' => 1))); ?>">Tout marquer comme lu</a><?php } ?><!--
 	<?php if (Session::param ('mode', 'all') == 'not_read') { ?>
 	--><a class="print_all" href="<?php echo Url::display (array ('a' => 'changeMode', 'params' => array ('mode' => 'all'))); ?>">Tout afficher</a>
 	<?php } else { ?>
@@ -26,6 +27,7 @@
 		<div class="content"><?php echo $item->content (); ?></div>
 		
 		<div class="after">
+			<?php if (!login_is_conf ($this->conf) || is_logged ()) { ?>
 			<?php if (!$item->isRead ()) { ?>
 			<a class="read" href="<?php echo Url::display (array ('c' => 'entry', 'a' => 'read', 'params' => array ('id' => $item->id (), 'is_read' => 1))); ?>">J'ai fini de lire l'article</a><!--
 			<?php } else { ?>
@@ -37,6 +39,7 @@
 			<?php } else { ?>
 			--><a class="bookmark" href="<?php echo Url::display (array ('c' => 'entry', 'a' => 'bookmark', 'params' => array ('id' => $item->id (), 'is_favorite' => 0))); ?>">Retirer l'article de mes favoris</a>
 			<?php } ?>
+			<?php } ?>
 		</div>
 	</div>
 	<?php } ?>
diff --git a/app/views/index/login.phtml b/app/views/index/login.phtml
new file mode 100644
index 000000000..cc814deff
--- /dev/null
+++ b/app/views/index/login.phtml
@@ -0,0 +1 @@
+<?php print_r ($this->res); ?>
diff --git a/app/views/javascript/main.phtml b/app/views/javascript/main.phtml
index beae6c12b..641bfa00c 100644
--- a/app/views/javascript/main.phtml
+++ b/app/views/javascript/main.phtml
@@ -35,6 +35,10 @@ function slide (new_active, old_active) {
 }
 
 function mark_read (active) {
+	if (active[0] === undefined) {
+		return false;
+	}
+
 	url =  active.find ("a.read").attr ("href");
 	
 	$.ajax ({
@@ -56,6 +60,10 @@ function mark_read (active) {
 }
 
 function mark_favorite (active) {
+	if (active[0] === undefined) {
+		return false;
+	}
+
 	url =  active.find ("a.bookmark").attr ("href");
 	
 	$.ajax ({
@@ -87,6 +95,12 @@ $(document).ready (function () {
 		
 		if (old_active[0] != new_active[0]) {
 			slide (new_active, old_active);
+		} else {
+			old_active.removeClass ("active");
+	
+			if (hide_posts) {
+				old_active.children (".content").slideUp (200);
+			}
 		}
 	});
 	
@@ -109,6 +123,11 @@ $(document).ready (function () {
 		active = $(".post.flux.active");
 		mark_read (active);
 	});
+	shortcut.add("shift+<?php echo $s['mark_read']; ?>", function () {
+		// on marque tout comme lu
+		url = $("#top a.read_all").attr ("href");
+		redirect (url);
+	});
 	shortcut.add("<?php echo $s['mark_favorite']; ?>", function () {
 		// on marque comme favori ou non favori
 		active = $(".post.flux.active");