From 60edaa4375e804b7f572b2b4c9f89a4cc52562c6 Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Sun, 12 May 2013 17:20:26 +0200
Subject: Fix issue #74 : les tags associés sont désormais cliquables
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/index/index.phtml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'app/views')

diff --git a/app/views/index/index.phtml b/app/views/index/index.phtml
index 0e09f84df..9974a9b0b 100644
--- a/app/views/index/index.phtml
+++ b/app/views/index/index.phtml
@@ -98,7 +98,7 @@ if ($output == 'rss') {
 							<li class="dropdown-close"><a href="#close"><i class="icon i_close"></i></a></li>
 
 							<?php foreach($tags as $tag) { ?>
-							<li class="item"><span><?php echo $tag; ?></span></li>
+							<li class="item"><a href="<?php echo _url ('index', 'index', 'search', urlencode ('#' . $tag)); ?>"><?php echo $tag; ?></a></li>
 							<?php } ?>
 						</ul>
 					</div>
-- 
cgit v1.2.3


From 9e219cbf5014c8f4f52f3ca6722f7a20cdcc13dd Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Sun, 12 May 2013 19:21:39 +0200
Subject: Fix issue #70 : lorsqu'on rencontre un problème avec un flux, on
 l'indique à l'utilisateur (couleur rouge)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/feedController.php |  3 +--
 app/i18n/en.php                    |  1 +
 app/i18n/fr.php                    |  1 +
 app/layout/aside_feed.phtml        |  2 +-
 app/layout/aside_flux.phtml        |  2 +-
 app/models/Feed.php                | 30 ++++++++++++++++++++++++++++++
 app/views/configure/feed.phtml     |  4 ++++
 public/theme/freshrss.css          |  3 +++
 public/theme/global.css            |  7 +++++++
 9 files changed, 49 insertions(+), 4 deletions(-)

(limited to 'app/views')

diff --git a/app/controllers/feedController.php b/app/controllers/feedController.php
index 77f1787d0..a41d7a33f 100755
--- a/app/controllers/feedController.php
+++ b/app/controllers/feedController.php
@@ -159,8 +159,7 @@ class feedController extends ActionController {
 				$feedDAO->updateLastUpdate ($feed->id ());
 			} catch (FeedException $e) {
 				Log::record ($e->getMessage (), Log::ERROR);
-				// TODO si on a une erreur ici, il faut mettre
-				// le flux à jour en BDD (error = 1) (issue #70)
+				$feedDAO->isInError ($feed->id ());
 			}
 
 			// On arrête à 10 flux pour ne pas surcharger le serveur
diff --git a/app/i18n/en.php b/app/i18n/en.php
index c832a519f..3c3a1fbcc 100644
--- a/app/i18n/en.php
+++ b/app/i18n/en.php
@@ -114,6 +114,7 @@ return array (
 	'or'				=> 'or',
 
 	'informations'			=> 'Informations',
+	'feed_in_error'			=> 'This feed has encountered a problem. Please verify that it is always reachable.',
 	'website_url'			=> 'Website URL',
 	'feed_url'			=> 'Feed URL',
 	'number_articles'		=> 'Number of articles',
diff --git a/app/i18n/fr.php b/app/i18n/fr.php
index 165b183eb..d270c9b96 100644
--- a/app/i18n/fr.php
+++ b/app/i18n/fr.php
@@ -114,6 +114,7 @@ return array (
 	'or'				=> 'ou',
 
 	'informations'			=> 'Informations',
+	'feed_in_error'			=> 'Ce flux a rencontré un problème. Veuillez vérifier qu\'il est toujours accessible.',
 	'website_url'			=> 'URL du site',
 	'feed_url'			=> 'URL du flux',
 	'number_articles'		=> 'Nombre d\'articles',
diff --git a/app/layout/aside_feed.phtml b/app/layout/aside_feed.phtml
index 158f012d0..4c56d12fc 100644
--- a/app/layout/aside_feed.phtml
+++ b/app/layout/aside_feed.phtml
@@ -43,7 +43,7 @@
 
 	<?php if (!empty ($this->feeds)) { ?>
 	<?php foreach ($this->feeds as $feed) { ?>
-	<li class="item<?php echo ($this->flux && $this->flux->id () == $feed->id ()) ? ' active' : ''; ?>">
+	<li class="item<?php echo ($this->flux && $this->flux->id () == $feed->id ()) ? ' active' : ''; ?><?php echo $feed->inError () ? ' error' : ''; ?>">
 		<a href="<?php echo _url ('configure', 'feed', 'id', $feed->id ()); ?>">
 			<img class="favicon" src="<?php echo $feed->favicon (); ?>" alt="" />
 			<?php echo $feed->name (); ?>
diff --git a/app/layout/aside_flux.phtml b/app/layout/aside_flux.phtml
index d1fe6b759..449ffaff4 100644
--- a/app/layout/aside_flux.phtml
+++ b/app/layout/aside_flux.phtml
@@ -62,7 +62,7 @@
 			<ul class="feeds<?php echo $c_active ? ' active' : ''; ?>">
 				<?php foreach ($feeds as $feed) { ?>
 				<?php $f_active = false; if ($this->get_f == $feed->id ()) { $f_active = true; } ?>
-				<li class="item<?php echo $f_active ? ' active' : ''; ?>">
+				<li class="item<?php echo $f_active ? ' active' : ''; ?><?php echo $feed->inError () ? ' error' : ''; ?>">
 					<div class="dropdown">
 						<div id="dropdown-<?php echo $feed->id(); ?>" class="dropdown-target"></div>
 						<a class="dropdown-toggle" href="#dropdown-<?php echo $feed->id(); ?>"><i class="icon i_configure"></i></a>
diff --git a/app/models/Feed.php b/app/models/Feed.php
index 51c409b69..0fc9640bc 100644
--- a/app/models/Feed.php
+++ b/app/models/Feed.php
@@ -12,6 +12,7 @@ class Feed extends Model {
 	private $priority = 10;
 	private $pathEntries = '';
 	private $httpAuth = '';
+	private $error = false;
 
 	public function __construct ($url) {
 		$this->_url ($url);
@@ -69,6 +70,9 @@ class Feed extends Model {
 			);
 		}
 	}
+	public function inError () {
+		return $this->error;
+	}
 	public function nbEntries () {
 		$feedDAO = new FeedDAO ();
 		return $feedDAO->countEntries ($this->id ());
@@ -138,6 +142,14 @@ class Feed extends Model {
 	public function _httpAuth ($value) {
 		$this->httpAuth = $value;
 	}
+	public function _error ($value) {
+		if ($value) {
+			$value = true;
+		} else {
+			$value = false;
+		}
+		$this->error = $value;
+	}
 
 	public function load () {
 		if (!is_null ($this->url)) {
@@ -306,6 +318,23 @@ class FeedDAO extends Model_pdo {
 		}
 	}
 
+	public function isInError ($id) {
+		$sql = 'UPDATE feed SET error=1 WHERE id=?';
+		$stm = $this->bd->prepare ($sql);
+
+		$values = array (
+			$id
+		);
+
+		if ($stm && $stm->execute ($values)) {
+			return true;
+		} else {
+			$info = $stm->errorInfo();
+			Log::record ('SQL error : ' . $info[2], Log::ERROR);
+			return false;
+		}
+	}
+
 	public function changeCategory ($idOldCat, $idNewCat) {
 		$catDAO = new CategoryDAO ();
 		$newCat = $catDAO->searchById ($idNewCat);
@@ -470,6 +499,7 @@ class HelperFeed {
 			$list[$key]->_priority ($dao['priority']);
 			$list[$key]->_pathEntries ($dao['pathEntries']);
 			$list[$key]->_httpAuth (base64_decode ($dao['httpAuth']));
+			$list[$key]->_error ($dao['error']);
 
 			if (isset ($dao['id'])) {
 				$list[$key]->_id ($dao['id']);
diff --git a/app/views/configure/feed.phtml b/app/views/configure/feed.phtml
index 33483f72d..ad9c86d9e 100644
--- a/app/views/configure/feed.phtml
+++ b/app/views/configure/feed.phtml
@@ -7,6 +7,10 @@
 	<h1><?php echo $this->flux->name (); ?></h1>
 	<?php echo $this->flux->description (); ?>
 
+	<?php if ($this->flux->inError ()) { ?>
+	<p class="alert alert-error"><span class="alert-head"><?php echo Translate::t ('damn'); ?></span> <?php echo Translate::t ('feed_in_error'); ?></p>
+	<?php } ?>
+
 	<form method="post" action="<?php echo _url ('configure', 'feed', 'id', $this->flux->id ()); ?>">
 		<legend><?php echo Translate::t ('informations'); ?></legend>
 		<div class="form-group">
diff --git a/public/theme/freshrss.css b/public/theme/freshrss.css
index 3ab7177d5..d7370cb8a 100644
--- a/public/theme/freshrss.css
+++ b/public/theme/freshrss.css
@@ -114,6 +114,9 @@
 			line-height: 35px;
 			float: right;
 		}
+		.categories .feeds .item.error .feed {
+			color: #BD362F;
+		}
 		.categories .feeds .item .feed {
 			display: inline-block;
 			margin: 0;
diff --git a/public/theme/global.css b/public/theme/global.css
index 99b335585..258d84baf 100644
--- a/public/theme/global.css
+++ b/public/theme/global.css
@@ -261,6 +261,13 @@ input, select, textarea {
 		.nav.nav-list a:hover {
 			text-decoration: none;
 		}
+	.nav.nav-list .item.error a {
+		color: #BD362F;
+	}
+		.nav.nav-list .item.active.error a {
+			color: #fff;
+			background: #BD362F;
+		}
 
 	.nav.nav-list .nav-header {
 		padding: 0 10px;
-- 
cgit v1.2.3


From 746ae4b33a2e7a83d2623291c02d7b4292247103 Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Fri, 14 Jun 2013 20:09:47 +0200
Subject: Fix issue #79 : possibilité de changer le nom d'un flux
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/configureController.php | 2 ++
 app/models/Entry.php                    | 2 +-
 app/views/configure/feed.phtml          | 6 ++++++
 3 files changed, 9 insertions(+), 1 deletion(-)

(limited to 'app/views')

diff --git a/app/controllers/configureController.php b/app/controllers/configureController.php
index 3b332de75..0d385daf9 100755
--- a/app/controllers/configureController.php
+++ b/app/controllers/configureController.php
@@ -91,6 +91,7 @@ class configureController extends ActionController {
 				$this->view->categories = $catDAO->listCategories ();
 
 				if (Request::isPost () && $this->view->flux) {
+					$name = Request::param ('name', '');
 					$cat = Request::param ('category', 0);
 					$path = Request::param ('path_entries', '');
 					$priority = Request::param ('priority', 0);
@@ -103,6 +104,7 @@ class configureController extends ActionController {
 					}
 
 					$values = array (
+						'name' => $name,
 						'category' => $cat,
 						'pathEntries' => $path,
 						'priority' => $priority,
diff --git a/app/models/Entry.php b/app/models/Entry.php
index f49e74239..1d944b184 100755
--- a/app/models/Entry.php
+++ b/app/models/Entry.php
@@ -239,7 +239,7 @@ class EntryDAO extends Model_pdo {
 			return true;
 		} else {
 			$info = $stm->errorInfo();
-			Log::record ('SQL error : ' . $info[2], Log::ERROR);
+			Log::record ('SQL error : ' . $info[2], Log::NOTICE);
 			return false;
 		}
 	}
diff --git a/app/views/configure/feed.phtml b/app/views/configure/feed.phtml
index ad9c86d9e..650da5641 100644
--- a/app/views/configure/feed.phtml
+++ b/app/views/configure/feed.phtml
@@ -13,6 +13,12 @@
 
 	<form method="post" action="<?php echo _url ('configure', 'feed', 'id', $this->flux->id ()); ?>">
 		<legend><?php echo Translate::t ('informations'); ?></legend>
+		<div class="form-group">
+			<label class="group-name" for="name"><?php echo Translate::t ('title'); ?></label>
+			<div class="group-controls">
+				<input type="text" name="name" id="name" value="<?php echo $this->flux->name () ; ?>" />
+			</div>
+		</div>
 		<div class="form-group">
 			<label class="group-name"><?php echo Translate::t ('website_url'); ?></label>
 			<div class="group-controls">
-- 
cgit v1.2.3


From 1d459af0464eb2cdbdaaaf1122e1681210fdffea Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Fri, 14 Jun 2013 20:45:00 +0200
Subject: Fix issue #75 : chargement des images en lazyload, reste à le rendre
 optionnel
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/App_FrontController.php           |  1 +
 app/views/index/index.phtml           | 10 +++++++++-
 app/views/javascript/main.phtml       |  6 ++++--
 public/scripts/jquery.lazyload.min.js | 15 +++++++++++++++
 4 files changed, 29 insertions(+), 3 deletions(-)
 create mode 100644 public/scripts/jquery.lazyload.min.js

(limited to 'app/views')

diff --git a/app/App_FrontController.php b/app/App_FrontController.php
index 77261280e..5729a115d 100644
--- a/app/App_FrontController.php
+++ b/app/App_FrontController.php
@@ -56,6 +56,7 @@ class App_FrontController extends FrontController {
 			View::appendScript ('https://login.persona.org/include.js');
 		}
 		View::appendScript (Url::display ('/scripts/jquery.js'));
+		View::appendScript (Url::display ('/scripts/jquery.lazyload.min.js'));
 		View::appendScript (Url::display ('/scripts/notification.js'));
 	}
 
diff --git a/app/views/index/index.phtml b/app/views/index/index.phtml
index 9974a9b0b..7037b2405 100644
--- a/app/views/index/index.phtml
+++ b/app/views/index/index.phtml
@@ -1,4 +1,12 @@
 <?php
+function lazyimg($content) {
+	return preg_replace(
+		'/<img([^<]+)src=([\'"])([^"\']*)([\'"])([^<]*)>/i',
+		'<img$1src="' . Url::display('/data/grey.gif') . '" data-original="$3"$5>',
+		$content
+	);
+}
+
 $output = Request::param ('output', 'normal');
 
 if ($output == 'rss') {
@@ -58,7 +66,7 @@ if ($output == 'rss') {
 				<h1 class="title"><?php echo $item->title (); ?></h1>
 				<?php $author = $item->author (); ?>
 				<?php echo $author != '' ? '<div class="author">' . Translate::t ('by_author', $author) . '</div>' : ''; ?>
-				<?php echo $item->content (); ?>
+				<?php echo lazyimg($item->content ()); ?>
 			</div>
 
 			<ul class="horizontal-list bottom">
diff --git a/app/views/javascript/main.phtml b/app/views/javascript/main.phtml
index e6c882333..443f62c31 100644
--- a/app/views/javascript/main.phtml
+++ b/app/views/javascript/main.phtml
@@ -109,8 +109,8 @@ function mark_favorite (active) {
 }
 
 function init_img () {
-	$(".flux .content img").each (function () {
-		if ($(this).width () > ($("#stream .content").width()) / 2) {
+	$(".flux_content .content img").each (function () {
+		if ($(this).width () > ($(".flux_content .content").width()) / 2) {
 			$(this).addClass("big");
 		}
 	});
@@ -125,6 +125,8 @@ function init_posts () {
 	<?php } ?>
 
 	init_img ();
+	// TODO rendre optionnel
+	$(".flux .content img").lazyload();
 
 	if (hide_posts) {
 		$(".flux:not(.active) .flux_content").hide ();
diff --git a/public/scripts/jquery.lazyload.min.js b/public/scripts/jquery.lazyload.min.js
new file mode 100644
index 000000000..79663d7bb
--- /dev/null
+++ b/public/scripts/jquery.lazyload.min.js
@@ -0,0 +1,15 @@
+/*
+ * Lazy Load - jQuery plugin for lazy loading images
+ *
+ * Copyright (c) 2007-2013 Mika Tuupola
+ *
+ * Licensed under the MIT license:
+ *   http://www.opensource.org/licenses/mit-license.php
+ *
+ * Project home:
+ *   http://www.appelsiini.net/projects/lazyload
+ *
+ * Version:  1.8.4
+ *
+ */
+(function(a,b,c,d){var e=a(b);a.fn.lazyload=function(c){function i(){var b=0;f.each(function(){var c=a(this);if(h.skip_invisible&&!c.is(":visible"))return;if(!a.abovethetop(this,h)&&!a.leftofbegin(this,h))if(!a.belowthefold(this,h)&&!a.rightoffold(this,h))c.trigger("appear"),b=0;else if(++b>h.failure_limit)return!1})}var f=this,g,h={threshold:0,failure_limit:0,event:"scroll",effect:"show",container:b,data_attribute:"original",skip_invisible:!0,appear:null,load:null};return c&&(d!==c.failurelimit&&(c.failure_limit=c.failurelimit,delete c.failurelimit),d!==c.effectspeed&&(c.effect_speed=c.effectspeed,delete c.effectspeed),a.extend(h,c)),g=h.container===d||h.container===b?e:a(h.container),0===h.event.indexOf("scroll")&&g.bind(h.event,function(a){return i()}),this.each(function(){var b=this,c=a(b);b.loaded=!1,c.one("appear",function(){if(!this.loaded){if(h.appear){var d=f.length;h.appear.call(b,d,h)}a("<img />").bind("load",function(){c.hide().attr("src",c.data(h.data_attribute))[h.effect](h.effect_speed),b.loaded=!0;var d=a.grep(f,function(a){return!a.loaded});f=a(d);if(h.load){var e=f.length;h.load.call(b,e,h)}}).attr("src",c.data(h.data_attribute))}}),0!==h.event.indexOf("scroll")&&c.bind(h.event,function(a){b.loaded||c.trigger("appear")})}),e.bind("resize",function(a){i()}),/iphone|ipod|ipad.*os 5/gi.test(navigator.appVersion)&&e.bind("pageshow",function(b){b.originalEvent.persisted&&f.each(function(){a(this).trigger("appear")})}),a(b).load(function(){i()}),this},a.belowthefold=function(c,f){var g;return f.container===d||f.container===b?g=e.height()+e.scrollTop():g=a(f.container).offset().top+a(f.container).height(),g<=a(c).offset().top-f.threshold},a.rightoffold=function(c,f){var g;return f.container===d||f.container===b?g=e.width()+e.scrollLeft():g=a(f.container).offset().left+a(f.container).width(),g<=a(c).offset().left-f.threshold},a.abovethetop=function(c,f){var g;return f.container===d||f.container===b?g=e.scrollTop():g=a(f.container).offset().top,g>=a(c).offset().top+f.threshold+a(c).height()},a.leftofbegin=function(c,f){var g;return f.container===d||f.container===b?g=e.scrollLeft():g=a(f.container).offset().left,g>=a(c).offset().left+f.threshold+a(c).width()},a.inviewport=function(b,c){return!a.rightoffold(b,c)&&!a.leftofbegin(b,c)&&!a.belowthefold(b,c)&&!a.abovethetop(b,c)},a.extend(a.expr[":"],{"below-the-fold":function(b){return a.belowthefold(b,{threshold:0})},"above-the-top":function(b){return!a.belowthefold(b,{threshold:0})},"right-of-screen":function(b){return a.rightoffold(b,{threshold:0})},"left-of-screen":function(b){return!a.rightoffold(b,{threshold:0})},"in-viewport":function(b){return a.inviewport(b,{threshold:0})},"above-the-fold":function(b){return!a.belowthefold(b,{threshold:0})},"right-of-fold":function(b){return a.rightoffold(b,{threshold:0})},"left-of-fold":function(b){return!a.rightoffold(b,{threshold:0})}})})(jQuery,window,document)
-- 
cgit v1.2.3


From 0ff751b443604ccb8cd0eb69050f59298c98a492 Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Sat, 15 Jun 2013 11:02:58 +0200
Subject: Lazyload facultatif (issue #75 ok)

---
 app/controllers/configureController.php |  3 +++
 app/i18n/en.php                         |  1 +
 app/i18n/fr.php                         |  1 +
 app/models/RSSConfiguration.php         | 16 ++++++++++++++++
 app/views/configure/display.phtml       | 14 ++++++++++++++
 app/views/index/index.phtml             |  8 +++++++-
 app/views/javascript/main.phtml         |  3 ++-
 7 files changed, 44 insertions(+), 2 deletions(-)

(limited to 'app/views')

diff --git a/app/controllers/configureController.php b/app/controllers/configureController.php
index 0d385daf9..4cfc1c085 100755
--- a/app/controllers/configureController.php
+++ b/app/controllers/configureController.php
@@ -142,6 +142,7 @@ class configureController extends ActionController {
 			$nb = Request::param ('posts_per_page', 10);
 			$view = Request::param ('default_view', 'all');
 			$display = Request::param ('display_posts', 'no');
+			$lazyload = Request::param ('lazyload', 'yes');
 			$sort = Request::param ('sort_order', 'low_to_high');
 			$old = Request::param ('old_entries', 3);
 			$mail = Request::param ('mail_login', false);
@@ -154,6 +155,7 @@ class configureController extends ActionController {
 			$this->view->conf->_postsPerPage (intval ($nb));
 			$this->view->conf->_defaultView ($view);
 			$this->view->conf->_displayPosts ($display);
+			$this->view->conf->_lazyload ($lazyload);
 			$this->view->conf->_sortOrder ($sort);
 			$this->view->conf->_oldEntries ($old);
 			$this->view->conf->_mailLogin ($mail);
@@ -169,6 +171,7 @@ class configureController extends ActionController {
 				'posts_per_page' => $this->view->conf->postsPerPage (),
 				'default_view' => $this->view->conf->defaultView (),
 				'display_posts' => $this->view->conf->displayPosts (),
+				'lazyload' => $this->view->conf->lazyload (),
 				'sort_order' => $this->view->conf->sortOrder (),
 				'old_entries' => $this->view->conf->oldEntries (),
 				'mail_login' => $this->view->conf->mailLogin (),
diff --git a/app/i18n/en.php b/app/i18n/en.php
index 3c3a1fbcc..30bed791f 100644
--- a/app/i18n/en.php
+++ b/app/i18n/en.php
@@ -144,6 +144,7 @@ return array (
 	'default_view'			=> 'Default view',
 	'sort_order'			=> 'Sort order',
 	'display_articles_unfolded'	=> 'Show articles unfolded by default',
+	'img_with_lazyload'		=> 'Use "lazy load" mode to load pictures',
 	'auto_read_when'		=> 'Mark automatically as read when',
 	'article_selected'		=> 'Article is selected',
 	'article_open_on_website'	=> 'Article is opened on its original website',
diff --git a/app/i18n/fr.php b/app/i18n/fr.php
index d270c9b96..87b87945f 100644
--- a/app/i18n/fr.php
+++ b/app/i18n/fr.php
@@ -144,6 +144,7 @@ return array (
 	'default_view'			=> 'Vue par défaut',
 	'sort_order'			=> 'Ordre de tri',
 	'display_articles_unfolded'	=> 'Afficher les articles dépliés par défaut',
+	'img_with_lazyload'		=> 'Utiliser le mode "lazy load" pour charger les images',
 	'auto_read_when'		=> 'Marquer automatiquement comme lu lorsque',
 	'article_selected'		=> 'L\'article est sélectionné',
 	'article_open_on_website'	=> 'L\'article est ouvert sur le site d\'origine',
diff --git a/app/models/RSSConfiguration.php b/app/models/RSSConfiguration.php
index 00fe3fe52..50dbd2555 100755
--- a/app/models/RSSConfiguration.php
+++ b/app/models/RSSConfiguration.php
@@ -9,6 +9,7 @@ class RSSConfiguration extends Model {
 	private $posts_per_page;
 	private $default_view;
 	private $display_posts;
+	private $lazyload;
 	private $sort_order;
 	private $old_entries;
 	private $shortcuts = array ();
@@ -22,6 +23,7 @@ class RSSConfiguration extends Model {
 		$this->_postsPerPage ($confDAO->posts_per_page);
 		$this->_defaultView ($confDAO->default_view);
 		$this->_displayPosts ($confDAO->display_posts);
+		$this->_lazyload ($confDAO->lazyload);
 		$this->_sortOrder ($confDAO->sort_order);
 		$this->_oldEntries ($confDAO->old_entries);
 		$this->_shortcuts ($confDAO->shortcuts);
@@ -45,6 +47,9 @@ class RSSConfiguration extends Model {
 	public function displayPosts () {
 		return $this->display_posts;
 	}
+	public function lazyload () {
+		return $this->lazyload;
+	}
 	public function sortOrder () {
 		return $this->sort_order;
 	}
@@ -100,6 +105,13 @@ class RSSConfiguration extends Model {
 			$this->display_posts = 'no';
 		}
 	}
+	public function _lazyload ($value) {
+		if ($value == 'no') {
+			$this->lazyload = 'no';
+		} else {
+			$this->lazyload = 'yes';
+		}
+	}
 	public function _sortOrder ($value) {
 		if ($value == 'high_to_low') {
 			$this->sort_order = 'high_to_low';
@@ -144,6 +156,7 @@ class RSSConfigurationDAO extends Model_array {
 	public $posts_per_page = 20;
 	public $default_view = 'not_read';
 	public $display_posts = 'no';
+	public $lazyload = 'yes';
 	public $sort_order = 'low_to_high';
 	public $old_entries = 3;
 	public $shortcuts = array (
@@ -178,6 +191,9 @@ class RSSConfigurationDAO extends Model_array {
 		if (isset ($this->array['display_posts'])) {
 			$this->display_posts = $this->array['display_posts'];
 		}
+		if (isset ($this->array['lazyload'])) {
+			$this->lazyload = $this->array['lazyload'];
+		}
 		if (isset ($this->array['sort_order'])) {
 			$this->sort_order = $this->array['sort_order'];
 		}
diff --git a/app/views/configure/display.phtml b/app/views/configure/display.phtml
index be67896dc..ea4fecd34 100644
--- a/app/views/configure/display.phtml
+++ b/app/views/configure/display.phtml
@@ -67,6 +67,20 @@
 			</div>
 		</div>
 
+		<div class="form-group">
+			<label class="group-name"><?php echo Translate::t ('img_with_lazyload'); ?></label>
+			<div class="group-controls">
+				<label class="radio" for="lazyload_yes">
+					<input type="radio" name="lazyload" id="lazyload_yes" value="yes"<?php echo $this->conf->lazyload () == 'yes' ? ' checked="checked"' : ''; ?> />
+					<?php echo Translate::t ('yes'); ?><noscript> - <b><?php echo Translate::t ('javascript_should_be_activated'); ?></b></noscript>
+				</label>
+				<label class="radio" for="lazyload_no">
+					<input type="radio" name="lazyload" id="lazyload_no" value="no"<?php echo $this->conf->lazyload () == 'no' ? ' checked="checked"' : ''; ?> />
+					<?php echo Translate::t ('no'); ?>
+				</label>
+			</div>
+		</div>
+
 		<div class="form-group">
 			<label class="group-name"><?php echo Translate::t ('display_articles_unfolded'); ?></label>
 			<div class="group-controls">
diff --git a/app/views/index/index.phtml b/app/views/index/index.phtml
index 7037b2405..1a07cdb46 100644
--- a/app/views/index/index.phtml
+++ b/app/views/index/index.phtml
@@ -66,7 +66,13 @@ if ($output == 'rss') {
 				<h1 class="title"><?php echo $item->title (); ?></h1>
 				<?php $author = $item->author (); ?>
 				<?php echo $author != '' ? '<div class="author">' . Translate::t ('by_author', $author) . '</div>' : ''; ?>
-				<?php echo lazyimg($item->content ()); ?>
+				<?php
+					if($this->conf->lazyload() == 'yes') {
+						echo lazyimg($item->content ());
+					} else {
+						echo $item->content();
+					}
+				?>
 			</div>
 
 			<ul class="horizontal-list bottom">
diff --git a/app/views/javascript/main.phtml b/app/views/javascript/main.phtml
index 443f62c31..9596b1647 100644
--- a/app/views/javascript/main.phtml
+++ b/app/views/javascript/main.phtml
@@ -125,8 +125,9 @@ function init_posts () {
 	<?php } ?>
 
 	init_img ();
-	// TODO rendre optionnel
+	<?php if($this->conf->lazyload() == 'yes') { ?>
 	$(".flux .content img").lazyload();
+	<?php } ?>
 
 	if (hide_posts) {
 		$(".flux:not(.active) .flux_content").hide ();
-- 
cgit v1.2.3


From 215b0a564e00874367a2730f204f967a1c336ebc Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Sat, 15 Jun 2013 13:13:20 +0200
Subject: Suppression du contrôleur API qui ne servait à rien
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/apiController.php | 46 ---------------------------------------
 app/views/api/getNbNotRead.phtml  |  3 ---
 app/views/api/getPublicFeed.phtml |  3 ---
 3 files changed, 52 deletions(-)
 delete mode 100755 app/controllers/apiController.php
 delete mode 100644 app/views/api/getNbNotRead.phtml
 delete mode 100644 app/views/api/getPublicFeed.phtml

(limited to 'app/views')

diff --git a/app/controllers/apiController.php b/app/controllers/apiController.php
deleted file mode 100755
index 025908f3e..000000000
--- a/app/controllers/apiController.php
+++ /dev/null
@@ -1,46 +0,0 @@
-<?php
-  
-class apiController extends ActionController {
-	public function firstAction() {
-		header('Content-type: application/json');
-
-		$this->view->_useLayout (false);
-	}
-
-	public function getPublicFeedAction () {
-		$entryDAO = new EntryDAO ();
-		$entryDAO->_nbItemsPerPage (-1);
-
-		$entries_tmp = $entryDAO->listPublic ('low_to_high');
-
-		$entries = array ();
-		foreach ($entries_tmp as $e) {
-			$author = $e->author ();
-
-			$notes = $e->notes ();
-			if ($notes == '') {
-				$feed = $e->feed (true);
-				if($author != '') {
-					$notes = Translate::t ('article_published_on_author', $feed->website (), $feed->name (), $author);
-				} else {
-					$notes = Translate::t ('article_published_on', $feed->website (), $feed->name ());
-				}
-			}
-
-			$id = $e->id ();
-			$entries[$id] = array ();
-			$entries[$id]['title'] = $e->title ();
-			$entries[$id]['content'] = $notes;
-			$entries[$id]['date'] = $e->date (true);
-			$entries[$id]['lastUpdate'] = $e->lastUpdate (true);
-			$entries[$id]['tags'] = $e->tags ();
-			$entries[$id]['url'] = $e->link ();
-			$entries[$id]['type'] = 'url';
-		}
-
-		$this->view->entries = $entries;
-	}
-
-	public function getNbNotReadAction() {
-	}
-}
diff --git a/app/views/api/getNbNotRead.phtml b/app/views/api/getNbNotRead.phtml
deleted file mode 100644
index 31c58f6ca..000000000
--- a/app/views/api/getNbNotRead.phtml
+++ /dev/null
@@ -1,3 +0,0 @@
-<?php
-echo json_encode($this->nb_not_read);
-
diff --git a/app/views/api/getPublicFeed.phtml b/app/views/api/getPublicFeed.phtml
deleted file mode 100644
index 8eb0774f2..000000000
--- a/app/views/api/getPublicFeed.phtml
+++ /dev/null
@@ -1,3 +0,0 @@
-<?php
-echo json_encode ($this->entries);
-?>
-- 
cgit v1.2.3


From 3ba63a170ec385910f2e743c648dd977c5eee135 Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Sat, 15 Jun 2013 13:25:48 +0200
Subject: Suppression des 'notes' sur les articles, pas utile

---
 app/controllers/entryController.php | 71 -------------------------------------
 app/i18n/en.php                     |  4 ---
 app/i18n/fr.php                     |  4 ---
 app/views/entry/note.phtml          | 65 ---------------------------------
 app/views/index/index.phtml         |  7 ----
 5 files changed, 151 deletions(-)
 delete mode 100644 app/views/entry/note.phtml

(limited to 'app/views')

diff --git a/app/controllers/entryController.php b/app/controllers/entryController.php
index 35f3150ea..9d6d9a944 100755
--- a/app/controllers/entryController.php
+++ b/app/controllers/entryController.php
@@ -97,75 +97,4 @@ class entryController extends ActionController {
 			}
 		}
 	}
-
-	public function noteAction () {
-		View::appendScript (Url::display (array ('c' => 'javascript', 'a' => 'main')));
-
-		$not_found = false;
-		$entryDAO = new EntryDAO ();
-		$catDAO = new CategoryDAO ();
-
-		$id = Request::param ('id');
-		if ($id) {
-			$entry = $entryDAO->searchById ($id);
-
-			if ($entry) {
-				$feed = $entry->feed (true);
-
-				if (Request::isPost ()) {
-					$note = htmlspecialchars (Request::param ('note', ''));
-					$public = Request::param ('public', 'no');
-					if ($public == 'yes') {
-						$public = true;
-					} else {
-						$public = false;
-					}
-
-					$values = array (
-						'annotation' => $note,
-						'is_public' => $public,
-						'lastUpdate' => time ()
-					);
-
-					if ($entryDAO->updateEntry ($id, $values)) {
-						$notif = array (
-							'type' => 'good',
-							'content' => Translate::t ('updated')
-						);
-					} else {
-						$notif = array (
-							'type' => 'bad',
-							'content' => Translate::t ('error_occured')
-						);
-					}
-					Session::_param ('notification', $notif);
-					Request::forward (array (
-						'c' => 'entry',
-						'a' => 'note',
-						'params' => array (
-							'id' => $id
-						)
-					), true);
-				}
-			} else {
-				$not_found = true;
-			}
-		} else {
-			$not_found = true;
-		}
-
-		if ($not_found) {
-			Error::error (
-				404,
-				array ('error' => array (Translate::t ('page_not_found')))
-			);
-		} else {
-			$this->view->entry = $entry;
-			$this->view->cat_aside = $catDAO->listCategories ();
-			$this->view->nb_favorites = $entryDAO->countFavorites ();
-			$this->view->nb_total = $entryDAO->count ();
-			$this->view->get_c = $feed->category ();
-			$this->view->get_f = $feed->id ();
-		}
-	}
 }
diff --git a/app/i18n/en.php b/app/i18n/en.php
index 30bed791f..0d0ab5269 100644
--- a/app/i18n/en.php
+++ b/app/i18n/en.php
@@ -155,10 +155,6 @@ return array (
 	'by_email'			=> 'By mail',
 	'on_shaarli'			=> 'On your Shaarli',
 
-	'note'				=> 'Note',
-	'add_note'			=> 'Add a note',
-	'update_note'			=> 'Update your note',
-	'ask_public_article'		=> 'Public article?',
 	'article'			=> 'Article',
 	'title'				=> 'Title',
 	'author'			=> 'Author',
diff --git a/app/i18n/fr.php b/app/i18n/fr.php
index 87b87945f..97e36f923 100644
--- a/app/i18n/fr.php
+++ b/app/i18n/fr.php
@@ -155,10 +155,6 @@ return array (
 	'by_email'			=> 'Par mail',
 	'on_shaarli'			=> 'Sur votre Shaarli',
 
-	'note'				=> 'Note',
-	'add_note'			=> 'Ajouter une note',
-	'update_note'			=> 'Modifier votre note',
-	'ask_public_article'		=> 'Article public ?',
 	'article'			=> 'Article',
 	'title'				=> 'Titre',
 	'author'			=> 'Auteur',
diff --git a/app/views/entry/note.phtml b/app/views/entry/note.phtml
deleted file mode 100644
index 061060106..000000000
--- a/app/views/entry/note.phtml
+++ /dev/null
@@ -1,65 +0,0 @@
-<?php $this->partial ('aside_flux'); ?>
-
-<div class="post">
-	<a href="<?php echo _url ('index', 'index'); ?>"><?php echo Translate::t ('back_to_rss_feeds'); ?></a>
-
-	<form method="post" action="<?php echo _url ('entry', 'note', 'id', $this->entry->id ()); ?>">
-		<legend><?php echo Translate::t ('note'); ?></legend>
-
-		<div class="form-group">
-			<label class="group-name" for="note"><?php echo Translate::t ('add_note'); ?></label>
-			<div class="group-controls">
-				<textarea rows="5" cols="80" name="note" id="note"><?php echo $this->entry->notes (); ?></textarea>
-			</div>
-		</div>
-		<div class="form-group">
-			<label class="group-name" for="public_note"><?php echo Translate::t ('ask_public_article'); ?></label>
-			<div class="group-controls">
-				<label class="checkbox" for="public">
-					<input type="checkbox" name="public" id="public" value="yes"<?php echo $this->entry->isPublic () ? ' checked="checked"' : ''; ?> /> <?php echo Translate::t ('yes'); ?>
-				</label>
-			</div>
-		</div>
-
-		<div class="form-group form-actions">
-			<div class="group-controls">
-				<button type="submit" class="btn btn-important"><?php echo Translate::t ('save'); ?></button>
-				<button type="reset" class="btn"><?php echo Translate::t ('cancel'); ?></button>
-			</div>
-		</div>
-
-		<legend><?php echo Translate::t ('article'); ?></legend>
-
-		<div class="form-group">
-			<label class="group-name"><?php echo Translate::t ('title'); ?></label>
-			<div class="group-controls">
-				<span class="control"><a href="<?php echo $this->entry->link (); ?>"><?php echo $this->entry->title (); ?></a></span>
-			</div>
-		</div>
-
-		<?php
-		$author = $this->entry->author ();
-		if ($author) { ?>
-		<div class="form-group">
-			<label class="group-name"><?php echo Translate::t ('author'); ?></label>
-			<div class="group-controls">
-				<span class="control"><?php echo $author; ?></span>
-			</div>
-		</div>
-		<?php } ?>
-
-		<div class="form-group">
-			<label class="group-name"><?php echo Translate::t ('publication_date'); ?></label>
-			<div class="group-controls">
-				<span class="control"><?php echo $this->entry->date (); ?></span>
-			</div>
-		</div>
-
-		<div class="form-group">
-			<label class="group-name"><?php echo Translate::t ('article'); ?></label>
-			<div class="group-controls">
-				<span class="control"><?php echo $this->entry->content (); ?></span>
-			</div>
-		</div>
-	</form>
-</div>
diff --git a/app/views/index/index.phtml b/app/views/index/index.phtml
index 1a07cdb46..30df591eb 100644
--- a/app/views/index/index.phtml
+++ b/app/views/index/index.phtml
@@ -76,13 +76,6 @@ if ($output == 'rss') {
 			</div>
 
 			<ul class="horizontal-list bottom">
-				<li class="item">
-					<?php if ($item->notes () != '') { ?>
-					<i class="icon i_note"></i> <a class="note" href="<?php echo _url ('entry', 'note', 'id', $item->id ()); ?>"><?php echo Translate::t ('update_note'); ?></a>
-					<?php } else { ?>
-					<i class="icon i_note_empty"></i> <a class="note" href="<?php echo _url ('entry', 'note', 'id', $item->id ()); ?>"><?php echo Translate::t ('add_note'); ?></a>
-					<?php } ?>
-				</li>
 				<li class="item">
 					<div class="dropdown">
 						<div id="dropdown-share-<?php echo $item->id ();?>" class="dropdown-target"></div>
-- 
cgit v1.2.3


From 1863153b966af00078869b6634df1daa22cdcbfe Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Sat, 15 Jun 2013 15:55:44 +0200
Subject: Fix issue #71 : remise en place du mode endless + correction bug à
 l'importation OPML
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/feedController.php  |   4 ++--
 app/controllers/indexController.php |   1 +
 app/views/helpers/pagination.phtml  |   2 +-
 lib/minz/Request.php                |   8 +++++---
 public/scripts/endless_mode.js      |  31 +++++++++++++++++++++++++++++++
 public/theme/freshrss.css           |   4 ++++
 public/theme/loader.gif             | Bin 0 -> 4167 bytes
 7 files changed, 44 insertions(+), 6 deletions(-)
 create mode 100644 public/scripts/endless_mode.js
 create mode 100644 public/theme/loader.gif

(limited to 'app/views')

diff --git a/app/controllers/feedController.php b/app/controllers/feedController.php
index a41d7a33f..76da41c58 100755
--- a/app/controllers/feedController.php
+++ b/app/controllers/feedController.php
@@ -219,8 +219,8 @@ class feedController extends ActionController {
 		$entryDAO = new EntryDAO ();
 		$feedDAO = new FeedDAO ();
 
-		$categories = Request::param ('categories', array ());
-		$feeds = Request::param ('feeds', array ());
+		$categories = Request::param ('categories', array (), true);
+		$feeds = Request::param ('feeds', array (), true);
 
 		// on ajoute les catégories en masse dans une fonction à part
 		$this->addCategories ($categories);
diff --git a/app/controllers/indexController.php b/app/controllers/indexController.php
index f4f0b98b3..5403b82ed 100755
--- a/app/controllers/indexController.php
+++ b/app/controllers/indexController.php
@@ -12,6 +12,7 @@ class indexController extends ActionController {
 			View::appendScript (Url::display ('/scripts/shortcut.js'));
 			View::appendScript (Url::display (array ('c' => 'javascript', 'a' => 'main')));
 			View::appendScript (Url::display (array ('c' => 'javascript', 'a' => 'actualize')));
+			View::appendScript (Url::display ('/scripts/endless_mode.js'));
 		}
 
 		$entryDAO = new EntryDAO ();
diff --git a/app/views/helpers/pagination.phtml b/app/views/helpers/pagination.phtml
index f029f281a..80c0976ad 100755
--- a/app/views/helpers/pagination.phtml
+++ b/app/views/helpers/pagination.phtml
@@ -8,7 +8,7 @@
 	<li class="item pager-next">
 	<?php if ($this->next != '') { ?>
 	<?php $params[$getteur] = $this->next; ?>
-	<a href="<?php echo Url::display (array ('c' => $c, 'a' => $a, 'params' => $params)); ?>"><?php echo Translate::t ('load_more'); ?></a>
+	<a id="load_more" href="<?php echo Url::display (array ('c' => $c, 'a' => $a, 'params' => $params)); ?>"><?php echo Translate::t ('load_more'); ?></a>
 	<?php } else { ?>
 	<?php echo Translate::t ('nothing_to_load'); ?>
 	<?php } ?>
diff --git a/lib/minz/Request.php b/lib/minz/Request.php
index 3463686bc..bd5fcb95e 100644
--- a/lib/minz/Request.php
+++ b/lib/minz/Request.php
@@ -29,11 +29,13 @@ class Request {
 	public static function params () {
 		return self::$params;
 	}
-	public static function param ($key, $default = false) {
+	public static function param ($key, $default = false, $specialchars = false) {
 		if (isset (self::$params[$key])) {
 			$p = self::$params[$key];
-			if(is_array($p)) {
-				return array_map(htmlspecialchars, $p);
+			if(is_object($p) || $specialchars) {
+				return $p;
+			} elseif(is_array($p)) {
+				return array_map('htmlspecialchars', $p);
 			} else {
 				return htmlspecialchars($p);
 			}
diff --git a/public/scripts/endless_mode.js b/public/scripts/endless_mode.js
new file mode 100644
index 000000000..489b69f30
--- /dev/null
+++ b/public/scripts/endless_mode.js
@@ -0,0 +1,31 @@
+var url_load_more = "";
+var load = false;
+
+function init_load_more() {
+	url_load_more = $("a#load_more").attr("href");
+	
+	$("#load_more").click (function () {
+		load_more_posts ();
+		
+		return false;
+	});
+}
+
+function load_more_posts () {
+	load = true;
+	$("#load_more").addClass("loading");
+	$.get (url_load_more, function (data) {
+		$("#stream .flux:last").after($("#stream .flux", data));
+		$(".pagination").html($(".pagination", data).html());
+		
+		init_load_more();
+		init_posts();
+		
+		$("#load_more").removeClass("loading");
+		load = false;
+	});
+}
+
+$(document).ready (function () {
+	init_load_more();
+});
\ No newline at end of file
diff --git a/public/theme/freshrss.css b/public/theme/freshrss.css
index 2a8f24ea7..f5d4f6a83 100644
--- a/public/theme/freshrss.css
+++ b/public/theme/freshrss.css
@@ -357,6 +357,10 @@
 			color: #333;
 			font-style: italic;
 		}
+.loading {
+	background: url("loader.gif") center center no-repeat;
+	font-size: 0;
+}
 
 /*** NOTIFICATION ***/
 .notification {
diff --git a/public/theme/loader.gif b/public/theme/loader.gif
new file mode 100644
index 000000000..5ff26f0e3
Binary files /dev/null and b/public/theme/loader.gif differ
-- 
cgit v1.2.3


From fafddf2a20748cdbda1f974338528c8e488f4b11 Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Sat, 15 Jun 2013 16:42:50 +0200
Subject: Fix issue #73 : ajout d'une page pour visualiser les logs

---
 app/App_FrontController.php             |  1 +
 app/controllers/indexController.php     | 26 ++++++++++++++++++
 app/i18n/en.php                         |  3 +++
 app/i18n/fr.php                         |  3 +++
 app/layout/header.phtml                 |  1 +
 app/models/Log.php                      | 47 +++++++++++++++++++++++++++++++++
 app/views/helpers/logs_pagination.phtml | 47 +++++++++++++++++++++++++++++++++
 app/views/index/logs.phtml              | 21 +++++++++++++++
 lib/minz/View.php                       |  2 +-
 lib/minz/dao/Model_txt.php              |  2 +-
 public/theme/freshrss.css               | 44 +++++++++++++++++++++++++++++-
 11 files changed, 194 insertions(+), 3 deletions(-)
 create mode 100644 app/models/Log.php
 create mode 100755 app/views/helpers/logs_pagination.phtml
 create mode 100644 app/views/index/logs.phtml

(limited to 'app/views')

diff --git a/app/App_FrontController.php b/app/App_FrontController.php
index 5729a115d..637d61206 100644
--- a/app/App_FrontController.php
+++ b/app/App_FrontController.php
@@ -36,6 +36,7 @@ class App_FrontController extends FrontController {
 		include (APP_PATH . '/models/Entry.php');
 		include (APP_PATH . '/models/EntriesGetter.php');
 		include (APP_PATH . '/models/RSSPaginator.php');
+		include (APP_PATH . '/models/Log.php');
 	}
 
 	private function loadParamsView () {
diff --git a/app/controllers/indexController.php b/app/controllers/indexController.php
index 5403b82ed..3f10720c2 100755
--- a/app/controllers/indexController.php
+++ b/app/controllers/indexController.php
@@ -139,6 +139,32 @@ class indexController extends ActionController {
 		View::prependTitle (Translate::t ('about') . ' - ');
 	}
 
+	public function logsAction () {
+		if (login_is_conf ($this->view->conf) && !is_logged ()) {
+			Error::error (
+				403,
+				array ('error' => array (Translate::t ('access_denied')))
+			);
+		}
+
+		View::prependTitle (Translate::t ('see_logs') . ' - ');
+
+		$logs = array();
+		try {
+			$logDAO = new LogDAO ();
+			$logs = $logDAO->lister ();
+			$logs = array_reverse ($logs);
+		} catch(FileNotExistException $e) {
+
+		}
+
+		//gestion pagination
+		$page = Request::param ('page', 1);
+		$this->view->logsPaginator = new Paginator ($logs);
+		$this->view->logsPaginator->_nbItemsPerPage (50);
+		$this->view->logsPaginator->_currentPage ($page);
+	}
+
 	public function loginAction () {
 		$this->view->_useLayout (false);
 
diff --git a/app/i18n/en.php b/app/i18n/en.php
index 0d0ab5269..dbb6b1bfe 100644
--- a/app/i18n/en.php
+++ b/app/i18n/en.php
@@ -186,6 +186,9 @@ return array (
 	'credits'			=> 'Credits',
 	'credits_content'		=> 'Some design elements come from <a href="http://twitter.github.io/bootstrap/">Bootstrap</a> although FreshRSS doesn\'t use this framework. <a href="https://git.gnome.org/browse/gnome-icon-theme-symbolic">Icons</a> come from <a href="https://www.gnome.org/">GNOME project</a>. <em>Open Sans</em> font police used has been created by <a href="https://www.google.com/webfonts/specimen/Open+Sans">Steve Matteson</a>. Favicons are collected with <a href="https://getfavicon.appspot.com/">getFavicon API</a>. FreshRSS is based on <a href="https://github.com/marienfressinaud/MINZ">Minz</a>, a PHP framework.',
 
+	'logs'				=> 'Logs',
+	'logs_empty'			=> 'Log file is empty',
+
 	// DATE
 	'january'			=> 'january',
 	'february'			=> 'february',
diff --git a/app/i18n/fr.php b/app/i18n/fr.php
index 97e36f923..75a76cc7a 100644
--- a/app/i18n/fr.php
+++ b/app/i18n/fr.php
@@ -186,6 +186,9 @@ return array (
 	'credits'			=> 'Crédits',
 	'credits_content'		=> 'Des éléments de design sont issus du <a href="http://twitter.github.io/bootstrap/">projet Bootstrap</a> bien que FreshRSS n\'utilise pas ce framework. Les <a href="https://git.gnome.org/browse/gnome-icon-theme-symbolic">icônes</a> sont issues du <a href="https://www.gnome.org/">projet GNOME</a>. La police <em>Open Sans</em> utilisée a été créée par <a href="https://www.google.com/webfonts/specimen/Open+Sans">Steve Matteson</a>. Les favicons sont récupérés grâce au site <a href="https://getfavicon.appspot.com/">getFavicon</a>. FreshRSS repose sur <a href="https://github.com/marienfressinaud/MINZ">Minz</a>, un framework PHP.',
 
+	'logs'				=> 'Logs',
+	'logs_empty'			=> 'Les logs sont vides',
+
 	// DATE
 	'january'			=> 'janvier',
 	'february'			=> 'février',
diff --git a/app/layout/header.phtml b/app/layout/header.phtml
index 2e84f7f4d..4131f8687 100644
--- a/app/layout/header.phtml
+++ b/app/layout/header.phtml
@@ -54,6 +54,7 @@
 				<li class="item"><a href="<?php echo _url ('configure', 'shortcut'); ?>"><?php echo Translate::t ('shortcuts'); ?></a></li>
 				<li class="separator"></li>
 				<li class="item"><a href="<?php echo _url ('index', 'about'); ?>"><?php echo Translate::t ('about'); ?></a></li>
+				<li class="item"><a href="<?php echo _url ('index', 'logs'); ?>"><?php echo Translate::t ('logs'); ?></a></li>
 			</ul>
 		</div>
 	</div>
diff --git a/app/models/Log.php b/app/models/Log.php
new file mode 100644
index 000000000..5c280fa7a
--- /dev/null
+++ b/app/models/Log.php
@@ -0,0 +1,47 @@
+<?php
+
+class Log_Model extends Model {
+	private $date;
+	private $level;
+	private $information;
+
+	public function date () {
+		return $this->date;
+	}
+	public function level () {
+		return $this->level;
+	}
+	public function info () {
+		return $this->information;
+	}
+	public function _date ($date) {
+		$this->date = $date;
+	}
+	public function _level ($level) {
+		$this->level = $level;
+	}
+	public function _info ($information) {
+		$this->information = $information;
+	}
+}
+
+class LogDAO extends Model_txt {
+	public function __construct () {
+		parent::__construct (LOG_PATH . '/application.log', 'r+');
+	}
+	
+	public function lister () {
+		$logs = array ();
+
+		$i = 0;
+		while (($line = $this->readLine ()) !== false) {
+			$logs[$i] = new Log_Model ();
+			$logs[$i]->_date (preg_replace ("'\[(.*?)\] \[(.*?)\] --- (.*?)'U", "\\1", $line));
+			$logs[$i]->_level (preg_replace ("'\[(.*?)\] \[(.*?)\] --- (.*?)'U", "\\2", $line));
+			$logs[$i]->_info (preg_replace ("'\[(.*?)\] \[(.*?)\] --- (.*?)'U", "\\3", $line));
+			$i++;
+		}
+
+		return $logs;
+	}
+}
\ No newline at end of file
diff --git a/app/views/helpers/logs_pagination.phtml b/app/views/helpers/logs_pagination.phtml
new file mode 100755
index 000000000..0088dabc6
--- /dev/null
+++ b/app/views/helpers/logs_pagination.phtml
@@ -0,0 +1,47 @@
+<?php
+	$c = Request::controllerName ();
+	$a = Request::actionName ();
+	$params = Request::params ();
+?>
+
+<?php if ($this->nbPage > 1) { ?>
+<ul class="pagination">
+	<?php $params[$getteur] = 1; ?>
+	<li class="item pager-first">
+		<?php if ($this->currentPage > 1) { ?>
+		<a href="<?php echo Url::display (array ('c' => $c, 'a' => $a, 'params' => $params)); ?>">« Début</a>
+		<?php } ?>
+	</li>
+
+	<?php $params[$getteur] = $this->currentPage - 1; ?>
+	<li class="item pager-previous">
+		<?php if ($this->currentPage > 1) { ?>
+		<a href="<?php echo Url::display (array ('c' => $c, 'a' => $a, 'params' => $params)); ?>">‹ Précédent</a>
+		<?php } ?>
+	</li>
+
+	<?php for ($i = $this->currentPage - 2; $i <= $this->currentPage + 2; $i++) { ?>
+		<?php if($i > 0 && $i <= $this->nbPage) { ?>
+			<?php if ($i != $this->currentPage) { ?>
+			<?php $params[$getteur] = $i; ?>
+			<li class="item pager-item"><a href="<?php echo Url::display (array ('c' => $c, 'a' => $a, 'params' => $params)); ?>"><?php echo $i; ?></a></li>
+			<?php } else { ?>
+			<li class="item pager-current"><?php echo $i; ?></li>
+			<?php } ?>
+		<?php } ?>
+	<?php } ?>
+
+	<?php $params[$getteur] = $this->currentPage + 1; ?>
+	<li class="item pager-next">
+		<?php if ($this->currentPage < $this->nbPage) { ?>
+		<a href="<?php echo Url::display (array ('c' => $c, 'a' => $a, 'params' => $params)); ?>">Suivant ›</a>
+		<?php } ?>
+	</li>
+	<?php $params[$getteur] = $this->nbPage; ?>
+	<li class="item pager-last">
+		<?php if ($this->currentPage < $this->nbPage) { ?>
+		<a href="<?php echo Url::display (array ('c' => $c, 'a' => $a, 'params' => $params)); ?>">Fin »</a>
+		<?php } ?>
+	</li>
+</ul>
+<?php } ?>
diff --git a/app/views/index/logs.phtml b/app/views/index/logs.phtml
new file mode 100644
index 000000000..c72a84c86
--- /dev/null
+++ b/app/views/index/logs.phtml
@@ -0,0 +1,21 @@
+<div class="post content">
+	<a href="<?php echo _url ('index', 'index'); ?>"><?php echo Translate::t ('back_to_rss_feeds'); ?></a>
+
+	<h1><?php echo Translate::t ('logs'); ?></h1>
+
+	<?php $items = $this->logsPaginator->items (); ?>
+
+	<?php if (!empty ($items)) { ?>
+	<div class="logs">
+		<?php $this->logsPaginator->render ('logs_pagination.phtml', 'page'); ?>
+		
+		<?php foreach ($items as $log) { ?>
+		<div class="log <?php echo $log->level (); ?>"><span class="date"><?php echo date ('d/m/Y - H:i:s', strtotime ($log->date ())); ?></span><?php echo $log->info (); ?></div>
+		<?php } ?>
+		
+		<?php $this->logsPaginator->render ('logs_pagination.phtml','page'); ?>
+	</div>
+	<?php } else { ?>
+	<p class="alert alert-warn"><?php echo Translate::t ('logs_empty'); ?></p>
+	<?php } ?>
+</div>
\ No newline at end of file
diff --git a/lib/minz/View.php b/lib/minz/View.php
index 5c329c159..2bb747aa9 100755
--- a/lib/minz/View.php
+++ b/lib/minz/View.php
@@ -71,7 +71,7 @@ class View {
 		} else {
 			Log::record ('File doesn\'t exist : `'
 			            . $this->view_filename . '`',
-			            Log::WARNING);
+			            Log::NOTICE);
 		}
 	}
 
diff --git a/lib/minz/dao/Model_txt.php b/lib/minz/dao/Model_txt.php
index ad15c8b36..c9d5cfe77 100755
--- a/lib/minz/dao/Model_txt.php
+++ b/lib/minz/dao/Model_txt.php
@@ -27,7 +27,7 @@ class Model_txt {
 	 */
 	public function __construct ($nameFile, $mode = 'a+') {
 		$this->filename = $nameFile;
-		$this->file = fopen ($this->filename, $mode);
+		$this->file = @fopen ($this->filename, $mode);
 		
 		if (!$this->file) {
 			throw new FileNotExistException (
diff --git a/public/theme/freshrss.css b/public/theme/freshrss.css
index f5d4f6a83..4919639af 100644
--- a/public/theme/freshrss.css
+++ b/public/theme/freshrss.css
@@ -349,14 +349,29 @@
 }
 	.pagination .item {
 		display: table-cell;
-		border-top: 1px solid #aaa;
 		line-height: 40px;
 	}
+		.pagination .item.pager-current {
+			font-weight: bold;
+			font-size: 140%;
+		}
+		.pagination .item.pager-first,
+		.pagination .item.pager-previous,
+		.pagination .item.pager-next,
+		.pagination .item.pager-last {
+			width: 100px;
+		}
 		.pagination .item a {
 			display: block;
 			color: #333;
 			font-style: italic;
 		}
+	.pagination:first-child .item {
+		border-bottom: 1px solid #aaa;
+	}
+	.pagination:last-child .item {
+		border-top: 1px solid #aaa;
+	}
 .loading {
 	background: url("loader.gif") center center no-repeat;
 	font-size: 0;
@@ -421,6 +436,33 @@
 		vertical-align: middle;
 	}
 
+.logs {
+	border: 1px solid #aaa;
+}
+	.logs .log {
+		padding: 5px 2%;
+		overflow: auto;
+		background: #fafafa;
+		border-bottom: 1px solid #999;
+		color: #333;
+		font-size: 90%;
+	}
+		.logs .log .date {
+			display: block;
+		}
+	.logs .log.error {
+		background: #fdd;
+		color: #844;
+	}
+	.logs .log.warning {
+		background: #ffe;
+		color: #c95;
+	}
+	.logs .log.notice {
+		background: #f4f4f4;
+		color: #aaa;
+	}
+
 @media(max-width: 840px) {
 	.header,
 	.aside .btn-important,
-- 
cgit v1.2.3


From 8cf9ee76504d2eabd969aff1760b4edb59dfb358 Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Sat, 15 Jun 2013 17:36:42 +0200
Subject: Fix issue #69 : ajout d'une option pour optimiser la BDD + correction
 bug script actualisation lorsque connexion paramétrée
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 actualize_script.php                |  1 +
 app/controllers/entryController.php | 19 +++++++++++++++++++
 app/i18n/en.php                     |  4 ++++
 app/i18n/fr.php                     |  4 ++++
 app/models/Entry.php                |  6 ++++++
 app/views/configure/display.phtml   | 11 +++++++++++
 6 files changed, 45 insertions(+)

(limited to 'app/views')

diff --git a/actualize_script.php b/actualize_script.php
index 76bbe2e4f..7f72e419e 100755
--- a/actualize_script.php
+++ b/actualize_script.php
@@ -24,4 +24,5 @@ require (APP_PATH . '/App_FrontController.php');
 
 $front_controller = new App_FrontController ();
 $front_controller->init ();
+Session::_param('mail', true); // permet de se passer de la phase de connexion
 $front_controller->run ();
diff --git a/app/controllers/entryController.php b/app/controllers/entryController.php
index 9d6d9a944..c7e13f471 100755
--- a/app/controllers/entryController.php
+++ b/app/controllers/entryController.php
@@ -97,4 +97,23 @@ class entryController extends ActionController {
 			}
 		}
 	}
+
+	public function optimizeAction() {
+		// La table des entrées a tendance à grossir énormément
+		// Cette action permet d'optimiser cette table permettant de grapiller un peu de place
+		// Cette fonctionnalité n'est à appeler qu'occasionnellement
+		$entryDAO = new EntryDAO();
+		$entryDAO->optimizeTable();
+
+		$notif = array (
+			'type' => 'good',
+			'content' => Translate::t ('optimization_complete')
+		);
+		Session::_param ('notification', $notif);
+
+		Request::forward(array(
+			'c' => 'configure',
+			'a' => 'display'
+		), true);
+	}
 }
diff --git a/app/i18n/en.php b/app/i18n/en.php
index dbb6b1bfe..e40be045a 100644
--- a/app/i18n/en.php
+++ b/app/i18n/en.php
@@ -78,6 +78,8 @@ return array (
 	'category_emptied'		=> 'Category has been emptied',
 	'feed_deleted'			=> 'Feed has been deleted',
 
+	'optimization_complete'		=> 'Optimization complete',
+
 	'your_rss_feeds'		=> 'Your RSS feeds',
 	'your_favorites'		=> 'Your favorites',
 	'public'			=> 'Public',
@@ -154,6 +156,8 @@ return array (
 	'share'				=> 'Share',
 	'by_email'			=> 'By mail',
 	'on_shaarli'			=> 'On your Shaarli',
+	'optimize_bdd'			=> 'Optimize database',
+	'optimize_todo_sometimes'	=> 'To do occasionally to reduce size of database',
 
 	'article'			=> 'Article',
 	'title'				=> 'Title',
diff --git a/app/i18n/fr.php b/app/i18n/fr.php
index 75a76cc7a..69c7a8ffe 100644
--- a/app/i18n/fr.php
+++ b/app/i18n/fr.php
@@ -78,6 +78,8 @@ return array (
 	'category_emptied'		=> 'La catégorie a été vidée',
 	'feed_deleted'			=> 'Le flux a été supprimé',
 
+	'optimization_complete'		=> 'Optimisation terminée',
+
 	'your_rss_feeds'		=> 'Vos flux RSS',
 	'your_favorites'		=> 'Vos favoris',
 	'public'			=> 'Public',
@@ -154,6 +156,8 @@ return array (
 	'share'				=> 'Partager',
 	'by_email'			=> 'Par mail',
 	'on_shaarli'			=> 'Sur votre Shaarli',
+	'optimize_bdd'			=> 'Optimiser la base de données',
+	'optimize_todo_sometimes'	=> 'À faire de temps en temps pour réduire la taille de la BDD',
 
 	'article'			=> 'Article',
 	'title'				=> 'Titre',
diff --git a/app/models/Entry.php b/app/models/Entry.php
index 050407390..6af3178ee 100755
--- a/app/models/Entry.php
+++ b/app/models/Entry.php
@@ -509,6 +509,12 @@ class EntryDAO extends Model_pdo {
 
 		return $res[0]['count'];
 	}
+
+	public function optimizeTable() {
+		$sql = 'OPTIMIZE TABLE entry';
+		$stm = $this->bd->prepare ($sql);
+		$stm->execute ();
+	}
 }
 
 class HelperEntry {
diff --git a/app/views/configure/display.phtml b/app/views/configure/display.phtml
index ea4fecd34..c46a02143 100644
--- a/app/views/configure/display.phtml
+++ b/app/views/configure/display.phtml
@@ -121,6 +121,17 @@
 			</div>
 		</div>
 
+		<legend><?php echo Translate::t ('advanced'); ?></legend>
+		<div class="form-group">
+			<label class="group-name"></label>
+			<div class="group-controls">
+				<a class="btn" href="<?php echo _url('entry', 'optimize'); ?>">
+					<?php echo Translate::t('optimize_bdd'); ?>
+				</a>
+				<i class="icon i_help"></i> <?php echo Translate::t('optimize_todo_sometimes'); ?>
+			</div>
+		</div>
+
 		<div class="form-group form-actions">
 			<div class="group-controls">
 				<button type="submit" class="btn btn-important"><?php echo Translate::t ('save'); ?></button>
-- 
cgit v1.2.3


From 4bda1d75aec180ee3845f74991f99a99ef2ae062 Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Sat, 15 Jun 2013 17:54:24 +0200
Subject: Possibilité de marquer un article lu / favori même si une autre
 action de ce type est en attente (http) + ajustement css
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/javascript/main.phtml | 17 ++---------------
 public/theme/freshrss.css       | 13 +++++++++++--
 2 files changed, 13 insertions(+), 17 deletions(-)

(limited to 'app/views')

diff --git a/app/views/javascript/main.phtml b/app/views/javascript/main.phtml
index 9596b1647..28bb0dfd9 100644
--- a/app/views/javascript/main.phtml
+++ b/app/views/javascript/main.phtml
@@ -42,19 +42,14 @@ function toggleContent (new_active, old_active) {
 	<?php } ?>
 }
 
-var load = false;
 function mark_read (active, only_not_read) {
 	if (active[0] === undefined || (
-	    only_not_read === true && !active.hasClass("not_read")) ||
-	    load === true) {
+	    only_not_read === true && !active.hasClass("not_read"))) {
 		return false;
 	}
 
-	load = true;
-
 	url =  active.find ("a.read").attr ("href");
 	if (url === undefined) {
-		load = false;
 		return false;
 	}
 
@@ -71,22 +66,16 @@ function mark_read (active, only_not_read) {
 		} else {
 			active.addClass ("not_read");
 		}
-
-		load = false;
 	});
 }
 
 function mark_favorite (active) {
-	if (active[0] === undefined ||
-	    load === true) {
+	if (active[0] === undefined) {
 		return false;
 	}
 
-	load = true;
-
 	url =  active.find ("a.bookmark").attr ("href");
 	if (url === undefined) {
-		load = false;
 		return false;
 	}
 
@@ -103,8 +92,6 @@ function mark_favorite (active) {
 		} else {
 			active.addClass ("favorite");
 		}
-
-		load = false;
 	});
 }
 
diff --git a/public/theme/freshrss.css b/public/theme/freshrss.css
index 4919639af..636f9e09d 100644
--- a/public/theme/freshrss.css
+++ b/public/theme/freshrss.css
@@ -77,6 +77,7 @@
 	}
 
 .favicon {
+	height: 16px;
 	width: 16px;
 }
 
@@ -243,9 +244,12 @@
 			text-overflow: ellipsis;
 			line-height: 40px;
 		}
+			.flux_header .item.website .favicon {
+				padding: 12px;
+			}
 			.flux_header .item.website a {
 				display: block;
-				padding: 0 5px;
+				padding: 0;
 				height: 40px;
 			}
 		.flux_header .item.title {
@@ -473,9 +477,14 @@
 		display: none;
 	}
 	.flux_header .item.website {
-		width: 30px;
+		width: 40px;
 		text-align: center;
 	}
+
+	.content {
+		font-size: 120%;
+	}
+
 	.pagination .pager-previous, .pagination .pager-next {
 		width: 100px;
 	}
-- 
cgit v1.2.3


From d3078fb726639eed478a2a449b0a9043af04a756 Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Sat, 15 Jun 2013 19:42:02 +0200
Subject: Mise en place de la structure pour les différentes vues
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/i18n/en.php                     |   3 +
 app/i18n/fr.php                     |   3 +
 app/layout/nav_menu.phtml           |  67 +++++++++++++------
 app/views/helpers/global_view.phtml |   5 ++
 app/views/helpers/normal_view.phtml | 114 ++++++++++++++++++++++++++++++++
 app/views/helpers/reader_view.phtml |   5 ++
 app/views/helpers/rss.phtml         |  30 ---------
 app/views/helpers/rss_view.phtml    |  30 +++++++++
 app/views/index/index.phtml         | 128 ++----------------------------------
 lib/lib_text.php                    |   8 +++
 public/theme/freshrss.css           |   7 +-
 11 files changed, 228 insertions(+), 172 deletions(-)
 create mode 100644 app/views/helpers/global_view.phtml
 create mode 100644 app/views/helpers/normal_view.phtml
 create mode 100644 app/views/helpers/reader_view.phtml
 delete mode 100755 app/views/helpers/rss.phtml
 create mode 100755 app/views/helpers/rss_view.phtml

(limited to 'app/views')

diff --git a/app/i18n/en.php b/app/i18n/en.php
index e40be045a..4dbfde715 100644
--- a/app/i18n/en.php
+++ b/app/i18n/en.php
@@ -37,6 +37,9 @@ return array (
 	'before_one_day'		=> 'Before one day',
 	'before_one_week'		=> 'Before one week',
 	'display'			=> 'Display',
+	'normal_view'			=> 'Normal view',
+	'reader_view'			=> 'Reading view',
+	'global_view'			=> 'Global view',
 	'show_all_articles'		=> 'Show all articles',
 	'show_not_reads'		=> 'Show only unread',
 	'older_first'			=> 'Oldest first',
diff --git a/app/i18n/fr.php b/app/i18n/fr.php
index 69c7a8ffe..7a58b984c 100644
--- a/app/i18n/fr.php
+++ b/app/i18n/fr.php
@@ -37,6 +37,9 @@ return array (
 	'before_one_day'		=> 'Antérieurs à 1 jour',
 	'before_one_week'		=> 'Antérieurs à 1 semaine',
 	'display'			=> 'Affichage',
+	'normal_view'			=> 'Vue normale',
+	'reader_view'			=> 'Vue lecture',
+	'global_view'			=> 'Vue globale',
 	'show_all_articles'		=> 'Afficher tous les articles',
 	'show_not_reads'		=> 'Afficher les non lus',
 	'older_first'			=> 'Plus anciens en premier',
diff --git a/app/layout/nav_menu.phtml b/app/layout/nav_menu.phtml
index 3411f344b..dbe597985 100644
--- a/app/layout/nav_menu.phtml
+++ b/app/layout/nav_menu.phtml
@@ -59,43 +59,72 @@
 		<ul class="dropdown-menu">
 			<li class="dropdown-close"><a href="#close"><i class="icon i_close"></i></a></li>
 
+			<?php
+				$url_output = $url;
+				$actual_view = Request::param('output', 'nomal');
+			?>
+			<?php if($actual_view != 'normal') { ?>
+			<li class="item">
+				<?php $url_output['params']['output'] = 'normal'; ?>
+				<a class="view_normal" href="<?php echo Url::display ($url_output); ?>">
+					<?php echo Translate::t ('normal_view'); ?>
+				</a>
+			</li>
+			<?php } if($actual_view != 'reader') { ?>
+			<li class="item">
+				<?php $url_output['params']['output'] = 'reader'; ?>
+				<a class="view_normal" href="<?php echo Url::display ($url_output); ?>">
+					<?php echo Translate::t ('reader_view'); ?>
+				</a>
+			</li>
+			<?php } if($actual_view != 'global') { ?>
+			<li class="item">
+				<?php $url_output['params']['output'] = 'global'; ?>
+				<a class="view_normal" href="<?php echo Url::display ($url_output); ?>">
+					<?php echo Translate::t ('global_view'); ?>
+				</a>
+			</li>
+			<?php } ?>
+
+			<li class="separator"></li>
+
 			<li class="item">
 				<?php
+					$url_state = $url;
 					if ($this->state == 'not_read') {
-						$url['params']['state'] = 'all';
+						$url_state['params']['state'] = 'all';
 				?>
-				<a class="print_all" href="<?php echo Url::display ($url); ?>"><?php echo Translate::t ('show_all_articles'); ?></a>
+				<a class="print_all" href="<?php echo Url::display ($url_state); ?>">
+					<?php echo Translate::t ('show_all_articles'); ?>
+				</a>
 				<?php
 					} else {
-						$url['params']['state'] = 'not_read';
+						$url_state['params']['state'] = 'not_read';
 				?>
-				<a class="print_non_read" href="<?php echo Url::display ($url); ?>"><?php echo Translate::t ('show_not_reads'); ?></a>
+				<a class="print_non_read" href="<?php echo Url::display ($url_state); ?>">
+					<?php echo Translate::t ('show_not_reads'); ?>
+				</a>
 				<?php } ?>
 			</li>
+
 			<li class="separator"></li>
 
-			<?php
-				$params = Request::params ();
-				if (isset ($params['search'])) {
-					$params['search'] = urlencode ($params['search']);
-				}
-				$url = array (
-					'c' => 'index',
-					'a' => 'index',
-					'params' => $params
-				);
-			?>
 			<li class="item">
 				<?php
+					$url_order = $url;
 					if ($this->order == 'low_to_high') {
-						$url['params']['order'] = 'high_to_low';
+						$url_order['params']['order'] = 'high_to_low';
 				?>
-				<a href="<?php echo Url::display ($url); ?>"><?php echo Translate::t ('older_first'); ?></a>
+				<a href="<?php echo Url::display ($url_order); ?>">
+					<?php echo Translate::t ('older_first'); ?>
+				</a>
 				<?php
 					} else {
-						$url['params']['order'] = 'low_to_high';
+						$url_order['params']['order'] = 'low_to_high';
 				?>
-				<a href="<?php echo Url::display ($url); ?>"><?php echo Translate::t ('newer_first'); ?></a>
+				<a href="<?php echo Url::display ($url_order); ?>">
+					<?php echo Translate::t ('newer_first'); ?>
+				</a>
 				<?php } ?>
 			</li>
 		</ul>
diff --git a/app/views/helpers/global_view.phtml b/app/views/helpers/global_view.phtml
new file mode 100644
index 000000000..b666fe620
--- /dev/null
+++ b/app/views/helpers/global_view.phtml
@@ -0,0 +1,5 @@
+<?php
+$this->partial ('nav_menu');
+?>
+
+Non implémenté
\ No newline at end of file
diff --git a/app/views/helpers/normal_view.phtml b/app/views/helpers/normal_view.phtml
new file mode 100644
index 000000000..515084047
--- /dev/null
+++ b/app/views/helpers/normal_view.phtml
@@ -0,0 +1,114 @@
+<?php
+
+$this->partial ('aside_flux');
+$this->partial ('nav_menu');
+
+if (isset ($this->entryPaginator) && !$this->entryPaginator->isEmpty ()) {
+	$items = $this->entryPaginator->items ();
+?>
+
+<div id="stream">
+	<?php
+		$display_today = true;
+		$display_yesterday = true;
+		$display_others = true;
+	?>
+	<?php foreach ($items as $item) { ?>
+
+	<?php if ($display_today && $item->isDay (Days::TODAY)) { ?>
+	<div class="day"><?php echo Translate::t ('today'); ?> - <?php echo timestamptodate (time (), false); ?></div>
+	<?php $display_today = false; } ?>
+	<?php if ($display_yesterday && $item->isDay (Days::YESTERDAY)) { ?>
+	<div class="day"><?php echo Translate::t ('yesterday'); ?> - <?php echo timestamptodate (time () - 86400, false); ?></div>
+	<?php $display_yesterday = false; } ?>
+	<?php if ($display_others && $item->isDay (Days::BEFORE_YESTERDAY)) { ?>
+	<div class="day"><?php echo Translate::t ('before_yesterday'); ?></div>
+	<?php $display_others = false; } ?>
+
+	<div class="flux<?php echo !$item->isRead () ? ' not_read' : ''; ?><?php echo $item->isFavorite () ? ' favorite' : ''; ?>" id="flux_<?php echo $item->id (); ?>">
+		<ul class="horizontal-list flux_header">
+			<?php if (!login_is_conf ($this->conf) || is_logged ()) { ?>
+			<li class="item manage">
+				<?php if (!$item->isRead ()) { ?>
+				<a class="read" href="<?php echo _url ('entry', 'read', 'id', $item->id (), 'is_read', 1); ?>">&nbsp;</a>
+				<?php } else { ?>
+				<a class="read" href="<?php echo _url ('entry', 'read', 'id', $item->id (), 'is_read', 0); ?>">&nbsp;</a>
+				<?php } ?>
+
+				<?php if (!$item->isFavorite ()) { ?>
+				<a class="bookmark" href="<?php echo _url ('entry', 'bookmark', 'id', $item->id (), 'is_favorite', 1); ?>">&nbsp;</a>
+				<?php } else { ?>
+				<a class="bookmark" href="<?php echo _url ('entry', 'bookmark', 'id', $item->id (), 'is_favorite', 0); ?>">&nbsp;</a>
+				<?php } ?>
+			</li>
+			<?php } ?>
+			<?php $feed = $item->feed (true); ?>
+			<li class="item website"><a href="<?php echo _url ('index', 'index', 'get', 'f_' . $feed->id ()); ?>"><img class="favicon" src="<?php echo $feed->favicon (); ?>" alt="" /> <span><?php echo $feed->name (); ?></span></a></li>
+			<li class="item title"><?php echo $item->title (); ?></li>
+			<li class="item date"><?php echo $item->date (); ?></li>
+			<li class="item link"><a target="_blank" href="<?php echo $item->link (); ?>">&nbsp;</a></li>
+		</ul>
+
+		<div class="flux_content">
+			<div class="content">
+				<h1 class="title"><?php echo $item->title (); ?></h1>
+				<?php $author = $item->author (); ?>
+				<?php echo $author != '' ? '<div class="author">' . Translate::t ('by_author', $author) . '</div>' : ''; ?>
+				<?php
+					if($this->conf->lazyload() == 'yes') {
+						echo lazyimg($item->content ());
+					} else {
+						echo $item->content();
+					}
+				?>
+			</div>
+
+			<ul class="horizontal-list bottom">
+				<li class="item">
+					<div class="dropdown">
+						<div id="dropdown-share-<?php echo $item->id ();?>" class="dropdown-target"></div>
+						<i class="icon i_share"></i> <a class="dropdown-toggle" href="#dropdown-share-<?php echo $item->id ();?>"><?php echo Translate::t ('share'); ?></a>
+
+						<ul class="dropdown-menu">
+							<li class="dropdown-close"><a href="#close"><i class="icon i_close"></i></a></li>
+
+							<li class="item"><a href="mailto:?subject=<?php echo $item->title (); ?>&amp;body=J'ai trouvé cet article intéressant, tu peux le lire à cette adresse : <?php echo urlencode($item->link ()); ?>"><?php echo Translate::t ('by_email'); ?></a></li>
+							<?php
+							$shaarli = $this->conf->urlShaarli ();
+							if ($shaarli) {
+							?>
+							<li class="item"><a target="_blank" href="<?php echo $shaarli . '?post=' . urlencode($item->link ()) . '&amp;title=' . urlencode ($item->title ()) . '&amp;source=bookmarklet'; ?>"><?php echo Translate::t ('on_shaarli'); ?></a></li>
+							<?php } ?>
+						</ul>
+					</div>
+				</li>
+				<?php $tags = $item->tags(); ?>
+				<?php if(!empty($tags)) { ?>
+				<li class="item">
+					<div class="dropdown">
+						<div id="dropdown-tags-<?php echo $item->id ();?>" class="dropdown-target"></div>
+						<i class="icon i_tag"></i> <a class="dropdown-toggle" href="#dropdown-tags-<?php echo $item->id ();?>"><?php echo Translate::t ('related_tags'); ?></a>
+
+						<ul class="dropdown-menu">
+							<li class="dropdown-close"><a href="#close"><i class="icon i_close"></i></a></li>
+
+							<?php foreach($tags as $tag) { ?>
+							<li class="item"><a href="<?php echo _url ('index', 'index', 'search', urlencode ('#' . $tag)); ?>"><?php echo $tag; ?></a></li>
+							<?php } ?>
+						</ul>
+					</div>
+				</li>
+				<?php } ?>
+			</ul>
+		</div>
+	</div>
+	<?php } ?>
+	
+	<?php $this->entryPaginator->render ('pagination.phtml', 'next'); ?>
+</div>
+
+<?php } else { ?>
+<div class="alert alert-warn">
+	<span class="alert-head"><?php echo Translate::t ('no_feed_to_display'); ?></span>
+</div>
+<?php } ?>
\ No newline at end of file
diff --git a/app/views/helpers/reader_view.phtml b/app/views/helpers/reader_view.phtml
new file mode 100644
index 000000000..b666fe620
--- /dev/null
+++ b/app/views/helpers/reader_view.phtml
@@ -0,0 +1,5 @@
+<?php
+$this->partial ('nav_menu');
+?>
+
+Non implémenté
\ No newline at end of file
diff --git a/app/views/helpers/rss.phtml b/app/views/helpers/rss.phtml
deleted file mode 100755
index 83de6de2e..000000000
--- a/app/views/helpers/rss.phtml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?php echo '<?xml version="1.0" encoding="UTF-8" ?>'; ?>
-<rss version="2.0" xmlns:atom="http://www.w3.org/2005/Atom" xmlns:dc="http://purl.org/dc/elements/1.1/">
-	<channel>
-		<title><?php echo View::title(); ?></title>
-		<link><?php echo Url::display(); ?></link>
-		<description><?php echo Translate::t ('rss_feeds_of', View::title()); ?></description>
-		<pubDate><?php echo date('D, d M Y H:i:s O'); ?></pubDate>
-		<lastBuildDate><?php echo gmdate('D, d M Y H:i:s'); ?> GMT</lastBuildDate>
-		<atom:link href="<?php echo _url ('index', 'index', 'output', 'rss'); ?>" rel="self" type="application/rss+xml" />
-<?php
-$items = $this->entryPaginator->items ();
-foreach ($items as $item) {
-?>
-		<item>
-			<title><?php echo htmlspecialchars(html_entity_decode($item->title ())); ?></title>
-			<link><?php echo $item->link (); ?></link>
-			<?php $author = $item->author (); ?>
-			<?php if ($author != '') { ?>
-			<dc:creator><?php echo $author; ?></dc:creator>
-			<?php } ?>
-			<description><![CDATA[<?php
-	echo $item->content ();
-?>]]></description>
-			<pubDate><?php echo date('D, d M Y H:i:s O', $item->date (true)); ?></pubDate>
-			<guid isPermaLink="false"><?php echo $item->id (); ?></guid>
-		</item>
-<?php } ?>		
-
-	</channel>
-</rss>
diff --git a/app/views/helpers/rss_view.phtml b/app/views/helpers/rss_view.phtml
new file mode 100755
index 000000000..83de6de2e
--- /dev/null
+++ b/app/views/helpers/rss_view.phtml
@@ -0,0 +1,30 @@
+<?php echo '<?xml version="1.0" encoding="UTF-8" ?>'; ?>
+<rss version="2.0" xmlns:atom="http://www.w3.org/2005/Atom" xmlns:dc="http://purl.org/dc/elements/1.1/">
+	<channel>
+		<title><?php echo View::title(); ?></title>
+		<link><?php echo Url::display(); ?></link>
+		<description><?php echo Translate::t ('rss_feeds_of', View::title()); ?></description>
+		<pubDate><?php echo date('D, d M Y H:i:s O'); ?></pubDate>
+		<lastBuildDate><?php echo gmdate('D, d M Y H:i:s'); ?> GMT</lastBuildDate>
+		<atom:link href="<?php echo _url ('index', 'index', 'output', 'rss'); ?>" rel="self" type="application/rss+xml" />
+<?php
+$items = $this->entryPaginator->items ();
+foreach ($items as $item) {
+?>
+		<item>
+			<title><?php echo htmlspecialchars(html_entity_decode($item->title ())); ?></title>
+			<link><?php echo $item->link (); ?></link>
+			<?php $author = $item->author (); ?>
+			<?php if ($author != '') { ?>
+			<dc:creator><?php echo $author; ?></dc:creator>
+			<?php } ?>
+			<description><![CDATA[<?php
+	echo $item->content ();
+?>]]></description>
+			<pubDate><?php echo date('D, d M Y H:i:s O', $item->date (true)); ?></pubDate>
+			<guid isPermaLink="false"><?php echo $item->id (); ?></guid>
+		</item>
+<?php } ?>		
+
+	</channel>
+</rss>
diff --git a/app/views/index/index.phtml b/app/views/index/index.phtml
index 30df591eb..46ff33b3a 100644
--- a/app/views/index/index.phtml
+++ b/app/views/index/index.phtml
@@ -1,127 +1,13 @@
 <?php
-function lazyimg($content) {
-	return preg_replace(
-		'/<img([^<]+)src=([\'"])([^"\']*)([\'"])([^<]*)>/i',
-		'<img$1src="' . Url::display('/data/grey.gif') . '" data-original="$3"$5>',
-		$content
-	);
-}
 
 $output = Request::param ('output', 'normal');
 
 if ($output == 'rss') {
-	$this->renderHelper ('rss');
+	$this->renderHelper ('rss_view');
+} elseif($output == 'reader') {
+	$this->renderHelper ('reader_view');
+} elseif($output == 'global') {
+	$this->renderHelper ('global_view');
 } else {
-	$this->partial ('aside_flux');
-	$this->partial ('nav_menu');
-
-	if (isset ($this->entryPaginator) && !$this->entryPaginator->isEmpty ()) {
-		$items = $this->entryPaginator->items ();
-?>
-
-<div id="stream">
-	<?php
-		$display_today = true;
-		$display_yesterday = true;
-		$display_others = true;
-	?>
-	<?php foreach ($items as $item) { ?>
-
-	<?php if ($display_today && $item->isDay (Days::TODAY)) { ?>
-	<div class="day"><?php echo Translate::t ('today'); ?> - <?php echo timestamptodate (time (), false); ?></div>
-	<?php $display_today = false; } ?>
-	<?php if ($display_yesterday && $item->isDay (Days::YESTERDAY)) { ?>
-	<div class="day"><?php echo Translate::t ('yesterday'); ?> - <?php echo timestamptodate (time () - 86400, false); ?></div>
-	<?php $display_yesterday = false; } ?>
-	<?php if ($display_others && $item->isDay (Days::BEFORE_YESTERDAY)) { ?>
-	<div class="day"><?php echo Translate::t ('before_yesterday'); ?></div>
-	<?php $display_others = false; } ?>
-
-	<div class="flux<?php echo !$item->isRead () ? ' not_read' : ''; ?><?php echo $item->isFavorite () ? ' favorite' : ''; ?>" id="flux_<?php echo $item->id (); ?>">
-		<ul class="horizontal-list flux_header">
-			<?php if (!login_is_conf ($this->conf) || is_logged ()) { ?>
-			<li class="item manage">
-				<?php if (!$item->isRead ()) { ?>
-				<a class="read" href="<?php echo _url ('entry', 'read', 'id', $item->id (), 'is_read', 1); ?>">&nbsp;</a>
-				<?php } else { ?>
-				<a class="read" href="<?php echo _url ('entry', 'read', 'id', $item->id (), 'is_read', 0); ?>">&nbsp;</a>
-				<?php } ?>
-
-				<?php if (!$item->isFavorite ()) { ?>
-				<a class="bookmark" href="<?php echo _url ('entry', 'bookmark', 'id', $item->id (), 'is_favorite', 1); ?>">&nbsp;</a>
-				<?php } else { ?>
-				<a class="bookmark" href="<?php echo _url ('entry', 'bookmark', 'id', $item->id (), 'is_favorite', 0); ?>">&nbsp;</a>
-				<?php } ?>
-			</li>
-			<?php } ?>
-			<?php $feed = $item->feed (true); ?>
-			<li class="item website"><a href="<?php echo _url ('index', 'index', 'get', 'f_' . $feed->id ()); ?>"><img class="favicon" src="<?php echo $feed->favicon (); ?>" alt="" /> <span><?php echo $feed->name (); ?></span></a></li>
-			<li class="item title"><?php echo $item->title (); ?></li>
-			<li class="item date"><?php echo $item->date (); ?></li>
-			<li class="item link"><a target="_blank" href="<?php echo $item->link (); ?>">&nbsp;</a></li>
-		</ul>
-
-		<div class="flux_content">
-			<div class="content">
-				<h1 class="title"><?php echo $item->title (); ?></h1>
-				<?php $author = $item->author (); ?>
-				<?php echo $author != '' ? '<div class="author">' . Translate::t ('by_author', $author) . '</div>' : ''; ?>
-				<?php
-					if($this->conf->lazyload() == 'yes') {
-						echo lazyimg($item->content ());
-					} else {
-						echo $item->content();
-					}
-				?>
-			</div>
-
-			<ul class="horizontal-list bottom">
-				<li class="item">
-					<div class="dropdown">
-						<div id="dropdown-share-<?php echo $item->id ();?>" class="dropdown-target"></div>
-						<i class="icon i_share"></i> <a class="dropdown-toggle" href="#dropdown-share-<?php echo $item->id ();?>"><?php echo Translate::t ('share'); ?></a>
-
-						<ul class="dropdown-menu">
-							<li class="dropdown-close"><a href="#close"><i class="icon i_close"></i></a></li>
-
-							<li class="item"><a href="mailto:?subject=<?php echo $item->title (); ?>&amp;body=J'ai trouvé cet article intéressant, tu peux le lire à cette adresse : <?php echo urlencode($item->link ()); ?>"><?php echo Translate::t ('by_email'); ?></a></li>
-							<?php
-							$shaarli = $this->conf->urlShaarli ();
-							if ($shaarli) {
-							?>
-							<li class="item"><a target="_blank" href="<?php echo $shaarli . '?post=' . urlencode($item->link ()) . '&amp;title=' . urlencode ($item->title ()) . '&amp;source=bookmarklet'; ?>"><?php echo Translate::t ('on_shaarli'); ?></a></li>
-							<?php } ?>
-						</ul>
-					</div>
-				</li>
-				<?php $tags = $item->tags(); ?>
-				<?php if(!empty($tags)) { ?>
-				<li class="item">
-					<div class="dropdown">
-						<div id="dropdown-tags-<?php echo $item->id ();?>" class="dropdown-target"></div>
-						<i class="icon i_tag"></i> <a class="dropdown-toggle" href="#dropdown-tags-<?php echo $item->id ();?>"><?php echo Translate::t ('related_tags'); ?></a>
-
-						<ul class="dropdown-menu">
-							<li class="dropdown-close"><a href="#close"><i class="icon i_close"></i></a></li>
-
-							<?php foreach($tags as $tag) { ?>
-							<li class="item"><a href="<?php echo _url ('index', 'index', 'search', urlencode ('#' . $tag)); ?>"><?php echo $tag; ?></a></li>
-							<?php } ?>
-						</ul>
-					</div>
-				</li>
-				<?php } ?>
-			</ul>
-		</div>
-	</div>
-	<?php } ?>
-	
-	<?php $this->entryPaginator->render ('pagination.phtml', 'next'); ?>
-</div>
-
-	<?php } else { ?>
-<div class="alert alert-warn">
-	<span class="alert-head"><?php echo Translate::t ('no_feed_to_display'); ?></span>
-</div>
-	<?php } ?>
-<?php } ?>
+	$this->renderHelper ('normal_view');
+}
\ No newline at end of file
diff --git a/lib/lib_text.php b/lib/lib_text.php
index 6e8f7b2bf..9792e191e 100644
--- a/lib/lib_text.php
+++ b/lib/lib_text.php
@@ -86,3 +86,11 @@ function parse_tags ($desc) {
 
 	return $desc_parse;
 }
+
+function lazyimg($content) {
+	return preg_replace(
+		'/<img([^<]+)src=([\'"])([^"\']*)([\'"])([^<]*)>/i',
+		'<img$1src="' . Url::display('/data/grey.gif') . '" data-original="$3"$5>',
+		$content
+	);
+}
\ No newline at end of file
diff --git a/public/theme/freshrss.css b/public/theme/freshrss.css
index 636f9e09d..26bb21d8f 100644
--- a/public/theme/freshrss.css
+++ b/public/theme/freshrss.css
@@ -245,11 +245,10 @@
 			line-height: 40px;
 		}
 			.flux_header .item.website .favicon {
-				padding: 12px;
+				padding: 5px;
 			}
 			.flux_header .item.website a {
 				display: block;
-				padding: 0;
 				height: 40px;
 			}
 		.flux_header .item.title {
@@ -293,6 +292,7 @@
 	padding: 20px 10px;
 	line-height: 170%;
 	font-family: 'OpenSans';
+	word-wrap: break-word;
 }
 	.content .title {
 		margin: 0 0 5px;
@@ -480,6 +480,9 @@
 		width: 40px;
 		text-align: center;
 	}
+		.flux_header .item.website .favicon {
+			padding: 12px;
+		}
 
 	.content {
 		font-size: 120%;
-- 
cgit v1.2.3


From e3b3fa39d8b51bb571d2d15dafcfc94d4ab28787 Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Sat, 15 Jun 2013 20:14:13 +0200
Subject: Première version de la vue lecture (issue #67)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/layout/nav_menu.phtml           |  2 +-
 app/views/helpers/reader_view.phtml | 43 +++++++++++++++++++++++++++++++++++--
 app/views/javascript/main.phtml     |  2 +-
 public/theme/freshrss.css           | 12 +++++++++++
 4 files changed, 55 insertions(+), 4 deletions(-)

(limited to 'app/views')

diff --git a/app/layout/nav_menu.phtml b/app/layout/nav_menu.phtml
index dbe597985..d36814bee 100644
--- a/app/layout/nav_menu.phtml
+++ b/app/layout/nav_menu.phtml
@@ -61,7 +61,7 @@
 
 			<?php
 				$url_output = $url;
-				$actual_view = Request::param('output', 'nomal');
+				$actual_view = Request::param('output', 'normal');
 			?>
 			<?php if($actual_view != 'normal') { ?>
 			<li class="item">
diff --git a/app/views/helpers/reader_view.phtml b/app/views/helpers/reader_view.phtml
index b666fe620..f702a4b91 100644
--- a/app/views/helpers/reader_view.phtml
+++ b/app/views/helpers/reader_view.phtml
@@ -1,5 +1,44 @@
 <?php
-$this->partial ('nav_menu');
+
+if (isset ($this->entryPaginator) && !$this->entryPaginator->isEmpty ()) {
+	$items = $this->entryPaginator->items ();
 ?>
 
-Non implémenté
\ No newline at end of file
+<div id="stream" class="reader">
+	<?php foreach ($items as $item) { ?>
+
+	<div class="flux<?php echo !$item->isRead () ? ' not_read' : ''; ?><?php echo $item->isFavorite () ? ' favorite' : ''; ?>" id="flux_<?php echo $item->id (); ?>">
+		<div class="flux_content">
+			<div class="content">
+				<?php $feed = $item->feed (true); ?>
+				<a href="<?php echo $item->link (); ?>">
+					<img class="favicon" src="<?php echo $feed->favicon (); ?>" alt="" /> <span><?php echo $feed->name (); ?></span>
+				</a>
+				<h1 class="title"><?php echo $item->title (); ?></h1>
+
+				<div class="author">
+					<?php $author = $item->author (); ?>
+					<?php echo $author != '' ? Translate::t ('by_author', $author) . ' - ' : ''; ?>
+					<?php echo $item->date (); ?>
+				</div>
+
+				<?php
+					if($this->conf->lazyload() == 'yes') {
+						echo lazyimg($item->content ());
+					} else {
+						echo $item->content();
+					}
+				?>
+			</div>
+		</div>
+	</div>
+	<?php } ?>
+	
+	<?php $this->entryPaginator->render ('pagination.phtml', 'next'); ?>
+</div>
+
+<?php } else { ?>
+<div class="alert alert-warn">
+	<span class="alert-head"><?php echo Translate::t ('no_feed_to_display'); ?></span>
+</div>
+<?php } ?>
\ No newline at end of file
diff --git a/app/views/javascript/main.phtml b/app/views/javascript/main.phtml
index 28bb0dfd9..5b325ac8d 100644
--- a/app/views/javascript/main.phtml
+++ b/app/views/javascript/main.phtml
@@ -117,7 +117,7 @@ function init_posts () {
 	<?php } ?>
 
 	if (hide_posts) {
-		$(".flux:not(.active) .flux_content").hide ();
+		$("#stream:not(.reader) .flux:not(.active) .flux_content").hide ();
 	}
 
 	$(".flux_header .item.title, .flux_header .item.date").click (function () {
diff --git a/public/theme/freshrss.css b/public/theme/freshrss.css
index 26bb21d8f..60498ad5b 100644
--- a/public/theme/freshrss.css
+++ b/public/theme/freshrss.css
@@ -286,6 +286,18 @@
 					text-decoration: none;
 				}
 
+#stream.reader .flux {
+	padding: 0 0 30px;
+	border: none;
+	background: #f0f0f0;
+	color: #333;
+}
+	#stream.reader .flux .author {
+		margin: 0 0 10px;
+		font-size: 90%;
+		color: #666;
+	}
+
 .content {
 	max-width: 550px;
 	margin: 0 auto;
-- 
cgit v1.2.3


From 36316a6d7e81c3e73cad1362194e73a9006b0c72 Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Sun, 16 Jun 2013 20:28:57 +0200
Subject: Implémentation des vues lecture et globale (issue #67)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/models/Category.php             |  6 +++---
 app/views/helpers/global_view.phtml | 32 +++++++++++++++++++++++++++++--
 app/views/helpers/normal_view.phtml |  2 +-
 app/views/helpers/reader_view.phtml |  1 +
 app/views/javascript/main.phtml     | 19 ++++++++++++++++++-
 public/theme/freshrss.css           | 38 +++++++++++++++++++++++++++++++++++++
 6 files changed, 91 insertions(+), 7 deletions(-)

(limited to 'app/views')

diff --git a/app/models/Category.php b/app/models/Category.php
index 273559b1e..0c991588d 100755
--- a/app/models/Category.php
+++ b/app/models/Category.php
@@ -35,10 +35,10 @@ class Category extends Model {
 	public function feeds () {
 		if (is_null ($this->feeds)) {
 			$feedDAO = new FeedDAO ();
-			return $feedDAO->listByCategory ($this->id ());
-		} else {
-			return $this->feeds;
+			$this->feeds = $feedDAO->listByCategory ($this->id ());
 		}
+
+		return $this->feeds;
 	}
 
 	public function _id ($value) {
diff --git a/app/views/helpers/global_view.phtml b/app/views/helpers/global_view.phtml
index b666fe620..8e5e363f8 100644
--- a/app/views/helpers/global_view.phtml
+++ b/app/views/helpers/global_view.phtml
@@ -1,5 +1,33 @@
+<?php $this->partial ('nav_menu'); ?>
+
+<div id="stream" class="global">
 <?php
-$this->partial ('nav_menu');
+	foreach ($this->cat_aside as $cat) {
+		$feeds = $cat->feeds ();
+		$catNotRead = $cat->nbNotRead ();
+		if (!empty ($feeds)) {
 ?>
+	<div class="category">
+		<div class="cat_header"><a href="<?php echo _url ('index', 'index', 'get', 'c_' . $cat->id ()); ?>"><?php echo $cat->name(); ?><?php echo $catNotRead > 0 ? ' (' . $catNotRead . ')' : ''; ?></a></div>
+
+		<ul class="feeds">
+			<?php foreach ($feeds as $feed) { ?>
+			<?php $not_read = $feed->nbNotRead (); ?>
+			<li class="item">
+				<img class="favicon" src="<?php echo $feed->favicon (); ?>" alt="" />
 
-Non implémenté
\ No newline at end of file
+				<a href="<?php echo _url ('index', 'index', 'get', 'f_' . $feed->id ()); ?>">
+				<?php echo $not_read > 0 ? '<b>' : ''; ?>
+				<?php echo $feed->name(); ?>
+				<?php echo $not_read > 0 ? ' (' . $not_read . ')' : ''; ?>
+				<?php echo $not_read > 0 ? '</b>' : ''; ?>
+				</a>
+			</li>
+			<?php } ?>
+		</ul>
+	</div>
+<?php
+		}
+	}
+?>
+</div>
\ No newline at end of file
diff --git a/app/views/helpers/normal_view.phtml b/app/views/helpers/normal_view.phtml
index 515084047..2ca365552 100644
--- a/app/views/helpers/normal_view.phtml
+++ b/app/views/helpers/normal_view.phtml
@@ -7,7 +7,7 @@ if (isset ($this->entryPaginator) && !$this->entryPaginator->isEmpty ()) {
 	$items = $this->entryPaginator->items ();
 ?>
 
-<div id="stream">
+<div id="stream" class="normal">
 	<?php
 		$display_today = true;
 		$display_yesterday = true;
diff --git a/app/views/helpers/reader_view.phtml b/app/views/helpers/reader_view.phtml
index f702a4b91..cdca393b9 100644
--- a/app/views/helpers/reader_view.phtml
+++ b/app/views/helpers/reader_view.phtml
@@ -1,4 +1,5 @@
 <?php
+$this->partial ('nav_menu');
 
 if (isset ($this->entryPaginator) && !$this->entryPaginator->isEmpty ()) {
 	$items = $this->entryPaginator->items ();
diff --git a/app/views/javascript/main.phtml b/app/views/javascript/main.phtml
index 5b325ac8d..e290e02d3 100644
--- a/app/views/javascript/main.phtml
+++ b/app/views/javascript/main.phtml
@@ -9,6 +9,16 @@ var hide_posts = false;
 	$mark = $this->conf->markWhen ();
 ?>
 
+function is_reader_mode() {
+	var stream = $("#stream.reader");
+	return stream.html() != null;
+}
+
+function is_normal_mode() {
+	var stream = $("#stream.normal");
+	return stream.html() != null;
+}
+
 function redirect (url, new_tab) {
 	if (url) {
 		if (new_tab) {
@@ -117,7 +127,7 @@ function init_posts () {
 	<?php } ?>
 
 	if (hide_posts) {
-		$("#stream:not(.reader) .flux:not(.active) .flux_content").hide ();
+		$(".flux:not(.active) .flux_content").hide ();
 	}
 
 	$(".flux_header .item.title, .flux_header .item.date").click (function () {
@@ -153,6 +163,10 @@ function init_posts () {
 }
 
 function init_column_categories () {
+	if(!is_normal_mode()) {
+		return;
+	}
+
 	$(".category").addClass ("stick");
 	$(".categories .category .btn:first-child").width ("160px");
 	$(".category").append ("<a class=\"btn dropdown-toggle\" href=\"#\"><i class=\"icon i_down\"></i></a>");
@@ -268,6 +282,9 @@ function init_shortcuts () {
 }
 
 $(document).ready (function () {
+	if(is_reader_mode()) {
+		hide_posts = false;
+	}
 	init_posts ();
 	init_column_categories ();
 	init_shortcuts ();
diff --git a/public/theme/freshrss.css b/public/theme/freshrss.css
index 60498ad5b..345bd5252 100644
--- a/public/theme/freshrss.css
+++ b/public/theme/freshrss.css
@@ -298,6 +298,44 @@
 		color: #666;
 	}
 
+#stream.global {
+	text-align: center;
+}
+	#stream.global .category {
+		display: inline-block;
+		width: 280px;
+		margin: 20px 10px;
+		vertical-align: top;
+		background: #fff;
+		border: 1px solid #aaa;
+		border-radius: 5px;
+		text-align: left;
+		box-shadow: 0 0 5px #bbb;
+	}
+		#stream.global .cat_header {
+			height: 35px;
+			padding: 0 10px;
+			background: #eee;
+			border-bottom: 1px solid #aaa;
+			border-radius: 5px 5px 0 0;
+			line-height: 35px;
+			font-size: 120%;
+		}
+			#stream.global .cat_header a {
+				color: #333;
+				text-shadow: 0 -1px 0px #aaa;
+			}
+		#stream.global .category .feeds {
+			max-height: 250px;
+			margin: 0;
+			list-style: none;
+			overflow: auto;
+		}
+			#stream.global .category .feeds .item {
+				padding: 0 10px;
+				font-size: 90%;
+			}
+
 .content {
 	max-width: 550px;
 	margin: 0 auto;
-- 
cgit v1.2.3


From 48cfe1571ececb9fae0c361d9147690b04d310e0 Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Sun, 16 Jun 2013 20:48:56 +0200
Subject: Fix issue #67 : différentes vues implémentées + possibilité de
 choisir la vue par défaut
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/configureController.php |  3 +++
 app/controllers/indexController.php     |  8 +++++++-
 app/models/RSSConfiguration.php         | 16 ++++++++++++++++
 app/views/configure/display.phtml       |  5 +++++
 app/views/helpers/global_view.phtml     |  6 +++++-
 5 files changed, 36 insertions(+), 2 deletions(-)

(limited to 'app/views')

diff --git a/app/controllers/configureController.php b/app/controllers/configureController.php
index 4cfc1c085..9ed0ad1eb 100755
--- a/app/controllers/configureController.php
+++ b/app/controllers/configureController.php
@@ -140,6 +140,7 @@ class configureController extends ActionController {
 		if (Request::isPost ()) {
 			$language = Request::param ('language', 'en');
 			$nb = Request::param ('posts_per_page', 10);
+			$mode = Request::param ('view_mode', 'normal');
 			$view = Request::param ('default_view', 'all');
 			$display = Request::param ('display_posts', 'no');
 			$lazyload = Request::param ('lazyload', 'yes');
@@ -153,6 +154,7 @@ class configureController extends ActionController {
 
 			$this->view->conf->_language ($language);
 			$this->view->conf->_postsPerPage (intval ($nb));
+			$this->view->conf->_viewMode ($mode);
 			$this->view->conf->_defaultView ($view);
 			$this->view->conf->_displayPosts ($display);
 			$this->view->conf->_lazyload ($lazyload);
@@ -169,6 +171,7 @@ class configureController extends ActionController {
 			$values = array (
 				'language' => $this->view->conf->language (),
 				'posts_per_page' => $this->view->conf->postsPerPage (),
+				'view_mode' => $this->view->conf->viewMode (),
 				'default_view' => $this->view->conf->defaultView (),
 				'display_posts' => $this->view->conf->displayPosts (),
 				'lazyload' => $this->view->conf->lazyload (),
diff --git a/app/controllers/indexController.php b/app/controllers/indexController.php
index 3f10720c2..a5a5501e7 100755
--- a/app/controllers/indexController.php
+++ b/app/controllers/indexController.php
@@ -6,13 +6,19 @@ class indexController extends ActionController {
 	private $mode = 'all';
 
 	public function indexAction () {
-		if (Request::param ('output') == 'rss') {
+		$output = Request::param ('output');
+
+		if ($output == 'rss') {
 			$this->view->_useLayout (false);
 		} else {
 			View::appendScript (Url::display ('/scripts/shortcut.js'));
 			View::appendScript (Url::display (array ('c' => 'javascript', 'a' => 'main')));
 			View::appendScript (Url::display (array ('c' => 'javascript', 'a' => 'actualize')));
 			View::appendScript (Url::display ('/scripts/endless_mode.js'));
+
+			if(!$output) {
+				Request::_param ('output', $this->view->conf->viewMode());
+			}
 		}
 
 		$entryDAO = new EntryDAO ();
diff --git a/app/models/RSSConfiguration.php b/app/models/RSSConfiguration.php
index 6ebc30e8e..b188c0e65 100755
--- a/app/models/RSSConfiguration.php
+++ b/app/models/RSSConfiguration.php
@@ -7,6 +7,7 @@ class RSSConfiguration extends Model {
 	);
 	private $language;
 	private $posts_per_page;
+	private $view_mode;
 	private $default_view;
 	private $display_posts;
 	private $lazyload;
@@ -21,6 +22,7 @@ class RSSConfiguration extends Model {
 		$confDAO = new RSSConfigurationDAO ();
 		$this->_language ($confDAO->language);
 		$this->_postsPerPage ($confDAO->posts_per_page);
+		$this->_viewMode ($confDAO->view_mode);
 		$this->_defaultView ($confDAO->default_view);
 		$this->_displayPosts ($confDAO->display_posts);
 		$this->_lazyload ($confDAO->lazyload);
@@ -41,6 +43,9 @@ class RSSConfiguration extends Model {
 	public function postsPerPage () {
 		return $this->posts_per_page;
 	}
+	public function viewMode () {
+		return $this->view_mode;
+	}
 	public function defaultView () {
 		return $this->default_view;
 	}
@@ -91,6 +96,13 @@ class RSSConfiguration extends Model {
 			$this->posts_per_page = 10;
 		}
 	}
+	public function _viewMode ($value) {
+		if ($value == 'global' || $value == 'reader') {
+			$this->view_mode = $value;
+		} else {
+			$this->view_mode = 'normal';
+		}
+	}
 	public function _defaultView ($value) {
 		if ($value == 'not_read') {
 			$this->default_view = 'not_read';
@@ -154,6 +166,7 @@ class RSSConfiguration extends Model {
 class RSSConfigurationDAO extends Model_array {
 	public $language = 'en';
 	public $posts_per_page = 20;
+	public $view_mode = 'normal';
 	public $default_view = 'not_read';
 	public $display_posts = 'no';
 	public $lazyload = 'yes';
@@ -185,6 +198,9 @@ class RSSConfigurationDAO extends Model_array {
 		if (isset ($this->array['posts_per_page'])) {
 			$this->posts_per_page = $this->array['posts_per_page'];
 		}
+		if (isset ($this->array['view_mode'])) {
+			$this->view_mode = $this->array['view_mode'];
+		}
 		if (isset ($this->array['default_view'])) {
 			$this->default_view = $this->array['default_view'];
 		}
diff --git a/app/views/configure/display.phtml b/app/views/configure/display.phtml
index c46a02143..8484a7116 100644
--- a/app/views/configure/display.phtml
+++ b/app/views/configure/display.phtml
@@ -46,6 +46,11 @@
 		<div class="form-group">
 			<label class="group-name"><?php echo Translate::t ('default_view'); ?></label>
 			<div class="group-controls">
+				<select name="view_mode" id="view_mode">
+					<option value="normal"<?php echo $this->conf->viewMode () == 'normal' ? ' selected="selected"' : ''; ?>><?php echo Translate::t ('normal_view'); ?></option>
+					<option value="reader"<?php echo $this->conf->viewMode () == 'reader' ? ' selected="selected"' : ''; ?>><?php echo Translate::t ('reader_view'); ?></option>
+					<option value="global"<?php echo $this->conf->viewMode () == 'global' ? ' selected="selected"' : ''; ?>><?php echo Translate::t ('global_view'); ?></option>
+				</select>
 				<label class="radio" for="radio_all">
 					<input type="radio" name="default_view" id="radio_all" value="all"<?php echo $this->conf->defaultView () == 'all' ? ' checked="checked"' : ''; ?> />
 					<?php echo Translate::t ('show_all_articles'); ?>
diff --git a/app/views/helpers/global_view.phtml b/app/views/helpers/global_view.phtml
index 8e5e363f8..fff391cba 100644
--- a/app/views/helpers/global_view.phtml
+++ b/app/views/helpers/global_view.phtml
@@ -8,7 +8,11 @@
 		if (!empty ($feeds)) {
 ?>
 	<div class="category">
-		<div class="cat_header"><a href="<?php echo _url ('index', 'index', 'get', 'c_' . $cat->id ()); ?>"><?php echo $cat->name(); ?><?php echo $catNotRead > 0 ? ' (' . $catNotRead . ')' : ''; ?></a></div>
+		<div class="cat_header">
+			<a href="<?php echo _url ('index', 'index', 'get', 'c_' . $cat->id ()); ?>">
+			<?php echo $cat->name(); ?><?php echo $catNotRead > 0 ? ' (' . $catNotRead . ')' : ''; ?>
+			</a>
+		</div>
 
 		<ul class="feeds">
 			<?php foreach ($feeds as $feed) { ?>
-- 
cgit v1.2.3


From 32499c0b3e519ef2fc255f5990448195256476ac Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Sun, 23 Jun 2013 12:45:27 +0200
Subject: Fix issue #91 : flux en erreur repasse normal

Lorsqu'on actualise un flux en erreur, si celui-ci est de nouveau
accessible, il repasse en normal
Ajout d'un bouton pour actualiser les flux sur la page de gestion
---
 app/i18n/en.php                | 2 +-
 app/i18n/fr.php                | 2 +-
 app/models/Feed.php            | 2 +-
 app/views/configure/feed.phtml | 8 ++++++++
 4 files changed, 11 insertions(+), 3 deletions(-)

(limited to 'app/views')

diff --git a/app/i18n/en.php b/app/i18n/en.php
index 4dbfde715..209bbcd87 100644
--- a/app/i18n/en.php
+++ b/app/i18n/en.php
@@ -119,7 +119,7 @@ return array (
 	'or'				=> 'or',
 
 	'informations'			=> 'Informations',
-	'feed_in_error'			=> 'This feed has encountered a problem. Please verify that it is always reachable.',
+	'feed_in_error'			=> 'This feed has encountered a problem. Please verify that it is always reachable then actualize it.',
 	'website_url'			=> 'Website URL',
 	'feed_url'			=> 'Feed URL',
 	'number_articles'		=> 'Number of articles',
diff --git a/app/i18n/fr.php b/app/i18n/fr.php
index 7a58b984c..172f06953 100644
--- a/app/i18n/fr.php
+++ b/app/i18n/fr.php
@@ -119,7 +119,7 @@ return array (
 	'or'				=> 'ou',
 
 	'informations'			=> 'Informations',
-	'feed_in_error'			=> 'Ce flux a rencontré un problème. Veuillez vérifier qu\'il est toujours accessible.',
+	'feed_in_error'			=> 'Ce flux a rencontré un problème. Veuillez vérifier qu\'il est toujours accessible puis actualisez-le.',
 	'website_url'			=> 'URL du site',
 	'feed_url'			=> 'URL du flux',
 	'number_articles'		=> 'Nombre d\'articles',
diff --git a/app/models/Feed.php b/app/models/Feed.php
index 15568d06a..4c6a3d229 100644
--- a/app/models/Feed.php
+++ b/app/models/Feed.php
@@ -292,7 +292,7 @@ class FeedDAO extends Model_pdo {
 	}
 
 	public function updateLastUpdate ($id) {
-		$sql = 'UPDATE feed SET lastUpdate=? WHERE id=?';
+		$sql = 'UPDATE feed SET lastUpdate=?, error=0 WHERE id=?';
 		$stm = $this->bd->prepare ($sql);
 
 		$values = array (
diff --git a/app/views/configure/feed.phtml b/app/views/configure/feed.phtml
index 650da5641..ec2ff3bdb 100644
--- a/app/views/configure/feed.phtml
+++ b/app/views/configure/feed.phtml
@@ -31,6 +31,14 @@
 				<span class="control"><a target="_blank" href="<?php echo $this->flux->url (); ?>"><?php echo $this->flux->url (); ?></a></span>
 			</div>
 		</div>
+		<div class="form-group">
+			<label class="group-name"></label>
+			<div class="group-controls">
+				<a class="btn" href="<?php echo _url ('feed', 'actualize', 'id', $this->flux->id ()); ?>">
+					<i class="icon i_refresh"></i> <?php echo Translate::t('actualize'); ?>
+				</a>
+			</div>
+		</div>
 		<div class="form-group">
 			<label class="group-name"><?php echo Translate::t ('number_articles'); ?></label>
 			<div class="group-controls">
-- 
cgit v1.2.3


From dff85f9a304a6ff2ede764a8f62024e7b4ff074e Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Sun, 23 Jun 2013 15:05:39 +0200
Subject: Ajout d'une barre de navigation en version mobile
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Fix issue #57 : pas d'effet de slide (effet trop bling-bling) mais
ajout d'une barre de navigation permettant d'aller à l'article
suivant / précédent ou de remonter en haut de la page
---
 app/layout/nav_entries.phtml        |   5 +++
 app/views/helpers/normal_view.phtml |   2 ++
 app/views/javascript/main.phtml     |  64 ++++++++++++++++++++++--------------
 public/theme/freshrss.css           |  33 +++++++++++++++++++
 public/theme/global.css             |   8 +++++
 public/theme/icons/next.png         | Bin 0 -> 373 bytes
 public/theme/icons/next.svg         |  31 +++++++++++++++++
 public/theme/icons/previous.png     | Bin 0 -> 395 bytes
 public/theme/icons/previous.svg     |  31 +++++++++++++++++
 9 files changed, 150 insertions(+), 24 deletions(-)
 create mode 100644 app/layout/nav_entries.phtml
 create mode 100644 public/theme/icons/next.png
 create mode 100644 public/theme/icons/next.svg
 create mode 100644 public/theme/icons/previous.png
 create mode 100644 public/theme/icons/previous.svg

(limited to 'app/views')

diff --git a/app/layout/nav_entries.phtml b/app/layout/nav_entries.phtml
new file mode 100644
index 000000000..101e7443e
--- /dev/null
+++ b/app/layout/nav_entries.phtml
@@ -0,0 +1,5 @@
+<ul class="nav_entries">
+	<li class="item"><a class="previous_entry" href="#"><i class="icon i_prev"></i></a></li>
+	<li class="item"><a href="#"><i class="icon i_up"></i></a></li>
+	<li class="item"><a class="next_entry" href="#"><i class="icon i_next"></i></a></li>
+</ul>
\ No newline at end of file
diff --git a/app/views/helpers/normal_view.phtml b/app/views/helpers/normal_view.phtml
index 2ca365552..eaf1e4276 100644
--- a/app/views/helpers/normal_view.phtml
+++ b/app/views/helpers/normal_view.phtml
@@ -107,6 +107,8 @@ if (isset ($this->entryPaginator) && !$this->entryPaginator->isEmpty ()) {
 	<?php $this->entryPaginator->render ('pagination.phtml', 'next'); ?>
 </div>
 
+<?php $this->partial ('nav_entries'); ?>
+
 <?php } else { ?>
 <div class="alert alert-warn">
 	<span class="alert-head"><?php echo Translate::t ('no_feed_to_display'); ?></span>
diff --git a/app/views/javascript/main.phtml b/app/views/javascript/main.phtml
index e290e02d3..e51cf978e 100644
--- a/app/views/javascript/main.phtml
+++ b/app/views/javascript/main.phtml
@@ -105,6 +105,32 @@ function mark_favorite (active) {
 	});
 }
 
+function prev_entry() {
+	old_active = $(".flux.active");
+	last_active = $(".flux:last");
+	new_active = old_active.prevAll (".flux:first");
+
+	if (new_active.hasClass("flux")) {
+		toggleContent (new_active, old_active);
+	} else if (old_active[0] === undefined &&
+	           new_active[0] === undefined) {
+		toggleContent (last_active, old_active);
+	}
+}
+
+function next_entry() {
+	old_active = $(".flux.active");
+	first_active = $(".flux:first");
+	new_active = old_active.nextAll (".flux:first");
+
+	if (new_active.hasClass("flux")) {
+		toggleContent (new_active, old_active);
+	} else if (old_active[0] === undefined &&
+	           new_active[0] === undefined) {
+		toggleContent (first_active, old_active);
+	}
+}
+
 function init_img () {
 	$(".flux_content .content img").each (function () {
 		if ($(this).width () > ($(".flux_content .content").width()) / 2) {
@@ -206,18 +232,7 @@ function init_shortcuts () {
 	});
 
 	// Touches de navigation
-	shortcut.add("<?php echo $s['prev_entry']; ?>", function () {
-		old_active = $(".flux.active");
-		last_active = $(".flux:last");
-		new_active = old_active.prevAll (".flux:first");
-
-		if (new_active.hasClass("flux")) {
-			toggleContent (new_active, old_active);
-		} else if (old_active[0] === undefined &&
-		           new_active[0] === undefined) {
-			toggleContent (last_active, old_active);
-		}
-	}, {
+	shortcut.add("<?php echo $s['prev_entry']; ?>", prev_entry, {
 		'disable_in_input':true
 	});
 	shortcut.add("shift+<?php echo $s['prev_entry']; ?>", function () {
@@ -230,18 +245,7 @@ function init_shortcuts () {
 	}, {
 		'disable_in_input':true
 	});
-	shortcut.add("<?php echo $s['next_entry']; ?>", function () {
-		old_active = $(".flux.active");
-		first_active = $(".flux:first");
-		new_active = old_active.nextAll (".flux:first");
-
-		if (new_active.hasClass("flux")) {
-			toggleContent (new_active, old_active);
-		} else if (old_active[0] === undefined &&
-		           new_active[0] === undefined) {
-			toggleContent (first_active, old_active);
-		}
-	}, {
+	shortcut.add("<?php echo $s['next_entry']; ?>", next_entry, {
 		'disable_in_input':true
 	});
 	shortcut.add("shift+<?php echo $s['next_entry']; ?>", function () {
@@ -281,6 +285,17 @@ function init_shortcuts () {
 	});
 }
 
+function init_nav_entries() {
+	$('.nav_entries a.previous_entry').click(function() {
+		prev_entry();
+		return false;
+	});
+	$('.nav_entries a.next_entry').click(function() {
+		next_entry();
+		return false;
+	});
+}
+
 $(document).ready (function () {
 	if(is_reader_mode()) {
 		hide_posts = false;
@@ -288,4 +303,5 @@ $(document).ready (function () {
 	init_posts ();
 	init_column_categories ();
 	init_shortcuts ();
+	init_nav_entries();
 });
diff --git a/public/theme/freshrss.css b/public/theme/freshrss.css
index 613a6f037..178472ac9 100644
--- a/public/theme/freshrss.css
+++ b/public/theme/freshrss.css
@@ -426,6 +426,11 @@
 	.pagination:last-child .item {
 		border-top: 1px solid #aaa;
 	}
+
+.nav_entries {
+	display: none;
+}
+
 .loading {
 	background: url("loader.gif") center center no-repeat;
 	font-size: 0;
@@ -538,6 +543,9 @@
 		font-size: 120%;
 	}
 
+	.pagination {
+		margin: 0 0 40px;
+	}
 	.pagination .pager-previous, .pagination .pager-next {
 		width: 100px;
 	}
@@ -574,4 +582,29 @@
 		.aside .categories {
 			margin: 30px 0;
 		}
+
+	.nav_entries {
+		display: table;
+		width: 100%;
+		height: 40px;
+		position: fixed;
+		bottom: 0;
+		margin: 0;
+		background: #fff;
+		border-top: 1px solid #ddd;
+		text-align: center;
+		line-height: 40px;
+		table-layout: fixed;
+	}
+		.nav_entries .item {
+			display: table-cell;
+			width: 30%;
+		}
+			.nav_entries .item a {
+				display: block;
+			}
+			.nav_entries .item .icon.i_up {
+				margin: 5px 0 0;
+				vertical-align: top;
+			}
 }
diff --git a/public/theme/global.css b/public/theme/global.css
index 4c504db63..b1fd01436 100644
--- a/public/theme/global.css
+++ b/public/theme/global.css
@@ -517,6 +517,14 @@ input, select, textarea {
 		background-image: url("icons/up.png");
 		background-image: url("icons/up.svg");
 	}
+	.icon.i_next {
+		background-image: url("icons/next.png");
+		background-image: url("icons/next.svg");
+	}
+	.icon.i_prev {
+		background-image: url("icons/previous.png");
+		background-image: url("icons/previous.svg");
+	}
 	.icon.i_help {
 		background-image: url("icons/help.png");
 		background-image: url("icons/help.svg");
diff --git a/public/theme/icons/next.png b/public/theme/icons/next.png
new file mode 100644
index 000000000..ab3490c3b
Binary files /dev/null and b/public/theme/icons/next.png differ
diff --git a/public/theme/icons/next.svg b/public/theme/icons/next.svg
new file mode 100644
index 000000000..72637b4e6
--- /dev/null
+++ b/public/theme/icons/next.svg
@@ -0,0 +1,31 @@
+<?xml version='1.0' encoding='UTF-8' standalone='no'?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg xmlns:cc='http://creativecommons.org/ns#' xmlns:dc='http://purl.org/dc/elements/1.1/' sodipodi:docname='go-next-symbolic.svg' height='16' id='svg7384' xmlns:inkscape='http://www.inkscape.org/namespaces/inkscape' xmlns:rdf='http://www.w3.org/1999/02/22-rdf-syntax-ns#' xmlns:sodipodi='http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd' xmlns:svg='http://www.w3.org/2000/svg' inkscape:version='0.48.4 r9939' version='1.1' width='16' xmlns='http://www.w3.org/2000/svg'>
+  <metadata id='metadata90'>
+    <rdf:RDF>
+      <cc:Work rdf:about=''>
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type rdf:resource='http://purl.org/dc/dcmitype/StillImage'/>
+        <dc:title>Gnome Symbolic Icon Theme</dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <sodipodi:namedview inkscape:bbox-nodes='false' inkscape:bbox-paths='true' bordercolor='#666666' borderopacity='1' inkscape:current-layer='layer12' inkscape:cx='78.648774' inkscape:cy='9.99302' gridtolerance='10' inkscape:guide-bbox='true' guidetolerance='10' id='namedview88' inkscape:object-nodes='false' inkscape:object-paths='false' objecttolerance='10' pagecolor='#3a3b39' inkscape:pageopacity='1' inkscape:pageshadow='2' showborder='false' showgrid='false' showguides='true' inkscape:snap-bbox='true' inkscape:snap-bbox-midpoints='false' inkscape:snap-global='true' inkscape:snap-grids='true' inkscape:snap-nodes='false' inkscape:snap-others='false' inkscape:snap-to-guides='true' inkscape:window-height='1408' inkscape:window-maximized='1' inkscape:window-width='2560' inkscape:window-x='0' inkscape:window-y='0' inkscape:zoom='1'>
+    <inkscape:grid empspacing='2' enabled='true' id='grid4866' originx='120px' originy='530px' snapvisiblegridlinesonly='true' spacingx='1px' spacingy='1px' type='xygrid' visible='true'/>
+  </sodipodi:namedview>
+  <title id='title9167'>Gnome Symbolic Icon Theme</title>
+  <defs id='defs7386'/>
+  <g inkscape:groupmode='layer' id='layer9' inkscape:label='status' style='display:inline' transform='translate(-121.0002,-747)'/>
+  <g inkscape:groupmode='layer' id='layer10' inkscape:label='devices' transform='translate(-121.0002,-747)'/>
+  <g inkscape:groupmode='layer' id='layer11' inkscape:label='apps' transform='translate(-121.0002,-747)'/>
+  <g inkscape:groupmode='layer' id='layer13' inkscape:label='places' transform='translate(-121.0002,-747)'/>
+  <g inkscape:groupmode='layer' id='layer14' inkscape:label='mimetypes' transform='translate(-121.0002,-747)'/>
+  <g inkscape:groupmode='layer' id='layer15' inkscape:label='emblems' style='display:inline' transform='translate(-121.0002,-747)'/>
+  <g inkscape:groupmode='layer' id='g71291' inkscape:label='emotes' style='display:inline' transform='translate(-121.0002,-747)'/>
+  <g inkscape:groupmode='layer' id='g4953' inkscape:label='categories' style='display:inline' transform='translate(-121.0002,-747)'/>
+  <g inkscape:groupmode='layer' id='layer12' inkscape:label='actions' style='display:inline' transform='translate(-121.0002,-747)'>
+    
+    <path inkscape:connector-curvature='0' d='m 125.0004,749 1,0 c 0.0104,-1.2e-4 0.0208,-4.6e-4 0.0313,0 0.25495,0.0112 0.50987,0.12858 0.6875,0.3125 l 6.29767,5.71875 -6.29772,5.71875 c -0.18816,0.18819 -0.45346,0.28125 -0.71875,0.28125 l -1,0 0,-1 c 0,-0.26529 0.0931,-0.53058 0.28125,-0.71875 l 4.82897,-4.28125 -4.82897,-4.28125 c -0.21074,-0.19463 -0.30316,-0.46925 -0.28125,-0.75 z' id='path10839-9-9-5-9' sodipodi:nodetypes='ccsccccccccccc' style='font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;color:#bebebe;fill:#bebebe;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.78124988;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:new;font-family:Andale Mono;-inkscape-font-specification:Andale Mono'/>
+  </g>
+</svg>
diff --git a/public/theme/icons/previous.png b/public/theme/icons/previous.png
new file mode 100644
index 000000000..10e40669e
Binary files /dev/null and b/public/theme/icons/previous.png differ
diff --git a/public/theme/icons/previous.svg b/public/theme/icons/previous.svg
new file mode 100644
index 000000000..67685c50c
--- /dev/null
+++ b/public/theme/icons/previous.svg
@@ -0,0 +1,31 @@
+<?xml version='1.0' encoding='UTF-8' standalone='no'?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg xmlns:cc='http://creativecommons.org/ns#' xmlns:dc='http://purl.org/dc/elements/1.1/' sodipodi:docname='go-next-rtl-symbolic.svg' height='16' id='svg7384' xmlns:inkscape='http://www.inkscape.org/namespaces/inkscape' xmlns:rdf='http://www.w3.org/1999/02/22-rdf-syntax-ns#' xmlns:sodipodi='http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd' xmlns:svg='http://www.w3.org/2000/svg' inkscape:version='0.48.4 r9939' version='1.1' width='16' xmlns='http://www.w3.org/2000/svg'>
+  <metadata id='metadata90'>
+    <rdf:RDF>
+      <cc:Work rdf:about=''>
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type rdf:resource='http://purl.org/dc/dcmitype/StillImage'/>
+        <dc:title>Gnome Symbolic Icon Theme</dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <sodipodi:namedview inkscape:bbox-nodes='false' inkscape:bbox-paths='true' bordercolor='#666666' borderopacity='1' inkscape:current-layer='layer12' inkscape:cx='-101.35123' inkscape:cy='9.99302' gridtolerance='10' inkscape:guide-bbox='true' guidetolerance='10' id='namedview88' inkscape:object-nodes='false' inkscape:object-paths='false' objecttolerance='10' pagecolor='#3a3b39' inkscape:pageopacity='1' inkscape:pageshadow='2' showborder='false' showgrid='false' showguides='true' inkscape:snap-bbox='true' inkscape:snap-bbox-midpoints='false' inkscape:snap-global='true' inkscape:snap-grids='true' inkscape:snap-nodes='false' inkscape:snap-others='false' inkscape:snap-to-guides='true' inkscape:window-height='1408' inkscape:window-maximized='1' inkscape:window-width='2560' inkscape:window-x='0' inkscape:window-y='0' inkscape:zoom='1'>
+    <inkscape:grid empspacing='2' enabled='true' id='grid4866' originx='-60px' originy='530px' snapvisiblegridlinesonly='true' spacingx='1px' spacingy='1px' type='xygrid' visible='true'/>
+  </sodipodi:namedview>
+  <title id='title9167'>Gnome Symbolic Icon Theme</title>
+  <defs id='defs7386'/>
+  <g inkscape:groupmode='layer' id='layer9' inkscape:label='status' style='display:inline' transform='translate(-301.0002,-747)'/>
+  <g inkscape:groupmode='layer' id='layer10' inkscape:label='devices' transform='translate(-301.0002,-747)'/>
+  <g inkscape:groupmode='layer' id='layer11' inkscape:label='apps' transform='translate(-301.0002,-747)'/>
+  <g inkscape:groupmode='layer' id='layer13' inkscape:label='places' transform='translate(-301.0002,-747)'/>
+  <g inkscape:groupmode='layer' id='layer14' inkscape:label='mimetypes' transform='translate(-301.0002,-747)'/>
+  <g inkscape:groupmode='layer' id='layer15' inkscape:label='emblems' style='display:inline' transform='translate(-301.0002,-747)'/>
+  <g inkscape:groupmode='layer' id='g71291' inkscape:label='emotes' style='display:inline' transform='translate(-301.0002,-747)'/>
+  <g inkscape:groupmode='layer' id='g4953' inkscape:label='categories' style='display:inline' transform='translate(-301.0002,-747)'/>
+  <g inkscape:groupmode='layer' id='layer12' inkscape:label='actions' style='display:inline' transform='translate(-301.0002,-747)'>
+    
+    <path inkscape:connector-curvature='0' d='m 313.01372,749 -1,0 c -0.0104,-1.2e-4 -0.0208,-4.6e-4 -0.0313,0 -0.25495,0.0112 -0.50987,0.12858 -0.6875,0.3125 l -6.29767,5.71875 6.29772,5.71875 c 0.18816,0.18819 0.45346,0.28125 0.71875,0.28125 l 1,0 0,-1 c 0,-0.26529 -0.0931,-0.53058 -0.28125,-0.71875 l -4.82897,-4.28125 4.82897,-4.28125 c 0.21074,-0.19463 0.30316,-0.46925 0.28125,-0.75 z' id='path5441' sodipodi:nodetypes='ccsccccccccccc' style='font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;color:#bebebe;fill:#bebebe;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.78124988;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:new;font-family:Andale Mono;-inkscape-font-specification:Andale Mono'/>
+  </g>
+</svg>
-- 
cgit v1.2.3


From 7396b3d89724a6280684f0d2099fe17834a0f923 Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Sun, 23 Jun 2013 17:40:05 +0200
Subject: Fix #77 : articles marqués comme lus au défilement
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Possibilité de marquer les articles automatiquement comme lus lors
du défilement de la page. Le marquage survient aux 3/4 de l'article
visible.
Ajout d'une option pour activer / désactiver (défaut) la fonctionnalité
et disparition de l'option de marquage au chargement de la page.
Ajout de 2 boutons pour marquer comme lu et en favori en bas des
articles
---
 app/controllers/configureController.php |  4 ++--
 app/controllers/indexController.php     |  2 +-
 app/i18n/en.php                         |  2 +-
 app/i18n/fr.php                         |  2 +-
 app/models/RSSConfiguration.php         | 18 +++++++++++----
 app/views/configure/display.phtml       |  6 ++---
 app/views/helpers/normal_view.phtml     | 15 ++++++++++++
 app/views/javascript/main.phtml         | 41 +++++++++++++++++++++++----------
 public/theme/freshrss.css               | 14 +++++------
 9 files changed, 73 insertions(+), 31 deletions(-)

(limited to 'app/views')

diff --git a/app/controllers/configureController.php b/app/controllers/configureController.php
index 9ed0ad1eb..ce53e1040 100755
--- a/app/controllers/configureController.php
+++ b/app/controllers/configureController.php
@@ -149,7 +149,7 @@ class configureController extends ActionController {
 			$mail = Request::param ('mail_login', false);
 			$openArticle = Request::param ('mark_open_article', 'no');
 			$openSite = Request::param ('mark_open_site', 'no');
-			$openPage = Request::param ('mark_open_page', 'no');
+			$scroll = Request::param ('mark_scroll', 'no');
 			$urlShaarli = Request::param ('shaarli', '');
 
 			$this->view->conf->_language ($language);
@@ -164,7 +164,7 @@ class configureController extends ActionController {
 			$this->view->conf->_markWhen (array (
 				'article' => $openArticle,
 				'site' => $openSite,
-				'page' => $openPage,
+				'scroll' => $scroll,
 			));
 			$this->view->conf->_urlShaarli ($urlShaarli);
 
diff --git a/app/controllers/indexController.php b/app/controllers/indexController.php
index a5a5501e7..594d379fb 100755
--- a/app/controllers/indexController.php
+++ b/app/controllers/indexController.php
@@ -153,7 +153,7 @@ class indexController extends ActionController {
 			);
 		}
 
-		View::prependTitle (Translate::t ('see_logs') . ' - ');
+		View::prependTitle (Translate::t ('logs') . ' - ');
 
 		$logs = array();
 		try {
diff --git a/app/i18n/en.php b/app/i18n/en.php
index 209bbcd87..648d70caf 100644
--- a/app/i18n/en.php
+++ b/app/i18n/en.php
@@ -153,7 +153,7 @@ return array (
 	'auto_read_when'		=> 'Mark automatically as read when',
 	'article_selected'		=> 'Article is selected',
 	'article_open_on_website'	=> 'Article is opened on its original website',
-	'page_loaded'			=> 'Page is loaded',
+	'scroll'			=> 'Page scrolls',
 	'your_shaarli'			=> 'Your Shaarli',
 	'sharing'			=> 'Sharing',
 	'share'				=> 'Share',
diff --git a/app/i18n/fr.php b/app/i18n/fr.php
index 172f06953..714443f38 100644
--- a/app/i18n/fr.php
+++ b/app/i18n/fr.php
@@ -153,7 +153,7 @@ return array (
 	'auto_read_when'		=> 'Marquer automatiquement comme lu lorsque',
 	'article_selected'		=> 'L\'article est sélectionné',
 	'article_open_on_website'	=> 'L\'article est ouvert sur le site d\'origine',
-	'page_loaded'			=> 'La page est chargée',
+	'scroll'			=> 'Au défilement de la page',
 	'your_shaarli'			=> 'Votre Shaarli',
 	'sharing'			=> 'Partage',
 	'share'				=> 'Partager',
diff --git a/app/models/RSSConfiguration.php b/app/models/RSSConfiguration.php
index b188c0e65..dde120e4a 100755
--- a/app/models/RSSConfiguration.php
+++ b/app/models/RSSConfiguration.php
@@ -76,8 +76,8 @@ class RSSConfiguration extends Model {
 	public function markWhenSite () {
 		return $this->mark_when['site'];
 	}
-	public function markWhenPage () {
-		return $this->mark_when['page'];
+	public function markWhenScroll () {
+		return $this->mark_when['scroll'];
 	}
 	public function urlShaarli () {
 		return $this->url_shaarli;
@@ -151,9 +151,19 @@ class RSSConfiguration extends Model {
 		}
 	}
 	public function _markWhen ($values) {
+		if(!isset($values['article'])) {
+			$values['article'] = 'yes';
+		}
+		if(!isset($values['site'])) {
+			$values['site'] = 'yes';
+		}
+		if(!isset($values['scroll'])) {
+			$values['scroll'] = 'yes';
+		}
+
 		$this->mark_when['article'] = $values['article'];
 		$this->mark_when['site'] = $values['site'];
-		$this->mark_when['page'] = $values['page'];
+		$this->mark_when['scroll'] = $values['scroll'];
 	}
 	public function _urlShaarli ($value) {
 		$this->url_shaarli = '';
@@ -185,7 +195,7 @@ class RSSConfigurationDAO extends Model_array {
 	public $mark_when = array (
 		'article' => 'yes',
 		'site' => 'yes',
-		'page' => 'no'
+		'scroll' => 'no'
 	);
 	public $url_shaarli = '';
 
diff --git a/app/views/configure/display.phtml b/app/views/configure/display.phtml
index 8484a7116..7da5b2947 100644
--- a/app/views/configure/display.phtml
+++ b/app/views/configure/display.phtml
@@ -111,9 +111,9 @@
 					<input type="checkbox" name="mark_open_site" id="check_open_site" value="yes"<?php echo $this->conf->markWhenSite () == 'yes' ? ' checked="checked"' : ''; ?> />
 					<?php echo Translate::t ('article_open_on_website'); ?>
 				</label>
-				<label class="checkbox" for="check_open_page">
-					<input type="checkbox" name="mark_open_page" id="check_open_page" value="yes"<?php echo $this->conf->markWhenPage () == 'yes' ? ' checked="checked"' : ''; ?> />
-					<?php echo Translate::t ('page_loaded'); ?>
+				<label class="checkbox" for="check_scroll">
+					<input type="checkbox" name="mark_scroll" id="check_scroll" value="yes"<?php echo $this->conf->markWhenScroll () == 'yes' ? ' checked="checked"' : ''; ?> />
+					<?php echo Translate::t ('scroll'); ?>
 				</label>
 			</div>
 		</div>
diff --git a/app/views/helpers/normal_view.phtml b/app/views/helpers/normal_view.phtml
index eaf1e4276..126fa5a78 100644
--- a/app/views/helpers/normal_view.phtml
+++ b/app/views/helpers/normal_view.phtml
@@ -64,6 +64,21 @@ if (isset ($this->entryPaginator) && !$this->entryPaginator->isEmpty ()) {
 			</div>
 
 			<ul class="horizontal-list bottom">
+				<?php if (!login_is_conf ($this->conf) || is_logged ()) { ?>
+				<li class="item manage">
+					<?php if (!$item->isRead ()) { ?>
+					<a class="read" href="<?php echo _url ('entry', 'read', 'id', $item->id (), 'is_read', 1); ?>">&nbsp;</a>
+					<?php } else { ?>
+					<a class="read" href="<?php echo _url ('entry', 'read', 'id', $item->id (), 'is_read', 0); ?>">&nbsp;</a>
+					<?php } ?>
+
+					<?php if (!$item->isFavorite ()) { ?>
+					<a class="bookmark" href="<?php echo _url ('entry', 'bookmark', 'id', $item->id (), 'is_favorite', 1); ?>">&nbsp;</a>
+					<?php } else { ?>
+					<a class="bookmark" href="<?php echo _url ('entry', 'bookmark', 'id', $item->id (), 'is_favorite', 0); ?>">&nbsp;</a>
+					<?php } ?>
+				</li>
+				<?php } ?>
 				<li class="item">
 					<div class="dropdown">
 						<div id="dropdown-share-<?php echo $item->id ();?>" class="dropdown-target"></div>
diff --git a/app/views/javascript/main.phtml b/app/views/javascript/main.phtml
index e51cf978e..da95f9c04 100644
--- a/app/views/javascript/main.phtml
+++ b/app/views/javascript/main.phtml
@@ -58,6 +58,12 @@ function mark_read (active, only_not_read) {
 		return false;
 	}
 
+	if (active.hasClass ("not_read")) {
+		active.removeClass ("not_read");
+	} else {
+		active.addClass ("not_read");
+	}
+
 	url =  active.find ("a.read").attr ("href");
 	if (url === undefined) {
 		return false;
@@ -71,11 +77,6 @@ function mark_read (active, only_not_read) {
 		res = jQuery.parseJSON(data);
 
 		active.find ("a.read").attr ("href", res.url);
-		if (active.hasClass ("not_read")) {
-			active.removeClass ("not_read");
-		} else {
-			active.addClass ("not_read");
-		}
 	});
 }
 
@@ -139,14 +140,19 @@ function init_img () {
 	});
 }
 
-function init_posts () {
-	<?php if ($mark['page'] == 'yes') { ?>
-	if ($(".flux.not_read")[0] != undefined) {
-		url = $(".nav_menu a.read_all").attr ("href");
-		redirect (url, false);
-	}
-	<?php } ?>
+function inMarkViewport(flux) {
+	var top = flux.position().top;
+	var height = flux.height();
+	var begin = top + 3 * height / 4;
+	var bot = top + height;
+
+	var windowTop = $(window).scrollTop();
+	var windowBot = windowTop + $(window).height();
 
+	return (windowBot >= begin && windowBot <= bot);
+}
+
+function init_posts () {
 	init_img ();
 	<?php if($this->conf->lazyload() == 'yes') { ?>
 	$(".flux .content img").lazyload();
@@ -186,6 +192,17 @@ function init_posts () {
 		mark_read($(this).parent().parent().parent(), true);
 	});
 	<?php } ?>
+
+	<?php if ($mark['scroll'] == 'yes') { ?>
+	var flux = $('.flux');
+	$(window).scroll(function() {
+		flux.each(function() {
+			if($(this).hasClass('not_read') && inMarkViewport($(this))) {
+				mark_read($(this), true);
+			}
+		});
+	});
+	<?php } ?>
 }
 
 function init_column_categories () {
diff --git a/public/theme/freshrss.css b/public/theme/freshrss.css
index 178472ac9..e7298d3fa 100644
--- a/public/theme/freshrss.css
+++ b/public/theme/freshrss.css
@@ -201,13 +201,13 @@
 		line-height: 25px;
 		border-top: 1px solid #ddd;
 	}
-		.flux_header .item.manage {
+		.item.manage {
 			width: 80px;
 			white-space: nowrap;
 			font-size: 0px;
 			text-align: center;
 		}
-			.flux_header .item.manage .read {
+			.item.manage .read {
 				display: inline-block;
 				width: 40px;
 				height: 40px;
@@ -215,14 +215,14 @@
 				background: url("icons/read.svg") center center no-repeat;
 				vertical-align: middle;
 			}
-				.flux_header .item.manage .read:hover {
+				.item.manage .read:hover {
 					text-decoration: none;
 				}
-				.flux.not_read .flux_header .item.manage .read {
+				.flux.not_read .item.manage .read {
 					background: url("icons/unread.png") center center no-repeat;
 					background: url("icons/unread.svg") center center no-repeat;
 				}
-			.flux_header .item.manage .bookmark {
+			.item.manage .bookmark {
 				display: inline-block;
 				width: 40px;
 				height: 40px;
@@ -230,10 +230,10 @@
 				background: url("icons/non-starred.svg") center center no-repeat;
 				vertical-align: middle;
 			}
-				.flux_header .item.manage .bookmark:hover {
+				.item.manage .bookmark:hover {
 					text-decoration: none;
 				}
-				.flux.favorite .flux_header .item.manage .bookmark {
+				.flux.favorite .item.manage .bookmark {
 					background: url("icons/starred.png") center center no-repeat;
 					background: url("icons/starred.svg") center center no-repeat;
 				}
-- 
cgit v1.2.3


From 9758d1d7366519ce17c052928a78bef76216f02a Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Sun, 23 Jun 2013 20:25:21 +0200
Subject: Amélioration du marquage au défilement
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Ne marque plus que lorsqu'on s'est déplacé de plus de 50px (évite de
checker à chaque fois)
De plus, lorsque les articles sont repliés, le marquage ne marche plus
(évite donc de marquer des articles non lus)
---
 app/views/javascript/main.phtml | 11 ++++++++++-
 public/theme/freshrss.css       |  1 +
 2 files changed, 11 insertions(+), 1 deletion(-)

(limited to 'app/views')

diff --git a/app/views/javascript/main.phtml b/app/views/javascript/main.phtml
index da95f9c04..b3da278bc 100644
--- a/app/views/javascript/main.phtml
+++ b/app/views/javascript/main.phtml
@@ -152,6 +152,7 @@ function inMarkViewport(flux) {
 	return (windowBot >= begin && windowBot <= bot);
 }
 
+var lastScroll = 0;
 function init_posts () {
 	init_img ();
 	<?php if($this->conf->lazyload() == 'yes') { ?>
@@ -196,8 +197,16 @@ function init_posts () {
 	<?php if ($mark['scroll'] == 'yes') { ?>
 	var flux = $('.flux');
 	$(window).scroll(function() {
+		var windowTop = $(this).scrollTop();
+		if(Math.abs(windowTop - lastScroll) <= 50) {
+			return;
+		}
+		lastScroll = windowTop;
+
 		flux.each(function() {
-			if($(this).hasClass('not_read') && inMarkViewport($(this))) {
+			if($(this).hasClass('not_read') &&
+			   $(this).children(".flux_content").is(':visible') &&
+			   inMarkViewport($(this))) {
 				mark_read($(this), true);
 			}
 		});
diff --git a/public/theme/freshrss.css b/public/theme/freshrss.css
index e7298d3fa..93bb32437 100644
--- a/public/theme/freshrss.css
+++ b/public/theme/freshrss.css
@@ -337,6 +337,7 @@
 			}
 
 .content {
+	min-height: 300px;
 	max-width: 550px;
 	margin: 0 auto;
 	padding: 20px 10px;
-- 
cgit v1.2.3


From 371434c63acedb4229c48ea8e737b908f271ca26 Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Tue, 2 Jul 2013 18:04:02 +0200
Subject: Fix issues #93 et #94
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Les noms de catégorie trop longs ne cassent plus les boutons dans la
colonne de gauche (ajout d'un overflow hidden)

Les articles enroulés ne bugguent plus lorsqu'on charge plus d'articles.
L'action au clic pour dérouler un article était appliqué deux fois,
désormais on "unbind" d'abord l'action avant de la réappliquer (pas très
efficace mais c'est la façon la plus simple)
---
 app/views/javascript/main.phtml | 4 +++-
 public/theme/global.css         | 1 +
 2 files changed, 4 insertions(+), 1 deletion(-)

(limited to 'app/views')

diff --git a/app/views/javascript/main.phtml b/app/views/javascript/main.phtml
index b3da278bc..9226efe63 100644
--- a/app/views/javascript/main.phtml
+++ b/app/views/javascript/main.phtml
@@ -163,7 +163,9 @@ function init_posts () {
 		$(".flux:not(.active) .flux_content").hide ();
 	}
 
-	$(".flux_header .item.title, .flux_header .item.date").click (function () {
+	var flux_header_toggle = $(".flux_header .item.title, .flux_header .item.date");
+	flux_header_toggle.unbind('click'); // évite d'associer 2 fois le toggle
+	flux_header_toggle.click (function () {
 		old_active = $(".flux.active");
 		new_active = $(this).parent ().parent ();
 
diff --git a/public/theme/global.css b/public/theme/global.css
index b1fd01436..081d26730 100644
--- a/public/theme/global.css
+++ b/public/theme/global.css
@@ -188,6 +188,7 @@ input, select, textarea {
 	line-height: 20px;
 	vertical-align: middle;
 	cursor: pointer;
+	overflow: hidden;
 }
 	a.btn {
 		min-height: 25px;
-- 
cgit v1.2.3