From 878e96202e8a22e4857b98e29b0a1fce68eccbc9 Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Sun, 15 Dec 2013 03:30:24 +0100
Subject: Grosse refactorisation pour permettre le chargement automatique des
 classes
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

C'est parti de changements pour
https://github.com/marienfressinaud/FreshRSS/issues/255 et finalement
j'ai continué la refactorisation...

Ajout de préfixes FreshRSS_ et Minz_ sur le modèle de SimplePie_.
Toutes les classes sont maintenant en chargement automatique (devrait
améliorer les performances en évitant de charger plein de classes
inutilisées, et faciliter la maintenance).
Suppression de set_include_path().
Si souhaité, certaines classes de Minz pourraient être déplacées dans un
sous-répertoire, par exemple les exceptions.

Tests et relecture nécessaires.
---
 app/Models/Configuration.php | 326 +++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 326 insertions(+)
 create mode 100644 app/Models/Configuration.php

(limited to 'app/Models/Configuration.php')

diff --git a/app/Models/Configuration.php b/app/Models/Configuration.php
new file mode 100644
index 000000000..7ef76b522
--- /dev/null
+++ b/app/Models/Configuration.php
@@ -0,0 +1,326 @@
+<?php
+class FreshRSS_Configuration extends Minz_Model {
+	private $available_languages = array (
+		'en' => 'English',
+		'fr' => 'Français',
+	);
+	private $language;
+	private $posts_per_page;
+	private $view_mode;
+	private $default_view;
+	private $display_posts;
+	private $onread_jump_next;
+	private $lazyload;
+	private $sort_order;
+	private $old_entries;
+	private $shortcuts = array ();
+	private $mail_login = '';
+	private $mark_when = array ();
+	private $sharing = array ();
+	private $theme;
+	private $anon_access;
+	private $token;
+	private $auto_load_more;
+	private $topline_read;
+	private $topline_favorite;
+	private $topline_date;
+	private $topline_link;
+	private $bottomline_read;
+	private $bottomline_favorite;
+	private $bottomline_sharing;
+	private $bottomline_tags;
+	private $bottomline_date;
+	private $bottomline_link;
+
+	public function __construct () {
+		$confDAO = new FreshRSS_ConfigurationDAO ();
+		$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->_onread_jump_next ($confDAO->onread_jump_next);
+		$this->_lazyload ($confDAO->lazyload);
+		$this->_sortOrder ($confDAO->sort_order);
+		$this->_oldEntries ($confDAO->old_entries);
+		$this->_shortcuts ($confDAO->shortcuts);
+		$this->_mailLogin ($confDAO->mail_login);
+		$this->_markWhen ($confDAO->mark_when);
+		$this->_sharing ($confDAO->sharing);
+		$this->_theme ($confDAO->theme);
+		FreshRSS_Themes::setThemeId ($confDAO->theme);
+		$this->_anonAccess ($confDAO->anon_access);
+		$this->_token ($confDAO->token);
+		$this->_autoLoadMore ($confDAO->auto_load_more);
+		$this->_topline_read ($confDAO->topline_read);
+		$this->_topline_favorite ($confDAO->topline_favorite);
+		$this->_topline_date ($confDAO->topline_date);
+		$this->_topline_link ($confDAO->topline_link);
+		$this->_bottomline_read ($confDAO->bottomline_read);
+		$this->_bottomline_favorite ($confDAO->bottomline_favorite);
+		$this->_bottomline_sharing ($confDAO->bottomline_sharing);
+		$this->_bottomline_tags ($confDAO->bottomline_tags);
+		$this->_bottomline_date ($confDAO->bottomline_date);
+		$this->_bottomline_link ($confDAO->bottomline_link);
+	}
+
+	public function availableLanguages () {
+		return $this->available_languages;
+	}
+	public function language () {
+		return $this->language;
+	}
+	public function postsPerPage () {
+		return $this->posts_per_page;
+	}
+	public function viewMode () {
+		return $this->view_mode;
+	}
+	public function defaultView () {
+		return $this->default_view;
+	}
+	public function displayPosts () {
+		return $this->display_posts;
+	}
+	public function onread_jump_next () {
+		return $this->onread_jump_next;
+	}
+	public function lazyload () {
+		return $this->lazyload;
+	}
+	public function sortOrder () {
+		return $this->sort_order;
+	}
+	public function oldEntries () {
+		return $this->old_entries;
+	}
+	public function shortcuts () {
+		return $this->shortcuts;
+	}
+	public function mailLogin () {
+		return $this->mail_login;
+	}
+	public function markWhen () {
+		return $this->mark_when;
+	}
+	public function markWhenArticle () {
+		return $this->mark_when['article'];
+	}
+	public function markWhenSite () {
+		return $this->mark_when['site'];
+	}
+	public function markWhenScroll () {
+		return $this->mark_when['scroll'];
+	}
+	public function markUponReception () {
+		return $this->mark_when['reception'];
+	}
+	public function sharing ($key = false) {
+		if ($key === false) {
+			return $this->sharing;
+		} elseif (isset ($this->sharing[$key])) {
+			return $this->sharing[$key];
+		}
+		return false;
+	}
+	public function theme () {
+		return $this->theme;
+	}
+	public function anonAccess () {
+		return $this->anon_access;
+	}
+	public function token () {
+		return $this->token;
+	}
+	public function autoLoadMore () {
+		return $this->auto_load_more;
+	}
+	public function toplineRead () {
+		return $this->topline_read;
+	}
+	public function toplineFavorite () {
+		return $this->topline_favorite;
+	}
+	public function toplineDate () {
+		return $this->topline_date;
+	}
+	public function toplineLink () {
+		return $this->topline_link;
+	}
+	public function bottomlineRead () {
+		return $this->bottomline_read;
+	}
+	public function bottomlineFavorite () {
+		return $this->bottomline_favorite;
+	}
+	public function bottomlineSharing () {
+		return $this->bottomline_sharing;
+	}
+	public function bottomlineTags () {
+		return $this->bottomline_tags;
+	}
+	public function bottomlineDate () {
+		return $this->bottomline_date;
+	}
+	public function bottomlineLink () {
+		return $this->bottomline_link;
+	}
+
+	public function _language ($value) {
+		if (!isset ($this->available_languages[$value])) {
+			$value = 'en';
+		}
+		$this->language = $value;
+	}
+	public function _postsPerPage ($value) {
+		$value = intval($value);
+		$this->posts_per_page = $value > 0 ? $value : 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';
+		} else {
+			$this->default_view = 'all';
+		}
+	}
+	public function _displayPosts ($value) {
+		if ($value == 'yes') {
+			$this->display_posts = 'yes';
+		} else {
+			$this->display_posts = 'no';
+		}
+	}
+	public function _onread_jump_next ($value) {
+		if ($value == 'no') {
+			$this->onread_jump_next = 'no';
+		} else {
+			$this->onread_jump_next = 'yes';
+		}
+	}
+	public function _lazyload ($value) {
+		if ($value == 'no') {
+			$this->lazyload = 'no';
+		} else {
+			$this->lazyload = 'yes';
+		}
+	}
+	public function _sortOrder ($value) {
+		$this->sort_order = $value === 'ASC' ? 'ASC' : 'DESC';
+	}
+	public function _oldEntries ($value) {
+		if (ctype_digit ($value) && $value > 0) {
+			$this->old_entries = $value;
+		} else {
+			$this->old_entries = 3;
+		}
+	}
+	public function _shortcuts ($values) {
+		foreach ($values as $key => $value) {
+			$this->shortcuts[$key] = $value;
+		}
+	}
+	public function _mailLogin ($value) {
+		if (filter_var ($value, FILTER_VALIDATE_EMAIL)) {
+			$this->mail_login = $value;
+		} elseif ($value == false) {
+			$this->mail_login = false;
+		}
+	}
+	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';
+		}
+		if(!isset($values['reception'])) {
+			$values['reception'] = 'no';
+		}
+
+		$this->mark_when['article'] = $values['article'];
+		$this->mark_when['site'] = $values['site'];
+		$this->mark_when['scroll'] = $values['scroll'];
+		$this->mark_when['reception'] = $values['reception'];
+	}
+	public function _sharing ($values) {
+		$are_url = array ('shaarli', 'poche', 'diaspora');
+		foreach ($values as $key => $value) {
+			if (in_array($key, $are_url)) {
+				$is_url = (
+					filter_var ($value, FILTER_VALIDATE_URL) ||
+					(version_compare(PHP_VERSION, '5.3.3', '<') &&
+						(strpos($value, '-') > 0) &&
+						($value === filter_var($value, FILTER_SANITIZE_URL)))
+				);  //PHP bug #51192
+
+				if (!$is_url) {
+					$value = '';
+				}
+			} elseif(!is_bool ($value)) {
+				$value = true;
+			}
+
+			$this->sharing[$key] = $value;
+		}
+	}
+	public function _theme ($value) {
+		$this->theme = $value;
+	}
+	public function _anonAccess ($value) {
+		if ($value == 'yes') {
+			$this->anon_access = 'yes';
+		} else {
+			$this->anon_access = 'no';
+		}
+	}
+	public function _token ($value) {
+		$this->token = $value;
+	}
+	public function _autoLoadMore ($value) {
+		if ($value == 'yes') {
+			$this->auto_load_more = 'yes';
+		} else {
+			$this->auto_load_more = 'no';
+		}
+	}
+	public function _topline_read ($value) {
+		$this->topline_read = $value === 'yes';
+	}
+	public function _topline_favorite ($value) {
+		$this->topline_favorite = $value === 'yes';
+	}
+	public function _topline_date ($value) {
+		$this->topline_date = $value === 'yes';
+	}
+	public function _topline_link ($value) {
+		$this->topline_link = $value === 'yes';
+	}
+	public function _bottomline_read ($value) {
+		$this->bottomline_read = $value === 'yes';
+	}
+	public function _bottomline_favorite ($value) {
+		$this->bottomline_favorite = $value === 'yes';
+	}
+	public function _bottomline_sharing ($value) {
+		$this->bottomline_sharing = $value === 'yes';
+	}
+	public function _bottomline_tags ($value) {
+		$this->bottomline_tags = $value === 'yes';
+	}
+	public function _bottomline_date ($value) {
+		$this->bottomline_date = $value === 'yes';
+	}
+	public function _bottomline_link ($value) {
+		$this->bottomline_link = $value === 'yes';
+	}
+}
-- 
cgit v1.2.3


From 7b7acf5c8738e949109672748dbd9f39a6e5a2c4 Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Mon, 23 Dec 2013 13:35:54 +0100
Subject: Synchronisation quelques lignes blanches

---
 README.md                       | 4 ++--
 app/Models/CategoryDAO.php      | 1 +
 app/Models/Configuration.php    | 1 +
 app/Models/ConfigurationDAO.php | 1 +
 app/Models/Entry.php            | 1 +
 app/Models/EntryDAO.php         | 1 +
 app/Models/Feed.php             | 1 +
 app/Models/FeedDAO.php          | 1 +
 app/Models/LogDAO.php           | 1 +
 public/install.php              | 1 +
 10 files changed, 11 insertions(+), 2 deletions(-)

(limited to 'app/Models/Configuration.php')

diff --git a/README.md b/README.md
index a45c8e67c..87ed9de99 100644
--- a/README.md
+++ b/README.md
@@ -5,8 +5,8 @@ Il se veut léger et facile à prendre en main tout en étant un outil puissant
 * Site officiel : http://marienfressinaud.github.io/FreshRSS/
 * Démo : http://marienfressinaud.fr/projets/freshrss/
 * Développeur : Marien Fressinaud <dev@marienfressinaud.fr>
-* Version actuelle : 0.7-dev
-* Date de publication 2013-12-xx
+* Version actuelle : 0.7-beta
+* Date de publication 2014-01-xx
 * License [GNU AGPL 3](http://www.gnu.org/licenses/agpl-3.0.html)
 
 ![Logo de FreshRSS](http://marienfressinaud.fr/data/images/freshrss/freshrss_title.png)
diff --git a/app/Models/CategoryDAO.php b/app/Models/CategoryDAO.php
index 3a810e9f0..6b07ab063 100644
--- a/app/Models/CategoryDAO.php
+++ b/app/Models/CategoryDAO.php
@@ -1,4 +1,5 @@
 <?php
+
 class FreshRSS_CategoryDAO extends Minz_ModelPdo {
 	public function addCategory ($valuesTmp) {
 		$sql = 'INSERT INTO `' . $this->prefix . 'category` (name, color) VALUES(?, ?)';
diff --git a/app/Models/Configuration.php b/app/Models/Configuration.php
index 7ef76b522..d5f69601f 100644
--- a/app/Models/Configuration.php
+++ b/app/Models/Configuration.php
@@ -1,4 +1,5 @@
 <?php
+
 class FreshRSS_Configuration extends Minz_Model {
 	private $available_languages = array (
 		'en' => 'English',
diff --git a/app/Models/ConfigurationDAO.php b/app/Models/ConfigurationDAO.php
index 57fc98047..0eebf2d90 100644
--- a/app/Models/ConfigurationDAO.php
+++ b/app/Models/ConfigurationDAO.php
@@ -1,4 +1,5 @@
 <?php
+
 class FreshRSS_ConfigurationDAO extends Minz_ModelArray {
 	public $language = 'en';
 	public $posts_per_page = 20;
diff --git a/app/Models/Entry.php b/app/Models/Entry.php
index 983f94727..ed31ef2b1 100644
--- a/app/Models/Entry.php
+++ b/app/Models/Entry.php
@@ -1,4 +1,5 @@
 <?php
+
 class FreshRSS_Entry extends Minz_Model {
 
 	private $id = 0;
diff --git a/app/Models/EntryDAO.php b/app/Models/EntryDAO.php
index d8bc869ae..c6bd5c404 100644
--- a/app/Models/EntryDAO.php
+++ b/app/Models/EntryDAO.php
@@ -1,4 +1,5 @@
 <?php
+
 class FreshRSS_EntryDAO extends Minz_ModelPdo {
 	public function addEntry ($valuesTmp) {
 		$sql = 'INSERT INTO `' . $this->prefix . 'entry`(id, guid, title, author, content_bin, link, date, is_read, is_favorite, id_feed, tags) '
diff --git a/app/Models/Feed.php b/app/Models/Feed.php
index e63ac8c7a..70efb0fa3 100644
--- a/app/Models/Feed.php
+++ b/app/Models/Feed.php
@@ -1,4 +1,5 @@
 <?php
+
 class FreshRSS_Feed extends Minz_Model {
 	private $id = 0;
 	private $url;
diff --git a/app/Models/FeedDAO.php b/app/Models/FeedDAO.php
index 9ebea4a47..9bd480544 100644
--- a/app/Models/FeedDAO.php
+++ b/app/Models/FeedDAO.php
@@ -1,4 +1,5 @@
 <?php
+
 class FreshRSS_FeedDAO extends Minz_ModelPdo {
 	public function addFeed ($valuesTmp) {
 		$sql = 'INSERT INTO `' . $this->prefix . 'feed` (url, category, name, website, description, lastUpdate, priority, httpAuth, error, keep_history) VALUES(?, ?, ?, ?, ?, ?, 10, ?, 0, 0)';
diff --git a/app/Models/LogDAO.php b/app/Models/LogDAO.php
index bf043fd6d..06855ec66 100644
--- a/app/Models/LogDAO.php
+++ b/app/Models/LogDAO.php
@@ -1,4 +1,5 @@
 <?php
+
 class FreshRSS_LogDAO extends Minz_ModelTxt {
 	public function __construct () {
 		parent::__construct (LOG_PATH . '/application.log', 'r+');
diff --git a/public/install.php b/public/install.php
index 377b2916d..642692cd0 100644
--- a/public/install.php
+++ b/public/install.php
@@ -164,6 +164,7 @@ function initTranslate () {
 		$translates = array_merge($translates, include($file));
 	}
 }
+
 function getBetterLanguage ($fallback) {
 	$available = availableLanguages ();
 	$accept = $_SERVER['HTTP_ACCEPT_LANGUAGE'];
-- 
cgit v1.2.3


From 06d4b8d10247146d9c6f7c78ff9fc584438dd8fe Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Wed, 25 Dec 2013 17:37:52 +0100
Subject: Option globale pour la taille minimale de l'historique par défaut
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Plus une réorganisation des options
---
 app/Controllers/configureController.php |  5 ++-
 app/Controllers/feedController.php      |  9 +++--
 app/Controllers/indexController.php     |  5 +--
 app/Models/Configuration.php            | 14 +++++++-
 app/Models/ConfigurationDAO.php         |  8 +++--
 app/Models/EntryDAO.php                 |  8 +++--
 app/Models/Feed.php                     |  4 +--
 app/Models/FeedDAO.php                  |  4 +--
 app/i18n/en.php                         |  8 +++--
 app/i18n/fr.php                         |  8 +++--
 app/views/configure/display.phtml       | 35 ++++++++++++-------
 app/views/configure/feed.phtml          | 62 ++++++++++++++++++---------------
 public/install.php                      |  4 +--
 public/themes/default/freshrss.css      |  4 +++
 public/themes/default/global.css        |  3 ++
 public/themes/flat-design/freshrss.css  |  4 +++
 public/themes/flat-design/global.css    |  3 ++
 17 files changed, 124 insertions(+), 64 deletions(-)

(limited to 'app/Models/Configuration.php')

diff --git a/app/Controllers/configureController.php b/app/Controllers/configureController.php
index b83501f0b..762134dd0 100755
--- a/app/Controllers/configureController.php
+++ b/app/Controllers/configureController.php
@@ -97,7 +97,7 @@ class FreshRSS_configure_Controller extends Minz_ActionController {
 					$description = sanitizeHTML(Minz_Request::param('description', '', true));
 					$website = Minz_Request::param('website', '');
 					$url = Minz_Request::param('url', '');
-					$keep_history = intval(Minz_Request::param ('keep_history', 0));
+					$keep_history = intval(Minz_Request::param ('keep_history', -2));
 					$cat = Minz_Request::param ('category', 0);
 					$path = Minz_Request::param ('path_entries', '');
 					$priority = Minz_Request::param ('priority', 0);
@@ -160,6 +160,7 @@ class FreshRSS_configure_Controller extends Minz_ActionController {
 			$lazyload = Minz_Request::param ('lazyload', 'no');
 			$sort = Minz_Request::param ('sort_order', 'DESC');
 			$old = Minz_Request::param ('old_entries', 3);
+			$keepHistoryDefault = Minz_Request::param('keep_history_default', 0);
 			$mail = Minz_Request::param ('mail_login', false);
 			$anon = Minz_Request::param ('anon_access', 'no');
 			$token = Minz_Request::param ('token', $current_token);
@@ -189,6 +190,7 @@ class FreshRSS_configure_Controller extends Minz_ActionController {
 			$this->view->conf->_lazyload ($lazyload);
 			$this->view->conf->_sortOrder ($sort);
 			$this->view->conf->_oldEntries ($old);
+			$this->view->conf->_keepHistoryDefault($keepHistoryDefault);
 			$this->view->conf->_mailLogin ($mail);
 			$this->view->conf->_anonAccess ($anon);
 			$this->view->conf->_token ($token);
@@ -221,6 +223,7 @@ class FreshRSS_configure_Controller extends Minz_ActionController {
 				'lazyload' => $this->view->conf->lazyload (),
 				'sort_order' => $this->view->conf->sortOrder (),
 				'old_entries' => $this->view->conf->oldEntries (),
+				'keep_history_default' => $this->view->conf->keepHistoryDefault(),
 				'mail_login' => $this->view->conf->mailLogin (),
 				'anon_access' => $this->view->conf->anonAccess (),
 				'token' => $this->view->conf->token (),
diff --git a/app/Controllers/feedController.php b/app/Controllers/feedController.php
index e7d9c97c3..836044da6 100755
--- a/app/Controllers/feedController.php
+++ b/app/Controllers/feedController.php
@@ -223,8 +223,13 @@ class FreshRSS_feed_Controller extends Minz_ActionController {
 					}
 				}
 
-				if (($feed->keepHistory() >= 0) && (rand(0, 30) === 1)) {
-					$nb = $feedDAO->cleanOldEntries ($feed->id (), $date_min, max($feed->keepHistory(), count($entries) + 10));
+				$feedHistory = $feed->keepHistory();
+				if ($feedHistory == -2) {	//default
+					$feedHistory = $this->view->conf->keepHistoryDefault();
+				}
+
+				if (($feedHistory >= 0) && (rand(0, 30) === 1)) {
+					$nb = $feedDAO->cleanOldEntries ($feed->id (), $date_min, max($feedHistory, count($entries) + 10));
 					if ($nb > 0) {
 						Minz_Log::record ($nb . ' old entries cleaned in feed ' . $feed->id (), Minz_Log::DEBUG);
 					}
diff --git a/app/Controllers/indexController.php b/app/Controllers/indexController.php
index e3c253518..6c0ba9058 100755
--- a/app/Controllers/indexController.php
+++ b/app/Controllers/indexController.php
@@ -130,16 +130,17 @@ class FreshRSS_index_Controller extends Minz_ActionController {
 		// on calcule la date des articles les plus anciens qu'on affiche
 		$nb_month_old = $this->view->conf->oldEntries ();
 		$date_min = $today - (3600 * 24 * 30 * $nb_month_old);	//Do not use a fast changing value such as time() to allow SQL caching
+		$keepHistoryDefault = $this->view->conf->keepHistoryDefault();
 
 		try {
-			$entries = $this->entryDAO->listWhere($getType, $getId, $state, $order, $nb + 1, $first, $filter, $date_min);
+			$entries = $this->entryDAO->listWhere($getType, $getId, $state, $order, $nb + 1, $first, $filter, $date_min, $keepHistoryDefault);
 
 			// Si on a récupéré aucun article "non lus"
 			// on essaye de récupérer tous les articles
 			if ($state === 'not_read' && empty($entries)) {	//TODO: Remove in v0.8
 				Minz_Log::record ('Conflicting information about nbNotRead!', Minz_Log::DEBUG);
 				$this->view->state = 'all';
-				$entries = $this->entryDAO->listWhere($getType, $getId, 'all', $order, $nb, $first, $filter, $date_min);
+				$entries = $this->entryDAO->listWhere($getType, $getId, 'all', $order, $nb, $first, $filter, $date_min, $keepHistoryDefault);
 			}
 
 			if (count($entries) <= $nb) {
diff --git a/app/Models/Configuration.php b/app/Models/Configuration.php
index d5f69601f..47509636f 100644
--- a/app/Models/Configuration.php
+++ b/app/Models/Configuration.php
@@ -14,6 +14,7 @@ class FreshRSS_Configuration extends Minz_Model {
 	private $lazyload;
 	private $sort_order;
 	private $old_entries;
+	private $keep_history_default;
 	private $shortcuts = array ();
 	private $mail_login = '';
 	private $mark_when = array ();
@@ -44,6 +45,7 @@ class FreshRSS_Configuration extends Minz_Model {
 		$this->_lazyload ($confDAO->lazyload);
 		$this->_sortOrder ($confDAO->sort_order);
 		$this->_oldEntries ($confDAO->old_entries);
+		$this->_keepHistoryDefault($confDAO->keep_history_default);
 		$this->_shortcuts ($confDAO->shortcuts);
 		$this->_mailLogin ($confDAO->mail_login);
 		$this->_markWhen ($confDAO->mark_when);
@@ -95,6 +97,9 @@ class FreshRSS_Configuration extends Minz_Model {
 	public function oldEntries () {
 		return $this->old_entries;
 	}
+	public function keepHistoryDefault() {
+		return $this->keep_history_default;
+	}
 	public function shortcuts () {
 		return $this->shortcuts;
 	}
@@ -217,11 +222,18 @@ class FreshRSS_Configuration extends Minz_Model {
 	}
 	public function _oldEntries ($value) {
 		if (ctype_digit ($value) && $value > 0) {
-			$this->old_entries = $value;
+			$this->old_entries = intval($value);
 		} else {
 			$this->old_entries = 3;
 		}
 	}
+	public function _keepHistoryDefault($value) {
+		if (ctype_digit($value) && $value >= -1) {
+			$this->keep_history_default = intval($value);
+		} else {
+			$this->keep_history_default = 0;
+		}
+	}
 	public function _shortcuts ($values) {
 		foreach ($values as $key => $value) {
 			$this->shortcuts[$key] = $value;
diff --git a/app/Models/ConfigurationDAO.php b/app/Models/ConfigurationDAO.php
index 0eebf2d90..91210e701 100644
--- a/app/Models/ConfigurationDAO.php
+++ b/app/Models/ConfigurationDAO.php
@@ -10,6 +10,7 @@ class FreshRSS_ConfigurationDAO extends Minz_ModelArray {
 	public $lazyload = 'yes';
 	public $sort_order = 'DESC';
 	public $old_entries = 3;
+	public $keep_history_default = 0;
 	public $shortcuts = array (
 		'mark_read' => 'r',
 		'mark_favorite' => 'f',
@@ -62,7 +63,7 @@ class FreshRSS_ConfigurationDAO extends Minz_ModelArray {
 			$this->language = $this->array['language'];
 		}
 		if (isset ($this->array['posts_per_page'])) {
-			$this->posts_per_page = $this->array['posts_per_page'];
+			$this->posts_per_page = intval($this->array['posts_per_page']);
 		}
 		if (isset ($this->array['view_mode'])) {
 			$this->view_mode = $this->array['view_mode'];
@@ -83,7 +84,10 @@ class FreshRSS_ConfigurationDAO extends Minz_ModelArray {
 			$this->sort_order = $this->array['sort_order'];
 		}
 		if (isset ($this->array['old_entries'])) {
-			$this->old_entries = $this->array['old_entries'];
+			$this->old_entries = intval($this->array['old_entries']);
+		}
+		if (isset ($this->array['keep_history_default'])) {
+			$this->keep_history_default = intval($this->array['keep_history_default']);
 		}
 		if (isset ($this->array['shortcuts'])) {
 			$this->shortcuts = array_merge (
diff --git a/app/Models/EntryDAO.php b/app/Models/EntryDAO.php
index f0207e96d..14d3ddcff 100644
--- a/app/Models/EntryDAO.php
+++ b/app/Models/EntryDAO.php
@@ -260,7 +260,7 @@ class FreshRSS_EntryDAO extends Minz_ModelPdo {
 		return isset ($entries[0]) ? $entries[0] : false;
 	}
 
-	public function listWhere($type = 'a', $id = '', $state = 'all', $order = 'DESC', $limit = 1, $firstId = '', $filter = '', $date_min = 0) {
+	public function listWhere($type = 'a', $id = '', $state = 'all', $order = 'DESC', $limit = 1, $firstId = '', $filter = '', $date_min = 0, $keepHistoryDefault = 0) {
 		$where = '';
 		$joinFeed = false;
 		$values = array();
@@ -307,7 +307,11 @@ class FreshRSS_EntryDAO extends Minz_ModelPdo {
 			$where .= 'AND e1.id ' . ($order === 'DESC' ? '<=' : '>=') . $firstId . ' ';
 		}
 		if (($date_min > 0) && ($type !== 's')) {
-			$where .= 'AND (e1.id >= ' . $date_min . '000000 OR e1.is_favorite = 1 OR f.keep_history <> 0) ';
+			$where .= 'AND (e1.id >= ' . $date_min . '000000 OR e1.is_favorite = 1 OR (f.keep_history <> 0';
+			if (intval($keepHistoryDefault) === 0) {
+				$where .= ' AND f.keep_history <> -2';	//default
+			}
+			$where .= ')) ';
 			$joinFeed = true;
 		}
 		$search = '';
diff --git a/app/Models/Feed.php b/app/Models/Feed.php
index 5bdf5e6d7..ef554e083 100644
--- a/app/Models/Feed.php
+++ b/app/Models/Feed.php
@@ -15,7 +15,7 @@ class FreshRSS_Feed extends Minz_Model {
 	private $pathEntries = '';
 	private $httpAuth = '';
 	private $error = false;
-	private $keep_history = 0;
+	private $keep_history = -2;
 
 	public function __construct ($url, $validate=true) {
 		if ($validate) {
@@ -168,7 +168,7 @@ class FreshRSS_Feed extends Minz_Model {
 	public function _keepHistory ($value) {
 		$value = intval($value);
 		$value = min($value, 1000000);
-		$value = max($value, -1);
+		$value = max($value, -2);
 		$this->keep_history = $value;
 	}
 	public function _nbNotRead ($value) {
diff --git a/app/Models/FeedDAO.php b/app/Models/FeedDAO.php
index 7d91a032a..c1d1f24e8 100644
--- a/app/Models/FeedDAO.php
+++ b/app/Models/FeedDAO.php
@@ -2,7 +2,7 @@
 
 class FreshRSS_FeedDAO extends Minz_ModelPdo {
 	public function addFeed ($valuesTmp) {
-		$sql = 'INSERT INTO `' . $this->prefix . 'feed` (url, category, name, website, description, lastUpdate, priority, httpAuth, error, keep_history) VALUES(?, ?, ?, ?, ?, ?, 10, ?, 0, 0)';
+		$sql = 'INSERT INTO `' . $this->prefix . 'feed` (url, category, name, website, description, lastUpdate, priority, httpAuth, error, keep_history) VALUES(?, ?, ?, ?, ?, ?, 10, ?, 0, -2)';
 		$stm = $this->bd->prepare ($sql);
 
 		$values = array (
@@ -326,7 +326,7 @@ class FreshRSS_FeedDAO extends Minz_ModelPdo {
 			$myFeed->_pathEntries (isset($dao['pathEntries']) ? $dao['pathEntries'] : '');
 			$myFeed->_httpAuth (isset($dao['httpAuth']) ? base64_decode ($dao['httpAuth']) : '');
 			$myFeed->_error ($dao['error']);
-			$myFeed->_keepHistory (isset($dao['keep_history']) ? $dao['keep_history'] : 0);
+			$myFeed->_keepHistory(isset($dao['keep_history']) ? $dao['keep_history'] : -2);
 			$myFeed->_nbNotRead ($dao['cache_nbUnreads']);
 			$myFeed->_nbEntries ($dao['cache_nbEntries']);
 			if (isset ($dao['id'])) {
diff --git a/app/i18n/en.php b/app/i18n/en.php
index b6417d8db..ca72d885c 100644
--- a/app/i18n/en.php
+++ b/app/i18n/en.php
@@ -137,8 +137,9 @@ return array (
 	'feed_url'			=> 'Feed URL',
 	'articles'			=> 'articles',
 	'number_articles'		=> 'Number of articles',
+	'by_feed'			=> 'by feed',
+	'by_default'		=> 'By default',
 	'keep_history'			=> 'Minimum number of articles to keep',
-	'keep_history_help'		=> 'Set to -1 to keep everything',
 	'categorize'			=> 'Store in a category',
 	'truncate'			=> 'Delete all articles',
 	'advanced'			=> 'Advanced',
@@ -164,10 +165,11 @@ return array (
 	'allow_anonymous'		=> 'Allow anonymous reading',
 	'auth_token'			=> 'Authentication token',
 	'explain_token'			=> 'Allows to access RSS output without authentication.<br />%s?token=%s',
-	'archiving_configuration'	=> 'Archiving configuration',
+	'login_configuration'	=> 'Login',
+	'archiving_configuration'	=> 'Archiving',
 	'delete_articles_every'	=> 'Remove articles after',
 	'archiving_configuration_help'	=> 'More options are available in the individual stream settings',
-	'reading_configuration'		=> 'Reading configuration',
+	'reading_configuration'		=> 'Reading',
 	'articles_per_page'		=> 'Number of articles per page',
 	'default_view'			=> 'Default view',
 	'sort_order'			=> 'Sort order',
diff --git a/app/i18n/fr.php b/app/i18n/fr.php
index b27f29940..053a97c8a 100644
--- a/app/i18n/fr.php
+++ b/app/i18n/fr.php
@@ -137,8 +137,9 @@ return array (
 	'feed_url'			=> 'URL du flux',
 	'articles'			=> 'articles',
 	'number_articles'		=> 'Nombre d’articles',
+	'by_feed'			=> 'par flux',
+	'by_default'		=> 'Par défaut',
 	'keep_history'			=> 'Nombre minimum d’articles à conserver',
-	'keep_history_help'		=> 'Mettre à -1 pour tout conserver',
 	'categorize'			=> 'Ranger dans une catégorie',
 	'truncate'			=> 'Supprimer tous les articles',
 	'advanced'			=> 'Avancé',
@@ -165,10 +166,11 @@ return array (
 	'allow_anonymous'		=> 'Autoriser la lecture anonyme',
 	'auth_token'			=> 'Jeton d’identification',
 	'explain_token'			=> 'Permet d’accéder à la sortie RSS sans besoin de s’authentifier.<br />%s?output=rss&token=%s',
-	'archiving_configuration'	=> 'Configuration de l’archivage',
+	'login_configuration'	=> 'Identification',
+	'archiving_configuration'	=> 'Archivage',
 	'delete_articles_every'	=> 'Supprimer les articles après',
 	'archiving_configuration_help'	=> 'D’autres options sont disponibles dans la configuration individuelle des flux',
-	'reading_configuration'		=> 'Configuration de lecture',
+	'reading_configuration'		=> 'Lecture',
 	'articles_per_page'		=> 'Nombre d’articles par page',
 	'default_view'			=> 'Vue par défaut',
 	'sort_order'			=> 'Ordre de tri',
diff --git a/app/views/configure/display.phtml b/app/views/configure/display.phtml
index 8995dc839..3280f657f 100644
--- a/app/views/configure/display.phtml
+++ b/app/views/configure/display.phtml
@@ -31,6 +31,15 @@
 			</div>
 		</div>
 
+		<div class="form-group form-actions">
+			<div class="group-controls">
+				<button type="submit" class="btn btn-important"><?php echo Minz_Translate::t ('save'); ?></button>
+				<button type="reset" class="btn"><?php echo Minz_Translate::t ('cancel'); ?></button>
+			</div>
+		</div>
+
+		<legend><?php echo Minz_Translate::t ('login_configuration'); ?></legend>
+
 		<div class="form-group">
 			<label class="group-name" for="mail_login"><?php echo Minz_Translate::t ('persona_connection_email'); ?></label>
 			<?php $mail = $this->conf->mailLogin (); ?>
@@ -61,22 +70,22 @@
 		</div>
 
 		<legend><?php echo Minz_Translate::t ('archiving_configuration'); ?></legend>
-
+		<p><?php echo FreshRSS_Themes::icon('help'); ?> <?php echo Minz_Translate::t('archiving_configuration_help'); ?></p>
+		
 		<div class="form-group">
 			<label class="group-name" for="old_entries"><?php echo Minz_Translate::t ('delete_articles_every'); ?></label>
 			<div class="group-controls">
-				<input type="number" id="old_entries" name="old_entries" list="list_months" min="1" max="1200" value="<?php echo $this->conf->oldEntries (); ?>" /> <?php echo Minz_Translate::t ('month'); ?>
-				<datalist id="list_months">
-					<option>1</option>
-					<option>2</option>
-					<option>3</option>
-					<option>6</option>
-					<option>12</option>
-					<option>18</option>
-					<option>24</option>
-					<option>36</option>
-				</datalist><br />
-				<?php echo FreshRSS_Themes::icon('help'); ?> <?php echo Minz_Translate::t('archiving_configuration_help'); ?>
+				<input type="number" id="old_entries" name="old_entries" min="1" max="1200" value="<?php echo $this->conf->oldEntries (); ?>" /> <?php echo Minz_Translate::t ('month'); ?>
+			</div>
+		</div>
+		<div class="form-group">
+			<label class="group-name" for="keep_history_default"><?php echo Minz_Translate::t('keep_history'), ' ', Minz_Translate::t('by_feed'); ?> (<?php echo Minz_Translate::t('by_default'); ?>)</label>
+			<div class="group-controls">
+				<select class="number" name="keep_history_default" id="keep_history_default"><?php
+					foreach (array(-3 => '', 0 => '0', 10 => '10', 50 => '50', 100 => '100', 500 => '500', 1000 => '1 000', 5000 => '5 000', 10000 => '10 000', -1 => '∞') as $v => $t) {
+						echo '<option value="' . $v . ($this->conf->keepHistoryDefault() == $v ? '" selected="selected' : '') . '">' . $t . ' </option>';
+					}
+				?></select>
 			</div>
 		</div>
 
diff --git a/app/views/configure/feed.phtml b/app/views/configure/feed.phtml
index 5940055ed..e738ab64f 100644
--- a/app/views/configure/feed.phtml
+++ b/app/views/configure/feed.phtml
@@ -52,6 +52,15 @@
 				</select>
 			</div>
 		</div>
+		<div class="form-group">
+			<label class="group-name" for="priority"><?php echo Minz_Translate::t ('show_in_all_flux'); ?></label>
+			<div class="group-controls">
+				<label class="checkbox" for="priority">
+					<input type="checkbox" name="priority" id="priority" value="10"<?php echo $this->flux->priority () > 0 ? ' checked="checked"' : ''; ?> />
+					<?php echo Minz_Translate::t ('yes'); ?>
+				</label>
+			</div>
+		</div>
 		<div class="form-group form-actions">
 			<div class="group-controls">
 				<button class="btn btn-important"><?php echo Minz_Translate::t ('save'); ?></button>
@@ -78,16 +87,11 @@
 		<div class="form-group">
 			<label class="group-name" for="keep_history"><?php echo Minz_Translate::t ('keep_history'); ?></label>
 			<div class="group-controls">
-				<input type="number" name="keep_history" id="keep_history" list="old_values" min="-1" max="1000000" value="<?php echo $this->flux->keepHistory(); ?>" />
-				<datalist id="old_values">
-					<option value="0">0</option>
-					<option value="10">10</option>
-					<option value="100">100</option>
-					<option value="1000">1 000</option>
-					<option value="10000">10 000</option>
-					<option value="-1">∞</option>
-				</datalist>
-				<?php echo FreshRSS_Themes::icon('help'); ?> <?php echo Minz_Translate::t ('keep_history_help'); ?>
+				<select class="number" name="keep_history" id="keep_history"><?php
+					foreach (array(-3 => '', -2 => Minz_Translate::t('by_default'), 0 => '0', 10 => '10', 50 => '50', 100 => '100', 500 => '500', 1000 => '1 000', 5000 => '5 000', 10000 => '10 000', -1 => '∞') as $v => $t) {
+						echo '<option value="' . $v . ($this->flux->keepHistory() === $v ? '" selected="selected' : '') . '">' . $t . '</option>';
+					}
+				?></select>
 			</div>
 		</div>
 		<div class="form-group form-actions">
@@ -97,24 +101,7 @@
 			</div>
 		</div>
 
-		<legend><?php echo Minz_Translate::t ('advanced'); ?></legend>
-		<div class="form-group">
-			<label class="group-name" for="priority"><?php echo Minz_Translate::t ('show_in_all_flux'); ?></label>
-			<div class="group-controls">
-				<label class="checkbox" for="priority">
-					<input type="checkbox" name="priority" id="priority" value="10"<?php echo $this->flux->priority () > 0 ? ' checked="checked"' : ''; ?> />
-					<?php echo Minz_Translate::t ('yes'); ?>
-				</label>
-			</div>
-		</div>
-		<div class="form-group">
-			<label class="group-name" for="path_entries"><?php echo Minz_Translate::t ('css_path_on_website'); ?></label>
-			<div class="group-controls">
-				<input type="text" name="path_entries" id="path_entries" value="<?php echo $this->flux->pathEntries (); ?>" placeholder="<?php echo Minz_Translate::t ('blank_to_disable'); ?>" />
-				<?php echo FreshRSS_Themes::icon('help'); ?> <?php echo Minz_Translate::t ('retrieve_truncated_feeds'); ?>
-			</div>
-		</div>
-
+		<legend><?php echo Minz_Translate::t ('login_configuration'); ?></legend>
 		<?php $auth = $this->flux->httpAuth (false); ?>
 		<div class="form-group">
 			<label class="group-name" for="http_user"><?php echo Minz_Translate::t ('http_username'); ?></label>
@@ -131,7 +118,24 @@
 
 		<div class="form-group form-actions">
 			<div class="group-controls">
-				<button class="btn btn-important"><?php echo Minz_Translate::t ('save'); ?></button>
+				<button type="submit" class="btn btn-important"><?php echo Minz_Translate::t ('save'); ?></button>
+				<button type="reset" class="btn"><?php echo Minz_Translate::t ('cancel'); ?></button>
+			</div>
+		</div>
+
+		<legend><?php echo Minz_Translate::t ('advanced'); ?></legend>
+		<div class="form-group">
+			<label class="group-name" for="path_entries"><?php echo Minz_Translate::t ('css_path_on_website'); ?></label>
+			<div class="group-controls">
+				<input type="text" name="path_entries" id="path_entries" value="<?php echo $this->flux->pathEntries (); ?>" placeholder="<?php echo Minz_Translate::t ('blank_to_disable'); ?>" />
+				<?php echo FreshRSS_Themes::icon('help'); ?> <?php echo Minz_Translate::t ('retrieve_truncated_feeds'); ?>
+			</div>
+		</div>
+
+		<div class="form-group form-actions">
+			<div class="group-controls">
+				<button type="submit" class="btn btn-important"><?php echo Minz_Translate::t ('save'); ?></button>
+				<button type="reset" class="btn"><?php echo Minz_Translate::t ('cancel'); ?></button>
 			</div>
 		</div>
 	</form>
diff --git a/public/install.php b/public/install.php
index 3885f143e..13abb010b 100644
--- a/public/install.php
+++ b/public/install.php
@@ -33,7 +33,7 @@ define ('SQL_FEED', 'CREATE TABLE IF NOT EXISTS `%1$sfeed` (
 	`pathEntries` varchar(511) DEFAULT NULL,
 	`httpAuth` varchar(511) DEFAULT NULL,
 	`error` boolean DEFAULT 0,
-	`keep_history` MEDIUMINT NOT NULL DEFAULT 0,
+	`keep_history` MEDIUMINT NOT NULL DEFAULT -2,	-- v0.7, -2 = default
 	`cache_nbEntries` int DEFAULT 0,	-- v0.7
 	`cache_nbUnreads` int DEFAULT 0,	-- v0.7
 	PRIMARY KEY (`id`),
@@ -93,7 +93,7 @@ FROM `%1$scategory006`
 ORDER BY id2;
 
 INSERT IGNORE INTO `%2$sfeed` (url, category, name, website, description, priority, pathEntries, httpAuth, keep_history)
-SELECT url, category2, name, website, description, priority, pathEntries, httpAuth, -1 * keep_history
+SELECT url, category2, name, website, description, priority, pathEntries, httpAuth, IF(keep_history = 1, -1, -2)
 FROM `%1$sfeed006`
 ORDER BY id2;
 
diff --git a/public/themes/default/freshrss.css b/public/themes/default/freshrss.css
index e3c4c3c3b..2b157b27a 100644
--- a/public/themes/default/freshrss.css
+++ b/public/themes/default/freshrss.css
@@ -667,6 +667,10 @@
 	padding:.5em;
 }
 
+select.number option {
+	text-align:right;
+}
+
 @media(max-width: 840px) {
 	.header,
 	.aside .btn-important,
diff --git a/public/themes/default/global.css b/public/themes/default/global.css
index 1c554d2dc..440fc6e41 100644
--- a/public/themes/default/global.css
+++ b/public/themes/default/global.css
@@ -99,6 +99,9 @@ input, select, textarea {
 	vertical-align: middle;
 	box-shadow: 0 2px 2px #eee inset;
 }
+	option {
+		padding:0 .5em 0 .5em;
+	}
 	input[type="radio"],
 	input[type="checkbox"] {
 		width: 15px !important;
diff --git a/public/themes/flat-design/freshrss.css b/public/themes/flat-design/freshrss.css
index fa1ed13e6..7e3f4c81a 100644
--- a/public/themes/flat-design/freshrss.css
+++ b/public/themes/flat-design/freshrss.css
@@ -662,6 +662,10 @@ body {
 	padding:.5em;
 }
 
+select.number option {
+	text-align:right;
+}
+
 @media(max-width: 840px) {
 	.header,
 	.aside .btn-important,
diff --git a/public/themes/flat-design/global.css b/public/themes/flat-design/global.css
index 8cf6412b3..90b59d002 100644
--- a/public/themes/flat-design/global.css
+++ b/public/themes/flat-design/global.css
@@ -101,6 +101,9 @@ input, select, textarea {
 	vertical-align: middle;
 	border-radius: 5px;
 }
+	option {
+		padding:0 .5em 0 .5em;
+	}
 	input[type="radio"],
 	input[type="checkbox"] {
 		width: 15px !important;
-- 
cgit v1.2.3


From 2788aaeb1a463012cfa90bf31f5efb4bf6ca7344 Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Thu, 26 Dec 2013 02:50:58 +0100
Subject: Problème ctype_digit qui ne marche pas sur des variables qui sont
 déjà des entiers
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/Models/Configuration.php | 16 +++++-----------
 app/Models/Entry.php         |  7 ++-----
 app/Models/Feed.php          |  7 ++++---
 3 files changed, 11 insertions(+), 19 deletions(-)

(limited to 'app/Models/Configuration.php')

diff --git a/app/Models/Configuration.php b/app/Models/Configuration.php
index 47509636f..cb2f90655 100644
--- a/app/Models/Configuration.php
+++ b/app/Models/Configuration.php
@@ -220,19 +220,13 @@ class FreshRSS_Configuration extends Minz_Model {
 	public function _sortOrder ($value) {
 		$this->sort_order = $value === 'ASC' ? 'ASC' : 'DESC';
 	}
-	public function _oldEntries ($value) {
-		if (ctype_digit ($value) && $value > 0) {
-			$this->old_entries = intval($value);
-		} else {
-			$this->old_entries = 3;
-		}
+	public function _oldEntries($value) {
+		$value = intval($value);
+		$this->old_entries = $value > 0 ? $value : 3;
 	}
 	public function _keepHistoryDefault($value) {
-		if (ctype_digit($value) && $value >= -1) {
-			$this->keep_history_default = intval($value);
-		} else {
-			$this->keep_history_default = 0;
-		}
+		$value = intval($value);
+		$this->keep_history_default = $value >= -1 ? $value : 0;
 	}
 	public function _shortcuts ($values) {
 		foreach ($values as $key => $value) {
diff --git a/app/Models/Entry.php b/app/Models/Entry.php
index ed31ef2b1..ab9605eb1 100644
--- a/app/Models/Entry.php
+++ b/app/Models/Entry.php
@@ -106,11 +106,8 @@ class FreshRSS_Entry extends Minz_Model {
 		$this->link = $value;
 	}
 	public function _date ($value) {
-		if (ctype_digit ($value)) {
-			$this->date = intval ($value);
-		} else {
-			$this->date = time ();
-		}
+		$value = intval($value);
+		$this->date = $value > 1 ? $value : time();
 	}
 	public function _isRead ($value) {
 		$this->is_read = $value;
diff --git a/app/Models/Feed.php b/app/Models/Feed.php
index dcf97d4ec..3008e33d7 100644
--- a/app/Models/Feed.php
+++ b/app/Models/Feed.php
@@ -154,7 +154,8 @@ class FreshRSS_Feed extends Minz_Model {
 		$this->lastUpdate = $value;
 	}
 	public function _priority ($value) {
-		$this->priority = ctype_digit ($value) ? intval ($value) : 10;
+		$value = intval($value);
+		$this->priority = $value >= 0 ? $value : 10;
 	}
 	public function _pathEntries ($value) {
 		$this->pathEntries = $value;
@@ -172,10 +173,10 @@ class FreshRSS_Feed extends Minz_Model {
 		$this->keep_history = $value;
 	}
 	public function _nbNotRead ($value) {
-		$this->nbNotRead = ctype_digit ($value) ? intval ($value) : -1;
+		$this->nbNotRead = intval($value);
 	}
 	public function _nbEntries ($value) {
-		$this->nbEntries = ctype_digit ($value) ? intval ($value) : -1;
+		$this->nbEntries = intval($value);
 	}
 
 	public function load () {
-- 
cgit v1.2.3


From 9ac1496d63da32524a33696187342ce061e9ef28 Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Sat, 28 Dec 2013 13:54:52 +0100
Subject: Bouge anon_access dans config.php
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

L'accès anonyme n'est pas au niveau utilisateur mais au niveau global.
Bouge FreshRSS_Configuration::conf->anonAccess() qui était stocké dans
*_user.php vers Minz_Configuration::allowAnonymous() stocké dans
config.php
Contribue à https://github.com/marienfressinaud/FreshRSS/issues/126
+ autres optimisations
Contribue à https://github.com/marienfressinaud/FreshRSS/issues/260
---
 app/Controllers/configureController.php | 11 ++++---
 app/Controllers/indexController.php     |  6 ++--
 app/Models/Configuration.php            | 12 -------
 app/Models/ConfigurationDAO.php         |  4 ---
 app/layout/header.phtml                 |  2 +-
 app/views/configure/users.phtml         |  2 +-
 app/views/index/index.phtml             |  2 +-
 data/.gitignore                         |  3 +-
 lib/Minz/Configuration.php              | 58 ++++++++++++++++++++++++++-------
 9 files changed, 61 insertions(+), 39 deletions(-)

(limited to 'app/Models/Configuration.php')

diff --git a/app/Controllers/configureController.php b/app/Controllers/configureController.php
index 487f6e4ad..dd9674588 100755
--- a/app/Controllers/configureController.php
+++ b/app/Controllers/configureController.php
@@ -398,15 +398,13 @@ class FreshRSS_configure_Controller extends Minz_ActionController {
 			$current_token = $this->view->conf->token();
 
 			$mail = Minz_Request::param('mail_login', false);
-			$anon = Minz_Request::param('anon_access', 'no');
 			$token = Minz_Request::param('token', $current_token);
+
 			$this->view->conf->_mailLogin($mail);
-			$this->view->conf->_anonAccess($anon);
 			$this->view->conf->_token($token);
 
 			$values = array(
 				'mail_login' => $this->view->conf->mailLogin(),
-				'anon_access' => $this->view->conf->anonAccess(),
 				'token' => $this->view->conf->token(),
 			);
 
@@ -415,7 +413,12 @@ class FreshRSS_configure_Controller extends Minz_ActionController {
 			Minz_Session::_param('conf', $this->view->conf);
 			Minz_Session::_param('mail', $this->view->conf->mailLogin());
 
-			// notif
+			$anon = (bool)(Minz_Request::param('anon_access', false));
+			if ($anon != Minz_Configuration::allowAnonymous()) {
+				Minz_Configuration::_allowAnonymous($anon);
+				Minz_Configuration::writeFile();
+			}
+
 			$notif = array(
 				'type' => 'good',
 				'content' => Minz_Translate::t('configuration_updated')
diff --git a/app/Controllers/indexController.php b/app/Controllers/indexController.php
index 6c0ba9058..0c229aedb 100755
--- a/app/Controllers/indexController.php
+++ b/app/Controllers/indexController.php
@@ -24,7 +24,7 @@ class FreshRSS_index_Controller extends Minz_ActionController {
 		// check if user is log in
 		if(login_is_conf ($this->view->conf) &&
 				!is_logged() &&
-				$this->view->conf->anonAccess() === 'no' &&
+				!Minz_Configuration::allowAnonymous() &&
 				!($output === 'rss' && $token_is_ok)) {
 			return;
 		}
@@ -36,8 +36,8 @@ class FreshRSS_index_Controller extends Minz_ActionController {
 			$params['search'] = urlencode ($params['search']);
 		}
 		if (login_is_conf($this->view->conf) &&
-				$this->view->conf->anonAccess() === 'no' &&
-				$token != '') {
+				!Minz_Configuration::allowAnonymous() &&
+				$token !== '') {
 			$params['token'] = $token;
 		}
 		$this->view->rss_url = array (
diff --git a/app/Models/Configuration.php b/app/Models/Configuration.php
index cb2f90655..7f4be474d 100644
--- a/app/Models/Configuration.php
+++ b/app/Models/Configuration.php
@@ -20,7 +20,6 @@ class FreshRSS_Configuration extends Minz_Model {
 	private $mark_when = array ();
 	private $sharing = array ();
 	private $theme;
-	private $anon_access;
 	private $token;
 	private $auto_load_more;
 	private $topline_read;
@@ -52,7 +51,6 @@ class FreshRSS_Configuration extends Minz_Model {
 		$this->_sharing ($confDAO->sharing);
 		$this->_theme ($confDAO->theme);
 		FreshRSS_Themes::setThemeId ($confDAO->theme);
-		$this->_anonAccess ($confDAO->anon_access);
 		$this->_token ($confDAO->token);
 		$this->_autoLoadMore ($confDAO->auto_load_more);
 		$this->_topline_read ($confDAO->topline_read);
@@ -132,9 +130,6 @@ class FreshRSS_Configuration extends Minz_Model {
 	public function theme () {
 		return $this->theme;
 	}
-	public function anonAccess () {
-		return $this->anon_access;
-	}
 	public function token () {
 		return $this->token;
 	}
@@ -283,13 +278,6 @@ class FreshRSS_Configuration extends Minz_Model {
 	public function _theme ($value) {
 		$this->theme = $value;
 	}
-	public function _anonAccess ($value) {
-		if ($value == 'yes') {
-			$this->anon_access = 'yes';
-		} else {
-			$this->anon_access = 'no';
-		}
-	}
 	public function _token ($value) {
 		$this->token = $value;
 	}
diff --git a/app/Models/ConfigurationDAO.php b/app/Models/ConfigurationDAO.php
index 91210e701..fa4d3338f 100644
--- a/app/Models/ConfigurationDAO.php
+++ b/app/Models/ConfigurationDAO.php
@@ -38,7 +38,6 @@ class FreshRSS_ConfigurationDAO extends Minz_ModelArray {
 		'print' => true
 	);
 	public $theme = 'default';
-	public $anon_access = 'no';
 	public $token = '';
 	public $auto_load_more = 'yes';
 	public $topline_read = 'yes';
@@ -108,9 +107,6 @@ class FreshRSS_ConfigurationDAO extends Minz_ModelArray {
 		if (isset ($this->array['theme'])) {
 			$this->theme = $this->array['theme'];
 		}
-		if (isset ($this->array['anon_access'])) {
-			$this->anon_access = $this->array['anon_access'];
-		}
 		if (isset ($this->array['token'])) {
 			$this->token = $this->array['token'];
 		}
diff --git a/app/layout/header.phtml b/app/layout/header.phtml
index bba22508e..aeb417a6e 100644
--- a/app/layout/header.phtml
+++ b/app/layout/header.phtml
@@ -21,7 +21,7 @@
 	<div class="item search">
 		<?php if(!login_is_conf ($this->conf) ||
 		         is_logged() ||
-		         $this->conf->anonAccess() == 'yes') { ?>
+		         Minz_Configuration::allowAnonymous()) { ?>
 		<form action="<?php echo _url ('index', 'index'); ?>" method="get">
 			<div class="stick">
 				<?php $search = Minz_Request::param ('search', ''); ?>
diff --git a/app/views/configure/users.phtml b/app/views/configure/users.phtml
index 40cce590e..c57671ef3 100644
--- a/app/views/configure/users.phtml
+++ b/app/views/configure/users.phtml
@@ -50,7 +50,7 @@
 		<div class="form-group">
 			<div class="group-controls">
 				<label class="checkbox" for="anon_access">
-					<input type="checkbox" name="anon_access" id="anon_access" value="yes"<?php echo $this->conf->anonAccess() == 'yes' ? ' checked="checked"' : ''; ?> />
+					<input type="checkbox" name="anon_access" id="anon_access" value="1"<?php echo Minz_Configuration::allowAnonymous() ? ' checked="checked"' : ''; ?> />
 					<?php echo Minz_Translate::t('allow_anonymous'); ?>
 				</label>
 			</div>
diff --git a/app/views/index/index.phtml b/app/views/index/index.phtml
index cf98060c4..2d134ba4e 100644
--- a/app/views/index/index.phtml
+++ b/app/views/index/index.phtml
@@ -7,7 +7,7 @@ $token_is_ok = ($token != '' && $token == $token_param);
 
 if(!login_is_conf ($this->conf) ||
    is_logged() ||
-   $this->conf->anonAccess() == 'yes' ||
+   Minz_Configuration::allowAnonymous() ||
    ($output == 'rss' && $token_is_ok)) {
 	if($output == 'rss') {
 		$this->renderHelper ('view/rss_view');
diff --git a/data/.gitignore b/data/.gitignore
index a8091901a..1d8393f3b 100644
--- a/data/.gitignore
+++ b/data/.gitignore
@@ -3,4 +3,5 @@ config.php
 *_user.php
 *.sqlite
 touch.txt
-no-cache.txt
\ No newline at end of file
+no-cache.txt
+*.bak
diff --git a/lib/Minz/Configuration.php b/lib/Minz/Configuration.php
index 1e8058dc2..fc0a4c2c1 100644
--- a/lib/Minz/Configuration.php
+++ b/lib/Minz/Configuration.php
@@ -52,6 +52,7 @@ class Minz_Configuration {
 	private static $delay_cache = 3600;
 	private static $default_user = '';
 	private static $current_user = '';
+	private static $allow_anonymous = false;
 
 	private static $db = array (
 		'host' => false,
@@ -99,6 +100,12 @@ class Minz_Configuration {
 	public static function isAdmin () {
 		return self::$current_user === self::$default_user;
 	}
+	public static function allowAnonymous() {
+		return self::$allow_anonymous;
+	}
+	public static function _allowAnonymous($allow = false) {
+		self::$allow_anonymous = (bool)$allow;
+	}
 
 	/**
 	 * Initialise les variables de configuration
@@ -116,8 +123,25 @@ class Minz_Configuration {
 		}
 	}
 
+	public static function writeFile() {
+		$ini_array = array(
+			'general' => array(
+				'environment' => self::$environment,
+				'use_url_rewriting' => self::$use_url_rewriting,
+				'sel_application' => self::$sel_application,
+				'base_url' => self::$base_url,
+				'title' => self::$title,
+				'default_user' => self::$default_user,
+				'allow_anonymous' => self::$allow_anonymous,
+			),
+			'db' => self::$db,
+		);
+		@rename(DATA_PATH . self::CONF_PATH_NAME, DATA_PATH . self::CONF_PATH_NAME . '.bak');
+		return file_put_contents(DATA_PATH . self::CONF_PATH_NAME, "<?php\n return " . var_export($ini_array, true) . ';');
+	}
+
 	/**
-	 * Parse un fichier de configuration de type ".ini"
+	 * Parse un fichier de configuration
 	 * @exception Minz_FileNotExistException si le CONF_PATH_NAME n'existe pas
 	 * @exception Minz_BadConfigurationException si CONF_PATH_NAME mal formaté
 	 */
@@ -158,12 +182,15 @@ class Minz_Configuration {
 
 		if (isset ($general['environment'])) {
 			switch ($general['environment']) {
+			case Minz_Configuration::SILENT:
 			case 'silent':
 				self::$environment = Minz_Configuration::SILENT;
 				break;
+			case Minz_Configuration::DEVELOPMENT:
 			case 'development':
 				self::$environment = Minz_Configuration::DEVELOPMENT;
 				break;
+			case Minz_Configuration::PRODUCTION:
 			case 'production':
 				self::$environment = Minz_Configuration::PRODUCTION;
 				break;
@@ -204,6 +231,9 @@ class Minz_Configuration {
 			self::$default_user = $general['default_user'];
 			self::$current_user = self::$default_user;
 		}
+		if (isset ($general['allow_anonymous'])) {
+			self::$allow_anonymous = (bool)($general['allow_anonymous']);
+		}
 
 		// Base de données
 		$db = false;
@@ -245,17 +275,21 @@ class Minz_Configuration {
 		}
 	}
 
-	private static function setReporting () {
-		if (self::environment () == self::DEVELOPMENT) {
-			error_reporting (E_ALL);
-			ini_set ('display_errors','On');
-			ini_set('log_errors', 'On');
-		} elseif (self::environment () == self::PRODUCTION) {
-			error_reporting(E_ALL);
-			ini_set('display_errors','Off');
-			ini_set('log_errors', 'On');
-		} else {
-			error_reporting(0);
+	private static function setReporting() {
+		switch (self::$environment) {
+			case self::PRODUCTION:
+				error_reporting(E_ALL);
+				ini_set('display_errors','Off');
+				ini_set('log_errors', 'On');
+				break;
+			case self::DEVELOPMENT:
+				error_reporting(E_ALL);
+				ini_set('display_errors','On');
+				ini_set('log_errors', 'On');
+				break;
+			case self::SILENT:
+				error_reporting(0);
+				break;
 		}
 	}
 }
-- 
cgit v1.2.3


From 96bdbafceac44af2159e6b80d3d403e0608991d9 Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Sat, 28 Dec 2013 23:09:39 +0100
Subject: Refactorisation FreshRSS_Configuration
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Implémente https://github.com/marienfressinaud/FreshRSS/issues/260
(évite les comparaisons de chaînes au profit des vrais booléens et
entiers)
Grosse simplification et réduction du code relatif à la configuration.
Supprime ConfigurationDAO.
Permet de simplifier considérablement configureController.
Évite de multiples copies des mêmes données en mémoire.
Évite de garder plusieurs versions de la configuration en mémoire
(auparavant : dans un tableau au niveau de ModelArray + au niveau de
FreshRSS_Configuration + en Session + des copies temporaires comme
ConfigurationDAO).
Ne stocke plus 'conf' en Session (n'était presque pas utilisé).
Évite de recharger plusieurs fois Translate inutilement.
Contribue à https://github.com/marienfressinaud/FreshRSS/issues/303
---
 app/Controllers/configureController.php  | 194 ++++-----------
 app/Controllers/entryController.php      |   4 +-
 app/Controllers/feedController.php       |  15 +-
 app/Controllers/indexController.php      |  14 +-
 app/FreshRSS.php                         |  17 +-
 app/Models/Configuration.php             | 397 ++++++++++++-------------------
 app/Models/ConfigurationDAO.php          | 154 ------------
 app/i18n/en.php                          |   2 +-
 app/i18n/fr.php                          |   2 +-
 app/layout/layout.phtml                  |   2 +-
 app/layout/nav_menu.phtml                |   2 +-
 app/views/configure/archiving.phtml      |   8 +-
 app/views/configure/display.phtml        |  62 ++---
 app/views/configure/sharing.phtml        |   2 +-
 app/views/configure/shortcut.phtml       |   2 +-
 app/views/configure/users.phtml          |   6 +-
 app/views/helpers/javascript_vars.phtml  |  18 +-
 app/views/helpers/view/global_view.phtml |   4 +-
 app/views/helpers/view/normal_view.phtml |  24 +-
 app/views/helpers/view/reader_view.phtml |   2 +-
 app/views/index/index.phtml              |   2 +-
 lib/Minz/Configuration.php               |   4 +-
 lib/Minz/ModelArray.php                  |  20 +-
 lib/Minz/Session.php                     |   6 +-
 lib/lib_rss.php                          |   2 +-
 25 files changed, 311 insertions(+), 654 deletions(-)
 delete mode 100644 app/Models/ConfigurationDAO.php

(limited to 'app/Models/Configuration.php')

diff --git a/app/Controllers/configureController.php b/app/Controllers/configureController.php
index f458cddf1..aabc3e4af 100755
--- a/app/Controllers/configureController.php
+++ b/app/Controllers/configureController.php
@@ -52,7 +52,6 @@ class FreshRSS_configure_Controller extends Minz_ActionController {
 				}
 			}
 
-			// notif
 			$notif = array (
 				'type' => 'good',
 				'content' => Minz_Translate::t ('categories_updated')
@@ -139,94 +138,40 @@ class FreshRSS_configure_Controller extends Minz_ActionController {
 	}
 
 	public function displayAction () {
-		if (Minz_Request::isPost ()) {
-			$current_token = $this->view->conf->token ();
-
-			$language = Minz_Request::param ('language', 'en');
-			$nb = Minz_Request::param ('posts_per_page', 10);
-			$mode = Minz_Request::param ('view_mode', 'normal');
-			$view = Minz_Request::param ('default_view', 'a');
-			$auto_load_more = Minz_Request::param ('auto_load_more', 'no');
-			$display = Minz_Request::param ('display_posts', 'no');
-			$onread_jump_next = Minz_Request::param ('onread_jump_next', 'no');
-			$lazyload = Minz_Request::param ('lazyload', 'no');
-			$sort = Minz_Request::param ('sort_order', 'DESC');
-			$openArticle = Minz_Request::param ('mark_open_article', 'no');
-			$openSite = Minz_Request::param ('mark_open_site', 'no');
-			$scroll = Minz_Request::param ('mark_scroll', 'no');
-			$reception = Minz_Request::param ('mark_upon_reception', 'no');
-			$theme = Minz_Request::param ('theme', 'default');
-			$topline_read = Minz_Request::param ('topline_read', 'no');
-			$topline_favorite = Minz_Request::param ('topline_favorite', 'no');
-			$topline_date = Minz_Request::param ('topline_date', 'no');
-			$topline_link = Minz_Request::param ('topline_link', 'no');
-			$bottomline_read = Minz_Request::param ('bottomline_read', 'no');
-			$bottomline_favorite = Minz_Request::param ('bottomline_favorite', 'no');
-			$bottomline_sharing = Minz_Request::param ('bottomline_sharing', 'no');
-			$bottomline_tags = Minz_Request::param ('bottomline_tags', 'no');
-			$bottomline_date = Minz_Request::param ('bottomline_date', 'no');
-			$bottomline_link = Minz_Request::param ('bottomline_link', 'no');
-
-			$this->view->conf->_language ($language);
-			$this->view->conf->_postsPerPage ($nb);
-			$this->view->conf->_viewMode ($mode);
-			$this->view->conf->_defaultView ($view);
-			$this->view->conf->_autoLoadMore ($auto_load_more);
-			$this->view->conf->_displayPosts ($display);
-			$this->view->conf->_onread_jump_next ($onread_jump_next);
-			$this->view->conf->_lazyload ($lazyload);
-			$this->view->conf->_sortOrder ($sort);
-			$this->view->conf->_markWhen (array (
-				'article' => $openArticle,
-				'site' => $openSite,
-				'scroll' => $scroll,
-				'reception' => $reception,
+		if (Minz_Request::isPost()) {
+			$this->view->conf->_language(Minz_Request::param('language', 'en'));
+			$this->view->conf->_posts_per_page(Minz_Request::param('posts_per_page', 10));
+			$this->view->conf->_view_mode(Minz_Request::param('view_mode', 'normal'));
+			$this->view->conf->_default_view (Minz_Request::param('default_view', 'a'));
+			$this->view->conf->_auto_load_more(Minz_Request::param('auto_load_more', false));
+			$this->view->conf->_display_posts(Minz_Request::param('display_posts', false));
+			$this->view->conf->_onread_jump_next(Minz_Request::param('onread_jump_next', false));
+			$this->view->conf->_lazyload (Minz_Request::param('lazyload', false));
+			$this->view->conf->_sort_order(Minz_Request::param('sort_order', 'DESC'));
+			$this->view->conf->_mark_when (array(
+				'article' => Minz_Request::param('mark_open_article', false),
+				'site' => Minz_Request::param('mark_open_site', false),
+				'scroll' => Minz_Request::param('mark_scroll', false),
+				'reception' => Minz_Request::param('mark_upon_reception', false),
 			));
-			$this->view->conf->_theme ($theme);
-			$this->view->conf->_topline_read ($topline_read);
-			$this->view->conf->_topline_favorite ($topline_favorite);
-			$this->view->conf->_topline_date ($topline_date);
-			$this->view->conf->_topline_link ($topline_link);
-			$this->view->conf->_bottomline_read ($bottomline_read);
-			$this->view->conf->_bottomline_favorite ($bottomline_favorite);
-			$this->view->conf->_bottomline_sharing ($bottomline_sharing);
-			$this->view->conf->_bottomline_tags ($bottomline_tags);
-			$this->view->conf->_bottomline_date ($bottomline_date);
-			$this->view->conf->_bottomline_link ($bottomline_link);
-
-			$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 (),
-				'auto_load_more' => $this->view->conf->autoLoadMore (),
-				'display_posts' => $this->view->conf->displayPosts (),
-				'onread_jump_next' => $this->view->conf->onread_jump_next (),
-				'lazyload' => $this->view->conf->lazyload (),
-				'sort_order' => $this->view->conf->sortOrder (),
-				'mark_when' => $this->view->conf->markWhen (),
-				'theme' => $this->view->conf->theme (),
-				'topline_read' => $this->view->conf->toplineRead () ? 'yes' : 'no',
-				'topline_favorite' => $this->view->conf->toplineFavorite () ? 'yes' : 'no',
-				'topline_date' => $this->view->conf->toplineDate () ? 'yes' : 'no',
-				'topline_link' => $this->view->conf->toplineLink () ? 'yes' : 'no',
-				'bottomline_read' => $this->view->conf->bottomlineRead () ? 'yes' : 'no',
-				'bottomline_favorite' => $this->view->conf->bottomlineFavorite () ? 'yes' : 'no',
-				'bottomline_sharing' => $this->view->conf->bottomlineSharing () ? 'yes' : 'no',
-				'bottomline_tags' => $this->view->conf->bottomlineTags () ? 'yes' : 'no',
-				'bottomline_date' => $this->view->conf->bottomlineDate () ? 'yes' : 'no',
-				'bottomline_link' => $this->view->conf->bottomlineLink () ? 'yes' : 'no',
-			);
-
-			$confDAO = new FreshRSS_ConfigurationDAO ();
-			$confDAO->update ($values);
-			Minz_Session::_param ('conf', $this->view->conf);
-			Minz_Session::_param ('mail', $this->view->conf->mailLogin ());
-
-			Minz_Session::_param ('language', $this->view->conf->language ());
+			$this->view->conf->_theme(Minz_Request::param('theme', 'default'));
+			$this->view->conf->_topline_read(Minz_Request::param('topline_read', false));
+			$this->view->conf->_topline_favorite(Minz_Request::param('topline_favorite', false));
+			$this->view->conf->_topline_date(Minz_Request::param('topline_date', false));
+			$this->view->conf->_topline_link(Minz_Request::param('topline_link', false));
+			$this->view->conf->_bottomline_read(Minz_Request::param('bottomline_read', false));
+			$this->view->conf->_bottomline_favorite(Minz_Request::param('bottomline_favorite', false));
+			$this->view->conf->_bottomline_sharing(Minz_Request::param('bottomline_sharing', false));
+			$this->view->conf->_bottomline_tags(Minz_Request::param('bottomline_tags', false));
+			$this->view->conf->_bottomline_date(Minz_Request::param('bottomline_date', false));
+			$this->view->conf->_bottomline_link(Minz_Request::param('bottomline_link', false));
+			$this->view->conf->save();
+
+			Minz_Session::_param ('mail', $this->view->conf->mail_login);
+
+			Minz_Session::_param ('language', $this->view->conf->language);
 			Minz_Translate::reset ();
 
-			// notif
 			$notif = array (
 				'type' => 'good',
 				'content' => Minz_Translate::t ('configuration_updated')
@@ -243,22 +188,18 @@ class FreshRSS_configure_Controller extends Minz_ActionController {
 
 	public function sharingAction () {
 		if (Minz_Request::isPost ()) {
-			$this->view->conf->_sharing (array (
-				'shaarli' => Minz_Request::param ('shaarli', ''),
-				'poche' => Minz_Request::param ('poche', ''),
-				'diaspora' => Minz_Request::param ('diaspora', ''),
-				'twitter' => Minz_Request::param ('twitter', 'no') === 'yes',
-				'g+' => Minz_Request::param ('g+', 'no') === 'yes',
-				'facebook' => Minz_Request::param ('facebook', 'no') === 'yes',
-				'email' => Minz_Request::param ('email', 'no') === 'yes',
-				'print' => Minz_Request::param ('print', 'no') === 'yes'
+			$this->view->conf->_sharing (array(
+				'shaarli' => Minz_Request::param ('shaarli', false),
+				'poche' => Minz_Request::param ('poche', false),
+				'diaspora' => Minz_Request::param ('diaspora', false),
+				'twitter' => Minz_Request::param ('twitter', false),
+				'g+' => Minz_Request::param ('g+', false),
+				'facebook' => Minz_Request::param ('facebook', false),
+				'email' => Minz_Request::param ('email', false),
+				'print' => Minz_Request::param ('print', false),
 			));
+			$this->view->conf->save();
 
-			$confDAO = new FreshRSS_ConfigurationDAO ();
-			$confDAO->update ($this->view->conf->sharing ());
-			Minz_Session::_param ('conf', $this->view->conf);
-
-			// notif
 			$notif = array (
 				'type' => 'good',
 				'content' => Minz_Translate::t ('configuration_updated')
@@ -269,9 +210,6 @@ class FreshRSS_configure_Controller extends Minz_ActionController {
 		}
 
 		Minz_View::prependTitle (Minz_Translate::t ('sharing_management') . ' - ');
-
-		$entryDAO = new FreshRSS_EntryDAO ();
-		$this->view->nb_total = $entryDAO->count ();
 	}
 
 	public function importExportAction () {
@@ -347,32 +285,20 @@ class FreshRSS_configure_Controller extends Minz_ActionController {
 		                    '9', 'f1', 'f2', 'f3', 'f4', 'f5', 'f6', 'f7', 'f8', 'f9',
 		                    'f10', 'f11', 'f12');
 		$this->view->list_keys = $list_keys;
-		$list_names = array ('mark_read', 'mark_favorite', 'go_website', 'next_entry',
-		                     'prev_entry', 'next_page', 'prev_page', 'collapse_entry',
-		                     'load_more');
 
 		if (Minz_Request::isPost ()) {
 			$shortcuts = Minz_Request::param ('shortcuts');
 			$shortcuts_ok = array ();
 
 			foreach ($shortcuts as $key => $value) {
-				if (in_array ($key, $list_names)
-				 && in_array ($value, $list_keys)) {
+				if (in_array($value, $list_keys)) {
 					$shortcuts_ok[$key] = $value;
 				}
 			}
 
 			$this->view->conf->_shortcuts ($shortcuts_ok);
+			$this->view->conf->save();
 
-			$values = array (
-				'shortcuts' => $this->view->conf->shortcuts ()
-			);
-
-			$confDAO = new FreshRSS_ConfigurationDAO ();
-			$confDAO->update ($values);
-			Minz_Session::_param ('conf', $this->view->conf);
-
-			// notif
 			$notif = array (
 				'type' => 'good',
 				'content' => Minz_Translate::t ('shortcuts_updated')
@@ -388,26 +314,20 @@ class FreshRSS_configure_Controller extends Minz_ActionController {
 	public function usersAction() {
 		if (Minz_Request::isPost()) {
 			$ok = true;
-			$current_token = $this->view->conf->token();
+			$current_token = $this->view->conf->token;
 
 			$mail = Minz_Request::param('mail_login', false);
 			$token = Minz_Request::param('token', $current_token);
 
-			$this->view->conf->_mailLogin($mail);
+			$this->view->conf->_mail_login($mail);
 			$this->view->conf->_token($token);
+			$ok &= $this->view->conf->save();
 
-			$values = array(
-				'mail_login' => $this->view->conf->mailLogin(),
-				'token' => $this->view->conf->token(),
-			);
-
-			$confDAO = new FreshRSS_ConfigurationDAO();
-			$ok &= $confDAO->update($values);
-			Minz_Session::_param('conf', $this->view->conf);
-			Minz_Session::_param('mail', $this->view->conf->mailLogin());
+			Minz_Session::_param('mail', $this->view->conf->mail_login);
 
 			if (Minz_Configuration::isAdmin()) {
-				$anon = (bool)(Minz_Request::param('anon_access', false));
+				$anon = (Minz_Request::param('anon_access', false));
+				$anon = ((bool)$anon) && ($anon !== 'no');
 				if ($anon != Minz_Configuration::allowAnonymous()) {
 					Minz_Configuration::_allowAnonymous($anon);
 					$ok &= Minz_Configuration::writeFile();
@@ -432,20 +352,10 @@ class FreshRSS_configure_Controller extends Minz_ActionController {
 			$old = Minz_Request::param('old_entries', 3);
 			$keepHistoryDefault = Minz_Request::param('keep_history_default', 0);
 
-			$this->view->conf->_oldEntries($old);
-			$this->view->conf->_keepHistoryDefault($keepHistoryDefault);
-
-			$values = array(
-				'old_entries' => $this->view->conf->oldEntries(),
-				'keep_history_default' => $this->view->conf->keepHistoryDefault(),
-			);
-
-			$confDAO = new FreshRSS_ConfigurationDAO();
-			$confDAO->update($values);
-			Minz_Session::_param('conf', $this->view->conf);
-			Minz_Session::_param('mail', $this->view->conf->mailLogin ());
+			$this->view->conf->_old_entries($old);
+			$this->view->conf->_keep_history_default($keepHistoryDefault);
+			$this->view->conf->save();
 
-			// notif
 			$notif = array(
 				'type' => 'good',
 				'content' => Minz_Translate::t('configuration_updated')
diff --git a/app/Controllers/entryController.php b/app/Controllers/entryController.php
index 9b5081894..b0fc37cdf 100755
--- a/app/Controllers/entryController.php
+++ b/app/Controllers/entryController.php
@@ -113,7 +113,7 @@ class FreshRSS_entry_Controller extends Minz_ActionController {
 	public function purgeAction() {
 		@set_time_limit(300);
 
-		$nb_month_old = max($this->view->conf->oldEntries(), 1);
+		$nb_month_old = max($this->view->conf->old_entries, 1);
 		$date_min = time() - (3600 * 24 * 30 * $nb_month_old);
 
 		$feedDAO = new FreshRSS_FeedDAO();
@@ -125,7 +125,7 @@ class FreshRSS_entry_Controller extends Minz_ActionController {
 		foreach ($feeds as $feed) {
 			$feedHistory = $feed->keepHistory();
 			if ($feedHistory == -2) {	//default
-				$feedHistory = $this->view->conf->keepHistoryDefault();
+				$feedHistory = $this->view->conf->keep_history_default;
 			}
 			if ($feedHistory >= 0) {
 				$nb = $feedDAO->cleanOldEntries($feed->id(), $date_min, $feedHistory);
diff --git a/app/Controllers/feedController.php b/app/Controllers/feedController.php
index 77d36e977..42a0dcb11 100755
--- a/app/Controllers/feedController.php
+++ b/app/Controllers/feedController.php
@@ -2,7 +2,7 @@
 
 class FreshRSS_feed_Controller extends Minz_ActionController {
 	public function firstAction () {
-		$token = $this->view->conf->token();
+		$token = $this->view->conf->token;
 		$token_param = Minz_Request::param ('token', '');
 		$token_is_ok = ($token != '' && $token == $token_param);
 		$action = Minz_Request::actionName ();
@@ -79,13 +79,13 @@ class FreshRSS_feed_Controller extends Minz_ActionController {
 						$feed->_id ($id);
 						$feed->faviconPrepare();
 
-						$is_read = $this->view->conf->markUponReception() === 'yes' ? 1 : 0;
+						$is_read = $this->view->conf->mark_when['reception'] ? 1 : 0;
 
 						$entryDAO = new FreshRSS_EntryDAO ();
 						$entries = array_reverse($feed->entries());	//We want chronological order and SimplePie uses reverse order
 
 						// on calcule la date des articles les plus anciens qu'on accepte
-						$nb_month_old = $this->view->conf->oldEntries ();
+						$nb_month_old = $this->view->conf->old_entries;
 						$date_min = time () - (3600 * 24 * 30 * $nb_month_old);
 
 						$transactionStarted = true;
@@ -182,26 +182,25 @@ class FreshRSS_feed_Controller extends Minz_ActionController {
 		}
 
 		// on calcule la date des articles les plus anciens qu'on accepte
-		$nb_month_old = max($this->view->conf->oldEntries(), 1);
+		$nb_month_old = max($this->view->conf->old_entries, 1);
 		$date_min = time () - (3600 * 24 * 30 * $nb_month_old);
 
 		$i = 0;
 		$flux_update = 0;
+		$is_read = $this->view->conf->mark_when['reception'] ? 1 : 0;
 		foreach ($feeds as $feed) {
 			try {
 				$url = $feed->url();
 				$feed->load(false);
 				$entries = array_reverse($feed->entries());	//We want chronological order and SimplePie uses reverse order
 
-				$is_read = $this->view->conf->markUponReception() === 'yes' ? 1 : 0;
-
 				//For this feed, check last n entry GUIDs already in database
 				$existingGuids = array_fill_keys ($entryDAO->listLastGuidsByFeed ($feed->id (), count($entries) + 10), 1);
 				$useDeclaredDate = empty($existingGuids);
 
 				$feedHistory = $feed->keepHistory();
 				if ($feedHistory == -2) {	//default
-					$feedHistory = $this->view->conf->keepHistoryDefault();
+					$feedHistory = $this->view->conf->keep_history_default;
 				}
 
 				// On ne vérifie pas strictement que l'article n'est pas déjà en BDD
@@ -309,7 +308,7 @@ class FreshRSS_feed_Controller extends Minz_ActionController {
 		$this->addCategories ($categories);
 
 		// on calcule la date des articles les plus anciens qu'on accepte
-		$nb_month_old = $this->view->conf->oldEntries ();
+		$nb_month_old = $this->view->conf->old_entries;
 		$date_min = time () - (3600 * 24 * 30 * $nb_month_old);
 
 		// la variable $error permet de savoir si une erreur est survenue
diff --git a/app/Controllers/indexController.php b/app/Controllers/indexController.php
index 4677787c1..54826636f 100755
--- a/app/Controllers/indexController.php
+++ b/app/Controllers/indexController.php
@@ -17,7 +17,7 @@ class FreshRSS_index_Controller extends Minz_ActionController {
 	public function indexAction () {
 		$output = Minz_Request::param ('output');
 
-		$token = $this->view->conf->token();
+		$token = $this->view->conf->token;
 		$token_param = Minz_Request::param ('token', '');
 		$token_is_ok = ($token != '' && $token === $token_param);
 
@@ -91,13 +91,13 @@ class FreshRSS_index_Controller extends Minz_ActionController {
 		);
 
 		// On récupère les différents éléments de filtrage
-		$this->view->state = $state = Minz_Request::param ('state', $this->view->conf->defaultView ());
+		$this->view->state = $state = Minz_Request::param ('state', $this->view->conf->default_view);
 		$filter = Minz_Request::param ('search', '');
 		if (!empty($filter)) {
 			$state = 'all';	//Search always in read and unread articles
 		}
-		$this->view->order = $order = Minz_Request::param ('order', $this->view->conf->sortOrder ());
-		$nb = Minz_Request::param ('nb', $this->view->conf->postsPerPage ());
+		$this->view->order = $order = Minz_Request::param ('order', $this->view->conf->sort_order);
+		$nb = Minz_Request::param ('nb', $this->view->conf->posts_per_page);
 		$first = Minz_Request::param ('next', '');
 
 		if ($state === 'not_read') {	//Any unread article in this category at all?
@@ -128,9 +128,9 @@ class FreshRSS_index_Controller extends Minz_ActionController {
 		$this->view->today = $today;
 
 		// on calcule la date des articles les plus anciens qu'on affiche
-		$nb_month_old = $this->view->conf->oldEntries ();
+		$nb_month_old = $this->view->conf->old_entries;
 		$date_min = $today - (3600 * 24 * 30 * $nb_month_old);	//Do not use a fast changing value such as time() to allow SQL caching
-		$keepHistoryDefault = $this->view->conf->keepHistoryDefault();
+		$keepHistoryDefault = $this->view->conf->keep_history_default;
 
 		try {
 			$entries = $this->entryDAO->listWhere($getType, $getId, $state, $order, $nb + 1, $first, $filter, $date_min, $keepHistoryDefault);
@@ -253,7 +253,7 @@ class FreshRSS_index_Controller extends Minz_ActionController {
 		curl_close ($ch);
 
 		$res = json_decode ($result, true);
-		if ($res['status'] === 'okay' && $res['email'] === $this->view->conf->mailLogin ()) {
+		if ($res['status'] === 'okay' && $res['email'] === $this->view->conf->mail_login) {
 			Minz_Session::_param ('mail', $res['email']);
 			invalidateHttpCache();
 		} else {
diff --git a/app/FreshRSS.php b/app/FreshRSS.php
index 60610e352..05c8ec8e0 100644
--- a/app/FreshRSS.php
+++ b/app/FreshRSS.php
@@ -2,7 +2,6 @@
 class FreshRSS extends Minz_FrontController {
 	public function init () {
 		Minz_Session::init ('FreshRSS');
-		Minz_Translate::init ();
 
 		$this->loadParamsView ();
 		$this->loadStylesAndScripts ();
@@ -11,26 +10,26 @@ class FreshRSS extends Minz_FrontController {
 
 	private function loadParamsView () {
 		try {
-			$this->conf = Minz_Session::param ('conf', new FreshRSS_Configuration ());
+			$this->conf = new FreshRSS_Configuration();
 		} catch (Minz_Exception $e) {
 			// Permission denied or conf file does not exist
 			// it's critical!
-			print $e->getMessage();
-			exit();
+			die($e->getMessage());
 		}
 
 		Minz_View::_param ('conf', $this->conf);
-		Minz_Session::_param ('language', $this->conf->language ());
+		Minz_Session::_param ('language', $this->conf->language);
+		Minz_Translate::init();
 
 		$output = Minz_Request::param ('output');
-		if(!$output) {
-			$output = $this->conf->viewMode();
+		if (!$output) {
+			$output = $this->conf->view_mode;
 			Minz_Request::_param ('output', $output);
 		}
 	}
 
 	private function loadStylesAndScripts () {
-		$theme = FreshRSS_Themes::get_infos($this->conf->theme());
+		$theme = FreshRSS_Themes::get_infos($this->conf->theme);
 		if ($theme) {
 			foreach($theme["files"] as $file) {
 				Minz_View::appendStyle (Minz_Url::display ('/themes/' . $theme['path'] . '/' . $file . '?' . @filemtime(PUBLIC_PATH . '/themes/' . $theme['path'] . '/' . $file)));
@@ -40,7 +39,7 @@ class FreshRSS extends Minz_FrontController {
 		if (login_is_conf ($this->conf)) {
 			Minz_View::appendScript ('https://login.persona.org/include.js');
 		}
-		$includeLazyLoad = $this->conf->lazyload () === 'yes' && ($this->conf->displayPosts () === 'yes' || Minz_Request::param ('output') === 'reader');
+		$includeLazyLoad = $this->conf->lazyload && ($this->conf->display_posts || Minz_Request::param ('output') === 'reader');
 		Minz_View::appendScript (Minz_Url::display ('/scripts/jquery.min.js?' . @filemtime(PUBLIC_PATH . '/scripts/jquery.min.js')), false, !$includeLazyLoad, !$includeLazyLoad);
 		if ($includeLazyLoad) {
 			Minz_View::appendScript (Minz_Url::display ('/scripts/jquery.lazyload.min.js?' . @filemtime(PUBLIC_PATH . '/scripts/jquery.lazyload.min.js')));
diff --git a/app/Models/Configuration.php b/app/Models/Configuration.php
index 7f4be474d..b0a5d9940 100644
--- a/app/Models/Configuration.php
+++ b/app/Models/Configuration.php
@@ -1,258 +1,171 @@
 <?php
 
-class FreshRSS_Configuration extends Minz_Model {
-	private $available_languages = array (
+class FreshRSS_Configuration extends Minz_ModelArray {
+	private $data = array(
+		'language' => 'en',
+		'old_entries' => 3,
+		'keep_history_default' => 0,
+		'mail_login' => '',
+		'token' => '',
+		'posts_per_page' => 20,
+		'view_mode' => 'normal',
+		'default_view' => 'not_read',
+		'auto_load_more' => true,
+		'display_posts' => false,
+		'onread_jump_next' => true,
+		'lazyload' => true,
+		'sort_order' => 'DESC',
+		'anon_access' => false,
+		'mark_when' => array(
+			'article' => true,
+			'site' => true,
+			'scroll' => false,
+			'reception' => false,
+		),
+		'theme' => 'default',
+		'shortcuts' => array(
+			'mark_read' => 'r',
+			'mark_favorite' => 'f',
+			'go_website' => 'space',
+			'next_entry' => 'j',
+			'prev_entry' => 'k',
+			'collapse_entry' => 'c',
+			'load_more' => 'm',
+		),
+		'topline_read' => true,
+		'topline_favorite' => true,
+		'topline_date' => true,
+		'topline_link' => true,
+		'bottomline_read' => true,
+		'bottomline_favorite' => true,
+		'bottomline_sharing' => true,
+		'bottomline_tags' => true,
+		'bottomline_date' => true,
+		'bottomline_link' => true,
+		'sharing' => array(
+			'shaarli' => '',
+			'poche' => '',
+			'diaspora' => '',
+			'twitter' => true,
+			'g+' => true,
+			'facebook' => true,
+			'email' => true,
+			'print' => true,
+		),
+	);
+
+	private $available_languages = array(
 		'en' => 'English',
 		'fr' => 'Français',
 	);
-	private $language;
-	private $posts_per_page;
-	private $view_mode;
-	private $default_view;
-	private $display_posts;
-	private $onread_jump_next;
-	private $lazyload;
-	private $sort_order;
-	private $old_entries;
-	private $keep_history_default;
-	private $shortcuts = array ();
-	private $mail_login = '';
-	private $mark_when = array ();
-	private $sharing = array ();
-	private $theme;
-	private $token;
-	private $auto_load_more;
-	private $topline_read;
-	private $topline_favorite;
-	private $topline_date;
-	private $topline_link;
-	private $bottomline_read;
-	private $bottomline_favorite;
-	private $bottomline_sharing;
-	private $bottomline_tags;
-	private $bottomline_date;
-	private $bottomline_link;
 
-	public function __construct () {
-		$confDAO = new FreshRSS_ConfigurationDAO ();
-		$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->_onread_jump_next ($confDAO->onread_jump_next);
-		$this->_lazyload ($confDAO->lazyload);
-		$this->_sortOrder ($confDAO->sort_order);
-		$this->_oldEntries ($confDAO->old_entries);
-		$this->_keepHistoryDefault($confDAO->keep_history_default);
-		$this->_shortcuts ($confDAO->shortcuts);
-		$this->_mailLogin ($confDAO->mail_login);
-		$this->_markWhen ($confDAO->mark_when);
-		$this->_sharing ($confDAO->sharing);
-		$this->_theme ($confDAO->theme);
-		FreshRSS_Themes::setThemeId ($confDAO->theme);
-		$this->_token ($confDAO->token);
-		$this->_autoLoadMore ($confDAO->auto_load_more);
-		$this->_topline_read ($confDAO->topline_read);
-		$this->_topline_favorite ($confDAO->topline_favorite);
-		$this->_topline_date ($confDAO->topline_date);
-		$this->_topline_link ($confDAO->topline_link);
-		$this->_bottomline_read ($confDAO->bottomline_read);
-		$this->_bottomline_favorite ($confDAO->bottomline_favorite);
-		$this->_bottomline_sharing ($confDAO->bottomline_sharing);
-		$this->_bottomline_tags ($confDAO->bottomline_tags);
-		$this->_bottomline_date ($confDAO->bottomline_date);
-		$this->_bottomline_link ($confDAO->bottomline_link);
-	}
+	public function __construct ($filename = '') {
+		if (empty($filename)) {
+			$filename = DATA_PATH . '/' . Minz_Configuration::currentUser () . '_user.php';
+		}
+		parent::__construct($filename);
+		$data = parent::loadArray();
 
-	public function availableLanguages () {
-		return $this->available_languages;
-	}
-	public function language () {
-		return $this->language;
-	}
-	public function postsPerPage () {
-		return $this->posts_per_page;
-	}
-	public function viewMode () {
-		return $this->view_mode;
-	}
-	public function defaultView () {
-		return $this->default_view;
-	}
-	public function displayPosts () {
-		return $this->display_posts;
-	}
-	public function onread_jump_next () {
-		return $this->onread_jump_next;
-	}
-	public function lazyload () {
-		return $this->lazyload;
-	}
-	public function sortOrder () {
-		return $this->sort_order;
-	}
-	public function oldEntries () {
-		return $this->old_entries;
-	}
-	public function keepHistoryDefault() {
-		return $this->keep_history_default;
-	}
-	public function shortcuts () {
-		return $this->shortcuts;
-	}
-	public function mailLogin () {
-		return $this->mail_login;
-	}
-	public function markWhen () {
-		return $this->mark_when;
-	}
-	public function markWhenArticle () {
-		return $this->mark_when['article'];
-	}
-	public function markWhenSite () {
-		return $this->mark_when['site'];
+		foreach ($data as $key => $value) {
+			if (isset($this->data[$key])) {
+				$function = '_' . $key;
+				$this->$function($value);
+			}
+		}
 	}
-	public function markWhenScroll () {
-		return $this->mark_when['scroll'];
+
+	public function save() {
+		invalidateHttpCache();
+		return parent::writeArray($this->data);
 	}
-	public function markUponReception () {
-		return $this->mark_when['reception'];
+
+	public function __get($name) {
+		if (array_key_exists($name, $this->data)) {
+			return $this->data[$name];
+		} else {
+			$trace = debug_backtrace();
+			trigger_error('Undefined FreshRSS_Configuration->' . $name . 'in ' . $trace[0]['file'] . ' line ' . $trace[0]['line'], E_USER_NOTICE);	//TODO: Use Minz exceptions
+			return null;
+		}
 	}
-	public function sharing ($key = false) {
+
+	public function sharing($key = false) {
 		if ($key === false) {
-			return $this->sharing;
-		} elseif (isset ($this->sharing[$key])) {
-			return $this->sharing[$key];
+			return $this->data['sharing'];
+		}
+		if (isset($this->data['sharing'][$key])) {
+			return $this->data['sharing'][$key];
 		}
 		return false;
 	}
-	public function theme () {
-		return $this->theme;
-	}
-	public function token () {
-		return $this->token;
-	}
-	public function autoLoadMore () {
-		return $this->auto_load_more;
-	}
-	public function toplineRead () {
-		return $this->topline_read;
-	}
-	public function toplineFavorite () {
-		return $this->topline_favorite;
-	}
-	public function toplineDate () {
-		return $this->topline_date;
-	}
-	public function toplineLink () {
-		return $this->topline_link;
-	}
-	public function bottomlineRead () {
-		return $this->bottomline_read;
-	}
-	public function bottomlineFavorite () {
-		return $this->bottomline_favorite;
-	}
-	public function bottomlineSharing () {
-		return $this->bottomline_sharing;
-	}
-	public function bottomlineTags () {
-		return $this->bottomline_tags;
-	}
-	public function bottomlineDate () {
-		return $this->bottomline_date;
-	}
-	public function bottomlineLink () {
-		return $this->bottomline_link;
+
+	public function availableLanguages() {
+		return $this->available_languages;
 	}
 
-	public function _language ($value) {
-		if (!isset ($this->available_languages[$value])) {
+	public function _language($value) {
+		if (!isset($this->available_languages[$value])) {
 			$value = 'en';
 		}
-		$this->language = $value;
+		$this->data['language'] = $value;
 	}
-	public function _postsPerPage ($value) {
+	public function _posts_per_page ($value) {
 		$value = intval($value);
-		$this->posts_per_page = $value > 0 ? $value : 10;
+		$this->data['posts_per_page'] = $value > 0 ? $value : 10;
 	}
-	public function _viewMode ($value) {
-		if ($value == 'global' || $value == 'reader') {
-			$this->view_mode = $value;
+	public function _view_mode ($value) {
+		if ($value === 'global' || $value === 'reader') {
+			$this->data['view_mode'] = $value;
 		} else {
-			$this->view_mode = 'normal';
+			$this->data['view_mode'] = 'normal';
 		}
 	}
-	public function _defaultView ($value) {
-		if ($value == 'not_read') {
-			$this->default_view = 'not_read';
-		} else {
-			$this->default_view = 'all';
-		}
+	public function _default_view ($value) {
+		$this->data['default_view'] = $value === 'all' ? 'all' : 'not_read';
 	}
-	public function _displayPosts ($value) {
-		if ($value == 'yes') {
-			$this->display_posts = 'yes';
-		} else {
-			$this->display_posts = 'no';
-		}
+	public function _display_posts ($value) {
+		$this->data['display_posts'] = ((bool)$value) && $value !== 'no';
 	}
 	public function _onread_jump_next ($value) {
-		if ($value == 'no') {
-			$this->onread_jump_next = 'no';
-		} else {
-			$this->onread_jump_next = 'yes';
-		}
+		$this->data['onread_jump_next'] = ((bool)$value) && $value !== 'no';
 	}
 	public function _lazyload ($value) {
-		if ($value == 'no') {
-			$this->lazyload = 'no';
-		} else {
-			$this->lazyload = 'yes';
-		}
+		$this->data['lazyload'] = ((bool)$value) && $value !== 'no';
 	}
-	public function _sortOrder ($value) {
-		$this->sort_order = $value === 'ASC' ? 'ASC' : 'DESC';
+	public function _sort_order ($value) {
+		$this->data['sort_order'] = $value === 'ASC' ? 'ASC' : 'DESC';
 	}
-	public function _oldEntries($value) {
+	public function _old_entries($value) {
 		$value = intval($value);
-		$this->old_entries = $value > 0 ? $value : 3;
+		$this->data['old_entries'] = $value > 0 ? $value : 3;
 	}
-	public function _keepHistoryDefault($value) {
+	public function _keep_history_default($value) {
 		$value = intval($value);
-		$this->keep_history_default = $value >= -1 ? $value : 0;
+		$this->data['keep_history_default'] = $value >= -1 ? $value : 0;
 	}
 	public function _shortcuts ($values) {
 		foreach ($values as $key => $value) {
-			$this->shortcuts[$key] = $value;
+			if (isset($this->data['shortcuts'][$key])) {
+				$this->data['shortcuts'][$key] = $value;
+			}
 		}
 	}
-	public function _mailLogin ($value) {
-		if (filter_var ($value, FILTER_VALIDATE_EMAIL)) {
+	public function _mail_login ($value) {
+		if (filter_var($value, FILTER_VALIDATE_EMAIL)) {
 			$this->mail_login = $value;
-		} elseif ($value == false) {
-			$this->mail_login = false;
+		} else {
+			$this->mail_login = '';
 		}
 	}
-	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';
-		}
-		if(!isset($values['reception'])) {
-			$values['reception'] = 'no';
+	public function _anon_access ($value) {
+		$this->data['anon_access'] = ((bool)$value) && $value !== 'no';
+	}
+	public function _mark_when ($values) {
+		foreach ($values as $key => $value) {
+			if (isset($this->data['mark_when'][$key])) {
+				$this->data['mark_when'][$key] = ((bool)$value) && $value !== 'no';
+			}
 		}
-
-		$this->mark_when['article'] = $values['article'];
-		$this->mark_when['site'] = $values['site'];
-		$this->mark_when['scroll'] = $values['scroll'];
-		$this->mark_when['reception'] = $values['reception'];
 	}
 	public function _sharing ($values) {
 		$are_url = array ('shaarli', 'poche', 'diaspora');
@@ -268,54 +181,50 @@ class FreshRSS_Configuration extends Minz_Model {
 				if (!$is_url) {
 					$value = '';
 				}
-			} elseif(!is_bool ($value)) {
+			} elseif (!is_bool($value)) {
 				$value = true;
 			}
 
-			$this->sharing[$key] = $value;
+			$this->data['sharing'][$key] = $value;
 		}
 	}
-	public function _theme ($value) {
-		$this->theme = $value;
+	public function _theme($value) {
+		$this->data['theme'] = $value;
 	}
-	public function _token ($value) {
-		$this->token = $value;
+	public function _token($value) {
+		$this->data['token'] = $value;
 	}
-	public function _autoLoadMore ($value) {
-		if ($value == 'yes') {
-			$this->auto_load_more = 'yes';
-		} else {
-			$this->auto_load_more = 'no';
-		}
+	public function _auto_load_more($value) {
+		$this->data['auto_load_more'] = ((bool)$value) && $value !== 'no';
 	}
-	public function _topline_read ($value) {
-		$this->topline_read = $value === 'yes';
+	public function _topline_read($value) {
+		$this->data['topline_read'] = ((bool)$value) && $value !== 'no';
 	}
-	public function _topline_favorite ($value) {
-		$this->topline_favorite = $value === 'yes';
+	public function _topline_favorite($value) {
+		$this->data['topline_favorite'] = ((bool)$value) && $value !== 'no';
 	}
-	public function _topline_date ($value) {
-		$this->topline_date = $value === 'yes';
+	public function _topline_date($value) {
+		$this->data['topline_date'] = ((bool)$value) && $value !== 'no';
 	}
-	public function _topline_link ($value) {
-		$this->topline_link = $value === 'yes';
+	public function _topline_link($value) {
+		$this->data['topline_link'] = ((bool)$value) && $value !== 'no';
 	}
-	public function _bottomline_read ($value) {
-		$this->bottomline_read = $value === 'yes';
+	public function _bottomline_read($value) {
+		$this->data['bottomline_read'] = ((bool)$value) && $value !== 'no';
 	}
-	public function _bottomline_favorite ($value) {
-		$this->bottomline_favorite = $value === 'yes';
+	public function _bottomline_favorite($value) {
+		$this->data['bottomline_favorite'] = ((bool)$value) && $value !== 'no';
 	}
-	public function _bottomline_sharing ($value) {
-		$this->bottomline_sharing = $value === 'yes';
+	public function _bottomline_sharing($value) {
+		$this->data['bottomline_sharing'] = ((bool)$value) && $value !== 'no';
 	}
-	public function _bottomline_tags ($value) {
-		$this->bottomline_tags = $value === 'yes';
+	public function _bottomline_tags($value) {
+		$this->data['bottomline_tags'] = ((bool)$value) && $value !== 'no';
 	}
-	public function _bottomline_date ($value) {
-		$this->bottomline_date = $value === 'yes';
+	public function _bottomline_date($value) {
+		$this->data['bottomline_date'] = ((bool)$value) && $value !== 'no';
 	}
-	public function _bottomline_link ($value) {
-		$this->bottomline_link = $value === 'yes';
+	public function _bottomline_link($value) {
+		$this->data['bottomline_link'] = ((bool)$value) && $value !== 'no';
 	}
 }
diff --git a/app/Models/ConfigurationDAO.php b/app/Models/ConfigurationDAO.php
deleted file mode 100644
index 53312f043..000000000
--- a/app/Models/ConfigurationDAO.php
+++ /dev/null
@@ -1,154 +0,0 @@
-<?php
-
-class FreshRSS_ConfigurationDAO extends Minz_ModelArray {
-	public $language = 'en';
-	public $posts_per_page = 20;
-	public $view_mode = 'normal';
-	public $default_view = 'not_read';
-	public $display_posts = 'no';
-	public $onread_jump_next = 'yes';
-	public $lazyload = 'yes';
-	public $sort_order = 'DESC';
-	public $old_entries = 3;
-	public $keep_history_default = 0;
-	public $shortcuts = array (
-		'mark_read' => 'r',
-		'mark_favorite' => 'f',
-		'go_website' => 'space',
-		'next_entry' => 'j',
-		'prev_entry' => 'k',
-		'collapse_entry' => 'c',
-		'load_more' => 'm'
-	);
-	public $mail_login = '';
-	public $mark_when = array (
-		'article' => 'yes',
-		'site' => 'yes',
-		'scroll' => 'no',
-		'reception' => 'no'
-	);
-	public $sharing = array (
-		'shaarli' => '',
-		'poche' => '',
-		'diaspora' => '',
-		'twitter' => true,
-		'g+' => true,
-		'facebook' => true,
-		'email' => true,
-		'print' => true
-	);
-	public $theme = 'default';
-	public $token = '';
-	public $auto_load_more = 'yes';
-	public $topline_read = 'yes';
-	public $topline_favorite = 'yes';
-	public $topline_date = 'yes';
-	public $topline_link = 'yes';
-	public $bottomline_read = 'yes';
-	public $bottomline_favorite = 'yes';
-	public $bottomline_sharing = 'yes';
-	public $bottomline_tags = 'yes';
-	public $bottomline_date = 'yes';
-	public $bottomline_link = 'yes';
-
-	public function __construct ($nameFile = '') {
-		if (empty($nameFile)) {
-			$nameFile = DATA_PATH . '/' . Minz_Configuration::currentUser () . '_user.php';
-		}
-		parent::__construct ($nameFile);
-
-		// TODO : simplifier ce code, une boucle for() devrait suffire !
-		if (isset ($this->array['language'])) {
-			$this->language = $this->array['language'];
-		}
-		if (isset ($this->array['posts_per_page'])) {
-			$this->posts_per_page = intval($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'];
-		}
-		if (isset ($this->array['display_posts'])) {
-			$this->display_posts = $this->array['display_posts'];
-		}
-		if (isset ($this->array['onread_jump_next'])) {
-			$this->onread_jump_next = $this->array['onread_jump_next'];
-		}
-		if (isset ($this->array['lazyload'])) {
-			$this->lazyload = $this->array['lazyload'];
-		}
-		if (isset ($this->array['sort_order'])) {
-			$this->sort_order = $this->array['sort_order'];
-		}
-		if (isset ($this->array['old_entries'])) {
-			$this->old_entries = intval($this->array['old_entries']);
-		}
-		if (isset ($this->array['keep_history_default'])) {
-			$this->keep_history_default = intval($this->array['keep_history_default']);
-		}
-		if (isset ($this->array['shortcuts'])) {
-			$this->shortcuts = array_merge (
-				$this->shortcuts, $this->array['shortcuts']
-			);
-		}
-		if (isset ($this->array['mail_login'])) {
-			$this->mail_login = $this->array['mail_login'];
-		}
-		if (isset ($this->array['mark_when'])) {
-			$this->mark_when = $this->array['mark_when'];
-		}
-		if (isset ($this->array['sharing'])) {
-			$this->sharing = array_merge (
-				$this->sharing, $this->array['sharing']
-			);
-		}
-		if (isset ($this->array['theme'])) {
-			$this->theme = $this->array['theme'];
-		}
-		if (isset ($this->array['token'])) {
-			$this->token = $this->array['token'];
-		}
-		if (isset ($this->array['auto_load_more'])) {
-			$this->auto_load_more = $this->array['auto_load_more'];
-		}
-
-		if (isset ($this->array['topline_read'])) {
-			$this->topline_read = $this->array['topline_read'];
-		}
-		if (isset ($this->array['topline_favorite'])) {
-			$this->topline_favorite = $this->array['topline_favorite'];
-		}
-		if (isset ($this->array['topline_date'])) {
-			$this->topline_date = $this->array['topline_date'];
-		}
-		if (isset ($this->array['topline_link'])) {
-			$this->topline_link = $this->array['topline_link'];
-		}
-		if (isset ($this->array['bottomline_read'])) {
-			$this->bottomline_read = $this->array['bottomline_read'];
-		}
-		if (isset ($this->array['bottomline_favorite'])) {
-			$this->bottomline_favorite = $this->array['bottomline_favorite'];
-		}
-		if (isset ($this->array['bottomline_sharing'])) {
-			$this->bottomline_sharing = $this->array['bottomline_sharing'];
-		}
-		if (isset ($this->array['bottomline_tags'])) {
-			$this->bottomline_tags = $this->array['bottomline_tags'];
-		}
-		if (isset ($this->array['bottomline_date'])) {
-			$this->bottomline_date = $this->array['bottomline_date'];
-		}
-		if (isset ($this->array['bottomline_link'])) {
-			$this->bottomline_link = $this->array['bottomline_link'];
-		}
-	}
-
-	public function update($values) {
-		$this->array = array_merge($this->array, $values);
-		invalidateHttpCache();
-		return parent::writeFile();
-	}
-}
diff --git a/app/i18n/en.php b/app/i18n/en.php
index c7ac16ae0..65afc11e5 100644
--- a/app/i18n/en.php
+++ b/app/i18n/en.php
@@ -159,7 +159,7 @@ return array (
 	'current_user'			=> 'Current user',
 	'default_user'			=> 'Username of the default user (maximum 16 alphanumeric characters)',
 	'persona_connection_email'	=> 'Login mail address (use <a href="https://persona.org/">Mozilla Persona</a>)',
-	'allow_anonymous'		=> 'Allow anonymous reading',
+	'allow_anonymous'		=> 'Allow anonymous reading for the default user (%s)',
 	'auth_token'			=> 'Authentication token',
 	'explain_token'			=> 'Allows to access RSS output without authentication.<br />%s?token=%s',
 	'login_configuration'		=> 'Login',
diff --git a/app/i18n/fr.php b/app/i18n/fr.php
index e8da1c603..adc38acbe 100644
--- a/app/i18n/fr.php
+++ b/app/i18n/fr.php
@@ -159,7 +159,7 @@ return array (
 	'current_user'			=> 'Utilisateur actuel',
 	'default_user'			=> 'Nom de l’utilisateur par défaut (16 caractères alphanumériques maximum)',
 	'persona_connection_email'	=> 'Adresse courriel de connexion (utilise <a href="https://persona.org/">Mozilla Persona</a>)',
-	'allow_anonymous'		=> 'Autoriser la lecture anonyme',
+	'allow_anonymous'		=> 'Autoriser la lecture anonyme pour l’utilisateur par défaut (%s)',
 	'auth_token'			=> 'Jeton d’identification',
 	'explain_token'			=> 'Permet d’accéder à la sortie RSS sans besoin de s’authentifier.<br />%s?output=rss&token=%s',
 	'login_configuration'		=> 'Identification',
diff --git a/app/layout/layout.phtml b/app/layout/layout.phtml
index b7c34f04e..ae75c9bdb 100644
--- a/app/layout/layout.phtml
+++ b/app/layout/layout.phtml
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html lang="<?php echo $this->conf->language (); ?>" xml:lang="<?php echo $this->conf->language (); ?>">
+<html lang="<?php echo $this->conf->language; ?>" xml:lang="<?php echo $this->conf->language; ?>">
 	<head>
 		<meta charset="UTF-8" />
 		<meta name="viewport" content="initial-scale=1.0" />
diff --git a/app/layout/nav_menu.phtml b/app/layout/nav_menu.phtml
index 1f2a7b408..37f8a426f 100644
--- a/app/layout/nav_menu.phtml
+++ b/app/layout/nav_menu.phtml
@@ -19,7 +19,7 @@
 			$string_mark = Minz_Translate::t ('mark_cat_read');
 		}
 		$nextGet = $get;
-		if (($this->conf->onread_jump_next () === 'yes') && (strlen ($get) > 2)) {
+		if ($this->conf->onread_jump_next && (strlen ($get) > 2)) {
 			$anotherUnreadId = '';
 			$foundCurrent = false;
 			switch ($get[0]) {
diff --git a/app/views/configure/archiving.phtml b/app/views/configure/archiving.phtml
index e4aacc7c6..0a68eb76c 100644
--- a/app/views/configure/archiving.phtml
+++ b/app/views/configure/archiving.phtml
@@ -10,18 +10,18 @@
 		<div class="form-group">
 			<label class="group-name" for="old_entries"><?php echo Minz_Translate::t('delete_articles_every'); ?></label>
 			<div class="group-controls">
-				<input type="number" id="old_entries" name="old_entries" min="1" max="1200" value="<?php echo $this->conf->oldEntries(); ?>" /> <?php echo Minz_Translate::t('month'); ?>
+				<input type="number" id="old_entries" name="old_entries" min="1" max="1200" value="<?php echo $this->conf->old_entries; ?>" /> <?php echo Minz_Translate::t('month'); ?>
 				  <a class="btn confirm" href="<?php echo _url('entry', 'purge'); ?>"><?php echo Minz_Translate::t('purge_now'); ?></a>
 			</div>
 		</div>
 		<div class="form-group">
-			<label class="group-name" for="keep_history_default"><?php echo Minz_Translate::t('keep_history'), ' ', Minz_Translate::t('by_feed'); ?>(<?php echo Minz_Translate::t('by_default'); ?>)</label>
+			<label class="group-name" for="keep_history_default"><?php echo Minz_Translate::t('keep_history'), ' ', Minz_Translate::t('by_feed'); ?></label>
 			<div class="group-controls">
 				<select class="number" name="keep_history_default" id="keep_history_default"><?php
 					foreach (array(-3 => '', 0 => '0', 10 => '10', 50 => '50', 100 => '100', 500 => '500', 1000 => '1 000', 5000 => '5 000', 10000 => '10 000', -1 => '∞') as $v => $t) {
-						echo '<option value="' . $v . ($this->conf->keepHistoryDefault() == $v ? '" selected="selected' : '') . '">' . $t . ' </option>';
+						echo '<option value="' . $v . ($this->conf->keep_history_default == $v ? '" selected="selected' : '') . '">' . $t . ' </option>';
 					}
-				?></select>
+				?></select> (<?php echo Minz_Translate::t('by_default'); ?>)
 			</div>
 		</div>
 
diff --git a/app/views/configure/display.phtml b/app/views/configure/display.phtml
index 800181659..11a987610 100644
--- a/app/views/configure/display.phtml
+++ b/app/views/configure/display.phtml
@@ -12,7 +12,7 @@
 				<select name="language" id="language">
 				<?php $languages = $this->conf->availableLanguages (); ?>
 				<?php foreach ($languages as $short => $lib) { ?>
-				<option value="<?php echo $short; ?>"<?php echo $this->conf->language () == $short ? ' selected="selected"' : ''; ?>><?php echo $lib; ?></option>
+				<option value="<?php echo $short; ?>"<?php echo $this->conf->language === $short ? ' selected="selected"' : ''; ?>><?php echo $lib; ?></option>
 				<?php } ?>
 				</select>
 			</div>
@@ -23,7 +23,7 @@
 			<div class="group-controls">
 				<select name="theme" id="theme">
 				<?php foreach ($this->themes as $theme) { ?>
-				<option value="<?php echo $theme['path']; ?>"<?php echo $this->conf->theme () == $theme['path'] ? ' selected="selected"' : ''; ?>>
+				<option value="<?php echo $theme['path']; ?>"<?php echo $this->conf->theme === $theme['path'] ? ' selected="selected"' : ''; ?>>
 					<?php echo $theme['name'] . ' ' . Minz_Translate::t ('by') . ' ' . $theme['author']; ?> 
 				</option>
 				<?php } ?>
@@ -43,7 +43,7 @@
 		<div class="form-group">
 			<label class="group-name" for="posts_per_page"><?php echo Minz_Translate::t ('articles_per_page'); ?></label>
 			<div class="group-controls">
-				<input type="number" id="posts_per_page" name="posts_per_page" value="<?php echo $this->conf->postsPerPage (); ?>" />
+				<input type="number" id="posts_per_page" name="posts_per_page" value="<?php echo $this->conf->posts_per_page; ?>" />
 			</div>
 		</div>
 
@@ -51,8 +51,8 @@
 			<label class="group-name" for="sort_order"><?php echo Minz_Translate::t ('sort_order'); ?></label>
 			<div class="group-controls">
 				<select name="sort_order" id="sort_order">
-					<option value="DESC"<?php echo $this->conf->sortOrder () === 'DESC' ? ' selected="selected"' : ''; ?>><?php echo Minz_Translate::t ('newer_first'); ?></option>
-					<option value="ASC"<?php echo $this->conf->sortOrder () === 'ASC' ? ' selected="selected"' : ''; ?>><?php echo Minz_Translate::t ('older_first'); ?></option>
+					<option value="DESC"<?php echo $this->conf->sort_order === 'DESC' ? ' selected="selected"' : ''; ?>><?php echo Minz_Translate::t ('newer_first'); ?></option>
+					<option value="ASC"<?php echo $this->conf->sort_order === 'ASC' ? ' selected="selected"' : ''; ?>><?php echo Minz_Translate::t ('older_first'); ?></option>
 				</select>
 			</div>
 		</div>
@@ -61,16 +61,16 @@
 			<label class="group-name" for="view_mode"><?php echo Minz_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 Minz_Translate::t ('normal_view'); ?></option>
-					<option value="reader"<?php echo $this->conf->viewMode () == 'reader' ? ' selected="selected"' : ''; ?>><?php echo Minz_Translate::t ('reader_view'); ?></option>
-					<option value="global"<?php echo $this->conf->viewMode () == 'global' ? ' selected="selected"' : ''; ?>><?php echo Minz_Translate::t ('global_view'); ?></option>
+					<option value="normal"<?php echo $this->conf->view_mode === 'normal' ? ' selected="selected"' : ''; ?>><?php echo Minz_Translate::t ('normal_view'); ?></option>
+					<option value="reader"<?php echo $this->conf->view_mode === 'reader' ? ' selected="selected"' : ''; ?>><?php echo Minz_Translate::t ('reader_view'); ?></option>
+					<option value="global"<?php echo $this->conf->view_mode === 'global' ? ' selected="selected"' : ''; ?>><?php echo Minz_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"' : ''; ?> />
+					<input type="radio" name="default_view" id="radio_all" value="all"<?php echo $this->conf->default_view === 'all' ? ' checked="checked"' : ''; ?> />
 					<?php echo Minz_Translate::t ('show_all_articles'); ?>
 				</label>
 				<label class="radio" for="radio_not_read">
-					<input type="radio" name="default_view" id="radio_not_read" value="not_read"<?php echo $this->conf->defaultView () == 'not_read' ? ' checked="checked"' : ''; ?> />
+					<input type="radio" name="default_view" id="radio_not_read" value="not_read"<?php echo $this->conf->default_view === 'not_read' ? ' checked="checked"' : ''; ?> />
 					<?php echo Minz_Translate::t ('show_not_reads'); ?>
 				</label>
 			</div>
@@ -79,9 +79,9 @@
 		<div class="form-group">
 			<div class="group-controls">
 				<label class="checkbox" for="auto_load_more">
-					<input type="checkbox" name="auto_load_more" id="auto_load_more" value="yes"<?php echo $this->conf->autoLoadMore () == 'yes' ? ' checked="checked"' : ''; ?> />
+					<input type="checkbox" name="auto_load_more" id="auto_load_more" value="1"<?php echo $this->conf->auto_load_more ? ' checked="checked"' : ''; ?> />
 					<?php echo Minz_Translate::t ('auto_load_more'); ?>
-					<?php echo $this->conf->displayPosts () == 'no' ? '<noscript> - <b>' . Minz_Translate::t ('javascript_should_be_activated') . '</b></noscript>' : ''; ?>
+					<noscript> - <strong><?php echo Minz_Translate::t ('javascript_should_be_activated'); ?></strong></noscript>
 				</label>
 			</div>
 		</div>
@@ -89,9 +89,9 @@
 		<div class="form-group">
 			<div class="group-controls">
 				<label class="checkbox" for="display_posts">
-					<input type="checkbox" name="display_posts" id="display_posts" value="yes"<?php echo $this->conf->displayPosts () == 'yes' ? ' checked="checked"' : ''; ?> />
+					<input type="checkbox" name="display_posts" id="display_posts" value="1"<?php echo $this->conf->display_posts ? ' checked="checked"' : ''; ?> />
 					<?php echo Minz_Translate::t ('display_articles_unfolded'); ?>
-					<?php echo $this->conf->displayPosts () == 'no' ? '<noscript> - <b>' . Minz_Translate::t ('javascript_should_be_activated') . '</b></noscript>' : ''; ?>
+					<noscript> - <strong><?php echo Minz_Translate::t ('javascript_should_be_activated'); ?></strong></noscript>
 				</label>
 			</div>
 		</div>
@@ -99,9 +99,9 @@
 		<div class="form-group">
 			<div class="group-controls">
 				<label class="checkbox" for="lazyload">
-					<input type="checkbox" name="lazyload" id="lazyload" value="yes"<?php echo $this->conf->lazyload () == 'yes' ? ' checked="checked"' : ''; ?> />
+					<input type="checkbox" name="lazyload" id="lazyload" value="1"<?php echo $this->conf->lazyload ? ' checked="checked"' : ''; ?> />
 					<?php echo Minz_Translate::t ('img_with_lazyload'); ?>
-					<?php echo $this->conf->lazyload () == 'yes' ? '<noscript> - <b>' . Minz_Translate::t ('javascript_should_be_activated') . '</b></noscript>' : ''; ?>
+					<noscript> - <strong><?php echo Minz_Translate::t ('javascript_should_be_activated'); ?></strong></noscript>
 				</label>
 			</div>
 		</div>
@@ -110,19 +110,19 @@
 			<label class="group-name"><?php echo Minz_Translate::t ('auto_read_when'); ?></label>
 			<div class="group-controls">
 				<label class="checkbox" for="check_open_article">
-					<input type="checkbox" name="mark_open_article" id="check_open_article" value="yes"<?php echo $this->conf->markWhenArticle () == 'yes' ? ' checked="checked"' : ''; ?> />
+					<input type="checkbox" name="mark_open_article" id="check_open_article" value="1"<?php echo $this->conf->mark_when['article'] ? ' checked="checked"' : ''; ?> />
 					<?php echo Minz_Translate::t ('article_selected'); ?>
 				</label>
 				<label class="checkbox" for="check_open_site">
-					<input type="checkbox" name="mark_open_site" id="check_open_site" value="yes"<?php echo $this->conf->markWhenSite () == 'yes' ? ' checked="checked"' : ''; ?> />
+					<input type="checkbox" name="mark_open_site" id="check_open_site" value="1"<?php echo $this->conf->mark_when['site'] ? ' checked="checked"' : ''; ?> />
 					<?php echo Minz_Translate::t ('article_open_on_website'); ?>
 				</label>
 				<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"' : ''; ?> />
+					<input type="checkbox" name="mark_scroll" id="check_scroll" value="1"<?php echo $this->conf->mark_when['scroll'] ? ' checked="checked"' : ''; ?> />
 					<?php echo Minz_Translate::t ('scroll'); ?>
 				</label>
 				<label class="checkbox" for="check_reception">
-					<input type="checkbox" name="mark_upon_reception" id="check_reception" value="yes"<?php echo $this->conf->markUponReception () == 'yes' ? ' checked="checked"' : ''; ?> />
+					<input type="checkbox" name="mark_upon_reception" id="check_reception" value="1"<?php echo $this->conf->mark_when['reception'] ? ' checked="checked"' : ''; ?> />
 					<?php echo Minz_Translate::t ('upon_reception'); ?>
 				</label>
 			</div>
@@ -132,7 +132,7 @@
 			<label class="group-name"><?php echo Minz_Translate::t ('after_onread'); ?></label>
 			<div class="group-controls">
 				<label class="checkbox" for="onread_jump_next">
-					<input type="checkbox" name="onread_jump_next" id="onread_jump_next" value="yes"<?php echo $this->conf->onread_jump_next () == 'yes' ? ' checked="checked"' : ''; ?> />
+					<input type="checkbox" name="onread_jump_next" id="onread_jump_next" value="1"<?php echo $this->conf->onread_jump_next ? ' checked="checked"' : ''; ?> />
 					<?php echo Minz_Translate::t ('jump_next'); ?>
 				</label>
 			</div>
@@ -162,20 +162,20 @@
 				<tbody>
 					<tr>
 						<th><?php echo Minz_Translate::t ('top_line'); ?></th>
-						<td><input type="checkbox" name="topline_read" value="yes"<?php echo $this->conf->toplineRead () ? ' checked="checked"' : ''; ?> /></td>
-						<td><input type="checkbox" name="topline_favorite" value="yes"<?php echo $this->conf->toplineFavorite () ? ' checked="checked"' : ''; ?> /></td>
+						<td><input type="checkbox" name="topline_read" value="1"<?php echo $this->conf->topline_read ? ' checked="checked"' : ''; ?> /></td>
+						<td><input type="checkbox" name="topline_favorite" value="1"<?php echo $this->conf->topline_favorite ? ' checked="checked"' : ''; ?> /></td>
 						<td><input type="checkbox" disabled="disabled" /></td>
 						<td><input type="checkbox" disabled="disabled" /></td>
-						<td><input type="checkbox" name="topline_date" value="yes"<?php echo $this->conf->toplineDate () ? ' checked="checked"' : ''; ?> /></td>
-						<td><input type="checkbox" name="topline_link" value="yes"<?php echo $this->conf->toplineLink () ? ' checked="checked"' : ''; ?> /></td>
+						<td><input type="checkbox" name="topline_date" value="1"<?php echo $this->conf->topline_date ? ' checked="checked"' : ''; ?> /></td>
+						<td><input type="checkbox" name="topline_link" value="1"<?php echo $this->conf->topline_link ? ' checked="checked"' : ''; ?> /></td>
 					</tr><tr>
 						<th><?php echo Minz_Translate::t ('bottom_line'); ?></th>
-						<td><input type="checkbox" name="bottomline_read" value="yes"<?php echo $this->conf->bottomlineRead () ? ' checked="checked"' : ''; ?> /></td>
-						<td><input type="checkbox" name="bottomline_favorite" value="yes"<?php echo $this->conf->bottomlineFavorite () ? ' checked="checked"' : ''; ?> /></td>
-						<td><input type="checkbox" name="bottomline_sharing" value="yes"<?php echo $this->conf->bottomlineSharing () ? ' checked="checked"' : ''; ?> /></td>
-						<td><input type="checkbox" name="bottomline_tags" value="yes"<?php echo $this->conf->bottomlineTags () ? ' checked="checked"' : ''; ?> /></td>
-						<td><input type="checkbox" name="bottomline_date" value="yes"<?php echo $this->conf->bottomlineDate () ? ' checked="checked"' : ''; ?> /></td>
-						<td><input type="checkbox" name="bottomline_link" value="yes"<?php echo $this->conf->bottomlineLink () ? ' checked="checked"' : ''; ?> /></td>
+						<td><input type="checkbox" name="bottomline_read" value="1"<?php echo $this->conf->bottomline_read ? ' checked="checked"' : ''; ?> /></td>
+						<td><input type="checkbox" name="bottomline_favorite" value="1"<?php echo $this->conf->bottomline_favorite ? ' checked="checked"' : ''; ?> /></td>
+						<td><input type="checkbox" name="bottomline_sharing" value="1"<?php echo $this->conf->bottomline_sharing ? ' checked="checked"' : ''; ?> /></td>
+						<td><input type="checkbox" name="bottomline_tags" value="1"<?php echo $this->conf->bottomline_tags ? ' checked="checked"' : ''; ?> /></td>
+						<td><input type="checkbox" name="bottomline_date" value="1"<?php echo $this->conf->bottomline_date ? ' checked="checked"' : ''; ?> /></td>
+						<td><input type="checkbox" name="bottomline_link" value="1"<?php echo $this->conf->bottomline_link ? ' checked="checked"' : ''; ?> /></td>
 					</tr>
 				</tbody>
 			</table><br />
diff --git a/app/views/configure/sharing.phtml b/app/views/configure/sharing.phtml
index 825537fc9..c6a96b48a 100644
--- a/app/views/configure/sharing.phtml
+++ b/app/views/configure/sharing.phtml
@@ -47,7 +47,7 @@
 					foreach ($services as $service) {
 				?>
 				<label class="checkbox" for="<?php echo $service; ?>">
-					<input type="checkbox" name="<?php echo $service; ?>" id="<?php echo $service; ?>" value="yes"<?php echo $this->conf->sharing ($service) ? ' checked="checked"' : ''; ?> />
+					<input type="checkbox" name="<?php echo $service; ?>" id="<?php echo $service; ?>" value="1"<?php echo $this->conf->sharing($service) ? ' checked="checked"' : ''; ?> />
 					<?php echo Minz_Translate::t ($service); ?>
 				</label>
 				<?php } ?>
diff --git a/app/views/configure/shortcut.phtml b/app/views/configure/shortcut.phtml
index e78d91820..2e564a7b6 100644
--- a/app/views/configure/shortcut.phtml
+++ b/app/views/configure/shortcut.phtml
@@ -9,7 +9,7 @@
 		<?php } ?>
 	</datalist>
 
-	<?php $s = $this->conf->shortcuts (); ?>
+	<?php $s = $this->conf->shortcuts; ?>
 
 	<form method="post" action="<?php echo _url ('configure', 'shortcut'); ?>">
 		<legend><?php echo Minz_Translate::t ('shortcuts_management'); ?></legend>
diff --git a/app/views/configure/users.phtml b/app/views/configure/users.phtml
index c57671ef3..4fd291ba3 100644
--- a/app/views/configure/users.phtml
+++ b/app/views/configure/users.phtml
@@ -20,7 +20,7 @@
 
 		<div class="form-group">
 			<label class="group-name" for="mail_login"><?php echo Minz_Translate::t('persona_connection_email'); ?></label>
-			<?php $mail = $this->conf->mailLogin(); ?>
+			<?php $mail = $this->conf->mail_login; ?>
 			<div class="group-controls">
 				<input type="email" id="mail_login" name="mail_login" value="<?php echo $mail ? $mail : ''; ?>" placeholder="<?php echo Minz_Translate::t('blank_to_disable'); ?>" />
 				<noscript><b><?php echo Minz_Translate::t('javascript_should_be_activated'); ?></b></noscript>
@@ -29,7 +29,7 @@
 
 		<div class="form-group">
 			<label class="group-name" for="token"><?php echo Minz_Translate::t('auth_token'); ?></label>
-			<?php $token = $this->conf->token(); ?>
+			<?php $token = $this->conf->token; ?>
 			<div class="group-controls">
 				<input type="text" id="token" name="token" value="<?php echo $token; ?>"  placeholder="<?php echo Minz_Translate::t('blank_to_disable'); ?>"/>
 				<?php echo FreshRSS_Themes::icon('help'); ?> <?php echo Minz_Translate::t('explain_token', Minz_Url::display(null, 'html', true), $token); ?>
@@ -51,7 +51,7 @@
 			<div class="group-controls">
 				<label class="checkbox" for="anon_access">
 					<input type="checkbox" name="anon_access" id="anon_access" value="1"<?php echo Minz_Configuration::allowAnonymous() ? ' checked="checked"' : ''; ?> />
-					<?php echo Minz_Translate::t('allow_anonymous'); ?>
+					<?php echo Minz_Translate::t('allow_anonymous', Minz_Configuration::defaultUser()); ?>
 				</label>
 			</div>
 		</div>
diff --git a/app/views/helpers/javascript_vars.phtml b/app/views/helpers/javascript_vars.phtml
index d008e2e48..8f508487c 100644
--- a/app/views/helpers/javascript_vars.phtml
+++ b/app/views/helpers/javascript_vars.phtml
@@ -1,16 +1,16 @@
 <?php
 	echo '"use strict";', "\n";
-	$mark = $this->conf->markWhen ();
+	$mark = $this->conf->mark_when;
 	echo 'var ',
-		'hide_posts=', ($this->conf->displayPosts () === 'yes' || Minz_Request::param ('output') === 'reader') ? 'false' : 'true',
-		',auto_mark_article=', $mark['article'] === 'yes' ? 'true' : 'false',
-		',auto_mark_site=', $mark['site'] === 'yes' ? 'true' : 'false',
-		',auto_mark_scroll=', $mark['scroll'] === 'yes' ? 'true' : 'false',
-		',auto_load_more=', $this->conf->autoLoadMore () === 'yes' ? 'true' : 'false',
-		',full_lazyload=', $this->conf->lazyload () === 'yes' && ($this->conf->displayPosts () === 'yes' || Minz_Request::param ('output') === 'reader') ? 'true' : 'false',
-		',does_lazyload=', $this->conf->lazyload() === 'yes' ? 'true' : 'false';
+		'hide_posts=', ($this->conf->display_posts || Minz_Request::param('output') === 'reader') ? 'false' : 'true',
+		',auto_mark_article=', $mark['article'] ? 'true' : 'false',
+		',auto_mark_site=', $mark['site'] ? 'true' : 'false',
+		',auto_mark_scroll=', $mark['scroll'] ? 'true' : 'false',
+		',auto_load_more=', $this->conf->auto_load_more ? 'true' : 'false',
+		',full_lazyload=', $this->conf->lazyload && ($this->conf->display_posts || Minz_Request::param('output') === 'reader') ? 'true' : 'false',
+		',does_lazyload=', $this->conf->lazyload ? 'true' : 'false';
 
-	$s = $this->conf->shortcuts ();
+	$s = $this->conf->shortcuts;
 	echo ',shortcuts={',
 			'mark_read:"', $s['mark_read'], '",',
 			'mark_favorite:"', $s['mark_favorite'], '",',
diff --git a/app/views/helpers/view/global_view.phtml b/app/views/helpers/view/global_view.phtml
index bc6e24e37..58ff13d4e 100644
--- a/app/views/helpers/view/global_view.phtml
+++ b/app/views/helpers/view/global_view.phtml
@@ -31,6 +31,6 @@
 </div>
 
 <div id="overlay"></div>
-<div id="panel"<?php echo $this->conf->displayPosts () === 'no' ? ' class="hide_posts"' : ''; ?>>
+<div id="panel"<?php echo $this->conf->display_posts ? '' : ' class="hide_posts"'; ?>>
 	<a class="close" href="#"><?php echo FreshRSS_Themes::icon('close'); ?></a>
-</div>
\ No newline at end of file
+</div>
diff --git a/app/views/helpers/view/normal_view.phtml b/app/views/helpers/view/normal_view.phtml
index 4307c2113..f59cae2b8 100644
--- a/app/views/helpers/view/normal_view.phtml
+++ b/app/views/helpers/view/normal_view.phtml
@@ -18,8 +18,8 @@ if (!empty($this->entries)) {
 	$email = $this->conf->sharing ('email');
 	$print = $this->conf->sharing ('print');
 	$today = $this->today;
-	$hidePosts = $this->conf->displayPosts() === 'no';
-	$lazyload = $this->conf->lazyload() === 'yes';
+	$hidePosts = !$this->conf->display_posts;
+	$lazyload = $this->conf->lazyload;
 ?>
 
 <div id="stream" class="normal<?php echo $hidePosts ? ' hide_posts' : ''; ?>">
@@ -49,13 +49,13 @@ if (!empty($this->entries)) {
 	<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 ($logged) {
-				if ($this->conf->toplineRead ()) {
+				if ($this->conf->topline_read) {
 					?><li class="item manage"><?php
 						?><a class="read" href="<?php echo _url ('entry', 'read', 'id', $item->id (), 'is_read', $item->isRead () ? 0 : 1); ?>"><?php
 							echo FreshRSS_Themes::icon($item->isRead () ? 'read' : 'unread'); ?></a><?php
 					?></li><?php
 				}
-				if ($this->conf->toplineFavorite ()) {
+				if ($this->conf->topline_favorite) {
 					 ?><li class="item manage"><?php
 						?><a class="bookmark" href="<?php echo _url ('entry', 'bookmark', 'id', $item->id (), 'is_favorite', $item->isFavorite () ? 0 : 1); ?>"><?php
 							echo FreshRSS_Themes::icon($item->isFavorite () ? 'starred' : 'non-starred'); ?></a><?php
@@ -67,8 +67,8 @@ if (!empty($this->entries)) {
 			?>
 			<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"><a target="_blank" href="<?php echo $item->link (); ?>"><?php echo $item->title (); ?></a></li>
-			<?php if ($this->conf->toplineDate ()) { ?><li class="item date"><?php echo $item->date (); ?> </li><?php } ?>
-			<?php if ($this->conf->toplineLink ()) { ?><li class="item link"><a target="_blank" href="<?php echo $item->link (); ?>"><?php echo FreshRSS_Themes::icon('link'); ?></a></li><?php } ?>
+			<?php if ($this->conf->topline_date) { ?><li class="item date"><?php echo $item->date (); ?> </li><?php } ?>
+			<?php if ($this->conf->topline_link) { ?><li class="item link"><a target="_blank" href="<?php echo $item->link (); ?>"><?php echo FreshRSS_Themes::icon('link'); ?></a></li><?php } ?>
 		</ul>
 
 		<div class="flux_content">
@@ -86,13 +86,13 @@ if (!empty($this->entries)) {
 			</div>
 			<ul class="horizontal-list bottom"><?php
 				if ($logged) {
-					if ($this->conf->bottomlineRead ()) {
+					if ($this->conf->bottomline_read) {
 						?><li class="item manage"><?php
 							?><a class="read" href="<?php echo _url ('entry', 'read', 'id', $item->id (), 'is_read', $item->isRead () ? 0 : 1); ?>"><?php
 								echo FreshRSS_Themes::icon($item->isRead () ? 'read' : 'unread'); ?></a><?php
 						?></li><?php
 					}
-					if ($this->conf->bottomlineFavorite ()) {
+					if ($this->conf->bottomline_favorite) {
 						?><li class="item manage"><?php
 							?><a class="bookmark" href="<?php echo _url ('entry', 'bookmark', 'id', $item->id (), 'is_favorite', $item->isFavorite () ? 0 : 1); ?>"><?php
 								echo FreshRSS_Themes::icon($item->isFavorite () ? 'starred' : 'non-starred'); ?></a><?php
@@ -101,7 +101,7 @@ if (!empty($this->entries)) {
 				} ?>
 				<li class="item">
 					<?php
-						if ($this->conf->bottomlineSharing () && (
+						if ($this->conf->bottomline_sharing && (
 								$shaarli || $poche || $diaspora || $twitter ||
 								$google_plus || $facebook || $email
 							)) {
@@ -171,7 +171,7 @@ if (!empty($this->entries)) {
 					<?php } ?>
 				</li>
 				<?php
-					$tags = $this->conf->bottomlineTags () ? $item->tags() : null;
+					$tags = $this->conf->bottomline_tags ? $item->tags() : null;
 					if (!empty($tags)) {
 				?>
 				<li class="item">
@@ -190,8 +190,8 @@ if (!empty($this->entries)) {
 					</div>
 				</li>
 				<?php } ?>
-				<?php if ($this->conf->bottomlineDate ()) { ?><li class="item date"><?php echo $item->date (); ?> </li><?php } ?>
-				<?php if ($this->conf->bottomlineLink ()) { ?><li class="item link"><a target="_blank" href="<?php echo $item->link (); ?>"><?php echo FreshRSS_Themes::icon('link'); ?></a></li><?php } ?>
+				<?php if ($this->conf->bottomline_date) { ?><li class="item date"><?php echo $item->date (); ?> </li><?php } ?>
+				<?php if ($this->conf->bottomline_link) { ?><li class="item link"><a target="_blank" href="<?php echo $item->link (); ?>"><?php echo FreshRSS_Themes::icon('link'); ?></a></li><?php } ?>
 			</ul>
 		</div>
 	</div>
diff --git a/app/views/helpers/view/reader_view.phtml b/app/views/helpers/view/reader_view.phtml
index 47254f74e..2f64e672a 100644
--- a/app/views/helpers/view/reader_view.phtml
+++ b/app/views/helpers/view/reader_view.phtml
@@ -2,7 +2,7 @@
 $this->partial ('nav_menu');
 
 if (!empty($this->entries)) {
-	$lazyload = $this->conf->lazyload() === 'yes';
+	$lazyload = $this->conf->lazyload;
 ?>
 
 <div id="stream" class="reader">
diff --git a/app/views/index/index.phtml b/app/views/index/index.phtml
index 2d134ba4e..4db53e2a5 100644
--- a/app/views/index/index.phtml
+++ b/app/views/index/index.phtml
@@ -1,7 +1,7 @@
 <?php
 
 $output = Minz_Request::param ('output', 'normal');
-$token = $this->conf->token();
+$token = $this->conf->token;
 $token_param = Minz_Request::param ('token', '');
 $token_is_ok = ($token != '' && $token == $token_param);
 
diff --git a/lib/Minz/Configuration.php b/lib/Minz/Configuration.php
index 306328904..3864a9335 100644
--- a/lib/Minz/Configuration.php
+++ b/lib/Minz/Configuration.php
@@ -225,14 +225,14 @@ class Minz_Configuration {
 			}
 		}
 		if (isset ($general['delay_cache'])) {
-			self::$delay_cache = $general['delay_cache'];
+			self::$delay_cache = inval($general['delay_cache']);
 		}
 		if (isset ($general['default_user'])) {
 			self::$default_user = $general['default_user'];
 			self::$current_user = self::$default_user;
 		}
 		if (isset ($general['allow_anonymous'])) {
-			self::$allow_anonymous = (bool)($general['allow_anonymous']);
+			self::$allow_anonymous = ((bool)($general['allow_anonymous'])) && ($general['allow_anonymous'] !== 'no');
 		}
 
 		// Base de données
diff --git a/lib/Minz/ModelArray.php b/lib/Minz/ModelArray.php
index 89d7f06c1..e3ec77dc9 100644
--- a/lib/Minz/ModelArray.php
+++ b/lib/Minz/ModelArray.php
@@ -8,11 +8,6 @@
  * La classe Model_array représente le modèle interragissant avec les fichiers de type texte gérant des tableaux php
  */
 class Minz_ModelArray {
-	/**
-	 * $array Le tableau php contenu dans le fichier $filename
-	 */
-	protected $array = array ();
-
 	/**
 	 * $filename est le nom du fichier
 	 */
@@ -25,29 +20,32 @@ class Minz_ModelArray {
 	 */
 	public function __construct ($filename) {
 		$this->filename = $filename;
+	}
 
+	protected function loadArray() {
 		if (!file_exists($this->filename)) {
 			throw new Minz_FileNotExistException($this->filename, Minz_Exception::WARNING);
 		}
 		elseif (($handle = $this->getLock()) === false) {
 			throw new Minz_PermissionDeniedException($this->filename);
 		} else {
-			$this->array = include($this->filename);
+			$data = include($this->filename);
 			$this->releaseLock($handle);
 
-			if ($this->array === false) {
+			if ($data === false) {
 				throw new Minz_PermissionDeniedException($this->filename);
-			} elseif (!is_array($this->array)) {
-				$this->array = array();
+			} elseif (!is_array($data)) {
+				$data = array();
 			}
+			return $data;
 		}
 	}
 
 	/**
 	 * Sauve le tableau $array dans le fichier $filename
 	 **/
-	protected function writeFile() {
-		if (!file_put_contents($this->filename, "<?php\n return " . var_export($this->array, true) . ';', LOCK_EX)) {
+	protected function writeArray($array) {
+		if (!file_put_contents($this->filename, "<?php\n return " . var_export($array, true) . ';', LOCK_EX)) {
 			throw new Minz_PermissionDeniedException($this->filename);
 		}
 		return true;
diff --git a/lib/Minz/Session.php b/lib/Minz/Session.php
index f527322f5..6e45fd226 100644
--- a/lib/Minz/Session.php
+++ b/lib/Minz/Session.php
@@ -55,11 +55,6 @@ class Minz_Session {
 		} else {
 			$_SESSION[$p] = $v;
 			self::$session[$p] = $v;
-
-			if($p == 'language') {
-				// reset pour remettre à jour le fichier de langue à utiliser
-				Minz_Translate::reset ();
-			}
 		}
 	}
 
@@ -76,6 +71,7 @@ class Minz_Session {
 
 		if (!$force) {
 			self::_param ('language', $language);
+			Minz_Translate::reset ();
 		}
 	}
 }
diff --git a/lib/lib_rss.php b/lib/lib_rss.php
index a27ef171a..3f55c7d58 100644
--- a/lib/lib_rss.php
+++ b/lib/lib_rss.php
@@ -63,7 +63,7 @@ function is_logged () {
 
 // vérifie que le système d'authentification est configuré
 function login_is_conf ($conf) {
-	return $conf->mailLogin () != false;
+	return $conf->mail_login != '';
 }
 
 // tiré de Shaarli de Seb Sauvage	//Format RFC 4648 base64url
-- 
cgit v1.2.3


From 92efd68a3a13e49fe7bbfb8441611c0dcd639415 Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Mon, 30 Dec 2013 01:03:32 +0100
Subject: Début de mode multi-utilisateur avec http_auth
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

+ Légère optimisation de Minz_View.
+ Encore plus de tests de bibliothèques dans install.php
Contribue à https://github.com/marienfressinaud/FreshRSS/issues/126 et
https://github.com/marienfressinaud/FreshRSS/issues/303
---
 README.md                                |  2 +-
 app/Controllers/configureController.php  |  5 +--
 app/Controllers/entryController.php      |  4 +--
 app/Controllers/feedController.php       | 27 +++++++-------
 app/Controllers/indexController.php      | 31 ++++++++---------
 app/FreshRSS.php                         | 56 ++++++++++++++++++++++-------
 app/Models/Configuration.php             | 15 ++++----
 app/actualize_script.php                 | 15 +++++---
 app/i18n/en.php                          |  5 +--
 app/i18n/fr.php                          |  5 +--
 app/layout/aside_flux.phtml              |  6 ++--
 app/layout/header.phtml                  | 21 +++++------
 app/layout/nav_menu.phtml                |  2 +-
 app/views/configure/users.phtml          | 51 +++++++++++++++------------
 app/views/helpers/javascript_vars.phtml  |  2 +-
 app/views/helpers/view/normal_view.phtml | 60 ++++++++++++++++++--------------
 app/views/index/index.phtml              | 45 ++++++++++++++----------
 lib/Minz/Configuration.php               | 12 ++++++-
 lib/Minz/View.php                        | 29 ++++++---------
 lib/lib_rss.php                          | 16 +++------
 p/i/install.php                          | 24 ++++++++++---
 21 files changed, 246 insertions(+), 187 deletions(-)

(limited to 'app/Models/Configuration.php')

diff --git a/README.md b/README.md
index f20f870dd..cfef89781 100644
--- a/README.md
+++ b/README.md
@@ -21,7 +21,7 @@ Privilégiez pour cela des demandes sur GitHub
 # Pré-requis
 * Serveur Apache2 ou Nginx (non testé sur les autres)
 * PHP 5.2+ (PHP 5.3.3+ recommandé)
- * Requis : [LibXML](http://php.net/xml), [PCRE](http://php.net/pcre), [cURL](http://php.net/curl), [PDO_MySQL](http://php.net/pdo-mysql)
+ * Requis : [PDO_MySQL](http://php.net/pdo-mysql), [cURL](http://php.net/curl), [LibXML](http://php.net/xml), [PCRE](http://php.net/pcre), [ctype](http://php.net/ctype)
  * Recommandés : [JSON](http://php.net/json), [zlib](http://php.net/zlib), [mbstring](http://php.net/mbstring), [iconv](http://php.net/iconv)
 * MySQL 5.0.3+ (ou SQLite 3.7.4+ à venir)
 * Un navigateur Web récent tel Firefox, Chrome, Opera, Safari, Internet Explorer 9+
diff --git a/app/Controllers/configureController.php b/app/Controllers/configureController.php
index 0c0b4951d..656e2ac89 100755
--- a/app/Controllers/configureController.php
+++ b/app/Controllers/configureController.php
@@ -2,7 +2,7 @@
 
 class FreshRSS_configure_Controller extends Minz_ActionController {
 	public function firstAction () {
-		if (login_is_conf ($this->view->conf) && !is_logged ()) {
+		if (!$this->view->loginOk) {
 			Minz_Error::error (
 				403,
 				array ('error' => array (Minz_Translate::t ('access_denied')))
@@ -16,7 +16,6 @@ class FreshRSS_configure_Controller extends Minz_ActionController {
 	public function categorizeAction () {
 		$feedDAO = new FreshRSS_FeedDAO ();
 		$catDAO = new FreshRSS_CategoryDAO ();
-		$catDAO->checkDefault ();
 		$defaultCategory = $catDAO->getDefault ();
 		$defaultId = $defaultCategory->id ();
 
@@ -167,8 +166,6 @@ class FreshRSS_configure_Controller extends Minz_ActionController {
 			$this->view->conf->_bottomline_link(Minz_Request::param('bottomline_link', false));
 			$this->view->conf->save();
 
-			Minz_Session::_param ('mail', $this->view->conf->mail_login);
-
 			Minz_Session::_param ('language', $this->view->conf->language);
 			Minz_Translate::reset ();
 
diff --git a/app/Controllers/entryController.php b/app/Controllers/entryController.php
index b0fc37cdf..da4ab5ecc 100755
--- a/app/Controllers/entryController.php
+++ b/app/Controllers/entryController.php
@@ -2,7 +2,7 @@
 
 class FreshRSS_entry_Controller extends Minz_ActionController {
 	public function firstAction () {
-		if (login_is_conf ($this->view->conf) && !is_logged ()) {
+		if (!$this->view->loginOk) {
 			Minz_Error::error (
 				403,
 				array ('error' => array (Minz_Translate::t ('access_denied')))
@@ -38,7 +38,7 @@ class FreshRSS_entry_Controller extends Minz_ActionController {
 		$nextGet = Minz_Request::param ('nextGet', $get); 
 		$idMax = Minz_Request::param ('idMax', 0);
 
-		$is_read = !!$is_read;
+		$is_read = (bool)$is_read;
 
 		$entryDAO = new FreshRSS_EntryDAO ();
 		if ($id == false) {
diff --git a/app/Controllers/feedController.php b/app/Controllers/feedController.php
index 42a0dcb11..2d7c0ab43 100755
--- a/app/Controllers/feedController.php
+++ b/app/Controllers/feedController.php
@@ -2,18 +2,17 @@
 
 class FreshRSS_feed_Controller extends Minz_ActionController {
 	public function firstAction () {
-		$token = $this->view->conf->token;
-		$token_param = Minz_Request::param ('token', '');
-		$token_is_ok = ($token != '' && $token == $token_param);
-		$action = Minz_Request::actionName ();
-
-		if (login_is_conf ($this->view->conf) &&
-				!is_logged () &&
-				!($token_is_ok && $action == 'actualize')) {
-			Minz_Error::error (
-				403,
-				array ('error' => array (Minz_Translate::t ('access_denied')))
-			);
+		if (!$this->view->loginOk) {
+			$token = $this->view->conf->token;	//TODO: check the token logic again, and if it is still needed
+			$token_param = Minz_Request::param ('token', '');
+			$token_is_ok = ($token != '' && $token == $token_param);
+			$action = Minz_Request::actionName ();
+			if (!($token_is_ok && $action === 'actualize')) {
+				Minz_Error::error (
+					403,
+					array ('error' => array (Minz_Translate::t ('access_denied')))
+				);
+			}
 		}
 
 		$this->catDAO = new FreshRSS_CategoryDAO ();
@@ -411,10 +410,8 @@ class FreshRSS_feed_Controller extends Minz_ActionController {
 	}
 
 	private function addCategories ($categories) {
-		$catDAO = new FreshRSS_CategoryDAO ();
-
 		foreach ($categories as $cat) {
-			if (!$catDAO->searchByName ($cat->name ())) {
+			if (!$this->catDAO->searchByName ($cat->name ())) {
 				$values = array (
 					'id' => $cat->id (),
 					'name' => $cat->name (),
diff --git a/app/Controllers/indexController.php b/app/Controllers/indexController.php
index 54826636f..66809964d 100755
--- a/app/Controllers/indexController.php
+++ b/app/Controllers/indexController.php
@@ -16,17 +16,18 @@ class FreshRSS_index_Controller extends Minz_ActionController {
 
 	public function indexAction () {
 		$output = Minz_Request::param ('output');
-
-		$token = $this->view->conf->token;
-		$token_param = Minz_Request::param ('token', '');
-		$token_is_ok = ($token != '' && $token === $token_param);
-
-		// check if user is log in
-		if(login_is_conf ($this->view->conf) &&
-				!is_logged() &&
-				!Minz_Configuration::allowAnonymous() &&
-				!($output === 'rss' && $token_is_ok)) {
-			return;
+		$token = '';
+
+		// check if user is logged in
+		if (!$this->view->loginOk && !Minz_Configuration::allowAnonymous())
+		{
+			$token = $this->view->conf->token;
+			$token_param = Minz_Request::param ('token', '');
+			$token_is_ok = ($token != '' && $token === $token_param);
+			if (!($output === 'rss' && $token_is_ok)) {
+				return;
+			}
+			$params['token'] = $token;
 		}
 
 		// construction of RSS url of this feed
@@ -35,11 +36,6 @@ class FreshRSS_index_Controller extends Minz_ActionController {
 		if (isset ($params['search'])) {
 			$params['search'] = urlencode ($params['search']);
 		}
-		if (login_is_conf($this->view->conf) &&
-				!Minz_Configuration::allowAnonymous() &&
-				$token !== '') {
-			$params['token'] = $token;
-		}
 		$this->view->rss_url = array (
 			'c' => 'index',
 			'a' => 'index',
@@ -212,7 +208,7 @@ class FreshRSS_index_Controller extends Minz_ActionController {
 	}
 
 	public function logsAction () {
-		if (login_is_conf ($this->view->conf) && !is_logged ()) {
+		if (!$this->view->loginOk) {
 			Minz_Error::error (
 				403,
 				array ('error' => array (Minz_Translate::t ('access_denied')))
@@ -255,6 +251,7 @@ class FreshRSS_index_Controller extends Minz_ActionController {
 		$res = json_decode ($result, true);
 		if ($res['status'] === 'okay' && $res['email'] === $this->view->conf->mail_login) {
 			Minz_Session::_param ('mail', $res['email']);
+			$this->view->loginOk = true;
 			invalidateHttpCache();
 		} else {
 			$res = array ();
diff --git a/app/FreshRSS.php b/app/FreshRSS.php
index 05c8ec8e0..10f362717 100644
--- a/app/FreshRSS.php
+++ b/app/FreshRSS.php
@@ -1,26 +1,56 @@
 <?php
 class FreshRSS extends Minz_FrontController {
-	public function init () {
-		Minz_Session::init ('FreshRSS');
-
-		$this->loadParamsView ();
-		$this->loadStylesAndScripts ();
-		$this->loadNotifications ();
+	public function init($currentUser = null) {
+		Minz_Session::init('FreshRSS');
+		$this->accessControl($currentUser);
+		$this->loadParamsView();
+		$this->loadStylesAndScripts();
+		$this->loadNotifications();
 	}
 
-	private function loadParamsView () {
+	private function accessControl($currentUser) {
+		if ($currentUser === null) {
+			switch (Minz_Configuration::authType()) {
+				case 'http_auth':
+					$currentUser = httpAuthUser();
+					$loginOk = $currentUser != '';
+					break;
+				case 'persona':
+					$currentUser = Minz_Configuration::defaultUser();
+					$loginOk = Minz_Session::param('mail') != '';
+					break;
+				case 'none':
+					$currentUser = Minz_Configuration::defaultUser();
+					$loginOk = true;
+					break;
+				default:
+					$loginOk = false;
+					break;
+			}
+		} elseif ((PHP_SAPI === 'cli') && (Minz_Request::actionName() === 'actualize')) {	//Command line
+			Minz_Configuration::_authType('none');
+			$loginOk = true;
+		}
+
+		if (!$loginOk || !isValidUser($currentUser)) {
+			$currentUser = Minz_Configuration::defaultUser();
+			$loginOk = false;
+		}
+		Minz_Configuration::_currentUser($currentUser);
+		Minz_View::_param ('loginOk', $loginOk);
+
 		try {
-			$this->conf = new FreshRSS_Configuration();
+			$this->conf = new FreshRSS_Configuration($currentUser);
 		} catch (Minz_Exception $e) {
 			// Permission denied or conf file does not exist
-			// it's critical!
 			die($e->getMessage());
 		}
-
 		Minz_View::_param ('conf', $this->conf);
+	}
+
+	private function loadParamsView () {
 		Minz_Session::_param ('language', $this->conf->language);
 		Minz_Translate::init();
-
 		$output = Minz_Request::param ('output');
 		if (!$output) {
 			$output = $this->conf->view_mode;
@@ -31,12 +61,12 @@ class FreshRSS extends Minz_FrontController {
 	private function loadStylesAndScripts () {
 		$theme = FreshRSS_Themes::get_infos($this->conf->theme);
 		if ($theme) {
-			foreach($theme["files"] as $file) {
+			foreach($theme['files'] as $file) {
 				Minz_View::appendStyle (Minz_Url::display ('/themes/' . $theme['path'] . '/' . $file . '?' . @filemtime(PUBLIC_PATH . '/themes/' . $theme['path'] . '/' . $file)));
 			}
 		}
 
-		if (login_is_conf ($this->conf)) {
+		if (Minz_Configuration::authType() === 'persona') {
 			Minz_View::appendScript ('https://login.persona.org/include.js');
 		}
 		$includeLazyLoad = $this->conf->lazyload && ($this->conf->display_posts || Minz_Request::param ('output') === 'reader');
diff --git a/app/Models/Configuration.php b/app/Models/Configuration.php
index b0a5d9940..ec7daaa7d 100644
--- a/app/Models/Configuration.php
+++ b/app/Models/Configuration.php
@@ -59,10 +59,9 @@ class FreshRSS_Configuration extends Minz_ModelArray {
 		'fr' => 'Français',
 	);
 
-	public function __construct ($filename = '') {
-		if (empty($filename)) {
-			$filename = DATA_PATH . '/' . Minz_Configuration::currentUser () . '_user.php';
-		}
+	public function __construct ($user) {
+		$filename = DATA_PATH . '/' . $user . '_user.php';
+
 		parent::__construct($filename);
 		$data = parent::loadArray();
 
@@ -72,6 +71,7 @@ class FreshRSS_Configuration extends Minz_ModelArray {
 				$this->$function($value);
 			}
 		}
+		$this->data['user'] = $user;
 	}
 
 	public function save() {
@@ -151,10 +151,11 @@ class FreshRSS_Configuration extends Minz_ModelArray {
 		}
 	}
 	public function _mail_login ($value) {
-		if (filter_var($value, FILTER_VALIDATE_EMAIL)) {
-			$this->mail_login = $value;
+		$value = filter_var($value, FILTER_VALIDATE_EMAIL);
+		if ($value) {
+			$this->data['mail_login'] = $value;
 		} else {
-			$this->mail_login = '';
+			$this->data['mail_login'] = '';
 		}
 	}
 	public function _anon_access ($value) {
diff --git a/app/actualize_script.php b/app/actualize_script.php
index 20438128a..e0c560ff7 100755
--- a/app/actualize_script.php
+++ b/app/actualize_script.php
@@ -1,6 +1,8 @@
 <?php
 require(dirname(__FILE__) . '/../constants.php');
 
+//TODO: check if already running
+
 $_GET['c'] = 'feed';
 $_GET['a'] = 'actualize';
 $_GET['force'] = true;
@@ -9,7 +11,12 @@ $_SERVER['HTTP_HOST'] = '';
 require(LIB_PATH . '/lib_rss.php');	//Includes class autoloader
 
 $front_controller = new FreshRSS ();
-$front_controller->init ();
-Minz_Session::_param('mail', true); // permet de se passer de la phase de connexion
-$front_controller->run ();
-invalidateHttpCache();
+
+$users = listUsers();
+shuffle($users);
+
+foreach ($users as $user) {
+	$front_controller->init($user);
+	$front_controller->run();
+	invalidateHttpCache($user);
+}
diff --git a/app/i18n/en.php b/app/i18n/en.php
index 65afc11e5..8b9eee548 100644
--- a/app/i18n/en.php
+++ b/app/i18n/en.php
@@ -158,13 +158,14 @@ return array (
 
 	'current_user'			=> 'Current user',
 	'default_user'			=> 'Username of the default user (maximum 16 alphanumeric characters)',
-	'persona_connection_email'	=> 'Login mail address (use <a href="https://persona.org/">Mozilla Persona</a>)',
+	'persona_connection_email'	=> 'Login mail address (for <a href="https://persona.org/" rel="external">Mozilla Persona</a>)',
 	'allow_anonymous'		=> 'Allow anonymous reading for the default user (%s)',
 	'auth_token'			=> 'Authentication token',
-	'explain_token'			=> 'Allows to access RSS output without authentication.<br />%s?token=%s',
+	'explain_token'			=> 'Allows to access RSS output of the default user without authentication.<br /><kbd>%s?token=%s</kbd>',
 	'login_configuration'		=> 'Login',
 	'is_admin'			=> 'is administrator',
 	'auth_type'			=> 'Authentication method',
+	'auth_none'			=> 'None (dangerous)',
 	'users_list'			=> 'List of users',
 
 	'language'			=> 'Language',
diff --git a/app/i18n/fr.php b/app/i18n/fr.php
index adc38acbe..cad156d47 100644
--- a/app/i18n/fr.php
+++ b/app/i18n/fr.php
@@ -158,13 +158,14 @@ return array (
 
 	'current_user'			=> 'Utilisateur actuel',
 	'default_user'			=> 'Nom de l’utilisateur par défaut (16 caractères alphanumériques maximum)',
-	'persona_connection_email'	=> 'Adresse courriel de connexion (utilise <a href="https://persona.org/">Mozilla Persona</a>)',
+	'persona_connection_email'	=> 'Adresse courriel de connexion (pour <a href="https://persona.org/" rel="external">Mozilla Persona</a>)',
 	'allow_anonymous'		=> 'Autoriser la lecture anonyme pour l’utilisateur par défaut (%s)',
 	'auth_token'			=> 'Jeton d’identification',
-	'explain_token'			=> 'Permet d’accéder à la sortie RSS sans besoin de s’authentifier.<br />%s?output=rss&token=%s',
+	'explain_token'			=> 'Permet d’accéder à la sortie RSS de l’utilisateur par défaut sans besoin de s’authentifier.<br /><kbd>%s?output=rss&token=%s</kbd>',
 	'login_configuration'		=> 'Identification',
 	'is_admin'			=> 'est administrateur',
 	'auth_type'			=> 'Méthode d’authentification',
+	'auth_none'			=> 'Aucune (dangereux)',
 	'users_list'			=> 'Liste des utilisateurs',
 
 	'language'			=> 'Langue',
diff --git a/app/layout/aside_flux.phtml b/app/layout/aside_flux.phtml
index 9a6b16d58..8730baf0e 100644
--- a/app/layout/aside_flux.phtml
+++ b/app/layout/aside_flux.phtml
@@ -2,14 +2,14 @@
 	<a class="toggle_aside" href="#close"><?php echo FreshRSS_Themes::icon('close'); ?></a>
 
 	<ul class="categories">
-		<?php if (!login_is_conf ($this->conf) || is_logged ()) { ?>
+		<?php if ($this->loginOk) { ?>
 		<li>
 			<div class="stick">
 				<a class="btn btn-important" href="<?php echo _url ('configure', 'feed'); ?>"><?php echo Minz_Translate::t ('subscription_management'); ?></a>
 				<a class="btn btn-important" href="<?php echo _url ('configure', 'categorize'); ?>" title="<?php echo Minz_Translate::t ('categories_management'); ?>"><?php echo FreshRSS_Themes::icon('category-white'); ?></a>
 			</div>
 		</li>
-		<?php } elseif (login_is_conf ($this->conf)) { ?>
+		<?php } elseif (Minz_Configuration::needsLogin()) { ?>
 		<li><a href="<?php echo _url ('index', 'about'); ?>"><?php echo Minz_Translate::t ('about_freshrss'); ?></a></li>
 		<?php } ?>
 
@@ -69,7 +69,7 @@
 		<li class="dropdown-close"><a href="#close">❌</a></li>
 		<li class="item"><a href="<?php echo _url ('index', 'index', 'get', 'f_!!!!!!'); ?>"><?php echo Minz_Translate::t ('filter'); ?></a></li>
 		<li class="item"><a target="_blank" href="http://example.net/"><?php echo Minz_Translate::t ('see_website'); ?></a></li>
-		<?php if (!login_is_conf ($this->conf) || is_logged ()) { ?>
+		<?php if ($this->loginOk) { ?>
 		<li class="separator"></li>
 		<li class="item"><a href="<?php echo _url ('configure', 'feed', 'id', '!!!!!!'); ?>"><?php echo Minz_Translate::t ('administration'); ?></a></li>
 		<li class="item"><a href="<?php echo _url ('feed', 'actualize', 'id', '!!!!!!'); ?>"><?php echo Minz_Translate::t ('actualize'); ?></a></li>
diff --git a/app/layout/header.phtml b/app/layout/header.phtml
index aeb417a6e..0f2c524c4 100644
--- a/app/layout/header.phtml
+++ b/app/layout/header.phtml
@@ -1,9 +1,9 @@
-<?php if (login_is_conf ($this->conf)) { ?>
+<?php if (Minz_Configuration::canLogIn()) { ?>
 <ul class="nav nav-head nav-login">
-	<?php if (!is_logged ()) { ?>
-	<li class="item"><?php echo FreshRSS_Themes::icon('login'); ?> <a class="signin" href="#"><?php echo Minz_Translate::t ('login'); ?></a></li>
-	<?php } else { ?>
+	<?php if ($this->loginOk) { ?>
 	<li class="item"><?php echo FreshRSS_Themes::icon('logout'); ?> <a class="signout" href="#"><?php echo Minz_Translate::t ('logout'); ?></a></li>
+	<?php } else { ?>
+	<li class="item"><?php echo FreshRSS_Themes::icon('login'); ?> <a class="signin" href="#"><?php echo Minz_Translate::t ('login'); ?></a></li>
 	<?php } ?>
 </ul>
 <?php } ?>
@@ -19,9 +19,7 @@
 	</div>
 
 	<div class="item search">
-		<?php if(!login_is_conf ($this->conf) ||
-		         is_logged() ||
-		         Minz_Configuration::allowAnonymous()) { ?>
+		<?php if ($this->loginOk || Minz_Configuration::allowAnonymous()) { ?>
 		<form action="<?php echo _url ('index', 'index'); ?>" method="get">
 			<div class="stick">
 				<?php $search = Minz_Request::param ('search', ''); ?>
@@ -48,11 +46,10 @@
 		<?php } ?>
 	</div>
 
-	<?php if (!login_is_conf ($this->conf) || is_logged ()) { ?>
+	<?php if ($this->loginOk) { ?>
 	<div class="item configure">
 		<div class="dropdown">
 			<div id="dropdown-configure" class="dropdown-target"></div>
-
 			<a class="btn dropdown-toggle" href="#dropdown-configure"><?php echo FreshRSS_Themes::icon('configure'); ?></a>
 			<ul class="dropdown-menu">
 				<li class="dropdown-close"><a href="#close">❌</a></li>
@@ -65,16 +62,14 @@
 				<li class="separator"></li>
 				<li class="item"><a href="<?php echo _url ('index', 'about'); ?>"><?php echo Minz_Translate::t ('about'); ?></a></li>
 				<li class="item"><a href="<?php echo _url ('index', 'logs'); ?>"><?php echo Minz_Translate::t ('logs'); ?></a></li>
-				<?php if (login_is_conf ($this->conf) && is_logged ()) { ?>
+				<?php if (Minz_Configuration::canLogIn()) { ?>
 				<li class="separator"></li>
 				<li class="item"><a class="signout" href="#"><?php echo FreshRSS_Themes::icon('logout'); ?> <?php echo Minz_Translate::t ('logout'); ?></a></li>
 				<?php } ?>
 			</ul>
 		</div>
 	</div>
-	<?php }
-
-	if (login_is_conf ($this->conf) && !is_logged ()) { ?>
+	<?php } elseif (Minz_Configuration::canLogIn()) { ?>
 	<div class="item configure">
 		<?php echo FreshRSS_Themes::icon('login'); ?> <a class="signin" href="#"><?php echo Minz_Translate::t ('login'); ?></a>
 	</div>
diff --git a/app/layout/nav_menu.phtml b/app/layout/nav_menu.phtml
index 37f8a426f..44b49b10c 100644
--- a/app/layout/nav_menu.phtml
+++ b/app/layout/nav_menu.phtml
@@ -1,7 +1,7 @@
 <div class="nav_menu">
 	<a class="btn toggle_aside" href="#aside_flux"><?php echo FreshRSS_Themes::icon('category'); ?></a>
 
-	<?php if (!login_is_conf ($this->conf) || is_logged ()) { ?>
+	<?php if ($this->loginOk) { ?>
 	<a id="actualize" class="btn" href="<?php echo _url ('feed', 'actualize'); ?>"><?php echo FreshRSS_Themes::icon('refresh'); ?></a>
 
 	<?php
diff --git a/app/views/configure/users.phtml b/app/views/configure/users.phtml
index 7e8edf9af..db57448f6 100644
--- a/app/views/configure/users.phtml
+++ b/app/views/configure/users.phtml
@@ -22,20 +22,11 @@
 			<label class="group-name" for="mail_login"><?php echo Minz_Translate::t('persona_connection_email'); ?></label>
 			<?php $mail = $this->conf->mail_login; ?>
 			<div class="group-controls">
-				<input type="email" id="mail_login" name="mail_login" value="<?php echo $mail ? $mail : ''; ?>" placeholder="<?php echo Minz_Translate::t('blank_to_disable'); ?>" />
+				<input type="email" id="mail_login" name="mail_login" value="<?php echo $mail ? $mail : ''; ?>" placeholder="alice@example.net" />
 				<noscript><b><?php echo Minz_Translate::t('javascript_should_be_activated'); ?></b></noscript>
 			</div>
 		</div>
 
-		<div class="form-group">
-			<label class="group-name" for="token"><?php echo Minz_Translate::t('auth_token'); ?></label>
-			<?php $token = $this->conf->token; ?>
-			<div class="group-controls">
-				<input type="text" id="token" name="token" value="<?php echo $token; ?>"  placeholder="<?php echo Minz_Translate::t('blank_to_disable'); ?>"/>
-				<?php echo FreshRSS_Themes::icon('help'); ?> <?php echo Minz_Translate::t('explain_token', Minz_Url::display(null, 'html', true), $token); ?>
-			</div>
-		</div>
-
 		<div class="form-group form-actions">
 			<div class="group-controls">
 				<button type="submit" class="btn btn-important"><?php echo Minz_Translate::t('save'); ?></button>
@@ -47,21 +38,12 @@
 
 		<legend><?php echo Minz_Translate::t('users'); ?></legend>
 
-		<div class="form-group">
-			<div class="group-controls">
-				<label class="checkbox" for="anon_access">
-					<input type="checkbox" name="anon_access" id="anon_access" value="1"<?php echo Minz_Configuration::allowAnonymous() ? ' checked="checked"' : ''; ?> />
-					<?php echo Minz_Translate::t('allow_anonymous', Minz_Configuration::defaultUser()); ?>
-				</label>
-			</div>
-		</div>
-
 		<div class="form-group">
 			<label class="group-name" for="auth_type"><?php echo Minz_Translate::t('auth_type'); ?></label>
 			<div class="group-controls">
 				<select id="auth_type" name="auth_type">
-					<option value="none"<?php echo Minz_Configuration::authType() === 'none' ? ' selected="selected"' : ''; ?>>None (dangerous)</option>
-					<option value="http_auth"<?php echo Minz_Configuration::authType() === 'http_auth' ? ' selected="selected"' : ''; ?>>HTTP Auth</option>
+					<option value="none"<?php echo Minz_Configuration::authType() === 'none' ? ' selected="selected"' : ''; ?>><?php echo Minz_Translate::t('auth_none'); ?></option>
+					<option value="http_auth"<?php echo Minz_Configuration::authType() === 'http_auth' ? ' selected="selected"' : '', httpAuthUser() == '' ? ' disabled="disabled"' : ''; ?>>HTTP Auth</option>
 					<option value="persona"<?php echo Minz_Configuration::authType() === 'persona' ? ' selected="selected"' : ''; ?>>Mozilla Persona</option>
 				</select>
 			</div>
@@ -75,7 +57,32 @@
 						echo '<option>', $user, '</option>';
 					}
 				?></select>
-				(not implemented yet)
+			</div>
+		</div>
+
+		<div class="form-group form-actions">
+			<div class="group-controls">
+				<button type="submit" class="btn btn-important"><?php echo Minz_Translate::t('save'); ?></button>
+				<button type="reset" class="btn"><?php echo Minz_Translate::t('cancel'); ?></button>
+			</div>
+		</div>
+
+		<legend>Mozilla Persona</legend>
+		<div class="form-group">
+			<div class="group-controls">
+				<label class="checkbox" for="anon_access">
+					<input type="checkbox" name="anon_access" id="anon_access" value="1"<?php echo Minz_Configuration::allowAnonymous() ? ' checked="checked"' : ''; ?> />
+					<?php echo Minz_Translate::t('allow_anonymous', Minz_Configuration::defaultUser()); ?>
+				</label>
+			</div>
+		</div>
+
+		<div class="form-group">
+			<label class="group-name" for="token"><?php echo Minz_Translate::t('auth_token'); ?></label>
+			<?php $token = $this->conf->token; ?>
+			<div class="group-controls">
+				<input type="text" id="token" name="token" value="<?php echo $token; ?>"  placeholder="<?php echo Minz_Translate::t('blank_to_disable'); ?>"/>
+				<?php echo FreshRSS_Themes::icon('help'); ?> <?php echo Minz_Translate::t('explain_token', Minz_Url::display(null, 'html', true), $token); ?>
 			</div>
 		</div>
 
diff --git a/app/views/helpers/javascript_vars.phtml b/app/views/helpers/javascript_vars.phtml
index 8f508487c..8419b9391 100644
--- a/app/views/helpers/javascript_vars.phtml
+++ b/app/views/helpers/javascript_vars.phtml
@@ -29,7 +29,7 @@
 	if ($mail != 'null') {
 		$mail = '"' . $mail . '"';
 	}
-	echo 'use_persona=', login_is_conf ($this->conf) ? 'true' : 'false',
+	echo 'use_persona=', Minz_Configuration::authType() === 'persona' ? 'true' : 'false',
 		',url_freshrss="', _url ('index', 'index'), '",',
 		'url_login="', _url ('index', 'login'), '",',
 		'url_logout="', _url ('index', 'logout'), '",',
diff --git a/app/views/helpers/view/normal_view.phtml b/app/views/helpers/view/normal_view.phtml
index f59cae2b8..1b4388796 100644
--- a/app/views/helpers/view/normal_view.phtml
+++ b/app/views/helpers/view/normal_view.phtml
@@ -7,39 +7,48 @@ if (!empty($this->entries)) {
 	$display_today = true;
 	$display_yesterday = true;
 	$display_others = true;
-
-	$logged = !login_is_conf ($this->conf) || is_logged ();
-	$shaarli = $this->conf->sharing ('shaarli');
-	$poche = $this->conf->sharing ('poche');
-	$diaspora = $this->conf->sharing ('diaspora');
+	$shaarli = $this->loginOk && $this->conf->sharing ('shaarli');
+	$poche = $this->loginOk && $this->conf->sharing ('poche');
+	$diaspora = $this->loginOk && $this->conf->sharing ('diaspora');
 	$twitter = $this->conf->sharing ('twitter');
 	$google_plus = $this->conf->sharing ('g+');
 	$facebook = $this->conf->sharing ('facebook');
 	$email = $this->conf->sharing ('email');
 	$print = $this->conf->sharing ('print');
-	$today = $this->today;
 	$hidePosts = !$this->conf->display_posts;
 	$lazyload = $this->conf->lazyload;
+	$topline_read = $this->conf->topline_read;
+	$topline_favorite = $this->conf->topline_favorite;
+	$topline_date = $this->conf->topline_date;
+	$topline_link = $this->conf->topline_link;
+	$bottomline_read = $this->conf->bottomline_read;
+	$bottomline_favorite = $this->conf->bottomline_favorite;
+	$bottomline_sharing = $this->conf->bottomline_sharing && (
+		$shaarli || $poche || $diaspora || $twitter ||
+		$google_plus || $facebook || $email);
+	$bottomline_tags = $this->conf->bottomline_tags;
+	$bottomline_date = $this->conf->bottomline_date;
+	$bottomline_link = $this->conf->bottomline_link;
 ?>
 
 <div id="stream" class="normal<?php echo $hidePosts ? ' hide_posts' : ''; ?>">
 	<?php foreach ($this->entries as $item) { ?>
 
-	<?php if ($display_today && $item->isDay (FreshRSS_Days::TODAY, $today)) { ?>
+	<?php if ($display_today && $item->isDay (FreshRSS_Days::TODAY, $this->today)) { ?>
 	<div class="day" id="day_today">
 		<?php echo Minz_Translate::t ('today'); ?>
 		<span class="date"> - <?php echo timestamptodate (time (), false); ?></span>
 		<span class="name"><?php echo $this->currentName; ?></span>
 	</div>
 	<?php $display_today = false; } ?>
-	<?php if ($display_yesterday && $item->isDay (FreshRSS_Days::YESTERDAY, $today)) { ?>
+	<?php if ($display_yesterday && $item->isDay (FreshRSS_Days::YESTERDAY, $this->today)) { ?>
 	<div class="day" id="day_yesterday">
 		<?php echo Minz_Translate::t ('yesterday'); ?>
 		<span class="date"> - <?php echo timestamptodate (time () - 86400, false); ?></span>
 		<span class="name"><?php echo $this->currentName; ?></span>
 	</div>
 	<?php $display_yesterday = false; } ?>
-	<?php if ($display_others && $item->isDay (FreshRSS_Days::BEFORE_YESTERDAY, $today)) { ?>
+	<?php if ($display_others && $item->isDay (FreshRSS_Days::BEFORE_YESTERDAY, $this->today)) { ?>
 	<div class="day" id="day_before_yesterday">
 		<?php echo Minz_Translate::t ('before_yesterday'); ?>
 		<span class="name"><?php echo $this->currentName; ?></span>
@@ -48,14 +57,14 @@ if (!empty($this->entries)) {
 
 	<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 ($logged) {
-				if ($this->conf->topline_read) {
+			if ($this->loginOk) {
+				if ($topline_read) {
 					?><li class="item manage"><?php
 						?><a class="read" href="<?php echo _url ('entry', 'read', 'id', $item->id (), 'is_read', $item->isRead () ? 0 : 1); ?>"><?php
 							echo FreshRSS_Themes::icon($item->isRead () ? 'read' : 'unread'); ?></a><?php
 					?></li><?php
 				}
-				if ($this->conf->topline_favorite) {
+				if ($topline_favorite) {
 					 ?><li class="item manage"><?php
 						?><a class="bookmark" href="<?php echo _url ('entry', 'bookmark', 'id', $item->id (), 'is_favorite', $item->isFavorite () ? 0 : 1); ?>"><?php
 							echo FreshRSS_Themes::icon($item->isFavorite () ? 'starred' : 'non-starred'); ?></a><?php
@@ -67,8 +76,8 @@ if (!empty($this->entries)) {
 			?>
 			<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"><a target="_blank" href="<?php echo $item->link (); ?>"><?php echo $item->title (); ?></a></li>
-			<?php if ($this->conf->topline_date) { ?><li class="item date"><?php echo $item->date (); ?> </li><?php } ?>
-			<?php if ($this->conf->topline_link) { ?><li class="item link"><a target="_blank" href="<?php echo $item->link (); ?>"><?php echo FreshRSS_Themes::icon('link'); ?></a></li><?php } ?>
+			<?php if ($topline_date) { ?><li class="item date"><?php echo $item->date (); ?> </li><?php } ?>
+			<?php if ($topline_link) { ?><li class="item link"><a target="_blank" href="<?php echo $item->link (); ?>"><?php echo FreshRSS_Themes::icon('link'); ?></a></li><?php } ?>
 		</ul>
 
 		<div class="flux_content">
@@ -85,14 +94,14 @@ if (!empty($this->entries)) {
 				?>
 			</div>
 			<ul class="horizontal-list bottom"><?php
-				if ($logged) {
-					if ($this->conf->bottomline_read) {
+				if ($this->loginOk) {
+					if ($bottomline_read) {
 						?><li class="item manage"><?php
 							?><a class="read" href="<?php echo _url ('entry', 'read', 'id', $item->id (), 'is_read', $item->isRead () ? 0 : 1); ?>"><?php
 								echo FreshRSS_Themes::icon($item->isRead () ? 'read' : 'unread'); ?></a><?php
 						?></li><?php
 					}
-					if ($this->conf->bottomline_favorite) {
+					if ($bottomline_favorite) {
 						?><li class="item manage"><?php
 							?><a class="bookmark" href="<?php echo _url ('entry', 'bookmark', 'id', $item->id (), 'is_favorite', $item->isFavorite () ? 0 : 1); ?>"><?php
 								echo FreshRSS_Themes::icon($item->isFavorite () ? 'starred' : 'non-starred'); ?></a><?php
@@ -101,10 +110,7 @@ if (!empty($this->entries)) {
 				} ?>
 				<li class="item">
 					<?php
-						if ($this->conf->bottomline_sharing && (
-								$shaarli || $poche || $diaspora || $twitter ||
-								$google_plus || $facebook || $email
-							)) {
+						if ($bottomline_sharing) {
 							$link = urlencode ($item->link ());
 							$title = urlencode ($item->title () . ' - ' . $feed->name ());
 					?>
@@ -117,19 +123,19 @@ if (!empty($this->entries)) {
 
 						<ul class="dropdown-menu">
 							<li class="dropdown-close"><a href="#close">❌</a></li>
-							<?php if ($logged && $shaarli) { ?>
+							<?php if ($shaarli) { ?>
 							<li class="item">
 								<a target="_blank" href="<?php echo $shaarli . '?post=' . $link . '&amp;title=' . $title . '&amp;source=FreshRSS'; ?>">
 									<?php echo Minz_Translate::t ('shaarli'); ?>
 								</a>
 							</li>
-							<?php } if ($logged && $poche) { ?>
+							<?php } if ($poche) { ?>
 							<li class="item">
 								<a target="_blank" href="<?php echo $poche . '?action=add&amp;url=' . base64_encode (urldecode($link)); ?>">
 									<?php echo Minz_Translate::t ('poche'); ?>
 								</a>
 							</li>
-							<?php } if ($logged && $diaspora) { ?>
+							<?php } if ($diaspora) { ?>
 							<li class="item">
 								<a target="_blank" href="<?php echo $diaspora . '/bookmarklet?url=' . $link . '&amp;title=' . $title; ?>">
 									<?php echo Minz_Translate::t ('diaspora'); ?>
@@ -171,7 +177,7 @@ if (!empty($this->entries)) {
 					<?php } ?>
 				</li>
 				<?php
-					$tags = $this->conf->bottomline_tags ? $item->tags() : null;
+					$tags = $bottomline_tags ? $item->tags() : null;
 					if (!empty($tags)) {
 				?>
 				<li class="item">
@@ -190,8 +196,8 @@ if (!empty($this->entries)) {
 					</div>
 				</li>
 				<?php } ?>
-				<?php if ($this->conf->bottomline_date) { ?><li class="item date"><?php echo $item->date (); ?> </li><?php } ?>
-				<?php if ($this->conf->bottomline_link) { ?><li class="item link"><a target="_blank" href="<?php echo $item->link (); ?>"><?php echo FreshRSS_Themes::icon('link'); ?></a></li><?php } ?>
+				<?php if ($bottomline_date) { ?><li class="item date"><?php echo $item->date (); ?> </li><?php } ?>
+				<?php if ($bottomline_link) { ?><li class="item link"><a target="_blank" href="<?php echo $item->link (); ?>"><?php echo FreshRSS_Themes::icon('link'); ?></a></li><?php } ?>
 			</ul>
 		</div>
 	</div>
diff --git a/app/views/index/index.phtml b/app/views/index/index.phtml
index 4db53e2a5..549d0b61e 100644
--- a/app/views/index/index.phtml
+++ b/app/views/index/index.phtml
@@ -1,29 +1,38 @@
 <?php
 
+function showForbidden() {
+?><div class="post content">
+	<h1><?php echo Minz_Translate::t ('forbidden_access'); ?></h1>
+	<p><?php echo Minz_Configuration::canLogIn() ?
+		Minz_Translate::t ('forbidden_access_description') :
+		Minz_Translate::t ('forbidden_access') . ' (' . Minz_Configuration::authType() . ')'; ?></p>
+	<p><a href="<?php echo _url ('index', 'about'); ?>"><?php echo Minz_Translate::t ('about_freshrss'); ?></a></p>
+</div><?php
+}
+
 $output = Minz_Request::param ('output', 'normal');
-$token = $this->conf->token;
-$token_param = Minz_Request::param ('token', '');
-$token_is_ok = ($token != '' && $token == $token_param);
 
-if(!login_is_conf ($this->conf) ||
-   is_logged() ||
-   Minz_Configuration::allowAnonymous() ||
-   ($output == 'rss' && $token_is_ok)) {
-	if($output == 'rss') {
+if ($this->loginOk || Minz_Configuration::allowAnonymous()) {
+	if ($output === 'normal') {
+		$this->renderHelper ('view/normal_view');
+	} elseif ($output === 'rss') {
 		$this->renderHelper ('view/rss_view');
-	} elseif($output == 'reader') {
+	} elseif ($output === 'reader') {
 		$this->renderHelper ('view/reader_view');
-	} elseif($output == 'global') {
+	} elseif ($output === 'global') {
 		$this->renderHelper ('view/global_view');
 	} else {
 		$this->renderHelper ('view/normal_view');
 	}
+} elseif ($output === 'rss') {
+	$token = $this->conf->token;
+	$token_param = Minz_Request::param ('token', '');
+	$token_is_ok = ($token != '' && $token == $token_param);
+	if ($token_is_ok) {
+		$this->renderHelper ('view/rss_view');
+	} else {
+		showForbidden();
+	}
 } else {
-?>
-<div class="post content">
-	<h1><?php echo Minz_Translate::t ('forbidden_access'); ?></h1>
-	<p><?php echo Minz_Translate::t ('forbidden_access_description'); ?></p>
-	<p><a href="<?php echo _url ('index', 'about'); ?>"><?php echo Minz_Translate::t ('about_freshrss'); ?></a></p>
-</div>
-<?php
-}
\ No newline at end of file
+	showForbidden();
+}
diff --git a/lib/Minz/Configuration.php b/lib/Minz/Configuration.php
index d0c530ef7..e6d7ae471 100644
--- a/lib/Minz/Configuration.php
+++ b/lib/Minz/Configuration.php
@@ -107,6 +107,12 @@ class Minz_Configuration {
 	public static function authType() {
 		return self::$auth_type;
 	}
+	public static function needsLogin() {
+		return self::$auth_type !== 'none';
+	}
+	public static function canLogIn() {
+		return self::$auth_type === 'persona';
+	}
 
 	public static function _allowAnonymous($allow = false) {
 		self::$allow_anonymous = (bool)$allow;
@@ -114,13 +120,17 @@ class Minz_Configuration {
 	public static function _authType($value) {
 		$value = strtolower($value);
 		switch ($value) {
-			case 'none':
 			case 'http_auth':
 			case 'persona':
+			case 'none':
 				self::$auth_type = $value;
 				break;
 		}
 	}
+	public static function _currentUser($user) {
+		self::$current_user = $user;
+	}
+
 
 	/**
 	 * Initialise les variables de configuration
diff --git a/lib/Minz/View.php b/lib/Minz/View.php
index c8d0aefed..ba9555cd7 100644
--- a/lib/Minz/View.php
+++ b/lib/Minz/View.php
@@ -13,7 +13,7 @@ class Minz_View {
 	const LAYOUT_FILENAME = '/layout.phtml';
 
 	private $view_filename = '';
-	private $use_layout = false;
+	private $use_layout = null;
 
 	private static $title = '';
 	private static $styles = array ();
@@ -31,12 +31,6 @@ class Minz_View {
 		                     . Minz_Request::controllerName () . '/'
 		                     . Minz_Request::actionName () . '.phtml';
 
-		if (file_exists (APP_PATH
-		               . self::LAYOUT_PATH_NAME
-		               . self::LAYOUT_FILENAME)) {
-			$this->use_layout = true;
-		}
-
 		self::$title = Minz_Configuration::title ();
 	}
 
@@ -44,6 +38,9 @@ class Minz_View {
 	 * Construit la vue
 	 */
 	public function build () {
+		if ($this->use_layout === null) {	//TODO: avoid file_exists and require views to be explicit
+			$this->use_layout = file_exists (APP_PATH . self::LAYOUT_PATH_NAME . self::LAYOUT_FILENAME);
+		}
 		if ($this->use_layout) {
 			$this->buildLayout ();
 		} else {
@@ -66,10 +63,8 @@ class Minz_View {
 	 * Affiche la Vue en elle-même
 	 */
 	public function render () {
-		if (file_exists ($this->view_filename)) {
-			include ($this->view_filename);
-		} else {
-			Minz_Log::record ('File doesn\'t exist : `'
+		if ((@include($this->view_filename)) === false) {
+			Minz_Log::record ('File not found: `'
 			            . $this->view_filename . '`',
 			            Minz_Log::NOTICE);
 		}
@@ -84,10 +79,8 @@ class Minz_View {
 		             . self::LAYOUT_PATH_NAME . '/'
 		             . $part . '.phtml';
 
-		if (file_exists ($fic_partial)) {
-			include ($fic_partial);
-		} else {
-			Minz_Log::record ('File doesn\'t exist : `'
+		if ((@include($fic_partial)) === false) {
+			Minz_Log::record ('File not found: `'
 			            . $fic_partial . '`',
 			            Minz_Log::WARNING);
 		}
@@ -102,10 +95,8 @@ class Minz_View {
 		            . '/views/helpers/'
 		            . $helper . '.phtml';
 
-		if (file_exists ($fic_helper)) {
-			include ($fic_helper);
-		} else {
-			Minz_Log::record ('File doesn\'t exist : `'
+		if ((@include($fic_helper)) === false) {;
+			Minz_Log::record ('File not found: `'
 			            . $fic_helper . '`',
 			            Minz_Log::WARNING);
 		}
diff --git a/lib/lib_rss.php b/lib/lib_rss.php
index 3f55c7d58..b266fa5c7 100644
--- a/lib/lib_rss.php
+++ b/lib/lib_rss.php
@@ -56,16 +56,6 @@ function checkUrl($url) {
 	}
 }
 
-// vérifie qu'on est connecté
-function is_logged () {
-	return Minz_Session::param ('mail') != false;
-}
-
-// vérifie que le système d'authentification est configuré
-function login_is_conf ($conf) {
-	return $conf->mail_login != '';
-}
-
 // tiré de Shaarli de Seb Sauvage	//Format RFC 4648 base64url
 function small_hash ($txt) {
 	$t = rtrim (base64_encode (hash ('crc32', $txt, true)), '=');
@@ -173,7 +163,7 @@ function uSecString() {
 	return str_pad($t['usec'], 6, '0');
 }
 
-function invalidateHttpCache() {
+function invalidateHttpCache($currentUser = '') {	//TODO: Make multi-user compatible
 	file_put_contents(DATA_PATH . '/touch.txt', uTimeString());
 }
 
@@ -185,6 +175,10 @@ function usernameFromPath($userPath) {
 	}
 }
 
+function isValidUser($user) {
+	return $user != '' && ctype_alnum($user) && file_exists(DATA_PATH . '/' . $user . '_user.php');
+}
+
 function listUsers() {
 	return array_map('usernameFromPath', glob(DATA_PATH . '/*_user.php'));
 }
diff --git a/p/i/install.php b/p/i/install.php
index 5c654f983..8a74c4492 100644
--- a/p/i/install.php
+++ b/p/i/install.php
@@ -543,6 +543,8 @@ function checkStep1 () {
 	$minz = file_exists (LIB_PATH . '/Minz');
 	$curl = extension_loaded ('curl');
 	$pdo = extension_loaded ('pdo_mysql');
+	$pcre = extension_loaded ('pcre');
+	$ctype = extension_loaded ('ctype');
 	$dom = class_exists('DOMDocument');
 	$data = DATA_PATH && is_writable (DATA_PATH);
 	$cache = CACHE_PATH && is_writable (CACHE_PATH);
@@ -554,12 +556,14 @@ function checkStep1 () {
 		'minz' => $minz ? 'ok' : 'ko',
 		'curl' => $curl ? 'ok' : 'ko',
 		'pdo-mysql' => $pdo ? 'ok' : 'ko',
+		'pcre' => $pcre ? 'ok' : 'ko',
+		'ctype' => $ctype ? 'ok' : 'ko',
 		'dom' => $dom ? 'ok' : 'ko',
 		'data' => $data ? 'ok' : 'ko',
 		'cache' => $cache ? 'ok' : 'ko',
 		'log' => $log ? 'ok' : 'ko',
 		'favicons' => $favicons ? 'ok' : 'ko',
-		'all' => $php && $minz && $curl && $pdo && $dom && $data && $cache && $log && $favicons ? 'ok' : 'ko'
+		'all' => $php && $minz && $curl && $pdo && $pcre && $ctype && $dom && $data && $cache && $log && $favicons ? 'ok' : 'ko'
 	);
 }
 
@@ -726,6 +730,12 @@ function printStep1 () {
 	<p class="alert alert-error"><span class="alert-head"><?php echo _t ('damn'); ?></span> <?php echo _t ('minz_is_nok', LIB_PATH . '/Minz'); ?></p>
 	<?php } ?>
 
+	<?php if ($res['pdo-mysql'] == 'ok') { ?>
+	<p class="alert alert-success"><span class="alert-head"><?php echo _t ('ok'); ?></span> <?php echo _t ('pdomysql_is_ok'); ?></p>
+	<?php } else { ?>
+	<p class="alert alert-error"><span class="alert-head"><?php echo _t ('damn'); ?></span> <?php echo _t ('pdomysql_is_nok'); ?></p>
+	<?php } ?>
+
 	<?php if ($res['curl'] == 'ok') { ?>
 	<?php $version = curl_version(); ?>
 	<p class="alert alert-success"><span class="alert-head"><?php echo _t ('ok'); ?></span> <?php echo _t ('curl_is_ok', $version['version']); ?></p>
@@ -733,10 +743,16 @@ function printStep1 () {
 	<p class="alert alert-error"><span class="alert-head"><?php echo _t ('damn'); ?></span> <?php echo _t ('curl_is_nok'); ?></p>
 	<?php } ?>
 
-	<?php if ($res['pdo-mysql'] == 'ok') { ?>
-	<p class="alert alert-success"><span class="alert-head"><?php echo _t ('ok'); ?></span> <?php echo _t ('pdomysql_is_ok'); ?></p>
+	<?php if ($res['pcre'] == 'ok') { ?>
+	<p class="alert alert-success"><span class="alert-head"><?php echo _t ('ok'); ?></span> <?php echo _t ('pcre_is_ok'); ?></p>
 	<?php } else { ?>
-	<p class="alert alert-error"><span class="alert-head"><?php echo _t ('damn'); ?></span> <?php echo _t ('pdomysql_is_nok'); ?></p>
+	<p class="alert alert-error"><span class="alert-head"><?php echo _t ('damn'); ?></span> <?php echo _t ('pcre_is_nok'); ?></p>
+	<?php } ?>
+
+	<?php if ($res['ctype'] == 'ok') { ?>
+	<p class="alert alert-success"><span class="alert-head"><?php echo _t ('ok'); ?></span> <?php echo _t ('ctype_is_ok'); ?></p>
+	<?php } else { ?>
+	<p class="alert alert-error"><span class="alert-head"><?php echo _t ('damn'); ?></span> <?php echo _t ('ctype_is_nok'); ?></p>
 	<?php } ?>
 
 	<?php if ($res['dom'] == 'ok') { ?>
-- 
cgit v1.2.3


From 66229a5d71b85c0a57d63fa8b1cc6e5729cabfe4 Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Wed, 1 Jan 2014 04:39:39 +0100
Subject: Minz : bug avec OPcache de PHP 5.5+
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Minz ne prenait pas en charge OPcache (cache PHP) http://php.net/opcache
activé par défaut depuis PHP5.5.
Ce fut un peu dur d'isoler ce bug :-/
Il faut penser à appeler opcache_invalidate avant de ré-utiliser un
fichier par include().
Aussi, le mécanisme de lock() n'est plus approprié ni nécessaire.
Pour FreshRSS, évite l'utilisation de ModelArray car il ne restait que
quelques lignes d'utiles, et évite un héritage + appel de classe, ce qui
est toujours ça de gagné.
---
 app/Models/Configuration.php | 20 +++++++++++++++-----
 lib/Minz/Configuration.php   | 17 +++++++----------
 lib/Minz/ModelArray.php      |  5 ++++-
 3 files changed, 26 insertions(+), 16 deletions(-)

(limited to 'app/Models/Configuration.php')

diff --git a/app/Models/Configuration.php b/app/Models/Configuration.php
index ec7daaa7d..abd874f27 100644
--- a/app/Models/Configuration.php
+++ b/app/Models/Configuration.php
@@ -1,6 +1,8 @@
 <?php
 
-class FreshRSS_Configuration extends Minz_ModelArray {
+class FreshRSS_Configuration {
+	private $filename;
+
 	private $data = array(
 		'language' => 'en',
 		'old_entries' => 3,
@@ -60,10 +62,12 @@ class FreshRSS_Configuration extends Minz_ModelArray {
 	);
 
 	public function __construct ($user) {
-		$filename = DATA_PATH . '/' . $user . '_user.php';
+		$this->filename = DATA_PATH . '/' . $user . '_user.php';
 
-		parent::__construct($filename);
-		$data = parent::loadArray();
+		$data = include($this->filename);
+		if (!is_array($data)) {
+			throw new Minz_PermissionDeniedException($this->filename);
+		}
 
 		foreach ($data as $key => $value) {
 			if (isset($this->data[$key])) {
@@ -75,8 +79,14 @@ class FreshRSS_Configuration extends Minz_ModelArray {
 	}
 
 	public function save() {
+		if (file_put_contents($this->filename, "<?php\n return " . var_export($array, true) . ';', LOCK_EX) === false) {
+			throw new Minz_PermissionDeniedException($this->filename);
+		}
+		if (function_exists('opcache_invalidate')) {
+			opcache_invalidate($this->filename);	//Clear PHP 5.5+ cache for include
+		}
 		invalidateHttpCache();
-		return parent::writeArray($this->data);
+		return true;
 	}
 
 	public function __get($name) {
diff --git a/lib/Minz/Configuration.php b/lib/Minz/Configuration.php
index 873908ce6..fc94d9731 100644
--- a/lib/Minz/Configuration.php
+++ b/lib/Minz/Configuration.php
@@ -157,25 +157,22 @@ class Minz_Configuration {
 			'db' => self::$db,
 		);
 		@rename(DATA_PATH . self::CONF_PATH_NAME, DATA_PATH . self::CONF_PATH_NAME . '.bak');
-		return file_put_contents(DATA_PATH . self::CONF_PATH_NAME, "<?php\n return " . var_export($ini_array, true) . ';');
+		$result = file_put_contents(DATA_PATH . self::CONF_PATH_NAME, "<?php\n return " . var_export($ini_array, true) . ';');
+		if (function_exists('opcache_invalidate')) {
+			opcache_invalidate(DATA_PATH . self::CONF_PATH_NAME);	//Clear PHP 5.5+ cache for include
+		}
+		return (bool)$result;
 	}
 
 	/**
 	 * Parse un fichier de configuration
-	 * @exception Minz_FileNotExistException si le CONF_PATH_NAME n'existe pas
+	 * @exception Minz_PermissionDeniedException si le CONF_PATH_NAME n'est pas accessible
 	 * @exception Minz_BadConfigurationException si CONF_PATH_NAME mal formaté
 	 */
 	private static function parseFile () {
-		if (!file_exists (DATA_PATH . self::CONF_PATH_NAME)) {
-			throw new Minz_FileNotExistException (
-				DATA_PATH . self::CONF_PATH_NAME,
-				Minz_Exception::ERROR
-			);
-		}
-
 		$ini_array = include(DATA_PATH . self::CONF_PATH_NAME);
 
-		if (!$ini_array) {
+		if (!is_array($ini_array)) {
 			throw new Minz_PermissionDeniedException (
 				DATA_PATH . self::CONF_PATH_NAME,
 				Minz_Exception::ERROR
diff --git a/lib/Minz/ModelArray.php b/lib/Minz/ModelArray.php
index e3ec77dc9..ff23dbc83 100644
--- a/lib/Minz/ModelArray.php
+++ b/lib/Minz/ModelArray.php
@@ -45,9 +45,12 @@ class Minz_ModelArray {
 	 * Sauve le tableau $array dans le fichier $filename
 	 **/
 	protected function writeArray($array) {
-		if (!file_put_contents($this->filename, "<?php\n return " . var_export($array, true) . ';', LOCK_EX)) {
+		if (file_put_contents($this->filename, "<?php\n return " . var_export($array, true) . ';', LOCK_EX) === false) {
 			throw new Minz_PermissionDeniedException($this->filename);
 		}
+		if (function_exists('opcache_invalidate')) {
+			opcache_invalidate($this->filename);	//Clear PHP 5.5+ cache for include
+		}
 		return true;
 	}
 
-- 
cgit v1.2.3


From bc4116ea77a927683b2abe8a7b4b4fde6452f7d6 Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Wed, 1 Jan 2014 04:54:44 +0100
Subject: Changement sauvegarde configuration
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Changement oublié dans
https://github.com/marienfressinaud/FreshRSS/commit/66229a5d71b85c0a57d63fa8b1cc6e5729cabfe4
pour https://github.com/marienfressinaud/FreshRSS/issues/126
---
 app/Models/Configuration.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'app/Models/Configuration.php')

diff --git a/app/Models/Configuration.php b/app/Models/Configuration.php
index abd874f27..a39d47888 100644
--- a/app/Models/Configuration.php
+++ b/app/Models/Configuration.php
@@ -79,7 +79,8 @@ class FreshRSS_Configuration {
 	}
 
 	public function save() {
-		if (file_put_contents($this->filename, "<?php\n return " . var_export($array, true) . ';', LOCK_EX) === false) {
+		@rename($this->filename, $this->filename . '.bak');
+		if (file_put_contents($this->filename, "<?php\n return " . var_export($this->data, true) . ';', LOCK_EX) === false) {
 			throw new Minz_PermissionDeniedException($this->filename);
 		}
 		if (function_exists('opcache_invalidate')) {
-- 
cgit v1.2.3


From 8beb15460a3c55c37264fdf414e7dcf9ff4e2a62 Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Wed, 1 Jan 2014 05:06:36 +0100
Subject: Sauvegardes avec extension .bak.php pour plus de sécurité
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Évite le téléchargement
---
 app/Models/Configuration.php | 2 +-
 data/.gitignore              | 2 +-
 lib/Minz/Configuration.php   | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'app/Models/Configuration.php')

diff --git a/app/Models/Configuration.php b/app/Models/Configuration.php
index a39d47888..e0ae3bf6b 100644
--- a/app/Models/Configuration.php
+++ b/app/Models/Configuration.php
@@ -79,7 +79,7 @@ class FreshRSS_Configuration {
 	}
 
 	public function save() {
-		@rename($this->filename, $this->filename . '.bak');
+		@rename($this->filename, $this->filename . '.bak.php');
 		if (file_put_contents($this->filename, "<?php\n return " . var_export($this->data, true) . ';', LOCK_EX) === false) {
 			throw new Minz_PermissionDeniedException($this->filename);
 		}
diff --git a/data/.gitignore b/data/.gitignore
index 1d8393f3b..005982b00 100644
--- a/data/.gitignore
+++ b/data/.gitignore
@@ -4,4 +4,4 @@ config.php
 *.sqlite
 touch.txt
 no-cache.txt
-*.bak
+*.bak.php
diff --git a/lib/Minz/Configuration.php b/lib/Minz/Configuration.php
index fc94d9731..2c30661ed 100644
--- a/lib/Minz/Configuration.php
+++ b/lib/Minz/Configuration.php
@@ -156,7 +156,7 @@ class Minz_Configuration {
 			),
 			'db' => self::$db,
 		);
-		@rename(DATA_PATH . self::CONF_PATH_NAME, DATA_PATH . self::CONF_PATH_NAME . '.bak');
+		@rename(DATA_PATH . self::CONF_PATH_NAME, DATA_PATH . self::CONF_PATH_NAME . '.bak.php');
 		$result = file_put_contents(DATA_PATH . self::CONF_PATH_NAME, "<?php\n return " . var_export($ini_array, true) . ';');
 		if (function_exists('opcache_invalidate')) {
 			opcache_invalidate(DATA_PATH . self::CONF_PATH_NAME);	//Clear PHP 5.5+ cache for include
-- 
cgit v1.2.3


From 67531f796f4c273cc9b078db788fdb51ece824ee Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Wed, 1 Jan 2014 17:01:09 +0100
Subject: HTTP Auth : améliorations  + changelog
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Affichage logo FreshRSS pendant la demande de nom d'utilisateur HTTP
* Meilleure page d'erreur si utilisateur HTTP non-configuré dans
FreshRSS + log

Je recommande donc de placer le .htaccess pour le contrôle d'accès dans
./FreshRSS/p/i/.htaccess et pas plus haut pour une meilleure mise en
cache et messages de connexion.
---
 CHANGELOG                    | 14 ++++++++++++++
 README.md                    | 16 +++++++++-------
 app/FreshRSS.php             | 23 ++++++++++++++++++-----
 app/Models/Configuration.php |  2 +-
 index.html                   |  6 +++---
 index.php                    |  2 +-
 p/index.html                 | 22 ++++++++++++++++++++--
 p/index.php                  |  3 ---
 8 files changed, 66 insertions(+), 22 deletions(-)
 delete mode 100644 p/index.php

(limited to 'app/Models/Configuration.php')

diff --git a/CHANGELOG b/CHANGELOG
index 108e29195..f4b168b41 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,5 +1,19 @@
 # Journal des modifications
 
+## 2014-01-xx FreshRSS 0.7.5
+
+* Nouveau mode multi-utilisateur
+	* L’utilisateur par défaut (administrateur) peut créer et supprimer d’autres utilisateurs
+	* Nécessite un contrôle d’accès, soit :
+		* par HTTP (par exemple sous Apache en créant un fichier ./p/i/.htaccess et .htpasswd)
+			* le nom d’utilisateur HTTP doit correspondre au nom d’utilisateur FreshRSS
+		* par Mozilla Persona, en renseignant l’adresse courriel des utilisateurs
+* Options
+	* Réorganisation des options
+* PHP
+	* Compatibilité PHP 5.5+ avec OPcache
+	* Amélioration des performances
+
 ## 2014-01-xx FreshRSS 0.7
 
 * Installeur
diff --git a/README.md b/README.md
index cfef89781..cf1308c33 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,7 @@
 # FreshRSS
 FreshRSS est un agrégateur de flux RSS à auto-héberger à l’image de [Leed](http://projet.idleman.fr/leed/) ou de [Kriss Feed](http://tontof.net/kriss/feed/).
 Il se veut léger et facile à prendre en main tout en étant un outil puissant et paramétrable.
+Il permet de gérer plusieurs utilisateurs, et dispose d’un mode de lecture anonyme.
 
 * Site officiel : http://freshrss.org
 * Démo : http://marienfressinaud.fr/projets/freshrss/
@@ -21,11 +22,11 @@ Privilégiez pour cela des demandes sur GitHub
 # Pré-requis
 * Serveur Apache2 ou Nginx (non testé sur les autres)
 * PHP 5.2+ (PHP 5.3.3+ recommandé)
- * Requis : [PDO_MySQL](http://php.net/pdo-mysql), [cURL](http://php.net/curl), [LibXML](http://php.net/xml), [PCRE](http://php.net/pcre), [ctype](http://php.net/ctype)
- * Recommandés : [JSON](http://php.net/json), [zlib](http://php.net/zlib), [mbstring](http://php.net/mbstring), [iconv](http://php.net/iconv)
+	* Requis : [PDO_MySQL](http://php.net/pdo-mysql), [cURL](http://php.net/curl), [LibXML](http://php.net/xml), [PCRE](http://php.net/pcre), [ctype](http://php.net/ctype)
+	* Recommandés : [JSON](http://php.net/json), [zlib](http://php.net/zlib), [mbstring](http://php.net/mbstring), [iconv](http://php.net/iconv)
 * MySQL 5.0.3+ (ou SQLite 3.7.4+ à venir)
 * Un navigateur Web récent tel Firefox, Chrome, Opera, Safari, Internet Explorer 9+
- * Fonctionne aussi sur mobile
+	* Fonctionne aussi sur mobile
 
 ![Capture d’écran de FreshRSS](http://marienfressinaud.fr/data/images/freshrss/freshrss_default-design.png)
 
@@ -37,10 +38,11 @@ Privilégiez pour cela des demandes sur GitHub
 5. Tout devrait fonctionner :) En cas de problème, n’hésitez pas à me contacter.
 
 # Contrôle d’accès
-Il est recommandé de limiter l’accès à votre FreshRSS, soit :
+Il est requis pour le mode multi-utilisateur, et recommandé dans tous les cas, de limiter l’accès à votre FreshRSS :
 * En utilisant l’identification par [Mozilla Persona](https://login.persona.org/about) incluse dans FreshRSS
-* En utilisant un contrôle d’accès défini par votre serveur Web
- * Voir par exemple la [documentation d’Apache sur l’authentification](http://httpd.apache.org/docs/trunk/howto/auth.html)
+* En utilisant un contrôle d’accès HTTP défini par votre serveur Web
+	* Voir par exemple la [documentation d’Apache sur l’authentification](http://httpd.apache.org/docs/trunk/howto/auth.html)
+		* Créer dans ce cas un fichier `./p/i/.htaccess` avec un fichier `.htpasswd` correspondant.
 
 # Rafraîchissement automatique des flux
 * Vous pouvez ajouter une tâche CRON sur le script d’actualisation des flux. Par exemple, pour exécuter le script toutes les heures :
@@ -51,6 +53,6 @@ Il est recommandé de limiter l’accès à votre FreshRSS, soit :
 
 # Conseils
 * Pour une meilleure sécurité, faites en sorte que seul le répertoire `./p/` soit accessible depuis le Web, par exemple en faisant pointer un sous-domaine sur le répertoire `./p/`.
-* Les données personnelles se trouvent dans le répertoire `./data/` (déjà protégé par un .htaccess pour Apache - vérifiez que cela fonctionne -, à protéger vous-même dans le cas d’autres serveurs Web).
+	* En particulier, les données personnelles se trouvent dans le répertoire `./data/`.
 * Le fichier `./constants.php` définit les chemins d’accès aux répertoires clés de l’application. Si vous les bougez, tout se passe ici.
 * En cas de problème, les logs peuvent être utile à lire, soit depuis l’interface de FreshRSS, soit manuellement depuis `./data/log/*.log`.
diff --git a/app/FreshRSS.php b/app/FreshRSS.php
index 0af0c01da..4ebb6d631 100644
--- a/app/FreshRSS.php
+++ b/app/FreshRSS.php
@@ -51,12 +51,25 @@ class FreshRSS extends Minz_FrontController {
 
 		try {
 			$this->conf = new FreshRSS_Configuration($currentUser);
-		} catch (Minz_Exception $e) {
-			Minz_Session::_param('currentUser', '');
-			die('Invalid configuration for user [' . $currentUser . ']! ' . $e->getMessage());	//Permission denied or conf file does not exist
+			Minz_View::_param ('conf', $this->conf);
+			Minz_Session::_param('currentUser', $currentUser);
+		} catch (Minz_Exception $me) {
+			$loginOk = false;
+			try {
+				$this->conf = new FreshRSS_Configuration(Minz_Configuration::defaultUser());
+				Minz_Session::_param('currentUser', Minz_Configuration::defaultUser());
+				Minz_View::_param('conf', $this->conf);
+				$notif = array(
+					'type' => 'bad',
+					'content' => 'Invalid configuration for user [' . $currentUser . ']!',
+				);
+				Minz_Session::_param ('notification', $notif);
+				Minz_Log::record ($notif['content'] . ' ' . $me->getMessage(), Minz_Log::WARNING);
+				Minz_Session::_param('currentUser', '');
+			} catch (Exception $e) {
+				die($e->getMessage());
+			}
 		}
-		Minz_View::_param ('conf', $this->conf);
-		Minz_Session::_param('currentUser', $currentUser);
 
 		if ($loginOk) {
 			switch (Minz_Configuration::authType()) {
diff --git a/app/Models/Configuration.php b/app/Models/Configuration.php
index e0ae3bf6b..d44420f56 100644
--- a/app/Models/Configuration.php
+++ b/app/Models/Configuration.php
@@ -64,7 +64,7 @@ class FreshRSS_Configuration {
 	public function __construct ($user) {
 		$this->filename = DATA_PATH . '/' . $user . '_user.php';
 
-		$data = include($this->filename);
+		$data = @include($this->filename);
 		if (!is_array($data)) {
 			throw new Minz_PermissionDeniedException($this->filename);
 		}
diff --git a/index.html b/index.html
index 1bfdea859..6ac025960 100644
--- a/index.html
+++ b/index.html
@@ -2,12 +2,12 @@
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en-GB" lang="en-GB">
 <head>
 <meta charset="UTF-8" />
-<meta http-equiv="Refresh" content="0; url=p/i/" />
+<meta http-equiv="Refresh" content="0; url=p/" />
 <title>Redirection</title>
-<meta name="robots" content="noindex" />
+<meta name="robots" content="noindex,nofollow" />
 </head>
 
 <body>
-<p><a href="p/i/">FreshRSS</a></p>
+<p><a href="p/">FreshRSS</a></p>
 </body>
 </html>
diff --git a/index.php b/index.php
index 3fdae4285..828cca39a 100644
--- a/index.php
+++ b/index.php
@@ -1,3 +1,3 @@
 <?php
-header('Location: p/i/', true, 301);
+header('Location: p/', true, 301);
 include('index.html');
diff --git a/p/index.html b/p/index.html
index af91b717e..eaa0d71f8 100644
--- a/p/index.html
+++ b/p/index.html
@@ -2,11 +2,29 @@
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en-GB" lang="en-GB">
 <head>
 <meta charset="UTF-8" />
+<meta name="viewport" content="initial-scale=1.0" />
 <meta http-equiv="Refresh" content="0; url=i/" />
-<title>Redirection</title>
+<title>FreshRSS</title>
+<meta name="robots" content="noindex,nofollow" />
+<link rel="icon" href="favicon.ico" />
+<style>
+body {
+	font-family: sans-serif;
+	text-align: center;
+}
+h1 {
+	font-size: xx-large;
+	text-shadow: 1px -1px 0 #CCCCCC;
+}
+h1 a {
+	color: #0062BE;
+	text-decoration: none;
+}
+</style>
 </head>
 
 <body>
-<p><a href="i/">FreshRSS</a></p>
+<h1><a href="i/">FreshRSS</a></h1>
+<p><a href="i/"><img class="logo" width="25%" src="themes/icons/icon.svg" alt="⊚" /></a></p>
 </body>
 </html>
diff --git a/p/index.php b/p/index.php
deleted file mode 100644
index e90662078..000000000
--- a/p/index.php
+++ /dev/null
@@ -1,3 +0,0 @@
-<?php
-header('Location: i/', true, 301);
-include('index.html');
-- 
cgit v1.2.3


From 7db271e95ebab52c31c78f51270de71af1d750d2 Mon Sep 17 00:00:00 2001
From: Alexis Degrugillier <github@ainw.org>
Date: Fri, 3 Jan 2014 00:01:29 -0500
Subject: Add a shortcut to open the share div. The default shortcut is "s".

---
 app/Models/Configuration.php            |  1 +
 app/i18n/en.php                         |  1 +
 app/i18n/fr.php                         |  1 +
 app/views/configure/shortcut.phtml      |  7 +++++++
 app/views/helpers/javascript_vars.phtml |  3 ++-
 p/scripts/main.js                       | 12 ++++++++++++
 6 files changed, 24 insertions(+), 1 deletion(-)

(limited to 'app/Models/Configuration.php')

diff --git a/app/Models/Configuration.php b/app/Models/Configuration.php
index d44420f56..c29e74603 100644
--- a/app/Models/Configuration.php
+++ b/app/Models/Configuration.php
@@ -33,6 +33,7 @@ class FreshRSS_Configuration {
 			'prev_entry' => 'k',
 			'collapse_entry' => 'c',
 			'load_more' => 'm',
+			'auto_share' => 's',
 		),
 		'topline_read' => true,
 		'topline_favorite' => true,
diff --git a/app/i18n/en.php b/app/i18n/en.php
index 28aa1296a..06bbf48e6 100644
--- a/app/i18n/en.php
+++ b/app/i18n/en.php
@@ -123,6 +123,7 @@ return array (
 	'next_page'			=> 'Skip to the next page',
 	'previous_page'			=> 'Skip to the previous page',
 	'collapse_article'		=> 'Collapse current article',
+	'auto_share'			=> 'Share current article',
 
 	'file_to_import'		=> 'File to import',
 	'import'			=> 'Import',
diff --git a/app/i18n/fr.php b/app/i18n/fr.php
index 39aeaf29a..cb689610b 100644
--- a/app/i18n/fr.php
+++ b/app/i18n/fr.php
@@ -123,6 +123,7 @@ return array (
 	'next_page'			=> 'Passer à la page suivante',
 	'previous_page'			=> 'Passer à la page précédente',
 	'collapse_article'		=> 'Refermer l’article courant',
+	'auto_share'			=> 'Partager l’article courant',
 
 	'file_to_import'		=> 'Fichier à importer',
 	'import'			=> 'Importer',
diff --git a/app/views/configure/shortcut.phtml b/app/views/configure/shortcut.phtml
index 2e564a7b6..b0867f711 100644
--- a/app/views/configure/shortcut.phtml
+++ b/app/views/configure/shortcut.phtml
@@ -68,6 +68,13 @@
 			</div>
 		</div>
 
+		<div class="form-group">
+			<label class="group-name" for="auto_share_shortcut"><?php echo Minz_Translate::t ('auto_share'); ?></label>
+			<div class="group-controls">
+				<input type="text" id="auto_share_shortcut" name="shortcuts[auto_share]" list="keys" value="<?php echo $s['auto_share']; ?>" />
+			</div>
+		</div>
+
 		<div class="form-group form-actions">
 			<div class="group-controls">
 				<button type="submit" class="btn btn-important"><?php echo Minz_Translate::t ('save'); ?></button>
diff --git a/app/views/helpers/javascript_vars.phtml b/app/views/helpers/javascript_vars.phtml
index 8419b9391..92c068f7e 100644
--- a/app/views/helpers/javascript_vars.phtml
+++ b/app/views/helpers/javascript_vars.phtml
@@ -18,7 +18,8 @@
 			'prev_entry:"', $s['prev_entry'], '",',
 			'next_entry:"', $s['next_entry'], '",',
 			'collapse_entry:"', $s['collapse_entry'], '",',
-			'load_more:"', $s['load_more'], '"',
+			'load_more:"', $s['load_more'], '",',
+			'auto_share:"', $s['auto_share'], '"',
 		"},\n";
 
 	if (Minz_Request::param ('output') === 'global') {
diff --git a/p/scripts/main.js b/p/scripts/main.js
index ef05eb2fb..43b0384e8 100644
--- a/p/scripts/main.js
+++ b/p/scripts/main.js
@@ -220,6 +220,13 @@ function collapse_entry() {
 	$(".flux.current").toggleClass("active");
 }
 
+function auto_share() {
+	var share = $(".flux.current.active").find('.dropdown-target[id^="dropdown-share"]');
+	if (share.length) {
+		window.location.replace('/i/#' + share.attr('id'));
+	}
+}
+
 function inMarkViewport(flux, box_to_follow, relative_follow) {
 	var top = flux.position().top;
 	if (relative_follow) {
@@ -338,6 +345,11 @@ function init_shortcuts() {
 	}, {
 		'disable_in_input': true
 	});
+	shortcut.add(shortcuts.auto_share, function () {
+		auto_share();
+	}, {
+		'disable_in_input': true
+	});
 
 	// Touches de navigation
 	shortcut.add(shortcuts.prev_entry, prev_entry, {
-- 
cgit v1.2.3


From eb50ab3b61ee2280dac2696598a58803e246fe22 Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Sat, 11 Jan 2014 16:48:10 +0100
Subject: Mot de passe + nonce serveur
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Début de https://github.com/marienfressinaud/FreshRSS/issues/104
---
 README.md                                |  7 ++-----
 app/Controllers/javascriptController.php | 27 +++++++++++++++++++++++++++
 app/Models/Configuration.php             |  4 ++++
 app/views/javascript/nonce.phtml         |  2 ++
 4 files changed, 35 insertions(+), 5 deletions(-)
 create mode 100644 app/views/javascript/nonce.phtml

(limited to 'app/Models/Configuration.php')

diff --git a/README.md b/README.md
index 96e25f4df..4100a8638 100644
--- a/README.md
+++ b/README.md
@@ -74,17 +74,14 @@ mysqldump -u utilisateur -p --databases freshrss > freshrss.sql
 ```
 
 
-
----
-
 # Bibliothèques incluses
-* [SimplePie](https://github.com/simplepie/simplepie)
+* [SimplePie](http://simplepie.org/)
 * [MINZ](https://github.com/marienfressinaud/MINZ)
 * [php-http-304](http://alexandre.alapetite.fr/doc-alex/php-http-304/)
 * [jQuery](http://jquery.com/)
 * [keyboard_shortcuts](http://www.openjs.com/scripts/events/keyboard_shortcuts/)
 
-## Uniquement dans certaines configurations
+## Uniquement pour certaines options
 * [bcrypt.js](https://github.com/dcodeIO/bcrypt.js)
 * [phpQuery](http://code.google.com/p/phpquery/)
 * [Lazy Load](http://www.appelsiini.net/projects/lazyload)
diff --git a/app/Controllers/javascriptController.php b/app/Controllers/javascriptController.php
index 2d0ff4984..e29f439d8 100755
--- a/app/Controllers/javascriptController.php
+++ b/app/Controllers/javascriptController.php
@@ -16,4 +16,31 @@ class FreshRSS_javascript_Controller extends Minz_ActionController {
 		$catDAO = new FreshRSS_CategoryDAO();
 		$this->view->categories = $catDAO->listCategories(true, false);
 	}
+
+	// For Web-form login
+	public function nonceAction() {
+		header('Content-Type: application/json; charset=UTF-8');
+		header('Last-Modified: ' . gmdate('D, d M Y H:i:s \G\M\T'));
+		header('Expires: 0');
+		header('Cache-Control: private, no-cache, no-store, must-revalidate');
+		header('Pragma: no-cache');
+
+		$user = isset($_GET['user']) ? $_GET['user'] : '';
+		if (ctype_alnum($user)) {
+			try {
+				$conf = new FreshRSS_Configuration($user);
+				$hash = $conf->passwordHash;	//CRYPT_BLOWFISH - Blowfish hashing with a salt as follows: "$2a$", "$2x$" or "$2y$", a two digit cost parameter, "$", and 22 characters from the alphabet "./0-9A-Za-z".
+				if (strlen($hash) >= 60) {
+					$this->view->salt1 = substr($hash, 0, 29);
+					$this->view->nonce = sha1(Minz_Configuration::salt() . uniqid(mt_rand(), true));
+					Minz_Session::_param ('nonce', $this->view->nonce);
+					return;	//Success
+				}
+			} catch (Minz_Exception $me) {
+				Minz_Log::record ('Login failure: ' . $me->getMessage(), Minz_Log::WARNING);
+			}
+		}
+		$this->view->nonce = '';	//Failure
+		$this->view->salt1 = '';
+	}
 }
diff --git a/app/Models/Configuration.php b/app/Models/Configuration.php
index c29e74603..8f394737a 100644
--- a/app/Models/Configuration.php
+++ b/app/Models/Configuration.php
@@ -9,6 +9,7 @@ class FreshRSS_Configuration {
 		'keep_history_default' => 0,
 		'mail_login' => '',
 		'token' => '',
+		'passwordHash' => '',	//CRYPT_BLOWFISH
 		'posts_per_page' => 20,
 		'view_mode' => 'normal',
 		'default_view' => 'not_read',
@@ -162,6 +163,9 @@ class FreshRSS_Configuration {
 			}
 		}
 	}
+	public function _passwordHash ($value) {
+		$this->data['passwordHash'] = ctype_graph($value) && (strlen($value) >= 60) ? $value : '';
+	}
 	public function _mail_login ($value) {
 		$value = filter_var($value, FILTER_VALIDATE_EMAIL);
 		if ($value) {
diff --git a/app/views/javascript/nonce.phtml b/app/views/javascript/nonce.phtml
new file mode 100644
index 000000000..4ac46c8fc
--- /dev/null
+++ b/app/views/javascript/nonce.phtml
@@ -0,0 +1,2 @@
+<?php
+echo json_encode(array('salt1' => $this->salt1, 'nonce' => $this->nonce));
-- 
cgit v1.2.3


From f720d41cbfb18edc1b0a694a7213682b96befa1f Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Mon, 13 Jan 2014 22:27:22 +0100
Subject: Mise à jour nom thèmes + chargement robuste des thèmes
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Renomme : default -> Origine
En cas de thème introuvable, charge le thème par défaut, sinon le
premier disponible.
https://github.com/marienfressinaud/FreshRSS/issues/120
---
 app/Controllers/configureController.php  |   6 +-
 app/FreshRSS.php                         |   5 +-
 app/Models/Configuration.php             |   2 +-
 app/Models/Themes.php                    |  28 +-
 app/views/configure/display.phtml        |   5 +-
 p/themes/Dark/freshrss.css               | 862 ++++++++++++++++++++++++++++++
 p/themes/Dark/global.css                 | 487 +++++++++++++++++
 p/themes/Dark/loader.gif                 | Bin 0 -> 404 bytes
 p/themes/Dark/metadata.json              |   7 +
 p/themes/Flat/freshrss.css               | 817 ++++++++++++++++++++++++++++
 p/themes/Flat/global.css                 | 495 +++++++++++++++++
 p/themes/Flat/icons/add.svg              |  30 ++
 p/themes/Flat/icons/all.svg              |  32 ++
 p/themes/Flat/icons/close.svg            |  28 +
 p/themes/Flat/icons/configure.svg        |  31 ++
 p/themes/Flat/icons/down.svg             |  31 ++
 p/themes/Flat/icons/next.svg             |  31 ++
 p/themes/Flat/icons/prev.svg             |  31 ++
 p/themes/Flat/icons/refresh.svg          |  31 ++
 p/themes/Flat/icons/search.svg           |  32 ++
 p/themes/Flat/icons/up.svg               |  31 ++
 p/themes/Flat/loader.gif                 | Bin 0 -> 4251 bytes
 p/themes/Flat/metadata.json              |   7 +
 p/themes/Origine/freshrss.css            | 880 +++++++++++++++++++++++++++++++
 p/themes/Origine/global.css              | 503 ++++++++++++++++++
 p/themes/Origine/loader.gif              | Bin 0 -> 4167 bytes
 p/themes/Origine/metadata.json           |   7 +
 p/themes/default/freshrss.css            | 880 -------------------------------
 p/themes/default/global.css              | 503 ------------------
 p/themes/default/loader.gif              | Bin 4167 -> 0 bytes
 p/themes/default/metadata.json           |   7 -
 p/themes/default_dark/freshrss.css       | 862 ------------------------------
 p/themes/default_dark/global.css         | 487 -----------------
 p/themes/default_dark/loader.gif         | Bin 404 -> 0 bytes
 p/themes/default_dark/metadata.json      |   7 -
 p/themes/flat-design/freshrss.css        | 817 ----------------------------
 p/themes/flat-design/global.css          | 495 -----------------
 p/themes/flat-design/icons/add.svg       |  30 --
 p/themes/flat-design/icons/all.svg       |  32 --
 p/themes/flat-design/icons/close.svg     |  28 -
 p/themes/flat-design/icons/configure.svg |  31 --
 p/themes/flat-design/icons/down.svg      |  31 --
 p/themes/flat-design/icons/next.svg      |  31 --
 p/themes/flat-design/icons/prev.svg      |  31 --
 p/themes/flat-design/icons/refresh.svg   |  31 --
 p/themes/flat-design/icons/search.svg    |  32 --
 p/themes/flat-design/icons/up.svg        |  31 --
 p/themes/flat-design/loader.gif          | Bin 4251 -> 0 bytes
 p/themes/flat-design/metadata.json       |   7 -
 49 files changed, 4407 insertions(+), 4385 deletions(-)
 create mode 100644 p/themes/Dark/freshrss.css
 create mode 100644 p/themes/Dark/global.css
 create mode 100644 p/themes/Dark/loader.gif
 create mode 100644 p/themes/Dark/metadata.json
 create mode 100644 p/themes/Flat/freshrss.css
 create mode 100644 p/themes/Flat/global.css
 create mode 100644 p/themes/Flat/icons/add.svg
 create mode 100644 p/themes/Flat/icons/all.svg
 create mode 100644 p/themes/Flat/icons/close.svg
 create mode 100644 p/themes/Flat/icons/configure.svg
 create mode 100644 p/themes/Flat/icons/down.svg
 create mode 100644 p/themes/Flat/icons/next.svg
 create mode 100644 p/themes/Flat/icons/prev.svg
 create mode 100644 p/themes/Flat/icons/refresh.svg
 create mode 100644 p/themes/Flat/icons/search.svg
 create mode 100644 p/themes/Flat/icons/up.svg
 create mode 100644 p/themes/Flat/loader.gif
 create mode 100644 p/themes/Flat/metadata.json
 create mode 100644 p/themes/Origine/freshrss.css
 create mode 100644 p/themes/Origine/global.css
 create mode 100644 p/themes/Origine/loader.gif
 create mode 100644 p/themes/Origine/metadata.json
 delete mode 100644 p/themes/default/freshrss.css
 delete mode 100644 p/themes/default/global.css
 delete mode 100644 p/themes/default/loader.gif
 delete mode 100644 p/themes/default/metadata.json
 delete mode 100644 p/themes/default_dark/freshrss.css
 delete mode 100644 p/themes/default_dark/global.css
 delete mode 100644 p/themes/default_dark/loader.gif
 delete mode 100644 p/themes/default_dark/metadata.json
 delete mode 100644 p/themes/flat-design/freshrss.css
 delete mode 100644 p/themes/flat-design/global.css
 delete mode 100644 p/themes/flat-design/icons/add.svg
 delete mode 100644 p/themes/flat-design/icons/all.svg
 delete mode 100644 p/themes/flat-design/icons/close.svg
 delete mode 100644 p/themes/flat-design/icons/configure.svg
 delete mode 100644 p/themes/flat-design/icons/down.svg
 delete mode 100644 p/themes/flat-design/icons/next.svg
 delete mode 100644 p/themes/flat-design/icons/prev.svg
 delete mode 100644 p/themes/flat-design/icons/refresh.svg
 delete mode 100644 p/themes/flat-design/icons/search.svg
 delete mode 100644 p/themes/flat-design/icons/up.svg
 delete mode 100644 p/themes/flat-design/loader.gif
 delete mode 100644 p/themes/flat-design/metadata.json

(limited to 'app/Models/Configuration.php')

diff --git a/app/Controllers/configureController.php b/app/Controllers/configureController.php
index 5b5770cbe..70144a8db 100755
--- a/app/Controllers/configureController.php
+++ b/app/Controllers/configureController.php
@@ -157,7 +157,11 @@ class FreshRSS_configure_Controller extends Minz_ActionController {
 				'scroll' => Minz_Request::param('mark_scroll', false),
 				'reception' => Minz_Request::param('mark_upon_reception', false),
 			));
-			$this->view->conf->_theme(Minz_Request::param('theme', 'default'));
+			$themeId = Minz_Request::param('theme', '');
+			if ($themeId == '') {
+				$themeId = FreshRSS_Themes::defaultTheme;
+			}
+			$this->view->conf->_theme($themeId);
 			$this->view->conf->_topline_read(Minz_Request::param('topline_read', false));
 			$this->view->conf->_topline_favorite(Minz_Request::param('topline_favorite', false));
 			$this->view->conf->_topline_date(Minz_Request::param('topline_date', false));
diff --git a/app/FreshRSS.php b/app/FreshRSS.php
index e64a1986b..52f34c6e2 100644
--- a/app/FreshRSS.php
+++ b/app/FreshRSS.php
@@ -114,11 +114,10 @@ class FreshRSS extends Minz_FrontController {
 	}
 
 	private function loadStylesAndScripts ($loginOk) {
-		$theme = FreshRSS_Themes::get_infos($this->conf->theme);
+		$theme = FreshRSS_Themes::load($this->conf->theme);
 		if ($theme) {
-			FreshRSS_Themes::setThemeId($this->conf->theme);
 			foreach($theme['files'] as $file) {
-				Minz_View::appendStyle (Minz_Url::display ('/themes/' . $theme['path'] . '/' . $file . '?' . @filemtime(PUBLIC_PATH . '/themes/' . $theme['path'] . '/' . $file)));
+				Minz_View::appendStyle (Minz_Url::display ('/themes/' . $theme['id'] . '/' . $file . '?' . @filemtime(PUBLIC_PATH . '/themes/' . $theme['path'] . '/' . $file)));
 			}
 		}
 
diff --git a/app/Models/Configuration.php b/app/Models/Configuration.php
index 8f394737a..f3fb76e72 100644
--- a/app/Models/Configuration.php
+++ b/app/Models/Configuration.php
@@ -25,7 +25,7 @@ class FreshRSS_Configuration {
 			'scroll' => false,
 			'reception' => false,
 		),
-		'theme' => 'default',
+		'theme' => 'Origine',
 		'shortcuts' => array(
 			'mark_read' => 'r',
 			'mark_favorite' => 'f',
diff --git a/app/Models/Themes.php b/app/Models/Themes.php
index a52812339..c7099a1df 100644
--- a/app/Models/Themes.php
+++ b/app/Models/Themes.php
@@ -3,13 +3,17 @@
 class FreshRSS_Themes extends Minz_Model {
 	private static $themesUrl = '/themes/';
 	private static $defaultIconsUrl = '/themes/icons/';
+	public static $defaultTheme = 'Origine';
 
-	public static function get() {
-		$themes_list = array_diff(
+	public static function getList() {
+		return array_values(array_diff(
 			scandir(PUBLIC_PATH . self::$themesUrl),
 			array('..', '.')
-		);
+		));
+	}
 
+	public static function get() {
+		$themes_list = self::getList();
 		$list = array();
 		foreach ($themes_list as $theme_dir) {
 			$theme = self::get_infos($theme_dir);
@@ -28,7 +32,7 @@ class FreshRSS_Themes extends Minz_Model {
 				$content = file_get_contents($json_filename);
 				$res = json_decode($content, true);
 				if ($res && isset($res['files']) && is_array($res['files'])) {
-					$res['path'] = $theme_id;
+					$res['id'] = $theme_id;
 					return $res;
 				}
 			}
@@ -39,12 +43,26 @@ class FreshRSS_Themes extends Minz_Model {
 	private static $themeIconsUrl;
 	private static $themeIcons;
 
-	public static function setThemeId($theme_id) {
+	public static function load($theme_id) {
+		$infos = self::get_infos($theme_id);
+		if (!$infos) {
+			if ($theme_id !== self::$defaultTheme) {	//Fall-back to default theme
+				return self::load(self::$defaultTheme);
+			}
+			$themes_list = self::getList();
+			if (!empty($themes_list)) {
+				if ($theme_id !== $themes_list[0]) {	//Fall-back to first theme
+					return self::load($themes_list[0]);
+				}
+			}
+			return false;
+		}
 		self::$themeIconsUrl = self::$themesUrl . $theme_id . '/icons/';
 		self::$themeIcons = is_dir(PUBLIC_PATH . self::$themeIconsUrl) ? array_fill_keys(array_diff(
 			scandir(PUBLIC_PATH . self::$themeIconsUrl),
 			array('..', '.')
 		), 1) : array();
+		return $infos;
 	}
 
 	public static function icon($name, $urlOnly = false) {
diff --git a/app/views/configure/display.phtml b/app/views/configure/display.phtml
index 3cc5442fb..725356c8d 100644
--- a/app/views/configure/display.phtml
+++ b/app/views/configure/display.phtml
@@ -21,9 +21,10 @@
 		<div class="form-group">
 			<label class="group-name" for="theme"><?php echo Minz_Translate::t ('theme'); ?></label>
 			<div class="group-controls">
-				<select name="theme" id="theme">
+				<select name="theme" id="theme" required="">
+				<option></option>
 				<?php foreach ($this->themes as $theme) { ?>
-				<option value="<?php echo $theme['path']; ?>"<?php echo $this->conf->theme === $theme['path'] ? ' selected="selected"' : ''; ?>>
+				<option value="<?php echo $theme['id']; ?>"<?php echo $this->conf->theme === $theme['id'] ? ' selected="selected"' : ''; ?>>
 					<?php echo $theme['name'] . ' — ' . Minz_Translate::t ('by') . ' ' . $theme['author']; ?> 
 				</option>
 				<?php } ?>
diff --git a/p/themes/Dark/freshrss.css b/p/themes/Dark/freshrss.css
new file mode 100644
index 000000000..e9eb2c705
--- /dev/null
+++ b/p/themes/Dark/freshrss.css
@@ -0,0 +1,862 @@
+@charset "UTF-8";
+
+/* STRUCTURE */
+.header {
+	display: table;
+	width: 100%;
+	background: #1c1c1c;
+	table-layout: fixed;
+}
+	.header > .item {
+		display: table-cell;
+		padding: 10px 0;
+		border-bottom: 1px solid #2f2f2f;
+		vertical-align: middle;
+		text-align: center;
+	}
+		.header > .item.title {
+			width: 250px;
+			white-space: nowrap;
+		}
+			.logo {
+				display: inline-block;
+				font-size: 48px;
+				height: 32px;
+				width: 32px;
+				padding: 10px;
+			}
+			.header > .item.title h1 {
+				display: inline-block;
+				margin: 0;
+			}
+		.header > .item.search input {
+			width: 230px;
+			transition: width 200ms linear;
+		}
+			.header .item.search input:focus {
+				width: 330px;
+			}
+		.header > .item.configure {
+			width: 100px;
+		}
+
+.item a:hover {
+	text-decoration: none;
+}
+
+#global {
+	display: table;
+	width: 100%;
+	height: 100%;
+	background: #1c1c1c;
+	table-layout: fixed;
+}
+	.aside {
+		display: table-cell;
+		height: 100%;
+		width: 250px;
+		vertical-align: top;
+		border-right: 1px solid #2f2f2f;
+		background: #1c1c1c;
+	}
+		.aside .nav-form input {
+			width: 180px;
+		}
+		.aside.aside_flux {
+			padding: 10px 0 40px;
+		}
+		.aside.aside_feed .nav-form input {
+			width: 140px;
+		}
+		.aside.aside_feed .nav-form .dropdown .dropdown-menu {
+			right: -20px;
+		}
+		.aside.aside_feed .nav-form .dropdown .dropdown-menu:after {
+			right: 33px;
+		}
+
+	.nav-login {
+		display: none;
+	}
+
+	.nav_menu {
+		width: 100%;
+		background: #1c1c1c;
+		border-bottom: 1px solid #2f2f2f;
+		text-align: center;
+		padding: 5px 0;
+	}
+		.nav_menu .search {
+			display:none;
+		}
+
+.favicon {
+	height: 16px;
+	width: 16px;
+}
+
+.categories {
+	margin: 0;
+	padding: 0;
+	text-align: center;
+	list-style: none;
+}
+	.category {
+		display: block;
+		width: 220px;
+		margin: 10px auto;
+		text-align: left;
+		overflow: hidden;
+		white-space: nowrap;
+		text-overflow: ellipsis;
+	}
+		.category .btn:first-child {
+			width: 195px;
+			position: relative;
+		}
+		.category.stick .btn:first-child {
+			width:160px;
+		}
+		.category .btn:first-child:not([data-unread="0"]):after {
+			content: attr(data-unread);
+			position: absolute;
+			top: 3px; right: 3px;
+			padding: 1px 5px;
+			background: #1a1a1a;
+			color: #888;
+			font-size: 90%;
+			border: 1px solid #000;
+			border-radius: 5px;
+		}
+		.category + .feeds:not(.active) {
+			display:none;
+		}
+	.categories .feeds {
+		width: 100%;
+		margin: 0;
+		list-style: none;
+	}
+		.categories .feeds .item.active {
+			background: #26303F;
+		}
+		.categories .feeds .item.active .feed {
+			color: #888;
+		}
+		.categories .feeds .item.empty .feed {
+			color: #e67e22;
+		}
+		.categories .feeds .item.empty.active {
+			background: #e67e22;
+		}
+		.categories .feeds .item.empty.active .feed {
+			color: #fff;
+		}
+		.categories .feeds .item.error .feed {
+			color: #BD362F;
+		}
+		.categories .feeds .item .feed {
+			display: inline-block;
+			margin: 0;
+			width: 165px;
+			line-height: 35px;
+			font-size: 90%;
+			vertical-align: middle;
+			text-align: left;
+			overflow: hidden;
+			white-space: nowrap;
+			text-overflow: ellipsis;
+		}
+		.feed:not([data-unread="0"]):before {
+			content: "(" attr(data-unread) ") ";
+		}
+		.categories .feeds .dropdown-menu {
+			left: 0;
+		}
+		.categories .feeds .dropdown-menu:after {
+			left: 2px;
+		}
+		.categories .feeds .item .dropdown-toggle > .icon {
+			visibility: hidden;
+			cursor: pointer;
+		}
+			.categories .feeds .item .dropdown-target:target ~ .dropdown-toggle > .icon,
+			.categories .feeds .item:hover .dropdown-toggle > .icon,
+			.categories .feeds .item.active .dropdown-toggle > .icon {
+				background-color: #1c1c1c;
+				border-radius: 3px;
+				visibility: visible;
+			}
+
+.post {
+	padding: 10px 50px;
+}
+	.post form {
+		margin: 10px 0;
+	}
+
+.day {
+	min-height: 50px;
+	padding: 0 10px;
+	font-size: 130%;
+	font-weight: bold;
+	line-height: 50px;
+	background: #1c1c1c;
+	border-top: 1px solid #888;
+	border-bottom: 1px solid #888;
+}
+	.day:first-child {
+		border-top: none;
+	}
+	.day .name {
+		position: absolute;
+		right: 0;
+		width: 50%;
+		height: 1.5em;
+		padding: 0 10px 0 0;
+		overflow: hidden;
+		color: #aab;
+		font-size: 1.8em;
+		opacity: .3;
+		text-shadow: 0px -1px 0px #333;
+		font-style: italic;
+		white-space: nowrap;
+		text-overflow: ellipsis;
+		text-align: right;
+	}
+
+.flux {
+	border-left: 3px solid #aaa;
+	background: #1c1c1c;
+}
+	.flux.not_read {
+		border-left: 3px solid #FF5300;
+		background: #1c1c1c;
+	}
+	.flux.favorite {
+		border-left: 3px solid #FFC300;
+		background: #1c1c1c;
+	}
+	.flux.current {
+		border-left: 3px solid #0062BE;
+		background: #1a1a1a;
+	}
+
+	.flux_header {
+		background: inherit;
+		height: 25px;
+		font-size: 12px;
+		border-top: 1px solid #2f2f2f;
+		cursor: pointer;
+	}
+		.flux .item {
+			line-height: 40px;
+			white-space: nowrap;
+		}
+		.flux_header > .item {
+			overflow: hidden;
+			text-overflow: ellipsis;
+		}
+		.flux .item.manage {
+			width: 40px;
+			text-align: center;
+		}
+		.flux .item.website {
+			width: 200px;
+		}
+			.website .favicon {
+				padding: 5px;
+			}
+		.flux .item.title {
+			background: inherit;
+		}
+		.flux:hover .item.title {
+			border-right: 2px solid rgba(127, 127, 127, 0.1);
+			padding-right: 1em;
+			position: absolute;
+		}
+			.flux .item.title a {
+				color: #888;
+				outline: none;
+			}
+			.flux.not_read .item.title,
+			.flux.current .item.title {
+				font-weight: bold;
+			}
+		.flux .item.date {
+			width: 200px;
+			padding:0 5px 0 0;
+			text-align: right;
+			font-size: 10px;
+			color: #666;
+		}
+		.link {
+			width: 40px;
+			text-align: center;
+		}
+
+#stream.reader .flux {
+	padding: 0 0 30px;
+	border: none;
+	background: #1c1c1c;
+	color: #888;
+}
+	#stream.reader .flux .author {
+		margin: 0 0 10px;
+		font-size: 90%;
+		color: #666;
+	}
+
+#stream.global {
+	text-align: center;
+}
+	#stream.global .box-category {
+		display: inline-block;
+		width: 280px;
+		margin: 20px 10px;
+		vertical-align: top;
+		background: #1a1a1a;
+		border: 1px solid #000;
+		border-radius: 5px;
+		text-align: left;
+		box-shadow: 0 0 5px #2f2f2f;
+	}
+		#stream.global .category {
+			width: 100%;
+			margin: 0;
+		}
+		#stream.global .btn {
+			display: block;
+			width: auto;
+			height: 35px;
+			margin: 0;
+			padding: 0 10px;
+			background: #26303F;
+			border: none;
+			border-bottom: 1px solid #2f2f2f;
+			border-radius: 5px 5px 0 0;
+			line-height: 35px;
+			font-size: 120%;
+		}
+			#stream.global .btn:not([data-unread="0"]) {
+				font-weight:bold;
+			}
+			#stream.global .btn:first-child:not([data-unread="0"]):after {
+				top: 0; right: 5px;
+				border: 0;
+				background: none;
+				color: #666;
+				font-weight: bold;
+				box-shadow: none;
+			}
+		#stream.global .box-category .feeds {
+			display: block;
+			max-height: 250px;
+			margin: 0;
+			list-style: none;
+			overflow: auto;
+		}
+			#stream.global .box-category .feeds .item {
+				padding: 2px 10px;
+				font-size: 90%;
+			}
+		#stream.global .box-category .feed {
+			width: 220px;
+		}
+
+.content {
+	min-height: 150px;
+	max-width: 550px;
+	margin: 0 auto;
+	padding: 20px 10px;
+	line-height: 170%;
+	word-wrap: break-word;
+}
+	.content h1, .content h2, .content h3 {
+		margin: 20px 0 5px;
+	}
+	.content > .title {
+		font-size: x-large;
+		margin: 0;
+	}
+
+	.content p {
+		margin: 0 0 20px;
+	}
+	img.big {
+		display: block;
+		margin: 10px auto;
+	}
+	figure img.big {
+		margin: 0;
+	}
+	.content hr {
+		margin: 30px 0;
+		height: 1px;
+		background: #ddd;
+		border: 0;
+	}
+	.content pre {
+		margin: 10px auto;
+		padding: 10px;
+		overflow: auto;
+		background: #000;
+		color: #fff;
+		font-size: 110%;
+	}
+	.content q, .content blockquote {
+		display: block;
+		margin: 5px 0;
+		padding: 5px 20px;
+		font-style: italic;
+		border-left: 4px solid #ccc;
+		color: #666;
+	}
+		.content blockquote p {
+			margin: 0;
+		}
+
+#panel {
+	display: none;
+	position: fixed;
+	top: 10px; bottom: 10px;
+	left: 100px; right: 100px;
+	overflow: auto;
+	background: #1c1c1c;
+	border: 1px solid #95a5a6;
+	border-radius: 5px;
+}
+	#panel .close {
+		position: fixed;
+		top: 10px; right: 0;
+		display: inline-block;
+		width: 26px;
+		height: 26px;
+		margin: 0 10px 0 0;
+		border: 1px solid #ccc;
+		border-radius: 20px;
+		text-align: center;
+		line-height: 26px;
+		background: #fff;
+	}
+
+#overlay {
+	display: none;
+	position: fixed;
+	top: 0; bottom: 0;
+	left: 0; right: 0;
+	background: rgba(0, 0, 0, 0.9);
+}
+
+.flux_content .bottom {
+	font-size: 90%;
+	text-align: center;
+}
+
+.hide_posts > :not(.active) > .flux_content {
+	display:none;
+}
+
+/*** PAGINATION ***/
+.pagination {
+	display: table;
+	width: 100%;
+	margin: 0;
+	background: #1a1a1a;
+	text-align: center;
+	color: #888;
+	font-size: 80%;
+	line-height: 200%;
+	table-layout: fixed;
+}
+	.pagination .item {
+		display: table-cell;
+		line-height: 40px;
+	}
+		.pagination .item.pager-current {
+			font-weight: bold;
+			font-size: 140%;
+		}
+		.pagination .pager-first,
+		.pagination .pager-previous,
+		.pagination .pager-next,
+		.pagination .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;
+	}
+
+#nav_entries {
+	display: table;
+	width: 250px;
+	height: 40px;
+	position: fixed;
+	bottom: 0;
+	left: 0;
+	margin: 0;
+	background: #1c1c1c;
+	border-top: 1px solid #2f2f2f;
+	text-align: center;
+	line-height: 40px;
+	table-layout: fixed;
+}
+	#nav_entries .item {
+		display: table-cell;
+		width: 30%;
+	}
+		#nav_entries a {
+			display: block;
+		}
+		#nav_entries .i_up {
+			margin: 5px 0 0;
+			vertical-align: top;
+		}
+
+.loading {
+	background: url("loader.gif") center center no-repeat;
+	font-size: 0;
+}
+
+#bigMarkAsRead {
+	display: block;
+	font-style: normal;
+	padding: 32px 0 64px 0;
+	text-align: center;
+	text-decoration: none;
+}
+	#bigMarkAsRead:hover {
+		background: #1c1c1c;
+		color: #888;
+	}
+	.bigTick {
+		font-size: 72pt;
+		line-height: 1.6em;
+	}
+
+/*** NOTIFICATION ***/
+.notification {
+	position: absolute;
+	top: 10px;
+	left: 25%; right: 25%;
+	min-height: 30px;
+	padding: 10px;
+	line-height: 30px;
+	text-align: center;
+	border-radius: 5px;
+	box-shadow: 0 0 5px #666;
+	background: #1a1a1a;
+	color: #888;
+	font-weight: bold;
+	z-index: 10;
+}
+	.notification.good {
+		border:1px solid #f4f899;
+	}
+	.notification.bad {
+		border:1px solid #f4a899;
+	}
+	.notification a.close {
+		display: inline-block;
+		width: 16px;
+		height: 16px;
+		float: right;
+		margin: -20px -20px 0 0;
+		padding: 5px;
+		background: #1a1a1a;
+		border-radius: 50px;
+		line-height: 16px;
+	}
+	.notification.good a.close{
+		border:1px solid #f4f899;
+	}
+	.notification.bad a.close{
+		border:1px solid #f4a899;
+	}
+
+.toggle_aside, .btn.toggle_aside {
+	display: none;
+}
+
+.actualizeProgress {
+	position: fixed;
+	top: 10px;
+	left: 25%; right: 25%;
+	padding: 5px;
+	background: #1a1a1a;
+	text-align: center;
+	border: 1px solid #2f2f2f;
+	border-radius: 5px;
+}
+	.actualizeProgress progress {
+		max-width: 100%;
+		vertical-align: middle;
+	}
+	.actualizeProgress .progress {
+		color: #888;
+		font-size: 90%;
+		vertical-align: middle;
+	}
+
+.logs {
+	border: 1px solid #aaa;
+}
+	.log {
+		padding: 5px 2%;
+		overflow: auto;
+		background: #fafafa;
+		border-bottom: 1px solid #999;
+		color: #333;
+		font-size: 90%;
+	}
+		.log .date {
+			display: block;
+		}
+	.log.error {
+		background: #fdd;
+		color: #844;
+	}
+	.log.warning {
+		background: #ffe;
+		color: #c95;
+	}
+	.log.notice {
+		background: #f4f4f4;
+		color: #aaa;
+	}
+	.log.debug {
+		background: #111;
+		color: #eee;
+	}
+
+.form-group table {
+	border-collapse:collapse;
+	margin:10px 0 0 220px;
+	text-align:center;
+}
+
+.form-group tr, .form-group th, .form-group td {
+	border:1px solid #2f2f2f;
+	font-weight:normal;
+	padding:.5em;
+}
+
+select.number option {
+	text-align:right;
+}
+
+@media(max-width: 840px) {
+	.header,
+	.aside .btn-important,
+	.aside .feeds .dropdown,
+	.flux_header .item.website span,
+	.item.date {
+		display: none;
+	}
+	.flux_header .item.website {
+		width: 40px;
+		text-align: center;
+	}
+		.flux_header .item.website .favicon {
+			padding: 12px;
+		}
+
+	.nav-login {
+		display: block;
+	}
+
+	.content {
+		font-size: 120%;
+		padding: 0;
+	}
+
+	.pagination {
+		margin: 0 0 40px;
+	}
+	.pagination .pager-previous, .pagination .pager-next {
+		width: 100px;
+	}
+
+	.toggle_aside, .btn.toggle_aside {
+		display: inline-block;
+	}
+	.aside {
+		position: fixed;
+		top: 0; left: 0;
+		width: 0;
+		overflow: hidden;
+		border-right: none;
+		z-index: 10;
+		transition: width 200ms linear;
+	}
+		.aside.aside_flux {
+			padding: 10px 0 0;
+		}
+		.aside:target {
+			width: 80%;
+			border-right: 1px solid #aaa;
+			overflow: auto;
+		}
+		.aside .toggle_aside {
+			position: absolute;
+			right: 0;
+			display: inline-block;
+			width: 26px;
+			height: 26px;
+			margin: 0 10px 0 0;
+			border: 1px solid #ccc;
+			border-radius: 20px;
+			text-align: center;
+			line-height: 26px;
+		}
+		.aside .categories {
+			margin: 30px 0;
+		}
+
+	#nav_entries {
+		width: 100%;
+	}
+
+	.nav_menu .btn {
+		margin: 5px 10px;
+	}
+	.nav_menu .stick {
+		margin: 0 10px;
+	}
+	.nav_menu .stick .btn {
+		margin: 5px 0;
+	}
+	.nav_menu .search {
+			display: inline-block;
+			max-width: 97%;
+		}
+		.nav_menu .search input {
+			max-width: 97%;
+			width: 90px;
+		}
+		.nav_menu .search input:focus {
+			width: 400px;
+		}
+
+	#panel {
+		left: 5px; right: 5px;
+	}
+
+	.day .date {
+		display: none;
+	}
+	.day .name {
+		height: 2.6em;
+		font-size: 1em;
+		text-shadow: none;
+	}
+
+	.notification,
+	.actualizeProgress {
+		left: 10px;
+		right: 10px;
+	}
+}
+
+/*** FALLBACK ***/
+.btn {
+	background: #1c1c1c;
+}
+	.btn:hover {
+		background: -moz-linear-gradient(top, #4A5D7A 0%, #26303F 100%);
+		background: -webkit-linear-gradient(top, #4A5D7A 0%, #26303F 100%);
+		background: -o-linear-gradient(top, #4A5D7A 0%, #26303F 100%);
+		background: -ms-linear-gradient(top, #4A5D7A 0%, #26303F 100%);
+	}
+	.btn-important {
+		background: #26303F;
+	}
+		.btn-important:hover {
+			background: -moz-linear-gradient(top, #4A5D7A 0%, #26303F 100%);
+			background: -webkit-linear-gradient(top, #4A5D7A 0%, #26303F 100%);
+			background: -o-linear-gradient(top, #4A5D7A 0%, #26303F 100%);
+			background: -ms-linear-gradient(top, #4A5D7A 0%, #26303F 100%);
+		}
+	.btn-attention {
+		background: #880011;
+	}
+		.btn-attention:hover {
+			background: -moz-linear-gradient(top, #cc0044 0%, #880011 100%);
+			background: -webkit-linear-gradient(top, #cc0044 0%, #880011 100%);
+			background: -o-linear-gradient(top, #cc0044 0%, #880011 100%);
+			background: -ms-linear-gradient(top, #cc0044 0%, #880011 100%);
+		}
+
+.dropdown-menu:after {
+	-moz-transform: rotate(45deg);
+	-webkit-transform: rotate(45deg);
+	-ms-transform: rotate(45deg);
+}
+
+.nav-head {
+	background: #fff;
+	background: -moz-linear-gradient(top, #fff 0%, #f0f0f0 100%);
+	background: -webkit-linear-gradient(top, #fff 0%, #f0f0f0 100%);
+	background: -o-linear-gradient(top, #fff 0%, #f0f0f0 100%);
+	background: -ms-linear-gradient(top, #fff 0%, #f0f0f0 100%);
+}
+
+.header > .item.search input {
+	-moz-transition: width 200ms linear;
+	 -webkit-transition: width 200ms linear;
+	-o-transition: width 200ms linear;
+	-ms-transition: width 200ms linear;
+}
+
+@media(max-width: 840px) {
+	.aside {
+		-moz-transition: width 200ms linear;
+		 -webkit-transition: width 200ms linear;
+		-o-transition: width 200ms linear;
+		-ms-transition: width 200ms linear;
+	}
+}
+
+@media print {
+	.header,
+	.aside,
+	.nav_menu,
+	.day,
+	.flux_header,
+	.flux_content .bottom,
+	.pagination {
+		display: none;
+	}
+
+	html, body {
+		background: #fff;
+		color: #000;
+		font-family: Serif;
+		font-size: 12pt;
+	}
+
+	#global,
+	.flux_content {
+		display: block !important;
+	}
+
+	.flux_content .content {
+		width: 100% !important;
+		text-align: justify;
+	}
+
+	.flux_content .content a {
+		color: #000;
+	}
+	.flux_content .content a:after {
+		content: " (" attr(href) ") ";
+		text-decoration: underline;
+	}
+}
diff --git a/p/themes/Dark/global.css b/p/themes/Dark/global.css
new file mode 100644
index 000000000..04eb723f1
--- /dev/null
+++ b/p/themes/Dark/global.css
@@ -0,0 +1,487 @@
+@charset "UTF-8";
+
+/* FONTS */
+@font-face {
+	font-family: "OpenSans";
+	src: url("../fonts/openSans.woff") format("woff");
+}
+
+
+* {
+	margin: 0;
+	padding: 0;
+}
+html, body {
+	height: 100%;
+	font-size: 95%;
+	font-family: "OpenSans", "Cantarell", "Helvetica", "Arial", sans-serif;
+	color: #888;
+}
+
+/* LIENS */
+a {
+	color: #6986B2;
+	text-decoration: none;
+}
+	a:hover {
+		text-decoration: underline;
+	}
+
+/* LISTES */
+ul, ol, dl {
+	margin: 10px 0 10px 30px;
+	line-height: 190%;
+}
+	dd {
+		margin: 0 0 10px 30px;
+	}
+
+/* TITRES */
+h1, h2, h3 {
+	min-height: 40px;
+	margin: 15px 0 5px;
+	line-height: 40px;
+}
+
+/* IMG */
+figure {
+	margin: 5px 0 10px;
+	text-align: center;
+}
+	figcaption {
+		display: inline-block;
+		padding: 3px 20px;
+		color: #999;
+		font-style: italic;
+		border-bottom: 1px solid #ccc;
+	}
+img {
+	height: auto;
+	max-width: 100%;
+	vertical-align: middle;
+}
+	a img {
+		border: none;
+	}
+
+/* VIDEOS */
+iframe, embed, object, video {
+	max-width: 100%;
+}
+
+/* FORMULAIRES */
+legend {
+	display: block;
+	width: 100%;
+	margin: 20px 0 5px;
+	padding: 5px 0;
+	border-bottom: 1px solid #2f2f2f;
+	font-size: 150%;
+	clear: both;
+}
+label {
+	display: block;
+	min-height: 25px;
+	padding: 5px 0;
+	font-size: 14px;
+	line-height: 25px;
+	cursor: pointer;
+}
+input, select, textarea {
+	display: inline-block;
+	max-width: 100%;
+	min-height: 25px;
+	padding: 5px;
+	background: #333;
+	border: 1px solid #000;
+	border-radius: 3px;
+	color: #999;
+	line-height: 25px;
+	vertical-align: middle;
+	box-shadow: 0 2px 2px #1d1d1d inset;
+}
+	option {
+		padding:0 .5em 0 .5em;
+	}
+	input[type="radio"],
+	input[type="checkbox"] {
+		width: 15px !important;
+		min-height: 15px !important;
+	}
+	input:focus, select:focus, textarea:focus {
+		color: #6986b2;
+		border-color: #2f2f2f;
+	}
+	input:invalid, select:invalid {
+		border-color: red;
+		box-shadow: 0 0 2px 1px red;
+	}
+
+.form-group {
+	margin: 0;
+}
+	.form-group:after {
+		content: "";
+		display: block;
+		clear: both;
+	}
+	.form-group.form-actions {
+		min-width: 250px;
+		padding: 5px 0;
+		background: #1a1a1a;
+		border-top: 1px solid #2f2f2f;
+	}
+		.form-group.form-actions .btn {
+			margin: 0 10px;
+		}
+	.form-group .group-name {
+		display: block;
+		float: left;
+		width: 200px;
+		padding: 10px 0;
+		text-align: right;
+	}
+	.form-group .group-controls {
+		min-width: 250px;
+		min-height: 25px;
+		margin: 0 0 0 220px;
+		padding: 5px 0;
+	}
+		.form-group .group-controls .control {
+			display: block;
+			min-height: 30px;
+			padding: 5px 0;
+			line-height: 25px;
+			font-size: 14px;
+		}
+
+.stick {
+	display: inline-block;
+	white-space: nowrap;
+	font-size: 0px;
+	vertical-align: middle;
+}
+	.stick input,
+	.stick .btn {
+		border-radius: 0;
+		font-size: 14px;
+	}
+	.stick .btn:first-child,
+	.stick input:first-child {
+		border-radius: 3px 0 0 3px;
+	}
+		.stick .btn-important:first-child {
+			border-right: 1px solid #000;
+		}
+	.stick .btn:last-child,
+	.stick input:last-child {
+		border-radius: 0 3px 3px 0;
+	}
+	.stick .btn + .btn,
+	.stick .btn + input,
+	.stick input + .btn,
+	.stick input + input {
+		border-left: none;
+	}
+	.stick .btn + .dropdown > .btn {
+		border-left: none;
+		border-radius: 0 3px 3px 0;
+	}
+	.stick .btn + .dropdown a {
+		font-size: 12px;
+	}
+
+.btn {
+	display: inline-block;
+	min-height: 37px;
+	min-width: 15px;
+	padding: 5px 10px;
+	background: linear-gradient(to bottom, #fff 0%, #eee 100%);
+	border-radius: 3px;
+	border: 1px solid #000;
+	color: #888;
+	line-height: 20px;
+	vertical-align: middle;
+	cursor: pointer;
+	overflow: hidden;
+}
+	a.btn {
+		min-height: 25px;
+		line-height: 25px;
+	}
+	.btn:hover {
+		background: linear-gradient(to bottom, #4A5D7A, #26303F);
+		text-decoration: none;
+	}
+	.btn.active,
+	.btn:active,
+	.dropdown-target:target ~ .btn.dropdown-toggle {
+		background: #26303F;
+	}
+
+	.btn-important {
+		background: linear-gradient(to bottom, #0084CC, #0045CC);
+		color: #888888;
+		border: 1px solid #000000;
+	}
+		.btn-important:hover {
+			background: linear-gradient(to bottom, #0066CC, #0045CC);
+		}
+		.btn-important:active {
+			background: #0044CB;
+			box-shadow: none;
+		}
+
+	.btn-attention {
+		background: linear-gradient(to bottom, #E95B57, #BD362F);
+		color: #888888;
+		border: 1px solid #000000;
+	}
+		.btn-attention:hover {
+			background: linear-gradient(to bottom, #D14641, #BD362F);
+		}
+		.btn-attention:active {
+			background: #BD362F;
+			box-shadow: none;
+		}
+
+/* NAVIGATION */
+.nav-list .nav-header,
+.nav-list .item {
+	display: block;
+	height: 35px;
+	line-height: 35px;
+}
+	.nav-list .item:hover {
+		background: #1a1a1a;
+	}
+		.nav-list .item:hover a {
+			color: #26303F;
+		}
+	.nav-list .item.active {
+		background: #26303F;
+		color: #1a1a1a;
+	}
+		.nav-list .item.active a {
+			color: #888;
+		}
+	.nav-list .disable {
+		color: #aaa;
+		background: #fafafa;
+		text-align: center;
+	}
+	.nav-list .item > * {
+		display: block;
+		padding: 0 10px;
+		overflow: hidden;
+		white-space: nowrap;
+		text-overflow: ellipsis;
+	}
+		.nav-list a:hover {
+			text-decoration: none;
+		}
+	.nav-list .item.error a {
+		color: #BD362F;
+	}
+		.nav-list .item.active.error a {
+			color: #fff;
+			background: #BD362F;
+		}
+	.nav-list .item.empty a {
+		color: #f39c12;
+	}
+		.nav-list .item.active.empty a {
+			color: #fff;
+			background: #f39c12;
+		}
+
+	.nav-list .nav-header {
+		padding: 0 10px;
+		background: #1a1a1a;
+		border-bottom: 1px solid #2f2f2f;
+		font-weight: bold;
+	}
+	.nav-list .separator {
+		display: block;
+		height: 0;
+		margin: 5px 0;
+		border-bottom: 1px solid #ddd;
+	}
+
+	.nav-list .nav-form {
+		padding: 3px;
+		text-align: center;
+	}
+
+.nav-head {
+	display: block;
+	margin: 0;
+	background: linear-gradient(to bottom, #fff, #f0f0f0);
+	border-bottom: 1px solid #ddd;
+	text-align: right;
+}
+	.nav-head .item {
+		display: inline-block;
+		padding: 5px 10px;
+	}
+
+/* HORIZONTAL-LIST */
+.horizontal-list {
+	display: table;
+	table-layout: fixed;
+	margin: 0;
+	padding: 0;
+	width: 100%;
+}
+	.horizontal-list .item {
+		display: table-cell;
+		vertical-align: middle;
+	}
+
+/* DROPDOWN */
+.dropdown {
+	position: relative;
+	display: inline-block;
+}
+	.dropdown-target {
+		display: none;
+	}
+
+	.dropdown-menu {
+		display: none;
+		min-width: 200px;
+		margin: 5px 0 0;
+		padding: 5px 0;
+		position: absolute;
+		right: 0px;
+		background: #1a1a1a;
+		border: 1px solid #888;
+		border-radius: 5px;
+		text-align: left;
+	}
+	.dropdown-menu:after {
+		content: "";
+		position: absolute;
+		top: -6px;
+		right: 13px;
+		width: 10px;
+		height: 10px;
+		background: #1a1a1a;
+		border-top: 1px solid #888;
+		border-left: 1px solid #888;
+		z-index: -10;
+		transform: rotate(45deg);
+	}
+		.dropdown-header {
+			display: block;
+			padding: 0 5px;
+			color: #888;
+			font-weight: bold;
+			font-size: 14px;
+			line-height: 30px;
+		}
+		.dropdown-menu .item {
+			display: block;
+			height: 30px;
+			font-size: 90%;
+			line-height: 30px;
+		}
+			.dropdown-menu > .item > a {
+				display: block;
+				padding: 0 25px;
+				line-height: 30px;
+			}
+			.dropdown-menu > .item:hover {
+				background: #26303F;
+				color: #888;
+			}
+				.dropdown-menu > .item[aria-checked="true"] > a:before {
+					content: '✓ ';
+					font-weight: bold;
+					margin: 0 0 0 -1.2em;
+					padding: 0 0.2em 0 0;
+				}
+				.dropdown-menu > .item:hover > a {
+					color: #888;
+					text-decoration: none;
+				}
+		.dropdown-menu .input {
+			display: block;
+			height: 40px;
+			font-size: 90%;
+			line-height: 30px;
+		}
+			.dropdown-menu .input select,
+			.dropdown-menu .input input {
+				display: block;
+				height: 20px;
+				width: 95%;
+				margin: auto;
+				padding: 2px 5px;
+				border-radius: 3px;
+			}
+			.dropdown-menu .input select {
+				width: 70%;
+				height: auto;
+			}
+		.dropdown-menu .separator {
+			display: block;
+			height: 0;
+			margin: 5px 0;
+			border-bottom: 1px solid #888;
+		}
+		.dropdown-target:target ~ .dropdown-menu {
+			display: block;
+			z-index: 10;
+		}
+	.dropdown-close {
+		display: inline;
+	}
+		.dropdown-close a {
+			font-size: 0;
+			position: fixed;
+			top: 0; bottom: 0;
+			left: 0; right: 0;
+			display: block;
+			z-index: -10;
+		}
+
+/* ALERTS */
+.alert {
+	display: block;
+	width: 90%;
+	margin: 15px auto;
+	padding: 10px 15px;
+	background: #1a1a1a;
+	border: 1px solid #ccc;
+	border-right: 1px solid #aaa;
+	border-bottom: 1px solid #aaa;
+	border-radius: 5px;
+	color: #aaa;
+}
+	.alert-head {
+		margin: 0;
+		font-weight: bold;
+		font-size: 110%;
+	}
+	.alert-warn {
+		border: 1px solid #c95;
+		color: #c95;
+	}
+	.alert-success {
+		border: 1px solid #484;
+		color: #484;
+	}
+	.alert-error {
+		border: 1px solid #844;
+		color: #844;
+	}
+
+/* ICÔNES */
+.icon {
+	display: inline-block;
+	width: 16px;
+	height: 16px;
+	vertical-align: middle;
+	line-height: 16px;
+}
diff --git a/p/themes/Dark/loader.gif b/p/themes/Dark/loader.gif
new file mode 100644
index 000000000..86022be71
Binary files /dev/null and b/p/themes/Dark/loader.gif differ
diff --git a/p/themes/Dark/metadata.json b/p/themes/Dark/metadata.json
new file mode 100644
index 000000000..27cae27df
--- /dev/null
+++ b/p/themes/Dark/metadata.json
@@ -0,0 +1,7 @@
+{
+	"name": "Dark",
+	"author": "AD",
+	"description": "Le coté obscur du thème “Origine”",
+	"version": 0.1,
+	"files": ["global.css", "freshrss.css"]
+}
diff --git a/p/themes/Flat/freshrss.css b/p/themes/Flat/freshrss.css
new file mode 100644
index 000000000..dca1b3f28
--- /dev/null
+++ b/p/themes/Flat/freshrss.css
@@ -0,0 +1,817 @@
+@charset "UTF-8";
+
+/* STRUCTURE */
+body {
+	background: #fafafa;
+}
+
+.header {
+	display: table;
+	width: 100%;
+	table-layout: fixed;
+	background: #ecf0f1;
+}
+	.header > .item {
+		display: table-cell;
+		padding: 10px 0;
+		vertical-align: middle;
+		text-align: center;
+	}
+		.header > .item.title {
+			width: 250px;
+			white-space: nowrap;
+		}
+			.logo {
+				display: inline-block;
+				font-size: 48px;
+				height: 32px;
+				width: 32px;
+				padding: 10px;
+			}
+			.header > .item.title h1 {
+				display: inline-block;
+				margin: 0;
+			}
+		.header > .item.search input {
+			width: 230px;
+			transition: width 200ms linear;
+		}
+			.header .item.search input:focus {
+				width: 330px;
+			}
+		.header > .item.configure {
+			width: 100px;
+		}
+
+.item a:hover {
+	text-decoration: none;
+}
+
+#global {
+	display: table;
+	width: 100%;
+	height: 100%;
+	table-layout: fixed;
+}
+	.aside {
+		display: table-cell;
+		height: 100%;
+		width: 250px;
+		vertical-align: top;
+		background: #ecf0f1;
+	}
+		.aside .nav-form input {
+			width: 180px;
+		}
+		.aside.aside_flux {
+			padding: 10px 0 40px;
+		}
+		.aside.aside_feed .nav-form input {
+			width: 140px;
+		}
+		.aside.aside_feed .nav-form .dropdown-menu {
+			right: -20px;
+		}
+		.aside.aside_feed .nav-form .dropdown-menu:after {
+			right: 33px;
+		}
+
+	.nav-login {
+		display: none;
+	}
+
+	.nav_menu {
+		width: 100%;
+		text-align: center;
+		padding: 5px 0;
+	}
+		.nav_menu .search {
+			display:none;
+		}
+
+.favicon {
+	height: 16px;
+	width: 16px;
+}
+
+.categories {
+	margin: 0;
+	padding: 0;
+	text-align: center;
+	list-style: none;
+}
+	.category {
+		display: block;
+		width: 220px;
+		margin: 10px auto;
+		text-align: left;
+		overflow: hidden;
+		white-space: nowrap;
+		text-overflow: ellipsis;
+	}
+		.category .btn:first-child {
+			width: 195px;
+			position: relative;
+		}
+		.category.stick .btn:first-child {
+			width:160px;
+		}
+		.category .btn:first-child:not([data-unread="0"]):after {
+			content: attr(data-unread);
+			position: absolute;
+			top: 5px; right: 5px;
+			padding: 0 5px;
+			color: #fff;
+			font-size: 90%;
+			background: #3498DB;
+			border-radius: 5px;
+		}
+		.category + .feeds:not(.active) {
+			display:none;
+		}
+	.categories .feeds {
+		width: 100%;
+		margin: 0 auto;
+		list-style: none;
+	}
+		.categories .feeds .item.active:after {
+			content: "⇢";
+			line-height: 35px;
+			float: right;
+		}
+		.categories .feeds .item.empty .feed {
+			color: #e67e22;
+		}
+		.categories .feeds .item.error .feed {
+			color: #BD362F;
+		}
+		.categories .feeds .item .feed {
+			display: inline-block;
+			margin: 0;
+			width: 165px;
+			line-height: 35px;
+			font-size: 90%;
+			vertical-align: middle;
+			text-align: left;
+			overflow: hidden;
+			white-space: nowrap;
+			text-overflow: ellipsis;
+		}
+		.feed:not([data-unread="0"]) {
+			font-weight:bold;
+		}
+		.feed:not([data-unread="0"]):before {
+			content: "(" attr(data-unread) ") ";
+		}
+		.categories .feeds .dropdown-menu {
+			left: 0;
+		}
+		.categories .feeds .dropdown-menu:after {
+			left: 2px;
+		}
+		.categories .feeds .item .dropdown-toggle > .icon {
+			visibility: hidden;
+			cursor: pointer;
+		}
+			.categories .feeds .item .dropdown-target:target ~ .dropdown-toggle > .icon,
+			.categories .feeds .item:hover .dropdown-toggle > .icon,
+			.categories .feeds .item.active .dropdown-toggle > .icon {
+				background-color: #95a5a6;
+				border-radius: 3px;
+				visibility: visible;
+			}
+	.categories .btn:hover .notRead,
+	.categories .btn.active .notRead {
+		background: #2980B9;
+		border-left: 3px solid #3498DB;
+	}
+
+.post {
+	padding: 10px 50px;
+}
+	.post form {
+		margin: 10px 0;
+	}
+
+.day {
+	padding: 5px 15px;
+	font-size: 130%;
+	font-weight: bold;
+	line-height: 50px;
+	border-left: 3px solid #ecf0f1;
+}
+	.day .name {
+		position: absolute;
+		right: 0;
+		width: 50%;
+		height: 1.5em;
+		padding: 0 10px 0 0;
+		overflow: hidden;
+		color: #aab;
+		font-size: 1.8em;
+		opacity: .3;
+		font-style: italic;
+		text-align: right;
+		white-space: nowrap;
+		text-overflow: ellipsis;
+		z-index: -10;
+	}
+
+.flux {
+	border-left: 3px solid #ecf0f1;
+}
+	.flux:hover {
+		background: #fff;
+	}
+	.flux.not_read {
+		border-left-color: #FF5300;
+		background: #FFF3ED;
+	}
+	.flux.favorite {
+		border-left-color: #FFC300;
+		background: #FFF6DA;
+	}
+	.flux.current {
+		border-left-color: #3498db;
+		background: #fff;
+	}
+
+	.flux_header {
+		background: inherit;
+		height: 25px;
+		font-size: 12px;
+		border-top: 1px solid #ecf0f1;
+		cursor: pointer;
+	}
+		.flux .item {
+			line-height: 40px;
+			white-space: nowrap;
+		}
+		.flux_header > .item {
+			overflow: hidden;
+			text-overflow: ellipsis;
+		}
+		.flux .item.manage {
+			width: 40px;
+			text-align: center;
+		}
+		.flux .item.website {
+			width: 200px;
+		}
+			.website .favicon {
+				padding: 5px;
+			}
+		.flux .item.title {
+			background: inherit;
+		}
+		.flux:hover .item.title {
+			border-right: 2px solid rgba(127, 127, 127, 0.1);
+			padding-right: 1em;
+			position: absolute;
+		}
+			.flux .item.title a {
+				color: #333;
+				outline: none;
+			}
+			.flux.current .item.title,
+			.flux.not_read .item.title {
+				font-weight: bold;
+			}
+		.flux .item.date {
+			width: 200px;
+			padding:0 5px 0 0;
+			text-align: right;
+			font-size: 10px;
+			color: #666;
+		}
+		.link {
+			width: 40px;
+			text-align: center;
+		}
+
+#stream.reader .flux {
+	position: relative;
+	padding: 0 0 30px;
+	border: none;
+	background: #ecf0f1;
+	color: #34495e;
+	font-size: 120%;
+}
+	#stream.reader .flux .author {
+		margin: 0 0 10px;
+		font-size: 90%;
+		color: #aaa;
+	}
+
+#stream.global {
+	text-align: center;
+}
+	#stream.global .box-category {
+		display: inline-block;
+		width: 280px;
+		margin: 20px 10px;
+		vertical-align: top;
+		border: 1px solid #ddd;
+		border-radius: 5px;
+		text-align: left;
+	}
+		#stream.global .category {
+			width: 100%;
+			margin: 0;
+		}
+		#stream.global .btn {
+			display: block;
+			width: auto;
+			height: 35px;
+			margin: 0;
+			padding: 0 10px;
+			background: #ecf0f1;
+			color: #333;
+			border-bottom: 1px solid #ddd;
+			border-radius: 5px 5px 0 0;
+			line-height: 35px;
+			font-size: 120%;
+		}
+			#stream.global .btn:not([data-unread="0"]) {
+				font-weight:bold;
+			}
+			#stream.global .btn:first-child:not([data-unread="0"]):after {
+				top: 0; right: 5px;
+				border: 0;
+				background: none;
+				color: #333;
+				font-weight: bold;
+				box-shadow: none;
+			}
+		#stream.global .box-category .feeds {
+			display: block;
+			max-height: 250px;
+			margin: 0;
+			list-style: none;
+			overflow: auto;
+		}
+			#stream.global .box-category .feeds .item {
+				padding: 2px 10px;
+				font-size: 90%;
+			}
+		#stream.global .box-category .feed {
+			width: 220px;
+		}
+
+.content {
+	min-height: 150px;
+	max-width: 550px;
+	margin: 0 auto;
+	padding: 20px 10px;
+	line-height: 170%;
+	word-wrap: break-word;
+}
+	.content h1, .content h2, .content h3 {
+		margin: 20px 0 5px;
+	}
+	.content > .title {
+		font-size: x-large;
+		margin: 0;
+	}
+
+	.content p {
+		margin: 0 0 20px;
+	}
+	img.big {
+		display: block;
+		margin: 10px auto;
+	}
+	figure img.big {
+		margin: 0;
+	}
+	.content hr {
+		margin: 30px 0;
+		height: 1px;
+		background: #ddd;
+		border: 0;
+	}
+	.content pre {
+		margin: 10px auto;
+		padding: 10px;
+		overflow: auto;
+		background: #000;
+		color: #fff;
+		font-size: 110%;
+	}
+	.content q, .content blockquote {
+		display: block;
+		margin: 5px 0;
+		padding: 5px 20px;
+		font-style: italic;
+		border-left: 4px solid #ccc;
+		color: #666;
+	}
+		.content blockquote p {
+			margin: 0;
+		}
+
+#panel {
+	display: none;
+	position: fixed;
+	top: 10px; bottom: 10px;
+	left: 100px; right: 100px;
+	overflow: auto;
+	background: #fff;
+	border: 1px solid #95a5a6;
+	border-radius: 5px;
+}
+	#panel .close {
+		position: fixed;
+		top: 10px; right: 0px;
+		display: inline-block;
+		width: 26px;
+		height: 26px;
+		margin: 0 10px 0 0;
+		border-radius: 3px;
+		text-align: center;
+		line-height: 24px;
+		background: #95a5a6;
+	}
+		#panel .close:hover {
+			background: #7f8c8d;
+		}
+
+#overlay {
+	display: none;
+	position: fixed;
+	top: 0; bottom: 0;
+	left: 0; right: 0;
+	background: rgba(0, 0, 0, 0.9);
+}
+
+.flux_content .bottom {
+	font-size: 90%;
+	text-align: center;
+}
+
+.hide_posts > :not(.active) > .flux_content {
+	display:none;
+}
+
+/*** PAGINATION ***/
+.pagination {
+	display: table;
+	width: 100%;
+	margin: 0;
+	background: #ecf0f1;
+	text-align: center;
+	color: #000;
+	font-size: 80%;
+	line-height: 200%;
+	table-layout: fixed;
+	font-weight: bold;
+}
+	.pagination .item {
+		display: table-cell;
+		line-height: 40px;
+		vertical-align: top;
+	}
+		.pagination .item.pager-current {
+			font-weight: bold;
+			font-size: 140%;
+			color: #ecf0f1;
+			background: #34495e;
+		}
+		.pagination .item.pager-first,
+		.pagination .item.pager-previous,
+		.pagination .item.pager-next,
+		.pagination .item.pager-last {
+			width: 100px;
+		}
+		.pagination .item a {
+			display: block;
+			color: #000;
+			font-weight: bold;
+			line-height: 40px;
+		}
+			.pagination .item a:hover {
+				color: #ecf0f1;
+				background: #34495e;
+			}
+
+#nav_entries {
+	display: table;
+	width: 250px;
+	height: 40px;
+	position: fixed;
+	bottom: 0;
+	left: 0;
+	margin: 0;
+	background: #34495e;
+	text-align: center;
+	line-height: 40px;
+	table-layout: fixed;
+}
+	#nav_entries .item {
+		display: table-cell;
+		width: 30%;
+	}
+		#nav_entries a {
+			display: block;
+		}
+		#nav_entries .i_up {
+			margin: 5px 0 0;
+			vertical-align: top;
+		}
+
+.pagination .loading,
+.pagination a:hover.loading {
+	background: url("loader.gif") center center no-repeat #34495e;
+	font-size: 0;
+}
+
+#bigMarkAsRead {
+	background: #ecf0f1;
+	display: block;
+	font-style: normal;
+	padding: 32px 0 64px 0;
+	text-align: center;
+	text-decoration: none;
+	text-shadow: 0 -1px 0 #aaa;
+}
+	#bigMarkAsRead:hover {
+		background: #34495e;
+		color: #fff;
+	}
+	.bigTick {
+		font-size: 72pt;
+		line-height: 1.6em;
+	}
+
+/*** NOTIFICATION ***/
+.notification {
+	position: absolute;
+	top: 10px;
+	left: 25%; right: 25%;
+	min-height: 30px;
+	padding: 10px;
+	line-height: 30px;
+	text-align: center;
+	border-radius: 3px;
+	background: #ddd;
+	color: #666;
+	font-weight: bold;
+	z-index: 10;
+}
+	.notification.good {
+		background: #1abc9c;
+		color: #fff;
+	}
+	.notification.bad {
+		background: #e74c3c;
+		color: #fff;
+	}
+	.notification a.close {
+		display: inline-block;
+		width: 16px;
+		height: 16px;
+		float: right;
+		margin: -16px -16px 0 0;
+		padding: 5px;
+		border-radius: 3px;
+		line-height: 16px;
+	}
+		.notification.good a.close {
+			background: #1abc9c;
+		}
+		.notification.bad a.close {
+			background: #e74c3c;
+		}
+
+.toggle_aside, .btn.toggle_aside {
+	display: none;
+}
+
+.actualizeProgress {
+	position: fixed;
+	top: 10px;
+	left: 25%; right: 25%;
+	padding: 5px;
+	background: #3498db;
+	color: #fff;
+	text-align: center;
+	border-radius: 3px;
+	font-weight: bold;
+}
+	.actualizeProgress progress {
+		max-width: 100%;
+		width: 250px;
+		height: 15px;
+		vertical-align: middle;
+		background: #fff;
+		border: none;
+	}
+	.actualizeProgress .progress {
+		color: #ecf0f1;
+	}
+
+.logs {
+	border: 1px solid #34495e;
+}
+	.log {
+		margin: 10px 0;
+		padding: 5px 2%;
+		overflow: auto;
+		background: #fafafa;
+		color: #666;
+		font-size: 90%;
+	}
+		.log>.date {
+			margin: 0 10px 0 0;
+			padding: 5px 10px;
+			border-radius: 20px;
+		}
+			.log.error>.date {
+				background: #e74c3c;
+				color: #fff;
+			}
+			.log.warning>.date {
+				background: #f39c12;
+			}
+			.log.notice>.date {
+				background: #ecf0f1;
+			}
+			.log.debug>.date {
+				background: #111;
+				color: #eee;
+			}
+
+.form-group table {
+	border-collapse:collapse;
+	margin:10px 0 0 220px;
+	text-align:center;
+}
+
+.form-group tr, .form-group th, .form-group td {
+	font-weight:normal;
+	padding:.5em;
+}
+
+select.number option {
+	text-align:right;
+}
+
+@media(max-width: 840px) {
+	.header,
+	.aside .btn-important,
+	.aside .feeds .dropdown,
+	.flux_header .item.website span,
+	.item.date {
+		display: none;
+	}
+	.flux_header .item.website {
+		width: 40px;
+		text-align: center;
+	}
+		.flux_header .item.website .favicon {
+			padding: 12px;
+		}
+
+	.nav-login {
+		display: block;
+	}
+
+	.content {
+		font-size: 120%;
+		padding: 0;
+	}
+
+	.pagination {
+		margin: 0 0 40px;
+	}
+	.pagination .pager-previous, .pagination .pager-next {
+		width: 100px;
+	}
+
+	.toggle_aside, .btn.toggle_aside {
+		display: inline-block;
+	}
+	.aside {
+		position: fixed;
+		top: 0; left: 0;
+		width: 0;
+		overflow: hidden;
+		z-index: 10;
+		transition: width 200ms linear;
+		background: #ecf0f1;
+	}
+		.aside.aside_flux {
+			padding: 10px 0 0;
+		}
+		.aside:target {
+			width: 80%;
+			border-right: 1px solid #aaa;
+			overflow: auto;
+		}
+		.aside .toggle_aside {
+			position: absolute;
+			right: 10px;
+			display: inline-block;
+			width: 26px;
+			height: 26px;
+			margin: 0 10px 0 0;
+			border-radius: 3px;
+			text-align: center;
+			line-height: 24px;
+			background: #95a5a6;
+		}
+			.aside .toggle_aside:hover {
+				background: #7f8c8d;
+			}
+		.aside .categories {
+			margin: 30px 0;
+		}
+
+	#nav_entries {
+		width: 100%;
+	}
+
+	.nav_menu .btn {
+		margin: 5px 10px;
+	}
+	.nav_menu .stick {
+		margin: 0 10px;
+	}
+	.nav_menu .stick .btn {
+		margin: 5px 0;
+	}
+	.nav_menu .search {
+			display: inline-block;
+			max-width: 97%;
+		}
+		.nav_menu .search input {
+			max-width: 97%;
+			width: 90px;
+		}
+		.nav_menu .search input:focus {
+			width: 400px;
+		}
+
+	#panel {
+		left: 5px; right: 5px;
+	}
+
+	.day .date {
+		display: none;
+	}
+	.day .name {
+		height: 2.6em;
+		font-size: 1em;
+		text-shadow: none;
+	}
+
+	.notification,
+	.actualizeProgress {
+		left: 10px;
+		right: 10px;
+	}
+}
+
+/*** FALLBACK ***/
+.dropdown-menu:after {
+	-moz-transform: rotate(45deg);
+	-webkit-transform: rotate(45deg);
+	-ms-transform: rotate(45deg);
+}
+
+@media print {
+	.header,
+	.aside,
+	.nav_menu,
+	.day,
+	.flux_header,
+	.flux_content .bottom,
+	.pagination {
+		display: none;
+	}
+
+	html, body {
+		background: #fff;
+		color: #000;
+		font-family: Serif;
+		font-size: 12pt;
+	}
+
+	#global,
+	.flux_content {
+		display: block !important;
+	}
+
+	.flux_content .content {
+		width: 100% !important;
+		text-align: justify;
+	}
+
+	.flux_content .content a {
+		color: #000;
+	}
+	.flux_content .content a:after {
+		content: " (" attr(href) ") ";
+		text-decoration: underline;
+	}
+}
diff --git a/p/themes/Flat/global.css b/p/themes/Flat/global.css
new file mode 100644
index 000000000..5fd0a4dcf
--- /dev/null
+++ b/p/themes/Flat/global.css
@@ -0,0 +1,495 @@
+@charset "UTF-8";
+
+/* FONTS */
+@font-face {
+	font-family: "OpenSans";
+	src: url("../fonts/openSans.woff") format("woff");
+}
+
+
+* {
+	margin: 0;
+	padding: 0;
+}
+html, body {
+	height: 100%;
+	font-size: 95%;
+	font-family: "OpenSans", "Cantarell", "Helvetica", "Arial", sans-serif;
+}
+
+/* LIENS */
+a {
+	color: #2980b9;
+	text-decoration: none;
+}
+	a:hover {
+		text-decoration: underline;
+	}
+
+/* LISTES */
+ul, ol, dl {
+	margin: 10px 0 10px 30px;
+	line-height: 190%;
+}
+	dd {
+		margin: 0 0 10px 30px;
+	}
+
+/* TITRES */
+h1, h2, h3 {
+	min-height: 40px;
+	margin: 15px 0 5px;
+	line-height: 40px;
+}
+
+/* IMG */
+figure {
+	margin: 5px 0 10px;
+	text-align: center;
+}
+	figcaption {
+		display: inline-block;
+		padding: 3px 20px;
+		color: #999;
+		font-style: italic;
+		border-bottom: 1px solid #ccc;
+	}
+img {
+	height: auto;
+	max-width: 100%;
+	vertical-align: middle;
+}
+	a img {
+		border: none;
+	}
+
+/* VIDEOS */
+iframe, embed, object, video {
+	max-width: 100%;
+}
+
+/* FORMULAIRES */
+legend {
+	display: inline-block;
+	margin: 20px 0 5px;
+	padding: 5px 20px;
+	font-size: 150%;
+	clear: both;
+	background: #ecf0f1;
+	border-radius: 20px;
+}
+label {
+	display: block;
+	min-height: 25px;
+	padding: 5px 0;
+	font-size: 12px;
+	line-height: 25px;
+	cursor: pointer;
+	font-weight: bold;
+	color: #444;
+}
+input, select, textarea {
+	display: inline-block;
+	max-width: 100%;
+	min-height: 25px;
+	padding: 5px;
+	background: #FFF;
+	border: none;
+	border-bottom: 3px solid #ddd;
+	color: #666;
+	line-height: 25px;
+	vertical-align: middle;
+	border-radius: 5px;
+}
+	option {
+		padding:0 .5em 0 .5em;
+	}
+	input[type="radio"],
+	input[type="checkbox"] {
+		width: 15px !important;
+		min-height: 15px !important;
+	}
+	input:focus, select:focus, textarea:focus {
+		color: #333;
+		border-color: #2980b9;
+	}
+	input:invalid, select:invalid {
+		border-color: red;
+		box-shadow: 0 0 2px 1px red;
+	}
+
+.form-group {
+	margin: 5px 0;
+	border: 1px solid transparent;
+}
+	.form-group:after {
+		content: "";
+		display: block;
+		clear: both;
+	}
+	.form-group:hover {
+		background: #fff;
+		border: 1px solid #eee;
+		border-radius: 3px;
+	}
+	.form-group.form-actions {
+		min-width: 250px;
+		margin: 20px 0;
+		padding: 5px 0;
+		background: #ecf0f1;
+		border-top: 3px solid #bdc3c7;
+		border-radius: 5px 5px 0 0;
+	}
+		.form-group.form-actions .btn {
+			margin: 0 10px;
+		}
+	.form-group .group-name {
+		display: block;
+		float: left;
+		width: 200px;
+		padding: 10px 0;
+		text-align: right;
+	}
+	.form-group .group-controls {
+		min-width: 250px;
+		min-height: 25px;
+		margin: 0 0 0 220px;
+		padding: 5px 0;
+	}
+		.form-group .group-controls label {
+			font-weight: normal;
+			font-size: 14px;
+			color: #000;
+		}
+		.form-group .group-controls .control {
+			display: block;
+			min-height: 30px;
+			padding: 5px 0;
+			line-height: 25px;
+			font-size: 14px;
+		}
+
+.stick {
+	display: inline-block;
+	white-space: nowrap;
+	font-size: 0px;
+	vertical-align: middle;
+}
+	.stick .btn,
+	.stick input {
+		font-size: 14px;
+		border-radius: 0;
+	}
+	.stick .btn:first-child,
+	.stick input:first-child {
+		border-radius: 5px 0 0 5px;
+	}
+	.stick .btn:last-child,
+	.stick input:last-child,
+	.stick .btn + .dropdown > .btn {
+		border-radius: 0 5px 5px 0;
+	}
+	.stick .btn + .dropdown a {
+		font-size: 12px;
+	}
+
+.btn {
+	display: inline-block;
+	min-height: 38px;
+	min-width: 18px;
+	padding: 5px 10px;
+	background: #3498db;
+	border-radius: 5px;
+	border: none;
+	border-bottom: 3px solid #2980b9;
+	color: #fff;
+	line-height: 20px;
+	vertical-align: middle;
+	cursor: pointer;
+	overflow: hidden;
+}
+	a.btn {
+		min-height: 25px;
+		line-height: 25px;
+	}
+	.btn.active,
+	.btn:active,
+	.btn:hover,
+	.dropdown-target:target ~ .btn.dropdown-toggle {
+		background: #2980b9;
+		text-decoration: none;
+	}
+
+	.btn-important {
+		background: #e67e22;
+		color: #fff;
+		border-bottom: 3px solid #d35400;
+	}
+		.btn-important:active,
+		.btn-important:hover {
+			background: #d35400;
+		}
+
+	.btn-attention {
+		background: #e74c3c;
+		color: #fff;
+		border-bottom: 3px solid #c0392b;
+	}
+		.btn-attention:hover,
+		.btn-attention:active {
+			background: #c0392b;
+		}
+
+/* NAVIGATION */
+.nav-list {
+	border-right: 1px solid #ecf0f1;
+}
+.nav-list .nav-header,
+.nav-list .item {
+	display: block;
+	height: 35px;
+	line-height: 35px;
+	margin: 5px 0;
+}
+	.nav-list .item:hover,
+	.nav-list .item.active {
+		background: #2980b9;
+		color: #fff;
+	}
+		.nav-list .item:hover a,
+		.nav-list .item.active a {
+			color: #fff;
+		}
+	.nav-list .disable {
+		color: #aaa;
+		background: #fafafa;
+		text-align: center;
+	}
+	.nav-list .item > * {
+		display: block;
+		padding: 0 10px;
+		overflow: hidden;
+		white-space: nowrap;
+		text-overflow: ellipsis;
+	}
+		.nav-list a:hover {
+			text-decoration: none;
+		}
+	.nav-list .item.error a {
+		color: #BD362F;
+	}
+		.nav-list .item:hover.error a,
+		.nav-list .item.active.error a {
+			color: #fff;
+			background: #BD362F;
+		}
+	.nav-list .item.empty a {
+		color: #f39c12;
+	}
+		.nav-list .item:hover.empty a,
+		.nav-list .item.active.empty a {
+			color: #fff;
+			background: #f39c12;
+		}
+
+	.nav-list .nav-header {
+		padding: 0 10px;
+		margin: 0;
+		color: #fff;
+		background: #34495e;
+		font-weight: bold;
+	}
+	.nav-list .separator {
+		display: block;
+		height: 0;
+		margin: 5px 0;
+		border-bottom: 1px solid #ddd;
+	}
+
+	.nav-list .nav-form {
+		padding: 3px;
+		text-align: center;
+	}
+
+.nav-head {
+	display: block;
+	margin: 0;
+	background: #34495e;
+	color: #fff;
+	text-align: right;
+}
+	.nav-head a {
+		color: #fff;
+	}
+	.nav-head .item {
+		display: inline-block;
+		padding: 5px 10px;
+	}
+
+/* HORIZONTAL-LIST */
+.horizontal-list {
+	display: table;
+	table-layout: fixed;
+	margin: 0;
+	padding: 0;
+	width: 100%;
+}
+	.horizontal-list .item {
+		display: table-cell;
+		vertical-align: middle;
+	}
+
+/* DROPDOWN */
+.dropdown {
+	position: relative;
+	display: inline-block;
+}
+	.dropdown-target {
+		display: none;
+	}
+
+	.dropdown-menu {
+		display: none;
+		min-width: 200px;
+		margin: 5px 0 0;
+		padding: 5px 0;
+		position: absolute;
+		right: 0px;
+		background: #fff;
+		border: 1px solid #95a5a6;
+		border-radius: 3px;
+		text-align: left;
+	}
+	.dropdown-menu:after {
+		content: "";
+		position: absolute;
+		top: -6px;
+		right: 13px;
+		width: 10px;
+		height: 10px;
+		background: #fff;
+		border-top: 1px solid #95a5a6;
+		border-left: 1px solid #95a5a6;
+		z-index: -10;
+		transform: rotate(45deg);
+	}
+		.dropdown-header {
+			display: block;
+			padding: 0 5px;
+			color: #34495e;
+			font-weight: bold;
+			font-size: 14px;
+			line-height: 30px;
+		}
+		.dropdown-menu > .item {
+			display: block;
+			height: 30px;
+			font-size: 90%;
+			line-height: 30px;
+		}
+			.dropdown-menu > .item > a {
+				display: block;
+				padding: 0 25px;
+				line-height: 30px;
+			}
+			.dropdown-menu > .item:hover > a {
+				background: #2980b9;
+				color: #fff;
+			}
+				.dropdown-menu > .item[aria-checked="true"] > a:before {
+					content: '✓ ';
+					font-weight: bold;
+					margin: 0 0 0 -1.2em;
+					padding: 0 0.2em 0 0;
+				}
+				.dropdown-menu > .item:hover > a {
+					color: #fff;
+					text-decoration: none;
+				}
+		.dropdown-menu .input {
+			display: block;
+			height: 40px;
+			font-size: 90%;
+			line-height: 30px;
+		}
+			.dropdown-menu label {
+				font-weight: normal;
+			}
+			.dropdown-menu .input select,
+			.dropdown-menu .input input {
+				display: block;
+				height: 20px;
+				width: 95%;
+				margin: auto;
+				padding: 2px 5px;
+				border-radius: 3px;
+			}
+			.dropdown-menu .input select {
+				width: 70%;
+				height: auto;
+			}
+		.dropdown-menu .separator {
+			display: block;
+			height: 0;
+			margin: 5px 0;
+			border-bottom: 1px solid #95a5a6;
+		}
+		.dropdown-target:target ~ .dropdown-menu {
+			display: block;
+			z-index: 10;
+		}
+	.dropdown-close {
+		display: inline;
+	}
+		.dropdown-close a {
+			font-size: 0;
+			position: fixed;
+			top: 0; bottom: 0;
+			left: 0; right: 0;
+			display: block;
+			z-index: -10;
+		}
+
+/* ALERTS */
+.alert {
+	display: block;
+	width: 90%;
+	margin: 15px auto;
+	padding: 10px 15px;
+	background: #f4f4f4;
+	border: 1px solid #ccc;
+	border-right: 1px solid #aaa;
+	border-bottom: 1px solid #aaa;
+	border-radius: 5px;
+	color: #aaa;
+	text-shadow: 0 0 1px #eee;
+}
+	.alert-head {
+		margin: 0;
+		font-weight: bold;
+		font-size: 110%;
+	}
+	.alert-warn {
+		background: #ffe;
+		border: 1px solid #eeb;
+		color: #c95;
+	}
+	.alert-success {
+		background: #dfd;
+		border: 1px solid #cec;
+		color: #484;
+	}
+	.alert-error {
+		background: #fdd;
+		border: 1px solid #ecc;
+		color: #844;
+	}
+
+/* ICÔNES */
+.icon {
+	display: inline-block;
+	width: 16px;
+	height: 16px;
+	vertical-align: middle;
+	line-height: 16px;
+}
diff --git a/p/themes/Flat/icons/add.svg b/p/themes/Flat/icons/add.svg
new file mode 100644
index 000000000..15767a3ad
--- /dev/null
+++ b/p/themes/Flat/icons/add.svg
@@ -0,0 +1,30 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg xmlns:cc='http://creativecommons.org/ns#' xmlns:svg='http://www.w3.org/2000/svg' xmlns:inkscape='http://www.inkscape.org/namespaces/inkscape' id='svg7384' xmlns:sodipodi='http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd' version='1.1' inkscape:version='0.47 r22583' height='16' sodipodi:docname='list-add-symbolic.svg' xmlns:dc='http://purl.org/dc/elements/1.1/' xmlns:rdf='http://www.w3.org/1999/02/22-rdf-syntax-ns#' xmlns='http://www.w3.org/2000/svg' width='16'>
+  <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:object-paths='true' inkscape:cy='17.83946' inkscape:current-layer='layer12' inkscape:window-width='1920' pagecolor='#555753' showborder='false' showguides='true' inkscape:snap-nodes='false' objecttolerance='10' showgrid='true' inkscape:object-nodes='true' inkscape:pageshadow='2' inkscape:guide-bbox='true' inkscape:window-x='0' inkscape:snap-bbox='true' bordercolor='#FFFFFF' id='namedview88' inkscape:window-maximized='1' inkscape:snap-global='true' inkscape:window-y='26' gridtolerance='10' inkscape:zoom='1' inkscape:window-height='1021' borderopacity='1' guidetolerance='10' inkscape:snap-bbox-midpoints='false' inkscape:cx='-2.56708' inkscape:bbox-paths='false' inkscape:snap-grids='true' inkscape:pageopacity='1' inkscape:snap-to-guides='true'>
+    <inkscape:grid visible='true' spacingx='1px' type='xygrid' spacingy='1px' id='grid4866' empspacing='2' enabled='true' snapvisiblegridlinesonly='true'/>
+  </sodipodi:namedview>
+  <title id='title9167'>Gnome Symbolic Icon Theme</title>
+  <defs id='defs7386'/>
+  <g transform='translate(-60.0002,-726)' inkscape:groupmode='layer' id='layer9' inkscape:label='status' style='display:inline'/>
+  <g transform='translate(-60.0002,-726)' inkscape:groupmode='layer' id='layer10' inkscape:label='devices'/>
+  <g transform='translate(-60.0002,-726)' inkscape:groupmode='layer' id='layer11' inkscape:label='apps'/>
+  <g transform='translate(-60.0002,-726)' inkscape:groupmode='layer' id='layer12' inkscape:label='actions'>
+    
+    <path d='m 67.0002,729 0,4 -4,0 0,2 4,0 0,4 2,0 0,-4 4,0 0,-2 -4,0 0,-4 -2,0 z' id='rect31992' style='color:#FFFFFF;fill:#FFFFFF;fill-opacity:1;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible'/>
+  </g>
+  <g transform='translate(-60.0002,-726)' inkscape:groupmode='layer' id='layer13' inkscape:label='places'/>
+  <g transform='translate(-60.0002,-726)' inkscape:groupmode='layer' id='layer14' inkscape:label='mimetypes'/>
+  <g transform='translate(-60.0002,-726)' inkscape:groupmode='layer' id='layer15' inkscape:label='emblems' style='display:inline'/>
+  <g transform='translate(-60.0002,-726)' inkscape:groupmode='layer' id='g4953' inkscape:label='categories' style='display:inline'/>
+</svg>
diff --git a/p/themes/Flat/icons/all.svg b/p/themes/Flat/icons/all.svg
new file mode 100644
index 000000000..d20e0f5bf
--- /dev/null
+++ b/p/themes/Flat/icons/all.svg
@@ -0,0 +1,32 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg xmlns:cc='http://creativecommons.org/ns#' xmlns:inkscape='http://www.inkscape.org/namespaces/inkscape' xmlns:svg='http://www.w3.org/2000/svg' id='svg7384' xmlns:sodipodi='http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd' sodipodi:docname='view-list-symbolic.svg' version='1.1' inkscape:version='0.48.1 r9760' height='16' xmlns:dc='http://purl.org/dc/elements/1.1/' xmlns:rdf='http://www.w3.org/1999/02/22-rdf-syntax-ns#' xmlns='http://www.w3.org/2000/svg' width='16'>
+  <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:cy='71.95215' pagecolor='#555753' borderopacity='1' showborder='false' inkscape:bbox-paths='false' guidetolerance='10' inkscape:object-paths='true' inkscape:window-width='1198' showguides='true' inkscape:object-nodes='true' inkscape:snap-bbox='true' inkscape:pageshadow='2' inkscape:guide-bbox='true' inkscape:snap-nodes='false' bordercolor='#666666' objecttolerance='10' id='namedview88' showgrid='false' inkscape:window-maximized='0' inkscape:window-x='1582' inkscape:snap-global='true' inkscape:window-y='85' gridtolerance='10' inkscape:window-height='1079' inkscape:snap-to-guides='true' inkscape:current-layer='layer12' inkscape:snap-bbox-midpoints='false' inkscape:zoom='1' inkscape:cx='244.57499' inkscape:snap-grids='true' inkscape:pageopacity='1'>
+    <inkscape:grid spacingx='1px' spacingy='1px' id='grid4866' empspacing='2' enabled='true' type='xygrid' snapvisiblegridlinesonly='true' visible='true'/>
+  </sodipodi:namedview>
+  <title id='title9167'>Gnome Symbolic Icon Theme</title>
+  <defs id='defs7386'/>
+  <g inkscape:label='status' transform='translate(-40.0002,-746)' inkscape:groupmode='layer' id='layer9' style='display:inline'/>
+  <g inkscape:label='devices' transform='translate(-40.0002,-746)' inkscape:groupmode='layer' id='layer10'/>
+  <g inkscape:label='apps' transform='translate(-40.0002,-746)' inkscape:groupmode='layer' id='layer11'/>
+  <g inkscape:label='actions' transform='translate(-40.0002,-746)' inkscape:groupmode='layer' id='layer12'>
+    
+    <rect inkscape:label='a' x='43.000397' y='748.99976' id='rect7356' height='2.0002136' width='9.9996014' style='color:#FFFFFF;fill:#FFFFFF;fill-opacity:1;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible'/>
+    <rect inkscape:label='a' x='43.000397' y='752.99976' id='rect7358' height='2.0002136' width='9.9996014' style='color:#FFFFFF;fill:#FFFFFF;fill-opacity:1;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible'/>
+    <rect inkscape:label='a' x='43.000397' y='756.99976' id='rect7360' height='2.0002136' width='9.9996014' style='color:#FFFFFF;fill:#FFFFFF;fill-opacity:1;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible'/>
+  </g>
+  <g inkscape:label='places' transform='translate(-40.0002,-746)' inkscape:groupmode='layer' id='layer13'/>
+  <g inkscape:label='mimetypes' transform='translate(-40.0002,-746)' inkscape:groupmode='layer' id='layer14'/>
+  <g inkscape:label='emblems' transform='translate(-40.0002,-746)' inkscape:groupmode='layer' id='layer15' style='display:inline'/>
+  <g inkscape:label='categories' transform='translate(-40.0002,-746)' inkscape:groupmode='layer' id='g4953' style='display:inline'/>
+</svg>
diff --git a/p/themes/Flat/icons/close.svg b/p/themes/Flat/icons/close.svg
new file mode 100644
index 000000000..629fda7ff
--- /dev/null
+++ b/p/themes/Flat/icons/close.svg
@@ -0,0 +1,28 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg xmlns:cc='http://creativecommons.org/ns#' xmlns:inkscape='http://www.inkscape.org/namespaces/inkscape' xmlns:svg='http://www.w3.org/2000/svg' id='svg7384' version='1.1' height='16' xmlns:dc='http://purl.org/dc/elements/1.1/' xmlns:rdf='http://www.w3.org/1999/02/22-rdf-syntax-ns#' xmlns='http://www.w3.org/2000/svg' width='16'>
+  <title id='title9167'>Gnome Symbolic Icon Theme</title>
+  <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>
+  <defs id='defs7386'/>
+  <g transform='translate(-60,-518)' id='layer9' style='display:inline'/>
+  <g transform='translate(-60,-518)' id='layer10'/>
+  <g transform='translate(-60,-518)' id='layer11'/>
+  <g transform='translate(-60,-518)' id='layer12'>
+    <g transform='translate(19,-242)' id='layer4-4-1' style='display:inline'>
+      
+      <path inkscape:connector-curvature='0' d='m 45,764 1,0 c 0.01037,-1.2e-4 0.02079,-4.6e-4 0.03125,0 0.254951,0.0112 0.50987,0.12858 0.6875,0.3125 L 49,766.59375 51.3125,764.3125 C 51.578125,764.082 51.759172,764.007 52,764 l 1,0 0,1 c 0,0.28647 -0.03434,0.55065 -0.25,0.75 l -2.28125,2.28125 2.25,2.25 C 52.906938,770.46942 52.999992,770.7347 53,771 l 0,1 -1,0 c -0.265301,-10e-6 -0.530586,-0.0931 -0.71875,-0.28125 L 49,769.4375 46.71875,771.71875 C 46.530586,771.90694 46.26529,772 46,772 l -1,0 0,-1 c -3e-6,-0.26529 0.09306,-0.53058 0.28125,-0.71875 l 2.28125,-2.25 L 45.28125,765.75 C 45.070508,765.55537 44.97809,765.28075 45,765 l 0,-1 z' id='path10839-9' 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:#FFFFFF;fill:#FFFFFF;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>
+  </g>
+  <g transform='translate(-60,-518)' id='layer13'/>
+  <g transform='translate(-60,-518)' id='layer14'/>
+  <g transform='translate(-60,-518)' id='layer15'/>
+</svg>
diff --git a/p/themes/Flat/icons/configure.svg b/p/themes/Flat/icons/configure.svg
new file mode 100644
index 000000000..969c5719f
--- /dev/null
+++ b/p/themes/Flat/icons/configure.svg
@@ -0,0 +1,31 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg xmlns:dc='http://purl.org/dc/elements/1.1/' xmlns='http://www.w3.org/2000/svg' id='svg7384' xmlns:inkscape='http://www.inkscape.org/namespaces/inkscape' xmlns:cc='http://creativecommons.org/ns#' xmlns:svg='http://www.w3.org/2000/svg' width='16' sodipodi:docname='emblem-system-symbolic.svg' height='16' xmlns:sodipodi='http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd' xmlns:rdf='http://www.w3.org/1999/02/22-rdf-syntax-ns#' version='1.1' inkscape:version='0.48.1 r9760'>
+  <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:window-height='967' inkscape:snap-bbox-midpoints='false' inkscape:snap-grids='true' inkscape:object-paths='false' pagecolor='#555753' inkscape:zoom='1' inkscape:current-layer='layer15' borderopacity='1' inkscape:snap-others='false' inkscape:window-x='2259' inkscape:window-y='356' inkscape:snap-to-guides='true' gridtolerance='10' id='namedview88' inkscape:snap-global='true' inkscape:cx='9.30971' inkscape:cy='-0.23089111' bordercolor='#666666' inkscape:window-width='1226' inkscape:snap-bbox='true' guidetolerance='10' showguides='true' showborder='false' inkscape:guide-bbox='true' inkscape:object-nodes='false' inkscape:pageopacity='1' inkscape:window-maximized='0' objecttolerance='10' showgrid='false' inkscape:snap-nodes='true' inkscape:bbox-paths='false' inkscape:pageshadow='2'>
+    <inkscape:grid visible='true' spacingx='1px' spacingy='1px' id='grid4866' type='xygrid' empspacing='2' enabled='true' snapvisiblegridlinesonly='true'/>
+  </sodipodi:namedview>
+  <title id='title9167'>Gnome Symbolic Icon Theme</title>
+  <defs id='defs7386'/>
+  <g inkscape:label='status' id='layer9' style='display:inline' transform='translate(-441.0002,-400.99999)' inkscape:groupmode='layer'/>
+  <g inkscape:label='devices' id='layer10' transform='translate(-441.0002,-400.99999)' inkscape:groupmode='layer'/>
+  <g inkscape:label='apps' id='layer11' transform='translate(-441.0002,-400.99999)' inkscape:groupmode='layer'/>
+  <g inkscape:label='places' id='layer13' transform='translate(-441.0002,-400.99999)' inkscape:groupmode='layer'/>
+  <g inkscape:label='mimetypes' id='layer14' transform='translate(-441.0002,-400.99999)' inkscape:groupmode='layer'/>
+  <g inkscape:label='emblems' id='layer15' style='display:inline' transform='translate(-441.0002,-400.99999)' inkscape:groupmode='layer'>
+    
+    <path id='path35543-6-4' d='m 449.0004,402.00002 c -0.22065,0 -0.44081,0.0113 -0.65625,0.0312 l -0.40625,2.09375 c -0.33446,0.0733 -0.66305,0.17589 -0.96875,0.3125 l -1.53125,-1.46875 c -0.38863,0.23011 -0.72695,0.51408 -1.0625,0.8125 l 0.90625,1.90625 c -0.22242,0.24899 -0.42425,0.5225 -0.59375,0.8125 l -2.09375,-0.28125 c -0.17772,0.40877 -0.30872,0.83637 -0.40625,1.28125 l 1.84375,1 c -0.0171,0.16809 -0.0312,0.3274 -0.0312,0.5 0,0.1726 0.0142,0.33191 0.0312,0.5 l -1.84375,1 c 0.0975,0.44488 0.22853,0.87248 0.40625,1.28125 l 2.09375,-0.28125 c 0.1695,0.29 0.37133,0.56351 0.59375,0.8125 l -0.90625,1.90625 c 0.33555,0.29842 0.67387,0.58239 1.0625,0.8125 l 1.53125,-1.46875 c 0.3057,0.13661 0.63429,0.23916 0.96875,0.3125 l 0.40625,2.09375 c 0.21544,0.02 0.4356,0.0312 0.65625,0.0312 0.22065,0 0.44081,-0.0113 0.65625,-0.0312 l 0.40625,-2.09375 c 0.33446,-0.0733 0.66305,-0.17589 0.96875,-0.3125 l 1.53125,1.46875 c 0.38863,-0.23011 0.72695,-0.51408 1.0625,-0.8125 l -0.90625,-1.90625 c 0.22242,-0.24899 0.42425,-0.5225 0.59375,-0.8125 l 2.09375,0.28125 c 0.17772,-0.40877 0.30872,-0.83637 0.40625,-1.28125 l -1.84375,-1 c 0.0171,-0.16809 0.0312,-0.3274 0.0312,-0.5 0,-0.1726 -0.0142,-0.33191 -0.0312,-0.5 l 1.84375,-1 c -0.0975,-0.44488 -0.22853,-0.87248 -0.40625,-1.28125 l -2.09375,0.28125 c -0.1695,-0.29 -0.37133,-0.56351 -0.59375,-0.8125 l 0.90625,-1.90625 c -0.33555,-0.29842 -0.67387,-0.58239 -1.0625,-0.8125 l -1.53125,1.46875 c -0.3057,-0.13661 -0.63429,-0.23916 -0.96875,-0.3125 l -0.40625,-2.09375 c -0.21544,-0.02 -0.4356,-0.0312 -0.65625,-0.0312 z m 0,4 c 1.65685,0 3,1.34315 3,3 0,1.65685 -1.34315,3 -3,3 -1.65685,0 -3,-1.34315 -3,-3 0,-1.65685 1.34315,-3 3,-3 z' style='color:#FFFFFF;fill:#FFFFFF;fill-opacity:1;fill-rule:nonzero;stroke:none;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate' inkscape:connector-curvature='0' sodipodi:nodetypes='sccccccccccsccccccccccsccccccccccsccccccccccssssss'/>
+  </g>
+  <g inkscape:label='emotes' id='g71291' style='display:inline' transform='translate(-441.0002,-400.99999)' inkscape:groupmode='layer'/>
+  <g inkscape:label='categories' id='g4953' style='display:inline' transform='translate(-441.0002,-400.99999)' inkscape:groupmode='layer'/>
+  <g inkscape:label='actions' id='layer12' style='display:inline' transform='translate(-441.0002,-400.99999)' inkscape:groupmode='layer'/>
+</svg>
diff --git a/p/themes/Flat/icons/down.svg b/p/themes/Flat/icons/down.svg
new file mode 100644
index 000000000..31730626f
--- /dev/null
+++ b/p/themes/Flat/icons/down.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-down-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='18.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='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(-181.0002,-747)'/>
+  <g inkscape:groupmode='layer' id='layer10' inkscape:label='devices' transform='translate(-181.0002,-747)'/>
+  <g inkscape:groupmode='layer' id='layer11' inkscape:label='apps' transform='translate(-181.0002,-747)'/>
+  <g inkscape:groupmode='layer' id='layer13' inkscape:label='places' transform='translate(-181.0002,-747)'/>
+  <g inkscape:groupmode='layer' id='layer14' inkscape:label='mimetypes' transform='translate(-181.0002,-747)'/>
+  <g inkscape:groupmode='layer' id='layer15' inkscape:label='emblems' style='display:inline' transform='translate(-181.0002,-747)'/>
+  <g inkscape:groupmode='layer' id='g71291' inkscape:label='emotes' style='display:inline' transform='translate(-181.0002,-747)'/>
+  <g inkscape:groupmode='layer' id='g4953' inkscape:label='categories' style='display:inline' transform='translate(-181.0002,-747)'/>
+  <g inkscape:groupmode='layer' id='layer12' inkscape:label='actions' style='display:inline' transform='translate(-181.0002,-747)'>
+    
+    <path inkscape:connector-curvature='0' d='m 195.03152,751.00323 0,1.00001 c -9.1e-4,0.0111 5.9e-4,0.021 -9e-5,0.0312 -0.0112,0.25496 -0.12835,0.50994 -0.31251,0.6875 l -5.71875,6.29767 -5.71875,-6.29773 c -0.18821,-0.1881 -0.28121,-0.45346 -0.28122,-0.71875 l 0,-1.00001 1,0 c 0.26531,7e-5 0.53059,0.0931 0.71873,0.28131 l 4.28125,4.82896 4.28127,-4.82896 c 0.19464,-0.21073 0.46925,-0.30315 0.74998,-0.2813 z' id='path10839-9-9-5-9-1' 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:#FFFFFF;fill:#FFFFFF;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/p/themes/Flat/icons/next.svg b/p/themes/Flat/icons/next.svg
new file mode 100644
index 000000000..d75cc40f5
--- /dev/null
+++ b/p/themes/Flat/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:#FFFFFF;fill:#FFFFFF;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/p/themes/Flat/icons/prev.svg b/p/themes/Flat/icons/prev.svg
new file mode 100644
index 000000000..9ba03ceb2
--- /dev/null
+++ b/p/themes/Flat/icons/prev.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:#FFFFFF;fill:#FFFFFF;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/p/themes/Flat/icons/refresh.svg b/p/themes/Flat/icons/refresh.svg
new file mode 100644
index 000000000..8f95bf443
--- /dev/null
+++ b/p/themes/Flat/icons/refresh.svg
@@ -0,0 +1,31 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg xmlns:inkscape='http://www.inkscape.org/namespaces/inkscape' xmlns:svg='http://www.w3.org/2000/svg' xmlns:cc='http://creativecommons.org/ns#' id='svg7384' sodipodi:docname='view-refresh-symbolic.svg' xmlns:sodipodi='http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd' xmlns='http://www.w3.org/2000/svg' xmlns:rdf='http://www.w3.org/1999/02/22-rdf-syntax-ns#' inkscape:version='0.48.1 r9760' version='1.1' width='16' height='16' xmlns:dc='http://purl.org/dc/elements/1.1/'>
+  <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:zoom='1' inkscape:bbox-paths='false' inkscape:pageopacity='1' guidetolerance='10' inkscape:snap-bbox='true' inkscape:window-height='1162' objecttolerance='10' id='namedview88' showborder='false' inkscape:window-x='2191' inkscape:window-y='111' inkscape:cx='9.3351214' inkscape:cy='10.6119' gridtolerance='10' inkscape:snap-bbox-midpoints='false' showguides='true' inkscape:pageshadow='2' pagecolor='#555753' bordercolor='#666666' inkscape:snap-global='true' inkscape:window-maximized='0' inkscape:object-nodes='false' inkscape:snap-nodes='false' inkscape:guide-bbox='true' inkscape:window-width='1595' inkscape:snap-others='false' borderopacity='1' showgrid='false' inkscape:snap-to-guides='true' inkscape:object-paths='false' inkscape:snap-grids='true' inkscape:current-layer='layer12'>
+    <inkscape:grid enabled='true' spacingx='1px' spacingy='1px' id='grid4866' visible='true' snapvisiblegridlinesonly='true' empspacing='2' type='xygrid'/>
+  </sodipodi:namedview>
+  <title id='title9167'>Gnome Symbolic Icon Theme</title>
+  <defs id='defs7386'/>
+  <g id='layer9' transform='translate(-241.0002,-627)' inkscape:label='status' style='display:inline' inkscape:groupmode='layer'/>
+  <g id='layer10' transform='translate(-241.0002,-627)' inkscape:label='devices' inkscape:groupmode='layer'/>
+  <g id='layer11' transform='translate(-241.0002,-627)' inkscape:label='apps' inkscape:groupmode='layer'/>
+  <g id='layer13' transform='translate(-241.0002,-627)' inkscape:label='places' inkscape:groupmode='layer'/>
+  <g id='layer14' transform='translate(-241.0002,-627)' inkscape:label='mimetypes' inkscape:groupmode='layer'/>
+  <g id='layer15' transform='translate(-241.0002,-627)' inkscape:label='emblems' style='display:inline' inkscape:groupmode='layer'/>
+  <g id='g71291' transform='translate(-241.0002,-627)' inkscape:label='emotes' style='display:inline' inkscape:groupmode='layer'/>
+  <g id='g4953' transform='translate(-241.0002,-627)' inkscape:label='categories' style='display:inline' inkscape:groupmode='layer'/>
+  <g id='layer12' transform='translate(-241.0002,-627)' inkscape:label='actions' style='display:inline' inkscape:groupmode='layer'>
+    
+    <path id='path4597' d='m 253.90645,628.96875 a 1.0001,1.0001 0 0 0 -0.125,0.0312 1.0001,1.0001 0 0 0 -0.78125,1 l 0,1.6875 c -0.38225,-0.57796 -0.84927,-1.08223 -1.40625,-1.5 -1.15563,-0.86677 -2.53199,-1.25227 -3.875,-1.1875 -0.19186,0.009 -0.37223,0.0353 -0.5625,0.0625 -1.52218,0.21741 -2.97815,1.02304 -3.96875,2.34375 -1.98119,2.64144 -1.42267,6.42505 1.21875,8.40625 2.64147,1.98122 6.42504,1.42267 8.40625,-1.21875 A 1.0063276,1.0063276 0 0 0 253.0002,638 a 1.0063276,1.0063276 0 0 0 0,-0.15625 l 0,-0.84375 -0.8125,0 -0.0937,0 a 1.0063276,1.0063276 0 0 0 -0.0937,0 1.0063276,1.0063276 0 0 0 -0.8125,0.40625 c -1.33265,1.77674 -3.81702,2.11387 -5.59375,0.78125 -1.77674,-1.33264 -2.1139,-3.81699 -0.78125,-5.59375 1.33265,-1.77674 3.817,-2.11389 5.59375,-0.78125 0.42946,0.32212 0.76954,0.73295 1.03125,1.1875 l -1.4375,0 a 1.0001,1.0001 0 0 0 -1,1 1.0001,1.0001 0 0 0 0,0.21875 l 0,0.78125 0.84375,0 0.15625,0 4,0 1,0 0,-1 0,-4 a 1.0001,1.0001 0 0 0 0,-0.1875 l 0,-0.8125 -0.8125,0 a 1.0001,1.0001 0 0 0 -0.28125,-0.0312 z' 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;baseline-shift:baseline;color:#FFFFFF;fill:#FFFFFF;fill-opacity:1;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans' inkscape:connector-curvature='0'/>
+  </g>
+</svg>
diff --git a/p/themes/Flat/icons/search.svg b/p/themes/Flat/icons/search.svg
new file mode 100644
index 000000000..bca7571b4
--- /dev/null
+++ b/p/themes/Flat/icons/search.svg
@@ -0,0 +1,32 @@
+<?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='folder-saved-search-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.2 r9819' version='1.1' width='16.000002' 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-paths='false' bordercolor='#FFFFFF' borderopacity='1' inkscape:current-layer='layer13' inkscape:cx='-151.02446' inkscape:cy='0.353386' gridtolerance='10' inkscape:guide-bbox='true' guidetolerance='10' id='namedview88' inkscape:object-nodes='false' inkscape:object-paths='false' objecttolerance='10' pagecolor='#555753' 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='1168' inkscape:window-maximized='1' inkscape:window-width='1600' inkscape:window-x='0' inkscape:window-y='0' inkscape:zoom='1'>
+    <inkscape:grid empspacing='2' enabled='true' id='grid4866' 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(-441.0004,-195)'/>
+  <g inkscape:groupmode='layer' id='layer10' inkscape:label='devices' transform='translate(-441.0004,-195)'/>
+  <g inkscape:groupmode='layer' id='layer11' inkscape:label='apps' transform='translate(-441.0004,-195)'/>
+  <g inkscape:groupmode='layer' id='layer13' inkscape:label='places' transform='translate(-441.0004,-195)'>
+    <path inkscape:connector-curvature='0' d='m 447.50781,195.99554 c -3.02886,0 -5.51073,2.47905 -5.51073,5.50447 0,3.02541 2.48187,5.50446 5.51073,5.50446 3.02885,0 5.51072,-2.47905 5.51072,-5.50446 0,-3.02542 -2.48187,-5.50447 -5.51072,-5.50447 z m 0,2.00893 c 1.94735,0 3.49951,1.55039 3.49951,3.49554 0,1.94514 -1.55216,3.49553 -3.49951,3.49553 -1.94736,0 -3.49952,-1.55039 -3.49952,-3.49553 0,-1.94515 1.55216,-3.49554 3.49952,-3.49554 z' id='path5079' 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;baseline-shift:baseline;color:#FFFFFF;fill:#FFFFFF;fill-opacity:1;stroke:none;stroke-width:1.55467153;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:new;font-family:Sans;-inkscape-font-specification:Sans'/>
+    <path inkscape:connector-curvature='0' d='m 450.8125,204 a 1.0001,1.0001 0 0 0 -0.5,1.71875 l 4,4 a 1.0054782,1.0054782 0 1 0 1.40625,-1.4375 l -4,-4 A 1.0001,1.0001 0 0 0 450.8125,204 z' id='path5081' 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;baseline-shift:baseline;color:#FFFFFF;fill:#FFFFFF;fill-opacity:1;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:new;font-family:Sans;-inkscape-font-specification:Sans'/>
+    
+  </g>
+  <g inkscape:groupmode='layer' id='layer14' inkscape:label='mimetypes' transform='translate(-441.0004,-195)'/>
+  <g inkscape:groupmode='layer' id='layer15' inkscape:label='emblems' style='display:inline' transform='translate(-441.0004,-195)'/>
+  <g inkscape:groupmode='layer' id='g71291' inkscape:label='emotes' style='display:inline' transform='translate(-441.0004,-195)'/>
+  <g inkscape:groupmode='layer' id='g4953' inkscape:label='categories' style='display:inline' transform='translate(-441.0004,-195)'/>
+  <g inkscape:groupmode='layer' id='layer12' inkscape:label='actions' style='display:inline' transform='translate(-441.0004,-195)'/>
+</svg>
diff --git a/p/themes/Flat/icons/up.svg b/p/themes/Flat/icons/up.svg
new file mode 100644
index 000000000..3ab11b168
--- /dev/null
+++ b/p/themes/Flat/icons/up.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-up-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='-1.351226' 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='40px' 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(-201.0002,-747)'/>
+  <g inkscape:groupmode='layer' id='layer10' inkscape:label='devices' transform='translate(-201.0002,-747)'/>
+  <g inkscape:groupmode='layer' id='layer11' inkscape:label='apps' transform='translate(-201.0002,-747)'/>
+  <g inkscape:groupmode='layer' id='layer13' inkscape:label='places' transform='translate(-201.0002,-747)'/>
+  <g inkscape:groupmode='layer' id='layer14' inkscape:label='mimetypes' transform='translate(-201.0002,-747)'/>
+  <g inkscape:groupmode='layer' id='layer15' inkscape:label='emblems' style='display:inline' transform='translate(-201.0002,-747)'/>
+  <g inkscape:groupmode='layer' id='g71291' inkscape:label='emotes' style='display:inline' transform='translate(-201.0002,-747)'/>
+  <g inkscape:groupmode='layer' id='g4953' inkscape:label='categories' style='display:inline' transform='translate(-201.0002,-747)'/>
+  <g inkscape:groupmode='layer' id='layer12' inkscape:label='actions' style='display:inline' transform='translate(-201.0002,-747)'>
+    
+    <path inkscape:connector-curvature='0' d='m 215.03152,758.99677 0,-1.00001 c -9.1e-4,-0.0111 5.9e-4,-0.021 -9e-5,-0.0312 -0.0112,-0.25496 -0.12835,-0.50994 -0.31251,-0.6875 l -5.71875,-6.29767 -5.71875,6.29773 c -0.18821,0.1881 -0.28121,0.45346 -0.28122,0.71875 l 0,1.00001 1,0 c 0.26531,-7e-5 0.53059,-0.0931 0.71873,-0.28131 l 4.28125,-4.82896 4.28127,4.82896 c 0.19464,0.21073 0.46925,0.30315 0.74998,0.2813 z' id='path10839-9-9-5-9-1-0' 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:#FFFFFF;fill:#FFFFFF;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/p/themes/Flat/loader.gif b/p/themes/Flat/loader.gif
new file mode 100644
index 000000000..ce36565b3
Binary files /dev/null and b/p/themes/Flat/loader.gif differ
diff --git a/p/themes/Flat/metadata.json b/p/themes/Flat/metadata.json
new file mode 100644
index 000000000..6b94d11c2
--- /dev/null
+++ b/p/themes/Flat/metadata.json
@@ -0,0 +1,7 @@
+{
+  "name": "Flat design",
+  "author": "Marien Fressinaud",
+  "description": "Thème plat pour FreshRSS",
+  "version": 0.1,
+  "files": ["global.css", "freshrss.css"]
+}
\ No newline at end of file
diff --git a/p/themes/Origine/freshrss.css b/p/themes/Origine/freshrss.css
new file mode 100644
index 000000000..593f21d30
--- /dev/null
+++ b/p/themes/Origine/freshrss.css
@@ -0,0 +1,880 @@
+@charset "UTF-8";
+
+/* STRUCTURE */
+.header {
+	display: table;
+	width: 100%;
+	background: #f4f4f4;
+	table-layout: fixed;
+}
+	.header > .item {
+		display: table-cell;
+		padding: 10px 0;
+		border-bottom: 1px solid #aaa;
+		vertical-align: middle;
+		text-align: center;
+	}
+		.header > .item.title {
+			width: 250px;
+			white-space: nowrap;
+		}
+			.logo {
+				display: inline-block;
+				font-size: 48px;
+				height: 32px;
+				width: 32px;
+				padding: 10px;
+			}
+			.header > .item.title h1 {
+				display: inline-block;
+				margin: 0;
+				text-shadow: 1px -1px 0 #ccc;
+			}
+		.header > .item.search input {
+			width: 230px;
+			transition: width 200ms linear;
+		}
+			.header .item.search input:focus {
+				width: 330px;
+			}
+		.header > .item.configure {
+			width: 100px;
+		}
+
+.item a:hover {
+	text-decoration: none;
+}
+
+#global {
+	display: table;
+	width: 100%;
+	height: 100%;
+	background: #fafafa;
+	table-layout: fixed;
+}
+	.aside {
+		display: table-cell;
+		height: 100%;
+		width: 250px;
+		vertical-align: top;
+		border-right: 1px solid #aaa;
+		background: #fff;
+	}
+		.aside .nav-form input {
+			width: 180px;
+		}
+		.aside.aside_flux {
+			padding: 10px 0 40px;
+		}
+		.aside.aside_feed .nav-form input {
+			width: 140px;
+		}
+		.aside.aside_feed .nav-form .dropdown .dropdown-menu {
+			right: -20px;
+		}
+		.aside.aside_feed .nav-form .dropdown .dropdown-menu:after {
+			right: 33px;
+		}
+
+	.nav-login {
+		display: none;
+	}
+
+	.nav_menu {
+		width: 100%;
+		background: #fafafa;
+		border-bottom: 1px solid #aaa;
+		text-align: center;
+		padding: 5px 0;
+	}
+		.nav_menu .search {
+			display:none;
+		}
+
+.favicon {
+	height: 16px;
+	width: 16px;
+}
+
+.categories {
+	margin: 0;
+	padding: 0;
+	text-align: center;
+	list-style: none;
+}
+	.category {
+		display: block;
+		width: 220px;
+		margin: 10px auto;
+		text-align: left;
+		overflow: hidden;
+		white-space: nowrap;
+		text-overflow: ellipsis;
+	}
+		.category .btn:first-child {
+			width: 195px;
+			position: relative;
+		}
+		.category.stick .btn:first-child {
+			width:160px;
+		}
+		.category .btn:first-child:not([data-unread="0"]):after {
+			content: attr(data-unread);
+			position: absolute;
+			top: 3px; right: 3px;
+			padding: 1px 5px;
+			background: #ccc;
+			color: #fff;
+			font-size: 90%;
+			border: 1px solid #bbb;
+			border-radius: 5px;
+			box-shadow: 1px 3px 3px #aaa inset;
+			text-shadow: 0 0 1px #aaa;
+		}
+		.category + .feeds:not(.active) {
+			display:none;
+		}
+	.categories .feeds {
+		width: 100%;
+		margin: 0;
+		list-style: none;
+	}
+		.categories .feeds .item.active {
+			background: #0062BE;
+		}
+		.categories .feeds .item.active .feed {
+			color: #fff;
+		}
+		.categories .feeds .item.empty .feed {
+			color: #e67e22;
+		}
+		.categories .feeds .item.empty.active {
+			background: #e67e22;
+		}
+		.categories .feeds .item.empty.active .feed {
+			color: #fff;
+		}
+		.categories .feeds .item.error .feed {
+			color: #BD362F;
+		}
+		.categories .feeds .item .feed {
+			display: inline-block;
+			margin: 0;
+			width: 165px;
+			line-height: 35px;
+			font-size: 90%;
+			vertical-align: middle;
+			text-align: left;
+			overflow: hidden;
+			white-space: nowrap;
+			text-overflow: ellipsis;
+		}
+		.feed:not([data-unread="0"]) {
+			font-weight:bold;
+		}
+		.feed:not([data-unread="0"]):before {
+			content: "(" attr(data-unread) ") ";
+		}
+		.categories .feeds .dropdown-menu {
+			left: 0;
+		}
+		.categories .feeds .dropdown-menu:after {
+			left: 2px;
+		}
+		.categories .feeds .item .dropdown-toggle > .icon {
+			visibility: hidden;
+			cursor: pointer;
+		}
+			.categories .feeds .item .dropdown-target:target ~ .dropdown-toggle > .icon,
+			.categories .feeds .item:hover .dropdown-toggle > .icon,
+			.categories .feeds .item.active .dropdown-toggle > .icon {
+				background-color: #fff;
+				border-radius: 3px;
+				visibility: visible;
+			}
+
+.post {
+	padding: 10px 50px;
+}
+	.post form {
+		margin: 10px 0;
+	}
+
+.day {
+	min-height: 50px;
+	padding: 0 10px;
+	font-size: 130%;
+	font-weight: bold;
+	line-height: 50px;
+	background: #fff;
+	border-top: 1px solid #aaa;
+	border-bottom: 1px solid #aaa;
+}
+	.day:first-child {
+		border-top: none;
+	}
+	.day .name {
+		position: absolute;
+		right: 0;
+		width: 50%;
+		height: 1.5em;
+		padding: 0 10px 0 0;
+		overflow: hidden;
+		color: #aab;
+		font-size: 1.8em;
+		opacity: .3;
+		text-shadow: 0px -1px 0px #333;
+		font-style: italic;
+		white-space: nowrap;
+		text-overflow: ellipsis;
+		text-align: right;
+	}
+
+.flux {
+	border-left: 3px solid #aaa;
+	background: #fafafa;
+}
+	.flux:hover {
+		background: #fff;
+	}
+	.flux.not_read {
+		border-left: 3px solid #FF5300;
+		background: #FFF3ED;
+	}
+	.flux.favorite {
+		border-left: 3px solid #FFC300;
+		background: #FFF6DA;
+	}
+	.flux.current {
+		border-left: 3px solid #0062BE;
+		background: #fff;
+	}
+
+	.flux_header {
+		background: inherit;
+		height: 25px;
+		font-size: 12px;
+		border-top: 1px solid #ddd;
+		cursor: pointer;
+	}
+		.flux .item {
+			line-height: 40px;
+			white-space: nowrap;
+		}
+		.flux_header > .item {
+			overflow: hidden;
+			text-overflow: ellipsis;
+		}
+		.flux .item.manage {
+			width: 40px;
+			text-align: center;
+		}
+		.flux .item.website {
+			width: 200px;
+		}
+			.website .favicon {
+				padding: 5px;
+			}
+		.flux .item.title {
+			background: inherit;
+		}
+		.flux:hover .item.title {
+			border-right: 2px solid rgba(127, 127, 127, 0.1);
+			padding-right: 1em;
+			position: absolute;
+		}
+			.flux .item.title a {
+				color: #000;
+				outline: none;
+			}
+			.flux.not_read .item.title,
+			.flux.current .item.title {
+				font-weight: bold;
+			}
+		.flux .item.date {
+			width: 200px;
+			padding:0 5px 0 0;
+			text-align: right;
+			font-size: 10px;
+			color: #666;
+		}
+		.link {
+			width: 40px;
+			text-align: center;
+		}
+
+#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;
+	}
+
+#stream.global {
+	text-align: center;
+}
+	#stream.global .box-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 .category {
+			width: 100%;
+			margin: 0;
+		}
+		#stream.global .btn {
+			display: block;
+			width: auto;
+			height: 35px;
+			margin: 0;
+			padding: 0 10px;
+			background: #eee;
+			border: none;
+			border-bottom: 1px solid #aaa;
+			border-radius: 5px 5px 0 0;
+			line-height: 35px;
+			font-size: 120%;
+		}
+			#stream.global .btn:not([data-unread="0"]) {
+				font-weight:bold;
+			}
+			#stream.global .btn:first-child:not([data-unread="0"]):after {
+				top: 0; right: 5px;
+				border: 0;
+				background: none;
+				color: #666;
+				font-weight: bold;
+				box-shadow: none;
+			}
+		#stream.global .box-category .feeds {
+			display: block;
+			max-height: 250px;
+			margin: 0;
+			list-style: none;
+			overflow: auto;
+		}
+			#stream.global .box-category .feeds .item {
+				padding: 2px 10px;
+				font-size: 90%;
+			}
+		#stream.global .box-category .feed {
+			width: 220px;
+		}
+
+.content {
+	min-height: 150px;
+	max-width: 550px;
+	margin: 0 auto;
+	padding: 20px 10px;
+	line-height: 170%;
+	word-wrap: break-word;
+}
+	.content h1, .content h2, .content h3 {
+		margin: 20px 0 5px;
+	}
+	.content > .title {
+		font-size: x-large;
+		margin: 0;
+	}
+
+	.content p {
+		margin: 0 0 20px;
+	}
+	img.big {
+		display: block;
+		margin: 10px auto;
+	}
+	figure img.big {
+		margin: 0;
+	}
+	.content hr {
+		margin: 30px 0;
+		height: 1px;
+		background: #ddd;
+		border: 0;
+	}
+	.content pre {
+		margin: 10px auto;
+		padding: 10px;
+		overflow: auto;
+		background: #000;
+		color: #fff;
+		font-size: 110%;
+	}
+	.content q, .content blockquote {
+		display: block;
+		margin: 5px 0;
+		padding: 5px 20px;
+		font-style: italic;
+		border-left: 4px solid #ccc;
+		color: #666;
+	}
+		.content blockquote p {
+			margin: 0;
+		}
+
+#panel {
+	display: none;
+	position: fixed;
+	top: 10px; bottom: 10px;
+	left: 100px; right: 100px;
+	overflow: auto;
+	background: #fff;
+	border: 1px solid #95a5a6;
+	border-radius: 5px;
+}
+	#panel .close {
+		position: fixed;
+		top: 10px; right: 0;
+		display: inline-block;
+		width: 26px;
+		height: 26px;
+		margin: 0 10px 0 0;
+		border: 1px solid #ccc;
+		border-radius: 20px;
+		text-align: center;
+		line-height: 26px;
+		background: #fff;
+	}
+
+#overlay {
+	display: none;
+	position: fixed;
+	top: 0; bottom: 0;
+	left: 0; right: 0;
+	background: rgba(0, 0, 0, 0.9);
+}
+
+.flux_content .bottom {
+	font-size: 90%;
+	text-align: center;
+}
+
+.hide_posts > :not(.active) > .flux_content {
+	display:none;
+}
+
+/*** PAGINATION ***/
+.pagination {
+	display: table;
+	width: 100%;
+	margin: 0;
+	background: #fafafa;
+	text-align: center;
+	color: #333;
+	font-size: 80%;
+	line-height: 200%;
+	table-layout: fixed;
+}
+	.pagination .item {
+		display: table-cell;
+		line-height: 40px;
+	}
+		.pagination .item.pager-current {
+			font-weight: bold;
+			font-size: 140%;
+		}
+		.pagination .pager-first,
+		.pagination .pager-previous,
+		.pagination .pager-next,
+		.pagination .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;
+	}
+
+#nav_entries {
+	display: table;
+	width: 250px;
+	height: 40px;
+	position: fixed;
+	bottom: 0;
+	left: 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 a {
+			display: block;
+		}
+		#nav_entries .i_up {
+			margin: 5px 0 0;
+			vertical-align: top;
+		}
+
+.loading {
+	background: url("loader.gif") center center no-repeat;
+	font-size: 0;
+}
+
+#bigMarkAsRead {
+	display: block;
+	font-style: normal;
+	padding: 32px 0 64px 0;
+	text-align: center;
+	text-decoration: none;
+	text-shadow: 0 -1px 0 #aaa;
+}
+	#bigMarkAsRead:hover {
+		background: #333;
+		color: #fff;
+	}
+	.bigTick {
+		font-size: 72pt;
+		line-height: 1.6em;
+	}
+
+/*** NOTIFICATION ***/
+.notification {
+	position: absolute;
+	top: 10px;
+	left: 25%; right: 25%;
+	min-height: 30px;
+	padding: 10px;
+	line-height: 30px;
+	text-align: center;
+	border-radius: 5px;
+	box-shadow: 0 0 5px #666;
+	background: #ddd;
+	color: #666;
+	font-weight: bold;
+	z-index: 10;
+}
+	.notification.good {
+		background: #f4f899;
+	}
+	.notification.bad {
+		background: #f4a899;
+	}
+	.notification a.close {
+		display: inline-block;
+		width: 16px;
+		height: 16px;
+		float: right;
+		margin: -20px -20px 0 0;
+		padding: 5px;
+		background: #fff;
+		border-radius: 50px;
+		border: 1px solid #aaa;
+		line-height: 16px;
+	}
+
+.toggle_aside, .btn.toggle_aside {
+	display: none;
+}
+
+.actualizeProgress {
+	position: fixed;
+	top: 10px;
+	left: 25%; right: 25%;
+	padding: 5px;
+	background: #fff;
+	text-align: center;
+	border: 1px solid #ddd;
+	border-radius: 5px;
+}
+	.actualizeProgress progress {
+		max-width: 100%;
+		vertical-align: middle;
+	}
+	.actualizeProgress .progress {
+		color: #999;
+		font-size: 90%;
+		vertical-align: middle;
+	}
+
+.logs {
+	border: 1px solid #aaa;
+}
+	.log {
+		padding: 5px 2%;
+		overflow: auto;
+		background: #fafafa;
+		border-bottom: 1px solid #999;
+		color: #333;
+		font-size: 90%;
+	}
+		.log .date {
+			display: block;
+		}
+	.log.error {
+		background: #fdd;
+		color: #844;
+	}
+	.log.warning {
+		background: #ffe;
+		color: #c95;
+	}
+	.log.notice {
+		background: #f4f4f4;
+		color: #aaa;
+	}
+	.log.debug {
+		background: #111;
+		color: #eee;
+	}
+
+.form-group table {
+	border-collapse:collapse;
+	margin:10px 0 0 220px;
+	text-align:center;
+}
+
+.form-group tr, .form-group th, .form-group td {
+	border:1px solid #DDD;
+	font-weight:normal;
+	padding:.5em;
+}
+
+select.number option {
+	text-align:right;
+}
+
+@media(max-width: 840px) {
+	.header,
+	.aside .btn-important,
+	.aside .feeds .dropdown,
+	.flux_header .item.website span,
+	.item.date {
+		display: none;
+	}
+	.flux_header .item.website {
+		width: 40px;
+		text-align: center;
+	}
+		.flux_header .item.website .favicon {
+			padding: 12px;
+		}
+
+	.nav-login {
+		display: block;
+	}
+
+	.content {
+		font-size: 120%;
+		padding: 0;
+	}
+
+	.pagination {
+		margin: 0 0 40px;
+	}
+	.pagination .pager-previous, .pagination .pager-next {
+		width: 100px;
+	}
+
+	.toggle_aside, .btn.toggle_aside {
+		display: inline-block;
+	}
+	.aside {
+		position: fixed;
+		top: 0; left: 0;
+		width: 0;
+		overflow: hidden;
+		border-right: none;
+		z-index: 10;
+		transition: width 200ms linear;
+	}
+		.aside.aside_flux {
+			padding: 10px 0 0;
+		}
+		.aside:target {
+			width: 80%;
+			border-right: 1px solid #aaa;
+			overflow: auto;
+		}
+		.aside .toggle_aside {
+			position: absolute;
+			right: 0;
+			display: inline-block;
+			width: 26px;
+			height: 26px;
+			margin: 0 10px 0 0;
+			border: 1px solid #ccc;
+			border-radius: 20px;
+			text-align: center;
+			line-height: 26px;
+		}
+		.aside .categories {
+			margin: 30px 0;
+		}
+
+	#nav_entries {
+		width: 100%;
+	}
+
+	.nav_menu .btn {
+		margin: 5px 10px;
+	}
+	.nav_menu .stick {
+		margin: 0 10px;
+	}
+	.nav_menu .stick .btn {
+		margin: 5px 0;
+	}
+	.nav_menu .search {
+			display: inline-block;
+			max-width: 97%;
+		}
+		.nav_menu .search input {
+			max-width: 97%;
+			width: 90px;
+		}
+		.nav_menu .search input:focus {
+			width: 400px;
+		}
+
+	#panel {
+		left: 5px; right: 5px;
+	}
+
+	.day .date {
+		display: none;
+	}
+	.day .name {
+		height: 2.6em;
+		font-size: 1em;
+		text-shadow: none;
+	}
+
+	.notification,
+	.actualizeProgress {
+		left: 10px;
+		right: 10px;
+	}
+}
+
+/*** FALLBACK ***/
+.btn {
+	background: #fff;
+	background: -moz-linear-gradient(top, #fff 0%, #eee 100%);
+	background: -webkit-linear-gradient(top, #fff 0%, #eee 100%);
+	background: -o-linear-gradient(top, #fff 0%, #eee 100%);
+	background: -ms-linear-gradient(top, #fff 0%, #eee 100%);
+}
+	.btn:hover {
+		background: #f0f0f0;
+		background: -moz-linear-gradient(top, #f8f8f8 0%, #f0f0f0 100%);
+		background: -webkit-linear-gradient(top, #f8f8f8 0%, #f0f0f0 100%);
+		background: -o-linear-gradient(top, #f8f8f8 0%, #f0f0f0 100%);
+		background: -ms-linear-gradient(top, #f8f8f8 0%, #f0f0f0 100%);
+	}
+	.btn-important {
+		background: #0084CC;
+		background: -moz-linear-gradient(top, #0084CC 0%, #0045CC 100%);
+		background: -webkit-linear-gradient(top, #0084CC 0%, #0045CC 100%);
+		background: -o-linear-gradient(top, #0084CC 0%, #0045CC 100%);
+		background: -ms-linear-gradient(top, #0084CC 0%, #0045CC 100%);
+	}
+		.btn-important:hover {
+			background: -moz-linear-gradient(top, #0066CC 0%, #0045CC 100%);
+			background: -webkit-linear-gradient(top, #0066CC 0%, #0045CC 100%);
+			background: -o-linear-gradient(top, #0066CC 0%, #0045CC 100%);
+			background: -ms-linear-gradient(top, #0066CC 0%, #0045CC 100%);
+		}
+	.btn-attention {
+		background: #E95B57;
+		background: -moz-linear-gradient(top, #E95B57 0%, #BD362F 100%);
+		background: -webkit-linear-gradient(top, #E95B57 0%, #BD362F 100%);
+		background: -o-linear-gradient(top, #E95B57 0%, #BD362F 100%);
+		background: -ms-linear-gradient(top, #E95B57 0%, #BD362F 100%);
+	}
+		.btn-attention:hover {
+			background: -moz-linear-gradient(top, #D14641 0%, #BD362F 100%);
+			background: -webkit-linear-gradient(top, #D14641 0%, #BD362F 100%);
+			background: -o-linear-gradient(top, #D14641 0%, #BD362F 100%);
+			background: -ms-linear-gradient(top, #D14641 0%, #BD362F 100%);
+		}
+
+.dropdown-menu:after {
+	-moz-transform: rotate(45deg);
+	-webkit-transform: rotate(45deg);
+	-ms-transform: rotate(45deg);
+}
+
+.nav-head {
+	background: #fff;
+	background: -moz-linear-gradient(top, #fff 0%, #f0f0f0 100%);
+	background: -webkit-linear-gradient(top, #fff 0%, #f0f0f0 100%);
+	background: -o-linear-gradient(top, #fff 0%, #f0f0f0 100%);
+	background: -ms-linear-gradient(top, #fff 0%, #f0f0f0 100%);
+}
+
+.header > .item.search input {
+	-moz-transition: width 200ms linear;
+	 -webkit-transition: width 200ms linear;
+	-o-transition: width 200ms linear;
+	-ms-transition: width 200ms linear;
+}
+
+@media(max-width: 840px) {
+	.aside {
+		-moz-transition: width 200ms linear;
+		 -webkit-transition: width 200ms linear;
+		-o-transition: width 200ms linear;
+		-ms-transition: width 200ms linear;
+	}
+}
+
+@media print {
+	.header,
+	.aside,
+	.nav_menu,
+	.day,
+	.flux_header,
+	.flux_content .bottom,
+	.pagination {
+		display: none;
+	}
+
+	html, body {
+		background: #fff;
+		color: #000;
+		font-family: Serif;
+		font-size: 12pt;
+	}
+
+	#global,
+	.flux_content {
+		display: block !important;
+	}
+
+	.flux_content .content {
+		width: 100% !important;
+		text-align: justify;
+	}
+
+	.flux_content .content a {
+		color: #000;
+	}
+	.flux_content .content a:after {
+		content: " (" attr(href) ") ";
+		text-decoration: underline;
+	}
+}
diff --git a/p/themes/Origine/global.css b/p/themes/Origine/global.css
new file mode 100644
index 000000000..49f3aa4cd
--- /dev/null
+++ b/p/themes/Origine/global.css
@@ -0,0 +1,503 @@
+@charset "UTF-8";
+
+/* FONTS */
+@font-face {
+	font-family: "OpenSans";
+	src: url("../fonts/openSans.woff") format("woff");
+}
+
+
+* {
+	margin: 0;
+	padding: 0;
+}
+html, body {
+	height: 100%;
+	font-size: 95%;
+	font-family: "OpenSans", "Cantarell", "Helvetica", "Arial", sans-serif;
+}
+
+/* LIENS */
+a {
+	color: #0062BE;
+	text-decoration: none;
+}
+	a:hover {
+		text-decoration: underline;
+	}
+
+/* LISTES */
+ul, ol, dl {
+	margin: 10px 0 10px 30px;
+	line-height: 190%;
+}
+	dd {
+		margin: 0 0 10px 30px;
+	}
+
+/* TITRES */
+h1, h2, h3 {
+	min-height: 40px;
+	margin: 15px 0 5px;
+	line-height: 40px;
+}
+
+/* IMG */
+figure {
+	margin: 5px 0 10px;
+	text-align: center;
+}
+	figcaption {
+		display: inline-block;
+		padding: 3px 20px;
+		color: #999;
+		font-style: italic;
+		border-bottom: 1px solid #ccc;
+	}
+img {
+	height: auto;
+	max-width: 100%;
+	vertical-align: middle;
+}
+	a img {
+		border: none;
+	}
+
+/* VIDEOS */
+iframe, embed, object, video {
+	max-width: 100%;
+}
+
+/* FORMULAIRES */
+legend {
+	display: block;
+	width: 100%;
+	margin: 20px 0 5px;
+	padding: 5px 0;
+	border-bottom: 1px solid #ddd;
+	font-size: 150%;
+	clear: both;
+}
+label {
+	display: block;
+	min-height: 25px;
+	padding: 5px 0;
+	font-size: 14px;
+	line-height: 25px;
+	cursor: pointer;
+}
+input, select, textarea {
+	display: inline-block;
+	max-width: 100%;
+	min-height: 25px;
+	padding: 5px;
+	background: #fdfdfd;
+	border: 1px solid #bbb;
+	border-radius: 3px;
+	color: #666;
+	line-height: 25px;
+	vertical-align: middle;
+	box-shadow: 0 2px 2px #eee inset;
+}
+	option {
+		padding:0 .5em 0 .5em;
+	}
+	input[type="radio"],
+	input[type="checkbox"] {
+		width: 15px !important;
+		min-height: 15px !important;
+	}
+	input:focus, select:focus, textarea:focus {
+		color: #0062BE;
+		border-color: #33BBFF;
+		box-shadow: 0 2px 2px #DDDDFF inset;
+	}
+	input:invalid, select:invalid {
+		border-color: red;
+		box-shadow: 0 0 2px 1px red;
+	}
+
+.form-group {
+	margin: 0;
+}
+	.form-group:after {
+		content: "";
+		display: block;
+		clear: both;
+	}
+	.form-group.form-actions {
+		min-width: 250px;
+		padding: 5px 0;
+		background: #f4f4f4;
+		border-top: 1px solid #ddd;
+	}
+		.form-group.form-actions .btn {
+			margin: 0 10px;
+		}
+	.form-group .group-name {
+		display: block;
+		float: left;
+		width: 200px;
+		padding: 10px 0;
+		text-align: right;
+	}
+	.form-group .group-controls {
+		min-width: 250px;
+		min-height: 25px;
+		margin: 0 0 0 220px;
+		padding: 5px 0;
+	}
+		.form-group .group-controls .control {
+			display: block;
+			min-height: 30px;
+			padding: 5px 0;
+			line-height: 25px;
+			font-size: 14px;
+		}
+
+.stick {
+	display: inline-block;
+	white-space: nowrap;
+	font-size: 0px;
+	vertical-align: middle;
+}
+	.stick input,
+	.stick .btn {
+		border-radius: 0;
+		font-size: 14px;
+	}
+	.stick .btn:first-child,
+	.stick input:first-child {
+		border-radius: 3px 0 0 3px;
+	}
+		.stick .btn-important:first-child {
+			border-right: 1px solid #06f;
+		}
+	.stick .btn:last-child,
+	.stick input:last-child {
+		border-radius: 0 3px 3px 0;
+	}
+	.stick .btn + .btn,
+	.stick .btn + input,
+	.stick input + .btn,
+	.stick input + input {
+		border-left: none;
+	}
+	.stick input + .btn {
+		border-top: 1px solid #bbb;
+	}
+	.stick .btn + .dropdown > .btn {
+		border-left: none;
+		border-radius: 0 3px 3px 0;
+	}
+	.stick .btn + .dropdown a {
+		font-size: 12px;
+	}
+
+.btn {
+	display: inline-block;
+	min-height: 37px;
+	min-width: 15px;
+	padding: 5px 10px;
+	background: linear-gradient(to bottom, #fff 0%, #eee 100%);
+	border-radius: 3px;
+	border: 1px solid #ddd;
+	border-bottom: 1px solid #aaa;
+	border-right: 1px solid #aaa;
+	color: #666;
+	text-shadow: 0px -1px 0 #ddd;
+	line-height: 20px;
+	vertical-align: middle;
+	cursor: pointer;
+	overflow: hidden;
+}
+	a.btn {
+		min-height: 25px;
+		line-height: 25px;
+	}
+	.btn:hover {
+		background: linear-gradient(to bottom, #f8f8f8, #f0f0f0);
+		text-decoration: none;
+	}
+	.btn.active,
+	.btn:active,
+	.dropdown-target:target ~ .btn.dropdown-toggle {
+		box-shadow: 0px 2px 4px #e0e0e0 inset, 0px 1px 2px #fafafa;
+		background: #eee;
+	}
+
+	.btn-important {
+		background: linear-gradient(to bottom, #0084CC, #0045CC);
+		color: #fff;
+		border: 1px solid #0062B7;
+		text-shadow: 0px -1px 0 #aaa;
+	}
+		.btn-important:hover {
+			background: linear-gradient(to bottom, #0066CC, #0045CC);
+		}
+		.btn-important:active {
+			background: #0044CB;
+			box-shadow: none;
+		}
+
+	.btn-attention {
+		background: linear-gradient(to bottom, #E95B57, #BD362F);
+		color: #fff;
+		border: 1px solid #C44742;
+		text-shadow: 0px -1px 0px #666;
+	}
+		.btn-attention:hover {
+			background: linear-gradient(to bottom, #D14641, #BD362F);
+		}
+		.btn-attention:active {
+			background: #BD362F;
+			box-shadow: none;
+		}
+
+/* NAVIGATION */
+.nav-list .nav-header,
+.nav-list .item {
+	display: block;
+	height: 35px;
+	line-height: 35px;
+}
+	.nav-list .item:hover {
+		background: #fafafa;
+	}
+		.nav-list .item:hover a {
+			color: #003388;
+		}
+	.nav-list .item.active {
+		background: #0062BE;
+		color: #fff;
+	}
+		.nav-list .item.active a {
+			color: #fff;
+		}
+	.nav-list .disable {
+		color: #aaa;
+		background: #fafafa;
+		text-align: center;
+	}
+	.nav-list .item > * {
+		display: block;
+		padding: 0 10px;
+		overflow: hidden;
+		white-space: nowrap;
+		text-overflow: ellipsis;
+	}
+		.nav-list a:hover {
+			text-decoration: none;
+		}
+	.nav-list .item.error a {
+		color: #BD362F;
+	}
+		.nav-list .item.active.error a {
+			color: #fff;
+			background: #BD362F;
+		}
+	.nav-list .item.empty a {
+		color: #f39c12;
+	}
+		.nav-list .item.active.empty a {
+			color: #fff;
+			background: #f39c12;
+		}
+
+	.nav-list .nav-header {
+		padding: 0 10px;
+		color: #888;
+		background: #f4f4f4;
+		border-bottom: 1px solid #ddd;
+		font-weight: bold;
+		text-shadow: 0 0 1px #ddd;
+	}
+	.nav-list .separator {
+		display: block;
+		height: 0;
+		margin: 5px 0;
+		border-bottom: 1px solid #ddd;
+	}
+
+	.nav-list .nav-form {
+		padding: 3px;
+		text-align: center;
+	}
+
+.nav-head {
+	display: block;
+	margin: 0;
+	background: linear-gradient(to bottom, #fff, #f0f0f0);
+	border-bottom: 1px solid #ddd;
+	text-align: right;
+}
+	.nav-head .item {
+		display: inline-block;
+		padding: 5px 10px;
+	}
+
+/* HORIZONTAL-LIST */
+.horizontal-list {
+	display: table;
+	table-layout: fixed;
+	margin: 0;
+	padding: 0;
+	width: 100%;
+}
+	.horizontal-list .item {
+		display: table-cell;
+		vertical-align: middle;
+	}
+
+/* DROPDOWN */
+.dropdown {
+	position: relative;
+	display: inline-block;
+}
+	.dropdown-target {
+		display: none;
+	}
+
+	.dropdown-menu {
+		display: none;
+		min-width: 200px;
+		margin: 5px 0 0;
+		padding: 5px 0;
+		position: absolute;
+		right: 0px;
+		background: #fff;
+		border: 1px solid #ddd;
+		border-radius: 5px;
+		text-align: left;
+		box-shadow: 3px 3px 3px #ddd;
+	}
+	.dropdown-menu:after {
+		content: "";
+		position: absolute;
+		top: -6px;
+		right: 13px;
+		width: 10px;
+		height: 10px;
+		background: #fff;
+		border-top: 1px solid #ddd;
+		border-left: 1px solid #ddd;
+		z-index: -10;
+		transform: rotate(45deg);
+	}
+		.dropdown-header {
+			display: block;
+			padding: 0 5px;
+			color: #888;
+			font-weight: bold;
+			font-size: 14px;
+			line-height: 30px;
+		}
+		.dropdown-menu > .item {
+			display: block;
+			height: 30px;
+			font-size: 90%;
+			line-height: 30px;
+		}
+			.dropdown-menu > .item > a {
+				display: block;
+				padding: 0 25px;
+				line-height: 30px;
+			}
+			.dropdown-menu > .item:hover {
+				background: #0062BE;
+				color: #fff;
+			}
+				.dropdown-menu > .item[aria-checked="true"] > a:before {
+					content: '✓ ';
+					font-weight: bold;
+					margin: 0 0 0 -1.2em;
+					padding: 0 0.2em 0 0;
+				}
+				.dropdown-menu > .item:hover > a {
+					color: #fff;
+					text-decoration: none;
+				}
+		.dropdown-menu .input {
+			display: block;
+			height: 40px;
+			font-size: 90%;
+			line-height: 30px;
+		}
+			.dropdown-menu .input select,
+			.dropdown-menu .input input {
+				display: block;
+				height: 20px;
+				width: 95%;
+				margin: auto;
+				padding: 2px 5px;
+				border-radius: 3px;
+			}
+			.dropdown-menu .input select {
+				width: 70%;
+				height: auto;
+			}
+		.dropdown-menu .separator {
+			display: block;
+			height: 0;
+			margin: 5px 0;
+			border-bottom: 1px solid #ddd;
+		}
+		.dropdown-target:target ~ .dropdown-menu {
+			display: block;
+			z-index: 10;
+		}
+	.dropdown-close {
+		display: inline;
+	}
+		.dropdown-close a {
+			font-size: 0;
+			position: fixed;
+			top: 0; bottom: 0;
+			left: 0; right: 0;
+			display: block;
+			z-index: -10;
+		}
+
+/* ALERTS */
+.alert {
+	display: block;
+	width: 90%;
+	margin: 15px auto;
+	padding: 10px 15px;
+	background: #f4f4f4;
+	border: 1px solid #ccc;
+	border-right: 1px solid #aaa;
+	border-bottom: 1px solid #aaa;
+	border-radius: 5px;
+	color: #aaa;
+	text-shadow: 0 0 1px #eee;
+}
+	.alert-head {
+		margin: 0;
+		font-weight: bold;
+		font-size: 110%;
+	}
+	.alert-warn {
+		background: #ffe;
+		border: 1px solid #eeb;
+		color: #c95;
+	}
+	.alert-success {
+		background: #dfd;
+		border: 1px solid #cec;
+		color: #484;
+	}
+	.alert-error {
+		background: #fdd;
+		border: 1px solid #ecc;
+		color: #844;
+	}
+
+/* ICÔNES */
+.icon {
+	display: inline-block;
+	width: 16px;
+	height: 16px;
+	vertical-align: middle;
+	line-height: 16px;
+}
diff --git a/p/themes/Origine/loader.gif b/p/themes/Origine/loader.gif
new file mode 100644
index 000000000..5ff26f0e3
Binary files /dev/null and b/p/themes/Origine/loader.gif differ
diff --git a/p/themes/Origine/metadata.json b/p/themes/Origine/metadata.json
new file mode 100644
index 000000000..f93dcbc3f
--- /dev/null
+++ b/p/themes/Origine/metadata.json
@@ -0,0 +1,7 @@
+{
+  "name": "Origine",
+  "author": "Marien Fressinaud",
+  "description": "Le thème par défaut pour FreshRSS",
+  "version": 0.1,
+  "files": ["global.css", "freshrss.css"]
+}
diff --git a/p/themes/default/freshrss.css b/p/themes/default/freshrss.css
deleted file mode 100644
index 593f21d30..000000000
--- a/p/themes/default/freshrss.css
+++ /dev/null
@@ -1,880 +0,0 @@
-@charset "UTF-8";
-
-/* STRUCTURE */
-.header {
-	display: table;
-	width: 100%;
-	background: #f4f4f4;
-	table-layout: fixed;
-}
-	.header > .item {
-		display: table-cell;
-		padding: 10px 0;
-		border-bottom: 1px solid #aaa;
-		vertical-align: middle;
-		text-align: center;
-	}
-		.header > .item.title {
-			width: 250px;
-			white-space: nowrap;
-		}
-			.logo {
-				display: inline-block;
-				font-size: 48px;
-				height: 32px;
-				width: 32px;
-				padding: 10px;
-			}
-			.header > .item.title h1 {
-				display: inline-block;
-				margin: 0;
-				text-shadow: 1px -1px 0 #ccc;
-			}
-		.header > .item.search input {
-			width: 230px;
-			transition: width 200ms linear;
-		}
-			.header .item.search input:focus {
-				width: 330px;
-			}
-		.header > .item.configure {
-			width: 100px;
-		}
-
-.item a:hover {
-	text-decoration: none;
-}
-
-#global {
-	display: table;
-	width: 100%;
-	height: 100%;
-	background: #fafafa;
-	table-layout: fixed;
-}
-	.aside {
-		display: table-cell;
-		height: 100%;
-		width: 250px;
-		vertical-align: top;
-		border-right: 1px solid #aaa;
-		background: #fff;
-	}
-		.aside .nav-form input {
-			width: 180px;
-		}
-		.aside.aside_flux {
-			padding: 10px 0 40px;
-		}
-		.aside.aside_feed .nav-form input {
-			width: 140px;
-		}
-		.aside.aside_feed .nav-form .dropdown .dropdown-menu {
-			right: -20px;
-		}
-		.aside.aside_feed .nav-form .dropdown .dropdown-menu:after {
-			right: 33px;
-		}
-
-	.nav-login {
-		display: none;
-	}
-
-	.nav_menu {
-		width: 100%;
-		background: #fafafa;
-		border-bottom: 1px solid #aaa;
-		text-align: center;
-		padding: 5px 0;
-	}
-		.nav_menu .search {
-			display:none;
-		}
-
-.favicon {
-	height: 16px;
-	width: 16px;
-}
-
-.categories {
-	margin: 0;
-	padding: 0;
-	text-align: center;
-	list-style: none;
-}
-	.category {
-		display: block;
-		width: 220px;
-		margin: 10px auto;
-		text-align: left;
-		overflow: hidden;
-		white-space: nowrap;
-		text-overflow: ellipsis;
-	}
-		.category .btn:first-child {
-			width: 195px;
-			position: relative;
-		}
-		.category.stick .btn:first-child {
-			width:160px;
-		}
-		.category .btn:first-child:not([data-unread="0"]):after {
-			content: attr(data-unread);
-			position: absolute;
-			top: 3px; right: 3px;
-			padding: 1px 5px;
-			background: #ccc;
-			color: #fff;
-			font-size: 90%;
-			border: 1px solid #bbb;
-			border-radius: 5px;
-			box-shadow: 1px 3px 3px #aaa inset;
-			text-shadow: 0 0 1px #aaa;
-		}
-		.category + .feeds:not(.active) {
-			display:none;
-		}
-	.categories .feeds {
-		width: 100%;
-		margin: 0;
-		list-style: none;
-	}
-		.categories .feeds .item.active {
-			background: #0062BE;
-		}
-		.categories .feeds .item.active .feed {
-			color: #fff;
-		}
-		.categories .feeds .item.empty .feed {
-			color: #e67e22;
-		}
-		.categories .feeds .item.empty.active {
-			background: #e67e22;
-		}
-		.categories .feeds .item.empty.active .feed {
-			color: #fff;
-		}
-		.categories .feeds .item.error .feed {
-			color: #BD362F;
-		}
-		.categories .feeds .item .feed {
-			display: inline-block;
-			margin: 0;
-			width: 165px;
-			line-height: 35px;
-			font-size: 90%;
-			vertical-align: middle;
-			text-align: left;
-			overflow: hidden;
-			white-space: nowrap;
-			text-overflow: ellipsis;
-		}
-		.feed:not([data-unread="0"]) {
-			font-weight:bold;
-		}
-		.feed:not([data-unread="0"]):before {
-			content: "(" attr(data-unread) ") ";
-		}
-		.categories .feeds .dropdown-menu {
-			left: 0;
-		}
-		.categories .feeds .dropdown-menu:after {
-			left: 2px;
-		}
-		.categories .feeds .item .dropdown-toggle > .icon {
-			visibility: hidden;
-			cursor: pointer;
-		}
-			.categories .feeds .item .dropdown-target:target ~ .dropdown-toggle > .icon,
-			.categories .feeds .item:hover .dropdown-toggle > .icon,
-			.categories .feeds .item.active .dropdown-toggle > .icon {
-				background-color: #fff;
-				border-radius: 3px;
-				visibility: visible;
-			}
-
-.post {
-	padding: 10px 50px;
-}
-	.post form {
-		margin: 10px 0;
-	}
-
-.day {
-	min-height: 50px;
-	padding: 0 10px;
-	font-size: 130%;
-	font-weight: bold;
-	line-height: 50px;
-	background: #fff;
-	border-top: 1px solid #aaa;
-	border-bottom: 1px solid #aaa;
-}
-	.day:first-child {
-		border-top: none;
-	}
-	.day .name {
-		position: absolute;
-		right: 0;
-		width: 50%;
-		height: 1.5em;
-		padding: 0 10px 0 0;
-		overflow: hidden;
-		color: #aab;
-		font-size: 1.8em;
-		opacity: .3;
-		text-shadow: 0px -1px 0px #333;
-		font-style: italic;
-		white-space: nowrap;
-		text-overflow: ellipsis;
-		text-align: right;
-	}
-
-.flux {
-	border-left: 3px solid #aaa;
-	background: #fafafa;
-}
-	.flux:hover {
-		background: #fff;
-	}
-	.flux.not_read {
-		border-left: 3px solid #FF5300;
-		background: #FFF3ED;
-	}
-	.flux.favorite {
-		border-left: 3px solid #FFC300;
-		background: #FFF6DA;
-	}
-	.flux.current {
-		border-left: 3px solid #0062BE;
-		background: #fff;
-	}
-
-	.flux_header {
-		background: inherit;
-		height: 25px;
-		font-size: 12px;
-		border-top: 1px solid #ddd;
-		cursor: pointer;
-	}
-		.flux .item {
-			line-height: 40px;
-			white-space: nowrap;
-		}
-		.flux_header > .item {
-			overflow: hidden;
-			text-overflow: ellipsis;
-		}
-		.flux .item.manage {
-			width: 40px;
-			text-align: center;
-		}
-		.flux .item.website {
-			width: 200px;
-		}
-			.website .favicon {
-				padding: 5px;
-			}
-		.flux .item.title {
-			background: inherit;
-		}
-		.flux:hover .item.title {
-			border-right: 2px solid rgba(127, 127, 127, 0.1);
-			padding-right: 1em;
-			position: absolute;
-		}
-			.flux .item.title a {
-				color: #000;
-				outline: none;
-			}
-			.flux.not_read .item.title,
-			.flux.current .item.title {
-				font-weight: bold;
-			}
-		.flux .item.date {
-			width: 200px;
-			padding:0 5px 0 0;
-			text-align: right;
-			font-size: 10px;
-			color: #666;
-		}
-		.link {
-			width: 40px;
-			text-align: center;
-		}
-
-#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;
-	}
-
-#stream.global {
-	text-align: center;
-}
-	#stream.global .box-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 .category {
-			width: 100%;
-			margin: 0;
-		}
-		#stream.global .btn {
-			display: block;
-			width: auto;
-			height: 35px;
-			margin: 0;
-			padding: 0 10px;
-			background: #eee;
-			border: none;
-			border-bottom: 1px solid #aaa;
-			border-radius: 5px 5px 0 0;
-			line-height: 35px;
-			font-size: 120%;
-		}
-			#stream.global .btn:not([data-unread="0"]) {
-				font-weight:bold;
-			}
-			#stream.global .btn:first-child:not([data-unread="0"]):after {
-				top: 0; right: 5px;
-				border: 0;
-				background: none;
-				color: #666;
-				font-weight: bold;
-				box-shadow: none;
-			}
-		#stream.global .box-category .feeds {
-			display: block;
-			max-height: 250px;
-			margin: 0;
-			list-style: none;
-			overflow: auto;
-		}
-			#stream.global .box-category .feeds .item {
-				padding: 2px 10px;
-				font-size: 90%;
-			}
-		#stream.global .box-category .feed {
-			width: 220px;
-		}
-
-.content {
-	min-height: 150px;
-	max-width: 550px;
-	margin: 0 auto;
-	padding: 20px 10px;
-	line-height: 170%;
-	word-wrap: break-word;
-}
-	.content h1, .content h2, .content h3 {
-		margin: 20px 0 5px;
-	}
-	.content > .title {
-		font-size: x-large;
-		margin: 0;
-	}
-
-	.content p {
-		margin: 0 0 20px;
-	}
-	img.big {
-		display: block;
-		margin: 10px auto;
-	}
-	figure img.big {
-		margin: 0;
-	}
-	.content hr {
-		margin: 30px 0;
-		height: 1px;
-		background: #ddd;
-		border: 0;
-	}
-	.content pre {
-		margin: 10px auto;
-		padding: 10px;
-		overflow: auto;
-		background: #000;
-		color: #fff;
-		font-size: 110%;
-	}
-	.content q, .content blockquote {
-		display: block;
-		margin: 5px 0;
-		padding: 5px 20px;
-		font-style: italic;
-		border-left: 4px solid #ccc;
-		color: #666;
-	}
-		.content blockquote p {
-			margin: 0;
-		}
-
-#panel {
-	display: none;
-	position: fixed;
-	top: 10px; bottom: 10px;
-	left: 100px; right: 100px;
-	overflow: auto;
-	background: #fff;
-	border: 1px solid #95a5a6;
-	border-radius: 5px;
-}
-	#panel .close {
-		position: fixed;
-		top: 10px; right: 0;
-		display: inline-block;
-		width: 26px;
-		height: 26px;
-		margin: 0 10px 0 0;
-		border: 1px solid #ccc;
-		border-radius: 20px;
-		text-align: center;
-		line-height: 26px;
-		background: #fff;
-	}
-
-#overlay {
-	display: none;
-	position: fixed;
-	top: 0; bottom: 0;
-	left: 0; right: 0;
-	background: rgba(0, 0, 0, 0.9);
-}
-
-.flux_content .bottom {
-	font-size: 90%;
-	text-align: center;
-}
-
-.hide_posts > :not(.active) > .flux_content {
-	display:none;
-}
-
-/*** PAGINATION ***/
-.pagination {
-	display: table;
-	width: 100%;
-	margin: 0;
-	background: #fafafa;
-	text-align: center;
-	color: #333;
-	font-size: 80%;
-	line-height: 200%;
-	table-layout: fixed;
-}
-	.pagination .item {
-		display: table-cell;
-		line-height: 40px;
-	}
-		.pagination .item.pager-current {
-			font-weight: bold;
-			font-size: 140%;
-		}
-		.pagination .pager-first,
-		.pagination .pager-previous,
-		.pagination .pager-next,
-		.pagination .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;
-	}
-
-#nav_entries {
-	display: table;
-	width: 250px;
-	height: 40px;
-	position: fixed;
-	bottom: 0;
-	left: 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 a {
-			display: block;
-		}
-		#nav_entries .i_up {
-			margin: 5px 0 0;
-			vertical-align: top;
-		}
-
-.loading {
-	background: url("loader.gif") center center no-repeat;
-	font-size: 0;
-}
-
-#bigMarkAsRead {
-	display: block;
-	font-style: normal;
-	padding: 32px 0 64px 0;
-	text-align: center;
-	text-decoration: none;
-	text-shadow: 0 -1px 0 #aaa;
-}
-	#bigMarkAsRead:hover {
-		background: #333;
-		color: #fff;
-	}
-	.bigTick {
-		font-size: 72pt;
-		line-height: 1.6em;
-	}
-
-/*** NOTIFICATION ***/
-.notification {
-	position: absolute;
-	top: 10px;
-	left: 25%; right: 25%;
-	min-height: 30px;
-	padding: 10px;
-	line-height: 30px;
-	text-align: center;
-	border-radius: 5px;
-	box-shadow: 0 0 5px #666;
-	background: #ddd;
-	color: #666;
-	font-weight: bold;
-	z-index: 10;
-}
-	.notification.good {
-		background: #f4f899;
-	}
-	.notification.bad {
-		background: #f4a899;
-	}
-	.notification a.close {
-		display: inline-block;
-		width: 16px;
-		height: 16px;
-		float: right;
-		margin: -20px -20px 0 0;
-		padding: 5px;
-		background: #fff;
-		border-radius: 50px;
-		border: 1px solid #aaa;
-		line-height: 16px;
-	}
-
-.toggle_aside, .btn.toggle_aside {
-	display: none;
-}
-
-.actualizeProgress {
-	position: fixed;
-	top: 10px;
-	left: 25%; right: 25%;
-	padding: 5px;
-	background: #fff;
-	text-align: center;
-	border: 1px solid #ddd;
-	border-radius: 5px;
-}
-	.actualizeProgress progress {
-		max-width: 100%;
-		vertical-align: middle;
-	}
-	.actualizeProgress .progress {
-		color: #999;
-		font-size: 90%;
-		vertical-align: middle;
-	}
-
-.logs {
-	border: 1px solid #aaa;
-}
-	.log {
-		padding: 5px 2%;
-		overflow: auto;
-		background: #fafafa;
-		border-bottom: 1px solid #999;
-		color: #333;
-		font-size: 90%;
-	}
-		.log .date {
-			display: block;
-		}
-	.log.error {
-		background: #fdd;
-		color: #844;
-	}
-	.log.warning {
-		background: #ffe;
-		color: #c95;
-	}
-	.log.notice {
-		background: #f4f4f4;
-		color: #aaa;
-	}
-	.log.debug {
-		background: #111;
-		color: #eee;
-	}
-
-.form-group table {
-	border-collapse:collapse;
-	margin:10px 0 0 220px;
-	text-align:center;
-}
-
-.form-group tr, .form-group th, .form-group td {
-	border:1px solid #DDD;
-	font-weight:normal;
-	padding:.5em;
-}
-
-select.number option {
-	text-align:right;
-}
-
-@media(max-width: 840px) {
-	.header,
-	.aside .btn-important,
-	.aside .feeds .dropdown,
-	.flux_header .item.website span,
-	.item.date {
-		display: none;
-	}
-	.flux_header .item.website {
-		width: 40px;
-		text-align: center;
-	}
-		.flux_header .item.website .favicon {
-			padding: 12px;
-		}
-
-	.nav-login {
-		display: block;
-	}
-
-	.content {
-		font-size: 120%;
-		padding: 0;
-	}
-
-	.pagination {
-		margin: 0 0 40px;
-	}
-	.pagination .pager-previous, .pagination .pager-next {
-		width: 100px;
-	}
-
-	.toggle_aside, .btn.toggle_aside {
-		display: inline-block;
-	}
-	.aside {
-		position: fixed;
-		top: 0; left: 0;
-		width: 0;
-		overflow: hidden;
-		border-right: none;
-		z-index: 10;
-		transition: width 200ms linear;
-	}
-		.aside.aside_flux {
-			padding: 10px 0 0;
-		}
-		.aside:target {
-			width: 80%;
-			border-right: 1px solid #aaa;
-			overflow: auto;
-		}
-		.aside .toggle_aside {
-			position: absolute;
-			right: 0;
-			display: inline-block;
-			width: 26px;
-			height: 26px;
-			margin: 0 10px 0 0;
-			border: 1px solid #ccc;
-			border-radius: 20px;
-			text-align: center;
-			line-height: 26px;
-		}
-		.aside .categories {
-			margin: 30px 0;
-		}
-
-	#nav_entries {
-		width: 100%;
-	}
-
-	.nav_menu .btn {
-		margin: 5px 10px;
-	}
-	.nav_menu .stick {
-		margin: 0 10px;
-	}
-	.nav_menu .stick .btn {
-		margin: 5px 0;
-	}
-	.nav_menu .search {
-			display: inline-block;
-			max-width: 97%;
-		}
-		.nav_menu .search input {
-			max-width: 97%;
-			width: 90px;
-		}
-		.nav_menu .search input:focus {
-			width: 400px;
-		}
-
-	#panel {
-		left: 5px; right: 5px;
-	}
-
-	.day .date {
-		display: none;
-	}
-	.day .name {
-		height: 2.6em;
-		font-size: 1em;
-		text-shadow: none;
-	}
-
-	.notification,
-	.actualizeProgress {
-		left: 10px;
-		right: 10px;
-	}
-}
-
-/*** FALLBACK ***/
-.btn {
-	background: #fff;
-	background: -moz-linear-gradient(top, #fff 0%, #eee 100%);
-	background: -webkit-linear-gradient(top, #fff 0%, #eee 100%);
-	background: -o-linear-gradient(top, #fff 0%, #eee 100%);
-	background: -ms-linear-gradient(top, #fff 0%, #eee 100%);
-}
-	.btn:hover {
-		background: #f0f0f0;
-		background: -moz-linear-gradient(top, #f8f8f8 0%, #f0f0f0 100%);
-		background: -webkit-linear-gradient(top, #f8f8f8 0%, #f0f0f0 100%);
-		background: -o-linear-gradient(top, #f8f8f8 0%, #f0f0f0 100%);
-		background: -ms-linear-gradient(top, #f8f8f8 0%, #f0f0f0 100%);
-	}
-	.btn-important {
-		background: #0084CC;
-		background: -moz-linear-gradient(top, #0084CC 0%, #0045CC 100%);
-		background: -webkit-linear-gradient(top, #0084CC 0%, #0045CC 100%);
-		background: -o-linear-gradient(top, #0084CC 0%, #0045CC 100%);
-		background: -ms-linear-gradient(top, #0084CC 0%, #0045CC 100%);
-	}
-		.btn-important:hover {
-			background: -moz-linear-gradient(top, #0066CC 0%, #0045CC 100%);
-			background: -webkit-linear-gradient(top, #0066CC 0%, #0045CC 100%);
-			background: -o-linear-gradient(top, #0066CC 0%, #0045CC 100%);
-			background: -ms-linear-gradient(top, #0066CC 0%, #0045CC 100%);
-		}
-	.btn-attention {
-		background: #E95B57;
-		background: -moz-linear-gradient(top, #E95B57 0%, #BD362F 100%);
-		background: -webkit-linear-gradient(top, #E95B57 0%, #BD362F 100%);
-		background: -o-linear-gradient(top, #E95B57 0%, #BD362F 100%);
-		background: -ms-linear-gradient(top, #E95B57 0%, #BD362F 100%);
-	}
-		.btn-attention:hover {
-			background: -moz-linear-gradient(top, #D14641 0%, #BD362F 100%);
-			background: -webkit-linear-gradient(top, #D14641 0%, #BD362F 100%);
-			background: -o-linear-gradient(top, #D14641 0%, #BD362F 100%);
-			background: -ms-linear-gradient(top, #D14641 0%, #BD362F 100%);
-		}
-
-.dropdown-menu:after {
-	-moz-transform: rotate(45deg);
-	-webkit-transform: rotate(45deg);
-	-ms-transform: rotate(45deg);
-}
-
-.nav-head {
-	background: #fff;
-	background: -moz-linear-gradient(top, #fff 0%, #f0f0f0 100%);
-	background: -webkit-linear-gradient(top, #fff 0%, #f0f0f0 100%);
-	background: -o-linear-gradient(top, #fff 0%, #f0f0f0 100%);
-	background: -ms-linear-gradient(top, #fff 0%, #f0f0f0 100%);
-}
-
-.header > .item.search input {
-	-moz-transition: width 200ms linear;
-	 -webkit-transition: width 200ms linear;
-	-o-transition: width 200ms linear;
-	-ms-transition: width 200ms linear;
-}
-
-@media(max-width: 840px) {
-	.aside {
-		-moz-transition: width 200ms linear;
-		 -webkit-transition: width 200ms linear;
-		-o-transition: width 200ms linear;
-		-ms-transition: width 200ms linear;
-	}
-}
-
-@media print {
-	.header,
-	.aside,
-	.nav_menu,
-	.day,
-	.flux_header,
-	.flux_content .bottom,
-	.pagination {
-		display: none;
-	}
-
-	html, body {
-		background: #fff;
-		color: #000;
-		font-family: Serif;
-		font-size: 12pt;
-	}
-
-	#global,
-	.flux_content {
-		display: block !important;
-	}
-
-	.flux_content .content {
-		width: 100% !important;
-		text-align: justify;
-	}
-
-	.flux_content .content a {
-		color: #000;
-	}
-	.flux_content .content a:after {
-		content: " (" attr(href) ") ";
-		text-decoration: underline;
-	}
-}
diff --git a/p/themes/default/global.css b/p/themes/default/global.css
deleted file mode 100644
index 49f3aa4cd..000000000
--- a/p/themes/default/global.css
+++ /dev/null
@@ -1,503 +0,0 @@
-@charset "UTF-8";
-
-/* FONTS */
-@font-face {
-	font-family: "OpenSans";
-	src: url("../fonts/openSans.woff") format("woff");
-}
-
-
-* {
-	margin: 0;
-	padding: 0;
-}
-html, body {
-	height: 100%;
-	font-size: 95%;
-	font-family: "OpenSans", "Cantarell", "Helvetica", "Arial", sans-serif;
-}
-
-/* LIENS */
-a {
-	color: #0062BE;
-	text-decoration: none;
-}
-	a:hover {
-		text-decoration: underline;
-	}
-
-/* LISTES */
-ul, ol, dl {
-	margin: 10px 0 10px 30px;
-	line-height: 190%;
-}
-	dd {
-		margin: 0 0 10px 30px;
-	}
-
-/* TITRES */
-h1, h2, h3 {
-	min-height: 40px;
-	margin: 15px 0 5px;
-	line-height: 40px;
-}
-
-/* IMG */
-figure {
-	margin: 5px 0 10px;
-	text-align: center;
-}
-	figcaption {
-		display: inline-block;
-		padding: 3px 20px;
-		color: #999;
-		font-style: italic;
-		border-bottom: 1px solid #ccc;
-	}
-img {
-	height: auto;
-	max-width: 100%;
-	vertical-align: middle;
-}
-	a img {
-		border: none;
-	}
-
-/* VIDEOS */
-iframe, embed, object, video {
-	max-width: 100%;
-}
-
-/* FORMULAIRES */
-legend {
-	display: block;
-	width: 100%;
-	margin: 20px 0 5px;
-	padding: 5px 0;
-	border-bottom: 1px solid #ddd;
-	font-size: 150%;
-	clear: both;
-}
-label {
-	display: block;
-	min-height: 25px;
-	padding: 5px 0;
-	font-size: 14px;
-	line-height: 25px;
-	cursor: pointer;
-}
-input, select, textarea {
-	display: inline-block;
-	max-width: 100%;
-	min-height: 25px;
-	padding: 5px;
-	background: #fdfdfd;
-	border: 1px solid #bbb;
-	border-radius: 3px;
-	color: #666;
-	line-height: 25px;
-	vertical-align: middle;
-	box-shadow: 0 2px 2px #eee inset;
-}
-	option {
-		padding:0 .5em 0 .5em;
-	}
-	input[type="radio"],
-	input[type="checkbox"] {
-		width: 15px !important;
-		min-height: 15px !important;
-	}
-	input:focus, select:focus, textarea:focus {
-		color: #0062BE;
-		border-color: #33BBFF;
-		box-shadow: 0 2px 2px #DDDDFF inset;
-	}
-	input:invalid, select:invalid {
-		border-color: red;
-		box-shadow: 0 0 2px 1px red;
-	}
-
-.form-group {
-	margin: 0;
-}
-	.form-group:after {
-		content: "";
-		display: block;
-		clear: both;
-	}
-	.form-group.form-actions {
-		min-width: 250px;
-		padding: 5px 0;
-		background: #f4f4f4;
-		border-top: 1px solid #ddd;
-	}
-		.form-group.form-actions .btn {
-			margin: 0 10px;
-		}
-	.form-group .group-name {
-		display: block;
-		float: left;
-		width: 200px;
-		padding: 10px 0;
-		text-align: right;
-	}
-	.form-group .group-controls {
-		min-width: 250px;
-		min-height: 25px;
-		margin: 0 0 0 220px;
-		padding: 5px 0;
-	}
-		.form-group .group-controls .control {
-			display: block;
-			min-height: 30px;
-			padding: 5px 0;
-			line-height: 25px;
-			font-size: 14px;
-		}
-
-.stick {
-	display: inline-block;
-	white-space: nowrap;
-	font-size: 0px;
-	vertical-align: middle;
-}
-	.stick input,
-	.stick .btn {
-		border-radius: 0;
-		font-size: 14px;
-	}
-	.stick .btn:first-child,
-	.stick input:first-child {
-		border-radius: 3px 0 0 3px;
-	}
-		.stick .btn-important:first-child {
-			border-right: 1px solid #06f;
-		}
-	.stick .btn:last-child,
-	.stick input:last-child {
-		border-radius: 0 3px 3px 0;
-	}
-	.stick .btn + .btn,
-	.stick .btn + input,
-	.stick input + .btn,
-	.stick input + input {
-		border-left: none;
-	}
-	.stick input + .btn {
-		border-top: 1px solid #bbb;
-	}
-	.stick .btn + .dropdown > .btn {
-		border-left: none;
-		border-radius: 0 3px 3px 0;
-	}
-	.stick .btn + .dropdown a {
-		font-size: 12px;
-	}
-
-.btn {
-	display: inline-block;
-	min-height: 37px;
-	min-width: 15px;
-	padding: 5px 10px;
-	background: linear-gradient(to bottom, #fff 0%, #eee 100%);
-	border-radius: 3px;
-	border: 1px solid #ddd;
-	border-bottom: 1px solid #aaa;
-	border-right: 1px solid #aaa;
-	color: #666;
-	text-shadow: 0px -1px 0 #ddd;
-	line-height: 20px;
-	vertical-align: middle;
-	cursor: pointer;
-	overflow: hidden;
-}
-	a.btn {
-		min-height: 25px;
-		line-height: 25px;
-	}
-	.btn:hover {
-		background: linear-gradient(to bottom, #f8f8f8, #f0f0f0);
-		text-decoration: none;
-	}
-	.btn.active,
-	.btn:active,
-	.dropdown-target:target ~ .btn.dropdown-toggle {
-		box-shadow: 0px 2px 4px #e0e0e0 inset, 0px 1px 2px #fafafa;
-		background: #eee;
-	}
-
-	.btn-important {
-		background: linear-gradient(to bottom, #0084CC, #0045CC);
-		color: #fff;
-		border: 1px solid #0062B7;
-		text-shadow: 0px -1px 0 #aaa;
-	}
-		.btn-important:hover {
-			background: linear-gradient(to bottom, #0066CC, #0045CC);
-		}
-		.btn-important:active {
-			background: #0044CB;
-			box-shadow: none;
-		}
-
-	.btn-attention {
-		background: linear-gradient(to bottom, #E95B57, #BD362F);
-		color: #fff;
-		border: 1px solid #C44742;
-		text-shadow: 0px -1px 0px #666;
-	}
-		.btn-attention:hover {
-			background: linear-gradient(to bottom, #D14641, #BD362F);
-		}
-		.btn-attention:active {
-			background: #BD362F;
-			box-shadow: none;
-		}
-
-/* NAVIGATION */
-.nav-list .nav-header,
-.nav-list .item {
-	display: block;
-	height: 35px;
-	line-height: 35px;
-}
-	.nav-list .item:hover {
-		background: #fafafa;
-	}
-		.nav-list .item:hover a {
-			color: #003388;
-		}
-	.nav-list .item.active {
-		background: #0062BE;
-		color: #fff;
-	}
-		.nav-list .item.active a {
-			color: #fff;
-		}
-	.nav-list .disable {
-		color: #aaa;
-		background: #fafafa;
-		text-align: center;
-	}
-	.nav-list .item > * {
-		display: block;
-		padding: 0 10px;
-		overflow: hidden;
-		white-space: nowrap;
-		text-overflow: ellipsis;
-	}
-		.nav-list a:hover {
-			text-decoration: none;
-		}
-	.nav-list .item.error a {
-		color: #BD362F;
-	}
-		.nav-list .item.active.error a {
-			color: #fff;
-			background: #BD362F;
-		}
-	.nav-list .item.empty a {
-		color: #f39c12;
-	}
-		.nav-list .item.active.empty a {
-			color: #fff;
-			background: #f39c12;
-		}
-
-	.nav-list .nav-header {
-		padding: 0 10px;
-		color: #888;
-		background: #f4f4f4;
-		border-bottom: 1px solid #ddd;
-		font-weight: bold;
-		text-shadow: 0 0 1px #ddd;
-	}
-	.nav-list .separator {
-		display: block;
-		height: 0;
-		margin: 5px 0;
-		border-bottom: 1px solid #ddd;
-	}
-
-	.nav-list .nav-form {
-		padding: 3px;
-		text-align: center;
-	}
-
-.nav-head {
-	display: block;
-	margin: 0;
-	background: linear-gradient(to bottom, #fff, #f0f0f0);
-	border-bottom: 1px solid #ddd;
-	text-align: right;
-}
-	.nav-head .item {
-		display: inline-block;
-		padding: 5px 10px;
-	}
-
-/* HORIZONTAL-LIST */
-.horizontal-list {
-	display: table;
-	table-layout: fixed;
-	margin: 0;
-	padding: 0;
-	width: 100%;
-}
-	.horizontal-list .item {
-		display: table-cell;
-		vertical-align: middle;
-	}
-
-/* DROPDOWN */
-.dropdown {
-	position: relative;
-	display: inline-block;
-}
-	.dropdown-target {
-		display: none;
-	}
-
-	.dropdown-menu {
-		display: none;
-		min-width: 200px;
-		margin: 5px 0 0;
-		padding: 5px 0;
-		position: absolute;
-		right: 0px;
-		background: #fff;
-		border: 1px solid #ddd;
-		border-radius: 5px;
-		text-align: left;
-		box-shadow: 3px 3px 3px #ddd;
-	}
-	.dropdown-menu:after {
-		content: "";
-		position: absolute;
-		top: -6px;
-		right: 13px;
-		width: 10px;
-		height: 10px;
-		background: #fff;
-		border-top: 1px solid #ddd;
-		border-left: 1px solid #ddd;
-		z-index: -10;
-		transform: rotate(45deg);
-	}
-		.dropdown-header {
-			display: block;
-			padding: 0 5px;
-			color: #888;
-			font-weight: bold;
-			font-size: 14px;
-			line-height: 30px;
-		}
-		.dropdown-menu > .item {
-			display: block;
-			height: 30px;
-			font-size: 90%;
-			line-height: 30px;
-		}
-			.dropdown-menu > .item > a {
-				display: block;
-				padding: 0 25px;
-				line-height: 30px;
-			}
-			.dropdown-menu > .item:hover {
-				background: #0062BE;
-				color: #fff;
-			}
-				.dropdown-menu > .item[aria-checked="true"] > a:before {
-					content: '✓ ';
-					font-weight: bold;
-					margin: 0 0 0 -1.2em;
-					padding: 0 0.2em 0 0;
-				}
-				.dropdown-menu > .item:hover > a {
-					color: #fff;
-					text-decoration: none;
-				}
-		.dropdown-menu .input {
-			display: block;
-			height: 40px;
-			font-size: 90%;
-			line-height: 30px;
-		}
-			.dropdown-menu .input select,
-			.dropdown-menu .input input {
-				display: block;
-				height: 20px;
-				width: 95%;
-				margin: auto;
-				padding: 2px 5px;
-				border-radius: 3px;
-			}
-			.dropdown-menu .input select {
-				width: 70%;
-				height: auto;
-			}
-		.dropdown-menu .separator {
-			display: block;
-			height: 0;
-			margin: 5px 0;
-			border-bottom: 1px solid #ddd;
-		}
-		.dropdown-target:target ~ .dropdown-menu {
-			display: block;
-			z-index: 10;
-		}
-	.dropdown-close {
-		display: inline;
-	}
-		.dropdown-close a {
-			font-size: 0;
-			position: fixed;
-			top: 0; bottom: 0;
-			left: 0; right: 0;
-			display: block;
-			z-index: -10;
-		}
-
-/* ALERTS */
-.alert {
-	display: block;
-	width: 90%;
-	margin: 15px auto;
-	padding: 10px 15px;
-	background: #f4f4f4;
-	border: 1px solid #ccc;
-	border-right: 1px solid #aaa;
-	border-bottom: 1px solid #aaa;
-	border-radius: 5px;
-	color: #aaa;
-	text-shadow: 0 0 1px #eee;
-}
-	.alert-head {
-		margin: 0;
-		font-weight: bold;
-		font-size: 110%;
-	}
-	.alert-warn {
-		background: #ffe;
-		border: 1px solid #eeb;
-		color: #c95;
-	}
-	.alert-success {
-		background: #dfd;
-		border: 1px solid #cec;
-		color: #484;
-	}
-	.alert-error {
-		background: #fdd;
-		border: 1px solid #ecc;
-		color: #844;
-	}
-
-/* ICÔNES */
-.icon {
-	display: inline-block;
-	width: 16px;
-	height: 16px;
-	vertical-align: middle;
-	line-height: 16px;
-}
diff --git a/p/themes/default/loader.gif b/p/themes/default/loader.gif
deleted file mode 100644
index 5ff26f0e3..000000000
Binary files a/p/themes/default/loader.gif and /dev/null differ
diff --git a/p/themes/default/metadata.json b/p/themes/default/metadata.json
deleted file mode 100644
index d316ec517..000000000
--- a/p/themes/default/metadata.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "name": "Default",
-  "author": "Marien Fressinaud",
-  "description": "Le thème par défaut pour FreshRSS",
-  "version": 0.1,
-  "files": ["global.css", "freshrss.css"]
-}
diff --git a/p/themes/default_dark/freshrss.css b/p/themes/default_dark/freshrss.css
deleted file mode 100644
index e9eb2c705..000000000
--- a/p/themes/default_dark/freshrss.css
+++ /dev/null
@@ -1,862 +0,0 @@
-@charset "UTF-8";
-
-/* STRUCTURE */
-.header {
-	display: table;
-	width: 100%;
-	background: #1c1c1c;
-	table-layout: fixed;
-}
-	.header > .item {
-		display: table-cell;
-		padding: 10px 0;
-		border-bottom: 1px solid #2f2f2f;
-		vertical-align: middle;
-		text-align: center;
-	}
-		.header > .item.title {
-			width: 250px;
-			white-space: nowrap;
-		}
-			.logo {
-				display: inline-block;
-				font-size: 48px;
-				height: 32px;
-				width: 32px;
-				padding: 10px;
-			}
-			.header > .item.title h1 {
-				display: inline-block;
-				margin: 0;
-			}
-		.header > .item.search input {
-			width: 230px;
-			transition: width 200ms linear;
-		}
-			.header .item.search input:focus {
-				width: 330px;
-			}
-		.header > .item.configure {
-			width: 100px;
-		}
-
-.item a:hover {
-	text-decoration: none;
-}
-
-#global {
-	display: table;
-	width: 100%;
-	height: 100%;
-	background: #1c1c1c;
-	table-layout: fixed;
-}
-	.aside {
-		display: table-cell;
-		height: 100%;
-		width: 250px;
-		vertical-align: top;
-		border-right: 1px solid #2f2f2f;
-		background: #1c1c1c;
-	}
-		.aside .nav-form input {
-			width: 180px;
-		}
-		.aside.aside_flux {
-			padding: 10px 0 40px;
-		}
-		.aside.aside_feed .nav-form input {
-			width: 140px;
-		}
-		.aside.aside_feed .nav-form .dropdown .dropdown-menu {
-			right: -20px;
-		}
-		.aside.aside_feed .nav-form .dropdown .dropdown-menu:after {
-			right: 33px;
-		}
-
-	.nav-login {
-		display: none;
-	}
-
-	.nav_menu {
-		width: 100%;
-		background: #1c1c1c;
-		border-bottom: 1px solid #2f2f2f;
-		text-align: center;
-		padding: 5px 0;
-	}
-		.nav_menu .search {
-			display:none;
-		}
-
-.favicon {
-	height: 16px;
-	width: 16px;
-}
-
-.categories {
-	margin: 0;
-	padding: 0;
-	text-align: center;
-	list-style: none;
-}
-	.category {
-		display: block;
-		width: 220px;
-		margin: 10px auto;
-		text-align: left;
-		overflow: hidden;
-		white-space: nowrap;
-		text-overflow: ellipsis;
-	}
-		.category .btn:first-child {
-			width: 195px;
-			position: relative;
-		}
-		.category.stick .btn:first-child {
-			width:160px;
-		}
-		.category .btn:first-child:not([data-unread="0"]):after {
-			content: attr(data-unread);
-			position: absolute;
-			top: 3px; right: 3px;
-			padding: 1px 5px;
-			background: #1a1a1a;
-			color: #888;
-			font-size: 90%;
-			border: 1px solid #000;
-			border-radius: 5px;
-		}
-		.category + .feeds:not(.active) {
-			display:none;
-		}
-	.categories .feeds {
-		width: 100%;
-		margin: 0;
-		list-style: none;
-	}
-		.categories .feeds .item.active {
-			background: #26303F;
-		}
-		.categories .feeds .item.active .feed {
-			color: #888;
-		}
-		.categories .feeds .item.empty .feed {
-			color: #e67e22;
-		}
-		.categories .feeds .item.empty.active {
-			background: #e67e22;
-		}
-		.categories .feeds .item.empty.active .feed {
-			color: #fff;
-		}
-		.categories .feeds .item.error .feed {
-			color: #BD362F;
-		}
-		.categories .feeds .item .feed {
-			display: inline-block;
-			margin: 0;
-			width: 165px;
-			line-height: 35px;
-			font-size: 90%;
-			vertical-align: middle;
-			text-align: left;
-			overflow: hidden;
-			white-space: nowrap;
-			text-overflow: ellipsis;
-		}
-		.feed:not([data-unread="0"]):before {
-			content: "(" attr(data-unread) ") ";
-		}
-		.categories .feeds .dropdown-menu {
-			left: 0;
-		}
-		.categories .feeds .dropdown-menu:after {
-			left: 2px;
-		}
-		.categories .feeds .item .dropdown-toggle > .icon {
-			visibility: hidden;
-			cursor: pointer;
-		}
-			.categories .feeds .item .dropdown-target:target ~ .dropdown-toggle > .icon,
-			.categories .feeds .item:hover .dropdown-toggle > .icon,
-			.categories .feeds .item.active .dropdown-toggle > .icon {
-				background-color: #1c1c1c;
-				border-radius: 3px;
-				visibility: visible;
-			}
-
-.post {
-	padding: 10px 50px;
-}
-	.post form {
-		margin: 10px 0;
-	}
-
-.day {
-	min-height: 50px;
-	padding: 0 10px;
-	font-size: 130%;
-	font-weight: bold;
-	line-height: 50px;
-	background: #1c1c1c;
-	border-top: 1px solid #888;
-	border-bottom: 1px solid #888;
-}
-	.day:first-child {
-		border-top: none;
-	}
-	.day .name {
-		position: absolute;
-		right: 0;
-		width: 50%;
-		height: 1.5em;
-		padding: 0 10px 0 0;
-		overflow: hidden;
-		color: #aab;
-		font-size: 1.8em;
-		opacity: .3;
-		text-shadow: 0px -1px 0px #333;
-		font-style: italic;
-		white-space: nowrap;
-		text-overflow: ellipsis;
-		text-align: right;
-	}
-
-.flux {
-	border-left: 3px solid #aaa;
-	background: #1c1c1c;
-}
-	.flux.not_read {
-		border-left: 3px solid #FF5300;
-		background: #1c1c1c;
-	}
-	.flux.favorite {
-		border-left: 3px solid #FFC300;
-		background: #1c1c1c;
-	}
-	.flux.current {
-		border-left: 3px solid #0062BE;
-		background: #1a1a1a;
-	}
-
-	.flux_header {
-		background: inherit;
-		height: 25px;
-		font-size: 12px;
-		border-top: 1px solid #2f2f2f;
-		cursor: pointer;
-	}
-		.flux .item {
-			line-height: 40px;
-			white-space: nowrap;
-		}
-		.flux_header > .item {
-			overflow: hidden;
-			text-overflow: ellipsis;
-		}
-		.flux .item.manage {
-			width: 40px;
-			text-align: center;
-		}
-		.flux .item.website {
-			width: 200px;
-		}
-			.website .favicon {
-				padding: 5px;
-			}
-		.flux .item.title {
-			background: inherit;
-		}
-		.flux:hover .item.title {
-			border-right: 2px solid rgba(127, 127, 127, 0.1);
-			padding-right: 1em;
-			position: absolute;
-		}
-			.flux .item.title a {
-				color: #888;
-				outline: none;
-			}
-			.flux.not_read .item.title,
-			.flux.current .item.title {
-				font-weight: bold;
-			}
-		.flux .item.date {
-			width: 200px;
-			padding:0 5px 0 0;
-			text-align: right;
-			font-size: 10px;
-			color: #666;
-		}
-		.link {
-			width: 40px;
-			text-align: center;
-		}
-
-#stream.reader .flux {
-	padding: 0 0 30px;
-	border: none;
-	background: #1c1c1c;
-	color: #888;
-}
-	#stream.reader .flux .author {
-		margin: 0 0 10px;
-		font-size: 90%;
-		color: #666;
-	}
-
-#stream.global {
-	text-align: center;
-}
-	#stream.global .box-category {
-		display: inline-block;
-		width: 280px;
-		margin: 20px 10px;
-		vertical-align: top;
-		background: #1a1a1a;
-		border: 1px solid #000;
-		border-radius: 5px;
-		text-align: left;
-		box-shadow: 0 0 5px #2f2f2f;
-	}
-		#stream.global .category {
-			width: 100%;
-			margin: 0;
-		}
-		#stream.global .btn {
-			display: block;
-			width: auto;
-			height: 35px;
-			margin: 0;
-			padding: 0 10px;
-			background: #26303F;
-			border: none;
-			border-bottom: 1px solid #2f2f2f;
-			border-radius: 5px 5px 0 0;
-			line-height: 35px;
-			font-size: 120%;
-		}
-			#stream.global .btn:not([data-unread="0"]) {
-				font-weight:bold;
-			}
-			#stream.global .btn:first-child:not([data-unread="0"]):after {
-				top: 0; right: 5px;
-				border: 0;
-				background: none;
-				color: #666;
-				font-weight: bold;
-				box-shadow: none;
-			}
-		#stream.global .box-category .feeds {
-			display: block;
-			max-height: 250px;
-			margin: 0;
-			list-style: none;
-			overflow: auto;
-		}
-			#stream.global .box-category .feeds .item {
-				padding: 2px 10px;
-				font-size: 90%;
-			}
-		#stream.global .box-category .feed {
-			width: 220px;
-		}
-
-.content {
-	min-height: 150px;
-	max-width: 550px;
-	margin: 0 auto;
-	padding: 20px 10px;
-	line-height: 170%;
-	word-wrap: break-word;
-}
-	.content h1, .content h2, .content h3 {
-		margin: 20px 0 5px;
-	}
-	.content > .title {
-		font-size: x-large;
-		margin: 0;
-	}
-
-	.content p {
-		margin: 0 0 20px;
-	}
-	img.big {
-		display: block;
-		margin: 10px auto;
-	}
-	figure img.big {
-		margin: 0;
-	}
-	.content hr {
-		margin: 30px 0;
-		height: 1px;
-		background: #ddd;
-		border: 0;
-	}
-	.content pre {
-		margin: 10px auto;
-		padding: 10px;
-		overflow: auto;
-		background: #000;
-		color: #fff;
-		font-size: 110%;
-	}
-	.content q, .content blockquote {
-		display: block;
-		margin: 5px 0;
-		padding: 5px 20px;
-		font-style: italic;
-		border-left: 4px solid #ccc;
-		color: #666;
-	}
-		.content blockquote p {
-			margin: 0;
-		}
-
-#panel {
-	display: none;
-	position: fixed;
-	top: 10px; bottom: 10px;
-	left: 100px; right: 100px;
-	overflow: auto;
-	background: #1c1c1c;
-	border: 1px solid #95a5a6;
-	border-radius: 5px;
-}
-	#panel .close {
-		position: fixed;
-		top: 10px; right: 0;
-		display: inline-block;
-		width: 26px;
-		height: 26px;
-		margin: 0 10px 0 0;
-		border: 1px solid #ccc;
-		border-radius: 20px;
-		text-align: center;
-		line-height: 26px;
-		background: #fff;
-	}
-
-#overlay {
-	display: none;
-	position: fixed;
-	top: 0; bottom: 0;
-	left: 0; right: 0;
-	background: rgba(0, 0, 0, 0.9);
-}
-
-.flux_content .bottom {
-	font-size: 90%;
-	text-align: center;
-}
-
-.hide_posts > :not(.active) > .flux_content {
-	display:none;
-}
-
-/*** PAGINATION ***/
-.pagination {
-	display: table;
-	width: 100%;
-	margin: 0;
-	background: #1a1a1a;
-	text-align: center;
-	color: #888;
-	font-size: 80%;
-	line-height: 200%;
-	table-layout: fixed;
-}
-	.pagination .item {
-		display: table-cell;
-		line-height: 40px;
-	}
-		.pagination .item.pager-current {
-			font-weight: bold;
-			font-size: 140%;
-		}
-		.pagination .pager-first,
-		.pagination .pager-previous,
-		.pagination .pager-next,
-		.pagination .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;
-	}
-
-#nav_entries {
-	display: table;
-	width: 250px;
-	height: 40px;
-	position: fixed;
-	bottom: 0;
-	left: 0;
-	margin: 0;
-	background: #1c1c1c;
-	border-top: 1px solid #2f2f2f;
-	text-align: center;
-	line-height: 40px;
-	table-layout: fixed;
-}
-	#nav_entries .item {
-		display: table-cell;
-		width: 30%;
-	}
-		#nav_entries a {
-			display: block;
-		}
-		#nav_entries .i_up {
-			margin: 5px 0 0;
-			vertical-align: top;
-		}
-
-.loading {
-	background: url("loader.gif") center center no-repeat;
-	font-size: 0;
-}
-
-#bigMarkAsRead {
-	display: block;
-	font-style: normal;
-	padding: 32px 0 64px 0;
-	text-align: center;
-	text-decoration: none;
-}
-	#bigMarkAsRead:hover {
-		background: #1c1c1c;
-		color: #888;
-	}
-	.bigTick {
-		font-size: 72pt;
-		line-height: 1.6em;
-	}
-
-/*** NOTIFICATION ***/
-.notification {
-	position: absolute;
-	top: 10px;
-	left: 25%; right: 25%;
-	min-height: 30px;
-	padding: 10px;
-	line-height: 30px;
-	text-align: center;
-	border-radius: 5px;
-	box-shadow: 0 0 5px #666;
-	background: #1a1a1a;
-	color: #888;
-	font-weight: bold;
-	z-index: 10;
-}
-	.notification.good {
-		border:1px solid #f4f899;
-	}
-	.notification.bad {
-		border:1px solid #f4a899;
-	}
-	.notification a.close {
-		display: inline-block;
-		width: 16px;
-		height: 16px;
-		float: right;
-		margin: -20px -20px 0 0;
-		padding: 5px;
-		background: #1a1a1a;
-		border-radius: 50px;
-		line-height: 16px;
-	}
-	.notification.good a.close{
-		border:1px solid #f4f899;
-	}
-	.notification.bad a.close{
-		border:1px solid #f4a899;
-	}
-
-.toggle_aside, .btn.toggle_aside {
-	display: none;
-}
-
-.actualizeProgress {
-	position: fixed;
-	top: 10px;
-	left: 25%; right: 25%;
-	padding: 5px;
-	background: #1a1a1a;
-	text-align: center;
-	border: 1px solid #2f2f2f;
-	border-radius: 5px;
-}
-	.actualizeProgress progress {
-		max-width: 100%;
-		vertical-align: middle;
-	}
-	.actualizeProgress .progress {
-		color: #888;
-		font-size: 90%;
-		vertical-align: middle;
-	}
-
-.logs {
-	border: 1px solid #aaa;
-}
-	.log {
-		padding: 5px 2%;
-		overflow: auto;
-		background: #fafafa;
-		border-bottom: 1px solid #999;
-		color: #333;
-		font-size: 90%;
-	}
-		.log .date {
-			display: block;
-		}
-	.log.error {
-		background: #fdd;
-		color: #844;
-	}
-	.log.warning {
-		background: #ffe;
-		color: #c95;
-	}
-	.log.notice {
-		background: #f4f4f4;
-		color: #aaa;
-	}
-	.log.debug {
-		background: #111;
-		color: #eee;
-	}
-
-.form-group table {
-	border-collapse:collapse;
-	margin:10px 0 0 220px;
-	text-align:center;
-}
-
-.form-group tr, .form-group th, .form-group td {
-	border:1px solid #2f2f2f;
-	font-weight:normal;
-	padding:.5em;
-}
-
-select.number option {
-	text-align:right;
-}
-
-@media(max-width: 840px) {
-	.header,
-	.aside .btn-important,
-	.aside .feeds .dropdown,
-	.flux_header .item.website span,
-	.item.date {
-		display: none;
-	}
-	.flux_header .item.website {
-		width: 40px;
-		text-align: center;
-	}
-		.flux_header .item.website .favicon {
-			padding: 12px;
-		}
-
-	.nav-login {
-		display: block;
-	}
-
-	.content {
-		font-size: 120%;
-		padding: 0;
-	}
-
-	.pagination {
-		margin: 0 0 40px;
-	}
-	.pagination .pager-previous, .pagination .pager-next {
-		width: 100px;
-	}
-
-	.toggle_aside, .btn.toggle_aside {
-		display: inline-block;
-	}
-	.aside {
-		position: fixed;
-		top: 0; left: 0;
-		width: 0;
-		overflow: hidden;
-		border-right: none;
-		z-index: 10;
-		transition: width 200ms linear;
-	}
-		.aside.aside_flux {
-			padding: 10px 0 0;
-		}
-		.aside:target {
-			width: 80%;
-			border-right: 1px solid #aaa;
-			overflow: auto;
-		}
-		.aside .toggle_aside {
-			position: absolute;
-			right: 0;
-			display: inline-block;
-			width: 26px;
-			height: 26px;
-			margin: 0 10px 0 0;
-			border: 1px solid #ccc;
-			border-radius: 20px;
-			text-align: center;
-			line-height: 26px;
-		}
-		.aside .categories {
-			margin: 30px 0;
-		}
-
-	#nav_entries {
-		width: 100%;
-	}
-
-	.nav_menu .btn {
-		margin: 5px 10px;
-	}
-	.nav_menu .stick {
-		margin: 0 10px;
-	}
-	.nav_menu .stick .btn {
-		margin: 5px 0;
-	}
-	.nav_menu .search {
-			display: inline-block;
-			max-width: 97%;
-		}
-		.nav_menu .search input {
-			max-width: 97%;
-			width: 90px;
-		}
-		.nav_menu .search input:focus {
-			width: 400px;
-		}
-
-	#panel {
-		left: 5px; right: 5px;
-	}
-
-	.day .date {
-		display: none;
-	}
-	.day .name {
-		height: 2.6em;
-		font-size: 1em;
-		text-shadow: none;
-	}
-
-	.notification,
-	.actualizeProgress {
-		left: 10px;
-		right: 10px;
-	}
-}
-
-/*** FALLBACK ***/
-.btn {
-	background: #1c1c1c;
-}
-	.btn:hover {
-		background: -moz-linear-gradient(top, #4A5D7A 0%, #26303F 100%);
-		background: -webkit-linear-gradient(top, #4A5D7A 0%, #26303F 100%);
-		background: -o-linear-gradient(top, #4A5D7A 0%, #26303F 100%);
-		background: -ms-linear-gradient(top, #4A5D7A 0%, #26303F 100%);
-	}
-	.btn-important {
-		background: #26303F;
-	}
-		.btn-important:hover {
-			background: -moz-linear-gradient(top, #4A5D7A 0%, #26303F 100%);
-			background: -webkit-linear-gradient(top, #4A5D7A 0%, #26303F 100%);
-			background: -o-linear-gradient(top, #4A5D7A 0%, #26303F 100%);
-			background: -ms-linear-gradient(top, #4A5D7A 0%, #26303F 100%);
-		}
-	.btn-attention {
-		background: #880011;
-	}
-		.btn-attention:hover {
-			background: -moz-linear-gradient(top, #cc0044 0%, #880011 100%);
-			background: -webkit-linear-gradient(top, #cc0044 0%, #880011 100%);
-			background: -o-linear-gradient(top, #cc0044 0%, #880011 100%);
-			background: -ms-linear-gradient(top, #cc0044 0%, #880011 100%);
-		}
-
-.dropdown-menu:after {
-	-moz-transform: rotate(45deg);
-	-webkit-transform: rotate(45deg);
-	-ms-transform: rotate(45deg);
-}
-
-.nav-head {
-	background: #fff;
-	background: -moz-linear-gradient(top, #fff 0%, #f0f0f0 100%);
-	background: -webkit-linear-gradient(top, #fff 0%, #f0f0f0 100%);
-	background: -o-linear-gradient(top, #fff 0%, #f0f0f0 100%);
-	background: -ms-linear-gradient(top, #fff 0%, #f0f0f0 100%);
-}
-
-.header > .item.search input {
-	-moz-transition: width 200ms linear;
-	 -webkit-transition: width 200ms linear;
-	-o-transition: width 200ms linear;
-	-ms-transition: width 200ms linear;
-}
-
-@media(max-width: 840px) {
-	.aside {
-		-moz-transition: width 200ms linear;
-		 -webkit-transition: width 200ms linear;
-		-o-transition: width 200ms linear;
-		-ms-transition: width 200ms linear;
-	}
-}
-
-@media print {
-	.header,
-	.aside,
-	.nav_menu,
-	.day,
-	.flux_header,
-	.flux_content .bottom,
-	.pagination {
-		display: none;
-	}
-
-	html, body {
-		background: #fff;
-		color: #000;
-		font-family: Serif;
-		font-size: 12pt;
-	}
-
-	#global,
-	.flux_content {
-		display: block !important;
-	}
-
-	.flux_content .content {
-		width: 100% !important;
-		text-align: justify;
-	}
-
-	.flux_content .content a {
-		color: #000;
-	}
-	.flux_content .content a:after {
-		content: " (" attr(href) ") ";
-		text-decoration: underline;
-	}
-}
diff --git a/p/themes/default_dark/global.css b/p/themes/default_dark/global.css
deleted file mode 100644
index 04eb723f1..000000000
--- a/p/themes/default_dark/global.css
+++ /dev/null
@@ -1,487 +0,0 @@
-@charset "UTF-8";
-
-/* FONTS */
-@font-face {
-	font-family: "OpenSans";
-	src: url("../fonts/openSans.woff") format("woff");
-}
-
-
-* {
-	margin: 0;
-	padding: 0;
-}
-html, body {
-	height: 100%;
-	font-size: 95%;
-	font-family: "OpenSans", "Cantarell", "Helvetica", "Arial", sans-serif;
-	color: #888;
-}
-
-/* LIENS */
-a {
-	color: #6986B2;
-	text-decoration: none;
-}
-	a:hover {
-		text-decoration: underline;
-	}
-
-/* LISTES */
-ul, ol, dl {
-	margin: 10px 0 10px 30px;
-	line-height: 190%;
-}
-	dd {
-		margin: 0 0 10px 30px;
-	}
-
-/* TITRES */
-h1, h2, h3 {
-	min-height: 40px;
-	margin: 15px 0 5px;
-	line-height: 40px;
-}
-
-/* IMG */
-figure {
-	margin: 5px 0 10px;
-	text-align: center;
-}
-	figcaption {
-		display: inline-block;
-		padding: 3px 20px;
-		color: #999;
-		font-style: italic;
-		border-bottom: 1px solid #ccc;
-	}
-img {
-	height: auto;
-	max-width: 100%;
-	vertical-align: middle;
-}
-	a img {
-		border: none;
-	}
-
-/* VIDEOS */
-iframe, embed, object, video {
-	max-width: 100%;
-}
-
-/* FORMULAIRES */
-legend {
-	display: block;
-	width: 100%;
-	margin: 20px 0 5px;
-	padding: 5px 0;
-	border-bottom: 1px solid #2f2f2f;
-	font-size: 150%;
-	clear: both;
-}
-label {
-	display: block;
-	min-height: 25px;
-	padding: 5px 0;
-	font-size: 14px;
-	line-height: 25px;
-	cursor: pointer;
-}
-input, select, textarea {
-	display: inline-block;
-	max-width: 100%;
-	min-height: 25px;
-	padding: 5px;
-	background: #333;
-	border: 1px solid #000;
-	border-radius: 3px;
-	color: #999;
-	line-height: 25px;
-	vertical-align: middle;
-	box-shadow: 0 2px 2px #1d1d1d inset;
-}
-	option {
-		padding:0 .5em 0 .5em;
-	}
-	input[type="radio"],
-	input[type="checkbox"] {
-		width: 15px !important;
-		min-height: 15px !important;
-	}
-	input:focus, select:focus, textarea:focus {
-		color: #6986b2;
-		border-color: #2f2f2f;
-	}
-	input:invalid, select:invalid {
-		border-color: red;
-		box-shadow: 0 0 2px 1px red;
-	}
-
-.form-group {
-	margin: 0;
-}
-	.form-group:after {
-		content: "";
-		display: block;
-		clear: both;
-	}
-	.form-group.form-actions {
-		min-width: 250px;
-		padding: 5px 0;
-		background: #1a1a1a;
-		border-top: 1px solid #2f2f2f;
-	}
-		.form-group.form-actions .btn {
-			margin: 0 10px;
-		}
-	.form-group .group-name {
-		display: block;
-		float: left;
-		width: 200px;
-		padding: 10px 0;
-		text-align: right;
-	}
-	.form-group .group-controls {
-		min-width: 250px;
-		min-height: 25px;
-		margin: 0 0 0 220px;
-		padding: 5px 0;
-	}
-		.form-group .group-controls .control {
-			display: block;
-			min-height: 30px;
-			padding: 5px 0;
-			line-height: 25px;
-			font-size: 14px;
-		}
-
-.stick {
-	display: inline-block;
-	white-space: nowrap;
-	font-size: 0px;
-	vertical-align: middle;
-}
-	.stick input,
-	.stick .btn {
-		border-radius: 0;
-		font-size: 14px;
-	}
-	.stick .btn:first-child,
-	.stick input:first-child {
-		border-radius: 3px 0 0 3px;
-	}
-		.stick .btn-important:first-child {
-			border-right: 1px solid #000;
-		}
-	.stick .btn:last-child,
-	.stick input:last-child {
-		border-radius: 0 3px 3px 0;
-	}
-	.stick .btn + .btn,
-	.stick .btn + input,
-	.stick input + .btn,
-	.stick input + input {
-		border-left: none;
-	}
-	.stick .btn + .dropdown > .btn {
-		border-left: none;
-		border-radius: 0 3px 3px 0;
-	}
-	.stick .btn + .dropdown a {
-		font-size: 12px;
-	}
-
-.btn {
-	display: inline-block;
-	min-height: 37px;
-	min-width: 15px;
-	padding: 5px 10px;
-	background: linear-gradient(to bottom, #fff 0%, #eee 100%);
-	border-radius: 3px;
-	border: 1px solid #000;
-	color: #888;
-	line-height: 20px;
-	vertical-align: middle;
-	cursor: pointer;
-	overflow: hidden;
-}
-	a.btn {
-		min-height: 25px;
-		line-height: 25px;
-	}
-	.btn:hover {
-		background: linear-gradient(to bottom, #4A5D7A, #26303F);
-		text-decoration: none;
-	}
-	.btn.active,
-	.btn:active,
-	.dropdown-target:target ~ .btn.dropdown-toggle {
-		background: #26303F;
-	}
-
-	.btn-important {
-		background: linear-gradient(to bottom, #0084CC, #0045CC);
-		color: #888888;
-		border: 1px solid #000000;
-	}
-		.btn-important:hover {
-			background: linear-gradient(to bottom, #0066CC, #0045CC);
-		}
-		.btn-important:active {
-			background: #0044CB;
-			box-shadow: none;
-		}
-
-	.btn-attention {
-		background: linear-gradient(to bottom, #E95B57, #BD362F);
-		color: #888888;
-		border: 1px solid #000000;
-	}
-		.btn-attention:hover {
-			background: linear-gradient(to bottom, #D14641, #BD362F);
-		}
-		.btn-attention:active {
-			background: #BD362F;
-			box-shadow: none;
-		}
-
-/* NAVIGATION */
-.nav-list .nav-header,
-.nav-list .item {
-	display: block;
-	height: 35px;
-	line-height: 35px;
-}
-	.nav-list .item:hover {
-		background: #1a1a1a;
-	}
-		.nav-list .item:hover a {
-			color: #26303F;
-		}
-	.nav-list .item.active {
-		background: #26303F;
-		color: #1a1a1a;
-	}
-		.nav-list .item.active a {
-			color: #888;
-		}
-	.nav-list .disable {
-		color: #aaa;
-		background: #fafafa;
-		text-align: center;
-	}
-	.nav-list .item > * {
-		display: block;
-		padding: 0 10px;
-		overflow: hidden;
-		white-space: nowrap;
-		text-overflow: ellipsis;
-	}
-		.nav-list a:hover {
-			text-decoration: none;
-		}
-	.nav-list .item.error a {
-		color: #BD362F;
-	}
-		.nav-list .item.active.error a {
-			color: #fff;
-			background: #BD362F;
-		}
-	.nav-list .item.empty a {
-		color: #f39c12;
-	}
-		.nav-list .item.active.empty a {
-			color: #fff;
-			background: #f39c12;
-		}
-
-	.nav-list .nav-header {
-		padding: 0 10px;
-		background: #1a1a1a;
-		border-bottom: 1px solid #2f2f2f;
-		font-weight: bold;
-	}
-	.nav-list .separator {
-		display: block;
-		height: 0;
-		margin: 5px 0;
-		border-bottom: 1px solid #ddd;
-	}
-
-	.nav-list .nav-form {
-		padding: 3px;
-		text-align: center;
-	}
-
-.nav-head {
-	display: block;
-	margin: 0;
-	background: linear-gradient(to bottom, #fff, #f0f0f0);
-	border-bottom: 1px solid #ddd;
-	text-align: right;
-}
-	.nav-head .item {
-		display: inline-block;
-		padding: 5px 10px;
-	}
-
-/* HORIZONTAL-LIST */
-.horizontal-list {
-	display: table;
-	table-layout: fixed;
-	margin: 0;
-	padding: 0;
-	width: 100%;
-}
-	.horizontal-list .item {
-		display: table-cell;
-		vertical-align: middle;
-	}
-
-/* DROPDOWN */
-.dropdown {
-	position: relative;
-	display: inline-block;
-}
-	.dropdown-target {
-		display: none;
-	}
-
-	.dropdown-menu {
-		display: none;
-		min-width: 200px;
-		margin: 5px 0 0;
-		padding: 5px 0;
-		position: absolute;
-		right: 0px;
-		background: #1a1a1a;
-		border: 1px solid #888;
-		border-radius: 5px;
-		text-align: left;
-	}
-	.dropdown-menu:after {
-		content: "";
-		position: absolute;
-		top: -6px;
-		right: 13px;
-		width: 10px;
-		height: 10px;
-		background: #1a1a1a;
-		border-top: 1px solid #888;
-		border-left: 1px solid #888;
-		z-index: -10;
-		transform: rotate(45deg);
-	}
-		.dropdown-header {
-			display: block;
-			padding: 0 5px;
-			color: #888;
-			font-weight: bold;
-			font-size: 14px;
-			line-height: 30px;
-		}
-		.dropdown-menu .item {
-			display: block;
-			height: 30px;
-			font-size: 90%;
-			line-height: 30px;
-		}
-			.dropdown-menu > .item > a {
-				display: block;
-				padding: 0 25px;
-				line-height: 30px;
-			}
-			.dropdown-menu > .item:hover {
-				background: #26303F;
-				color: #888;
-			}
-				.dropdown-menu > .item[aria-checked="true"] > a:before {
-					content: '✓ ';
-					font-weight: bold;
-					margin: 0 0 0 -1.2em;
-					padding: 0 0.2em 0 0;
-				}
-				.dropdown-menu > .item:hover > a {
-					color: #888;
-					text-decoration: none;
-				}
-		.dropdown-menu .input {
-			display: block;
-			height: 40px;
-			font-size: 90%;
-			line-height: 30px;
-		}
-			.dropdown-menu .input select,
-			.dropdown-menu .input input {
-				display: block;
-				height: 20px;
-				width: 95%;
-				margin: auto;
-				padding: 2px 5px;
-				border-radius: 3px;
-			}
-			.dropdown-menu .input select {
-				width: 70%;
-				height: auto;
-			}
-		.dropdown-menu .separator {
-			display: block;
-			height: 0;
-			margin: 5px 0;
-			border-bottom: 1px solid #888;
-		}
-		.dropdown-target:target ~ .dropdown-menu {
-			display: block;
-			z-index: 10;
-		}
-	.dropdown-close {
-		display: inline;
-	}
-		.dropdown-close a {
-			font-size: 0;
-			position: fixed;
-			top: 0; bottom: 0;
-			left: 0; right: 0;
-			display: block;
-			z-index: -10;
-		}
-
-/* ALERTS */
-.alert {
-	display: block;
-	width: 90%;
-	margin: 15px auto;
-	padding: 10px 15px;
-	background: #1a1a1a;
-	border: 1px solid #ccc;
-	border-right: 1px solid #aaa;
-	border-bottom: 1px solid #aaa;
-	border-radius: 5px;
-	color: #aaa;
-}
-	.alert-head {
-		margin: 0;
-		font-weight: bold;
-		font-size: 110%;
-	}
-	.alert-warn {
-		border: 1px solid #c95;
-		color: #c95;
-	}
-	.alert-success {
-		border: 1px solid #484;
-		color: #484;
-	}
-	.alert-error {
-		border: 1px solid #844;
-		color: #844;
-	}
-
-/* ICÔNES */
-.icon {
-	display: inline-block;
-	width: 16px;
-	height: 16px;
-	vertical-align: middle;
-	line-height: 16px;
-}
diff --git a/p/themes/default_dark/loader.gif b/p/themes/default_dark/loader.gif
deleted file mode 100644
index 86022be71..000000000
Binary files a/p/themes/default_dark/loader.gif and /dev/null differ
diff --git a/p/themes/default_dark/metadata.json b/p/themes/default_dark/metadata.json
deleted file mode 100644
index 7504831a6..000000000
--- a/p/themes/default_dark/metadata.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "name": "Dark",
-  "author": "AD",
-  "description": "Le coté obscur du thème par défaut pour FreshRSS",
-  "version": 0.1,
-  "files": ["global.css", "freshrss.css"]
-}
diff --git a/p/themes/flat-design/freshrss.css b/p/themes/flat-design/freshrss.css
deleted file mode 100644
index dca1b3f28..000000000
--- a/p/themes/flat-design/freshrss.css
+++ /dev/null
@@ -1,817 +0,0 @@
-@charset "UTF-8";
-
-/* STRUCTURE */
-body {
-	background: #fafafa;
-}
-
-.header {
-	display: table;
-	width: 100%;
-	table-layout: fixed;
-	background: #ecf0f1;
-}
-	.header > .item {
-		display: table-cell;
-		padding: 10px 0;
-		vertical-align: middle;
-		text-align: center;
-	}
-		.header > .item.title {
-			width: 250px;
-			white-space: nowrap;
-		}
-			.logo {
-				display: inline-block;
-				font-size: 48px;
-				height: 32px;
-				width: 32px;
-				padding: 10px;
-			}
-			.header > .item.title h1 {
-				display: inline-block;
-				margin: 0;
-			}
-		.header > .item.search input {
-			width: 230px;
-			transition: width 200ms linear;
-		}
-			.header .item.search input:focus {
-				width: 330px;
-			}
-		.header > .item.configure {
-			width: 100px;
-		}
-
-.item a:hover {
-	text-decoration: none;
-}
-
-#global {
-	display: table;
-	width: 100%;
-	height: 100%;
-	table-layout: fixed;
-}
-	.aside {
-		display: table-cell;
-		height: 100%;
-		width: 250px;
-		vertical-align: top;
-		background: #ecf0f1;
-	}
-		.aside .nav-form input {
-			width: 180px;
-		}
-		.aside.aside_flux {
-			padding: 10px 0 40px;
-		}
-		.aside.aside_feed .nav-form input {
-			width: 140px;
-		}
-		.aside.aside_feed .nav-form .dropdown-menu {
-			right: -20px;
-		}
-		.aside.aside_feed .nav-form .dropdown-menu:after {
-			right: 33px;
-		}
-
-	.nav-login {
-		display: none;
-	}
-
-	.nav_menu {
-		width: 100%;
-		text-align: center;
-		padding: 5px 0;
-	}
-		.nav_menu .search {
-			display:none;
-		}
-
-.favicon {
-	height: 16px;
-	width: 16px;
-}
-
-.categories {
-	margin: 0;
-	padding: 0;
-	text-align: center;
-	list-style: none;
-}
-	.category {
-		display: block;
-		width: 220px;
-		margin: 10px auto;
-		text-align: left;
-		overflow: hidden;
-		white-space: nowrap;
-		text-overflow: ellipsis;
-	}
-		.category .btn:first-child {
-			width: 195px;
-			position: relative;
-		}
-		.category.stick .btn:first-child {
-			width:160px;
-		}
-		.category .btn:first-child:not([data-unread="0"]):after {
-			content: attr(data-unread);
-			position: absolute;
-			top: 5px; right: 5px;
-			padding: 0 5px;
-			color: #fff;
-			font-size: 90%;
-			background: #3498DB;
-			border-radius: 5px;
-		}
-		.category + .feeds:not(.active) {
-			display:none;
-		}
-	.categories .feeds {
-		width: 100%;
-		margin: 0 auto;
-		list-style: none;
-	}
-		.categories .feeds .item.active:after {
-			content: "⇢";
-			line-height: 35px;
-			float: right;
-		}
-		.categories .feeds .item.empty .feed {
-			color: #e67e22;
-		}
-		.categories .feeds .item.error .feed {
-			color: #BD362F;
-		}
-		.categories .feeds .item .feed {
-			display: inline-block;
-			margin: 0;
-			width: 165px;
-			line-height: 35px;
-			font-size: 90%;
-			vertical-align: middle;
-			text-align: left;
-			overflow: hidden;
-			white-space: nowrap;
-			text-overflow: ellipsis;
-		}
-		.feed:not([data-unread="0"]) {
-			font-weight:bold;
-		}
-		.feed:not([data-unread="0"]):before {
-			content: "(" attr(data-unread) ") ";
-		}
-		.categories .feeds .dropdown-menu {
-			left: 0;
-		}
-		.categories .feeds .dropdown-menu:after {
-			left: 2px;
-		}
-		.categories .feeds .item .dropdown-toggle > .icon {
-			visibility: hidden;
-			cursor: pointer;
-		}
-			.categories .feeds .item .dropdown-target:target ~ .dropdown-toggle > .icon,
-			.categories .feeds .item:hover .dropdown-toggle > .icon,
-			.categories .feeds .item.active .dropdown-toggle > .icon {
-				background-color: #95a5a6;
-				border-radius: 3px;
-				visibility: visible;
-			}
-	.categories .btn:hover .notRead,
-	.categories .btn.active .notRead {
-		background: #2980B9;
-		border-left: 3px solid #3498DB;
-	}
-
-.post {
-	padding: 10px 50px;
-}
-	.post form {
-		margin: 10px 0;
-	}
-
-.day {
-	padding: 5px 15px;
-	font-size: 130%;
-	font-weight: bold;
-	line-height: 50px;
-	border-left: 3px solid #ecf0f1;
-}
-	.day .name {
-		position: absolute;
-		right: 0;
-		width: 50%;
-		height: 1.5em;
-		padding: 0 10px 0 0;
-		overflow: hidden;
-		color: #aab;
-		font-size: 1.8em;
-		opacity: .3;
-		font-style: italic;
-		text-align: right;
-		white-space: nowrap;
-		text-overflow: ellipsis;
-		z-index: -10;
-	}
-
-.flux {
-	border-left: 3px solid #ecf0f1;
-}
-	.flux:hover {
-		background: #fff;
-	}
-	.flux.not_read {
-		border-left-color: #FF5300;
-		background: #FFF3ED;
-	}
-	.flux.favorite {
-		border-left-color: #FFC300;
-		background: #FFF6DA;
-	}
-	.flux.current {
-		border-left-color: #3498db;
-		background: #fff;
-	}
-
-	.flux_header {
-		background: inherit;
-		height: 25px;
-		font-size: 12px;
-		border-top: 1px solid #ecf0f1;
-		cursor: pointer;
-	}
-		.flux .item {
-			line-height: 40px;
-			white-space: nowrap;
-		}
-		.flux_header > .item {
-			overflow: hidden;
-			text-overflow: ellipsis;
-		}
-		.flux .item.manage {
-			width: 40px;
-			text-align: center;
-		}
-		.flux .item.website {
-			width: 200px;
-		}
-			.website .favicon {
-				padding: 5px;
-			}
-		.flux .item.title {
-			background: inherit;
-		}
-		.flux:hover .item.title {
-			border-right: 2px solid rgba(127, 127, 127, 0.1);
-			padding-right: 1em;
-			position: absolute;
-		}
-			.flux .item.title a {
-				color: #333;
-				outline: none;
-			}
-			.flux.current .item.title,
-			.flux.not_read .item.title {
-				font-weight: bold;
-			}
-		.flux .item.date {
-			width: 200px;
-			padding:0 5px 0 0;
-			text-align: right;
-			font-size: 10px;
-			color: #666;
-		}
-		.link {
-			width: 40px;
-			text-align: center;
-		}
-
-#stream.reader .flux {
-	position: relative;
-	padding: 0 0 30px;
-	border: none;
-	background: #ecf0f1;
-	color: #34495e;
-	font-size: 120%;
-}
-	#stream.reader .flux .author {
-		margin: 0 0 10px;
-		font-size: 90%;
-		color: #aaa;
-	}
-
-#stream.global {
-	text-align: center;
-}
-	#stream.global .box-category {
-		display: inline-block;
-		width: 280px;
-		margin: 20px 10px;
-		vertical-align: top;
-		border: 1px solid #ddd;
-		border-radius: 5px;
-		text-align: left;
-	}
-		#stream.global .category {
-			width: 100%;
-			margin: 0;
-		}
-		#stream.global .btn {
-			display: block;
-			width: auto;
-			height: 35px;
-			margin: 0;
-			padding: 0 10px;
-			background: #ecf0f1;
-			color: #333;
-			border-bottom: 1px solid #ddd;
-			border-radius: 5px 5px 0 0;
-			line-height: 35px;
-			font-size: 120%;
-		}
-			#stream.global .btn:not([data-unread="0"]) {
-				font-weight:bold;
-			}
-			#stream.global .btn:first-child:not([data-unread="0"]):after {
-				top: 0; right: 5px;
-				border: 0;
-				background: none;
-				color: #333;
-				font-weight: bold;
-				box-shadow: none;
-			}
-		#stream.global .box-category .feeds {
-			display: block;
-			max-height: 250px;
-			margin: 0;
-			list-style: none;
-			overflow: auto;
-		}
-			#stream.global .box-category .feeds .item {
-				padding: 2px 10px;
-				font-size: 90%;
-			}
-		#stream.global .box-category .feed {
-			width: 220px;
-		}
-
-.content {
-	min-height: 150px;
-	max-width: 550px;
-	margin: 0 auto;
-	padding: 20px 10px;
-	line-height: 170%;
-	word-wrap: break-word;
-}
-	.content h1, .content h2, .content h3 {
-		margin: 20px 0 5px;
-	}
-	.content > .title {
-		font-size: x-large;
-		margin: 0;
-	}
-
-	.content p {
-		margin: 0 0 20px;
-	}
-	img.big {
-		display: block;
-		margin: 10px auto;
-	}
-	figure img.big {
-		margin: 0;
-	}
-	.content hr {
-		margin: 30px 0;
-		height: 1px;
-		background: #ddd;
-		border: 0;
-	}
-	.content pre {
-		margin: 10px auto;
-		padding: 10px;
-		overflow: auto;
-		background: #000;
-		color: #fff;
-		font-size: 110%;
-	}
-	.content q, .content blockquote {
-		display: block;
-		margin: 5px 0;
-		padding: 5px 20px;
-		font-style: italic;
-		border-left: 4px solid #ccc;
-		color: #666;
-	}
-		.content blockquote p {
-			margin: 0;
-		}
-
-#panel {
-	display: none;
-	position: fixed;
-	top: 10px; bottom: 10px;
-	left: 100px; right: 100px;
-	overflow: auto;
-	background: #fff;
-	border: 1px solid #95a5a6;
-	border-radius: 5px;
-}
-	#panel .close {
-		position: fixed;
-		top: 10px; right: 0px;
-		display: inline-block;
-		width: 26px;
-		height: 26px;
-		margin: 0 10px 0 0;
-		border-radius: 3px;
-		text-align: center;
-		line-height: 24px;
-		background: #95a5a6;
-	}
-		#panel .close:hover {
-			background: #7f8c8d;
-		}
-
-#overlay {
-	display: none;
-	position: fixed;
-	top: 0; bottom: 0;
-	left: 0; right: 0;
-	background: rgba(0, 0, 0, 0.9);
-}
-
-.flux_content .bottom {
-	font-size: 90%;
-	text-align: center;
-}
-
-.hide_posts > :not(.active) > .flux_content {
-	display:none;
-}
-
-/*** PAGINATION ***/
-.pagination {
-	display: table;
-	width: 100%;
-	margin: 0;
-	background: #ecf0f1;
-	text-align: center;
-	color: #000;
-	font-size: 80%;
-	line-height: 200%;
-	table-layout: fixed;
-	font-weight: bold;
-}
-	.pagination .item {
-		display: table-cell;
-		line-height: 40px;
-		vertical-align: top;
-	}
-		.pagination .item.pager-current {
-			font-weight: bold;
-			font-size: 140%;
-			color: #ecf0f1;
-			background: #34495e;
-		}
-		.pagination .item.pager-first,
-		.pagination .item.pager-previous,
-		.pagination .item.pager-next,
-		.pagination .item.pager-last {
-			width: 100px;
-		}
-		.pagination .item a {
-			display: block;
-			color: #000;
-			font-weight: bold;
-			line-height: 40px;
-		}
-			.pagination .item a:hover {
-				color: #ecf0f1;
-				background: #34495e;
-			}
-
-#nav_entries {
-	display: table;
-	width: 250px;
-	height: 40px;
-	position: fixed;
-	bottom: 0;
-	left: 0;
-	margin: 0;
-	background: #34495e;
-	text-align: center;
-	line-height: 40px;
-	table-layout: fixed;
-}
-	#nav_entries .item {
-		display: table-cell;
-		width: 30%;
-	}
-		#nav_entries a {
-			display: block;
-		}
-		#nav_entries .i_up {
-			margin: 5px 0 0;
-			vertical-align: top;
-		}
-
-.pagination .loading,
-.pagination a:hover.loading {
-	background: url("loader.gif") center center no-repeat #34495e;
-	font-size: 0;
-}
-
-#bigMarkAsRead {
-	background: #ecf0f1;
-	display: block;
-	font-style: normal;
-	padding: 32px 0 64px 0;
-	text-align: center;
-	text-decoration: none;
-	text-shadow: 0 -1px 0 #aaa;
-}
-	#bigMarkAsRead:hover {
-		background: #34495e;
-		color: #fff;
-	}
-	.bigTick {
-		font-size: 72pt;
-		line-height: 1.6em;
-	}
-
-/*** NOTIFICATION ***/
-.notification {
-	position: absolute;
-	top: 10px;
-	left: 25%; right: 25%;
-	min-height: 30px;
-	padding: 10px;
-	line-height: 30px;
-	text-align: center;
-	border-radius: 3px;
-	background: #ddd;
-	color: #666;
-	font-weight: bold;
-	z-index: 10;
-}
-	.notification.good {
-		background: #1abc9c;
-		color: #fff;
-	}
-	.notification.bad {
-		background: #e74c3c;
-		color: #fff;
-	}
-	.notification a.close {
-		display: inline-block;
-		width: 16px;
-		height: 16px;
-		float: right;
-		margin: -16px -16px 0 0;
-		padding: 5px;
-		border-radius: 3px;
-		line-height: 16px;
-	}
-		.notification.good a.close {
-			background: #1abc9c;
-		}
-		.notification.bad a.close {
-			background: #e74c3c;
-		}
-
-.toggle_aside, .btn.toggle_aside {
-	display: none;
-}
-
-.actualizeProgress {
-	position: fixed;
-	top: 10px;
-	left: 25%; right: 25%;
-	padding: 5px;
-	background: #3498db;
-	color: #fff;
-	text-align: center;
-	border-radius: 3px;
-	font-weight: bold;
-}
-	.actualizeProgress progress {
-		max-width: 100%;
-		width: 250px;
-		height: 15px;
-		vertical-align: middle;
-		background: #fff;
-		border: none;
-	}
-	.actualizeProgress .progress {
-		color: #ecf0f1;
-	}
-
-.logs {
-	border: 1px solid #34495e;
-}
-	.log {
-		margin: 10px 0;
-		padding: 5px 2%;
-		overflow: auto;
-		background: #fafafa;
-		color: #666;
-		font-size: 90%;
-	}
-		.log>.date {
-			margin: 0 10px 0 0;
-			padding: 5px 10px;
-			border-radius: 20px;
-		}
-			.log.error>.date {
-				background: #e74c3c;
-				color: #fff;
-			}
-			.log.warning>.date {
-				background: #f39c12;
-			}
-			.log.notice>.date {
-				background: #ecf0f1;
-			}
-			.log.debug>.date {
-				background: #111;
-				color: #eee;
-			}
-
-.form-group table {
-	border-collapse:collapse;
-	margin:10px 0 0 220px;
-	text-align:center;
-}
-
-.form-group tr, .form-group th, .form-group td {
-	font-weight:normal;
-	padding:.5em;
-}
-
-select.number option {
-	text-align:right;
-}
-
-@media(max-width: 840px) {
-	.header,
-	.aside .btn-important,
-	.aside .feeds .dropdown,
-	.flux_header .item.website span,
-	.item.date {
-		display: none;
-	}
-	.flux_header .item.website {
-		width: 40px;
-		text-align: center;
-	}
-		.flux_header .item.website .favicon {
-			padding: 12px;
-		}
-
-	.nav-login {
-		display: block;
-	}
-
-	.content {
-		font-size: 120%;
-		padding: 0;
-	}
-
-	.pagination {
-		margin: 0 0 40px;
-	}
-	.pagination .pager-previous, .pagination .pager-next {
-		width: 100px;
-	}
-
-	.toggle_aside, .btn.toggle_aside {
-		display: inline-block;
-	}
-	.aside {
-		position: fixed;
-		top: 0; left: 0;
-		width: 0;
-		overflow: hidden;
-		z-index: 10;
-		transition: width 200ms linear;
-		background: #ecf0f1;
-	}
-		.aside.aside_flux {
-			padding: 10px 0 0;
-		}
-		.aside:target {
-			width: 80%;
-			border-right: 1px solid #aaa;
-			overflow: auto;
-		}
-		.aside .toggle_aside {
-			position: absolute;
-			right: 10px;
-			display: inline-block;
-			width: 26px;
-			height: 26px;
-			margin: 0 10px 0 0;
-			border-radius: 3px;
-			text-align: center;
-			line-height: 24px;
-			background: #95a5a6;
-		}
-			.aside .toggle_aside:hover {
-				background: #7f8c8d;
-			}
-		.aside .categories {
-			margin: 30px 0;
-		}
-
-	#nav_entries {
-		width: 100%;
-	}
-
-	.nav_menu .btn {
-		margin: 5px 10px;
-	}
-	.nav_menu .stick {
-		margin: 0 10px;
-	}
-	.nav_menu .stick .btn {
-		margin: 5px 0;
-	}
-	.nav_menu .search {
-			display: inline-block;
-			max-width: 97%;
-		}
-		.nav_menu .search input {
-			max-width: 97%;
-			width: 90px;
-		}
-		.nav_menu .search input:focus {
-			width: 400px;
-		}
-
-	#panel {
-		left: 5px; right: 5px;
-	}
-
-	.day .date {
-		display: none;
-	}
-	.day .name {
-		height: 2.6em;
-		font-size: 1em;
-		text-shadow: none;
-	}
-
-	.notification,
-	.actualizeProgress {
-		left: 10px;
-		right: 10px;
-	}
-}
-
-/*** FALLBACK ***/
-.dropdown-menu:after {
-	-moz-transform: rotate(45deg);
-	-webkit-transform: rotate(45deg);
-	-ms-transform: rotate(45deg);
-}
-
-@media print {
-	.header,
-	.aside,
-	.nav_menu,
-	.day,
-	.flux_header,
-	.flux_content .bottom,
-	.pagination {
-		display: none;
-	}
-
-	html, body {
-		background: #fff;
-		color: #000;
-		font-family: Serif;
-		font-size: 12pt;
-	}
-
-	#global,
-	.flux_content {
-		display: block !important;
-	}
-
-	.flux_content .content {
-		width: 100% !important;
-		text-align: justify;
-	}
-
-	.flux_content .content a {
-		color: #000;
-	}
-	.flux_content .content a:after {
-		content: " (" attr(href) ") ";
-		text-decoration: underline;
-	}
-}
diff --git a/p/themes/flat-design/global.css b/p/themes/flat-design/global.css
deleted file mode 100644
index 5fd0a4dcf..000000000
--- a/p/themes/flat-design/global.css
+++ /dev/null
@@ -1,495 +0,0 @@
-@charset "UTF-8";
-
-/* FONTS */
-@font-face {
-	font-family: "OpenSans";
-	src: url("../fonts/openSans.woff") format("woff");
-}
-
-
-* {
-	margin: 0;
-	padding: 0;
-}
-html, body {
-	height: 100%;
-	font-size: 95%;
-	font-family: "OpenSans", "Cantarell", "Helvetica", "Arial", sans-serif;
-}
-
-/* LIENS */
-a {
-	color: #2980b9;
-	text-decoration: none;
-}
-	a:hover {
-		text-decoration: underline;
-	}
-
-/* LISTES */
-ul, ol, dl {
-	margin: 10px 0 10px 30px;
-	line-height: 190%;
-}
-	dd {
-		margin: 0 0 10px 30px;
-	}
-
-/* TITRES */
-h1, h2, h3 {
-	min-height: 40px;
-	margin: 15px 0 5px;
-	line-height: 40px;
-}
-
-/* IMG */
-figure {
-	margin: 5px 0 10px;
-	text-align: center;
-}
-	figcaption {
-		display: inline-block;
-		padding: 3px 20px;
-		color: #999;
-		font-style: italic;
-		border-bottom: 1px solid #ccc;
-	}
-img {
-	height: auto;
-	max-width: 100%;
-	vertical-align: middle;
-}
-	a img {
-		border: none;
-	}
-
-/* VIDEOS */
-iframe, embed, object, video {
-	max-width: 100%;
-}
-
-/* FORMULAIRES */
-legend {
-	display: inline-block;
-	margin: 20px 0 5px;
-	padding: 5px 20px;
-	font-size: 150%;
-	clear: both;
-	background: #ecf0f1;
-	border-radius: 20px;
-}
-label {
-	display: block;
-	min-height: 25px;
-	padding: 5px 0;
-	font-size: 12px;
-	line-height: 25px;
-	cursor: pointer;
-	font-weight: bold;
-	color: #444;
-}
-input, select, textarea {
-	display: inline-block;
-	max-width: 100%;
-	min-height: 25px;
-	padding: 5px;
-	background: #FFF;
-	border: none;
-	border-bottom: 3px solid #ddd;
-	color: #666;
-	line-height: 25px;
-	vertical-align: middle;
-	border-radius: 5px;
-}
-	option {
-		padding:0 .5em 0 .5em;
-	}
-	input[type="radio"],
-	input[type="checkbox"] {
-		width: 15px !important;
-		min-height: 15px !important;
-	}
-	input:focus, select:focus, textarea:focus {
-		color: #333;
-		border-color: #2980b9;
-	}
-	input:invalid, select:invalid {
-		border-color: red;
-		box-shadow: 0 0 2px 1px red;
-	}
-
-.form-group {
-	margin: 5px 0;
-	border: 1px solid transparent;
-}
-	.form-group:after {
-		content: "";
-		display: block;
-		clear: both;
-	}
-	.form-group:hover {
-		background: #fff;
-		border: 1px solid #eee;
-		border-radius: 3px;
-	}
-	.form-group.form-actions {
-		min-width: 250px;
-		margin: 20px 0;
-		padding: 5px 0;
-		background: #ecf0f1;
-		border-top: 3px solid #bdc3c7;
-		border-radius: 5px 5px 0 0;
-	}
-		.form-group.form-actions .btn {
-			margin: 0 10px;
-		}
-	.form-group .group-name {
-		display: block;
-		float: left;
-		width: 200px;
-		padding: 10px 0;
-		text-align: right;
-	}
-	.form-group .group-controls {
-		min-width: 250px;
-		min-height: 25px;
-		margin: 0 0 0 220px;
-		padding: 5px 0;
-	}
-		.form-group .group-controls label {
-			font-weight: normal;
-			font-size: 14px;
-			color: #000;
-		}
-		.form-group .group-controls .control {
-			display: block;
-			min-height: 30px;
-			padding: 5px 0;
-			line-height: 25px;
-			font-size: 14px;
-		}
-
-.stick {
-	display: inline-block;
-	white-space: nowrap;
-	font-size: 0px;
-	vertical-align: middle;
-}
-	.stick .btn,
-	.stick input {
-		font-size: 14px;
-		border-radius: 0;
-	}
-	.stick .btn:first-child,
-	.stick input:first-child {
-		border-radius: 5px 0 0 5px;
-	}
-	.stick .btn:last-child,
-	.stick input:last-child,
-	.stick .btn + .dropdown > .btn {
-		border-radius: 0 5px 5px 0;
-	}
-	.stick .btn + .dropdown a {
-		font-size: 12px;
-	}
-
-.btn {
-	display: inline-block;
-	min-height: 38px;
-	min-width: 18px;
-	padding: 5px 10px;
-	background: #3498db;
-	border-radius: 5px;
-	border: none;
-	border-bottom: 3px solid #2980b9;
-	color: #fff;
-	line-height: 20px;
-	vertical-align: middle;
-	cursor: pointer;
-	overflow: hidden;
-}
-	a.btn {
-		min-height: 25px;
-		line-height: 25px;
-	}
-	.btn.active,
-	.btn:active,
-	.btn:hover,
-	.dropdown-target:target ~ .btn.dropdown-toggle {
-		background: #2980b9;
-		text-decoration: none;
-	}
-
-	.btn-important {
-		background: #e67e22;
-		color: #fff;
-		border-bottom: 3px solid #d35400;
-	}
-		.btn-important:active,
-		.btn-important:hover {
-			background: #d35400;
-		}
-
-	.btn-attention {
-		background: #e74c3c;
-		color: #fff;
-		border-bottom: 3px solid #c0392b;
-	}
-		.btn-attention:hover,
-		.btn-attention:active {
-			background: #c0392b;
-		}
-
-/* NAVIGATION */
-.nav-list {
-	border-right: 1px solid #ecf0f1;
-}
-.nav-list .nav-header,
-.nav-list .item {
-	display: block;
-	height: 35px;
-	line-height: 35px;
-	margin: 5px 0;
-}
-	.nav-list .item:hover,
-	.nav-list .item.active {
-		background: #2980b9;
-		color: #fff;
-	}
-		.nav-list .item:hover a,
-		.nav-list .item.active a {
-			color: #fff;
-		}
-	.nav-list .disable {
-		color: #aaa;
-		background: #fafafa;
-		text-align: center;
-	}
-	.nav-list .item > * {
-		display: block;
-		padding: 0 10px;
-		overflow: hidden;
-		white-space: nowrap;
-		text-overflow: ellipsis;
-	}
-		.nav-list a:hover {
-			text-decoration: none;
-		}
-	.nav-list .item.error a {
-		color: #BD362F;
-	}
-		.nav-list .item:hover.error a,
-		.nav-list .item.active.error a {
-			color: #fff;
-			background: #BD362F;
-		}
-	.nav-list .item.empty a {
-		color: #f39c12;
-	}
-		.nav-list .item:hover.empty a,
-		.nav-list .item.active.empty a {
-			color: #fff;
-			background: #f39c12;
-		}
-
-	.nav-list .nav-header {
-		padding: 0 10px;
-		margin: 0;
-		color: #fff;
-		background: #34495e;
-		font-weight: bold;
-	}
-	.nav-list .separator {
-		display: block;
-		height: 0;
-		margin: 5px 0;
-		border-bottom: 1px solid #ddd;
-	}
-
-	.nav-list .nav-form {
-		padding: 3px;
-		text-align: center;
-	}
-
-.nav-head {
-	display: block;
-	margin: 0;
-	background: #34495e;
-	color: #fff;
-	text-align: right;
-}
-	.nav-head a {
-		color: #fff;
-	}
-	.nav-head .item {
-		display: inline-block;
-		padding: 5px 10px;
-	}
-
-/* HORIZONTAL-LIST */
-.horizontal-list {
-	display: table;
-	table-layout: fixed;
-	margin: 0;
-	padding: 0;
-	width: 100%;
-}
-	.horizontal-list .item {
-		display: table-cell;
-		vertical-align: middle;
-	}
-
-/* DROPDOWN */
-.dropdown {
-	position: relative;
-	display: inline-block;
-}
-	.dropdown-target {
-		display: none;
-	}
-
-	.dropdown-menu {
-		display: none;
-		min-width: 200px;
-		margin: 5px 0 0;
-		padding: 5px 0;
-		position: absolute;
-		right: 0px;
-		background: #fff;
-		border: 1px solid #95a5a6;
-		border-radius: 3px;
-		text-align: left;
-	}
-	.dropdown-menu:after {
-		content: "";
-		position: absolute;
-		top: -6px;
-		right: 13px;
-		width: 10px;
-		height: 10px;
-		background: #fff;
-		border-top: 1px solid #95a5a6;
-		border-left: 1px solid #95a5a6;
-		z-index: -10;
-		transform: rotate(45deg);
-	}
-		.dropdown-header {
-			display: block;
-			padding: 0 5px;
-			color: #34495e;
-			font-weight: bold;
-			font-size: 14px;
-			line-height: 30px;
-		}
-		.dropdown-menu > .item {
-			display: block;
-			height: 30px;
-			font-size: 90%;
-			line-height: 30px;
-		}
-			.dropdown-menu > .item > a {
-				display: block;
-				padding: 0 25px;
-				line-height: 30px;
-			}
-			.dropdown-menu > .item:hover > a {
-				background: #2980b9;
-				color: #fff;
-			}
-				.dropdown-menu > .item[aria-checked="true"] > a:before {
-					content: '✓ ';
-					font-weight: bold;
-					margin: 0 0 0 -1.2em;
-					padding: 0 0.2em 0 0;
-				}
-				.dropdown-menu > .item:hover > a {
-					color: #fff;
-					text-decoration: none;
-				}
-		.dropdown-menu .input {
-			display: block;
-			height: 40px;
-			font-size: 90%;
-			line-height: 30px;
-		}
-			.dropdown-menu label {
-				font-weight: normal;
-			}
-			.dropdown-menu .input select,
-			.dropdown-menu .input input {
-				display: block;
-				height: 20px;
-				width: 95%;
-				margin: auto;
-				padding: 2px 5px;
-				border-radius: 3px;
-			}
-			.dropdown-menu .input select {
-				width: 70%;
-				height: auto;
-			}
-		.dropdown-menu .separator {
-			display: block;
-			height: 0;
-			margin: 5px 0;
-			border-bottom: 1px solid #95a5a6;
-		}
-		.dropdown-target:target ~ .dropdown-menu {
-			display: block;
-			z-index: 10;
-		}
-	.dropdown-close {
-		display: inline;
-	}
-		.dropdown-close a {
-			font-size: 0;
-			position: fixed;
-			top: 0; bottom: 0;
-			left: 0; right: 0;
-			display: block;
-			z-index: -10;
-		}
-
-/* ALERTS */
-.alert {
-	display: block;
-	width: 90%;
-	margin: 15px auto;
-	padding: 10px 15px;
-	background: #f4f4f4;
-	border: 1px solid #ccc;
-	border-right: 1px solid #aaa;
-	border-bottom: 1px solid #aaa;
-	border-radius: 5px;
-	color: #aaa;
-	text-shadow: 0 0 1px #eee;
-}
-	.alert-head {
-		margin: 0;
-		font-weight: bold;
-		font-size: 110%;
-	}
-	.alert-warn {
-		background: #ffe;
-		border: 1px solid #eeb;
-		color: #c95;
-	}
-	.alert-success {
-		background: #dfd;
-		border: 1px solid #cec;
-		color: #484;
-	}
-	.alert-error {
-		background: #fdd;
-		border: 1px solid #ecc;
-		color: #844;
-	}
-
-/* ICÔNES */
-.icon {
-	display: inline-block;
-	width: 16px;
-	height: 16px;
-	vertical-align: middle;
-	line-height: 16px;
-}
diff --git a/p/themes/flat-design/icons/add.svg b/p/themes/flat-design/icons/add.svg
deleted file mode 100644
index 15767a3ad..000000000
--- a/p/themes/flat-design/icons/add.svg
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg xmlns:cc='http://creativecommons.org/ns#' xmlns:svg='http://www.w3.org/2000/svg' xmlns:inkscape='http://www.inkscape.org/namespaces/inkscape' id='svg7384' xmlns:sodipodi='http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd' version='1.1' inkscape:version='0.47 r22583' height='16' sodipodi:docname='list-add-symbolic.svg' xmlns:dc='http://purl.org/dc/elements/1.1/' xmlns:rdf='http://www.w3.org/1999/02/22-rdf-syntax-ns#' xmlns='http://www.w3.org/2000/svg' width='16'>
-  <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:object-paths='true' inkscape:cy='17.83946' inkscape:current-layer='layer12' inkscape:window-width='1920' pagecolor='#555753' showborder='false' showguides='true' inkscape:snap-nodes='false' objecttolerance='10' showgrid='true' inkscape:object-nodes='true' inkscape:pageshadow='2' inkscape:guide-bbox='true' inkscape:window-x='0' inkscape:snap-bbox='true' bordercolor='#FFFFFF' id='namedview88' inkscape:window-maximized='1' inkscape:snap-global='true' inkscape:window-y='26' gridtolerance='10' inkscape:zoom='1' inkscape:window-height='1021' borderopacity='1' guidetolerance='10' inkscape:snap-bbox-midpoints='false' inkscape:cx='-2.56708' inkscape:bbox-paths='false' inkscape:snap-grids='true' inkscape:pageopacity='1' inkscape:snap-to-guides='true'>
-    <inkscape:grid visible='true' spacingx='1px' type='xygrid' spacingy='1px' id='grid4866' empspacing='2' enabled='true' snapvisiblegridlinesonly='true'/>
-  </sodipodi:namedview>
-  <title id='title9167'>Gnome Symbolic Icon Theme</title>
-  <defs id='defs7386'/>
-  <g transform='translate(-60.0002,-726)' inkscape:groupmode='layer' id='layer9' inkscape:label='status' style='display:inline'/>
-  <g transform='translate(-60.0002,-726)' inkscape:groupmode='layer' id='layer10' inkscape:label='devices'/>
-  <g transform='translate(-60.0002,-726)' inkscape:groupmode='layer' id='layer11' inkscape:label='apps'/>
-  <g transform='translate(-60.0002,-726)' inkscape:groupmode='layer' id='layer12' inkscape:label='actions'>
-    
-    <path d='m 67.0002,729 0,4 -4,0 0,2 4,0 0,4 2,0 0,-4 4,0 0,-2 -4,0 0,-4 -2,0 z' id='rect31992' style='color:#FFFFFF;fill:#FFFFFF;fill-opacity:1;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible'/>
-  </g>
-  <g transform='translate(-60.0002,-726)' inkscape:groupmode='layer' id='layer13' inkscape:label='places'/>
-  <g transform='translate(-60.0002,-726)' inkscape:groupmode='layer' id='layer14' inkscape:label='mimetypes'/>
-  <g transform='translate(-60.0002,-726)' inkscape:groupmode='layer' id='layer15' inkscape:label='emblems' style='display:inline'/>
-  <g transform='translate(-60.0002,-726)' inkscape:groupmode='layer' id='g4953' inkscape:label='categories' style='display:inline'/>
-</svg>
diff --git a/p/themes/flat-design/icons/all.svg b/p/themes/flat-design/icons/all.svg
deleted file mode 100644
index d20e0f5bf..000000000
--- a/p/themes/flat-design/icons/all.svg
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg xmlns:cc='http://creativecommons.org/ns#' xmlns:inkscape='http://www.inkscape.org/namespaces/inkscape' xmlns:svg='http://www.w3.org/2000/svg' id='svg7384' xmlns:sodipodi='http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd' sodipodi:docname='view-list-symbolic.svg' version='1.1' inkscape:version='0.48.1 r9760' height='16' xmlns:dc='http://purl.org/dc/elements/1.1/' xmlns:rdf='http://www.w3.org/1999/02/22-rdf-syntax-ns#' xmlns='http://www.w3.org/2000/svg' width='16'>
-  <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:cy='71.95215' pagecolor='#555753' borderopacity='1' showborder='false' inkscape:bbox-paths='false' guidetolerance='10' inkscape:object-paths='true' inkscape:window-width='1198' showguides='true' inkscape:object-nodes='true' inkscape:snap-bbox='true' inkscape:pageshadow='2' inkscape:guide-bbox='true' inkscape:snap-nodes='false' bordercolor='#666666' objecttolerance='10' id='namedview88' showgrid='false' inkscape:window-maximized='0' inkscape:window-x='1582' inkscape:snap-global='true' inkscape:window-y='85' gridtolerance='10' inkscape:window-height='1079' inkscape:snap-to-guides='true' inkscape:current-layer='layer12' inkscape:snap-bbox-midpoints='false' inkscape:zoom='1' inkscape:cx='244.57499' inkscape:snap-grids='true' inkscape:pageopacity='1'>
-    <inkscape:grid spacingx='1px' spacingy='1px' id='grid4866' empspacing='2' enabled='true' type='xygrid' snapvisiblegridlinesonly='true' visible='true'/>
-  </sodipodi:namedview>
-  <title id='title9167'>Gnome Symbolic Icon Theme</title>
-  <defs id='defs7386'/>
-  <g inkscape:label='status' transform='translate(-40.0002,-746)' inkscape:groupmode='layer' id='layer9' style='display:inline'/>
-  <g inkscape:label='devices' transform='translate(-40.0002,-746)' inkscape:groupmode='layer' id='layer10'/>
-  <g inkscape:label='apps' transform='translate(-40.0002,-746)' inkscape:groupmode='layer' id='layer11'/>
-  <g inkscape:label='actions' transform='translate(-40.0002,-746)' inkscape:groupmode='layer' id='layer12'>
-    
-    <rect inkscape:label='a' x='43.000397' y='748.99976' id='rect7356' height='2.0002136' width='9.9996014' style='color:#FFFFFF;fill:#FFFFFF;fill-opacity:1;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible'/>
-    <rect inkscape:label='a' x='43.000397' y='752.99976' id='rect7358' height='2.0002136' width='9.9996014' style='color:#FFFFFF;fill:#FFFFFF;fill-opacity:1;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible'/>
-    <rect inkscape:label='a' x='43.000397' y='756.99976' id='rect7360' height='2.0002136' width='9.9996014' style='color:#FFFFFF;fill:#FFFFFF;fill-opacity:1;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible'/>
-  </g>
-  <g inkscape:label='places' transform='translate(-40.0002,-746)' inkscape:groupmode='layer' id='layer13'/>
-  <g inkscape:label='mimetypes' transform='translate(-40.0002,-746)' inkscape:groupmode='layer' id='layer14'/>
-  <g inkscape:label='emblems' transform='translate(-40.0002,-746)' inkscape:groupmode='layer' id='layer15' style='display:inline'/>
-  <g inkscape:label='categories' transform='translate(-40.0002,-746)' inkscape:groupmode='layer' id='g4953' style='display:inline'/>
-</svg>
diff --git a/p/themes/flat-design/icons/close.svg b/p/themes/flat-design/icons/close.svg
deleted file mode 100644
index 629fda7ff..000000000
--- a/p/themes/flat-design/icons/close.svg
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg xmlns:cc='http://creativecommons.org/ns#' xmlns:inkscape='http://www.inkscape.org/namespaces/inkscape' xmlns:svg='http://www.w3.org/2000/svg' id='svg7384' version='1.1' height='16' xmlns:dc='http://purl.org/dc/elements/1.1/' xmlns:rdf='http://www.w3.org/1999/02/22-rdf-syntax-ns#' xmlns='http://www.w3.org/2000/svg' width='16'>
-  <title id='title9167'>Gnome Symbolic Icon Theme</title>
-  <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>
-  <defs id='defs7386'/>
-  <g transform='translate(-60,-518)' id='layer9' style='display:inline'/>
-  <g transform='translate(-60,-518)' id='layer10'/>
-  <g transform='translate(-60,-518)' id='layer11'/>
-  <g transform='translate(-60,-518)' id='layer12'>
-    <g transform='translate(19,-242)' id='layer4-4-1' style='display:inline'>
-      
-      <path inkscape:connector-curvature='0' d='m 45,764 1,0 c 0.01037,-1.2e-4 0.02079,-4.6e-4 0.03125,0 0.254951,0.0112 0.50987,0.12858 0.6875,0.3125 L 49,766.59375 51.3125,764.3125 C 51.578125,764.082 51.759172,764.007 52,764 l 1,0 0,1 c 0,0.28647 -0.03434,0.55065 -0.25,0.75 l -2.28125,2.28125 2.25,2.25 C 52.906938,770.46942 52.999992,770.7347 53,771 l 0,1 -1,0 c -0.265301,-10e-6 -0.530586,-0.0931 -0.71875,-0.28125 L 49,769.4375 46.71875,771.71875 C 46.530586,771.90694 46.26529,772 46,772 l -1,0 0,-1 c -3e-6,-0.26529 0.09306,-0.53058 0.28125,-0.71875 l 2.28125,-2.25 L 45.28125,765.75 C 45.070508,765.55537 44.97809,765.28075 45,765 l 0,-1 z' id='path10839-9' 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:#FFFFFF;fill:#FFFFFF;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>
-  </g>
-  <g transform='translate(-60,-518)' id='layer13'/>
-  <g transform='translate(-60,-518)' id='layer14'/>
-  <g transform='translate(-60,-518)' id='layer15'/>
-</svg>
diff --git a/p/themes/flat-design/icons/configure.svg b/p/themes/flat-design/icons/configure.svg
deleted file mode 100644
index 969c5719f..000000000
--- a/p/themes/flat-design/icons/configure.svg
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg xmlns:dc='http://purl.org/dc/elements/1.1/' xmlns='http://www.w3.org/2000/svg' id='svg7384' xmlns:inkscape='http://www.inkscape.org/namespaces/inkscape' xmlns:cc='http://creativecommons.org/ns#' xmlns:svg='http://www.w3.org/2000/svg' width='16' sodipodi:docname='emblem-system-symbolic.svg' height='16' xmlns:sodipodi='http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd' xmlns:rdf='http://www.w3.org/1999/02/22-rdf-syntax-ns#' version='1.1' inkscape:version='0.48.1 r9760'>
-  <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:window-height='967' inkscape:snap-bbox-midpoints='false' inkscape:snap-grids='true' inkscape:object-paths='false' pagecolor='#555753' inkscape:zoom='1' inkscape:current-layer='layer15' borderopacity='1' inkscape:snap-others='false' inkscape:window-x='2259' inkscape:window-y='356' inkscape:snap-to-guides='true' gridtolerance='10' id='namedview88' inkscape:snap-global='true' inkscape:cx='9.30971' inkscape:cy='-0.23089111' bordercolor='#666666' inkscape:window-width='1226' inkscape:snap-bbox='true' guidetolerance='10' showguides='true' showborder='false' inkscape:guide-bbox='true' inkscape:object-nodes='false' inkscape:pageopacity='1' inkscape:window-maximized='0' objecttolerance='10' showgrid='false' inkscape:snap-nodes='true' inkscape:bbox-paths='false' inkscape:pageshadow='2'>
-    <inkscape:grid visible='true' spacingx='1px' spacingy='1px' id='grid4866' type='xygrid' empspacing='2' enabled='true' snapvisiblegridlinesonly='true'/>
-  </sodipodi:namedview>
-  <title id='title9167'>Gnome Symbolic Icon Theme</title>
-  <defs id='defs7386'/>
-  <g inkscape:label='status' id='layer9' style='display:inline' transform='translate(-441.0002,-400.99999)' inkscape:groupmode='layer'/>
-  <g inkscape:label='devices' id='layer10' transform='translate(-441.0002,-400.99999)' inkscape:groupmode='layer'/>
-  <g inkscape:label='apps' id='layer11' transform='translate(-441.0002,-400.99999)' inkscape:groupmode='layer'/>
-  <g inkscape:label='places' id='layer13' transform='translate(-441.0002,-400.99999)' inkscape:groupmode='layer'/>
-  <g inkscape:label='mimetypes' id='layer14' transform='translate(-441.0002,-400.99999)' inkscape:groupmode='layer'/>
-  <g inkscape:label='emblems' id='layer15' style='display:inline' transform='translate(-441.0002,-400.99999)' inkscape:groupmode='layer'>
-    
-    <path id='path35543-6-4' d='m 449.0004,402.00002 c -0.22065,0 -0.44081,0.0113 -0.65625,0.0312 l -0.40625,2.09375 c -0.33446,0.0733 -0.66305,0.17589 -0.96875,0.3125 l -1.53125,-1.46875 c -0.38863,0.23011 -0.72695,0.51408 -1.0625,0.8125 l 0.90625,1.90625 c -0.22242,0.24899 -0.42425,0.5225 -0.59375,0.8125 l -2.09375,-0.28125 c -0.17772,0.40877 -0.30872,0.83637 -0.40625,1.28125 l 1.84375,1 c -0.0171,0.16809 -0.0312,0.3274 -0.0312,0.5 0,0.1726 0.0142,0.33191 0.0312,0.5 l -1.84375,1 c 0.0975,0.44488 0.22853,0.87248 0.40625,1.28125 l 2.09375,-0.28125 c 0.1695,0.29 0.37133,0.56351 0.59375,0.8125 l -0.90625,1.90625 c 0.33555,0.29842 0.67387,0.58239 1.0625,0.8125 l 1.53125,-1.46875 c 0.3057,0.13661 0.63429,0.23916 0.96875,0.3125 l 0.40625,2.09375 c 0.21544,0.02 0.4356,0.0312 0.65625,0.0312 0.22065,0 0.44081,-0.0113 0.65625,-0.0312 l 0.40625,-2.09375 c 0.33446,-0.0733 0.66305,-0.17589 0.96875,-0.3125 l 1.53125,1.46875 c 0.38863,-0.23011 0.72695,-0.51408 1.0625,-0.8125 l -0.90625,-1.90625 c 0.22242,-0.24899 0.42425,-0.5225 0.59375,-0.8125 l 2.09375,0.28125 c 0.17772,-0.40877 0.30872,-0.83637 0.40625,-1.28125 l -1.84375,-1 c 0.0171,-0.16809 0.0312,-0.3274 0.0312,-0.5 0,-0.1726 -0.0142,-0.33191 -0.0312,-0.5 l 1.84375,-1 c -0.0975,-0.44488 -0.22853,-0.87248 -0.40625,-1.28125 l -2.09375,0.28125 c -0.1695,-0.29 -0.37133,-0.56351 -0.59375,-0.8125 l 0.90625,-1.90625 c -0.33555,-0.29842 -0.67387,-0.58239 -1.0625,-0.8125 l -1.53125,1.46875 c -0.3057,-0.13661 -0.63429,-0.23916 -0.96875,-0.3125 l -0.40625,-2.09375 c -0.21544,-0.02 -0.4356,-0.0312 -0.65625,-0.0312 z m 0,4 c 1.65685,0 3,1.34315 3,3 0,1.65685 -1.34315,3 -3,3 -1.65685,0 -3,-1.34315 -3,-3 0,-1.65685 1.34315,-3 3,-3 z' style='color:#FFFFFF;fill:#FFFFFF;fill-opacity:1;fill-rule:nonzero;stroke:none;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate' inkscape:connector-curvature='0' sodipodi:nodetypes='sccccccccccsccccccccccsccccccccccsccccccccccssssss'/>
-  </g>
-  <g inkscape:label='emotes' id='g71291' style='display:inline' transform='translate(-441.0002,-400.99999)' inkscape:groupmode='layer'/>
-  <g inkscape:label='categories' id='g4953' style='display:inline' transform='translate(-441.0002,-400.99999)' inkscape:groupmode='layer'/>
-  <g inkscape:label='actions' id='layer12' style='display:inline' transform='translate(-441.0002,-400.99999)' inkscape:groupmode='layer'/>
-</svg>
diff --git a/p/themes/flat-design/icons/down.svg b/p/themes/flat-design/icons/down.svg
deleted file mode 100644
index 31730626f..000000000
--- a/p/themes/flat-design/icons/down.svg
+++ /dev/null
@@ -1,31 +0,0 @@
-<?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-down-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='18.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='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(-181.0002,-747)'/>
-  <g inkscape:groupmode='layer' id='layer10' inkscape:label='devices' transform='translate(-181.0002,-747)'/>
-  <g inkscape:groupmode='layer' id='layer11' inkscape:label='apps' transform='translate(-181.0002,-747)'/>
-  <g inkscape:groupmode='layer' id='layer13' inkscape:label='places' transform='translate(-181.0002,-747)'/>
-  <g inkscape:groupmode='layer' id='layer14' inkscape:label='mimetypes' transform='translate(-181.0002,-747)'/>
-  <g inkscape:groupmode='layer' id='layer15' inkscape:label='emblems' style='display:inline' transform='translate(-181.0002,-747)'/>
-  <g inkscape:groupmode='layer' id='g71291' inkscape:label='emotes' style='display:inline' transform='translate(-181.0002,-747)'/>
-  <g inkscape:groupmode='layer' id='g4953' inkscape:label='categories' style='display:inline' transform='translate(-181.0002,-747)'/>
-  <g inkscape:groupmode='layer' id='layer12' inkscape:label='actions' style='display:inline' transform='translate(-181.0002,-747)'>
-    
-    <path inkscape:connector-curvature='0' d='m 195.03152,751.00323 0,1.00001 c -9.1e-4,0.0111 5.9e-4,0.021 -9e-5,0.0312 -0.0112,0.25496 -0.12835,0.50994 -0.31251,0.6875 l -5.71875,6.29767 -5.71875,-6.29773 c -0.18821,-0.1881 -0.28121,-0.45346 -0.28122,-0.71875 l 0,-1.00001 1,0 c 0.26531,7e-5 0.53059,0.0931 0.71873,0.28131 l 4.28125,4.82896 4.28127,-4.82896 c 0.19464,-0.21073 0.46925,-0.30315 0.74998,-0.2813 z' id='path10839-9-9-5-9-1' 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:#FFFFFF;fill:#FFFFFF;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/p/themes/flat-design/icons/next.svg b/p/themes/flat-design/icons/next.svg
deleted file mode 100644
index d75cc40f5..000000000
--- a/p/themes/flat-design/icons/next.svg
+++ /dev/null
@@ -1,31 +0,0 @@
-<?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:#FFFFFF;fill:#FFFFFF;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/p/themes/flat-design/icons/prev.svg b/p/themes/flat-design/icons/prev.svg
deleted file mode 100644
index 9ba03ceb2..000000000
--- a/p/themes/flat-design/icons/prev.svg
+++ /dev/null
@@ -1,31 +0,0 @@
-<?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:#FFFFFF;fill:#FFFFFF;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/p/themes/flat-design/icons/refresh.svg b/p/themes/flat-design/icons/refresh.svg
deleted file mode 100644
index 8f95bf443..000000000
--- a/p/themes/flat-design/icons/refresh.svg
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg xmlns:inkscape='http://www.inkscape.org/namespaces/inkscape' xmlns:svg='http://www.w3.org/2000/svg' xmlns:cc='http://creativecommons.org/ns#' id='svg7384' sodipodi:docname='view-refresh-symbolic.svg' xmlns:sodipodi='http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd' xmlns='http://www.w3.org/2000/svg' xmlns:rdf='http://www.w3.org/1999/02/22-rdf-syntax-ns#' inkscape:version='0.48.1 r9760' version='1.1' width='16' height='16' xmlns:dc='http://purl.org/dc/elements/1.1/'>
-  <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:zoom='1' inkscape:bbox-paths='false' inkscape:pageopacity='1' guidetolerance='10' inkscape:snap-bbox='true' inkscape:window-height='1162' objecttolerance='10' id='namedview88' showborder='false' inkscape:window-x='2191' inkscape:window-y='111' inkscape:cx='9.3351214' inkscape:cy='10.6119' gridtolerance='10' inkscape:snap-bbox-midpoints='false' showguides='true' inkscape:pageshadow='2' pagecolor='#555753' bordercolor='#666666' inkscape:snap-global='true' inkscape:window-maximized='0' inkscape:object-nodes='false' inkscape:snap-nodes='false' inkscape:guide-bbox='true' inkscape:window-width='1595' inkscape:snap-others='false' borderopacity='1' showgrid='false' inkscape:snap-to-guides='true' inkscape:object-paths='false' inkscape:snap-grids='true' inkscape:current-layer='layer12'>
-    <inkscape:grid enabled='true' spacingx='1px' spacingy='1px' id='grid4866' visible='true' snapvisiblegridlinesonly='true' empspacing='2' type='xygrid'/>
-  </sodipodi:namedview>
-  <title id='title9167'>Gnome Symbolic Icon Theme</title>
-  <defs id='defs7386'/>
-  <g id='layer9' transform='translate(-241.0002,-627)' inkscape:label='status' style='display:inline' inkscape:groupmode='layer'/>
-  <g id='layer10' transform='translate(-241.0002,-627)' inkscape:label='devices' inkscape:groupmode='layer'/>
-  <g id='layer11' transform='translate(-241.0002,-627)' inkscape:label='apps' inkscape:groupmode='layer'/>
-  <g id='layer13' transform='translate(-241.0002,-627)' inkscape:label='places' inkscape:groupmode='layer'/>
-  <g id='layer14' transform='translate(-241.0002,-627)' inkscape:label='mimetypes' inkscape:groupmode='layer'/>
-  <g id='layer15' transform='translate(-241.0002,-627)' inkscape:label='emblems' style='display:inline' inkscape:groupmode='layer'/>
-  <g id='g71291' transform='translate(-241.0002,-627)' inkscape:label='emotes' style='display:inline' inkscape:groupmode='layer'/>
-  <g id='g4953' transform='translate(-241.0002,-627)' inkscape:label='categories' style='display:inline' inkscape:groupmode='layer'/>
-  <g id='layer12' transform='translate(-241.0002,-627)' inkscape:label='actions' style='display:inline' inkscape:groupmode='layer'>
-    
-    <path id='path4597' d='m 253.90645,628.96875 a 1.0001,1.0001 0 0 0 -0.125,0.0312 1.0001,1.0001 0 0 0 -0.78125,1 l 0,1.6875 c -0.38225,-0.57796 -0.84927,-1.08223 -1.40625,-1.5 -1.15563,-0.86677 -2.53199,-1.25227 -3.875,-1.1875 -0.19186,0.009 -0.37223,0.0353 -0.5625,0.0625 -1.52218,0.21741 -2.97815,1.02304 -3.96875,2.34375 -1.98119,2.64144 -1.42267,6.42505 1.21875,8.40625 2.64147,1.98122 6.42504,1.42267 8.40625,-1.21875 A 1.0063276,1.0063276 0 0 0 253.0002,638 a 1.0063276,1.0063276 0 0 0 0,-0.15625 l 0,-0.84375 -0.8125,0 -0.0937,0 a 1.0063276,1.0063276 0 0 0 -0.0937,0 1.0063276,1.0063276 0 0 0 -0.8125,0.40625 c -1.33265,1.77674 -3.81702,2.11387 -5.59375,0.78125 -1.77674,-1.33264 -2.1139,-3.81699 -0.78125,-5.59375 1.33265,-1.77674 3.817,-2.11389 5.59375,-0.78125 0.42946,0.32212 0.76954,0.73295 1.03125,1.1875 l -1.4375,0 a 1.0001,1.0001 0 0 0 -1,1 1.0001,1.0001 0 0 0 0,0.21875 l 0,0.78125 0.84375,0 0.15625,0 4,0 1,0 0,-1 0,-4 a 1.0001,1.0001 0 0 0 0,-0.1875 l 0,-0.8125 -0.8125,0 a 1.0001,1.0001 0 0 0 -0.28125,-0.0312 z' 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;baseline-shift:baseline;color:#FFFFFF;fill:#FFFFFF;fill-opacity:1;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans' inkscape:connector-curvature='0'/>
-  </g>
-</svg>
diff --git a/p/themes/flat-design/icons/search.svg b/p/themes/flat-design/icons/search.svg
deleted file mode 100644
index bca7571b4..000000000
--- a/p/themes/flat-design/icons/search.svg
+++ /dev/null
@@ -1,32 +0,0 @@
-<?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='folder-saved-search-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.2 r9819' version='1.1' width='16.000002' 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-paths='false' bordercolor='#FFFFFF' borderopacity='1' inkscape:current-layer='layer13' inkscape:cx='-151.02446' inkscape:cy='0.353386' gridtolerance='10' inkscape:guide-bbox='true' guidetolerance='10' id='namedview88' inkscape:object-nodes='false' inkscape:object-paths='false' objecttolerance='10' pagecolor='#555753' 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='1168' inkscape:window-maximized='1' inkscape:window-width='1600' inkscape:window-x='0' inkscape:window-y='0' inkscape:zoom='1'>
-    <inkscape:grid empspacing='2' enabled='true' id='grid4866' 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(-441.0004,-195)'/>
-  <g inkscape:groupmode='layer' id='layer10' inkscape:label='devices' transform='translate(-441.0004,-195)'/>
-  <g inkscape:groupmode='layer' id='layer11' inkscape:label='apps' transform='translate(-441.0004,-195)'/>
-  <g inkscape:groupmode='layer' id='layer13' inkscape:label='places' transform='translate(-441.0004,-195)'>
-    <path inkscape:connector-curvature='0' d='m 447.50781,195.99554 c -3.02886,0 -5.51073,2.47905 -5.51073,5.50447 0,3.02541 2.48187,5.50446 5.51073,5.50446 3.02885,0 5.51072,-2.47905 5.51072,-5.50446 0,-3.02542 -2.48187,-5.50447 -5.51072,-5.50447 z m 0,2.00893 c 1.94735,0 3.49951,1.55039 3.49951,3.49554 0,1.94514 -1.55216,3.49553 -3.49951,3.49553 -1.94736,0 -3.49952,-1.55039 -3.49952,-3.49553 0,-1.94515 1.55216,-3.49554 3.49952,-3.49554 z' id='path5079' 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;baseline-shift:baseline;color:#FFFFFF;fill:#FFFFFF;fill-opacity:1;stroke:none;stroke-width:1.55467153;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:new;font-family:Sans;-inkscape-font-specification:Sans'/>
-    <path inkscape:connector-curvature='0' d='m 450.8125,204 a 1.0001,1.0001 0 0 0 -0.5,1.71875 l 4,4 a 1.0054782,1.0054782 0 1 0 1.40625,-1.4375 l -4,-4 A 1.0001,1.0001 0 0 0 450.8125,204 z' id='path5081' 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;baseline-shift:baseline;color:#FFFFFF;fill:#FFFFFF;fill-opacity:1;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:new;font-family:Sans;-inkscape-font-specification:Sans'/>
-    
-  </g>
-  <g inkscape:groupmode='layer' id='layer14' inkscape:label='mimetypes' transform='translate(-441.0004,-195)'/>
-  <g inkscape:groupmode='layer' id='layer15' inkscape:label='emblems' style='display:inline' transform='translate(-441.0004,-195)'/>
-  <g inkscape:groupmode='layer' id='g71291' inkscape:label='emotes' style='display:inline' transform='translate(-441.0004,-195)'/>
-  <g inkscape:groupmode='layer' id='g4953' inkscape:label='categories' style='display:inline' transform='translate(-441.0004,-195)'/>
-  <g inkscape:groupmode='layer' id='layer12' inkscape:label='actions' style='display:inline' transform='translate(-441.0004,-195)'/>
-</svg>
diff --git a/p/themes/flat-design/icons/up.svg b/p/themes/flat-design/icons/up.svg
deleted file mode 100644
index 3ab11b168..000000000
--- a/p/themes/flat-design/icons/up.svg
+++ /dev/null
@@ -1,31 +0,0 @@
-<?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-up-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='-1.351226' 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='40px' 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(-201.0002,-747)'/>
-  <g inkscape:groupmode='layer' id='layer10' inkscape:label='devices' transform='translate(-201.0002,-747)'/>
-  <g inkscape:groupmode='layer' id='layer11' inkscape:label='apps' transform='translate(-201.0002,-747)'/>
-  <g inkscape:groupmode='layer' id='layer13' inkscape:label='places' transform='translate(-201.0002,-747)'/>
-  <g inkscape:groupmode='layer' id='layer14' inkscape:label='mimetypes' transform='translate(-201.0002,-747)'/>
-  <g inkscape:groupmode='layer' id='layer15' inkscape:label='emblems' style='display:inline' transform='translate(-201.0002,-747)'/>
-  <g inkscape:groupmode='layer' id='g71291' inkscape:label='emotes' style='display:inline' transform='translate(-201.0002,-747)'/>
-  <g inkscape:groupmode='layer' id='g4953' inkscape:label='categories' style='display:inline' transform='translate(-201.0002,-747)'/>
-  <g inkscape:groupmode='layer' id='layer12' inkscape:label='actions' style='display:inline' transform='translate(-201.0002,-747)'>
-    
-    <path inkscape:connector-curvature='0' d='m 215.03152,758.99677 0,-1.00001 c -9.1e-4,-0.0111 5.9e-4,-0.021 -9e-5,-0.0312 -0.0112,-0.25496 -0.12835,-0.50994 -0.31251,-0.6875 l -5.71875,-6.29767 -5.71875,6.29773 c -0.18821,0.1881 -0.28121,0.45346 -0.28122,0.71875 l 0,1.00001 1,0 c 0.26531,-7e-5 0.53059,-0.0931 0.71873,-0.28131 l 4.28125,-4.82896 4.28127,4.82896 c 0.19464,0.21073 0.46925,0.30315 0.74998,0.2813 z' id='path10839-9-9-5-9-1-0' 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:#FFFFFF;fill:#FFFFFF;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/p/themes/flat-design/loader.gif b/p/themes/flat-design/loader.gif
deleted file mode 100644
index ce36565b3..000000000
Binary files a/p/themes/flat-design/loader.gif and /dev/null differ
diff --git a/p/themes/flat-design/metadata.json b/p/themes/flat-design/metadata.json
deleted file mode 100644
index 6b94d11c2..000000000
--- a/p/themes/flat-design/metadata.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "name": "Flat design",
-  "author": "Marien Fressinaud",
-  "description": "Thème plat pour FreshRSS",
-  "version": 0.1,
-  "files": ["global.css", "freshrss.css"]
-}
\ No newline at end of file
-- 
cgit v1.2.3


From dbfa9228358feb3fa6d5f4ea2a35a3dacd0b5852 Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Mon, 27 Jan 2014 21:03:58 +0100
Subject: Changement du nom poche en wallabag
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Le nom de poche a été changé en wallabag suite à "l'affaire Pocket".
Le changement a été impacté partout même au niveau du fichier de conf. À
priori ce n'est pas très impactant puisque poche n'est introduit que
dans cette version et qu'il ne devrait pas y avoir "trop" de testeurs.
Au pire si l'adresse poche/wallabag disparaît lors d'une migration, il
suffit de la ressaisir, ce n'est pas critique :)

Voir #397
---
 app/Controllers/configureController.php  |  2 +-
 app/Models/Configuration.php             |  4 ++--
 app/i18n/en.php                          |  4 ++--
 app/i18n/fr.php                          |  4 ++--
 app/views/configure/sharing.phtml        |  8 ++++----
 app/views/helpers/view/normal_view.phtml | 12 ++++++------
 6 files changed, 17 insertions(+), 17 deletions(-)

(limited to 'app/Models/Configuration.php')

diff --git a/app/Controllers/configureController.php b/app/Controllers/configureController.php
index 70144a8db..645f9eabf 100755
--- a/app/Controllers/configureController.php
+++ b/app/Controllers/configureController.php
@@ -196,7 +196,7 @@ class FreshRSS_configure_Controller extends Minz_ActionController {
 		if (Minz_Request::isPost ()) {
 			$this->view->conf->_sharing (array(
 				'shaarli' => Minz_Request::param ('shaarli', false),
-				'poche' => Minz_Request::param ('poche', false),
+				'wallabag' => Minz_Request::param ('wallabag', false),
 				'diaspora' => Minz_Request::param ('diaspora', false),
 				'twitter' => Minz_Request::param ('twitter', false),
 				'g+' => Minz_Request::param ('g+', false),
diff --git a/app/Models/Configuration.php b/app/Models/Configuration.php
index f3fb76e72..2a7fe95aa 100644
--- a/app/Models/Configuration.php
+++ b/app/Models/Configuration.php
@@ -48,7 +48,7 @@ class FreshRSS_Configuration {
 		'bottomline_link' => true,
 		'sharing' => array(
 			'shaarli' => '',
-			'poche' => '',
+			'wallabag' => '',
 			'diaspora' => '',
 			'twitter' => true,
 			'g+' => true,
@@ -185,7 +185,7 @@ class FreshRSS_Configuration {
 		}
 	}
 	public function _sharing ($values) {
-		$are_url = array ('shaarli', 'poche', 'diaspora');
+		$are_url = array ('shaarli', 'wallabag', 'diaspora');
 		foreach ($values as $key => $value) {
 			if (in_array($key, $are_url)) {
 				$is_url = (
diff --git a/app/i18n/en.php b/app/i18n/en.php
index 8073ecf51..a2cc461c5 100644
--- a/app/i18n/en.php
+++ b/app/i18n/en.php
@@ -210,7 +210,7 @@ return array (
 	'scroll'			=> 'during page scrolls',
 	'upon_reception'		=> 'upon reception of the article',
 	'your_shaarli'			=> 'Your Shaarli',
-	'your_poche'			=> 'Your Poche',
+	'your_wallabag'			=> 'Your wallabag',
 	'your_diaspora_pod'		=> 'Your Diaspora* pod',
 	'sharing'			=> 'Sharing',
 	'share'				=> 'Share',
@@ -221,7 +221,7 @@ return array (
 	'more_information'		=> 'More information',
 	'activate_sharing'		=> 'Activate sharing',
 	'shaarli'			=> 'Shaarli',
-	'poche'				=> 'Poche',
+	'wallabag'			=> 'wallabag',
 	'diaspora'			=> 'Diaspora*',
 	'twitter'			=> 'Twitter',
 	'g+'				=> 'Google+',
diff --git a/app/i18n/fr.php b/app/i18n/fr.php
index 3dad497ae..9ab06ba26 100644
--- a/app/i18n/fr.php
+++ b/app/i18n/fr.php
@@ -210,7 +210,7 @@ return array (
 	'scroll'			=> 'au défilement de la page',
 	'upon_reception'		=> 'dès la réception du nouvel article',
 	'your_shaarli'			=> 'Votre Shaarli',
-	'your_poche'			=> 'Votre Poche',
+	'your_wallabag'			=> 'Votre wallabag',
 	'your_diaspora_pod'		=> 'Votre pod Diaspora*',
 	'sharing'			=> 'Partage',
 	'share'				=> 'Partager',
@@ -221,7 +221,7 @@ return array (
 	'more_information'		=> 'Plus d’informations',
 	'activate_sharing'		=> 'Activer le partage',
 	'shaarli'			=> 'Shaarli',
-	'poche'				=> 'Poche',
+	'wallabag'			=> 'wallabag',
 	'diaspora'			=> 'Diaspora*',
 	'twitter'			=> 'Twitter',
 	'g+'				=> 'Google+',
diff --git a/app/views/configure/sharing.phtml b/app/views/configure/sharing.phtml
index 9dc733392..e3ea11665 100644
--- a/app/views/configure/sharing.phtml
+++ b/app/views/configure/sharing.phtml
@@ -17,13 +17,13 @@
 		</div>
 
 		<div class="form-group">
-			<label class="group-name" for="poche">
-				<?php echo Minz_Translate::t ('your_poche'); ?>
+			<label class="group-name" for="wallabag">
+				<?php echo Minz_Translate::t ('your_wallabag'); ?>
 			</label>
 			<div class="group-controls">
-				<input type="url" id="poche" name="poche" class="extend" value="<?php echo $this->conf->sharing ('poche'); ?>" placeholder="<?php echo Minz_Translate::t ('blank_to_disable'); ?>" size="64" />
+				<input type="url" id="wallabag" name="wallabag" class="extend" value="<?php echo $this->conf->sharing ('wallabag'); ?>" placeholder="<?php echo Minz_Translate::t ('blank_to_disable'); ?>" size="64" />
 
-				<?php echo FreshRSS_Themes::icon('help'); ?> <a target="_blank" href="http://www.inthepoche.com/"><?php echo Minz_Translate::t ('more_information'); ?></a>
+				<?php echo FreshRSS_Themes::icon('help'); ?> <a target="_blank" href="http://www.wallabag.org"><?php echo Minz_Translate::t ('more_information'); ?></a>
 			</div>
 		</div>
 
diff --git a/app/views/helpers/view/normal_view.phtml b/app/views/helpers/view/normal_view.phtml
index 1c2ed49e2..7b7faccee 100644
--- a/app/views/helpers/view/normal_view.phtml
+++ b/app/views/helpers/view/normal_view.phtml
@@ -9,11 +9,11 @@ if (!empty($this->entries)) {
 	$display_others = true;
 	if ($this->loginOk) {
 		$shaarli = $this->conf->sharing ('shaarli');
-		$poche = $this->conf->sharing ('poche');
+		$wallabag = $this->conf->sharing ('wallabag');
 		$diaspora = $this->conf->sharing ('diaspora');
 	} else {
 		$shaarli = '';
-		$poche = '';
+		$wallabag = '';
 		$diaspora = '';
 	}
 	$twitter = $this->conf->sharing ('twitter');
@@ -30,7 +30,7 @@ if (!empty($this->entries)) {
 	$bottomline_read = $this->conf->bottomline_read;
 	$bottomline_favorite = $this->conf->bottomline_favorite;
 	$bottomline_sharing = $this->conf->bottomline_sharing && (
-		$shaarli || $poche || $diaspora || $twitter ||
+		$shaarli || $wallabag || $diaspora || $twitter ||
 		$google_plus || $facebook || $email || $print);
 	$bottomline_tags = $this->conf->bottomline_tags;
 	$bottomline_date = $this->conf->bottomline_date;
@@ -152,10 +152,10 @@ if (!empty($this->entries)) {
 									<?php echo Minz_Translate::t ('shaarli'); ?>
 								</a>
 							</li>
-							<?php } if ($poche) { ?>
+							<?php } if ($wallabag) { ?>
 							<li class="item">
-								<a target="_blank" href="<?php echo $poche . '?action=add&amp;url=' . base64_encode (urldecode($link)); ?>">
-									<?php echo Minz_Translate::t ('poche'); ?>
+								<a target="_blank" href="<?php echo $wallabag . '?action=add&amp;url=' . base64_encode (urldecode($link)); ?>">
+									<?php echo Minz_Translate::t ('wallabag'); ?>
 								</a>
 							</li>
 							<?php } if ($diaspora) { ?>
-- 
cgit v1.2.3


From a201450b5817af23a57e8c68569c24ed5451b7ef Mon Sep 17 00:00:00 2001
From: Alexis Degrugillier <github@ainw.org>
Date: Sun, 2 Feb 2014 10:02:45 -0500
Subject: Modification des raccourcis de navigation
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Modification du raccourci pour naviguer au premier article (Home au lieu de Shift+j)
Modification du raccourci pour naviguer au dernier article (End au lieu de Shift+k)
Ajout de modificateurs pour utiliser les touches de navigation dans d'autres contextes (Shift pour les flux, Ctrl pour les catégories)

Voir issue#256
---
 app/Controllers/configureController.php |  2 +-
 app/Models/Configuration.php            |  2 +
 app/i18n/en.php                         | 15 ++++--
 app/i18n/fr.php                         | 15 ++++--
 app/views/configure/shortcut.phtml      | 55 +++++++++++++------
 app/views/helpers/javascript_vars.phtml |  2 +
 p/scripts/main.js                       | 94 +++++++++++++++++++++++++++++++--
 7 files changed, 154 insertions(+), 31 deletions(-)

(limited to 'app/Models/Configuration.php')

diff --git a/app/Controllers/configureController.php b/app/Controllers/configureController.php
index 645f9eabf..a5d99c508 100755
--- a/app/Controllers/configureController.php
+++ b/app/Controllers/configureController.php
@@ -286,7 +286,7 @@ class FreshRSS_configure_Controller extends Minz_ActionController {
 
 	public function shortcutAction () {
 		$list_keys = array ('a', 'b', 'backspace', 'c', 'd', 'delete', 'down', 'e', 'end', 'enter',
-		                    'escape', 'f', 'g', 'h', 'i', 'insert', 'j', 'k', 'l', 'left',
+		                    'escape', 'f', 'g', 'h', 'home', 'i', 'insert', 'j', 'k', 'l', 'left',
 		                    'm', 'n', 'o', 'p', 'page_down', 'page_up', 'q', 'r', 'return', 'right',
 		                    's', 'space', 't', 'tab', 'u', 'up', 'v', 'w', 'x', 'y',
 		                    'z', '0', '1', '2', '3', '4', '5', '6', '7', '8',
diff --git a/app/Models/Configuration.php b/app/Models/Configuration.php
index 2a7fe95aa..2b719c370 100644
--- a/app/Models/Configuration.php
+++ b/app/Models/Configuration.php
@@ -32,6 +32,8 @@ class FreshRSS_Configuration {
 			'go_website' => 'space',
 			'next_entry' => 'j',
 			'prev_entry' => 'k',
+			'first_entry' => 'home',
+			'last_entry' => 'end',
 			'collapse_entry' => 'c',
 			'load_more' => 'm',
 			'auto_share' => 's',
diff --git a/app/i18n/en.php b/app/i18n/en.php
index a2cc461c5..66386f0ed 100644
--- a/app/i18n/en.php
+++ b/app/i18n/en.php
@@ -78,6 +78,10 @@ return array (
 	'bad_opml_file'			=> 'Your OPML file is invalid',
 	'shortcuts_updated'		=> 'Shortcuts have been updated',
 	'shortcuts_management'		=> 'Shortcuts management',
+	'shortcuts_navigation'		=> 'Navigation',
+	'shortcuts_navigation_help'	=> 'With the "Shift" modifier, navigation shortcuts apply on feeds.<br/>With the "Ctrl" modifier, navigation shortcuts apply on categories.',
+	'shortcuts_article_action'	=> 'Article actions',
+	'shortcuts_other_action'	=> 'Other actions',
 	'feeds_marked_read'		=> 'Feeds have been marked as read',
 	'updated'			=> 'Modifications have been updated',
 
@@ -121,15 +125,16 @@ return array (
 	'javascript_for_shortcuts'	=> 'JavaScript must be enabled in order to use shortcuts',
 	'javascript_should_be_activated'=> 'JavaScript must be enabled',
 	'shift_for_all_read'		=> '+ <code>shift</code> to mark all articles as read',
-	'see_on_website'		=> 'See article on its original website',
+	'see_on_website'		=> 'See on original website',
 	'next_article'			=> 'Skip to the next article',
-	'shift_for_last'		=> '+ <code>shift</code> to skip to the last article of page',
+	'last_article'			=> 'Skip to the last article',
 	'previous_article'		=> 'Skip to the previous article',
-	'shift_for_first'		=> '+ <code>shift</code> to skip to the first article of page',
+	'first_article'			=> 'Skip to the first article',
 	'next_page'			=> 'Skip to the next page',
 	'previous_page'			=> 'Skip to the previous page',
-	'collapse_article'		=> 'Collapse current article',
-	'auto_share'			=> 'Share current article',
+	'collapse_article'		=> 'Collapse',
+	'auto_share'			=> 'Share',
+	'auto_share_help'		=> 'If there is only one sharing mode, it is used. Else modes are accessible by their number.',
 
 	'file_to_import'		=> 'File to import',
 	'import'			=> 'Import',
diff --git a/app/i18n/fr.php b/app/i18n/fr.php
index 9ab06ba26..edf2fb19f 100644
--- a/app/i18n/fr.php
+++ b/app/i18n/fr.php
@@ -78,6 +78,10 @@ return array (
 	'bad_opml_file'			=> 'Votre fichier OPML n’est pas valide',
 	'shortcuts_updated'		=> 'Les raccourcis ont été mis à jour',
 	'shortcuts_management'		=> 'Gestion des raccourcis',
+	'shortcuts_navigation'		=> 'Navigation',
+	'shortcuts_navigation_help'	=> 'Avec le modificateur "Shift", les raccourcis de navigation s’appliquent aux flux.<br/>Avec le modificateur "Ctrl", les raccourcis de navigation s’appliquent aux catégories.',
+	'shortcuts_article_action'	=> 'Actions associées à l’article courant',
+	'shortcuts_other_action'	=> 'Autres actions',
 	'feeds_marked_read'		=> 'Les flux ont été marqués comme lus',
 	'updated'			=> 'Modifications enregistrées',
 
@@ -121,15 +125,16 @@ return array (
 	'javascript_for_shortcuts'	=> 'Le JavaScript doit être activé pour pouvoir profiter des raccourcis',
 	'javascript_should_be_activated'=> 'Le JavaScript doit être activé',
 	'shift_for_all_read'		=> '+ <code>shift</code> pour marquer tous les articles comme lus',
-	'see_on_website'		=> 'Voir l’article sur le site d’origine',
+	'see_on_website'		=> 'Voir sur le site d’origine',
 	'next_article'			=> 'Passer à l’article suivant',
-	'shift_for_last'		=> '+ <code>shift</code> pour passer au dernier article de la page',
+	'last_article'			=> 'Passer au dernier article',
 	'previous_article'		=> 'Passer à l’article précédent',
-	'shift_for_first'		=> '+ <code>shift</code> pour passer au premier article de la page',
+	'first_article'			=> 'Passer au premier article',
 	'next_page'			=> 'Passer à la page suivante',
 	'previous_page'			=> 'Passer à la page précédente',
-	'collapse_article'		=> 'Refermer l’article courant',
-	'auto_share'			=> 'Partager l’article courant',
+	'collapse_article'		=> 'Refermer',
+	'auto_share'			=> 'Partager',
+	'auto_share_help'		=> 'Si il n’y a qu’un mode de partage, celui ci est utilisé automatiquement. Sinon ils sont accessibles par leur numéro.',
 
 	'file_to_import'		=> 'Fichier à importer',
 	'import'			=> 'Importer',
diff --git a/app/views/configure/shortcut.phtml b/app/views/configure/shortcut.phtml
index b0867f711..748a65d17 100644
--- a/app/views/configure/shortcut.phtml
+++ b/app/views/configure/shortcut.phtml
@@ -16,55 +16,59 @@
 
 		<noscript><p class="alert alert-error"><?php echo Minz_Translate::t ('javascript_for_shortcuts'); ?></p></noscript>
 
+		<legend><?php echo Minz_Translate::t ('shortcuts_navigation'); ?></legend>
+
 		<div class="form-group">
-			<label class="group-name" for="mark_read"><?php echo Minz_Translate::t ('mark_read'); ?></label>
+			<label class="group-name" for="next_entry"><?php echo Minz_Translate::t ('next_article'); ?></label>
 			<div class="group-controls">
-				<input type="text" id="mark_read" name="shortcuts[mark_read]" list="keys" value="<?php echo $s['mark_read']; ?>" />
-				<?php echo Minz_Translate::t ('shift_for_all_read'); ?>
+				<input type="text" id="next_entry" name="shortcuts[next_entry]" list="keys" value="<?php echo $s['next_entry']; ?>" />
 			</div>
 		</div>
 
 		<div class="form-group">
-			<label class="group-name" for="mark_favorite"><?php echo Minz_Translate::t ('mark_favorite'); ?></label>
+			<label class="group-name" for="prev_entry"><?php echo Minz_Translate::t ('previous_article'); ?></label>
 			<div class="group-controls">
-				<input type="text" id="mark_favorite" name="shortcuts[mark_favorite]" list="keys" value="<?php echo $s['mark_favorite']; ?>" />
+				<input type="text" id="prev_entry" name="shortcuts[prev_entry]" list="keys" value="<?php echo $s['prev_entry']; ?>" />
 			</div>
 		</div>
 
 		<div class="form-group">
-			<label class="group-name" for="go_website"><?php echo Minz_Translate::t ('see_on_website'); ?></label>
+			<label class="group-name" for="first_entry"><?php echo Minz_Translate::t ('first_article'); ?></label>
 			<div class="group-controls">
-				<input type="text" id="go_website" name="shortcuts[go_website]" list="keys" value="<?php echo $s['go_website']; ?>" />
+				<input type="text" id="first_entry" name="shortcuts[first_entry]" list="keys" value="<?php echo $s['first_entry']; ?>" />
 			</div>
 		</div>
 
 		<div class="form-group">
-			<label class="group-name" for="next_entry"><?php echo Minz_Translate::t ('next_article'); ?></label>
+			<label class="group-name" for="last_entry"><?php echo Minz_Translate::t ('last_article'); ?></label>
 			<div class="group-controls">
-				<input type="text" id="next_entry" name="shortcuts[next_entry]" list="keys" value="<?php echo $s['next_entry']; ?>" />
-				<?php echo Minz_Translate::t ('shift_for_last'); ?>
+				<input type="text" id="last_entry" name="shortcuts[last_entry]" list="keys" value="<?php echo $s['last_entry']; ?>" />
 			</div>
 		</div>
 
+		<div><?php echo Minz_Translate::t ('shortcuts_navigation_help');?></div>
+
+		<legend><?php echo Minz_Translate::t ('shortcuts_article_action');?></legend>
+
 		<div class="form-group">
-			<label class="group-name" for="prev_entry"><?php echo Minz_Translate::t ('previous_article'); ?></label>
+			<label class="group-name" for="mark_read"><?php echo Minz_Translate::t ('mark_read'); ?></label>
 			<div class="group-controls">
-				<input type="text" id="prev_entry" name="shortcuts[prev_entry]" list="keys" value="<?php echo $s['prev_entry']; ?>" />
-				<?php echo Minz_Translate::t ('shift_for_first'); ?>
+				<input type="text" id="mark_read" name="shortcuts[mark_read]" list="keys" value="<?php echo $s['mark_read']; ?>" />
+				<?php echo Minz_Translate::t ('shift_for_all_read'); ?>
 			</div>
 		</div>
 
 		<div class="form-group">
-			<label class="group-name" for="collapse_entry"><?php echo Minz_Translate::t ('collapse_article'); ?></label>
+			<label class="group-name" for="mark_favorite"><?php echo Minz_Translate::t ('mark_favorite'); ?></label>
 			<div class="group-controls">
-				<input type="text" id="collapse_entry" name="shortcuts[collapse_entry]" list="keys" value="<?php echo $s['collapse_entry']; ?>" />
+				<input type="text" id="mark_favorite" name="shortcuts[mark_favorite]" list="keys" value="<?php echo $s['mark_favorite']; ?>" />
 			</div>
 		</div>
 
 		<div class="form-group">
-			<label class="group-name" for="load_more_shortcut"><?php echo Minz_Translate::t ('load_more'); ?></label>
+			<label class="group-name" for="go_website"><?php echo Minz_Translate::t ('see_on_website'); ?></label>
 			<div class="group-controls">
-				<input type="text" id="load_more_shortcut" name="shortcuts[load_more]" list="keys" value="<?php echo $s['load_more']; ?>" />
+				<input type="text" id="go_website" name="shortcuts[go_website]" list="keys" value="<?php echo $s['go_website']; ?>" />
 			</div>
 		</div>
 
@@ -72,6 +76,23 @@
 			<label class="group-name" for="auto_share_shortcut"><?php echo Minz_Translate::t ('auto_share'); ?></label>
 			<div class="group-controls">
 				<input type="text" id="auto_share_shortcut" name="shortcuts[auto_share]" list="keys" value="<?php echo $s['auto_share']; ?>" />
+				<?php echo Minz_Translate::t ('auto_share_help'); ?>
+			</div>
+		</div>
+
+		<div class="form-group">
+			<label class="group-name" for="collapse_entry"><?php echo Minz_Translate::t ('collapse_article'); ?></label>
+			<div class="group-controls">
+				<input type="text" id="collapse_entry" name="shortcuts[collapse_entry]" list="keys" value="<?php echo $s['collapse_entry']; ?>" />
+			</div>
+		</div>
+
+		<legend><?php echo Minz_Translate::t ('shortcuts_other_action');?></legend>
+
+		<div class="form-group">
+			<label class="group-name" for="load_more_shortcut"><?php echo Minz_Translate::t ('load_more'); ?></label>
+			<div class="group-controls">
+				<input type="text" id="load_more_shortcut" name="shortcuts[load_more]" list="keys" value="<?php echo $s['load_more']; ?>" />
 			</div>
 		</div>
 
diff --git a/app/views/helpers/javascript_vars.phtml b/app/views/helpers/javascript_vars.phtml
index 0ecdc1bca..42312bc97 100644
--- a/app/views/helpers/javascript_vars.phtml
+++ b/app/views/helpers/javascript_vars.phtml
@@ -19,6 +19,8 @@ echo ',shortcuts={',
 	'go_website:"', $s['go_website'], '",',
 	'prev_entry:"', $s['prev_entry'], '",',
 	'next_entry:"', $s['next_entry'], '",',
+	'first_entry:"', $s['first_entry'], '",',
+	'last_entry:"', $s['last_entry'], '",',
 	'collapse_entry:"', $s['collapse_entry'], '",',
 	'load_more:"', $s['load_more'], '",',
 	'auto_share:"', $s['auto_share'], '"',
diff --git a/p/scripts/main.js b/p/scripts/main.js
index ee729b9e5..e9d6c40da 100644
--- a/p/scripts/main.js
+++ b/p/scripts/main.js
@@ -247,6 +247,67 @@ function next_entry() {
 	}
 }
 
+function prev_feed() {
+	if ($('li.active').length > 0) {
+		var pf = $('li.active').prev().find('a.feed');
+		if (pf.length > 0) {
+			pf[0].click();
+		}
+	} else {
+		first_feed();
+	}
+}
+
+function next_feed() {
+	if ($('li.active').length > 0) {
+		var nf = $('li.active').next().find('a.feed');
+		if (nf.length > 0) {
+			nf[0].click();
+		}
+	} else {
+		last_feed();
+	}
+}
+
+function first_feed() {
+	$('.feeds.active li').first().find('a')[1].click();
+}
+
+function last_feed() {
+	$('.feeds.active li').last().find('a')[1].click();
+}
+
+function prev_category() {
+	if ($('div.active').length > 0) {
+		var pc = $('div.active').parent('li').prev().find('div.stick a.btn');
+		if (pc.length > 0) {
+			pc[0].click();
+			return;
+		}
+	} else {
+		first_category();
+	}
+}
+
+function next_category() {
+	if ($('div.active').length > 0) {
+		var nc = $('div.active').parent('li').next().find('div.stick a.btn');
+		if (nc.length > 0) {
+			nc[0].click();
+		}
+	} else {
+		last_category();
+	}
+}
+
+function first_category() {
+	$('div.category.stick').first().find('a.btn')[0].click();
+}
+
+function last_category() {
+	$('div.category.stick').last().find('a.btn')[0].click();
+}
+
 function collapse_entry() {
 	isCollapsed = !isCollapsed;
 	$(".flux.current").toggleClass("active");
@@ -415,11 +476,11 @@ function init_shortcuts() {
 		});
 	}
 
-	// Touches de navigation
+	// Touches de navigation pour les articles
 	shortcut.add(shortcuts.prev_entry, prev_entry, {
 		'disable_in_input': true
 	});
-	shortcut.add("shift+" + shortcuts.prev_entry, function () {
+	shortcut.add(shortcuts.first_entry, function () {
 		var old_active = $(".flux.current"),
 			first = $(".flux:first");
 
@@ -432,7 +493,7 @@ function init_shortcuts() {
 	shortcut.add(shortcuts.next_entry, next_entry, {
 		'disable_in_input': true
 	});
-	shortcut.add("shift+" + shortcuts.next_entry, function () {
+	shortcut.add(shortcuts.last_entry, function () {
 		var old_active = $(".flux.current"),
 			last = $(".flux:last");
 
@@ -442,6 +503,33 @@ function init_shortcuts() {
 	}, {
 		'disable_in_input': true
 	});
+	// Touches de navigation pour les flux
+	shortcut.add("shift+" + shortcuts.prev_entry, prev_feed, {
+		'disable_in_input': true
+	});
+	shortcut.add("shift+" + shortcuts.next_entry, next_feed, {
+		'disable_in_input': true
+	});
+	shortcut.add("shift+" + shortcuts.first_entry, first_feed, {
+		'disable_in_input': true
+	});
+	shortcut.add("shift+" + shortcuts.last_entry, last_feed, {
+		'disable_in_input': true
+	});
+	// Touches de navigation pour les categories
+	shortcut.add("ctrl+" + shortcuts.prev_entry, prev_category, {
+		'disable_in_input': true
+	});
+	shortcut.add("ctrl+" + shortcuts.next_entry, next_category, {
+		'disable_in_input': true
+	});
+	shortcut.add("ctrl+" + shortcuts.first_entry, first_category, {
+		'disable_in_input': true
+	});
+	shortcut.add("ctrl+" + shortcuts.last_entry, last_category, {
+		'disable_in_input': true
+	});
+
 	shortcut.add(shortcuts.go_website, function () {
 		var url_website = $(".flux.active .link a").attr("href");
 
-- 
cgit v1.2.3


From 27764b36353b3066a9e92da2a96ac17b546295be Mon Sep 17 00:00:00 2001
From: Alexis Degrugillier <github@ainw.org>
Date: Sat, 22 Feb 2014 16:53:51 -0500
Subject: Improve sharing

Previously, the share page can handle only a limited number of shares and only one of each type.
Now the configuration has been change to be more flexible and allows an unlimited number of shares.
The share description is located in an array and the share configuration is stored along with the
user configuration.

Note: I tried to include the specific javascript code in a separate file but I did not succeded to
import it.
---
 app/Controllers/configureController.php  | 12 +----
 app/Models/Configuration.php             | 56 ++++++++++-------------
 app/Models/Share.php                     | 44 ++++++++++++++++++
 app/i18n/en.php                          |  3 ++
 app/i18n/fr.php                          |  3 ++
 app/views/configure/sharing.phtml        | 77 +++++++++++++-------------------
 app/views/helpers/view/normal_view.phtml | 73 +++++-------------------------
 data/shares.php                          | 75 +++++++++++++++++++++++++++++++
 p/scripts/main.js                        | 28 +++++++++++-
 9 files changed, 219 insertions(+), 152 deletions(-)
 create mode 100644 app/Models/Share.php
 create mode 100644 data/shares.php

(limited to 'app/Models/Configuration.php')

diff --git a/app/Controllers/configureController.php b/app/Controllers/configureController.php
index ad8bc546a..104fa8900 100755
--- a/app/Controllers/configureController.php
+++ b/app/Controllers/configureController.php
@@ -192,16 +192,8 @@ class FreshRSS_configure_Controller extends Minz_ActionController {
 
 	public function sharingAction () {
 		if (Minz_Request::isPost ()) {
-			$this->view->conf->_sharing (array(
-				'shaarli' => Minz_Request::param ('shaarli', false),
-				'wallabag' => Minz_Request::param ('wallabag', false),
-				'diaspora' => Minz_Request::param ('diaspora', false),
-				'twitter' => Minz_Request::param ('twitter', false),
-				'g+' => Minz_Request::param ('g+', false),
-				'facebook' => Minz_Request::param ('facebook', false),
-				'email' => Minz_Request::param ('email', false),
-				'print' => Minz_Request::param ('print', false),
-			));
+			$params = Minz_Request::params();
+			$this->view->conf->_sharing ($params['share']);
 			$this->view->conf->save();
 			invalidateHttpCache();
 
diff --git a/app/Models/Configuration.php b/app/Models/Configuration.php
index 2b719c370..052e28ba8 100644
--- a/app/Models/Configuration.php
+++ b/app/Models/Configuration.php
@@ -48,16 +48,7 @@ class FreshRSS_Configuration {
 		'bottomline_tags' => true,
 		'bottomline_date' => true,
 		'bottomline_link' => true,
-		'sharing' => array(
-			'shaarli' => '',
-			'wallabag' => '',
-			'diaspora' => '',
-			'twitter' => true,
-			'g+' => true,
-			'facebook' => true,
-			'email' => true,
-			'print' => true,
-		),
+		'sharing' => array(),
 	);
 
 	private $available_languages = array(
@@ -65,8 +56,10 @@ class FreshRSS_Configuration {
 		'fr' => 'Français',
 	);
 
-	public function __construct ($user) {
-		$this->filename = DATA_PATH . '/' . $user . '_user.php';
+	private $shares;
+
+	public function __construct($user) {
+		$this->filename = DATA_PATH . DIRECTORY_SEPARATOR . $user . '_user.php';
 
 		$data = @include($this->filename);
 		if (!is_array($data)) {
@@ -80,10 +73,20 @@ class FreshRSS_Configuration {
 			}
 		}
 		$this->data['user'] = $user;
+
+		$this->shares = DATA_PATH . DIRECTORY_SEPARATOR . 'shares.php';
+
+		$shares = @include($this->shares);
+		if (!is_array($shares)) {
+			throw new Minz_PermissionDeniedException($this->shares);
+		}
+
+		$this->data['shares'] = $shares;
 	}
 
 	public function save() {
 		@rename($this->filename, $this->filename . '.bak.php');
+		unset($this->data['shares']); // Remove shares because it is not intended to be stored in user configuration
 		if (file_put_contents($this->filename, "<?php\n return " . var_export($this->data, true) . ';', LOCK_EX) === false) {
 			throw new Minz_PermissionDeniedException($this->filename);
 		}
@@ -104,16 +107,6 @@ class FreshRSS_Configuration {
 		}
 	}
 
-	public function sharing($key = false) {
-		if ($key === false) {
-			return $this->data['sharing'];
-		}
-		if (isset($this->data['sharing'][$key])) {
-			return $this->data['sharing'][$key];
-		}
-		return false;
-	}
-
 	public function availableLanguages() {
 		return $this->available_languages;
 	}
@@ -187,24 +180,23 @@ class FreshRSS_Configuration {
 		}
 	}
 	public function _sharing ($values) {
-		$are_url = array ('shaarli', 'wallabag', 'diaspora');
-		foreach ($values as $key => $value) {
-			if (in_array($key, $are_url)) {
+		$this->data['sharing'] = array();
+		foreach ($values as $value) {
+			if (array_key_exists('url', $value)) {
 				$is_url = (
-					filter_var ($value, FILTER_VALIDATE_URL) ||
+					filter_var ($value['url'], FILTER_VALIDATE_URL) ||
 					(version_compare(PHP_VERSION, '5.3.3', '<') &&
 						(strpos($value, '-') > 0) &&
 						($value === filter_var($value, FILTER_SANITIZE_URL)))
 				);  //PHP bug #51192
-
 				if (!$is_url) {
-					$value = '';
+					continue;
+				}
+				if (!array_key_exists('name', $value) || strcmp($value['name'], '') === 0) {
+					$value['name'] = $value['type'];
 				}
-			} elseif (!is_bool($value)) {
-				$value = true;
 			}
-
-			$this->data['sharing'][$key] = $value;
+			$this->data['sharing'][] = $value;
 		}
 	}
 	public function _theme($value) {
diff --git a/app/Models/Share.php b/app/Models/Share.php
new file mode 100644
index 000000000..b146db722
--- /dev/null
+++ b/app/Models/Share.php
@@ -0,0 +1,44 @@
+<?php
+
+class FreshRSS_Share {
+
+	static public function generateUrl($options, $selected, $link, $title) {
+		$share = $options[$selected['type']];
+		$matches = array(
+			'~URL~',
+			'~TITLE~',
+			'~LINK~',
+		);
+		$replaces = array(
+			$selected['url'],
+			self::transformData($title, self::getTransform($share, 'title')),
+			self::transformData($link, self::getTransform($share, 'link')),
+		);
+		$url = str_replace($matches, $replaces, $share['url']);
+		return $url;
+	}
+
+	static private function transformData($data, $transform) {
+		if (!is_array($transform)) {
+			return $data;
+		}
+		if (count($transform) === 0) {
+			return $data;
+		}
+		foreach ($transform as $action) {
+			$data = call_user_func($action, $data);
+		}
+		return $data;
+	}
+
+	static private function getTransform($options, $type) {
+		$transform = $options['transform'];
+
+		if (array_key_exists($type, $transform)) {
+			return $transform[$type];
+		}
+
+		return $transform;
+	}
+
+}
diff --git a/app/i18n/en.php b/app/i18n/en.php
index 932513588..d4fd491a3 100644
--- a/app/i18n/en.php
+++ b/app/i18n/en.php
@@ -166,6 +166,8 @@ return array (
 	'http_username'			=> 'HTTP username',
 	'http_password'			=> 'HTTP password',
 	'blank_to_disable'		=> 'Leave blank to disable',
+	'share_name'			=> 'Share name to display',
+	'share_url'				=> 'Share URL to use',
 	'not_yet_implemented'		=> 'Not yet implemented',
 	'access_protected_feeds'	=> 'Connection allows to access HTTP protected RSS feeds',
 	'no_selected_feed'		=> 'No feed selected.',
@@ -230,6 +232,7 @@ return array (
 	'more_information'		=> 'More information',
 	'activate_sharing'		=> 'Activate sharing',
 	'shaarli'			=> 'Shaarli',
+	'blogotext'			=> 'Blogotext',
 	'wallabag'			=> 'wallabag',
 	'diaspora'			=> 'Diaspora*',
 	'twitter'			=> 'Twitter',
diff --git a/app/i18n/fr.php b/app/i18n/fr.php
index ab7843d12..7420e2fdd 100644
--- a/app/i18n/fr.php
+++ b/app/i18n/fr.php
@@ -166,6 +166,8 @@ return array (
 	'http_username'			=> 'Identifiant HTTP',
 	'http_password'			=> 'Mot de passe HTTP',
 	'blank_to_disable'		=> 'Laissez vide pour désactiver',
+	'share_name'			=> 'Nom du partage à afficher',
+	'share_url'				=> 'URL du partage à utiliser',
 	'not_yet_implemented'		=> 'Pas encore implémenté',
 	'access_protected_feeds'	=> 'La connexion permet d’accéder aux flux protégés par une authentification HTTP',
 	'no_selected_feed'		=> 'Aucun flux sélectionné.',
@@ -230,6 +232,7 @@ return array (
 	'more_information'		=> 'Plus d’informations',
 	'activate_sharing'		=> 'Activer le partage',
 	'shaarli'			=> 'Shaarli',
+	'blogotext'			=> 'Blogotext',
 	'wallabag'			=> 'wallabag',
 	'diaspora'			=> 'Diaspora*',
 	'twitter'			=> 'Twitter',
diff --git a/app/views/configure/sharing.phtml b/app/views/configure/sharing.phtml
index e3ea11665..e46284955 100644
--- a/app/views/configure/sharing.phtml
+++ b/app/views/configure/sharing.phtml
@@ -3,54 +3,41 @@
 <div class="post">
 	<a href="<?php echo _url ('index', 'index'); ?>"><?php echo Minz_Translate::t ('back_to_rss_feeds'); ?></a>
 
-	<form method="post" action="<?php echo _url ('configure', 'sharing'); ?>">
+	<form method="post" action="<?php echo _url ('configure', 'sharing'); ?>"
+		data-simple='<div class="form-group"><label class="group-name">##label##</label><div class="group-controls"><a href="#" class="share remove"><?php echo FreshRSS_Themes::icon('close'); ?></a>
+			<input type="hidden" id="share_##key##_type" name="share[##key##][type]" value="##type##" /></div></div>'
+		data-advanced='<div class="form-group"><label class="group-name">##label##</label><div class="group-controls"><a href="#" class="share remove"><?php echo FreshRSS_Themes::icon('close'); ?></a>
+			<input type="hidden" id="share_##key##_type" name="share[##key##][type]" value="##type##" />
+			<input type="text" id="share_##key##_name" name="share[##key##][name]" class="extend" value="" placeholder="<?php echo Minz_Translate::t ('share_name'); ?>" size="64" />
+			<input type="url" id="share_##key##_url" name="share[##key##][url]" class="extend" value="" placeholder="<?php echo Minz_Translate::t ('share_url'); ?>" size="64" />
+			<?php echo FreshRSS_Themes::icon('help'); ?> <a target="_blank" href="##help##"><?php echo Minz_Translate::t ('more_information'); ?></a></div></div>'>
 		<legend><?php echo Minz_Translate::t ('sharing'); ?></legend>
-		<div class="form-group">
-			<label class="group-name" for="shaarli">
-				<?php echo Minz_Translate::t ('your_shaarli'); ?>
-			</label>
-			<div class="group-controls">
-				<input type="url" id="shaarli" name="shaarli" class="extend" value="<?php echo $this->conf->sharing ('shaarli'); ?>" placeholder="<?php echo Minz_Translate::t ('blank_to_disable'); ?>" size="64" />
-
-				<?php echo FreshRSS_Themes::icon('help'); ?> <a target="_blank" href="http://sebsauvage.net/wiki/doku.php?id=php:shaarli"><?php echo Minz_Translate::t ('more_information'); ?></a>
-			</div>
-		</div>
-
-		<div class="form-group">
-			<label class="group-name" for="wallabag">
-				<?php echo Minz_Translate::t ('your_wallabag'); ?>
-			</label>
-			<div class="group-controls">
-				<input type="url" id="wallabag" name="wallabag" class="extend" value="<?php echo $this->conf->sharing ('wallabag'); ?>" placeholder="<?php echo Minz_Translate::t ('blank_to_disable'); ?>" size="64" />
-
-				<?php echo FreshRSS_Themes::icon('help'); ?> <a target="_blank" href="http://www.wallabag.org"><?php echo Minz_Translate::t ('more_information'); ?></a>
-			</div>
-		</div>
-
-		<div class="form-group">
-			<label class="group-name" for="diaspora">
-				<?php echo Minz_Translate::t ('your_diaspora_pod'); ?>
-			</label>
-			<div class="group-controls">
-				<input type="url" id="diaspora" name="diaspora" class="extend" value="<?php echo $this->conf->sharing ('diaspora'); ?>" placeholder="<?php echo Minz_Translate::t ('blank_to_disable'); ?>" size="64" />
-
-				<?php echo FreshRSS_Themes::icon('help'); ?> <a target="_blank" href="https://diasporafoundation.org/"><?php echo Minz_Translate::t ('more_information'); ?></a>
+		<?php foreach ($this->conf->sharing as $key => $sharing): ?>
+			<?php $share = $this->conf->shares[$sharing['type']]; ?>
+			<div class="form-group">
+				<label class="group-name">
+					<?php echo Minz_Translate::t ($sharing['type']); ?>
+				</label>
+				<div class="group-controls">
+					<a href='#' class='share remove'><?php echo FreshRSS_Themes::icon('close'); ?></a>
+					<input type='hidden' id='share_<?php echo $key;?>_type' name="share[<?php echo $key;?>][type]" value='<?php echo $sharing['type']?>' />
+					<?php if ($share['form'] === 'advanced'):?>
+						<input type="text" id="share_<?php echo $key;?>_name" name="share[<?php echo $key;?>][name]" class="extend" value="<?php echo $sharing['name']?>" placeholder="<?php echo Minz_Translate::t ('share_name'); ?>" size="64" />
+						<input type="url" id="share_<?php echo $key;?>_url" name="share[<?php echo $key;?>][url]" class="extend" value="<?php echo $sharing['url']?>" placeholder="<?php echo Minz_Translate::t ('share_url'); ?>" size="64" />
+						<?php echo FreshRSS_Themes::icon('help'); ?> <a target="_blank" href="<?php echo $share['help']?>"><?php echo Minz_Translate::t ('more_information'); ?></a>
+					<?php endif;?>
+				</div>
 			</div>
-		</div>
+		<?php endforeach;?>
 
-		<div class="form-group">
-			<label class="group-name"><?php echo Minz_Translate::t ('activate_sharing'); ?></label>
+		<div class="form-group form-actions">
 			<div class="group-controls">
-				<?php
-					$services = array ('twitter', 'g+', 'facebook', 'email', 'print');
-
-					foreach ($services as $service) {
-				?>
-				<label class="checkbox" for="<?php echo $service; ?>">
-					<input type="checkbox" name="<?php echo $service; ?>" id="<?php echo $service; ?>" value="1"<?php echo $this->conf->sharing($service) ? ' checked="checked"' : ''; ?> />
-					<?php echo Minz_Translate::t ($service); ?>
-				</label>
-				<?php } ?>
+				<a href='#' class='share add'><?php echo FreshRSS_Themes::icon('add'); ?></a>
+				<select>
+					<?php foreach($this->conf->shares as $key => $params):?>
+						<option value='<?php echo $key?>' data-form='<?php echo $params['form']?>' data-help='<?php echo $params['help']?>'><?php echo Minz_Translate::t($key) ?></option>
+					<?php endforeach; ?>
+				</select>
 			</div>
 		</div>
 
@@ -61,4 +48,4 @@
 			</div>
 		</div>
 	</form>
-</div>
+</div>
\ No newline at end of file
diff --git a/app/views/helpers/view/normal_view.phtml b/app/views/helpers/view/normal_view.phtml
index ae93b627c..f27984025 100644
--- a/app/views/helpers/view/normal_view.phtml
+++ b/app/views/helpers/view/normal_view.phtml
@@ -8,19 +8,10 @@ if (!empty($this->entries)) {
 	$display_yesterday = true;
 	$display_others = true;
 	if ($this->loginOk) {
-		$shaarli = $this->conf->sharing ('shaarli');
-		$wallabag = $this->conf->sharing ('wallabag');
-		$diaspora = $this->conf->sharing ('diaspora');
+		$sharing = $this->conf->sharing;
 	} else {
-		$shaarli = '';
-		$wallabag = '';
-		$diaspora = '';
+		$sharing = array();
 	}
-	$twitter = $this->conf->sharing ('twitter');
-	$google_plus = $this->conf->sharing ('g+');
-	$facebook = $this->conf->sharing ('facebook');
-	$email = $this->conf->sharing ('email');
-	$print = $this->conf->sharing ('print');
 	$hidePosts = !$this->conf->display_posts;
 	$lazyload = $this->conf->lazyload;
 	$topline_read = $this->conf->topline_read;
@@ -29,9 +20,7 @@ if (!empty($this->entries)) {
 	$topline_link = $this->conf->topline_link;
 	$bottomline_read = $this->conf->bottomline_read;
 	$bottomline_favorite = $this->conf->bottomline_favorite;
-	$bottomline_sharing = $this->conf->bottomline_sharing && (
-		$shaarli || $wallabag || $diaspora || $twitter ||
-		$google_plus || $facebook || $email || $print);
+	$bottomline_sharing = $this->conf->bottomline_sharing && (count($sharing));
 	$bottomline_tags = $this->conf->bottomline_tags;
 	$bottomline_date = $this->conf->bottomline_date;
 	$bottomline_link = $this->conf->bottomline_link;
@@ -146,55 +135,13 @@ if (!empty($this->entries)) {
 
 						<ul class="dropdown-menu">
 							<li class="dropdown-close"><a href="#close">❌</a></li>
-							<?php if ($shaarli) { ?>
-							<li class="item share">
-								<a target="_blank" href="<?php echo $shaarli . '?post=' . $link . '&amp;title=' . $title . '&amp;source=FreshRSS'; ?>">
-									<?php echo Minz_Translate::t ('shaarli'); ?>
-								</a>
-							</li>
-							<?php } if ($wallabag) { ?>
-							<li class="item share">
-								<a target="_blank" href="<?php echo $wallabag . '?action=add&amp;url=' . base64_encode (urldecode($link)); ?>">
-									<?php echo Minz_Translate::t ('wallabag'); ?>
-								</a>
-							</li>
-							<?php } if ($diaspora) { ?>
-							<li class="item share">
-								<a target="_blank" href="<?php echo $diaspora . '/bookmarklet?url=' . $link . '&amp;title=' . $title; ?>">
-									<?php echo Minz_Translate::t ('diaspora'); ?>
-								</a>
-							</li>
-							<?php } if ($twitter) { ?>
-							<li class="item share">
-								<a target="_blank" href="https://twitter.com/share?url=<?php echo $link; ?>&amp;text=<?php echo $title; ?>">
-									<?php echo Minz_Translate::t ('twitter'); ?>
-								</a>
-							</li>
-							<?php } if ($google_plus) { ?>
-							<li class="item share">
-								<a target="_blank" href="https://plus.google.com/share?url=<?php echo $link; ?>">
-									<?php echo Minz_Translate::t ('g+'); ?>
-								</a>
-							</li>
-							<?php } if ($facebook) { ?>
-							<li class="item share">
-								<a target="_blank" href="https://www.facebook.com/sharer.php?u=<?php echo $link; ?>&amp;t=<?php echo $title; ?>">
-									<?php echo Minz_Translate::t ('facebook'); ?>
-								</a>
-							</li>
-							<?php } if ($email) { ?>
-							<li class="item share">
-								<a href="mailto:?subject=<?php echo urldecode($title); ?>&amp;body=<?php echo $link; ?>">
-									<?php echo Minz_Translate::t ('by_email'); ?>
-								</a>
-							</li>
-							<?php } if ($print) { ?>
-							<li class="item share">
-								<a href="#" class="print-article">
-									<?php echo Minz_Translate::t ('print'); ?>
-								</a>
-							</li>
-							<?php } ?>
+							<?php foreach ($sharing as $share) :?>
+								<li class="item share">
+									<a target="_blank" href="<?php echo FreshRSS_Share::generateUrl($this->conf->shares, $share, $item->link(), $item->title() . ' . ' . $feed->name())?>">
+										<?php echo (array_key_exists('name', $share)) ? $share['name'] : Minz_Translate::t ($share['type']);?>
+									</a>
+								</li>
+							<?php endforeach;?>
 						</ul>
 					</div>
 					<?php } ?>
diff --git a/data/shares.php b/data/shares.php
new file mode 100644
index 000000000..44176f1bf
--- /dev/null
+++ b/data/shares.php
@@ -0,0 +1,75 @@
+<?php
+
+/*
+ * This is a configuration file. You shouldn't modify it unless you know what
+ * you are doing. If you want to add a share type, this is where you need to do
+ * it.
+ * 
+ * For each share there is different configuration options. Here is the description
+ * of those options:
+ *   - url is a mandatory option. It is a string representing the share URL. It
+ *     supports 3 different placeholders for custom data. The ~URL~ placeholder
+ *     represents the URL of the system used to share, it is configured by the
+ *     user. The ~LINK~ placeholder represents the link of the shared article.
+ *     The ~TITLE~ placeholder represents the title of the shared article.
+ *   - transform is an array of transformation to apply on links and titles
+ *   - help is a URL to a help page
+ */
+
+return array(
+	'shaarli' => array(
+		'url' => '~URL~?post=~LINK~&amp;title=~TITLE~&amp;source=FreshRSS',
+		'transform' => array('urlencode'),
+		'help' => 'http://sebsauvage.net/wiki/doku.php?id=php:shaarli',
+		'form' => 'advanced',
+	),
+	'blogotext' => array(
+		'url' => '~URL~/admin/links.php?url=~LINK~',
+		'transform' => array(),
+		'help' => 'http://lehollandaisvolant.net/blogotext/fr/',
+		'form' => 'advanced',
+	),
+	'wallabag' => array(
+		'url' => '~URL~?action=add&amp;url=~LINK~',
+		'transform' => array(
+			'link' => array('base64_encode'),
+			'title' => array(),
+		),
+		'help' => 'http://www.wallabag.org/',
+		'form' => 'advanced',
+	),
+	'diaspora' => array(
+		'url' => '~URL~/bookmarklet?url=~LINK~&amp;title=~TITLE~',
+		'transform' => array('urlencode'),
+		'help' => 'https://diasporafoundation.org/',
+		'form' => 'advanced',
+	),
+	'twitter' => array(
+		'url' => 'https://twitter.com/share?url=~LINK~&amp;text=~TITLE~',
+		'transform' => array('urlencode'),
+		'form' => 'simple',
+	),
+	'g+' => array(
+		'url' => 'https://plus.google.com/share?url=~LINK~',
+		'transform' => array('urlencode'),
+		'form' => 'simple',
+	),
+	'facebook' => array(
+		'url' => 'https://www.facebook.com/sharer.php?u=~LINK~&amp;t=~TITLE~',
+		'transform' => array('urlencode'),
+		'form' => 'simple',
+	),
+	'email' => array(
+		'url' => 'mailto:?subject=~TITLE~&amp;body=~LINK~',
+		'transform' => array(
+			'link' => array('urlencode'),
+			'title' => array(),
+		),
+		'form' => 'simple',
+	),
+	'print' => array(
+		'url' => '#',
+		'transform' => array(),
+		'form' => 'simple',
+	),
+);
diff --git a/p/scripts/main.js b/p/scripts/main.js
index beb77a19c..ec27bd50c 100644
--- a/p/scripts/main.js
+++ b/p/scripts/main.js
@@ -1,6 +1,7 @@
 "use strict";
 var $stream = null,
-	isCollapsed = true;
+	isCollapsed = true,
+	shares = 0;
 
 function is_normal_mode() {
 	return $stream.hasClass('normal');
@@ -945,7 +946,7 @@ function init_confirm_action() {
 }
 
 function init_print_action() {
-	$('.print-article').click(function () {
+	$('.item.share > a[href="#"]').click(function () {
 		var content = "<html><head><style>"
 			+ "body { font-family: Serif; text-align: justify; }"
 			+ "a { color: #000; text-decoration: none; }"
@@ -965,6 +966,27 @@ function init_print_action() {
 	});
 }
 
+function init_share_observers() {
+	shares = $('.form-group:not(".form-actions")').length;
+
+	$('.post').on('click', '.share.remove', function(e){
+		e.preventDefault();
+		$(this).parents('.form-group').remove();
+	});
+
+	$('.share.add').on('click',function(e){
+		e.preventDefault();
+		var opt = $(this).siblings('select').find(':selected');
+		var row = $(this).parents('form').data(opt.data('form'));
+		row = row.replace('##label##', opt.html(), 'g');
+		row = row.replace('##type##', opt.val(), 'g');
+		row = row.replace('##help##', opt.data('help'), 'g');
+		row = row.replace('##key##', shares, 'g');
+		$(this).parents('.form-actions').before(row);
+		shares++;
+	});
+};
+
 function init_all() {
 	if (!(window.$ && window.url_freshrss && ((!full_lazyload) || $.fn.lazyload))) {
 		if (window.console) {
@@ -994,6 +1016,8 @@ function init_all() {
 		init_shortcuts();
 		init_print_action();
 		window.setInterval(refreshUnreads, 120000);
+	} else {
+		init_share_observers();
 	}
 
 	if (window.console) {
-- 
cgit v1.2.3


From 166009f3623213249086038f7af72a76507f60dc Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Sun, 23 Feb 2014 21:55:45 +0100
Subject: Sharing: Compatibility 0.7

https://github.com/marienfressinaud/FreshRSS/pull/433
---
 README.md                                | 2 +-
 app/Models/Configuration.php             | 3 +++
 app/i18n/en.php                          | 2 +-
 app/i18n/fr.php                          | 2 +-
 app/views/configure/sharing.phtml        | 2 +-
 app/views/helpers/view/normal_view.phtml | 2 +-
 6 files changed, 8 insertions(+), 5 deletions(-)

(limited to 'app/Models/Configuration.php')

diff --git a/README.md b/README.md
index 2b54ff9d5..6c434527c 100644
--- a/README.md
+++ b/README.md
@@ -43,7 +43,7 @@ Privilégiez pour cela des demandes sur GitHub
 
 # Contrôle d’accès
 Il est requis pour le mode multi-utilisateur, et recommandé dans tous les cas, de limiter l’accès à votre FreshRSS. Au choix :
-* En utilisant l’identification par formulaire (requiert JavaScript, et PHP 5.3.7+ recommandé – fonctionne avec certaines versions de PHP5.3.3+)
+* En utilisant l’identification par formulaire (requiert JavaScript, et PHP 5.3.7+ recommandé – fonctionne avec certaines versions de PHP 5.3.3+)
 * En utilisant l’identification par [Mozilla Persona](https://login.persona.org/about) incluse dans FreshRSS
 * En utilisant un contrôle d’accès HTTP défini par votre serveur Web
 	* Voir par exemple la [documentation d’Apache sur l’authentification](http://httpd.apache.org/docs/trunk/howto/auth.html)
diff --git a/app/Models/Configuration.php b/app/Models/Configuration.php
index 052e28ba8..bacb79510 100644
--- a/app/Models/Configuration.php
+++ b/app/Models/Configuration.php
@@ -182,6 +182,9 @@ class FreshRSS_Configuration {
 	public function _sharing ($values) {
 		$this->data['sharing'] = array();
 		foreach ($values as $value) {
+			if (!is_array($value)) {
+				continue;
+			}
 			if (array_key_exists('url', $value)) {
 				$is_url = (
 					filter_var ($value['url'], FILTER_VALIDATE_URL) ||
diff --git a/app/i18n/en.php b/app/i18n/en.php
index d4fd491a3..69c2fd310 100644
--- a/app/i18n/en.php
+++ b/app/i18n/en.php
@@ -167,7 +167,7 @@ return array (
 	'http_password'			=> 'HTTP password',
 	'blank_to_disable'		=> 'Leave blank to disable',
 	'share_name'			=> 'Share name to display',
-	'share_url'				=> 'Share URL to use',
+	'share_url'			=> 'Share URL to use',
 	'not_yet_implemented'		=> 'Not yet implemented',
 	'access_protected_feeds'	=> 'Connection allows to access HTTP protected RSS feeds',
 	'no_selected_feed'		=> 'No feed selected.',
diff --git a/app/i18n/fr.php b/app/i18n/fr.php
index 7420e2fdd..452c560a7 100644
--- a/app/i18n/fr.php
+++ b/app/i18n/fr.php
@@ -167,7 +167,7 @@ return array (
 	'http_password'			=> 'Mot de passe HTTP',
 	'blank_to_disable'		=> 'Laissez vide pour désactiver',
 	'share_name'			=> 'Nom du partage à afficher',
-	'share_url'				=> 'URL du partage à utiliser',
+	'share_url'			=> 'URL du partage à utiliser',
 	'not_yet_implemented'		=> 'Pas encore implémenté',
 	'access_protected_feeds'	=> 'La connexion permet d’accéder aux flux protégés par une authentification HTTP',
 	'no_selected_feed'		=> 'Aucun flux sélectionné.',
diff --git a/app/views/configure/sharing.phtml b/app/views/configure/sharing.phtml
index e46284955..b50e6ddc4 100644
--- a/app/views/configure/sharing.phtml
+++ b/app/views/configure/sharing.phtml
@@ -48,4 +48,4 @@
 			</div>
 		</div>
 	</form>
-</div>
\ No newline at end of file
+</div>
diff --git a/app/views/helpers/view/normal_view.phtml b/app/views/helpers/view/normal_view.phtml
index f27984025..ff535c60a 100644
--- a/app/views/helpers/view/normal_view.phtml
+++ b/app/views/helpers/view/normal_view.phtml
@@ -138,7 +138,7 @@ if (!empty($this->entries)) {
 							<?php foreach ($sharing as $share) :?>
 								<li class="item share">
 									<a target="_blank" href="<?php echo FreshRSS_Share::generateUrl($this->conf->shares, $share, $item->link(), $item->title() . ' . ' . $feed->name())?>">
-										<?php echo (array_key_exists('name', $share)) ? $share['name'] : Minz_Translate::t ($share['type']);?>
+										<?php echo array_key_exists('name', $share) ? $share['name'] : Minz_Translate::t ($share['type']);?>
 									</a>
 								</li>
 							<?php endforeach;?>
-- 
cgit v1.2.3


From 1e105a64ab12b37f55b605a89e869f7bbb520e95 Mon Sep 17 00:00:00 2001
From: Alexis Degrugillier <github@ainw.org>
Date: Mon, 24 Feb 2014 19:51:57 -0500
Subject: Add a configuration option to get sticky articles

Now the user can choose if an opened article will be repositioned to the top or not

See #338
---
 app/Controllers/configureController.php |  1 +
 app/Models/Configuration.php            |  4 ++++
 app/i18n/en.php                         |  1 +
 app/i18n/fr.php                         |  1 +
 app/views/configure/display.phtml       | 10 ++++++++++
 app/views/helpers/javascript_vars.phtml |  3 ++-
 p/scripts/main.js                       | 34 +++++++++++++++++----------------
 7 files changed, 37 insertions(+), 17 deletions(-)

(limited to 'app/Models/Configuration.php')

diff --git a/app/Controllers/configureController.php b/app/Controllers/configureController.php
index 104fa8900..f831f25d0 100755
--- a/app/Controllers/configureController.php
+++ b/app/Controllers/configureController.php
@@ -148,6 +148,7 @@ class FreshRSS_configure_Controller extends Minz_ActionController {
 			$this->view->conf->_display_posts(Minz_Request::param('display_posts', false));
 			$this->view->conf->_onread_jump_next(Minz_Request::param('onread_jump_next', false));
 			$this->view->conf->_lazyload (Minz_Request::param('lazyload', false));
+			$this->view->conf->_sticky_post (Minz_Request::param('sticky_post', false));
 			$this->view->conf->_sort_order(Minz_Request::param('sort_order', 'DESC'));
 			$this->view->conf->_mark_when (array(
 				'article' => Minz_Request::param('mark_open_article', false),
diff --git a/app/Models/Configuration.php b/app/Models/Configuration.php
index bacb79510..48efe3bf6 100644
--- a/app/Models/Configuration.php
+++ b/app/Models/Configuration.php
@@ -17,6 +17,7 @@ class FreshRSS_Configuration {
 		'display_posts' => false,
 		'onread_jump_next' => true,
 		'lazyload' => true,
+		'sticky_post' => true,
 		'sort_order' => 'DESC',
 		'anon_access' => false,
 		'mark_when' => array(
@@ -140,6 +141,9 @@ class FreshRSS_Configuration {
 	public function _lazyload ($value) {
 		$this->data['lazyload'] = ((bool)$value) && $value !== 'no';
 	}
+	public function _sticky_post($value) {
+		$this->data['sticky_post'] = ((bool)$value) && $value !== 'no';
+	}
 	public function _sort_order ($value) {
 		$this->data['sort_order'] = $value === 'ASC' ? 'ASC' : 'DESC';
 	}
diff --git a/app/i18n/en.php b/app/i18n/en.php
index 69c2fd310..e67447520 100644
--- a/app/i18n/en.php
+++ b/app/i18n/en.php
@@ -215,6 +215,7 @@ return array (
 	'top_line'			=> 'Top line',
 	'bottom_line'			=> 'Bottom line',
 	'img_with_lazyload'		=> 'Use "lazy load" mode to load pictures',
+	'sticky_post'			=> 'Stick the article to the top when opened',
 	'auto_read_when'		=> 'Mark article as read…',
 	'article_selected'		=> 'when article is selected',
 	'article_open_on_website'	=> 'when article is opened on its original website',
diff --git a/app/i18n/fr.php b/app/i18n/fr.php
index 452c560a7..2bd4fabab 100644
--- a/app/i18n/fr.php
+++ b/app/i18n/fr.php
@@ -215,6 +215,7 @@ return array (
 	'top_line'			=> 'Ligne du haut',
 	'bottom_line'			=> 'Ligne du bas',
 	'img_with_lazyload'		=> 'Utiliser le mode “chargement différé” pour les images',
+	'sticky_post'			=> 'Aligner l’article en haut quand il est ouvert',
 	'auto_read_when'		=> 'Marquer un article comme lu…',
 	'article_selected'		=> 'lorsque l’article est sélectionné',
 	'article_open_on_website'	=> 'lorsque l’article est ouvert sur le site d’origine',
diff --git a/app/views/configure/display.phtml b/app/views/configure/display.phtml
index 9104e4ef1..846db4b4c 100644
--- a/app/views/configure/display.phtml
+++ b/app/views/configure/display.phtml
@@ -110,6 +110,16 @@
 			</div>
 		</div>
 
+		<div class="form-group">
+			<div class="group-controls">
+				<label class="checkbox" for="sticky_post">
+					<input type="checkbox" name="sticky_post" id="sticky_post" value="1"<?php echo $this->conf->sticky_post ? ' checked="checked"' : ''; ?> />
+					<?php echo Minz_Translate::t ('sticky_post'); ?>
+					<noscript> — <strong><?php echo Minz_Translate::t ('javascript_should_be_activated'); ?></strong></noscript>
+				</label>
+			</div>
+		</div>
+
 		<div class="form-group">
 			<label class="group-name"><?php echo Minz_Translate::t ('auto_read_when'); ?></label>
 			<div class="group-controls">
diff --git a/app/views/helpers/javascript_vars.phtml b/app/views/helpers/javascript_vars.phtml
index afe0ab258..2ce11d7d7 100644
--- a/app/views/helpers/javascript_vars.phtml
+++ b/app/views/helpers/javascript_vars.phtml
@@ -11,7 +11,8 @@ echo 'var ',
 	',auto_mark_scroll=', $mark['scroll'] ? 'true' : 'false',
 	',auto_load_more=', $this->conf->auto_load_more ? 'true' : 'false',
 	',full_lazyload=', $this->conf->lazyload && ($this->conf->display_posts || Minz_Request::param('output') === 'reader') ? 'true' : 'false',
-	',does_lazyload=', $this->conf->lazyload ? 'true' : 'false';
+	',does_lazyload=', $this->conf->lazyload ? 'true' : 'false',
+	',sticky_post=', $this->conf->sticky_post ? 'true' : 'false';
 
 $s = $this->conf->shortcuts;
 echo ',shortcuts={',
diff --git a/p/scripts/main.js b/p/scripts/main.js
index ec27bd50c..6cc992379 100644
--- a/p/scripts/main.js
+++ b/p/scripts/main.js
@@ -238,26 +238,28 @@ function toggleContent(new_active, old_active) {
 
 	var new_pos = new_active.position().top,
 		old_scroll = $(box_to_move).scrollTop();
-	if (hide_posts) {
+	if (sticky_post) {
+		if (hide_posts) {
 
-		new_pos = new_active.position().top;
-		old_scroll = $(box_to_move).scrollTop();
+			new_pos = new_active.position().top;
+			old_scroll = $(box_to_move).scrollTop();
 
-		if (relative_move) {
-			new_pos += old_scroll;
-		}
+			if (relative_move) {
+				new_pos += old_scroll;
+			}
 
-		if (old_active[0] !== new_active[0]) {
-			new_active.children(".flux_content").first().each(function () {
-				$(box_to_move).scrollTop(new_pos).scrollTop();
-			});
-		}
-	} else {
-		if (relative_move) {
-			new_pos += old_scroll;
-		}
+			if (old_active[0] !== new_active[0]) {
+				new_active.children(".flux_content").first().each(function () {
+					$(box_to_move).scrollTop(new_pos).scrollTop();
+				});
+			}
+		} else {
+			if (relative_move) {
+				new_pos += old_scroll;
+			}
 
-		$(box_to_move).scrollTop(new_pos).scrollTop();
+			$(box_to_move).scrollTop(new_pos).scrollTop();
+		}
 	}
 
 	if (auto_mark_article) {
-- 
cgit v1.2.3


From 29b3bbfe284a6e56413a2e89b740ffc4172c6847 Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Sat, 1 Mar 2014 14:45:58 +0100
Subject: API: Real password system

https://github.com/marienfressinaud/FreshRSS/issues/13
Expiring token not implemented yet
---
 app/Controllers/usersController.php | 12 +++++
 app/Models/Configuration.php        |  4 ++
 app/i18n/en.php                     |  1 +
 app/i18n/fr.php                     |  1 +
 app/views/configure/users.phtml     | 12 ++++-
 p/api/greader.php                   | 89 ++++++++++++++++++++++---------------
 6 files changed, 82 insertions(+), 37 deletions(-)

(limited to 'app/Models/Configuration.php')

diff --git a/app/Controllers/usersController.php b/app/Controllers/usersController.php
index bb4f34c5e..b03989cd7 100644
--- a/app/Controllers/usersController.php
+++ b/app/Controllers/usersController.php
@@ -32,6 +32,18 @@ class FreshRSS_users_Controller extends Minz_ActionController {
 			}
 			Minz_Session::_param('passwordHash', $this->view->conf->passwordHash);
 
+			$passwordPlain = Minz_Request::param('apiPasswordPlain', false);
+			if ($passwordPlain != '') {
+				if (!function_exists('password_hash')) {
+					include_once(LIB_PATH . '/password_compat.php');
+				}
+				$passwordHash = password_hash($passwordPlain, PASSWORD_BCRYPT, array('cost' => self::BCRYPT_COST));
+				$passwordPlain = '';
+				$passwordHash = preg_replace('/^\$2[xy]\$/', '\$2a\$', $passwordHash);	//Compatibility with bcrypt.js
+				$ok &= ($passwordHash != '');
+				$this->view->conf->_apiPasswordHash($passwordHash);
+			}
+
 			if (Minz_Configuration::isAdmin(Minz_Session::param('currentUser', '_'))) {
 				$this->view->conf->_mail_login(Minz_Request::param('mail_login', false));
 			}
diff --git a/app/Models/Configuration.php b/app/Models/Configuration.php
index 48efe3bf6..827a1d166 100644
--- a/app/Models/Configuration.php
+++ b/app/Models/Configuration.php
@@ -10,6 +10,7 @@ class FreshRSS_Configuration {
 		'mail_login' => '',
 		'token' => '',
 		'passwordHash' => '',	//CRYPT_BLOWFISH
+		'apiPasswordHash' => '',	//CRYPT_BLOWFISH
 		'posts_per_page' => 20,
 		'view_mode' => 'normal',
 		'default_view' => 'not_read',
@@ -165,6 +166,9 @@ class FreshRSS_Configuration {
 	public function _passwordHash ($value) {
 		$this->data['passwordHash'] = ctype_graph($value) && (strlen($value) >= 60) ? $value : '';
 	}
+	public function _apiPasswordHash ($value) {
+		$this->data['apiPasswordHash'] = ctype_graph($value) && (strlen($value) >= 60) ? $value : '';
+	}
 	public function _mail_login ($value) {
 		$value = filter_var($value, FILTER_VALIDATE_EMAIL);
 		if ($value) {
diff --git a/app/i18n/en.php b/app/i18n/en.php
index e67447520..d504ffc11 100644
--- a/app/i18n/en.php
+++ b/app/i18n/en.php
@@ -176,6 +176,7 @@ return array (
 	'current_user'			=> 'Current user',
 	'default_user'			=> 'Username of the default user <small>(maximum 16 alphanumeric characters)</small>',
 	'password_form'			=> 'Password<br /><small>(for the Web-form login method)</small>',
+	'password_api'			=> 'Password API<br /><small>(e.g., for mobile apps)</small>',
 	'persona_connection_email'	=> 'Login mail address<br /><small>(for <a href="https://persona.org/" rel="external">Mozilla Persona</a>)</small>',
 	'allow_anonymous'		=> 'Allow anonymous reading of the articles of the default user (%s)',
 	'allow_anonymous_refresh'	=> 'Allow anonymous refresh of the articles',
diff --git a/app/i18n/fr.php b/app/i18n/fr.php
index 2bd4fabab..c5581a78b 100644
--- a/app/i18n/fr.php
+++ b/app/i18n/fr.php
@@ -175,6 +175,7 @@ return array (
 
 	'current_user'			=> 'Utilisateur actuel',
 	'password_form'			=> 'Mot de passe<br /><small>(pour connexion par formulaire)</small>',
+	'password_api'			=> 'Mot de passe API<br /><small>(ex. : pour applis mobiles)</small>',
 	'default_user'			=> 'Nom de l’utilisateur par défaut <small>(16 caractères alphanumériques maximum)</small>',
 	'persona_connection_email'	=> 'Adresse courriel de connexion<br /><small>(pour <a href="https://persona.org/" rel="external">Mozilla Persona</a>)</small>',
 	'allow_anonymous'		=> 'Autoriser la lecture anonyme des articles de l’utilisateur par défaut (%s)',
diff --git a/app/views/configure/users.phtml b/app/views/configure/users.phtml
index 0677db881..f5c7dff17 100644
--- a/app/views/configure/users.phtml
+++ b/app/views/configure/users.phtml
@@ -20,7 +20,15 @@
 		<div class="form-group">
 			<label class="group-name" for="passwordPlain"><?php echo Minz_Translate::t('password_form'); ?></label>
 			<div class="group-controls">
-				<input type="password" id="passwordPlain" name="passwordPlain" autocomplete="off" pattern=".{7,}" />
+				<input type="password" id="passwordPlain" name="passwordPlain" autocomplete="off" pattern=".{7,}" <?php echo cryptAvailable() ? '' : 'disabled="disabled" '; ?>/>
+				<noscript><b><?php echo Minz_Translate::t('javascript_should_be_activated'); ?></b></noscript>
+			</div>
+		</div>
+
+		<div class="form-group">
+			<label class="group-name" for="apiPasswordPlain"><?php echo Minz_Translate::t('password_api'); ?></label>
+			<div class="group-controls">
+				<input type="password" id="apiPasswordPlain" name="apiPasswordPlain" autocomplete="off" pattern=".{7,}" <?php echo cryptAvailable() ? '' : 'disabled="disabled" '; ?>/>
 				<noscript><b><?php echo Minz_Translate::t('javascript_should_be_activated'); ?></b></noscript>
 			</div>
 		</div>
@@ -85,7 +93,7 @@
 			<label class="group-name" for="token"><?php echo Minz_Translate::t('auth_token'); ?></label>
 			<?php $token = $this->conf->token; ?>
 			<div class="group-controls">
-				<input type="text" id="token" name="token" value="<?php echo $token; ?>"  placeholder="<?php echo Minz_Translate::t('blank_to_disable'); ?>"<?php
+				<input type="text" id="token" name="token" value="<?php echo $token; ?>" placeholder="<?php echo Minz_Translate::t('blank_to_disable'); ?>"<?php
 					echo Minz_Configuration::canLogIn() ? '' : ' disabled="disabled"'; ?> />
 				<?php echo FreshRSS_Themes::icon('help'); ?> <?php echo Minz_Translate::t('explain_token', Minz_Url::display(null, 'html', true), $token); ?>
 			</div>
diff --git a/p/api/greader.php b/p/api/greader.php
index e99e1c0c8..035a031dd 100644
--- a/p/api/greader.php
+++ b/p/api/greader.php
@@ -20,9 +20,6 @@ Server-side API compatible with Google Reader API layer 2
 * https://github.com/theoldreader/api
 */
 
-define('TEMP_PASSWORD', 'temp123');	//Change to another ASCII password
-define('TEMP_AUTH', 'XtofqkkOkCULRLH8');	//Change to another random ASCII auth
-
 require('../../constants.php');
 require(LIB_PATH . '/lib_rss.php');	//Includes class autoloader
 
@@ -119,14 +116,28 @@ function checkCompatibility() {
 	exit();
 }
 
-function authorizationToUser() {
+function authorizationToUserConf() {
 	$headerAuth = headerVariable('Authorization', 'GoogleLogin_auth');	//Input is 'GoogleLogin auth', but PHP replaces spaces by '_'	http://php.net/language.variables.external
 	if ($headerAuth != '') {
 		$headerAuthX = explode('/', $headerAuth, 2);
-		if ((count($headerAuthX) === 2) && ($headerAuthX[1] === TEMP_AUTH)) {
+		if (count($headerAuthX) === 2) {
 			$user = $headerAuthX[0];
 			if (ctype_alnum($user)) {
-				return $user;
+				try {
+					$conf = new FreshRSS_Configuration($user);
+				} catch (Exception $e) {
+					logMe($e->getMessage() . "\n");
+					unauthorized();
+				}
+				if ($headerAuthX[1] === sha1(Minz_Configuration::salt() . $conf->user . $conf->apiPasswordHash)) {
+					return $conf;
+				} else {
+					logMe('Invalid API authorisation for user ' . $user . ': ' . $headerAuthX[1] . "\n");
+					Minz_Log::record('Invalid API authorisation for user ' . $user . ': ' . $headerAuthX[1], Minz_Log::WARNING);
+					unauthorized();
+				}
+			} else {
+				badRequest();
 			}
 		}
 	}
@@ -135,28 +146,45 @@ function authorizationToUser() {
 
 function clientLogin($email, $pass) {	//http://web.archive.org/web/20130604091042/http://undoc.in/clientLogin.html
 	logMe('clientLogin(' . $email . ")\n");
-	if ($pass !== TEMP_PASSWORD) {
-		unauthorized();
+	if (ctype_alnum($email)) {
+		if (!function_exists('password_verify')) {
+			include_once(LIB_PATH . '/password_compat.php');
+		}
+		try {
+			$conf = new FreshRSS_Configuration($email);
+		} catch (Exception $e) {
+			logMe($e->getMessage() . "\n");
+			Minz_Log::record('Invalid API user ' . $email, Minz_Log::WARNING);
+			unauthorized();
+		}
+		if ($conf->apiPasswordHash != '' && password_verify($pass, $conf->apiPasswordHash)) {
+			header('Content-Type: text/plain; charset=UTF-8');
+			$auth = $email . '/' . sha1(Minz_Configuration::salt() . $conf->user . $conf->apiPasswordHash);
+			echo 'SID=', $auth, "\n",
+				'Auth=', $auth, "\n";
+			exit();
+		} else {
+			Minz_Log::record('Password API mismatch for user ' . $email, Minz_Log::WARNING);
+			unauthorized();
+		}
+	} else {
+		badRequest();
 	}
-	header('Content-Type: text/plain; charset=UTF-8');
-	$auth = $email . '/' . TEMP_AUTH;
-	echo 'SID=', $auth, "\n",
-		'Auth=', $auth, "\n";
-	exit();
+	die();
 }
 
-function token($user) {
+function token($conf) {
 //http://blog.martindoms.com/2009/08/15/using-the-google-reader-api-part-1/	https://github.com/ericmann/gReader-Library/blob/master/greader.class.php
-	logMe('token('. $user . ")\n");
-	$token = 'ABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZ01234';	//Must have 57 characters...
+	logMe('token('. $conf->user . ")\n");	//TODO: Implement real token that expires
+	$token = str_pad(sha1(Minz_Configuration::salt() . $conf->user . $conf->apiPasswordHash), 57, 'Z');	//Must have 57 characters
 	echo $token, "\n";
 	exit();
 }
 
-function checkToken($user, $token) {
+function checkToken($conf, $token) {
 //http://code.google.com/p/google-reader-api/wiki/ActionToken
 	logMe('checkToken(' . $token . ")\n");
-	if ($token === 'ABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZ01234') {
+	if ($token === str_pad(sha1(Minz_Configuration::salt() . $conf->user . $conf->apiPasswordHash), 57, 'Z')) {
 		return true;
 	}
 	unauthorized();
@@ -462,32 +490,23 @@ if (!Minz_Configuration::apiEnabled()) {
 
 Minz_Session::init('FreshRSS');
 
-$user = authorizationToUser();
-$conf = null;
+$conf = authorizationToUserConf();
+$user = $conf == null ? '' : $conf->user;
 
 logMe('User => ' . $user . "\n");
 
-if ($user != null) {
-	try {
-		$conf = new FreshRSS_Configuration($user);
-	} catch (Exception $e) {
-		logMe($e->getMessage());
-		$user = null;
-		badRequest();
-	}
-}
-
 Minz_Session::_param('currentUser', $user);
 
 if (count($pathInfos) < 3) {
 	badRequest();
 }
 elseif ($pathInfos[1] === 'accounts') {
-	if (($pathInfos[2] === 'ClientLogin') && isset($_REQUEST['Email']) && isset($_REQUEST['Passwd']))
+	if (($pathInfos[2] === 'ClientLogin') && isset($_REQUEST['Email']) && isset($_REQUEST['Passwd'])) {
 		clientLogin($_REQUEST['Email'], $_REQUEST['Passwd']);
+	}
 }
 elseif ($pathInfos[1] === 'reader' && $pathInfos[2] === 'api' && isset($pathInfos[3]) && $pathInfos[3] === '0' && isset($pathInfos[4])) {
-	if ($user == null) {
+	if ($user == '') {
 		unauthorized();
 	}
 	$timestamp = isset($_GET['ck']) ? intval($_GET['ck']) : 0;	//ck=[unix timestamp] : Use the current Unix time here, helps Google with caching.
@@ -543,7 +562,7 @@ elseif ($pathInfos[1] === 'reader' && $pathInfos[2] === 'api' && isset($pathInfo
 			break;
 		case 'edit-tag':	//http://blog.martindoms.com/2010/01/20/using-the-google-reader-api-part-3/
 			$token = isset($_POST['T']) ? trim($_POST['T']) : '';
-			checkToken($user, $token);
+			checkToken($conf, $token);
 			$a = isset($_POST['a']) ? $_POST['a'] : '';	//Add:	user/-/state/com.google/read	user/-/state/com.google/starred
 			$r = isset($_POST['r']) ? $_POST['r'] : '';	//Remove:	user/-/state/com.google/read	user/-/state/com.google/starred
 			$e_ids = multiplePosts('i');	//item IDs
@@ -551,7 +570,7 @@ elseif ($pathInfos[1] === 'reader' && $pathInfos[2] === 'api' && isset($pathInfo
 			break;
 		case 'mark-all-as-read':
 			$token = isset($_POST['T']) ? trim($_POST['T']) : '';
-			checkToken($user, $token);
+			checkToken($conf, $token);
 			$streamId = $_POST['s'];	//StreamId
 			$ts = isset($_POST['ts']) ? $_POST['ts'] : '0';	//Older than timestamp in nanoseconds
 			if (!ctype_digit($ts)) {
@@ -560,7 +579,7 @@ elseif ($pathInfos[1] === 'reader' && $pathInfos[2] === 'api' && isset($pathInfo
 			markAllAsRead($streamId, $ts);
 			break;
 		case 'token':
-			Token($user);
+			Token($conf);
 			break;
 	}
 } elseif ($pathInfos[1] === 'check' && $pathInfos[2] === 'compatibility') {
-- 
cgit v1.2.3


From e9eca6aff6c7e2e2349b3b6cf714e2e7eb99405e Mon Sep 17 00:00:00 2001
From: Alexis Degrugillier <github@ainw.org>
Date: Wed, 5 Mar 2014 20:22:03 -0500
Subject: Sharing optimization

Change the storage and display of sharings to improve the time needed to generate the page.
Instead of looking for a default value when displaying the sharing links, they are added
during the configuration.
---
 app/Models/Configuration.php             | 15 +++++++++++----
 app/Models/Share.php                     |  3 ---
 app/views/helpers/view/normal_view.phtml |  2 +-
 3 files changed, 12 insertions(+), 8 deletions(-)

(limited to 'app/Models/Configuration.php')

diff --git a/app/Models/Configuration.php b/app/Models/Configuration.php
index 827a1d166..85e891b64 100644
--- a/app/Models/Configuration.php
+++ b/app/Models/Configuration.php
@@ -193,7 +193,9 @@ class FreshRSS_Configuration {
 			if (!is_array($value)) {
 				continue;
 			}
-			if (array_key_exists('url', $value)) {
+
+			// Verify URL and add default value when needed
+			if (array_key_exists('url', $value) && $value['url'] !== null) {
 				$is_url = (
 					filter_var ($value['url'], FILTER_VALIDATE_URL) ||
 					(version_compare(PHP_VERSION, '5.3.3', '<') &&
@@ -203,10 +205,15 @@ class FreshRSS_Configuration {
 				if (!$is_url) {
 					continue;
 				}
-				if (!array_key_exists('name', $value) || strcmp($value['name'], '') === 0) {
-					$value['name'] = $value['type'];
-				}
+			} else {
+				$value['url'] = null;
 			}
+
+			// Add a default name
+			if (!array_key_exists('name', $value) || strcmp($value['name'], '') === 0) {
+				$value['name'] = $value['type'];
+			}
+
 			$this->data['sharing'][] = $value;
 		}
 	}
diff --git a/app/Models/Share.php b/app/Models/Share.php
index 887fcef05..b146db722 100644
--- a/app/Models/Share.php
+++ b/app/Models/Share.php
@@ -3,9 +3,6 @@
 class FreshRSS_Share {
 
 	static public function generateUrl($options, $selected, $link, $title) {
-		if (!array_key_exists('url', $selected)) {
-			$selected['url'] = '';
-		}
 		$share = $options[$selected['type']];
 		$matches = array(
 			'~URL~',
diff --git a/app/views/helpers/view/normal_view.phtml b/app/views/helpers/view/normal_view.phtml
index ff535c60a..9fd06ebae 100644
--- a/app/views/helpers/view/normal_view.phtml
+++ b/app/views/helpers/view/normal_view.phtml
@@ -138,7 +138,7 @@ if (!empty($this->entries)) {
 							<?php foreach ($sharing as $share) :?>
 								<li class="item share">
 									<a target="_blank" href="<?php echo FreshRSS_Share::generateUrl($this->conf->shares, $share, $item->link(), $item->title() . ' . ' . $feed->name())?>">
-										<?php echo array_key_exists('name', $share) ? $share['name'] : Minz_Translate::t ($share['type']);?>
+										<?php echo Minz_Translate::t ($share['name']);?>
 									</a>
 								</li>
 							<?php endforeach;?>
-- 
cgit v1.2.3


From b0a3610db735c7f719e8c35d84ffdc5a4e4987af Mon Sep 17 00:00:00 2001
From: Alexis Degrugillier <github@ainw.org>
Date: Fri, 7 Mar 2014 21:04:16 -0500
Subject: Change test

---
 app/Models/Configuration.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'app/Models/Configuration.php')

diff --git a/app/Models/Configuration.php b/app/Models/Configuration.php
index 85e891b64..3e5cd8bad 100644
--- a/app/Models/Configuration.php
+++ b/app/Models/Configuration.php
@@ -210,7 +210,7 @@ class FreshRSS_Configuration {
 			}
 
 			// Add a default name
-			if (!array_key_exists('name', $value) || strcmp($value['name'], '') === 0) {
+			if (empty($value['name'])) {
 				$value['name'] = $value['type'];
 			}
 
-- 
cgit v1.2.3


From 339a0dd49c79b9adba67483a3cab55c4cb2e2066 Mon Sep 17 00:00:00 2001
From: Alexis Degrugillier <github@ainw.org>
Date: Sat, 8 Mar 2014 09:23:59 -0500
Subject: Change test on URL parameter

---
 app/Models/Configuration.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'app/Models/Configuration.php')

diff --git a/app/Models/Configuration.php b/app/Models/Configuration.php
index 3e5cd8bad..80031369e 100644
--- a/app/Models/Configuration.php
+++ b/app/Models/Configuration.php
@@ -195,7 +195,7 @@ class FreshRSS_Configuration {
 			}
 
 			// Verify URL and add default value when needed
-			if (array_key_exists('url', $value) && $value['url'] !== null) {
+			if (isset($value['url'])) {
 				$is_url = (
 					filter_var ($value['url'], FILTER_VALIDATE_URL) ||
 					(version_compare(PHP_VERSION, '5.3.3', '<') &&
-- 
cgit v1.2.3


From 3e665bcf9aefe40499b5d16e901d0c7427e367af Mon Sep 17 00:00:00 2001
From: Alexis Degrugillier <github@ainw.org>
Date: Sat, 12 Apr 2014 11:51:44 -0400
Subject: Delete favorite button

I extract drop-down menu actions to make them as button action in the page header.
I removed the favorite button on the category list because it is a duplicate from the button action.
Now button action act as filters and you can combine them.

It is a test to see if we can keep it like that. There is still work to do to extract other actions from the drop-down list.
I did not want to change everything if we don't keep it.

See #376 and #277
---
 app/Controllers/indexController.php |   7 +--
 app/Models/Configuration.php        |   9 +++-
 app/Models/EntryDAO.php             |  32 ++++++-----
 app/i18n/en.php                     |   4 +-
 app/i18n/fr.php                     |   2 +-
 app/layout/aside_flux.phtml         |   9 ----
 app/layout/nav_menu.phtml           | 102 +++++++++++++++++++++++-------------
 app/views/configure/reading.phtml   |   2 +-
 p/themes/Dark/freshrss.css          |   5 ++
 p/themes/Dark/global.css            |   6 ---
 p/themes/Flat/freshrss.css          |   5 ++
 p/themes/Flat/global.css            |   6 ---
 p/themes/Origine/freshrss.css       |   5 ++
 p/themes/Origine/global.css         |   6 ---
 14 files changed, 111 insertions(+), 89 deletions(-)

(limited to 'app/Models/Configuration.php')

diff --git a/app/Controllers/indexController.php b/app/Controllers/indexController.php
index 9da1e5022..243d887ac 100755
--- a/app/Controllers/indexController.php
+++ b/app/Controllers/indexController.php
@@ -91,14 +91,11 @@ class FreshRSS_index_Controller extends Minz_ActionController {
 		$nb = Minz_Request::param ('nb', $this->view->conf->posts_per_page);
 		$first = Minz_Request::param ('next', '');
 
-		if ($state === 'not_read') {	//Any unread article in this category at all?
+		if ($state === FreshRSS_Configuration::STATE_NOT_READ) {	//Any unread article in this category at all?
 			switch ($getType) {
 				case 'a':
 					$hasUnread = $this->view->nb_not_read > 0;
 					break;
-				case 's':
-					$hasUnread = $this->view->nb_favorites['unread'] > 0;
-					break;
 				case 'c':
 					$hasUnread = (!isset($this->view->cat_aside[$getId])) || ($this->view->cat_aside[$getId]->nbNotRead() > 0);
 					break;
@@ -128,7 +125,7 @@ class FreshRSS_index_Controller extends Minz_ActionController {
 
 			// Si on a récupéré aucun article "non lus"
 			// on essaye de récupérer tous les articles
-			if ($state === 'not_read' && empty($entries) && ($state_param === null)) {
+			if ($state === FreshRSS_Configuration::STATE_NOT_READ && empty($entries) && ($state_param === null)) {
 				Minz_Log::record ('Conflicting information about nbNotRead!', Minz_Log::DEBUG);
 				$this->view->state = 'all';
 				$entries = $entryDAO->listWhere($getType, $getId, 'all', $order, $nb, $first, $filter, $date_min, true, $keepHistoryDefault);
diff --git a/app/Models/Configuration.php b/app/Models/Configuration.php
index 80031369e..f9ea47be6 100644
--- a/app/Models/Configuration.php
+++ b/app/Models/Configuration.php
@@ -1,6 +1,11 @@
 <?php
 
 class FreshRSS_Configuration {
+	const STATE_READ = 1;
+	const STATE_NOT_READ = 2;
+	const STATE_FAVORITE = 4;
+	const STATE_NOT_FAVORITE = 8;
+
 	private $filename;
 
 	private $data = array(
@@ -13,7 +18,7 @@ class FreshRSS_Configuration {
 		'apiPasswordHash' => '',	//CRYPT_BLOWFISH
 		'posts_per_page' => 20,
 		'view_mode' => 'normal',
-		'default_view' => 'not_read',
+		'default_view' => self::STATE_NOT_READ,
 		'auto_load_more' => true,
 		'display_posts' => false,
 		'onread_jump_next' => true,
@@ -131,7 +136,7 @@ class FreshRSS_Configuration {
 		}
 	}
 	public function _default_view ($value) {
-		$this->data['default_view'] = $value === 'all' ? 'all' : 'not_read';
+		$this->data['default_view'] = $value === 'all' ? 'all' : self::STATE_NOT_READ;
 	}
 	public function _display_posts ($value) {
 		$this->data['display_posts'] = ((bool)$value) && $value !== 'no';
diff --git a/app/Models/EntryDAO.php b/app/Models/EntryDAO.php
index 6d00967fc..2f5a9e1f6 100644
--- a/app/Models/EntryDAO.php
+++ b/app/Models/EntryDAO.php
@@ -415,9 +415,6 @@ class FreshRSS_EntryDAO extends Minz_ModelPdo {
 				$where .= 'f.priority > 0 ';
 				$joinFeed = true;
 				break;
-			case 's':
-				$where .= 'e1.is_favorite = 1 ';
-				break;
 			case 'c':
 				$where .= 'f.category = ? ';
 				$values[] = intval($id);
@@ -433,21 +430,28 @@ class FreshRSS_EntryDAO extends Minz_ModelPdo {
 			default:
 				throw new FreshRSS_EntriesGetter_Exception ('Bad type in Entry->listByType: [' . $type . ']!');
 		}
-		switch ($state) {
-			case 'all':
-				break;
-			case 'not_read':
+
+		if ($state & FreshRSS_Configuration::STATE_NOT_READ) {
+			if (!($state & FreshRSS_Configuration::STATE_READ)) {
 				$where .= 'AND e1.is_read = 0 ';
-				break;
-			case 'read':
+			}
+		}
+		if ($state & FreshRSS_Configuration::STATE_READ) {
+			if (!($state & FreshRSS_Configuration::STATE_NOT_READ)) {
 				$where .= 'AND e1.is_read = 1 ';
-				break;
-			case 'favorite':
+			}
+		}
+		if ($state & FreshRSS_Configuration::STATE_NOT_FAVORITE) {
+			if (!($state & FreshRSS_Configuration::STATE_FAVORITE)) {
+				$where .= 'AND e1.is_favorite = 0 ';
+			}
+		}
+		if ($state & FreshRSS_Configuration::STATE_FAVORITE) {
+			if (!($state & FreshRSS_Configuration::STATE_NOT_FAVORITE)) {
 				$where .= 'AND e1.is_favorite = 1 ';
-				break;
-			default:
-				throw new FreshRSS_EntriesGetter_Exception ('Bad state in Entry->listByType: [' . $state . ']!');
+			}
 		}
+
 		switch ($order) {
 			case 'DESC':
 			case 'ASC':
diff --git a/app/i18n/en.php b/app/i18n/en.php
index d6096bbe8..01f31eca7 100644
--- a/app/i18n/en.php
+++ b/app/i18n/en.php
@@ -27,7 +27,6 @@ return array (
 	'subscription_management'	=> 'Subscriptions management',
 	'main_stream'			=> 'Main stream',
 	'all_feeds'			=> 'All feeds',
-	'favorite_feeds'		=> 'Favourites (%d)',
 	'not_read'			=> '%d unread',
 	'not_reads'			=> '%d unread',
 
@@ -51,7 +50,8 @@ return array (
 	'show_all_articles'		=> 'Show all articles',
 	'show_not_reads'		=> 'Show only unread',
 	'show_read'			=> 'Show only read',
-	'show_favorite'			=> 'Show favorites',
+	'show_favorite'			=> 'Show only favorites',
+	'show_not_favorite'		=> 'Show all but favorites',
 	'older_first'			=> 'Oldest first',
 	'newer_first'			=> 'Newer first',
 
diff --git a/app/i18n/fr.php b/app/i18n/fr.php
index d89cbb098..299d4d242 100644
--- a/app/i18n/fr.php
+++ b/app/i18n/fr.php
@@ -27,7 +27,6 @@ return array (
 	'subscription_management'	=> 'Gestion des abonnements',
 	'main_stream'			=> 'Flux principal',
 	'all_feeds'			=> 'Tous les flux',
-	'favorite_feeds'		=> 'Favoris (%d)',
 	'not_read'			=> '%d non lu',
 	'not_reads'			=> '%d non lus',
 
@@ -52,6 +51,7 @@ return array (
 	'show_not_reads'		=> 'Afficher les non lus',
 	'show_read'			=> 'Afficher les lus',
 	'show_favorite'			=> 'Afficher les favoris',
+	'show_not_favorite'		=> 'Afficher tout sauf les favoris',
 	'older_first'			=> 'Plus anciens en premier',
 	'newer_first'			=> 'Plus récents en premier',
 
diff --git a/app/layout/aside_flux.phtml b/app/layout/aside_flux.phtml
index 817dae676..0542e6b66 100644
--- a/app/layout/aside_flux.phtml
+++ b/app/layout/aside_flux.phtml
@@ -28,15 +28,6 @@
 			</div>
 		</li>
 
-		<li>
-			<div class="category favorites<?php echo $this->get_c == 's' ? ' active' : ''; ?>">
-				<a data-unread="<?php echo formatNumber($this->nb_favorites['unread']); ?>" class="btn<?php echo $this->get_c == 's' ? ' active' : ''; ?>" href="<?php $arUrl['params']['get'] = 's'; echo Minz_Url::display($arUrl); ?>">
-					<?php echo FreshRSS_Themes::icon('bookmark'); ?>
-					<?php echo Minz_Translate::t('favorite_feeds', formatNumber($this->nb_favorites['all'])); ?>
-				</a>
-			</div>
-		</li>
-
 		<?php
 		foreach ($this->cat_aside as $cat) {
 			$feeds = $cat->feeds ();
diff --git a/app/layout/nav_menu.phtml b/app/layout/nav_menu.phtml
index ffdc95b24..129647607 100644
--- a/app/layout/nav_menu.phtml
+++ b/app/layout/nav_menu.phtml
@@ -11,6 +11,70 @@
 	<?php } ?>
 
 	<?php if ($this->loginOk) { ?>
+	<?php $url_state = $this->url;
+		if ($this->state & FreshRSS_Configuration::STATE_READ) {
+			$url_state['params']['state'] = $this->state - FreshRSS_Configuration::STATE_READ;
+			$checked = 'true';
+		} else {
+			$url_state['params']['state'] = $this->state + FreshRSS_Configuration::STATE_READ;
+			$checked = 'false';
+		}
+	?>
+	<a id="actualize"
+	   class="btn"
+	   aria-checked="<?php echo $checked; ?>"
+	   href="<?php echo Minz_Url::display ($url_state); ?>"
+	   title="<?php echo Minz_Translate::t ('show_read'); ?>">
+		<?php echo FreshRSS_Themes::icon('read'); ?>
+	</a>
+	<?php
+		if ($this->state & FreshRSS_Configuration::STATE_NOT_READ) {
+			$url_state['params']['state'] = $this->state - FreshRSS_Configuration::STATE_NOT_READ;
+			$checked = 'true';
+		} else {
+			$url_state['params']['state'] = $this->state + FreshRSS_Configuration::STATE_NOT_READ;
+			$checked = 'false';
+		}
+	?>
+	<a id="actualize"
+	   class="btn"
+	   aria-checked="<?php echo $checked; ?>"
+	   href="<?php echo Minz_Url::display ($url_state); ?>"
+	   title="<?php echo Minz_Translate::t ('show_not_reads'); ?>">
+		<?php echo FreshRSS_Themes::icon('unread'); ?>
+	</a>
+	<?php
+		if ($this->state & FreshRSS_Configuration::STATE_FAVORITE) {
+			$url_state['params']['state'] = $this->state - FreshRSS_Configuration::STATE_FAVORITE;
+			$checked = 'true';
+		} else {
+			$url_state['params']['state'] = $this->state + FreshRSS_Configuration::STATE_FAVORITE;
+			$checked = 'false';
+		}
+	?>
+	<a id="actualize"
+	   class="btn"
+	   aria-checked="<?php echo $checked; ?>"
+	   href="<?php echo Minz_Url::display ($url_state); ?>"
+	   title="<?php echo Minz_Translate::t ('show_favorite'); ?>">
+		<?php echo FreshRSS_Themes::icon('starred'); ?>
+	</a>
+	<?php
+		if ($this->state & FreshRSS_Configuration::STATE_NOT_FAVORITE) {
+			$url_state['params']['state'] = $this->state - FreshRSS_Configuration::STATE_NOT_FAVORITE;
+			$checked = 'true';
+		} else {
+			$url_state['params']['state'] = $this->state + FreshRSS_Configuration::STATE_NOT_FAVORITE;
+			$checked = 'false';
+		}
+	?>
+	<a id="actualize"
+	   class="btn"
+	   aria-checked="<?php echo $checked; ?>"
+	   href="<?php echo Minz_Url::display ($url_state); ?>"
+	   title="<?php echo Minz_Translate::t ('show_not_favorite'); ?>">
+		<?php echo FreshRSS_Themes::icon('non-starred'); ?>
+	</a>
 	<?php
 		$get = false;
 		$string_mark = Minz_Translate::t ('mark_all_read');
@@ -86,7 +150,7 @@
 			<ul class="dropdown-menu">
 				<li class="dropdown-close"><a href="#close">❌</a></li>
 
-				<li class="item"><a href="<?php echo $markReadUrl; ?>"><?php echo $string_mark; ?></a></li> 
+				<li class="item"><a href="<?php echo $markReadUrl; ?>"><?php echo $string_mark; ?></a></li>
 				<li class="separator"></li>
 <?php
 	$today = $this->today;
@@ -132,42 +196,6 @@
 
 			<li class="separator"></li>
 
-			<?php
-				$url_state = $this->url;
-				$url_state['params']['state'] = 'all';
-			?>
-			<li class="item" role="checkbox" aria-checked="<?php echo ($this->state === 'all') ? 'true' :'false'; ?>">
-				<a class="print_all" href="<?php echo Minz_Url::display ($url_state); ?>">
-					<?php echo Minz_Translate::t ('show_all_articles'); ?>
-				</a>
-			</li>
-			<?php
-				$url_state['params']['state'] = 'not_read';
-			?>
-			<li class="item" role="checkbox" aria-checked="<?php echo ($this->state === 'not_read') ? 'true' :'false'; ?>">
-				<a class="print_non_read" href="<?php echo Minz_Url::display ($url_state); ?>">
-					<?php echo Minz_Translate::t ('show_not_reads'); ?>
-				</a>
-			</li>
-			<?php
-				$url_state['params']['state'] = 'read';
-			?>
-			<li class="item" role="checkbox" aria-checked="<?php echo ($this->state === 'read') ? 'true' :'false'; ?>">
-				<a class="print_read" href="<?php echo Minz_Url::display ($url_state); ?>">
-					<?php echo Minz_Translate::t ('show_read'); ?>
-				</a>
-			</li>
-			<?php
-				$url_state['params']['state'] = 'favorite';
-			?>
-			<li class="item" role="checkbox" aria-checked="<?php echo ($this->state === 'favorite') ? 'true' :'false'; ?>">
-				<a class="print_favorite" href="<?php echo Minz_Url::display ($url_state); ?>">
-					<?php echo Minz_Translate::t ('show_favorite'); ?>
-				</a>
-			</li>
-
-			<li class="separator"></li>
-
 			<li class="item">
 				<?php
 					$url_order = $this->url;
diff --git a/app/views/configure/reading.phtml b/app/views/configure/reading.phtml
index c32c59305..b778a4d22 100644
--- a/app/views/configure/reading.phtml
+++ b/app/views/configure/reading.phtml
@@ -36,7 +36,7 @@
 					<?php echo Minz_Translate::t ('show_all_articles'); ?>
 				</label>
 				<label class="radio" for="radio_not_read">
-					<input type="radio" name="default_view" id="radio_not_read" value="not_read"<?php echo $this->conf->default_view === 'not_read' ? ' checked="checked"' : ''; ?> />
+					<input type="radio" name="default_view" id="radio_not_read" value="<?php echo FreshRSS_Configuration::STATE_NOT_READ; ?>"<?php echo $this->conf->default_view === FreshRSS_Configuration::STATE_NOT_READ ? ' checked="checked"' : ''; ?> />
 					<?php echo Minz_Translate::t ('show_not_reads'); ?>
 				</label>
 			</div>
diff --git a/p/themes/Dark/freshrss.css b/p/themes/Dark/freshrss.css
index be8d6b86a..d7da91bb8 100644
--- a/p/themes/Dark/freshrss.css
+++ b/p/themes/Dark/freshrss.css
@@ -88,6 +88,11 @@
 		.nav_menu .search {
 			display:none;
 		}
+		.nav_menu .btn[aria-checked="true"]:before{
+			content: '✓';
+			font-size: 2.5rem;
+			position: absolute;
+		}
 
 .favicon {
 	height: 16px;
diff --git a/p/themes/Dark/global.css b/p/themes/Dark/global.css
index e296f2188..0f1baa216 100644
--- a/p/themes/Dark/global.css
+++ b/p/themes/Dark/global.css
@@ -416,12 +416,6 @@ input, select, textarea {
 				background: #26303F;
 				color: #888;
 			}
-				.dropdown-menu > .item[aria-checked="true"] > a:before {
-					content: '✓ ';
-					font-weight: bold;
-					margin: 0 0 0 -1.2em;
-					padding: 0 0.2em 0 0;
-				}
 				.dropdown-menu > .item:hover > a {
 					color: #888;
 					text-decoration: none;
diff --git a/p/themes/Flat/freshrss.css b/p/themes/Flat/freshrss.css
index 1f297309b..f1737d23e 100644
--- a/p/themes/Flat/freshrss.css
+++ b/p/themes/Flat/freshrss.css
@@ -87,6 +87,11 @@ body {
 		.nav_menu .search {
 			display:none;
 		}
+		.nav_menu .btn[aria-checked="true"]:before{
+			content: '✓';
+			font-size: 2.5rem;
+			position: absolute;
+		}
 
 .favicon {
 	height: 16px;
diff --git a/p/themes/Flat/global.css b/p/themes/Flat/global.css
index 4044dd781..68e9fa359 100644
--- a/p/themes/Flat/global.css
+++ b/p/themes/Flat/global.css
@@ -412,12 +412,6 @@ input, select, textarea {
 				background: #2980b9;
 				color: #fff;
 			}
-				.dropdown-menu > .item[aria-checked="true"] > a:before {
-					content: '✓ ';
-					font-weight: bold;
-					margin: 0 0 0 -1.2em;
-					padding: 0 0.2em 0 0;
-				}
 				.dropdown-menu > .item:hover > a {
 					color: #fff;
 					text-decoration: none;
diff --git a/p/themes/Origine/freshrss.css b/p/themes/Origine/freshrss.css
index 662e085d6..d33ee4f54 100644
--- a/p/themes/Origine/freshrss.css
+++ b/p/themes/Origine/freshrss.css
@@ -89,6 +89,11 @@
 		.nav_menu .search {
 			display:none;
 		}
+		.nav_menu .btn[aria-checked="true"]:before{
+			content: '✓';
+			font-size: 2.5rem;
+			position: absolute;
+		}
 
 .favicon {
 	height: 16px;
diff --git a/p/themes/Origine/global.css b/p/themes/Origine/global.css
index 5792c9e4d..7fb3a8f95 100644
--- a/p/themes/Origine/global.css
+++ b/p/themes/Origine/global.css
@@ -428,12 +428,6 @@ input, select, textarea {
 				background: #0062BE;
 				color: #fff;
 			}
-				.dropdown-menu > .item[aria-checked="true"] > a:before {
-					content: '✓ ';
-					font-weight: bold;
-					margin: 0 0 0 -1.2em;
-					padding: 0 0.2em 0 0;
-				}
 				.dropdown-menu > .item:hover > a {
 					color: #fff;
 					text-decoration: none;
-- 
cgit v1.2.3


From 86066b1659e33eb5fdfbcae5fb7f0bd93604d442 Mon Sep 17 00:00:00 2001
From: Alexis Degrugillier <github@ainw.org>
Date: Sun, 13 Apr 2014 07:28:41 -0400
Subject: Add a new status for 'ALL'

I made the conversion in every file I can think of.
It should not have any reference to the string 'all' for the state context
---
 app/Controllers/importExportController.php | 4 ++--
 app/Controllers/indexController.php        | 8 ++++----
 app/Models/Configuration.php               | 3 ++-
 app/Models/EntryDAO.php                    | 9 ++++++---
 app/views/configure/reading.phtml          | 2 +-
 p/api/greader.php                          | 8 ++++----
 6 files changed, 19 insertions(+), 15 deletions(-)

(limited to 'app/Models/Configuration.php')

diff --git a/app/Controllers/importExportController.php b/app/Controllers/importExportController.php
index a9b103a34..b8253b7bd 100644
--- a/app/Controllers/importExportController.php
+++ b/app/Controllers/importExportController.php
@@ -370,7 +370,7 @@ class FreshRSS_importExport_Controller extends Minz_ActionController {
 			$this->view->type = 'starred';
 			$unread_fav = $this->entryDAO->countUnreadReadFavorites();
 			$this->view->entries = $this->entryDAO->listWhere(
-				's', '', 'all', 'ASC',
+				's', '', FreshRSS_Configuration::STATE_ALL, 'ASC',
 				$unread_fav['all']
 			);
 		} elseif ($type == 'feed' && !is_null($feed)) {
@@ -379,7 +379,7 @@ class FreshRSS_importExport_Controller extends Minz_ActionController {
 			);
 			$this->view->type = 'feed/' . $feed->id();
 			$this->view->entries = $this->entryDAO->listWhere(
-				'f', $feed->id(), 'all', 'ASC',
+				'f', $feed->id(), FreshRSS_Configuration::STATE_ALL, 'ASC',
 				$this->view->conf->posts_per_page
 			);
 			$this->view->feed = $feed;
diff --git a/app/Controllers/indexController.php b/app/Controllers/indexController.php
index 243d887ac..48471b480 100755
--- a/app/Controllers/indexController.php
+++ b/app/Controllers/indexController.php
@@ -85,7 +85,7 @@ class FreshRSS_index_Controller extends Minz_ActionController {
 		$state_param = Minz_Request::param ('state', null);
 		$filter = Minz_Request::param ('search', '');
 		if (!empty($filter)) {
-			$state = 'all';	//Search always in read and unread articles
+			$state = FreshRSS_Configuration::STATE_ALL;	//Search always in read and unread articles
 		}
 		$this->view->order = $order = Minz_Request::param ('order', $this->view->conf->sort_order);
 		$nb = Minz_Request::param ('nb', $this->view->conf->posts_per_page);
@@ -108,7 +108,7 @@ class FreshRSS_index_Controller extends Minz_ActionController {
 					break;
 			}
 			if (!$hasUnread && ($state_param === null)) {
-				$this->view->state = $state = 'all';
+				$this->view->state = $state = FreshRSS_Configuration::STATE_ALL;
 			}
 		}
 
@@ -127,8 +127,8 @@ class FreshRSS_index_Controller extends Minz_ActionController {
 			// on essaye de récupérer tous les articles
 			if ($state === FreshRSS_Configuration::STATE_NOT_READ && empty($entries) && ($state_param === null)) {
 				Minz_Log::record ('Conflicting information about nbNotRead!', Minz_Log::DEBUG);
-				$this->view->state = 'all';
-				$entries = $entryDAO->listWhere($getType, $getId, 'all', $order, $nb, $first, $filter, $date_min, true, $keepHistoryDefault);
+				$this->view->state = FreshRSS_Configuration::STATE_ALL;
+				$entries = $entryDAO->listWhere($getType, $getId, $this->view->state, $order, $nb, $first, $filter, $date_min, true, $keepHistoryDefault);
 			}
 
 			if (count($entries) <= $nb) {
diff --git a/app/Models/Configuration.php b/app/Models/Configuration.php
index f9ea47be6..e693542e0 100644
--- a/app/Models/Configuration.php
+++ b/app/Models/Configuration.php
@@ -1,6 +1,7 @@
 <?php
 
 class FreshRSS_Configuration {
+	const STATE_ALL = 0;
 	const STATE_READ = 1;
 	const STATE_NOT_READ = 2;
 	const STATE_FAVORITE = 4;
@@ -136,7 +137,7 @@ class FreshRSS_Configuration {
 		}
 	}
 	public function _default_view ($value) {
-		$this->data['default_view'] = $value === 'all' ? 'all' : self::STATE_NOT_READ;
+		$this->data['default_view'] = $value === self::STATE_ALL ? self::STATE_ALL : self::STATE_NOT_READ;
 	}
 	public function _display_posts ($value) {
 		$this->data['display_posts'] = ((bool)$value) && $value !== 'no';
diff --git a/app/Models/EntryDAO.php b/app/Models/EntryDAO.php
index 2f5a9e1f6..b9cbfd584 100644
--- a/app/Models/EntryDAO.php
+++ b/app/Models/EntryDAO.php
@@ -406,7 +406,10 @@ class FreshRSS_EntryDAO extends Minz_ModelPdo {
 		return isset ($entries[0]) ? $entries[0] : null;
 	}
 
-	private function sqlListWhere($type = 'a', $id = '', $state = 'all', $order = 'DESC', $limit = 1, $firstId = '', $filter = '', $date_min = 0, $showOlderUnreadsorFavorites = false, $keepHistoryDefault = 0) {
+	private function sqlListWhere($type = 'a', $id = '', $state = null , $order = 'DESC', $limit = 1, $firstId = '', $filter = '', $date_min = 0, $showOlderUnreadsorFavorites = false, $keepHistoryDefault = 0) {
+		if (!$state) {
+			$state = FreshRSS_Configuration::STATE_ALL;
+		}
 		$where = '';
 		$joinFeed = false;
 		$values = array();
@@ -532,7 +535,7 @@ class FreshRSS_EntryDAO extends Minz_ModelPdo {
 			. ($limit > 0 ? ' LIMIT ' . $limit : ''));	//TODO: See http://explainextended.com/2009/10/23/mysql-order-by-limit-performance-late-row-lookups/
 	}
 
-	public function listWhere($type = 'a', $id = '', $state = 'all', $order = 'DESC', $limit = 1, $firstId = '', $filter = '', $date_min = 0, $showOlderUnreadsorFavorites = false, $keepHistoryDefault = 0) {
+	public function listWhere($type = 'a', $id = '', $state = null, $order = 'DESC', $limit = 1, $firstId = '', $filter = '', $date_min = 0, $showOlderUnreadsorFavorites = false, $keepHistoryDefault = 0) {
 		list($values, $sql) = $this->sqlListWhere($type, $id, $state, $order, $limit, $firstId, $filter, $date_min, $showOlderUnreadsorFavorites, $keepHistoryDefault);
 
 		$sql = 'SELECT e.id, e.guid, e.title, e.author, UNCOMPRESS(e.content_bin) AS content, e.link, e.date, e.is_read, e.is_favorite, e.id_feed, e.tags '
@@ -548,7 +551,7 @@ class FreshRSS_EntryDAO extends Minz_ModelPdo {
 		return self::daoToEntry ($stm->fetchAll (PDO::FETCH_ASSOC));
 	}
 
-	public function listIdsWhere($type = 'a', $id = '', $state = 'all', $order = 'DESC', $limit = 1, $firstId = '', $filter = '', $date_min = 0, $showOlderUnreadsorFavorites = false, $keepHistoryDefault = 0) {	//For API
+	public function listIdsWhere($type = 'a', $id = '', $state = null, $order = 'DESC', $limit = 1, $firstId = '', $filter = '', $date_min = 0, $showOlderUnreadsorFavorites = false, $keepHistoryDefault = 0) {	//For API
 		list($values, $sql) = $this->sqlListWhere($type, $id, $state, $order, $limit, $firstId, $filter, $date_min, $showOlderUnreadsorFavorites, $keepHistoryDefault);
 
 		$stm = $this->bd->prepare($sql);
diff --git a/app/views/configure/reading.phtml b/app/views/configure/reading.phtml
index b778a4d22..b277397b1 100644
--- a/app/views/configure/reading.phtml
+++ b/app/views/configure/reading.phtml
@@ -32,7 +32,7 @@
 					<option value="global"<?php echo $this->conf->view_mode === 'global' ? ' selected="selected"' : ''; ?>><?php echo Minz_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->default_view === 'all' ? ' checked="checked"' : ''; ?> />
+					<input type="radio" name="default_view" id="radio_all" value="<?php echo FreshRSS_Configuration::STATE_ALL; ?>"<?php echo $this->conf->default_view === FreshRSS_Configuration::STATE_ALL ? ' checked="checked"' : ''; ?> />
 					<?php echo Minz_Translate::t ('show_all_articles'); ?>
 				</label>
 				<label class="radio" for="radio_not_read">
diff --git a/p/api/greader.php b/p/api/greader.php
index 741c4fbd4..9836f2f02 100644
--- a/p/api/greader.php
+++ b/p/api/greader.php
@@ -353,10 +353,10 @@ function streamContents($path, $include_target, $start_time, $count, $order, $ex
 
 	switch ($exclude_target) {
 		case 'user/-/state/com.google/read':
-			$state = 'not_read';
+			$state = FreshRSS_Configuration::STATE_NOT_READ;
 			break;
 		default:
-			$state = 'all';
+			$state = FreshRSS_Configuration::STATE_ALL;
 			break;
 	}
 
@@ -451,10 +451,10 @@ function streamContentsItemsIds($streamId, $start_time, $count, $order, $exclude
 
 	switch ($exclude_target) {
 		case 'user/-/state/com.google/read':
-			$state = 'not_read';
+			$state = FreshRSS_Configuration::STATE_NOT_READ;
 			break;
 		default:
-			$state = 'all';
+			$state = FreshRSS_Configuration::STATE_ALL;
 			break;
 	}
 
-- 
cgit v1.2.3


From 3a736e902c5af7f215bbf91dc54be00bf82f8df3 Mon Sep 17 00:00:00 2001
From: Alexis Degrugillier <github@ainw.org>
Date: Sun, 13 Apr 2014 08:16:43 -0400
Subject: Move state constants from Configuration to Entry

---
 app/Controllers/importExportController.php |  4 ++--
 app/Controllers/indexController.php        | 10 +++++-----
 app/Models/Configuration.php               | 10 ++--------
 app/Models/Entry.php                       |  5 +++++
 app/Models/EntryDAO.php                    | 18 +++++++++---------
 app/layout/nav_menu.phtml                  | 24 ++++++++++++------------
 app/views/configure/reading.phtml          |  4 ++--
 p/api/greader.php                          |  8 ++++----
 8 files changed, 41 insertions(+), 42 deletions(-)

(limited to 'app/Models/Configuration.php')

diff --git a/app/Controllers/importExportController.php b/app/Controllers/importExportController.php
index b8253b7bd..3cd791781 100644
--- a/app/Controllers/importExportController.php
+++ b/app/Controllers/importExportController.php
@@ -370,7 +370,7 @@ class FreshRSS_importExport_Controller extends Minz_ActionController {
 			$this->view->type = 'starred';
 			$unread_fav = $this->entryDAO->countUnreadReadFavorites();
 			$this->view->entries = $this->entryDAO->listWhere(
-				's', '', FreshRSS_Configuration::STATE_ALL, 'ASC',
+				's', '', FreshRSS_Entry::STATE_ALL, 'ASC',
 				$unread_fav['all']
 			);
 		} elseif ($type == 'feed' && !is_null($feed)) {
@@ -379,7 +379,7 @@ class FreshRSS_importExport_Controller extends Minz_ActionController {
 			);
 			$this->view->type = 'feed/' . $feed->id();
 			$this->view->entries = $this->entryDAO->listWhere(
-				'f', $feed->id(), FreshRSS_Configuration::STATE_ALL, 'ASC',
+				'f', $feed->id(), FreshRSS_Entry::STATE_ALL, 'ASC',
 				$this->view->conf->posts_per_page
 			);
 			$this->view->feed = $feed;
diff --git a/app/Controllers/indexController.php b/app/Controllers/indexController.php
index 52dd01e0a..3445c0bd4 100755
--- a/app/Controllers/indexController.php
+++ b/app/Controllers/indexController.php
@@ -85,13 +85,13 @@ class FreshRSS_index_Controller extends Minz_ActionController {
 		$state_param = Minz_Request::param ('state', null);
 		$filter = Minz_Request::param ('search', '');
 		if (!empty($filter)) {
-			$state = FreshRSS_Configuration::STATE_ALL;	//Search always in read and unread articles
+			$state = FreshRSS_Entry::STATE_ALL;	//Search always in read and unread articles
 		}
 		$this->view->order = $order = Minz_Request::param ('order', $this->view->conf->sort_order);
 		$nb = Minz_Request::param ('nb', $this->view->conf->posts_per_page);
 		$first = Minz_Request::param ('next', '');
 
-		if ($state === FreshRSS_Configuration::STATE_NOT_READ) {	//Any unread article in this category at all?
+		if ($state === FreshRSS_Entry::STATE_NOT_READ) {	//Any unread article in this category at all?
 			switch ($getType) {
 				case 'a':
 					$hasUnread = $this->view->nb_not_read > 0;
@@ -112,7 +112,7 @@ class FreshRSS_index_Controller extends Minz_ActionController {
 					break;
 			}
 			if (!$hasUnread && ($state_param === null)) {
-				$this->view->state = $state = FreshRSS_Configuration::STATE_ALL;
+				$this->view->state = $state = FreshRSS_Entry::STATE_ALL;
 			}
 		}
 
@@ -129,9 +129,9 @@ class FreshRSS_index_Controller extends Minz_ActionController {
 
 			// Si on a récupéré aucun article "non lus"
 			// on essaye de récupérer tous les articles
-			if ($state === FreshRSS_Configuration::STATE_NOT_READ && empty($entries) && ($state_param === null)) {
+			if ($state === FreshRSS_Entry::STATE_NOT_READ && empty($entries) && ($state_param === null)) {
 				Minz_Log::record ('Conflicting information about nbNotRead!', Minz_Log::DEBUG);
-				$this->view->state = FreshRSS_Configuration::STATE_ALL;
+				$this->view->state = FreshRSS_Entry::STATE_ALL;
 				$entries = $entryDAO->listWhere($getType, $getId, $this->view->state, $order, $nb, $first, $filter, $date_min, true, $keepHistoryDefault);
 			}
 
diff --git a/app/Models/Configuration.php b/app/Models/Configuration.php
index e693542e0..4b52fa05b 100644
--- a/app/Models/Configuration.php
+++ b/app/Models/Configuration.php
@@ -1,12 +1,6 @@
 <?php
 
 class FreshRSS_Configuration {
-	const STATE_ALL = 0;
-	const STATE_READ = 1;
-	const STATE_NOT_READ = 2;
-	const STATE_FAVORITE = 4;
-	const STATE_NOT_FAVORITE = 8;
-
 	private $filename;
 
 	private $data = array(
@@ -19,7 +13,7 @@ class FreshRSS_Configuration {
 		'apiPasswordHash' => '',	//CRYPT_BLOWFISH
 		'posts_per_page' => 20,
 		'view_mode' => 'normal',
-		'default_view' => self::STATE_NOT_READ,
+		'default_view' => FreshRSS_Entry::STATE_NOT_READ,
 		'auto_load_more' => true,
 		'display_posts' => false,
 		'onread_jump_next' => true,
@@ -137,7 +131,7 @@ class FreshRSS_Configuration {
 		}
 	}
 	public function _default_view ($value) {
-		$this->data['default_view'] = $value === self::STATE_ALL ? self::STATE_ALL : self::STATE_NOT_READ;
+		$this->data['default_view'] = $value === FreshRSS_Entry::STATE_ALL ? FreshRSS_Entry::STATE_ALL : FreshRSS_Entry::STATE_NOT_READ;
 	}
 	public function _display_posts ($value) {
 		$this->data['display_posts'] = ((bool)$value) && $value !== 'no';
diff --git a/app/Models/Entry.php b/app/Models/Entry.php
index a6c67221b..fa9066d5b 100644
--- a/app/Models/Entry.php
+++ b/app/Models/Entry.php
@@ -1,6 +1,11 @@
 <?php
 
 class FreshRSS_Entry extends Minz_Model {
+	const STATE_ALL = 0;
+	const STATE_READ = 1;
+	const STATE_NOT_READ = 2;
+	const STATE_FAVORITE = 4;
+	const STATE_NOT_FAVORITE = 8;
 
 	private $id = 0;
 	private $guid;
diff --git a/app/Models/EntryDAO.php b/app/Models/EntryDAO.php
index 3f3cc478b..285ad431f 100644
--- a/app/Models/EntryDAO.php
+++ b/app/Models/EntryDAO.php
@@ -408,7 +408,7 @@ class FreshRSS_EntryDAO extends Minz_ModelPdo {
 
 	private function sqlListWhere($type = 'a', $id = '', $state = null , $order = 'DESC', $limit = 1, $firstId = '', $filter = '', $date_min = 0, $showOlderUnreadsorFavorites = false, $keepHistoryDefault = 0) {
 		if (!$state) {
-			$state = FreshRSS_Configuration::STATE_ALL;
+			$state = FreshRSS_Entry::STATE_ALL;
 		}
 		$where = '';
 		$joinFeed = false;
@@ -438,23 +438,23 @@ class FreshRSS_EntryDAO extends Minz_ModelPdo {
 				throw new FreshRSS_EntriesGetter_Exception ('Bad type in Entry->listByType: [' . $type . ']!');
 		}
 
-		if ($state & FreshRSS_Configuration::STATE_NOT_READ) {
-			if (!($state & FreshRSS_Configuration::STATE_READ)) {
+		if ($state & FreshRSS_Entry::STATE_NOT_READ) {
+			if (!($state & FreshRSS_Entry::STATE_READ)) {
 				$where .= 'AND e1.is_read = 0 ';
 			}
 		}
-		if ($state & FreshRSS_Configuration::STATE_READ) {
-			if (!($state & FreshRSS_Configuration::STATE_NOT_READ)) {
+		if ($state & FreshRSS_Entry::STATE_READ) {
+			if (!($state & FreshRSS_Entry::STATE_NOT_READ)) {
 				$where .= 'AND e1.is_read = 1 ';
 			}
 		}
-		if ($state & FreshRSS_Configuration::STATE_NOT_FAVORITE) {
-			if (!($state & FreshRSS_Configuration::STATE_FAVORITE)) {
+		if ($state & FreshRSS_Entry::STATE_NOT_FAVORITE) {
+			if (!($state & FreshRSS_Entry::STATE_FAVORITE)) {
 				$where .= 'AND e1.is_favorite = 0 ';
 			}
 		}
-		if ($state & FreshRSS_Configuration::STATE_FAVORITE) {
-			if (!($state & FreshRSS_Configuration::STATE_NOT_FAVORITE)) {
+		if ($state & FreshRSS_Entry::STATE_FAVORITE) {
+			if (!($state & FreshRSS_Entry::STATE_NOT_FAVORITE)) {
 				$where .= 'AND e1.is_favorite = 1 ';
 			}
 		}
diff --git a/app/layout/nav_menu.phtml b/app/layout/nav_menu.phtml
index 67539c747..8b1ca1f6f 100644
--- a/app/layout/nav_menu.phtml
+++ b/app/layout/nav_menu.phtml
@@ -8,11 +8,11 @@
 
 	<?php if ($this->loginOk) { ?>
 	<?php $url_state = $this->url;
-		if ($this->state & FreshRSS_Configuration::STATE_READ) {
-			$url_state['params']['state'] = $this->state - FreshRSS_Configuration::STATE_READ;
+		if ($this->state & FreshRSS_Entry::STATE_READ) {
+			$url_state['params']['state'] = $this->state - FreshRSS_Entry::STATE_READ;
 			$checked = 'true';
 		} else {
-			$url_state['params']['state'] = $this->state + FreshRSS_Configuration::STATE_READ;
+			$url_state['params']['state'] = $this->state + FreshRSS_Entry::STATE_READ;
 			$checked = 'false';
 		}
 	?>
@@ -24,11 +24,11 @@
 		<?php echo FreshRSS_Themes::icon('read'); ?>
 	</a>
 	<?php
-		if ($this->state & FreshRSS_Configuration::STATE_NOT_READ) {
-			$url_state['params']['state'] = $this->state - FreshRSS_Configuration::STATE_NOT_READ;
+		if ($this->state & FreshRSS_Entry::STATE_NOT_READ) {
+			$url_state['params']['state'] = $this->state - FreshRSS_Entry::STATE_NOT_READ;
 			$checked = 'true';
 		} else {
-			$url_state['params']['state'] = $this->state + FreshRSS_Configuration::STATE_NOT_READ;
+			$url_state['params']['state'] = $this->state + FreshRSS_Entry::STATE_NOT_READ;
 			$checked = 'false';
 		}
 	?>
@@ -40,11 +40,11 @@
 		<?php echo FreshRSS_Themes::icon('unread'); ?>
 	</a>
 	<?php
-		if ($this->state & FreshRSS_Configuration::STATE_FAVORITE) {
-			$url_state['params']['state'] = $this->state - FreshRSS_Configuration::STATE_FAVORITE;
+		if ($this->state & FreshRSS_Entry::STATE_FAVORITE) {
+			$url_state['params']['state'] = $this->state - FreshRSS_Entry::STATE_FAVORITE;
 			$checked = 'true';
 		} else {
-			$url_state['params']['state'] = $this->state + FreshRSS_Configuration::STATE_FAVORITE;
+			$url_state['params']['state'] = $this->state + FreshRSS_Entry::STATE_FAVORITE;
 			$checked = 'false';
 		}
 	?>
@@ -56,11 +56,11 @@
 		<?php echo FreshRSS_Themes::icon('starred'); ?>
 	</a>
 	<?php
-		if ($this->state & FreshRSS_Configuration::STATE_NOT_FAVORITE) {
-			$url_state['params']['state'] = $this->state - FreshRSS_Configuration::STATE_NOT_FAVORITE;
+		if ($this->state & FreshRSS_Entry::STATE_NOT_FAVORITE) {
+			$url_state['params']['state'] = $this->state - FreshRSS_Entry::STATE_NOT_FAVORITE;
 			$checked = 'true';
 		} else {
-			$url_state['params']['state'] = $this->state + FreshRSS_Configuration::STATE_NOT_FAVORITE;
+			$url_state['params']['state'] = $this->state + FreshRSS_Entry::STATE_NOT_FAVORITE;
 			$checked = 'false';
 		}
 	?>
diff --git a/app/views/configure/reading.phtml b/app/views/configure/reading.phtml
index b277397b1..456ab9522 100644
--- a/app/views/configure/reading.phtml
+++ b/app/views/configure/reading.phtml
@@ -32,11 +32,11 @@
 					<option value="global"<?php echo $this->conf->view_mode === 'global' ? ' selected="selected"' : ''; ?>><?php echo Minz_Translate::t ('global_view'); ?></option>
 				</select>
 				<label class="radio" for="radio_all">
-					<input type="radio" name="default_view" id="radio_all" value="<?php echo FreshRSS_Configuration::STATE_ALL; ?>"<?php echo $this->conf->default_view === FreshRSS_Configuration::STATE_ALL ? ' checked="checked"' : ''; ?> />
+					<input type="radio" name="default_view" id="radio_all" value="<?php echo FreshRSS_Entry::STATE_ALL; ?>"<?php echo $this->conf->default_view === FreshRSS_Entry::STATE_ALL ? ' checked="checked"' : ''; ?> />
 					<?php echo Minz_Translate::t ('show_all_articles'); ?>
 				</label>
 				<label class="radio" for="radio_not_read">
-					<input type="radio" name="default_view" id="radio_not_read" value="<?php echo FreshRSS_Configuration::STATE_NOT_READ; ?>"<?php echo $this->conf->default_view === FreshRSS_Configuration::STATE_NOT_READ ? ' checked="checked"' : ''; ?> />
+					<input type="radio" name="default_view" id="radio_not_read" value="<?php echo FreshRSS_Entry::STATE_NOT_READ; ?>"<?php echo $this->conf->default_view === FreshRSS_Entry::STATE_NOT_READ ? ' checked="checked"' : ''; ?> />
 					<?php echo Minz_Translate::t ('show_not_reads'); ?>
 				</label>
 			</div>
diff --git a/p/api/greader.php b/p/api/greader.php
index 9836f2f02..8a8623966 100644
--- a/p/api/greader.php
+++ b/p/api/greader.php
@@ -353,10 +353,10 @@ function streamContents($path, $include_target, $start_time, $count, $order, $ex
 
 	switch ($exclude_target) {
 		case 'user/-/state/com.google/read':
-			$state = FreshRSS_Configuration::STATE_NOT_READ;
+			$state = FreshRSS_Entry::STATE_NOT_READ;
 			break;
 		default:
-			$state = FreshRSS_Configuration::STATE_ALL;
+			$state = FreshRSS_Entry::STATE_ALL;
 			break;
 	}
 
@@ -451,10 +451,10 @@ function streamContentsItemsIds($streamId, $start_time, $count, $order, $exclude
 
 	switch ($exclude_target) {
 		case 'user/-/state/com.google/read':
-			$state = FreshRSS_Configuration::STATE_NOT_READ;
+			$state = FreshRSS_Entry::STATE_NOT_READ;
 			break;
 		default:
-			$state = FreshRSS_Configuration::STATE_ALL;
+			$state = FreshRSS_Entry::STATE_ALL;
 			break;
 	}
 
-- 
cgit v1.2.3


From f820f428ef92a87c2d2083fa3a239b10f5c31129 Mon Sep 17 00:00:00 2001
From: Alexis Degrugillier <github@ainw.org>
Date: Sun, 27 Apr 2014 11:00:25 -0400
Subject: Add a shortcut to access the search field

---
 app/Models/Configuration.php            |  1 +
 app/i18n/en.php                         |  1 +
 app/i18n/fr.php                         |  1 +
 app/views/configure/shortcut.phtml      |  7 +++++++
 app/views/helpers/javascript_vars.phtml |  3 ++-
 p/scripts/main.js                       | 10 ++++++++++
 6 files changed, 22 insertions(+), 1 deletion(-)

(limited to 'app/Models/Configuration.php')

diff --git a/app/Models/Configuration.php b/app/Models/Configuration.php
index 4b52fa05b..8d3e69a1c 100644
--- a/app/Models/Configuration.php
+++ b/app/Models/Configuration.php
@@ -39,6 +39,7 @@ class FreshRSS_Configuration {
 			'collapse_entry' => 'c',
 			'load_more' => 'm',
 			'auto_share' => 's',
+			'focus_search' => 'a',
 		),
 		'topline_read' => true,
 		'topline_favorite' => true,
diff --git a/app/i18n/en.php b/app/i18n/en.php
index f9be04549..21d37f475 100644
--- a/app/i18n/en.php
+++ b/app/i18n/en.php
@@ -137,6 +137,7 @@ return array (
 	'collapse_article'		=> 'Collapse',
 	'auto_share'			=> 'Share',
 	'auto_share_help'		=> 'If there is only one sharing mode, it is used. Else modes are accessible by their number.',
+	'focus_search'			=> 'Access search box',
 
 	'file_to_import'		=> 'File to import<br />(OPML, Json or Zip)',
 	'import'			=> 'Import',
diff --git a/app/i18n/fr.php b/app/i18n/fr.php
index f40750b92..f42115fcd 100644
--- a/app/i18n/fr.php
+++ b/app/i18n/fr.php
@@ -137,6 +137,7 @@ return array (
 	'collapse_article'		=> 'Refermer',
 	'auto_share'			=> 'Partager',
 	'auto_share_help'		=> 'Si il n’y a qu’un mode de partage, celui ci est utilisé automatiquement. Sinon ils sont accessibles par leur numéro.',
+	'focus_search'			=> 'Accéder à la recherche',
 
 	'file_to_import'		=> 'Fichier à importer<br />(OPML, Json ou Zip)',
 	'import'			=> 'Importer',
diff --git a/app/views/configure/shortcut.phtml b/app/views/configure/shortcut.phtml
index 7ba14c1d8..bfb13f003 100644
--- a/app/views/configure/shortcut.phtml
+++ b/app/views/configure/shortcut.phtml
@@ -96,6 +96,13 @@
 			</div>
 		</div>
 
+		<div class="form-group">
+			<label class="group-name" for="focus_search_shortcut"><?php echo Minz_Translate::t ('focus_search'); ?></label>
+			<div class="group-controls">
+				<input type="text" id="focus_search_shortcut" name="shortcuts[focus_search]" list="keys" value="<?php echo $s['focus_search']; ?>" />
+			</div>
+		</div>
+
 		<div class="form-group form-actions">
 			<div class="group-controls">
 				<button type="submit" class="btn btn-important"><?php echo Minz_Translate::t ('save'); ?></button>
diff --git a/app/views/helpers/javascript_vars.phtml b/app/views/helpers/javascript_vars.phtml
index 2ce11d7d7..6e0a20de3 100644
--- a/app/views/helpers/javascript_vars.phtml
+++ b/app/views/helpers/javascript_vars.phtml
@@ -25,7 +25,8 @@ echo ',shortcuts={',
 	'last_entry:"', $s['last_entry'], '",',
 	'collapse_entry:"', $s['collapse_entry'], '",',
 	'load_more:"', $s['load_more'], '",',
-	'auto_share:"', $s['auto_share'], '"',
+	'auto_share:"', $s['auto_share'], '",',
+	'focus_search:"', $s['focus_search'], '"',
 "},\n";
 
 if (Minz_Request::param ('output') === 'global') {
diff --git a/p/scripts/main.js b/p/scripts/main.js
index 7d1864b42..aeb044e88 100644
--- a/p/scripts/main.js
+++ b/p/scripts/main.js
@@ -599,6 +599,12 @@ function init_shortcuts() {
 	}, {
 		'disable_in_input': true
 	});
+
+	shortcut.add(shortcuts.focus_search, function () {
+		focus_search();
+	}, {
+		'disable_in_input': true
+	});
 }
 
 function init_stream(divStream) {
@@ -791,6 +797,10 @@ function load_more_posts() {
 	});
 }
 
+function focus_search() {
+	$('#search').focus();
+}
+
 function init_load_more(box) {
 	box_load_more = box;
 
-- 
cgit v1.2.3


From 8521c876d4b2ce69ff5d4313493017f26aa2cd6b Mon Sep 17 00:00:00 2001
From: Alexis Degrugillier <github@ainw.org>
Date: Sun, 4 May 2014 08:57:19 -0400
Subject: Add user queries

It's an intermediary step to remove the favorite button.
I add a button to store the current query as a favorite query. It redirects automatically to the configuration page where it is possible to name and remove user queries.
To make the queries more straigtforward, I removed the default behavior when searching for a string. This way, when we search for a string, the filter is not defaulted to all articles.
---
 app/Controllers/configureController.php | 54 +++++++++++++++++++++++++++++++++
 app/Controllers/indexController.php     |  3 --
 app/Models/Configuration.php            |  7 +++++
 app/Models/Themes.php                   |  1 +
 app/i18n/en.php                         | 22 ++++++++++++++
 app/i18n/fr.php                         | 22 ++++++++++++++
 app/layout/aside_configure.phtml        |  3 ++
 app/layout/aside_flux.phtml             | 17 +++++++++++
 app/layout/header.phtml                 |  1 +
 app/layout/nav_menu.phtml               |  8 +++++
 app/views/configure/queries.phtml       | 45 +++++++++++++++++++++++++++
 p/scripts/main.js                       |  8 +++++
 p/themes/icons/bookmark-add.svg         |  6 ++++
 13 files changed, 194 insertions(+), 3 deletions(-)
 create mode 100644 app/views/configure/queries.phtml
 create mode 100644 p/themes/icons/bookmark-add.svg

(limited to 'app/Models/Configuration.php')

diff --git a/app/Controllers/configureController.php b/app/Controllers/configureController.php
index df5212041..573c42d64 100755
--- a/app/Controllers/configureController.php
+++ b/app/Controllers/configureController.php
@@ -298,4 +298,58 @@ class FreshRSS_configure_Controller extends Minz_ActionController {
 			$this->view->size_total = $entryDAO->size(true);
 		}
 	}
+	
+	public function queriesAction () {
+		if (Minz_Request::isPost ()) {
+			$params = Minz_Request::params();
+			$this->view->conf->_queries ($params['queries']);
+			$this->view->conf->save();
+
+			$notif = array (
+				'type' => 'good',
+				'content' => Minz_Translate::t ('configuration_updated')
+			);
+			Minz_Session::_param ('notification', $notif);
+
+			Minz_Request::forward (array ('c' => 'configure', 'a' => 'queries'), true);
+		} else {
+			$this->view->query_get = array();
+			foreach ($this->view->conf->queries as $key => $query) {
+				if (isset($query['get'])) {
+					switch ($query['get'][0]) {
+						case 'c':
+							$dao = new FreshRSS_CategoryDAO();
+							$category = $dao->searchById(substr($query['get'], 2));
+							$this->view->query_get[$key] = array(
+								'type' => 'category',
+								'name' => $category->name(),
+							);
+							break;
+						case 'f':
+							$dao = new FreshRSS_FeedDAO();
+							$feed = $dao->searchById(substr($query['get'], 2));
+							$this->view->query_get[$key] = array(
+								'type' => 'feed',
+								'name' => $feed->name(),
+							);
+							break;
+					}
+				}
+			}
+		}
+
+		Minz_View::prependTitle (Minz_Translate::t ('queries') . ' · ');
+	}
+	
+	public function addQueryAction () {
+		$queries = $this->view->conf->queries;
+		$query = Minz_Request::params();
+		unset($query['output']);
+		unset($query['token']);
+		$queries[] = $query;
+		$this->view->conf->_queries($queries);
+		$this->view->conf->save();
+		
+		Minz_Request::forward(array('c' => 'configure', 'a' => 'queries'), true);
+	}
 }
diff --git a/app/Controllers/indexController.php b/app/Controllers/indexController.php
index 3445c0bd4..d45ce5510 100755
--- a/app/Controllers/indexController.php
+++ b/app/Controllers/indexController.php
@@ -84,9 +84,6 @@ class FreshRSS_index_Controller extends Minz_ActionController {
 		$this->view->state = $state = Minz_Request::param ('state', $this->view->conf->default_view);
 		$state_param = Minz_Request::param ('state', null);
 		$filter = Minz_Request::param ('search', '');
-		if (!empty($filter)) {
-			$state = FreshRSS_Entry::STATE_ALL;	//Search always in read and unread articles
-		}
 		$this->view->order = $order = Minz_Request::param ('order', $this->view->conf->sort_order);
 		$nb = Minz_Request::param ('nb', $this->view->conf->posts_per_page);
 		$first = Minz_Request::param ('next', '');
diff --git a/app/Models/Configuration.php b/app/Models/Configuration.php
index 8d3e69a1c..deeae0826 100644
--- a/app/Models/Configuration.php
+++ b/app/Models/Configuration.php
@@ -52,6 +52,7 @@ class FreshRSS_Configuration {
 		'bottomline_date' => true,
 		'bottomline_link' => true,
 		'sharing' => array(),
+		'queries' => array(),
 	);
 
 	private $available_languages = array(
@@ -218,6 +219,12 @@ class FreshRSS_Configuration {
 			$this->data['sharing'][] = $value;
 		}
 	}
+	public function _queries ($values) {
+		$this->data['queries'] = array();
+		foreach ($values as $value) {
+			$this->data['queries'][] = array_filter($value);
+		}
+	}
 	public function _theme($value) {
 		$this->data['theme'] = $value;
 	}
diff --git a/app/Models/Themes.php b/app/Models/Themes.php
index 17b95bb9e..5fcbe78e0 100644
--- a/app/Models/Themes.php
+++ b/app/Models/Themes.php
@@ -70,6 +70,7 @@ class FreshRSS_Themes extends Minz_Model {
 			'add' => '✚',
 			'all' => '☰',
 			'bookmark' => '★',
+			'bookmark-add' => '✚',
 			'category' => '☷',
 			'category-white' => '☷',
 			'close' => '❌',
diff --git a/app/i18n/en.php b/app/i18n/en.php
index 21d37f475..57ca0985d 100644
--- a/app/i18n/en.php
+++ b/app/i18n/en.php
@@ -15,6 +15,28 @@ return array (
 	'feed'				=> 'Feed',
 	'feeds'				=> 'Feeds',
 	'shortcuts'			=> 'Shortcuts',
+	'queries'			=> 'User queries',
+	'query-search'		=> 'Search for "%s"',
+	'query-order-asc'   => 'Display oldest articles first',
+	'query-order-desc'  => 'Display newest articles first',
+	'query-get-category'=> 'Display "%s" category',
+	'query-get-feed'    => 'Display "%s" feed',
+	'query-state-0'		=> 'Display all articles',
+	'query-state-1'		=> 'Display read articles',
+	'query-state-2'		=> 'Display unread articles',
+	'query-state-3'		=> 'Display all articles',
+	'query-state-4'		=> 'Display favorite articles',
+	'query-state-5'		=> 'Display read favorite articles',
+	'query-state-6'		=> 'Display unread favorite articles',
+	'query-state-7'		=> 'Display favorite articles',
+	'query-state-8'		=> 'Display not favorite articles',
+	'query-state-9'		=> 'Display read not favorite articles',
+	'query-state-10'	=> 'Display unread not favorite articles',
+	'query-state-11'	=> 'Display not favorite articles',
+	'query-state-12'	=> 'Display all articles',
+	'query-state-13'	=> 'Display read articles',
+	'query-state-14'	=> 'Display unread articles',
+	'query-state-15'	=> 'Display all articles',
 	'about'				=> 'About',
 	'stats'				=> 'Statistics',
 
diff --git a/app/i18n/fr.php b/app/i18n/fr.php
index f42115fcd..d99b8eb1d 100644
--- a/app/i18n/fr.php
+++ b/app/i18n/fr.php
@@ -15,6 +15,28 @@ return array (
 	'feed'				=> 'Flux',
 	'feeds'				=> 'Flux',
 	'shortcuts'			=> 'Raccourcis',
+	'queries'			=> 'Filtres utilisateurs',
+	'query-search'		=> 'Chercher "%s"',
+	'query-order-asc'   => 'Afficher les articles les plus anciens en premier',
+	'query-order-desc'  => 'Afficher les articles les plus récents en premier',
+	'query-get-category'=> 'Afficher la catégorie "%s"',
+	'query-get-feed'    => 'Afficher le flux "%s"',
+	'query-state-0'		=> 'Afficher tous les articles',
+	'query-state-1'		=> 'Afficher les articles lus',
+	'query-state-2'		=> 'Afficher les articles non lus',
+	'query-state-3'		=> 'Afficher tous les articles',
+	'query-state-4'		=> 'Afficher les articles favoris',
+	'query-state-5'		=> 'Afficher les articles lus et favoris',
+	'query-state-6'		=> 'Afficher les articles non lus et favoris',
+	'query-state-7'		=> 'Afficher les articles favoris',
+	'query-state-8'		=> 'Afficher les articles non favoris',
+	'query-state-9'		=> 'Afficher les articles lus et non favoris',
+	'query-state-10'	=> 'Afficher les articles non lus et non favoris',
+	'query-state-11'	=> 'Afficher les articles non favoris',
+	'query-state-12'	=> 'Afficher tous les articles',
+	'query-state-13'	=> 'Afficher les articles lus',
+	'query-state-14'	=> 'Afficher les articles non lus',
+	'query-state-15'	=> 'Afficher tous les articles',
 	'about'				=> 'À propos',
 	'stats'				=> 'Statistiques',
 
diff --git a/app/layout/aside_configure.phtml b/app/layout/aside_configure.phtml
index 43adeb3c6..e66f2f64c 100644
--- a/app/layout/aside_configure.phtml
+++ b/app/layout/aside_configure.phtml
@@ -15,6 +15,9 @@
 	<li class="item<?php echo Minz_Request::actionName () == 'shortcut' ? ' active' : ''; ?>">
 		<a href="<?php echo _url ('configure', 'shortcut'); ?>"><?php echo Minz_Translate::t ('shortcuts'); ?></a>
 	</li>
+	<li class="item<?php echo Minz_Request::actionName () == 'queries' ? ' active' : ''; ?>">
+		<a href="<?php echo _url ('configure', 'queries'); ?>"><?php echo Minz_Translate::t ('queries'); ?></a>
+	</li>
 	<li class="separator"></li>
 	<li class="item<?php echo Minz_Request::actionName () == 'users' ? ' active' : ''; ?>">
 		<a href="<?php echo _url ('configure', 'users'); ?>"><?php echo Minz_Translate::t ('users'); ?></a>
diff --git a/app/layout/aside_flux.phtml b/app/layout/aside_flux.phtml
index 817dae676..8f8d436e1 100644
--- a/app/layout/aside_flux.phtml
+++ b/app/layout/aside_flux.phtml
@@ -36,6 +36,23 @@
 				</a>
 			</div>
 		</li>
+		
+		<?php 
+		$count = 0;
+		foreach ($this->conf->queries as $query_conf):
+			$count++;
+			$name = $count;
+			if (isset($query_conf['name'])) {
+				$name = $query_conf['name'];
+				unset($query_conf['name']);
+			}
+			$url_user_query = array('c' => 'index', 'a' => 'index', 'params' => $query_conf); ?>
+		<li>
+			<div class="category">
+				<a  data-unread="0" class="btn" href="<?php echo Minz_Url::display($url_user_query)?>"><?php echo $name?></a>
+			</div>
+		</li>
+		<?php endforeach; ?>
 
 		<?php
 		foreach ($this->cat_aside as $cat) {
diff --git a/app/layout/header.phtml b/app/layout/header.phtml
index 08aa7715d..3eedc8ea7 100644
--- a/app/layout/header.phtml
+++ b/app/layout/header.phtml
@@ -72,6 +72,7 @@ if (Minz_Configuration::canLogIn()) {
 				<li class="item"><a href="<?php echo _url ('configure', 'archiving'); ?>"><?php echo Minz_Translate::t ('archiving_configuration'); ?></a></li>
 				<li class="item"><a href="<?php echo _url ('configure', 'sharing'); ?>"><?php echo Minz_Translate::t ('sharing'); ?></a></li>
 				<li class="item"><a href="<?php echo _url ('configure', 'shortcut'); ?>"><?php echo Minz_Translate::t ('shortcuts'); ?></a></li>
+				<li class="item"><a href="<?php echo _url ('configure', 'queries'); ?>"><?php echo Minz_Translate::t ('queries'); ?></a></li>
 				<li class="separator"></li>
 				<li class="item"><a href="<?php echo _url ('configure', 'users'); ?>"><?php echo Minz_Translate::t ('users'); ?></a></li>
 				<li class="separator"></li>
diff --git a/app/layout/nav_menu.phtml b/app/layout/nav_menu.phtml
index 9990448ba..6db172904 100644
--- a/app/layout/nav_menu.phtml
+++ b/app/layout/nav_menu.phtml
@@ -241,6 +241,14 @@
 		<?php echo FreshRSS_Themes::icon($icon); ?>
 	</a>
 
+	<?php if ($this->loginOk): 
+		$url_query = $this->url;
+		$url_query['c'] = 'configure';
+		$url_query['a'] = 'addQuery';
+	?>
+	<a id="save_query" class="btn" href="<?php echo Minz_Url::display ($url_query); ?>"><?php echo FreshRSS_Themes::icon('bookmark-add'); ?></a>
+	<?php endif; ?>
+
 	<?php $url_output['params']['output'] = 'rss'; ?>
 	<a class="btn view_rss" target="_blank" href="<?php echo Minz_Url::display ($url_output); ?>" title="<?php echo Minz_Translate::t ('rss_view'); ?>">
 		<?php echo FreshRSS_Themes::icon('rss'); ?>
diff --git a/app/views/configure/queries.phtml b/app/views/configure/queries.phtml
new file mode 100644
index 000000000..38755edc5
--- /dev/null
+++ b/app/views/configure/queries.phtml
@@ -0,0 +1,45 @@
+<?php $this->partial ('aside_configure'); ?>
+
+<div class="post">
+	<a href="<?php echo _url ('index', 'index'); ?>"><?php echo Minz_Translate::t ('back_to_rss_feeds'); ?></a>
+
+	<form method="post" action="<?php echo _url ('configure', 'queries'); ?>">
+		<legend><?php echo Minz_Translate::t ('queries'); ?></legend>
+
+		<?php foreach ($this->conf->queries as $key => $query):?>
+			<div class="form-group">
+				<label class="group-name"><?php echo $key + 1?></label>
+				<div class="group-controls">
+					<input type="hidden" id="queries_<?php echo $key; ?>_search" name="queries[<?php echo $key; ?>][search]" value="<?php echo $query['search']; ?>"/>
+					<input type="hidden" id="queries_<?php echo $key; ?>_state" name="queries[<?php echo $key; ?>][state]" value="<?php echo $query['state']; ?>"/>
+					<input type="hidden" id="queries_<?php echo $key; ?>_order" name="queries[<?php echo $key; ?>][order]" value="<?php echo $query['order']; ?>"/>
+					<input type="hidden" id="queries_<?php echo $key; ?>_get" name="queries[<?php echo $key; ?>][get]" value="<?php echo $query['get']; ?>"/>
+					<input type="text" id="queries_<?php echo $key; ?>_name" name="queries[<?php echo $key; ?>][name]" value="<?php echo $query['name']; ?>"/>
+					<a href='#' class='query remove'><?php echo FreshRSS_Themes::icon('close'); ?></a>
+					<ul>
+						<?php if (isset($query['search'])):?>
+							<li><?php echo Minz_Translate::t ('query-search', $query['search']); ?></li>
+						<?php endif; ?>
+						<?php if (isset($query['state'])):?>
+							<li><?php echo Minz_Translate::t ('query-state-' . $query['state']); ?></li>
+						<?php endif; ?>
+						<?php if (isset($query['order'])):?>
+							<li><?php echo Minz_Translate::t ('query-order-' . strtolower($query['order'])); ?></li>
+						<?php endif; ?>
+						<?php if (isset($query['get'])):?>
+							<li><?php echo Minz_Translate::t ('query-get-' . $this->query_get[$key]['type'], $this->query_get[$key]['name']); ?></li>
+						<?php endif; ?>
+					</ul>
+				</div>
+			</div>
+		<?php endforeach; ?>
+		
+		<div class="form-group form-actions">
+			<div class="group-controls">
+				<button type="submit" class="btn btn-important"><?php echo Minz_Translate::t ('save'); ?></button>
+				<button type="reset" class="btn"><?php echo Minz_Translate::t ('cancel'); ?></button>
+			</div>
+		</div>
+	</form>
+
+</div>
\ No newline at end of file
diff --git a/p/scripts/main.js b/p/scripts/main.js
index aeb044e88..0b3ebf735 100644
--- a/p/scripts/main.js
+++ b/p/scripts/main.js
@@ -992,6 +992,13 @@ function init_share_observers() {
 	});
 }
 
+function init_queries_observers() {
+	$('.post').on('click', '.query.remove', function(e) {
+		e.preventDefault();
+		$(this).parents('.form-group').remove();
+	});
+}
+
 function init_feed_observers() {
 	$('select[id="category"]').on('change', function() {
 		var detail = $('#new_category_name').parent();
@@ -1046,6 +1053,7 @@ function init_all() {
 		window.setInterval(refreshUnreads, 120000);
 	} else {
 		init_share_observers();
+		init_queries_observers();
 		init_feed_observers();
 		init_password_observers();
 	}
diff --git a/p/themes/icons/bookmark-add.svg b/p/themes/icons/bookmark-add.svg
new file mode 100644
index 000000000..51db9c498
--- /dev/null
+++ b/p/themes/icons/bookmark-add.svg
@@ -0,0 +1,6 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="16" width="16">
+<g transform="translate(-141.0002,-807)" fill="#bebebe">
+<path d="m143,807,0,13,4-4,4,4,0-4,0-1-2,0,0-4,2,0,0-4z"/>
+<path d="m152,810,0,2-2,0,0,2,2,0,0,2,2,0,0-2,2,0,0-2-2,0,0-2-2,0z"/>
+</g>
+</svg>
\ No newline at end of file
-- 
cgit v1.2.3


From b8f53b052592d3729bdc88936bad5f4e2da78dfe Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Thu, 5 Jun 2014 22:26:18 +0200
Subject: Add an option to choose content width

- 4 options: thin, medium, large and no limit
- Thin is by default
---
 app/Controllers/configureController.php  |  1 +
 app/Models/Configuration.php             | 10 ++++++++++
 app/i18n/en.php                          |  5 +++++
 app/i18n/fr.php                          |  5 +++++
 app/views/configure/display.phtml        | 21 +++++++++++++++++++++
 app/views/helpers/view/normal_view.phtml |  4 +++-
 app/views/helpers/view/reader_view.phtml |  3 ++-
 7 files changed, 47 insertions(+), 2 deletions(-)

(limited to 'app/Models/Configuration.php')

diff --git a/app/Controllers/configureController.php b/app/Controllers/configureController.php
index df5212041..a117e0f9c 100755
--- a/app/Controllers/configureController.php
+++ b/app/Controllers/configureController.php
@@ -145,6 +145,7 @@ class FreshRSS_configure_Controller extends Minz_ActionController {
 				$themeId = FreshRSS_Themes::defaultTheme;
 			}
 			$this->view->conf->_theme($themeId);
+			$this->view->conf->_content_width(Minz_Request::param('content_width', 'thin'));
 			$this->view->conf->_topline_read(Minz_Request::param('topline_read', false));
 			$this->view->conf->_topline_favorite(Minz_Request::param('topline_favorite', false));
 			$this->view->conf->_topline_date(Minz_Request::param('topline_date', false));
diff --git a/app/Models/Configuration.php b/app/Models/Configuration.php
index 8d3e69a1c..0d6666297 100644
--- a/app/Models/Configuration.php
+++ b/app/Models/Configuration.php
@@ -28,6 +28,7 @@ class FreshRSS_Configuration {
 			'reception' => false,
 		),
 		'theme' => 'Origine',
+		'content_width' => 'thin',
 		'shortcuts' => array(
 			'mark_read' => 'r',
 			'mark_favorite' => 'f',
@@ -221,6 +222,15 @@ class FreshRSS_Configuration {
 	public function _theme($value) {
 		$this->data['theme'] = $value;
 	}
+	public function _content_width($value) {
+		if ($value === 'medium' ||
+				$value === 'large' ||
+				$value === 'no_limit') {
+			$this->data['content_width'] = $value;
+		} else {
+			$this->data['content_width'] = 'thin';
+		}
+	}
 	public function _token($value) {
 		$this->data['token'] = $value;
 	}
diff --git a/app/i18n/en.php b/app/i18n/en.php
index 21d37f475..a3c1dfeb7 100644
--- a/app/i18n/en.php
+++ b/app/i18n/en.php
@@ -240,6 +240,11 @@ return array (
 	'optimize_bdd'			=> 'Optimize database',
 	'optimize_todo_sometimes'	=> 'To do occasionally to reduce the size of the database',
 	'theme'				=> 'Theme',
+	'content_width'			=> 'Content width',
+	'width_thin'			=> 'Thin',
+	'width_medium'			=> 'Medium',
+	'width_large'			=> 'Large',
+	'width_no_limit'		=> 'No limit',
 	'more_information'		=> 'More information',
 	'activate_sharing'		=> 'Activate sharing',
 	'shaarli'			=> 'Shaarli',
diff --git a/app/i18n/fr.php b/app/i18n/fr.php
index f42115fcd..4acf5b397 100644
--- a/app/i18n/fr.php
+++ b/app/i18n/fr.php
@@ -240,6 +240,11 @@ return array (
 	'optimize_bdd'			=> 'Optimiser la base de données',
 	'optimize_todo_sometimes'	=> 'À faire de temps en temps pour réduire la taille de la BDD',
 	'theme'				=> 'Thème',
+	'content_width'			=> 'Largeur du contenu',
+	'width_thin'			=> 'Fine',
+	'width_medium'			=> 'Moyenne',
+	'width_large'			=> 'Large',
+	'width_no_limit'		=> 'Pas de limite',
 	'more_information'		=> 'Plus d’informations',
 	'activate_sharing'		=> 'Activer le partage',
 	'shaarli'			=> 'Shaarli',
diff --git a/app/views/configure/display.phtml b/app/views/configure/display.phtml
index 5a94376ad..955fc6747 100644
--- a/app/views/configure/display.phtml
+++ b/app/views/configure/display.phtml
@@ -35,6 +35,27 @@
 			</div>
 		</div>
 
+		<?php $width = $this->conf->content_width; ?>
+		<div class="form-group">
+			<label class="group-name" for="content_width"><?php echo Minz_Translate::t('content_width'); ?></label>
+			<div class="group-controls">
+				<select name="content_width" id="content_width" required="">
+					<option value="thin" <?php echo $width === 'thin'? 'selected="selected"' : ''; ?>>
+						<?php echo Minz_Translate::t('width_thin'); ?>
+					</option>
+					<option value="medium" <?php echo $width === 'medium'? 'selected="selected"' : ''; ?>>
+						<?php echo Minz_Translate::t('width_medium'); ?>
+					</option>
+					<option value="large" <?php echo $width === 'large'? 'selected="selected"' : ''; ?>>
+						<?php echo Minz_Translate::t('width_large'); ?>
+					</option>
+					<option value="no_limit" <?php echo $width === 'no_limit'? 'selected="selected"' : ''; ?>>
+						<?php echo Minz_Translate::t('width_no_limit'); ?>
+					</option>
+				</select>
+			</div>
+		</div>
+
 		<div class="form-group">
 			<label class="group-name" for="theme"><?php echo Minz_Translate::t ('article_icons'); ?></label>
 			<table>
diff --git a/app/views/helpers/view/normal_view.phtml b/app/views/helpers/view/normal_view.phtml
index b5cdd3039..6f172d579 100644
--- a/app/views/helpers/view/normal_view.phtml
+++ b/app/views/helpers/view/normal_view.phtml
@@ -24,6 +24,8 @@ if (!empty($this->entries)) {
 	$bottomline_tags = $this->conf->bottomline_tags;
 	$bottomline_date = $this->conf->bottomline_date;
 	$bottomline_link = $this->conf->bottomline_link;
+
+	$content_width = $this->conf->content_width;
 ?>
 
 <div id="stream" class="normal<?php echo $hidePosts ? ' hide_posts' : ''; ?>"><?php
@@ -87,7 +89,7 @@ if (!empty($this->entries)) {
 		</ul>
 
 		<div class="flux_content">
-			<div class="content">
+			<div class="content <?php echo $content_width; ?>">
 				<h1 class="title"><a target="_blank" href="<?php echo $item->link (); ?>"><?php echo $item->title (); ?></a></h1>
 				<?php
 					$author = $item->author ();
diff --git a/app/views/helpers/view/reader_view.phtml b/app/views/helpers/view/reader_view.phtml
index bda96e86d..e37c78cb4 100644
--- a/app/views/helpers/view/reader_view.phtml
+++ b/app/views/helpers/view/reader_view.phtml
@@ -3,6 +3,7 @@ $this->partial ('nav_menu');
 
 if (!empty($this->entries)) {
 	$lazyload = $this->conf->lazyload;
+	$content_width = $this->conf->content_width;
 ?>
 
 <div id="stream" class="reader">
@@ -10,7 +11,7 @@ if (!empty($this->entries)) {
 
 	<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">
+			<div class="content <?php echo $content_width; ?>">
 				<?php
 					$feed = FreshRSS_CategoryDAO::findFeed($this->cat_aside, $item->feed ());	//We most likely already have the feed object in cache
 					if (empty($feed)) $feed = $item->feed (true);
-- 
cgit v1.2.3


From a7e833280954a537e12d5a3f4fa12a5b9e8412da Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Sat, 14 Jun 2014 08:58:33 +0200
Subject: Improve system of queries
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- Coding style
- More checks server side
- Default query name is "Query n°X"
- List of queries is moved into nav_menu, in a dropdown
- Better system to remove fields in JS (to a.remove elements, give an
  attibute data-remove="id_to_remove")
- Fix a bug in lib/Mine/Request.php (htmlspecialchars_utf8 can be applied on
  arrays now)
- Few theme improvements
- Add an element .no-mobile to apply to elements which should not appear on
  mobiles

See https://github.com/marienfressinaud/FreshRSS/pull/498
---
 app/Controllers/configureController.php |  66 +++++++++++++-------
 app/Models/Configuration.php            |   8 ++-
 app/i18n/en.php                         |  49 ++++++++-------
 app/i18n/fr.php                         |  49 ++++++++-------
 app/layout/aside_flux.phtml             |  17 ------
 app/layout/nav_menu.phtml               |  63 +++++++++++++------
 app/views/configure/queries.phtml       | 105 +++++++++++++++++++++++---------
 app/views/configure/sharing.phtml       |  14 ++---
 lib/Minz/Request.php                    |   5 +-
 p/scripts/main.js                       |  21 ++++---
 p/themes/Origine/origine.css            |   6 +-
 p/themes/Origine/template.css           |  13 +++-
 12 files changed, 263 insertions(+), 153 deletions(-)

(limited to 'app/Models/Configuration.php')

diff --git a/app/Controllers/configureController.php b/app/Controllers/configureController.php
index 14cd65647..89130cae4 100755
--- a/app/Controllers/configureController.php
+++ b/app/Controllers/configureController.php
@@ -302,8 +302,14 @@ class FreshRSS_configure_Controller extends Minz_ActionController {
 	
 	public function queriesAction () {
 		if (Minz_Request::isPost ()) {
-			$params = Minz_Request::params();
-			$this->view->conf->_queries (isset($params['queries']) ? $params['queries'] : array());
+			$queries = Minz_Request::param('queries', array());
+
+			foreach ($queries as $key => $query) {
+				if (!$query['name']) {
+					$query['name'] = Minz_Translate::t('query_number', $key + 1);
+				}
+			}
+			$this->view->conf->_queries($queries);
 			$this->view->conf->save();
 
 			$notif = array (
@@ -316,25 +322,39 @@ class FreshRSS_configure_Controller extends Minz_ActionController {
 		} else {
 			$this->view->query_get = array();
 			foreach ($this->view->conf->queries as $key => $query) {
-				if (isset($query['get'])) {
-					switch ($query['get'][0]) {
-						case 'c':
-							$dao = new FreshRSS_CategoryDAO();
-							$category = $dao->searchById(substr($query['get'], 2));
-							$this->view->query_get[$key] = array(
-								'type' => 'category',
-								'name' => $category->name(),
-							);
-							break;
-						case 'f':
-							$dao = new FreshRSS_FeedDAO();
-							$feed = $dao->searchById(substr($query['get'], 2));
-							$this->view->query_get[$key] = array(
-								'type' => 'feed',
-								'name' => $feed->name(),
-							);
-							break;
-					}
+				if (!isset($query['get'])) {
+					continue;
+				}
+
+				switch ($query['get'][0]) {
+				case 'c':
+					$dao = new FreshRSS_CategoryDAO();
+					$category = $dao->searchById(substr($query['get'], 2));
+					$this->view->query_get[$key] = array(
+						'type' => 'category',
+						'name' => $category->name(),
+					);
+					break;
+				case 'f':
+					$dao = new FreshRSS_FeedDAO();
+					$feed = $dao->searchById(substr($query['get'], 2));
+					$this->view->query_get[$key] = array(
+						'type' => 'feed',
+						'name' => $feed->name(),
+					);
+					break;
+				case 's':
+					$this->view->query_get[$key] = array(
+						'type' => 'favorite',
+						'name' => 'favorite',
+					);
+					break;
+				case 'a':
+					$this->view->query_get[$key] = array(
+						'type' => 'all',
+						'name' => 'all',
+					);
+					break;
 				}
 			}
 		}
@@ -345,12 +365,14 @@ class FreshRSS_configure_Controller extends Minz_ActionController {
 	public function addQueryAction () {
 		$queries = $this->view->conf->queries;
 		$query = Minz_Request::params();
+		$query['name'] = Minz_Translate::t('query_number', count($queries) + 1);
 		unset($query['output']);
 		unset($query['token']);
 		$queries[] = $query;
 		$this->view->conf->_queries($queries);
 		$this->view->conf->save();
-		
+
+		// Minz_Request::forward(array('params' => $query), true);
 		Minz_Request::forward(array('c' => 'configure', 'a' => 'queries'), true);
 	}
 }
diff --git a/app/Models/Configuration.php b/app/Models/Configuration.php
index b0ce70000..ffd20deca 100644
--- a/app/Models/Configuration.php
+++ b/app/Models/Configuration.php
@@ -223,7 +223,13 @@ class FreshRSS_Configuration {
 	public function _queries ($values) {
 		$this->data['queries'] = array();
 		foreach ($values as $value) {
-			$this->data['queries'][] = array_filter($value);
+			$value = array_filter($value);
+			$params = $value;
+			unset($params['name']);
+			unset($params['url']);
+			$value['url'] = Minz_Url::display(array('params' => $params));
+
+			$this->data['queries'][] = $value;
 		}
 	}
 	public function _theme($value) {
diff --git a/app/i18n/en.php b/app/i18n/en.php
index afcc4b7ec..223b74010 100644
--- a/app/i18n/en.php
+++ b/app/i18n/en.php
@@ -16,27 +16,34 @@ return array (
 	'feeds'				=> 'Feeds',
 	'shortcuts'			=> 'Shortcuts',
 	'queries'			=> 'User queries',
-	'query-search'			=> 'Search for "%s"',
-	'query-order-asc'		=> 'Display oldest articles first',
-	'query-order-desc'		=> 'Display newest articles first',
-	'query-get-category'		=> 'Display "%s" category',
-	'query-get-feed'		=> 'Display "%s" feed',
-	'query-state-0'			=> 'Display all articles',
-	'query-state-1'			=> 'Display read articles',
-	'query-state-2'			=> 'Display unread articles',
-	'query-state-3'			=> 'Display all articles',
-	'query-state-4'			=> 'Display favorite articles',
-	'query-state-5'			=> 'Display read favorite articles',
-	'query-state-6'			=> 'Display unread favorite articles',
-	'query-state-7'			=> 'Display favorite articles',
-	'query-state-8'			=> 'Display not favorite articles',
-	'query-state-9'			=> 'Display read not favorite articles',
-	'query-state-10'		=> 'Display unread not favorite articles',
-	'query-state-11'		=> 'Display not favorite articles',
-	'query-state-12'		=> 'Display all articles',
-	'query-state-13'		=> 'Display read articles',
-	'query-state-14'		=> 'Display unread articles',
-	'query-state-15'		=> 'Display all articles',
+	'query_search'			=> 'Search for "%s"',
+	'query_order_asc'		=> 'Display oldest articles first',
+	'query_order_desc'		=> 'Display newest articles first',
+	'query_get_category'		=> 'Display "%s" category',
+	'query_get_feed'		=> 'Display "%s" feed',
+	'query_get_all'			=> 'Display all articles',
+	'query_get_favorite'		=> 'Display favorite articles',
+	'query_state_0'			=> 'Display all articles',
+	'query_state_1'			=> 'Display read articles',
+	'query_state_2'			=> 'Display unread articles',
+	'query_state_3'			=> 'Display all articles',
+	'query_state_4'			=> 'Display favorite articles',
+	'query_state_5'			=> 'Display read favorite articles',
+	'query_state_6'			=> 'Display unread favorite articles',
+	'query_state_7'			=> 'Display favorite articles',
+	'query_state_8'			=> 'Display not favorite articles',
+	'query_state_9'			=> 'Display read not favorite articles',
+	'query_state_10'		=> 'Display unread not favorite articles',
+	'query_state_11'		=> 'Display not favorite articles',
+	'query_state_12'		=> 'Display all articles',
+	'query_state_13'		=> 'Display read articles',
+	'query_state_14'		=> 'Display unread articles',
+	'query_state_15'		=> 'Display all articles',
+	'query_number'			=> 'Query n°%d',
+	'add_query'			=> 'Add a query',
+	'no_query'			=> 'You have not create user query yet.',
+	'query_filter'			=> 'Filter applied:',
+	'no_query_filter'		=> 'No filter',
 	'about'				=> 'About',
 	'stats'				=> 'Statistics',
 
diff --git a/app/i18n/fr.php b/app/i18n/fr.php
index 9cd1725dd..e85e66723 100644
--- a/app/i18n/fr.php
+++ b/app/i18n/fr.php
@@ -16,27 +16,34 @@ return array (
 	'feeds'				=> 'Flux',
 	'shortcuts'			=> 'Raccourcis',
 	'queries'			=> 'Filtres utilisateurs',
-	'query-search'			=> 'Chercher "%s"',
-	'query-order-asc'		=> 'Afficher les articles les plus anciens en premier',
-	'query-order-desc'		=> 'Afficher les articles les plus récents en premier',
-	'query-get-category'		=> 'Afficher la catégorie "%s"',
-	'query-get-feed'		=> 'Afficher le flux "%s"',
-	'query-state-0'			=> 'Afficher tous les articles',
-	'query-state-1'			=> 'Afficher les articles lus',
-	'query-state-2'			=> 'Afficher les articles non lus',
-	'query-state-3'			=> 'Afficher tous les articles',
-	'query-state-4'			=> 'Afficher les articles favoris',
-	'query-state-5'			=> 'Afficher les articles lus et favoris',
-	'query-state-6'			=> 'Afficher les articles non lus et favoris',
-	'query-state-7'			=> 'Afficher les articles favoris',
-	'query-state-8'			=> 'Afficher les articles non favoris',
-	'query-state-9'			=> 'Afficher les articles lus et non favoris',
-	'query-state-10'		=> 'Afficher les articles non lus et non favoris',
-	'query-state-11'		=> 'Afficher les articles non favoris',
-	'query-state-12'		=> 'Afficher tous les articles',
-	'query-state-13'		=> 'Afficher les articles lus',
-	'query-state-14'		=> 'Afficher les articles non lus',
-	'query-state-15'		=> 'Afficher tous les articles',
+	'query_search'			=> 'Recherche de "%s"',
+	'query_order_asc'		=> 'Afficher les articles les plus anciens en premier',
+	'query_order_desc'		=> 'Afficher les articles les plus récents en premier',
+	'query_get_category'		=> 'Afficher la catégorie "%s"',
+	'query_get_feed'		=> 'Afficher le flux "%s"',
+	'query_get_all'			=> 'Afficher tous les articles',
+	'query_get_favorite'		=> 'Afficher les articles favoris',
+	'query_state_0'			=> 'Afficher tous les articles',
+	'query_state_1'			=> 'Afficher les articles lus',
+	'query_state_2'			=> 'Afficher les articles non lus',
+	'query_state_3'			=> 'Afficher tous les articles',
+	'query_state_4'			=> 'Afficher les articles favoris',
+	'query_state_5'			=> 'Afficher les articles lus et favoris',
+	'query_state_6'			=> 'Afficher les articles non lus et favoris',
+	'query_state_7'			=> 'Afficher les articles favoris',
+	'query_state_8'			=> 'Afficher les articles non favoris',
+	'query_state_9'			=> 'Afficher les articles lus et non favoris',
+	'query_state_10'		=> 'Afficher les articles non lus et non favoris',
+	'query_state_11'		=> 'Afficher les articles non favoris',
+	'query_state_12'		=> 'Afficher tous les articles',
+	'query_state_13'		=> 'Afficher les articles lus',
+	'query_state_14'		=> 'Afficher les articles non lus',
+	'query_state_15'		=> 'Afficher tous les articles',
+	'query_number'			=> 'Filtre n°%d',
+	'add_query'			=> 'Créer un filtre',
+	'no_query'			=> 'Vous n’avez pas encore créé de filtre.',
+	'query_filter'			=> 'Filtres appliqués :',
+	'no_query_filter'		=> 'Aucun filtre appliqué',
 	'about'				=> 'À propos',
 	'stats'				=> 'Statistiques',
 
diff --git a/app/layout/aside_flux.phtml b/app/layout/aside_flux.phtml
index 8f8d436e1..817dae676 100644
--- a/app/layout/aside_flux.phtml
+++ b/app/layout/aside_flux.phtml
@@ -36,23 +36,6 @@
 				</a>
 			</div>
 		</li>
-		
-		<?php 
-		$count = 0;
-		foreach ($this->conf->queries as $query_conf):
-			$count++;
-			$name = $count;
-			if (isset($query_conf['name'])) {
-				$name = $query_conf['name'];
-				unset($query_conf['name']);
-			}
-			$url_user_query = array('c' => 'index', 'a' => 'index', 'params' => $query_conf); ?>
-		<li>
-			<div class="category">
-				<a  data-unread="0" class="btn" href="<?php echo Minz_Url::display($url_user_query)?>"><?php echo $name?></a>
-			</div>
-		</li>
-		<?php endforeach; ?>
 
 		<?php
 		foreach ($this->cat_aside as $cat) {
diff --git a/app/layout/nav_menu.phtml b/app/layout/nav_menu.phtml
index aadaadff9..a9cf02388 100644
--- a/app/layout/nav_menu.phtml
+++ b/app/layout/nav_menu.phtml
@@ -7,18 +7,20 @@
 	<?php } ?>
 
 	<?php if ($this->loginOk) { ?>
-	<?php $url_state = $this->url;
-		if ($this->state & FreshRSS_Entry::STATE_READ) {
-			$url_state['params']['state'] = $this->state & ~FreshRSS_Entry::STATE_READ;
-			$checked = 'true';
-			$class = 'active';
-		} else {
-			$url_state['params']['state'] = $this->state | FreshRSS_Entry::STATE_READ;
-			$checked = 'false';
-			$class = '';
-		}
-	?>
 	<div class="stick">
+		<?php
+			$url_state = $this->url;
+
+			if ($this->state & FreshRSS_Entry::STATE_READ) {
+				$url_state['params']['state'] = $this->state & ~FreshRSS_Entry::STATE_READ;
+				$checked = 'true';
+				$class = 'active';
+			} else {
+				$url_state['params']['state'] = $this->state | FreshRSS_Entry::STATE_READ;
+				$checked = 'false';
+				$class = '';
+			}
+		?>
 		<a id="toggle-read"
 		   class="btn <?php echo $class; ?>"
 		   aria-checked="<?php echo $checked; ?>"
@@ -26,6 +28,7 @@
 		   title="<?php echo Minz_Translate::t ('show_read'); ?>">
 			<?php echo FreshRSS_Themes::icon('read'); ?>
 		</a>
+
 		<?php
 			if ($this->state & FreshRSS_Entry::STATE_NOT_READ) {
 				$url_state['params']['state'] = $this->state & ~FreshRSS_Entry::STATE_NOT_READ;
@@ -44,6 +47,7 @@
 		   title="<?php echo Minz_Translate::t ('show_not_reads'); ?>">
 			<?php echo FreshRSS_Themes::icon('unread'); ?>
 		</a>
+
 		<?php
 			if ($this->state & FreshRSS_Entry::STATE_FAVORITE) {
 				$url_state['params']['state'] = $this->state & ~FreshRSS_Entry::STATE_FAVORITE;
@@ -62,6 +66,7 @@
 		   title="<?php echo Minz_Translate::t ('show_favorite'); ?>">
 			<?php echo FreshRSS_Themes::icon('starred'); ?>
 		</a>
+
 		<?php
 			if ($this->state & FreshRSS_Entry::STATE_NOT_FAVORITE) {
 				$url_state['params']['state'] = $this->state & ~FreshRSS_Entry::STATE_NOT_FAVORITE;
@@ -80,6 +85,34 @@
 		   title="<?php echo Minz_Translate::t ('show_not_favorite'); ?>">
 			<?php echo FreshRSS_Themes::icon('non-starred'); ?>
 		</a>
+
+		<div class="dropdown">
+			<div id="dropdown-query" class="dropdown-target"></div>
+
+			<a class="dropdown-toggle btn" href="#dropdown-query"><?php echo FreshRSS_Themes::icon('bookmark-add'); ?></a>
+			<ul class="dropdown-menu">
+				<li class="dropdown-close"><a href="#close">❌</a></li>
+
+				<li class="dropdown-header"><?php echo Minz_Translate::t('queries'); ?> <a class="no-mobile" href="<?php echo _url('configure', 'queries'); ?>"><?php echo FreshRSS_Themes::icon('configure'); ?></a></li>
+
+				<?php foreach ($this->conf->queries as $query) { ?>
+				<li class="item">
+					<a href="<?php echo $query['url']; ?>"><?php echo $query['name']; ?></a>
+				</li>
+				<?php } ?>
+
+				<?php if (count($this->conf->queries) > 0) { ?>
+				<li class="separator no-mobile"></li>
+				<?php } ?>
+
+				<?php
+					$url_query = $this->url;
+					$url_query['c'] = 'configure';
+					$url_query['a'] = 'addQuery';
+				?>
+				<li class="item no-mobile"><a href="<?php echo Minz_Url::display($url_query); ?>"><?php echo Minz_Translate::t('add_query'); ?></a></li>
+			</ul>
+		</div>
 	</div>
 	<?php
 		$get = false;
@@ -233,14 +266,6 @@
 	<a class="btn" href="<?php echo Minz_Url::display ($url_order); ?>" title="<?php echo Minz_Translate::t ($title); ?>">
 		<?php echo FreshRSS_Themes::icon($icon); ?>
 	</a>
-
-	<?php if ($this->loginOk) {
-		$url_query = $this->url;
-		$url_query['c'] = 'configure';
-		$url_query['a'] = 'addQuery';
-	?>
-	<a id="save_query" class="btn" href="<?php echo Minz_Url::display ($url_query); ?>"><?php echo FreshRSS_Themes::icon('bookmark-add'); ?></a>
-	<?php } ?>
 	
 	<?php if ($this->loginOk || Minz_Configuration::allowAnonymousRefresh()) { ?>
 	<a id="actualize" class="btn" href="<?php echo _url ('feed', 'actualize'); ?>"><?php echo FreshRSS_Themes::icon('refresh'); ?></a>
diff --git a/app/views/configure/queries.phtml b/app/views/configure/queries.phtml
index f0c551742..d0aec687b 100644
--- a/app/views/configure/queries.phtml
+++ b/app/views/configure/queries.phtml
@@ -1,45 +1,90 @@
-<?php $this->partial ('aside_configure'); ?>
+<?php $this->partial('aside_configure'); ?>
 
 <div class="post">
-	<a href="<?php echo _url ('index', 'index'); ?>"><?php echo Minz_Translate::t ('back_to_rss_feeds'); ?></a>
-
-	<form method="post" action="<?php echo _url ('configure', 'queries'); ?>">
-		<legend><?php echo Minz_Translate::t ('queries'); ?></legend>
-
-		<?php foreach ($this->conf->queries as $key => $query):?>
-			<div class="form-group">
-				<label class="group-name"><?php echo $key + 1?></label>
-				<div class="group-controls">
-					<input type="hidden" id="queries_<?php echo $key; ?>_search" name="queries[<?php echo $key; ?>][search]" value="<?php echo isset($query['search']) ? $query['search'] : ""; ?>"/>
-					<input type="hidden" id="queries_<?php echo $key; ?>_state" name="queries[<?php echo $key; ?>][state]" value="<?php echo isset($query['state']) ? $query['state'] : ""; ?>"/>
-					<input type="hidden" id="queries_<?php echo $key; ?>_order" name="queries[<?php echo $key; ?>][order]" value="<?php echo isset($query['order']) ? $query['order'] : ""; ?>"/>
-					<input type="hidden" id="queries_<?php echo $key; ?>_get" name="queries[<?php echo $key; ?>][get]" value="<?php echo isset($query['get']) ? $query['get'] : ""; ?>"/>
-					<input type="text" id="queries_<?php echo $key; ?>_name" name="queries[<?php echo $key; ?>][name]" value="<?php echo isset($query['name']) ? $query['name'] : ""; ?>"/>
-					<a href='#' class='query remove'><?php echo FreshRSS_Themes::icon('close'); ?></a>
+	<a href="<?php echo _url('index', 'index'); ?>"><?php echo Minz_Translate::t('back_to_rss_feeds'); ?></a>
+
+	<form method="post" action="<?php echo _url('configure', 'queries'); ?>">
+		<legend><?php echo Minz_Translate::t('queries'); ?></legend>
+
+		<?php foreach ($this->conf->queries as $key => $query) { ?>
+		<div class="form-group" id="query-group-<?php echo $key; ?>">
+			<label class="group-name" for="queries_<?php echo $key; ?>_name">
+				<?php echo Minz_Translate::t('query_number', $key + 1); ?>
+			</label>
+
+			<div class="group-controls">
+				<input type="hidden" id="queries_<?php echo $key; ?>_search" name="queries[<?php echo $key; ?>][search]" value="<?php echo isset($query['search']) ? $query['search'] : ""; ?>"/>
+				<input type="hidden" id="queries_<?php echo $key; ?>_state" name="queries[<?php echo $key; ?>][state]" value="<?php echo isset($query['state']) ? $query['state'] : ""; ?>"/>
+				<input type="hidden" id="queries_<?php echo $key; ?>_order" name="queries[<?php echo $key; ?>][order]" value="<?php echo isset($query['order']) ? $query['order'] : ""; ?>"/>
+				<input type="hidden" id="queries_<?php echo $key; ?>_get" name="queries[<?php echo $key; ?>][get]" value="<?php echo isset($query['get']) ? $query['get'] : ""; ?>"/>
+
+				<div class="stick">
+					<input class="extend"
+					       type="text"
+					       id="queries_<?php echo $key; ?>_name"
+					       name="queries[<?php echo $key; ?>][name]"
+					       value="<?php echo $query['name']; ?>"
+					/>
+
+					<a class="btn" href="<?php echo $query['url']; ?>">
+						<?php echo FreshRSS_Themes::icon('link'); ?>
+					</a>
+
+					<a class="btn btn-attention remove" href="#" data-remove="query-group-<?php echo $key; ?>">
+						<?php echo FreshRSS_Themes::icon('close'); ?>
+					</a>
+				</div>
+
+				<?php
+					$exist = (isset($query['search']) ? 1 : 0)
+						   + (isset($query['state']) ? 1 : 0)
+						   + (isset($query['order']) ? 1 : 0)
+						   + (isset($query['get']) ? 1 : 0);
+					// If the only filter is "all" articles, we consider there is no filter
+					$exist = ($exist === 1 && isset($query['get']) && $query['get'] === 'a') ? 0 : $exist;
+				?>
+
+				<?php if ($exist === 0) { ?>
+				<div class="alert alert-warn">
+					<div class="alert-head"><?php echo Minz_Translate::t('no_query_filter'); ?></div>
+				</div>
+				<?php } else { ?>
+				<div class="alert alert-success">
+					<div class="alert-head"><?php echo Minz_Translate::t('query_filter'); ?></div>
+
 					<ul>
-						<?php if (isset($query['search'])):?>
-							<li><?php echo Minz_Translate::t ('query-search', $query['search']); ?></li>
-						<?php endif; ?>
-						<?php if (isset($query['state'])):?>
-							<li><?php echo Minz_Translate::t ('query-state-' . $query['state']); ?></li>
-						<?php endif; ?>
-						<?php if (isset($query['order'])):?>
-							<li><?php echo Minz_Translate::t ('query-order-' . strtolower($query['order'])); ?></li>
-						<?php endif; ?>
-						<?php if (isset($query['get'])):?>
-							<li><?php echo Minz_Translate::t ('query-get-' . $this->query_get[$key]['type'], $this->query_get[$key]['name']); ?></li>
-						<?php endif; ?>
+						<?php if (isset($query['search'])) { $exist = true; ?>
+						<li class="item"><?php echo Minz_Translate::t('query_search', $query['search']); ?></li>
+						<?php } ?>
+
+						<?php if (isset($query['state'])) { $exist = true; ?>
+						<li class="item"><?php echo Minz_Translate::t('query_state_' . $query['state']); ?></li>
+						<?php } ?>
+
+						<?php if (isset($query['order'])) { $exist = true; ?>
+						<li class="item"><?php echo Minz_Translate::t('query_order_' . strtolower($query['order'])); ?></li>
+						<?php } ?>
+
+						<?php if (isset($query['get'])) { $exist = true; ?>
+						<li class="item"><?php echo Minz_Translate::t('query_get_' . $this->query_get[$key]['type'], $this->query_get[$key]['name']); ?></li>
+						<?php } ?>
 					</ul>
 				</div>
+				<?php } ?>
 			</div>
-		<?php endforeach; ?>
-		
+		</div>
+		<?php } ?>
+
+		<?php if (count($this->conf->queries) > 0) { ?>
 		<div class="form-group form-actions">
 			<div class="group-controls">
 				<button type="submit" class="btn btn-important"><?php echo Minz_Translate::t ('save'); ?></button>
 				<button type="reset" class="btn"><?php echo Minz_Translate::t ('cancel'); ?></button>
 			</div>
 		</div>
+		<?php } else { ?>
+		<p class="alert alert-warn"><span class="alert-head"><?php echo Minz_Translate::t ('damn'); ?></span> <?php echo Minz_Translate::t('no_query'); ?></p>
+		<?php } ?>
 	</form>
 
 </div>
\ No newline at end of file
diff --git a/app/views/configure/sharing.phtml b/app/views/configure/sharing.phtml
index a952bc3b4..02ce331da 100644
--- a/app/views/configure/sharing.phtml
+++ b/app/views/configure/sharing.phtml
@@ -4,35 +4,35 @@
 	<a href="<?php echo _url ('index', 'index'); ?>"><?php echo Minz_Translate::t ('back_to_rss_feeds'); ?></a>
 
 	<form method="post" action="<?php echo _url ('configure', 'sharing'); ?>"
-		data-simple='<div class="form-group"><label class="group-name">##label##</label><div class="group-controls"><a href="#" class="share remove btn btn-attention"><?php echo FreshRSS_Themes::icon('close'); ?></a>
+		data-simple='<div class="form-group" id="group-share-##key##"><label class="group-name">##label##</label><div class="group-controls"><a href="#" class="remove btn btn-attention" data-remove="group-share-##key##"><?php echo FreshRSS_Themes::icon('close'); ?></a>
 			<input type="hidden" id="share_##key##_type" name="share[##key##][type]" value="##type##" /></div></div>'
-		data-advanced='<div class="form-group"><label class="group-name">##label##</label><div class="group-controls">
+		data-advanced='<div class="form-group" id="group-share-##key##"><label class="group-name">##label##</label><div class="group-controls">
 			<input type="hidden" id="share_##key##_type" name="share[##key##][type]" value="##type##" />
 			<div class="stick">
 			<input type="text" id="share_##key##_name" name="share[##key##][name]" class="extend" value="" placeholder="<?php echo Minz_Translate::t ('share_name'); ?>" size="64" />
 			<input type="url" id="share_##key##_url" name="share[##key##][url]" class="extend" value="" placeholder="<?php echo Minz_Translate::t ('share_url'); ?>" size="64" />
-			<a href="#" class="share remove btn btn-attention"><?php echo FreshRSS_Themes::icon('close'); ?></a></div>
+			<a href="#" class="remove btn btn-attention" data-remove="group-share-##key##"><?php echo FreshRSS_Themes::icon('close'); ?></a></div>
 			<a target="_blank" class="btn" title="<?php echo Minz_Translate::t('more_information'); ?>" href="##help##"><?php echo FreshRSS_Themes::icon('help'); ?></a>
 			</div></div>'>
 		<legend><?php echo Minz_Translate::t ('sharing'); ?></legend>
 		<?php foreach ($this->conf->sharing as $key => $sharing): ?>
 			<?php $share = $this->conf->shares[$sharing['type']]; ?>
-			<div class="form-group">
+			<div class="form-group" id="group-share-<?php echo $key; ?>">
 				<label class="group-name">
 					<?php echo Minz_Translate::t ($sharing['type']); ?>
 				</label>
 				<div class="group-controls">
 					<input type='hidden' id='share_<?php echo $key;?>_type' name="share[<?php echo $key;?>][type]" value='<?php echo $sharing['type']?>' />
-					<?php if ($share['form'] === 'advanced'){ ?>
+					<?php if ($share['form'] === 'advanced') { ?>
 						<div class="stick">
 							<input type="text" id="share_<?php echo $key;?>_name" name="share[<?php echo $key;?>][name]" class="extend" value="<?php echo $sharing['name']?>" placeholder="<?php echo Minz_Translate::t ('share_name'); ?>" size="64" />
 							<input type="url" id="share_<?php echo $key;?>_url" name="share[<?php echo $key;?>][url]" class="extend" value="<?php echo $sharing['url']?>" placeholder="<?php echo Minz_Translate::t ('share_url'); ?>" size="64" />
-							<a href='#' class='share remove btn btn-attention'><?php echo FreshRSS_Themes::icon('close'); ?></a>
+							<a href='#' class='remove btn btn-attention' data-remove="group-share-<?php echo $key; ?>"><?php echo FreshRSS_Themes::icon('close'); ?></a>
 						</div>
 
 						<a target="_blank" class="btn" title="<?php echo Minz_Translate::t('more_information'); ?>" href="<?php echo $share['help']?>"><?php echo FreshRSS_Themes::icon('help'); ?></a>
 					<?php } else { ?>
-					<a href='#' class='share remove btn btn-attention'><?php echo FreshRSS_Themes::icon('close'); ?></a>
+					<a href='#' class='remove btn btn-attention' data-remove="group-share-<?php echo $key; ?>"><?php echo FreshRSS_Themes::icon('close'); ?></a>
 					<?php } ?>
 				</div>
 			</div>
diff --git a/lib/Minz/Request.php b/lib/Minz/Request.php
index 7e3c59990..755784522 100644
--- a/lib/Minz/Request.php
+++ b/lib/Minz/Request.php
@@ -28,6 +28,9 @@ class Minz_Request {
 		return self::$params;
 	}
 	static function htmlspecialchars_utf8 ($p) {
+		if (is_array($p)) {
+			return array_map('self::htmlspecialchars_utf8', $p);
+		}
 		return htmlspecialchars($p, ENT_COMPAT, 'UTF-8');
 	}
 	public static function param ($key, $default = false, $specialchars = false) {
@@ -35,8 +38,6 @@ class Minz_Request {
 			$p = self::$params[$key];
 			if(is_object($p) || $specialchars) {
 				return $p;
-			} elseif(is_array($p)) {
-				return array_map('self::htmlspecialchars_utf8', $p);
 			} else {
 				return self::htmlspecialchars_utf8($p);
 			}
diff --git a/p/scripts/main.js b/p/scripts/main.js
index 079ae0da4..5a3b25c3f 100644
--- a/p/scripts/main.js
+++ b/p/scripts/main.js
@@ -975,11 +975,6 @@ function init_print_action() {
 function init_share_observers() {
 	shares = $('.form-group:not(".form-actions")').length;
 
-	$('.post').on('click', '.share.remove', function(e) {
-		e.preventDefault();
-		$(this).parents('.form-group').remove();
-	});
-
 	$('.share.add').on('click', function(e) {
 		var opt = $(this).siblings('select').find(':selected');
 		var row = $(this).parents('form').data(opt.data('form'));
@@ -994,10 +989,16 @@ function init_share_observers() {
 	});
 }
 
-function init_queries_observers() {
-	$('.post').on('click', '.query.remove', function(e) {
-		e.preventDefault();
-		$(this).parents('.form-group').remove();
+function init_remove_observers() {
+	$('.post').on('click', 'a.remove', function(e) {
+		var remove_what = $(this).attr('data-remove');
+
+		if (remove_what !== undefined) {
+			var remove_obj = $('#' + remove_what);
+			remove_obj.remove();
+		}
+
+		return false;
 	});
 }
 
@@ -1061,7 +1062,7 @@ function init_all() {
 		window.setInterval(refreshUnreads, 120000);
 	} else {
 		init_share_observers();
-		init_queries_observers();
+		init_remove_observers();
 		init_feed_observers();
 		init_password_observers();
 	}
diff --git a/p/themes/Origine/origine.css b/p/themes/Origine/origine.css
index 1835e9ff9..cd40dc509 100644
--- a/p/themes/Origine/origine.css
+++ b/p/themes/Origine/origine.css
@@ -362,6 +362,10 @@ a.btn {
 	padding: 0 25px;
 	line-height: 2.5em;
 }
+.dropdown-menu > .item > span {
+	padding: 0 25px;
+	line-height: 2em;
+}
 .dropdown-menu > .item:hover {
 	background: #0062BE;
 	color: #fff;
@@ -400,7 +404,7 @@ a.btn {
 	font-size: 0.9em;
 }
 .alert-head {
-	font-size: 1.2em;
+	font-size: 1.15em;
 }
 .alert > a {
 	color: inherit;
diff --git a/p/themes/Origine/template.css b/p/themes/Origine/template.css
index f68fdfca3..09ecaf685 100644
--- a/p/themes/Origine/template.css
+++ b/p/themes/Origine/template.css
@@ -180,7 +180,8 @@ a.btn {
 .dropdown-menu > .item {
 	display: block;
 }
-.dropdown-menu > .item > a {
+.dropdown-menu > .item > a,
+.dropdown-menu > .item > span {
 	display: block;
 }
 .dropdown-menu > .item[aria-checked="true"] > a:before {
@@ -220,10 +221,16 @@ a.btn {
 	display: block;
 	width: 90%;
 }
+.group-controls .alert {
+	width: 100%
+}
 .alert-head {
 	margin: 0;
 	font-weight: bold;
 }
+.alert ul {
+	margin: 5px 20px;
+}
 
 /*=== Icons */
 .icon {
@@ -587,7 +594,9 @@ a.btn {
 	.aside .btn-important,
 	.aside .feeds .dropdown,
 	.flux_header .item.website span,
-	.item.date, .day .date {
+	.item.date, .day .date,
+	.dropdown-menu > .no-mobile,
+	.no-mobile {
 		display: none;
 	}
 	.nav-login {
-- 
cgit v1.2.3


From bc8eb560afd50290745ea6a500c0f930df2559eb Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Sun, 6 Jul 2014 00:09:31 +0200
Subject: Add TTL to control feed freshness

https://github.com/marienfressinaud/FreshRSS/issues/250
---
 app/Controllers/configureController.php  |   3 +
 app/Controllers/entryController.php      |   2 +-
 app/Controllers/feedController.php       |   2 +-
 app/Controllers/javascriptController.php |   2 +-
 app/Models/Configuration.php             |   5 ++
 app/Models/Feed.php                      | 150 ++++++++++++++++---------------
 app/Models/FeedDAO.php                   |  19 ++--
 app/i18n/en.php                          |   3 +-
 app/i18n/fr.php                          |   1 +
 app/views/configure/archiving.phtml      |  21 +++++
 app/views/configure/feed.phtml           |  21 +++++
 lib/lib_rss.php                          |   2 +-
 12 files changed, 150 insertions(+), 81 deletions(-)

(limited to 'app/Models/Configuration.php')

diff --git a/app/Controllers/configureController.php b/app/Controllers/configureController.php
index a608df162..5fd09a263 100755
--- a/app/Controllers/configureController.php
+++ b/app/Controllers/configureController.php
@@ -109,6 +109,7 @@ class FreshRSS_configure_Controller extends Minz_ActionController {
 						'priority' => intval(Minz_Request::param ('priority', 0)),
 						'httpAuth' => $httpAuth,
 						'keep_history' => intval(Minz_Request::param ('keep_history', -2)),
+						'ttl' => intval(Minz_Request::param('ttl', -2)),
 					);
 
 					if ($feedDAO->updateFeed ($id, $values)) {
@@ -274,9 +275,11 @@ class FreshRSS_configure_Controller extends Minz_ActionController {
 		if (Minz_Request::isPost()) {
 			$old = Minz_Request::param('old_entries', 3);
 			$keepHistoryDefault = Minz_Request::param('keep_history_default', 0);
+			$ttlDefault = Minz_Request::param('ttl_default', -2);
 
 			$this->view->conf->_old_entries($old);
 			$this->view->conf->_keep_history_default($keepHistoryDefault);
+			$this->view->conf->_ttl_default($ttlDefault);
 			$this->view->conf->save();
 			invalidateHttpCache();
 
diff --git a/app/Controllers/entryController.php b/app/Controllers/entryController.php
index 2d7fa718a..ac43587ea 100755
--- a/app/Controllers/entryController.php
+++ b/app/Controllers/entryController.php
@@ -125,7 +125,7 @@ class FreshRSS_entry_Controller extends Minz_ActionController {
 		$date_min = time() - (3600 * 24 * 30 * $nb_month_old);
 
 		$feedDAO = FreshRSS_Factory::createFeedDao();
-		$feeds = $feedDAO->listFeedsOrderUpdate();
+		$feeds = $feedDAO->listFeeds();
 		$nbTotal = 0;
 
 		invalidateHttpCache();
diff --git a/app/Controllers/feedController.php b/app/Controllers/feedController.php
index d30b60877..36425ca9b 100755
--- a/app/Controllers/feedController.php
+++ b/app/Controllers/feedController.php
@@ -233,7 +233,7 @@ class FreshRSS_feed_Controller extends Minz_ActionController {
 				$feeds = array ($feed);
 			}
 		} else {
-			$feeds = $feedDAO->listFeedsOrderUpdate ();
+			$feeds = $feedDAO->listFeedsOrderUpdate($this->view->conf->ttl_default);
 		}
 
 		// on calcule la date des articles les plus anciens qu'on accepte
diff --git a/app/Controllers/javascriptController.php b/app/Controllers/javascriptController.php
index 737908c91..67148350f 100755
--- a/app/Controllers/javascriptController.php
+++ b/app/Controllers/javascriptController.php
@@ -8,7 +8,7 @@ class FreshRSS_javascript_Controller extends Minz_ActionController {
 	public function actualizeAction () {
 		header('Content-Type: text/javascript; charset=UTF-8');
 		$feedDAO = FreshRSS_Factory::createFeedDao();
-		$this->view->feeds = $feedDAO->listFeedsOrderUpdate();
+		$this->view->feeds = $feedDAO->listFeedsOrderUpdate($this->view->conf->ttl_default);
 	}
 
 	public function nbUnreadsPerFeedAction() {
diff --git a/app/Models/Configuration.php b/app/Models/Configuration.php
index ffd20deca..f2084b833 100644
--- a/app/Models/Configuration.php
+++ b/app/Models/Configuration.php
@@ -7,6 +7,7 @@ class FreshRSS_Configuration {
 		'language' => 'en',
 		'old_entries' => 3,
 		'keep_history_default' => 0,
+		'ttl_default' => 3600,
 		'mail_login' => '',
 		'token' => '',
 		'passwordHash' => '',	//CRYPT_BLOWFISH
@@ -159,6 +160,10 @@ class FreshRSS_Configuration {
 		$value = intval($value);
 		$this->data['keep_history_default'] = $value >= -1 ? $value : 0;
 	}
+	public function _ttl_default($value) {
+		$value = intval($value);
+		$this->data['ttl_default'] = $value >= -1 ? $value : 3600;
+	}
 	public function _shortcuts ($values) {
 		foreach ($values as $key => $value) {
 			if (isset($this->data['shortcuts'][$key])) {
diff --git a/app/Models/Feed.php b/app/Models/Feed.php
index c9f1230ad..576f37760 100644
--- a/app/Models/Feed.php
+++ b/app/Models/Feed.php
@@ -16,18 +16,19 @@ class FreshRSS_Feed extends Minz_Model {
 	private $httpAuth = '';
 	private $error = false;
 	private $keep_history = -2;
+	private $ttl = -2;
 	private $hash = null;
 	private $lockPath = '';
 
-	public function __construct ($url, $validate=true) {
+	public function __construct($url, $validate=true) {
 		if ($validate) {
-			$this->_url ($url);
+			$this->_url($url);
 		} else {
 			$this->url = $url;
 		}
 	}
 
-	public function id () {
+	public function id() {
 		return $this->id;
 	}
 
@@ -38,72 +39,75 @@ class FreshRSS_Feed extends Minz_Model {
 		return $this->hash;
 	}
 
-	public function url () {
+	public function url() {
 		return $this->url;
 	}
-	public function category () {
+	public function category() {
 		return $this->category;
 	}
-	public function entries () {
+	public function entries() {
 		return $this->entries === null ? array() : $this->entries;
 	}
-	public function name () {
+	public function name() {
 		return $this->name;
 	}
-	public function website () {
+	public function website() {
 		return $this->website;
 	}
-	public function description () {
+	public function description() {
 		return $this->description;
 	}
-	public function lastUpdate () {
+	public function lastUpdate() {
 		return $this->lastUpdate;
 	}
-	public function priority () {
+	public function priority() {
 		return $this->priority;
 	}
-	public function pathEntries () {
+	public function pathEntries() {
 		return $this->pathEntries;
 	}
-	public function httpAuth ($raw = true) {
+	public function httpAuth($raw = true) {
 		if ($raw) {
 			return $this->httpAuth;
 		} else {
-			$pos_colon = strpos ($this->httpAuth, ':');
-			$user = substr ($this->httpAuth, 0, $pos_colon);
-			$pass = substr ($this->httpAuth, $pos_colon + 1);
+			$pos_colon = strpos($this->httpAuth, ':');
+			$user = substr($this->httpAuth, 0, $pos_colon);
+			$pass = substr($this->httpAuth, $pos_colon + 1);
 
-			return array (
+			return array(
 				'username' => $user,
 				'password' => $pass
 			);
 		}
 	}
-	public function inError () {
+	public function inError() {
 		return $this->error;
 	}
-	public function keepHistory () {
+	public function keepHistory() {
 		return $this->keep_history;
 	}
-	public function nbEntries () {
+	public function ttl() {
+		return $this->ttl;
+	}
+	public function nbEntries() {
 		if ($this->nbEntries < 0) {
 			$feedDAO = FreshRSS_Factory::createFeedDao();
-			$this->nbEntries = $feedDAO->countEntries ($this->id ());
+			$this->nbEntries = $feedDAO->countEntries($this->id());
 		}
 
 		return $this->nbEntries;
 	}
-	public function nbNotRead () {
+	public function nbNotRead() {
 		if ($this->nbNotRead < 0) {
 			$feedDAO = FreshRSS_Factory::createFeedDao();
-			$this->nbNotRead = $feedDAO->countNotRead ($this->id ());
+			$this->nbNotRead = $feedDAO->countNotRead($this->id());
 		}
 
 		return $this->nbNotRead;
 	}
 	public function faviconPrepare() {
 		$file = DATA_PATH . '/favicons/' . $this->hash() . '.txt';
-		if (!file_exists ($file)) {
+		if (!file_exists($file)) {
 			$t = $this->website;
 			if ($t == '') {
 				$t = $this->url;
@@ -116,92 +120,98 @@ class FreshRSS_Feed extends Minz_Model {
 		@unlink($path . '.ico');
 		@unlink($path . '.txt');
 	}
-	public function favicon () {
-		return Minz_Url::display ('/f.php?' . $this->hash());
+	public function favicon() {
+		return Minz_Url::display('/f.php?' . $this->hash());
 	}
 
-	public function _id ($value) {
+	public function _id($value) {
 		$this->id = $value;
 	}
-	public function _url ($value, $validate=true) {
+	public function _url($value, $validate=true) {
 		$this->hash = null;
 		if ($validate) {
 			$value = checkUrl($value);
 		}
-		if (empty ($value)) {
-			throw new FreshRSS_BadUrl_Exception ($value);
+		if (empty($value)) {
+			throw new FreshRSS_BadUrl_Exception($value);
 		}
 		$this->url = $value;
 	}
-	public function _category ($value) {
+	public function _category($value) {
 		$value = intval($value);
 		$this->category = $value >= 0 ? $value : 0;
 	}
-	public function _name ($value) {
+	public function _name($value) {
 		$this->name = $value === null ? '' : $value;
 	}
-	public function _website ($value, $validate=true) {
+	public function _website($value, $validate=true) {
 		if ($validate) {
 			$value = checkUrl($value);
 		}
-		if (empty ($value)) {
+		if (empty($value)) {
 			$value = '';
 		}
 		$this->website = $value;
 	}
-	public function _description ($value) {
+	public function _description($value) {
 		$this->description = $value === null ? '' : $value;
 	}
-	public function _lastUpdate ($value) {
+	public function _lastUpdate($value) {
 		$this->lastUpdate = $value;
 	}
-	public function _priority ($value) {
+	public function _priority($value) {
 		$value = intval($value);
 		$this->priority = $value >= 0 ? $value : 10;
 	}
-	public function _pathEntries ($value) {
+	public function _pathEntries($value) {
 		$this->pathEntries = $value;
 	}
-	public function _httpAuth ($value) {
+	public function _httpAuth($value) {
 		$this->httpAuth = $value;
 	}
-	public function _error ($value) {
+	public function _error($value) {
 		$this->error = (bool)$value;
 	}
-	public function _keepHistory ($value) {
+	public function _keepHistory($value) {
 		$value = intval($value);
 		$value = min($value, 1000000);
 		$value = max($value, -2);
 		$this->keep_history = $value;
 	}
-	public function _nbNotRead ($value) {
+	public function _ttl($value) {
+		$value = intval($value);
+		$value = min($value, 100000000);
+		$value = max($value, -2);
+		$this->ttl = $value;
+	}
+	public function _nbNotRead($value) {
 		$this->nbNotRead = intval($value);
 	}
-	public function _nbEntries ($value) {
+	public function _nbEntries($value) {
 		$this->nbEntries = intval($value);
 	}
 
-	public function load ($loadDetails = false) {
+	public function load($loadDetails = false) {
 		if ($this->url !== null) {
 			if (CACHE_PATH === false) {
-				throw new Minz_FileNotExistException (
+				throw new Minz_FileNotExistException(
 					'CACHE_PATH',
 					Minz_Exception::ERROR
 				);
 			} else {
-				$url = htmlspecialchars_decode ($this->url, ENT_QUOTES);
+				$url = htmlspecialchars_decode($this->url, ENT_QUOTES);
 				if ($this->httpAuth != '') {
-					$url = preg_replace ('#((.+)://)(.+)#', '${1}' . $this->httpAuth . '@${3}', $url);
+					$url = preg_replace('#((.+)://)(.+)#', '${1}' . $this->httpAuth . '@${3}', $url);
 				}
 				$feed = customSimplePie();
-				$feed->set_feed_url ($url);
+				$feed->set_feed_url($url);
 				if (!$loadDetails) {	//Only activates auto-discovery when adding a new feed
 					$feed->set_autodiscovery_level(SIMPLEPIE_LOCATOR_NONE);
 				}
 				$mtime = $feed->init();
 
 				if ((!$mtime) || $feed->error()) {
-					throw new FreshRSS_Feed_Exception ($feed->error() . ' [' . $url . ']');
+					throw new FreshRSS_Feed_Exception($feed->error() . ' [' . $url . ']');
 				}
 
 				if ($loadDetails) {
@@ -209,7 +219,7 @@ class FreshRSS_Feed extends Minz_Model {
 					$subscribe_url = $feed->subscribe_url(false);
 
 					$title = strtr(html_only_entity_decode($feed->get_title()), array('<' => '&lt;', '>' => '&gt;', '"' => '&quot;'));	//HTML to HTML-PRE	//ENT_COMPAT except &
-					$this->_name ($title == '' ? $this->url : $title);
+					$this->_name($title == '' ? $this->url : $title);
 
 					$this->_website(html_only_entity_decode($feed->get_link()));
 					$this->_description(html_only_entity_decode($feed->get_description()));
@@ -221,12 +231,12 @@ class FreshRSS_Feed extends Minz_Model {
 				if ($subscribe_url !== null && $subscribe_url !== $this->url) {
 					if ($this->httpAuth != '') {
 						// on enlève les id si authentification HTTP
-						$subscribe_url = preg_replace ('#((.+)://)((.+)@)(.+)#', '${1}${5}', $subscribe_url);
+						$subscribe_url = preg_replace('#((.+)://)((.+)@)(.+)#', '${1}${5}', $subscribe_url);
 					}
-					$this->_url ($subscribe_url);
+					$this->_url($subscribe_url);
 				}
 
-				if (($mtime === true) || ($mtime > $this->lastUpdate)) {
+				if (($mtime === true) ||($mtime > $this->lastUpdate)) {
 					syslog(LOG_DEBUG, 'FreshRSS no cache ' . $mtime . ' > ' . $this->lastUpdate . ' for ' . $subscribe_url);
 					$this->loadEntries($feed);	// et on charge les articles du flux
 				} else {
@@ -240,25 +250,25 @@ class FreshRSS_Feed extends Minz_Model {
 		}
 	}
 
-	private function loadEntries ($feed) {
-		$entries = array ();
+	private function loadEntries($feed) {
+		$entries = array();
 
-		foreach ($feed->get_items () as $item) {
-			$title = html_only_entity_decode (strip_tags ($item->get_title ()));
-			$author = $item->get_author ();
-			$link = $item->get_permalink ();
-			$date = @strtotime ($item->get_date ());
+		foreach ($feed->get_items() as $item) {
+			$title = html_only_entity_decode(strip_tags($item->get_title()));
+			$author = $item->get_author();
+			$link = $item->get_permalink();
+			$date = @strtotime($item->get_date());
 
 			// gestion des tags (catégorie == tag)
-			$tags_tmp = $item->get_categories ();
-			$tags = array ();
+			$tags_tmp = $item->get_categories();
+			$tags = array();
 			if ($tags_tmp !== null) {
 				foreach ($tags_tmp as $tag) {
-					$tags[] = html_only_entity_decode ($tag->get_label ());
+					$tags[] = html_only_entity_decode($tag->get_label());
 				}
 			}
 
-			$content = html_only_entity_decode ($item->get_content ());
+			$content = html_only_entity_decode($item->get_content());
 
 			$elinks = array();
 			foreach ($item->get_enclosures() as $enclosure) {
@@ -276,16 +286,16 @@ class FreshRSS_Feed extends Minz_Model {
 				}
 			}
 
-			$entry = new FreshRSS_Entry (
-				$this->id (),
-				$item->get_id (),
+			$entry = new FreshRSS_Entry(
+				$this->id(),
+				$item->get_id(),
 				$title === null ? '' : $title,
-				$author === null ? '' : html_only_entity_decode ($author->name),
+				$author === null ? '' : html_only_entity_decode($author->name),
 				$content === null ? '' : $content,
 				$link === null ? '' : $link,
-				$date ? $date : time ()
+				$date ? $date : time()
 			);
-			$entry->_tags ($tags);
+			$entry->_tags($tags);
 			// permet de récupérer le contenu des flux tronqués
 			$entry->loadCompleteContent($this->pathEntries());
 
diff --git a/app/Models/FeedDAO.php b/app/Models/FeedDAO.php
index 5281b371d..83f3a6231 100644
--- a/app/Models/FeedDAO.php
+++ b/app/Models/FeedDAO.php
@@ -2,7 +2,7 @@
 
 class FreshRSS_FeedDAO extends Minz_ModelPdo {
 	public function addFeed($valuesTmp) {
-		$sql = 'INSERT INTO `' . $this->prefix . 'feed` (url, category, name, website, description, lastUpdate, priority, httpAuth, error, keep_history) VALUES(?, ?, ?, ?, ?, ?, 10, ?, 0, -2)';
+		$sql = 'INSERT INTO `' . $this->prefix . 'feed` (url, category, name, website, description, lastUpdate, priority, httpAuth, error, keep_history, ttl) VALUES(?, ?, ?, ?, ?, ?, 10, ?, 0, -2, -2)';
 		$stm = $this->bd->prepare($sql);
 
 		$values = array(
@@ -222,13 +222,19 @@ class FreshRSS_FeedDAO extends Minz_ModelPdo {
 		return $feedCategoryNames;
 	}
 
-	public function listFeedsOrderUpdate($cacheDuration = 1500) {
-		$sql = 'SELECT id, url, name, website, lastUpdate, pathEntries, httpAuth, keep_history '
+	public function listFeedsOrderUpdate($defaultCacheDuration = 3600) {
+		$sql = 'SELECT id, url, name, website, lastUpdate, pathEntries, httpAuth, keep_history, ttl '
 		     . 'FROM `' . $this->prefix . 'feed` '
-		     . 'WHERE lastUpdate < ' . (time() - intval($cacheDuration))
-		     . ' ORDER BY lastUpdate';
+		     . 'WHERE ttl <> -1 AND lastUpdate < (' . (time() + 60) . '-(CASE WHEN ttl=-2 THEN ' . intval($defaultCacheDuration) . ' ELSE ttl END)) '
+		     . 'ORDER BY lastUpdate';
 		$stm = $this->bd->prepare($sql);
-		$stm->execute();
+		if (!($stm && $stm->execute())) {
+			$sql2 = 'ALTER TABLE `' . $this->prefix . 'feed` ADD COLUMN ttl INT NOT NULL DEFAULT -2';	//v0.7.3
+			$stm = $this->bd->prepare($sql2);
+			$stm->execute();
+			$stm = $this->bd->prepare($sql);
+			$stm->execute();
+		}
 
 		return self::daoToFeed($stm->fetchAll(PDO::FETCH_ASSOC));
 	}
@@ -365,6 +371,7 @@ class FreshRSS_FeedDAO extends Minz_ModelPdo {
 			$myFeed->_httpAuth(isset($dao['httpAuth']) ? base64_decode($dao['httpAuth']) : '');
 			$myFeed->_error(isset($dao['error']) ? $dao['error'] : 0);
 			$myFeed->_keepHistory(isset($dao['keep_history']) ? $dao['keep_history'] : -2);
+			$myFeed->_ttl(isset($dao['ttl']) ? $dao['ttl'] : -2);
 			$myFeed->_nbNotRead(isset($dao['cache_nbUnreads']) ? $dao['cache_nbUnreads'] : 0);
 			$myFeed->_nbEntries(isset($dao['cache_nbEntries']) ? $dao['cache_nbEntries'] : 0);
 			if (isset($dao['id'])) {
diff --git a/app/i18n/en.php b/app/i18n/en.php
index 19cf4a06d..569903782 100644
--- a/app/i18n/en.php
+++ b/app/i18n/en.php
@@ -41,7 +41,7 @@ return array (
 	'query_state_15'		=> 'Display all articles',
 	'query_number'			=> 'Query n°%d',
 	'add_query'			=> 'Add a query',
-	'no_query'			=> 'You haven’t created user queries yet.',
+	'no_query'			=> 'You haven’t created any user query yet.',
 	'query_filter'			=> 'Filter applied:',
 	'no_query_filter'		=> 'No filter',
 	'about'				=> 'About',
@@ -197,6 +197,7 @@ return array (
 	'by_feed'			=> 'by feed',
 	'by_default'			=> 'By default',
 	'keep_history'			=> 'Minimum number of articles to keep',
+	'ttl'				=> 'Do not automatically refresh more often than',
 	'categorize'			=> 'Store in a category',
 	'truncate'			=> 'Delete all articles',
 	'advanced'			=> 'Advanced',
diff --git a/app/i18n/fr.php b/app/i18n/fr.php
index 54fe55ea0..5fc60bd15 100644
--- a/app/i18n/fr.php
+++ b/app/i18n/fr.php
@@ -197,6 +197,7 @@ return array (
 	'by_feed'			=> 'par flux',
 	'by_default'			=> 'Par défaut',
 	'keep_history'			=> 'Nombre minimum d’articles à conserver',
+	'ttl'				=> 'Ne pas automatiquement rafraîchir plus souvent que',
 	'categorize'			=> 'Ranger dans une catégorie',
 	'truncate'			=> 'Supprimer tous les articles',
 	'advanced'			=> 'Avancé',
diff --git a/app/views/configure/archiving.phtml b/app/views/configure/archiving.phtml
index e144d0f45..04fa19b0d 100644
--- a/app/views/configure/archiving.phtml
+++ b/app/views/configure/archiving.phtml
@@ -24,6 +24,27 @@
 				?></select> (<?php echo Minz_Translate::t('by_default'); ?>)
 			</div>
 		</div>
+		<div class="form-group">
+			<label class="group-name" for="ttl_default"><?php echo Minz_Translate::t('ttl'), ' ', Minz_Translate::t('by_feed'); ?></label>
+			<div class="group-controls">
+				<select class="number" name="ttl_default" id="ttl_default" required="required"><?php
+					$found = false;
+					foreach (array(1200 => '20min', 1500 => '25min', 1800 => '30min', 2700 => '45min',
+					                3600 => '1h', 5400 => '1.5h', 7200 => '2h', 10800 => '3h', 14400 => '4h', 18800 => '5h', 21600 => '6h', 25200 => '7h', 28800 => '8h',
+					                36000 => '10h', 43200 => '12h', 64800 => '18h',
+					                86400 => '1d', 129600 => '1.5d', 172800 => '2d', 259200 => '3d', 345600 => '4d', 432000 => '5d', 518400 => '6d',
+					                604800 => '1wk', -1 => '∞') as $v => $t) {
+						echo '<option value="' . $v . ($this->conf->ttl_default == $v ? '" selected="selected' : '') . '">' . $t . '</option>';
+						if ($this->conf->ttl_default == $v) {
+							$found = true;
+						}
+					}
+					if (!$found) {
+						echo '<option value="' . intval($this->conf->ttl_default) . '" selected="selected">' . intval($this->conf->ttl_default) . 's</option>';
+					}
+				?></select> (<?php echo Minz_Translate::t('by_default'); ?>)
+			</div>
+		</div>
 
 		<div class="form-group form-actions">
 			<div class="group-controls">
diff --git a/app/views/configure/feed.phtml b/app/views/configure/feed.phtml
index 27b0990ff..a8dd9a8cb 100644
--- a/app/views/configure/feed.phtml
+++ b/app/views/configure/feed.phtml
@@ -103,6 +103,27 @@
 				?></select>
 			</div>
 		</div>
+		<div class="form-group">
+			<label class="group-name" for="ttl"><?php echo Minz_Translate::t('ttl'); ?></label>
+			<div class="group-controls">
+				<select class="number" name="ttl" id="ttl" required="required"><?php
+					$found = false;
+					foreach (array(-2 => Minz_Translate::t('by_default'), 900 => '15min', 1200 => '20min', 1500 => '25min', 1800 => '30min', 2700 => '45min',
+					                3600 => '1h', 5400 => '1.5h', 7200 => '2h', 10800 => '3h', 14400 => '4h', 18800 => '5h', 21600 => '6h', 25200 => '7h', 28800 => '8h',
+					                36000 => '10h', 43200 => '12h', 64800 => '18h',
+					                86400 => '1d', 129600 => '1.5d', 172800 => '2d', 259200 => '3d', 345600 => '4d', 432000 => '5d', 518400 => '6d',
+					                604800 => '1wk', 1209600 => '2wk', 1814400 => '3wk', 2419200 => '4wk', 2629744 => '1mo', -1 => '∞') as $v => $t) {
+						echo '<option value="' . $v . ($this->flux->ttl() === $v ? '" selected="selected' : '') . '">' . $t . '</option>';
+						if ($this->flux->ttl() == $v) {
+							$found = true;
+						}
+					}
+					if (!$found) {
+						echo '<option value="' . intval($this->flux->ttl()) . '" selected="selected">' . intval($this->flux->ttl()) . 's</option>';
+					}
+				?></select>
+			</div>
+		</div>
 		<div class="form-group form-actions">
 			<div class="group-controls">
 				<button class="btn btn-important"><?php echo Minz_Translate::t ('save'); ?></button>
diff --git a/lib/lib_rss.php b/lib/lib_rss.php
index 1b1e4b021..7ca611b04 100644
--- a/lib/lib_rss.php
+++ b/lib/lib_rss.php
@@ -109,7 +109,7 @@ function customSimplePie() {
 	$simplePie = new SimplePie();
 	$simplePie->set_useragent(Minz_Translate::t('freshrss') . '/' . FRESHRSS_VERSION . ' (' . PHP_OS . '; ' . FRESHRSS_WEBSITE . ') ' . SIMPLEPIE_NAME . '/' . SIMPLEPIE_VERSION);
 	$simplePie->set_cache_location(CACHE_PATH);
-	$simplePie->set_cache_duration(1500);
+	$simplePie->set_cache_duration(800);
 	$simplePie->strip_htmltags(array(
 		'base', 'blink', 'body', 'doctype', 'embed',
 		'font', 'form', 'frame', 'frameset', 'html',
-- 
cgit v1.2.3


From 21d8c03ac969d93b9a0d29ee5cb8cd2f5630bdb8 Mon Sep 17 00:00:00 2001
From: Alexis Degrugillier <github@ainw.org>
Date: Mon, 7 Jul 2014 19:21:57 -0400
Subject: Add a configuration parameter

Add a parameter to choose wether or not the user want to display a confirmation dialog when clicking on "mark all as read" actions.
---
 app/Controllers/configureController.php |  5 +++--
 app/Models/Configuration.php            |  4 ++++
 app/i18n/en.php                         |  1 +
 app/i18n/fr.php                         |  1 +
 app/layout/nav_menu.phtml               |  2 +-
 app/views/configure/reading.phtml       | 10 ++++++++++
 app/views/helpers/pagination.phtml      |  2 +-
 7 files changed, 21 insertions(+), 4 deletions(-)

(limited to 'app/Models/Configuration.php')

diff --git a/app/Controllers/configureController.php b/app/Controllers/configureController.php
index f016e1fbf..9c143508e 100755
--- a/app/Controllers/configureController.php
+++ b/app/Controllers/configureController.php
@@ -185,8 +185,9 @@ class FreshRSS_configure_Controller extends Minz_ActionController {
 			$this->view->conf->_auto_load_more(Minz_Request::param('auto_load_more', false));
 			$this->view->conf->_display_posts(Minz_Request::param('display_posts', false));
 			$this->view->conf->_onread_jump_next(Minz_Request::param('onread_jump_next', false));
-			$this->view->conf->_lazyload(Minz_Request::param('lazyload', false));
-			$this->view->conf->_sticky_post(Minz_Request::param('sticky_post', false));
+			$this->view->conf->_lazyload (Minz_Request::param('lazyload', false));
+			$this->view->conf->_sticky_post (Minz_Request::param('sticky_post', false));
+			$this->view->conf->_reading_confirm (Minz_Request::param('reading_confirm', false));
 			$this->view->conf->_sort_order(Minz_Request::param('sort_order', 'DESC'));
 			$this->view->conf->_mark_when(array(
 				'article' => Minz_Request::param('mark_open_article', false),
diff --git a/app/Models/Configuration.php b/app/Models/Configuration.php
index f2084b833..7596c54cd 100644
--- a/app/Models/Configuration.php
+++ b/app/Models/Configuration.php
@@ -20,6 +20,7 @@ class FreshRSS_Configuration {
 		'onread_jump_next' => true,
 		'lazyload' => true,
 		'sticky_post' => true,
+		'reading_confirm' => false,
 		'sort_order' => 'DESC',
 		'anon_access' => false,
 		'mark_when' => array(
@@ -149,6 +150,9 @@ class FreshRSS_Configuration {
 	public function _sticky_post($value) {
 		$this->data['sticky_post'] = ((bool)$value) && $value !== 'no';
 	}
+	public function _reading_confirm($value) {
+		$this->data['reading_confirm'] = ((bool)$value) && $value !== 'no';
+	}
 	public function _sort_order ($value) {
 		$this->data['sort_order'] = $value === 'ASC' ? 'ASC' : 'DESC';
 	}
diff --git a/app/i18n/en.php b/app/i18n/en.php
index b9aff9d73..8634f99b5 100644
--- a/app/i18n/en.php
+++ b/app/i18n/en.php
@@ -264,6 +264,7 @@ return array (
 	'bottom_line'			=> 'Bottom line',
 	'img_with_lazyload'		=> 'Use "lazy load" mode to load pictures',
 	'sticky_post'			=> 'Stick the article to the top when opened',
+	'reading_confirm'		=> 'Display a confirmation dialog on “mark all as read” actions',
 	'auto_read_when'		=> 'Mark article as read…',
 	'article_viewed'		=> 'when article is viewed',
 	'article_open_on_website'	=> 'when article is opened on its original website',
diff --git a/app/i18n/fr.php b/app/i18n/fr.php
index c43e2611b..e04078dba 100644
--- a/app/i18n/fr.php
+++ b/app/i18n/fr.php
@@ -264,6 +264,7 @@ return array (
 	'bottom_line'			=> 'Ligne du bas',
 	'img_with_lazyload'		=> 'Utiliser le mode “chargement différé” pour les images',
 	'sticky_post'			=> 'Aligner l’article en haut quand il est ouvert',
+	'reading_confirm'		=> 'Afficher une confirmation lors des actions “marquer tout comme lu”',
 	'auto_read_when'		=> 'Marquer un article comme lu…',
 	'article_viewed'		=> 'lorsque l’article est affiché',
 	'article_open_on_website'	=> 'lorsque l’article est ouvert sur le site d’origine',
diff --git a/app/layout/nav_menu.phtml b/app/layout/nav_menu.phtml
index b7eee664a..29ea9032c 100644
--- a/app/layout/nav_menu.phtml
+++ b/app/layout/nav_menu.phtml
@@ -181,7 +181,7 @@
 	?>
 
 	<div class="stick" id="nav_menu_read_all">
-		<a class="read_all btn confirm" href="<?php echo $markReadUrl; ?>"><?php echo Minz_Translate::t ('mark_read'); ?></a>
+		<a class="read_all btn<?php if ($this->conf->reading_confirm) {echo ' confirm';} ?>" href="<?php echo $markReadUrl; ?>"><?php echo Minz_Translate::t ('mark_read'); ?></a>
 		<div class="dropdown">
 			<div id="dropdown-read" class="dropdown-target"></div>
 
diff --git a/app/views/configure/reading.phtml b/app/views/configure/reading.phtml
index 0388e0bee..4d439e83d 100644
--- a/app/views/configure/reading.phtml
+++ b/app/views/configure/reading.phtml
@@ -82,6 +82,16 @@
 			</div>
 		</div>
 
+		<div class="form-group">
+			<div class="group-controls">
+				<label class="checkbox" for="reading_confirm">
+					<input type="checkbox" name="reading_confirm" id="reading_confirm" value="1"<?php echo $this->conf->reading_confirm ? ' checked="checked"' : ''; ?> />
+					<?php echo Minz_Translate::t ('reading_confirm'); ?>
+					<noscript> — <strong><?php echo Minz_Translate::t ('javascript_should_be_activated'); ?></strong></noscript>
+				</label>
+			</div>
+		</div>
+
 		<div class="form-group">
 			<label class="group-name"><?php echo Minz_Translate::t ('auto_read_when'); ?></label>
 			<div class="group-controls">
diff --git a/app/views/helpers/pagination.phtml b/app/views/helpers/pagination.phtml
index d43c664e5..f38913c06 100755
--- a/app/views/helpers/pagination.phtml
+++ b/app/views/helpers/pagination.phtml
@@ -12,7 +12,7 @@
 	<?php $params['next'] = $this->nextId; ?>
 	<a id="load_more" href="<?php echo Minz_Url::display (array ('c' => $c, 'a' => $a, 'params' => $params)); ?>"><?php echo Minz_Translate::t ('load_more'); ?></a>
 	<?php } elseif ($markReadUrl) { ?>
-	<a id="bigMarkAsRead" href="<?php echo $markReadUrl; ?>" class="confirm">
+	<a id="bigMarkAsRead" href="<?php echo $markReadUrl; ?>"<?php if ($this->conf->reading_confirm) { echo ' class="confirm"';} ?>>
 		<?php echo Minz_Translate::t ('nothing_to_load'); ?><br />
 		<span class="bigTick">✔</span><br />
 		<?php echo Minz_Translate::t ('mark_all_read'); ?>
-- 
cgit v1.2.3


From 2b25aa8f68dccf7001b965fc6c08c3a794ec6b04 Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Sat, 9 Aug 2014 18:46:22 +0200
Subject: Option to hide (or not) feeds/categories with no unread article

https://github.com/marienfressinaud/FreshRSS/issues/430
https://github.com/marienfressinaud/FreshRSS/issues/575
---
 app/Controllers/configureController.php | 1 +
 app/Models/Configuration.php            | 4 ++++
 app/i18n/en.php                         | 1 +
 app/i18n/fr.php                         | 1 +
 app/layout/aside_flux.phtml             | 2 +-
 app/views/configure/reading.phtml       | 9 +++++++++
 6 files changed, 17 insertions(+), 1 deletion(-)

(limited to 'app/Models/Configuration.php')

diff --git a/app/Controllers/configureController.php b/app/Controllers/configureController.php
index 79f40b30b..0bf58880f 100755
--- a/app/Controllers/configureController.php
+++ b/app/Controllers/configureController.php
@@ -184,6 +184,7 @@ class FreshRSS_configure_Controller extends Minz_ActionController {
 			$this->view->conf->_default_view((int)Minz_Request::param('default_view', FreshRSS_Entry::STATE_ALL));
 			$this->view->conf->_auto_load_more(Minz_Request::param('auto_load_more', false));
 			$this->view->conf->_display_posts(Minz_Request::param('display_posts', false));
+			$this->view->conf->_hide_read_feeds(Minz_Request::param('hide_read_feeds', false));
 			$this->view->conf->_onread_jump_next(Minz_Request::param('onread_jump_next', false));
 			$this->view->conf->_lazyload(Minz_Request::param('lazyload', false));
 			$this->view->conf->_sticky_post(Minz_Request::param('sticky_post', false));
diff --git a/app/Models/Configuration.php b/app/Models/Configuration.php
index 7596c54cd..2f47312c0 100644
--- a/app/Models/Configuration.php
+++ b/app/Models/Configuration.php
@@ -17,6 +17,7 @@ class FreshRSS_Configuration {
 		'default_view' => FreshRSS_Entry::STATE_NOT_READ,
 		'auto_load_more' => true,
 		'display_posts' => false,
+		'hide_read_feeds' => true,
 		'onread_jump_next' => true,
 		'lazyload' => true,
 		'sticky_post' => true,
@@ -141,6 +142,9 @@ class FreshRSS_Configuration {
 	public function _display_posts ($value) {
 		$this->data['display_posts'] = ((bool)$value) && $value !== 'no';
 	}
+	public function _hide_read_feeds($value) {
+		$this->data['hide_read_feeds'] = (bool)$value;
+	}
 	public function _onread_jump_next ($value) {
 		$this->data['onread_jump_next'] = ((bool)$value) && $value !== 'no';
 	}
diff --git a/app/i18n/en.php b/app/i18n/en.php
index 532327e4a..d80299b10 100644
--- a/app/i18n/en.php
+++ b/app/i18n/en.php
@@ -262,6 +262,7 @@ return array (
 	'sort_order'			=> 'Sort order',
 	'auto_load_more'		=> 'Load next articles at the page bottom',
 	'display_articles_unfolded'	=> 'Show articles unfolded by default',
+	'hide_read_feeds'		=> 'Hide categories &amp; feeds with no unread article (only in “unread articles” display mode)',
 	'after_onread'			=> 'After “mark all as read”,',
 	'jump_next'			=> 'jump to next unread sibling (feed or category)',
 	'article_icons'			=> 'Article icons',
diff --git a/app/i18n/fr.php b/app/i18n/fr.php
index 0705d80b2..4be028ac3 100644
--- a/app/i18n/fr.php
+++ b/app/i18n/fr.php
@@ -262,6 +262,7 @@ return array (
 	'sort_order'			=> 'Ordre de tri',
 	'auto_load_more'		=> 'Charger les articles suivants en bas de page',
 	'display_articles_unfolded'	=> 'Afficher les articles dépliés par défaut',
+	'hide_read_feeds'		=> 'Cacher les catégories &amp; flux sans article non-lu (uniquement en affichage “articles non lus”)',
 	'after_onread'			=> 'Après “marquer tout comme lu”,',
 	'jump_next'			=> 'sauter au prochain voisin non lu (flux ou catégorie)',
 	'article_icons'			=> 'Icônes d’article',
diff --git a/app/layout/aside_flux.phtml b/app/layout/aside_flux.phtml
index cc04e757c..aee8f8754 100644
--- a/app/layout/aside_flux.phtml
+++ b/app/layout/aside_flux.phtml
@@ -1,4 +1,4 @@
-<div class="aside aside_flux<?php if (($this->state & FreshRSS_Entry::STATE_NOT_READ) && !($this->state & FreshRSS_Entry::STATE_READ)) echo ' state_unread'; ?>" id="aside_flux">
+<div class="aside aside_flux<?php if ($this->conf->hide_read_feeds && ($this->state & FreshRSS_Entry::STATE_NOT_READ) && !($this->state & FreshRSS_Entry::STATE_READ)) echo ' state_unread'; ?>" id="aside_flux">
 	<a class="toggle_aside" href="#close"><?php echo FreshRSS_Themes::icon('close'); ?></a>
 
 	<ul class="categories">
diff --git a/app/views/configure/reading.phtml b/app/views/configure/reading.phtml
index d56726730..c0525f1ed 100644
--- a/app/views/configure/reading.phtml
+++ b/app/views/configure/reading.phtml
@@ -62,6 +62,15 @@
 			</div>
 		</div>
 
+		<div class="form-group">
+			<div class="group-controls">
+				<label class="checkbox" for="hide_read_feeds">
+					<input type="checkbox" name="hide_read_feeds" id="hide_read_feeds" value="1"<?php echo $this->conf->hide_read_feeds ? ' checked="checked"' : ''; ?> />
+					<?php echo Minz_Translate::t('hide_read_feeds'); ?>
+				</label>
+			</div>
+		</div>
+
 		<div class="form-group">
 			<div class="group-controls">
 				<label class="checkbox" for="lazyload">
-- 
cgit v1.2.3


From b1139bf39ca2ff8baa893a9d76e5196013666500 Mon Sep 17 00:00:00 2001
From: Alexis Degrugillier <github@ainw.org>
Date: Sat, 23 Aug 2014 08:18:47 -0400
Subject: Add category reading option

Before, when a category was selected, it was expanded to show the feeds in that category.
Now, there is a parameter that allows the user to choose either if he wants the old behaviour or if he wants to expand only when needed (when selecting a feed or when clicking the appropriate button)
---
 app/Controllers/configureController.php |  1 +
 app/Models/Configuration.php            |  4 ++++
 app/i18n/en.php                         |  1 +
 app/i18n/fr.php                         |  1 +
 app/layout/aside_flux.phtml             | 10 ++++++++--
 app/views/configure/reading.phtml       | 10 ++++++++++
 6 files changed, 25 insertions(+), 2 deletions(-)

(limited to 'app/Models/Configuration.php')

diff --git a/app/Controllers/configureController.php b/app/Controllers/configureController.php
index 0bf58880f..bb96bfae3 100755
--- a/app/Controllers/configureController.php
+++ b/app/Controllers/configureController.php
@@ -184,6 +184,7 @@ class FreshRSS_configure_Controller extends Minz_ActionController {
 			$this->view->conf->_default_view((int)Minz_Request::param('default_view', FreshRSS_Entry::STATE_ALL));
 			$this->view->conf->_auto_load_more(Minz_Request::param('auto_load_more', false));
 			$this->view->conf->_display_posts(Minz_Request::param('display_posts', false));
+			$this->view->conf->_display_categories(Minz_Request::param('display_categories', false));
 			$this->view->conf->_hide_read_feeds(Minz_Request::param('hide_read_feeds', false));
 			$this->view->conf->_onread_jump_next(Minz_Request::param('onread_jump_next', false));
 			$this->view->conf->_lazyload(Minz_Request::param('lazyload', false));
diff --git a/app/Models/Configuration.php b/app/Models/Configuration.php
index 2f47312c0..4c804a9fb 100644
--- a/app/Models/Configuration.php
+++ b/app/Models/Configuration.php
@@ -17,6 +17,7 @@ class FreshRSS_Configuration {
 		'default_view' => FreshRSS_Entry::STATE_NOT_READ,
 		'auto_load_more' => true,
 		'display_posts' => false,
+		'display_categories' => false,
 		'hide_read_feeds' => true,
 		'onread_jump_next' => true,
 		'lazyload' => true,
@@ -142,6 +143,9 @@ class FreshRSS_Configuration {
 	public function _display_posts ($value) {
 		$this->data['display_posts'] = ((bool)$value) && $value !== 'no';
 	}
+	public function _display_categories ($value) {
+		$this->data['display_categories'] = ((bool)$value) && $value !== 'no';
+	}
 	public function _hide_read_feeds($value) {
 		$this->data['hide_read_feeds'] = (bool)$value;
 	}
diff --git a/app/i18n/en.php b/app/i18n/en.php
index f4a15e747..be0cdc642 100644
--- a/app/i18n/en.php
+++ b/app/i18n/en.php
@@ -267,6 +267,7 @@ return array (
 	'sort_order'			=> 'Sort order',
 	'auto_load_more'		=> 'Load next articles at the page bottom',
 	'display_articles_unfolded'	=> 'Show articles unfolded by default',
+	'display_categories_unfolded'	=> 'Show categories folded by default',
 	'hide_read_feeds'		=> 'Hide categories &amp; feeds with no unread article (only in “unread articles” display mode)',
 	'after_onread'			=> 'After “mark all as read”,',
 	'jump_next'			=> 'jump to next unread sibling (feed or category)',
diff --git a/app/i18n/fr.php b/app/i18n/fr.php
index 4675e17ee..08f12234e 100644
--- a/app/i18n/fr.php
+++ b/app/i18n/fr.php
@@ -267,6 +267,7 @@ return array (
 	'sort_order'			=> 'Ordre de tri',
 	'auto_load_more'		=> 'Charger les articles suivants en bas de page',
 	'display_articles_unfolded'	=> 'Afficher les articles dépliés par défaut',
+	'display_categories_unfolded'	=> 'Afficher les catégories pliées par défaut',
 	'hide_read_feeds'		=> 'Cacher les catégories &amp; flux sans article non-lu (uniquement en affichage “articles non lus”)',
 	'after_onread'			=> 'Après “marquer tout comme lu”,',
 	'jump_next'			=> 'sauter au prochain voisin non lu (flux ou catégorie)',
diff --git a/app/layout/aside_flux.phtml b/app/layout/aside_flux.phtml
index aee8f8754..432d6fdb7 100644
--- a/app/layout/aside_flux.phtml
+++ b/app/layout/aside_flux.phtml
@@ -42,8 +42,14 @@
 			$feeds = $cat->feeds ();
 			if (!empty ($feeds)) {
 				$c_active = false;
-				if ($this->get_c == $cat->id ()) {
-					$c_active = true;
+				if ($this->conf->display_categories) {
+					if ($this->get_c == $cat->id () && $this->get_f) {
+						$c_active = true;
+					}
+				} else {
+					if ($this->get_c == $cat->id ()) {
+						$c_active = true;
+					}
 				}
 				?><li data-unread="<?php echo $cat->nbNotRead(); ?>"<?php if ($c_active) echo ' class="active"'; ?>><?php
 				?><div class="category stick<?php echo $c_active ? ' active' : ''; ?>"><?php
diff --git a/app/views/configure/reading.phtml b/app/views/configure/reading.phtml
index e96bcea42..5a26501a4 100644
--- a/app/views/configure/reading.phtml
+++ b/app/views/configure/reading.phtml
@@ -61,6 +61,16 @@
 			</div>
 		</div>
 
+		<div class="form-group">
+			<div class="group-controls">
+				<label class="checkbox" for="display_categories">
+					<input type="checkbox" name="display_categories" id="display_categories" value="1"<?php echo $this->conf->display_categories ? ' checked="checked"' : ''; ?> />
+					<?php echo Minz_Translate::t ('display_categories_unfolded'); ?>
+					<noscript> — <strong><?php echo Minz_Translate::t ('javascript_should_be_activated'); ?></strong></noscript>
+				</label>
+			</div>
+		</div>
+
 		<div class="form-group">
 			<div class="group-controls">
 				<label class="checkbox" for="sticky_post">
-- 
cgit v1.2.3


From 7b17c60bb18b122f3d14795780f4642717cfd81b Mon Sep 17 00:00:00 2001
From: Alexis Degrugillier <github@ainw.org>
Date: Sun, 24 Aug 2014 11:34:58 -0400
Subject: Add shortcuts

Add a shortcut to open the wiki. Shortcut is F1 and is not modifiable.

Add a shortcut to access user filters the same way to access share actions.
---
 app/Controllers/configureController.php |  2 +-
 app/Models/Configuration.php            |  2 ++
 app/i18n/en.php                         |  2 ++
 app/i18n/fr.php                         |  2 ++
 app/layout/nav_menu.phtml               |  2 +-
 app/views/configure/shortcut.phtml      |  8 ++++++
 app/views/helpers/javascript_vars.phtml |  7 +++--
 constants.php                           |  1 +
 p/scripts/main.js                       | 49 ++++++++++++++++++++++++++++++++-
 9 files changed, 70 insertions(+), 5 deletions(-)

(limited to 'app/Models/Configuration.php')

diff --git a/app/Controllers/configureController.php b/app/Controllers/configureController.php
index bb96bfae3..461cbceda 100755
--- a/app/Controllers/configureController.php
+++ b/app/Controllers/configureController.php
@@ -240,7 +240,7 @@ class FreshRSS_configure_Controller extends Minz_ActionController {
 		                    'm', 'n', 'o', 'p', 'page_down', 'page_up', 'q', 'r', 'return', 'right',
 		                    's', 'space', 't', 'tab', 'u', 'up', 'v', 'w', 'x', 'y',
 		                    'z', '0', '1', '2', '3', '4', '5', '6', '7', '8',
-		                    '9', 'f1', 'f2', 'f3', 'f4', 'f5', 'f6', 'f7', 'f8', 'f9',
+		                    '9', 'f2', 'f3', 'f4', 'f5', 'f6', 'f7', 'f8', 'f9',
 		                    'f10', 'f11', 'f12');
 		$this->view->list_keys = $list_keys;
 
diff --git a/app/Models/Configuration.php b/app/Models/Configuration.php
index 4c804a9fb..989603b20 100644
--- a/app/Models/Configuration.php
+++ b/app/Models/Configuration.php
@@ -45,6 +45,8 @@ class FreshRSS_Configuration {
 			'load_more' => 'm',
 			'auto_share' => 's',
 			'focus_search' => 'a',
+			'user_filter' => 'u',
+			'help' => 'f1',
 		),
 		'topline_read' => true,
 		'topline_favorite' => true,
diff --git a/app/i18n/en.php b/app/i18n/en.php
index be0cdc642..76da5d182 100644
--- a/app/i18n/en.php
+++ b/app/i18n/en.php
@@ -180,6 +180,8 @@ return array (
 	'auto_share'			=> 'Share',
 	'auto_share_help'		=> 'If there is only one sharing mode, it is used. Else modes are accessible by their number.',
 	'focus_search'			=> 'Access search box',
+	'user_filter'			=> 'Access user filters',
+	'user_filter_help'		=> 'If there is only one user filter, it is used. Else filters are accessible by their number.',
 
 	'file_to_import'		=> 'File to import<br />(OPML, Json or Zip)',
 	'file_to_import_no_zip'		=> 'File to import<br />(OPML or Json)',
diff --git a/app/i18n/fr.php b/app/i18n/fr.php
index 08f12234e..a8f7a3a98 100644
--- a/app/i18n/fr.php
+++ b/app/i18n/fr.php
@@ -180,6 +180,8 @@ return array (
 	'auto_share'			=> 'Partager',
 	'auto_share_help'		=> 'S’il n’y a qu’un mode de partage, celui ci est utilisé automatiquement. Sinon ils sont accessibles par leur numéro.',
 	'focus_search'			=> 'Accéder à la recherche',
+	'user_filter'			=> 'Accéder aux filtres utilisateur',
+	'user_filter_help'		=> 'S’il n’y a qu’un filtre utilisateur, celui ci est utilisé automatiquement. Sinon ils sont accessibles par leur numéro.',
 
 	'file_to_import'		=> 'Fichier à importer<br />(OPML, Json ou Zip)',
 	'file_to_import_no_zip'		=> 'Fichier à importer<br />(OPML ou Json)',
diff --git a/app/layout/nav_menu.phtml b/app/layout/nav_menu.phtml
index 25833c16d..7cd15c1a3 100644
--- a/app/layout/nav_menu.phtml
+++ b/app/layout/nav_menu.phtml
@@ -96,7 +96,7 @@
 				<li class="dropdown-header"><?php echo Minz_Translate::t('queries'); ?> <a class="no-mobile" href="<?php echo _url('configure', 'queries'); ?>"><?php echo FreshRSS_Themes::icon('configure'); ?></a></li>
 
 				<?php foreach ($this->conf->queries as $query) { ?>
-				<li class="item">
+				<li class="item query">
 					<a href="<?php echo $query['url']; ?>"><?php echo $query['name']; ?></a>
 				</li>
 				<?php } ?>
diff --git a/app/views/configure/shortcut.phtml b/app/views/configure/shortcut.phtml
index bfb13f003..73ad0ebb8 100644
--- a/app/views/configure/shortcut.phtml
+++ b/app/views/configure/shortcut.phtml
@@ -103,6 +103,14 @@
 			</div>
 		</div>
 
+		<div class="form-group">
+			<label class="group-name" for="user_filter_shortcut"><?php echo Minz_Translate::t ('user_filter'); ?></label>
+			<div class="group-controls">
+				<input type="text" id="user_filter_shortcut" name="shortcuts[user_filter]" list="keys" value="<?php echo $s['user_filter']; ?>" />
+				<?php echo Minz_Translate::t ('user_filter_help'); ?>
+			</div>
+		</div>
+
 		<div class="form-group form-actions">
 			<div class="group-controls">
 				<button type="submit" class="btn btn-important"><?php echo Minz_Translate::t ('save'); ?></button>
diff --git a/app/views/helpers/javascript_vars.phtml b/app/views/helpers/javascript_vars.phtml
index 7144c519a..2144f1576 100644
--- a/app/views/helpers/javascript_vars.phtml
+++ b/app/views/helpers/javascript_vars.phtml
@@ -4,7 +4,8 @@ echo '"use strict";', "\n";
 
 $mark = $this->conf->mark_when;
 echo 'var ',
-	'hide_posts=', ($this->conf->display_posts || Minz_Request::param('output') === 'reader') ? 'false' : 'true',
+	'help_url="', FRESHRSS_WIKI, '"',
+	',hide_posts=', ($this->conf->display_posts || Minz_Request::param('output') === 'reader') ? 'false' : 'true',
 	',display_order="', Minz_Request::param('order', $this->conf->sort_order), '"',
 	',auto_mark_article=', $mark['article'] ? 'true' : 'false',
 	',auto_mark_site=', $mark['site'] ? 'true' : 'false',
@@ -25,7 +26,9 @@ echo ',shortcuts={',
 	'collapse_entry:"', $s['collapse_entry'], '",',
 	'load_more:"', $s['load_more'], '",',
 	'auto_share:"', $s['auto_share'], '",',
-	'focus_search:"', $s['focus_search'], '"',
+	'focus_search:"', $s['focus_search'], '",',
+	'user_filter:"', $s['user_filter'], '",',
+	'help:"', $s['help'], '"',
 "},\n";
 
 if (Minz_Request::param ('output') === 'global') {
diff --git a/constants.php b/constants.php
index e32b8cbc3..483989371 100644
--- a/constants.php
+++ b/constants.php
@@ -1,6 +1,7 @@
 <?php
 define('FRESHRSS_VERSION', '0.8-dev');
 define('FRESHRSS_WEBSITE', 'http://freshrss.org');
+define('FRESHRSS_WIKI', 'http://doc.freshrss.org/doku.php?id=fr:start');
 
 // PHP text output compression http://php.net/ob_gzhandler (better to do it at Web server level)
 define('PHP_COMPRESSION', false);
diff --git a/p/scripts/main.js b/p/scripts/main.js
index c37f9f6f2..ad6cc8bef 100644
--- a/p/scripts/main.js
+++ b/p/scripts/main.js
@@ -378,6 +378,36 @@ function collapse_entry() {
 	}
 }
 
+function user_filter(key) {
+	console.log('user filter');
+	console.warn(key);
+	var filter = $('#dropdown-query');
+	var filters = filter.siblings('.dropdown-menu').find('.item.query a');
+	if (typeof key === "undefined") {
+		if (!filter.length) {
+			return;
+		}
+		// Display the filter div
+		window.location.hash = filter.attr('id');
+		// Force scrolling to the filter div
+		var scroll = needsScroll($('.header'));
+		if (scroll !== 0) {
+			$('html,body').scrollTop(scroll);
+		}
+		// Force the key value if there is only one action, so we can trigger it automatically
+		if (filters.length === 1) {
+			key = 1;
+		} else {
+			return;
+		}
+	}
+	// Trigger selected share action
+	key = parseInt(key);
+	if (key <= filters.length) {
+		filters[key - 1].click();
+	}
+}
+
 function auto_share(key) {
 	var share = $(".flux.current.active").find('.dropdown-target[id^="dropdown-share"]');
 	var shares = share.siblings('.dropdown-menu').find('.item a');
@@ -531,9 +561,19 @@ function init_shortcuts() {
 	}, {
 		'disable_in_input': true
 	});
+
+	shortcut.add(shortcuts.user_filter, function () {
+		user_filter();
+	}, {
+		'disable_in_input': true
+	});
 	for(var i = 1; i < 10; i++){
 		shortcut.add(i.toString(), function (e) {
-			auto_share(String.fromCharCode(e.keyCode));
+			if ($('#dropdown-query').siblings('.dropdown-menu').is(':visible')) {
+				user_filter(String.fromCharCode(e.keyCode));
+			} else {
+				auto_share(String.fromCharCode(e.keyCode));
+			}
 		}, {
 			'disable_in_input': true
 		});
@@ -618,6 +658,13 @@ function init_shortcuts() {
 	}, {
 		'disable_in_input': true
 	});
+
+	shortcut.add(shortcuts.help, function () {
+		redirect(help_url, true);
+	}, {
+		'disable_in_input': true
+	});
+
 }
 
 function init_stream(divStream) {
-- 
cgit v1.2.3


From a2ba5e2a21ad79e065925d7642f62c5cf4083212 Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Tue, 2 Sep 2014 18:50:41 +0200
Subject: Add a first version of i18n for German

All the strings are not completed yet, but it's a good start!
---
 app/Models/Configuration.php |   1 +
 app/i18n/de.php              | 326 +++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 327 insertions(+)
 create mode 100644 app/i18n/de.php

(limited to 'app/Models/Configuration.php')

diff --git a/app/Models/Configuration.php b/app/Models/Configuration.php
index 4c804a9fb..e815561a9 100644
--- a/app/Models/Configuration.php
+++ b/app/Models/Configuration.php
@@ -61,6 +61,7 @@ class FreshRSS_Configuration {
 	);
 
 	private $available_languages = array(
+		'de' => 'Deutsch',
 		'en' => 'English',
 		'fr' => 'Français',
 	);
diff --git a/app/i18n/de.php b/app/i18n/de.php
new file mode 100644
index 000000000..4301a8b6d
--- /dev/null
+++ b/app/i18n/de.php
@@ -0,0 +1,326 @@
+<?php
+
+return array (
+	// LAYOUT
+	'login'				=> 'Login',
+	'login_with_persona'		=> 'Login mit Persona',
+	'logout'			=> 'Logout',
+	'search'			=> 'Suche nach Worten oder #tags',
+	'search_short'			=> 'Suche',
+
+	'configuration'			=> 'Konfiguration',
+	'users'				=> 'Nutzer',
+	'categories'			=> 'Kategorien',
+	'category'			=> 'Kategorie',
+	'feed'				=> 'Feed',
+	'feeds'				=> 'Feeds',
+	'shortcuts'			=> 'Shortcuts',
+	'about'				=> '&Uuml;ber',
+	'stats'				=> 'Statistiken',
+
+	'your_rss_feeds'		=> 'Ihre RSS Feeds',
+	'add_rss_feed'			=> 'RSS-Feed hinzuf&uuml;gen',
+	'no_rss_feed'			=> 'Kein RSS Feed',
+	'import_export_opml'		=> 'Import / Export (OPML)',
+
+	'subscription_management'	=> 'Abonnementsverwaltung',
+	'main_stream'			=> 'Haupt-Nachrichtenflu&szlig;',
+	'all_feeds'			=> 'Alle Feeds',
+	'favorite_feeds'		=> 'Favoriten (%d)',
+	'not_read'			=> '%d ungelesen',
+	'not_reads'			=> '%d ungelesen',
+
+	'filter'			=> 'Filter',
+	'see_website'			=> 'Website ansehen',
+	'administration'		=> 'Verwaltung',
+	'actualize'			=> 'Aktualisierung',
+
+	'mark_read'			=> 'Als gelesen markieren',
+	'mark_favorite'			=> 'Als Favoriten markieren',
+	'mark_all_read'			=> 'Alle als gelesen markieren',
+	'mark_feed_read'		=> 'Feed als gelesen markieren',
+	'mark_cat_read'			=> 'Kategorie als gelesen markieren',
+	'before_one_day'		=> 'Vor einem Tag',
+	'before_one_week'		=> 'Vor einer Woche',
+	'display'			    => 'Anzeige',
+	'normal_view'			=> 'Normale Anzeige',
+	'reader_view'			=> 'Leseanzeige-Modus',
+	'global_view'			=> 'Globale Anzeige',
+	'rss_view'			    => 'RSS-Feed',
+	'show_all_articles'		=> 'zeige alle Artikel',
+	'show_not_reads'		=> 'zeige nicht gelesene',
+	'show_read'			    => 'zeige nur gelesene',
+	'show_favorite'			=> 'Favoriten anzeigen',
+	'older_first'			=> '&Auml;lteste zuerst',
+	'newer_first'			=> 'Neuere zuerst',
+
+	// Pagination
+	'first'				=> 'Erste',
+	'previous'			=> 'Vorherige',
+	'next'				=> 'N&auml;chste',
+	'last'				=> 'Letzte',
+
+	// CONTROLLERS
+	'article_published_on'		=> 'Dieser Artikel erschien im Original bei <a href="%s">%s</a>',
+	'article_published_on_author'	=> 'Dieser Artikel erschien im Original bei <a href="%s">%s</a> von %s',
+
+	'access_denied'			=> 'Sie haben nicht die Berechtigung, diese Seite aufzurufen',
+	'page_not_found'		=> 'Sie suchen nach einer Seite, die es nicht gibt',
+	'error_occurred'		=> 'Es gab einen Fehler',
+	'error_occurred_update'	=> 'Es wurde nichts ge&auml;ndert',
+
+	'default_category'		=> 'Unkategorisiert',
+	'categories_updated'		=> 'Kategorien wurden aktualisiert',
+	'categories_management'		=> 'Kategorienverwaltung',
+	'feed_updated'			=> 'Der Feed wurde aktualisiert',
+	'rss_feed_management'		=> 'Verwaltung der RSS Feeds',
+	'configuration_updated'		=> 'Die Konfiguration wurde aktualisiert',
+	'sharing_management'		=> 'Verwaltung der Optionen f&uuml;r das Teilen',
+	'bad_opml_file'			=> 'Ihre OPML-Datei ist ung&uuml;ltig',
+	'shortcuts_updated'		=> 'Shortcuts wurden aktualisiert',
+	'shortcuts_management'		=> 'Verwaltung der Shortcuts',
+	'shortcuts_navigation'		=> 'Navigation',
+	'shortcuts_navigation_help'	=> 'Mit der "Shift" Taste gelten die Navigations-Shortcuts f&uuml;r Feeds.<br/>Mit der "Alt" Taste gelten die Navigations-Shortcuts f&uuml;r Kategorien.',
+	'shortcuts_article_action'	=> 'Artikelaktionen',
+	'shortcuts_other_action'	=> 'Andere Aktionen',
+	'feeds_marked_read'		=> 'Die Feeds wurden als gelesen markiert',
+	'updated'			=> 'Die &Auml;nderungen wurden aktualisiert',
+
+	'already_subscribed'		=> 'Sie haben bereits <em>%s</em> abonniert',
+	'feed_added'			=> 'Der RSS Feed <em>%s</em> wurde hinzugef&uuml;gt',
+	'feed_not_added'		=> '<em>%s</em> konnte nicht hinzugef&uuml;gt werden',
+	'internal_problem_feed'		=> 'Der RSS Feed konnte nicht hinzugef&uuml;gt werden. &uuml;berpr&uuml;fen Sie die Protokolldateien von FressRSS f&uuml;r weitere Informationen.',
+	'invalid_url'			=> 'URL <em>%s</em> ist ung&uuml;ltig',
+	'feed_actualized'		=> '<em>%s</em> wurde aktualisiert',
+	'n_feeds_actualized'		=> '%d Feeds wurden aktualisiert',
+	'feeds_actualized'		=> 'RSS Feeds wurden aktualisiert',
+	'no_feed_actualized'		=> 'Es wurden keine RSS Feeds aktualisiert',
+	'n_entries_deleted'		=> '%d Artikel wurden gel&ouml;scht',
+	'feeds_imported_with_errors'	=> 'Ihre Feeds wurden importiert, es gab aber einige Fehler',
+	'feeds_imported'		=> 'Ihre Feeds wurden importiert und werden jetzt aktualisiert',
+	'category_emptied'		=> 'Die Kategorie wurde geleert',
+	'feed_deleted'			=> 'Der Feed wurde gel&ouml;scht',
+	'feed_validator'		=> '&Üuml;berpr&uuml;fen Sie die G&uuml;ltigkeit des Feeds',
+
+	'optimization_complete'		=> 'Die Optimierung ist beendet',
+
+	'your_rss_feeds'		=> 'Ihre RSS Feeds',
+	'your_favorites'		=> 'Ihre Favoriten',
+	'public'			=> '&Ouml;ffentlich',
+	'invalid_login'			=> 'Das Login ist ung&uuml;ltig',
+
+	// VIEWS
+	'save'				=> 'Speichern',
+	'delete'			=> 'L&ouml;schen',
+	'cancel'			=> 'Abbrechen',
+
+	'back_to_rss_feeds'		=> '← Zur&uuml;ck zu den RSS Feeds gehen',
+	'feeds_moved_category_deleted'	=> 'Wenn Sie eine Kategorie l&ouml;schen, werden deren Feeds automatisch in die Kategorie <em>%s</em> eingef&uuml;gt.',
+	'category_number'		=> 'Kategorie n°%d',
+	'ask_empty'			=> 'Leeren?',
+	'number_feeds'			=> '%d Feeds',
+	'can_not_be_deleted'		=> 'Kann nicht gel&ouml;scht werden',
+	'add_category'			=> 'F&uuml;ge eine Kategorie hinzu',
+	'new_category'			=> 'Neue Kategorie',
+
+	'javascript_for_shortcuts'	=> 'JavaScript muss erm&ouml;glicht werden, wenn Shortcuts verwendet werden sollen',
+	'javascript_should_be_activated'=> 'JavaScript muss erm&ouml;glicht werden',
+	'shift_for_all_read'		=> '+ <code>shift</code> um alle Artikel als gelesen zu markieren',
+	'see_on_website'		=> 'Auf der Originalwebseite anschauen',
+	'next_article'			=> 'Zum n&auml;chsten Artikel springen',
+	'last_article'			=> 'Zum letzten Artikel springen',
+	'previous_article'		=> 'Zum vorherigen Artikel springen',
+	'first_article'			=> 'Zum ersten Artikel springen',
+	'next_page'			=> 'Zur n&auml;chsten Seite springen',
+	'previous_page'			=> 'Zur vorherigen Seite springen',
+	'collapse_article'		=> 'Zusammenfalten',
+	'auto_share'			=> 'Teilen',
+	'auto_share_help'		=> 'Wenn es nur eine Option zum Teilen gibt, wird die verwendet. Ansonsten werden die Optionen &uuml;ber die Nummer ausgew&auml;hlt.',
+
+	'file_to_import'		=> 'Datei zum importieren',
+	'import'			=> 'Import',
+	'export'			=> 'Export',
+	'or'				=> 'oder',
+
+	'informations'			=> 'Information',
+	'damn'				=> 'Verdammt!',
+	'feed_in_error'			=> 'Dieser Feed hat ein Problem verursacht. Bitte stellen Sie sicher, dass er immer lesbar ist und aktualisieren Sie ihn dann.',
+	'feed_empty'			=> 'Dieser Feed ist leer. Bitte stellen Sie sicher, dass er noch gepflegt wird.',
+	'feed_description'		=> 'Beschreibung',
+	'website_url'			=> 'Webseiten-Adresse URL',
+	'feed_url'			=> 'Feed URL',
+	'articles'			=> 'Artikel',
+	'number_articles'		=> 'Anzahl der Artikel',
+	'by_feed'			=> 'per Feed',
+	'by_default'			=> 'Als Vorgabe',
+	'keep_history'			=> 'Kleinste Anzahl der Artikel, die behalten werden',
+	'categorize'			=> 'In einer Kategorie speichern',
+	'truncate'			=> 'Alle Artikel l&ouml;schen',
+	'advanced'			=> 'Erweitert',
+	'show_in_all_flux'		=> 'Im Hauptstrom anzeigen',
+	'yes'				=> 'Ja',
+	'no'				=> 'Nein',
+	'css_path_on_website'		=> 'Pfad zur CSS-Datei des Artikels auf der Original Webseite',
+	'retrieve_truncated_feeds'	=> 'Gek&uuml;rzte RSS Feeds abrufen (Achtung, ben&ouml;tigt mehr Zeit!)',
+	'http_authentication'		=> 'HTTP Authentifizierung',
+	'http_username'			=> 'HTTP Nutzername',
+	'http_password'			=> 'HTTP Passwort',
+	'blank_to_disable'		=> 'Zum Ausschalten frei lassen',
+	'not_yet_implemented'		=> 'Noch nicht implementiert',
+	'access_protected_feeds'	=> 'Die Verbindung erlaubt Zugriff zu HTTP-gesch&uuml;tzten RSS Feeds',
+	'no_selected_feed'		=> 'Kein Feed ausgew&auml;hlt.',
+	'think_to_add'			=> '<a href="./?c=configure&amp;a=feed">Sie k&ouml;nnen Feeds hinzuf&uuml;gen</a>.',
+
+	'current_user'			=> 'Aktuelle Nutzung',
+	'default_user'			=> 'Nutzername des Standardnutzers <small>(maximal 16 Zeichen - alphanumerisch)</small>',
+	'password_form'			=> 'Passwort<br /><small>(f&uuml;r die Anmeldemethode per Webformular)</small>',
+	'persona_connection_email'	=> 'Login E-Mail Adresse<br /><small>(f&uuml;r <a href="https://persona.org/" rel="external">Mozilla Persona</a>)</small>',
+	'allow_anonymous'		=> 'Anonymes lesen der Artikel des Standardnutzers (%s) wird erlaubt',
+	'allow_anonymous_refresh'	=> 'Aktualisieren der Artikel wird anonymen Nutzern erlaubt',
+	'auth_token'			=> 'Authentifizierungs-Token',
+	'explain_token'			=> 'Erlaube den Zugriff auf die RSS-Ausgabe des Standardnutzers ohne Authentifizierung.<br /><kbd>%s?output=rss&token=%s</kbd>',
+	'login_configuration'		=> 'Login',
+	'is_admin'			=> 'ist Administrator',
+	'auth_type'			=> 'Authentifizierungsmethode',
+	'auth_none'			=> 'Keine (gef&auml;hrlich)',
+	'auth_form'			=> 'Webformular (traditionell, JavaScript wird ben&ouml;tigt)',
+	'http_auth'			=> 'HTTP (mit HTTPS f&uuml;r erfahrene Nutzer)',
+	'auth_persona'			=> 'Mozilla Persona (modern, JavaScript wird ben&ouml;tigt)',
+	'users_list'			=> 'Liste der Nutzer',
+	'create_user'			=> 'Neuen Nutzer erstellen',
+	'username'			=> 'Nutzername',
+	'password'			=> 'Passwort',
+	'create'			=> 'Erstellen',
+	'user_created'			=> 'Nutzer %s wurde erstellt',
+	'user_deleted'			=> 'Nutzer %s wurde gel&ouml;scht',
+
+	'language'			=> 'Sprache',
+	'month'				=> 'Monate',
+	'archiving_configuration'	=> 'Archivieren',
+	'delete_articles_every'	=> 'Entfernen von Artikeln nach',
+	'purge_now'			=> 'Jetzt bereinigen',
+	'purge_completed'		=> 'Die Bereinigung ist abgeschlossen (%d Artikel wurden gel&ouml;scht)',
+	'archiving_configuration_help'	=> 'Es gibt weitere Optionen bei den Einstellungen der individuellen Nachrichtenstr&ouml;me',
+	'reading_configuration'		=> 'Lesen',
+	'articles_per_page'		=> 'Anzahl der Artikel pro Seite',
+	'default_view'			=> 'Standard-Ansicht',
+	'sort_order'			=> 'Sortierreihenfolge',
+	'auto_load_more'		=> 'Die n&auml;chsten Artikel am Seitenende laden',
+	'display_articles_unfolded'	=> 'Die Artikel als Standard zusammen gefaltet anzeigen',
+	'after_onread'			=> 'Nach “als gelesen markieren”',
+	'jump_next'			=> 'springe zum n&auml;chsten ungelesenen Geschwisterelement (Feed oder Kategorie)',
+	'reading_icons'			=> 'Lese Symbol',
+	'top_line'			=> 'Kopfzeile',
+	'bottom_line'			=> 'Fusszeile',
+	'img_with_lazyload'		=> 'Verwende die "tr&auml;ge laden" Methode zum laden von Bildern',
+	'auto_read_when'		=> 'Artikel als gelesen markieren…',
+	'article_selected'		=> 'wenn der Artikel ausgew&auml;hlt ist',
+	'article_open_on_website'	=> 'wenn der Artikel auf der Originalwebseite ge&ouml;ffnet ist',
+	'scroll'			=> 'w&auml;hrend des Seiten-Scrollens',
+	'upon_reception'		=> 'beim Empfang des Artikels',
+	'your_shaarli'			=> 'Ihr Shaarli',
+	'your_wallabag'			=> 'Ihr wallabag',
+	'your_diaspora_pod'		=> 'Ihr Diaspora* pod',
+	'sharing'			=> 'Teilen',
+	'share'				=> 'teile',
+	'by_email'			=> 'Per E-Mail',
+	'optimize_bdd'			=> 'Datenbank optimieren',
+	'optimize_todo_sometimes'	=> 'Sollte gelegentlich gemacht werden, um die Gr&ouml;ße der Datenbank zu reduzieren',
+	'theme'				=> 'Thema',
+	'more_information'		=> 'Weitere Informationen',
+	'activate_sharing'		=> 'Teilen aktivieren',
+	'shaarli'			=> 'Shaarli',
+	'wallabag'			=> 'wallabag',
+	'diaspora'			=> 'Diaspora*',
+	'twitter'			=> 'Twitter',
+	'g+'				=> 'Google+',
+	'facebook'			=> 'Facebook',
+	'email'				=> 'E-Mail',
+	'print'				=> 'Drucken',
+
+	'article'			=> 'Artikel',
+	'title'				=> 'Titel',
+	'author'			=> 'Autor',
+	'publication_date'		=> 'Datum der Ver&ouml;ffentlichung',
+	'by'				=> 'von',
+
+	'load_more'			=> 'Weitere Artikel laden',
+	'nothing_to_load'		=> 'Es gibt keine weiteren Artikel',
+
+	'rss_feeds_of'			=> 'RSS Feed von %s',
+
+	'refresh'			=> 'Aktualisieren',
+	'no_feed_to_refresh'		=> 'Es gibt keinen Feed zum aktualisieren',
+
+	'today'				=> 'Heute',
+	'yesterday'			=> 'Gestern',
+	'before_yesterday'		=> 'vor Gestern',
+	'new_article'			=> 'Es gibt neue Artikel. Bitte klicken Sie hier, um die Seite erneut zu laden.',
+	'by_author'			=> 'Von <em>%s</em>',
+	'related_tags'			=> 'Verwandte tags',
+	'no_feed_to_display'		=> 'Es gibt keinen Artikel zum anzeigen.',
+
+	'about_freshrss'		=> '&Uuml;ber FreshRSS',
+	'project_website'		=> 'Projekt Webseite',
+	'lead_developer'		=> 'Hauptentwickler',
+	'website'			=> 'Webseite',
+	'bugs_reports'			=> 'Fehlerberichte',
+	'github_or_email'		=> '<a href="https://github.com/marienfressinaud/FreshRSS/issues">auf Github</a> oder <a href="mailto:dev@marienfressinaud.fr">per Mail</a>',
+	'license'			=> 'Lizenz',
+	'agpl3'				=> '<a href="https://www.gnu.org/licenses/agpl-3.0.html">AGPL 3</a>',
+	'freshrss_description'		=> 'FreshRSS ist ein RSS Feedsaggregator zum selbst hosten wie zum Beispiel <a href="http://tontof.net/kriss/feed/">Kriss Feed</a> oder <a href="http://projet.idleman.fr/leed/">Leed</a>. Es ist leicht und einfach zu handhaben und gleichzeitig ein leistungsstark und konfigurierbares Werkzeug.',
+	'credits'			=> 'Credits',
+	'credits_content'		=> 'Einige Designelemente sind von <a href="http://twitter.github.io/bootstrap/">Bootstrap</a> obwohl FreshRSS dieses Framework nicht nutzt. <a href="https://git.gnome.org/browse/gnome-icon-theme-symbolic">Icons</a> sind vom <a href="https://www.gnome.org/">GNOME Projekt</a>. <em>Open Sans</em> Font police wurde von <a href="https://www.google.com/webfonts/specimen/Open+Sans">Steve Matteson erstellt</a>. Favicons wurden mit <a href="https://getfavicon.appspot.com/">getFavicon API gesammelt</a>. FreshRSS basiert auf <a href="https://github.com/marienfressinaud/MINZ">Minz</a>, einem PHP Framework.',
+	'version'			=> 'Version',
+
+	'logs'				=> 'Protokolle',
+	'logs_empty'			=> 'Die Protokolldatei ist leer',
+	'clear_logs'			=> 'Protokolldateien leeren',
+
+	'forbidden_access'		=> 'Der Zugriff ist verboten!',
+	'login_required'		=> 'Das Login ist n&ouml;tig:',
+
+	'confirm_action'		=> 'Sind Sie sicher, dass Sie diese Aktion durchf&uuml;hren wollen? Die Aktion kann nicht abgebrochen werden!',
+
+	// DATE
+	'january'			=> 'januar',
+	'february'			=> 'februar',
+	'march'				=> 'm&auml;rz',
+	'april'				=> 'april',
+	'may'				=> 'mai',
+	'june'				=> 'juni',
+	'july'				=> 'juli',
+	'august'			=> 'august',
+	'september'			=> 'september',
+	'october'			=> 'oktober',
+	'november'			=> 'november',
+	'december'			=> 'dezember',
+	// special format for date() function
+	'Jan'				=> '\J\a\n\u\a\r',
+	'Feb'				=> '\F\e\b\r\u\a\r',
+	'Mar'				=> '\M\a\e\r\z',
+	'Apr'				=> '\A\p\r\i\l',
+	'May'				=> '\M\a\i',
+	'Jun'				=> '\J\u\n\i',
+	'Jul'				=> '\J\u\l\i',
+	'Aug'				=> '\A\u\g\u\s\t',
+	'Sep'				=> '\S\e\p\t\e\m\b\e\r',
+	'Oct'				=> '\O\k\t\o\b\e\r',
+	'Nov'				=> '\N\o\v\e\m\b\e\r',
+	'Dec'				=> '\D\e\z\e\m\b\e\r',
+	// format for date() function, %s allows to indicate month in letter
+	'format_date'			=> 'd\.\ %s  Y',
+	'format_date_hour'		=> 'd\.\ %s  Y \u\m H\:i',
+	
+	'status_favorites'		=> 'Favoriten',
+	'status_read'			=> 'Gelesen',
+	'status_unread'			=> 'Ungelesen',
+	'status_total'			=> 'Gesamt',
+	
+	'stats_entry_repartition'	=> 'Verteilung der Eintr&auml;ge',
+	'stats_entry_per_day'		=> 'Eintr&auml;ge pro Tag (w&auml;hrend der letzten 30 Tage)',
+	'stats_feed_per_category'	=> 'Feeds pro Kategorie',
+	'stats_entry_per_category'	=> 'Eintr&auml;ge pro Kategorie',
+	'stats_top_feed'		=> 'Top 10 Feeds',
+	'stats_entry_count'		=> 'Z&auml;hler f&uuml;r Eintr&auml;ge',
+);
-- 
cgit v1.2.3


From 83832a39c4651bd3e4bfa007f75c91d040db79d3 Mon Sep 17 00:00:00 2001
From: Alexis Degrugillier <github@ainw.org>
Date: Sat, 6 Sep 2014 11:32:52 -0400
Subject: Add a new configuration option

Before, when you selected the option to display only unread articles, it shows read articles if no unread article were found.
Now, this option is renamed to include information on fallback behavior and a new option is created to have the "only unread" behavior

See #551

It is missing the german translation
---
 app/Models/Configuration.php      | 13 ++++++++++++-
 app/Models/Entry.php              |  2 ++
 app/Models/EntryDAO.php           |  3 +++
 app/i18n/en.php                   |  2 ++
 app/i18n/fr.php                   |  2 ++
 app/views/configure/reading.phtml | 19 +++++++++++--------
 6 files changed, 32 insertions(+), 9 deletions(-)

(limited to 'app/Models/Configuration.php')

diff --git a/app/Models/Configuration.php b/app/Models/Configuration.php
index 3a408faa5..92bab6ad9 100644
--- a/app/Models/Configuration.php
+++ b/app/Models/Configuration.php
@@ -141,7 +141,18 @@ class FreshRSS_Configuration {
 		}
 	}
 	public function _default_view ($value) {
-		$this->data['default_view'] = $value === FreshRSS_Entry::STATE_ALL ? FreshRSS_Entry::STATE_ALL : FreshRSS_Entry::STATE_NOT_READ;
+		switch ($value):
+			case FreshRSS_Entry::STATE_ALL:
+				// left blank on purpose
+			case FreshRSS_Entry::STATE_NOT_READ:
+				// left blank on purpose
+			case FreshRSS_Entry::STATE_NOT_READ_STRICT:
+				$this->data['default_view'] = $value;
+				break;
+			default:
+				$this->data['default_view'] = FreshRSS_Entry::STATE_ALL;
+				break;
+		endswitch;
 	}
 	public function _display_posts ($value) {
 		$this->data['display_posts'] = ((bool)$value) && $value !== 'no';
diff --git a/app/Models/Entry.php b/app/Models/Entry.php
index 0bf1f2616..5f1c8abc4 100644
--- a/app/Models/Entry.php
+++ b/app/Models/Entry.php
@@ -6,6 +6,8 @@ class FreshRSS_Entry extends Minz_Model {
 	const STATE_NOT_READ = 2;
 	const STATE_FAVORITE = 4;
 	const STATE_NOT_FAVORITE = 8;
+	const STATE_READ_STRICT = 16;
+	const STATE_NOT_READ_STRICT = 32;
 
 	private $id = 0;
 	private $guid;
diff --git a/app/Models/EntryDAO.php b/app/Models/EntryDAO.php
index 75a8aeba4..dee49212d 100644
--- a/app/Models/EntryDAO.php
+++ b/app/Models/EntryDAO.php
@@ -338,6 +338,9 @@ class FreshRSS_EntryDAO extends Minz_ModelPdo {
 		elseif ($state & FreshRSS_Entry::STATE_READ) {
 			$where .= 'AND e1.is_read=1 ';
 		}
+		elseif ($state & FreshRSS_Entry::STATE_NOT_READ_STRICT) {
+			$where .= 'AND e1.is_read=0 ';
+		}
 		if ($state & FreshRSS_Entry::STATE_FAVORITE) {
 			if (!($state & FreshRSS_Entry::STATE_NOT_FAVORITE)) {
 				$where .= 'AND e1.is_favorite=1 ';
diff --git a/app/i18n/en.php b/app/i18n/en.php
index bcd7a3da5..ea4e3d02a 100644
--- a/app/i18n/en.php
+++ b/app/i18n/en.php
@@ -92,6 +92,7 @@ return array (
 	'rss_view'			=> 'RSS feed',
 	'show_all_articles'		=> 'Show all articles',
 	'show_not_reads'		=> 'Show only unread',
+	'show_not_reads_with_fallback'	=> 'Show only unread or read if no unread',
 	'show_read'			=> 'Show only read',
 	'show_favorite'			=> 'Show only favorites',
 	'show_not_favorite'		=> 'Show all but favorites',
@@ -267,6 +268,7 @@ return array (
 	'display_configuration'		=> 'Display',
 	'articles_per_page'		=> 'Number of articles per page',
 	'default_view'			=> 'Default view',
+	'articles_to_display'		=> 'Articles to display',
 	'sort_order'			=> 'Sort order',
 	'auto_load_more'		=> 'Load next articles at the page bottom',
 	'display_articles_unfolded'	=> 'Show articles unfolded by default',
diff --git a/app/i18n/fr.php b/app/i18n/fr.php
index 395f2b5d2..c23e291ab 100644
--- a/app/i18n/fr.php
+++ b/app/i18n/fr.php
@@ -92,6 +92,7 @@ return array (
 	'rss_view'			=> 'Flux RSS',
 	'show_all_articles'		=> 'Afficher tous les articles',
 	'show_not_reads'		=> 'Afficher les non lus',
+	'show_not_reads_with_fallback'	=> 'Afficher les non lus ou les lus si aucun non lus',
 	'show_read'			=> 'Afficher les lus',
 	'show_favorite'			=> 'Afficher les favoris',
 	'show_not_favorite'		=> 'Afficher tout sauf les favoris',
@@ -267,6 +268,7 @@ return array (
 	'display_configuration'		=> 'Affichage',
 	'articles_per_page'		=> 'Nombre d’articles par page',
 	'default_view'			=> 'Vue par défaut',
+	'articles_to_display'		=> 'Articles à afficher',
 	'sort_order'			=> 'Ordre de tri',
 	'auto_load_more'		=> 'Charger les articles suivants en bas de page',
 	'display_articles_unfolded'	=> 'Afficher les articles dépliés par défaut',
diff --git a/app/views/configure/reading.phtml b/app/views/configure/reading.phtml
index 5a26501a4..df3b5277e 100644
--- a/app/views/configure/reading.phtml
+++ b/app/views/configure/reading.phtml
@@ -31,14 +31,17 @@
 					<option value="reader"<?php echo $this->conf->view_mode === 'reader' ? ' selected="selected"' : ''; ?>><?php echo Minz_Translate::t ('reader_view'); ?></option>
 					<option value="global"<?php echo $this->conf->view_mode === 'global' ? ' selected="selected"' : ''; ?>><?php echo Minz_Translate::t ('global_view'); ?></option>
 				</select>
-				<label class="radio" for="radio_all">
-					<input type="radio" name="default_view" id="radio_all" value="<?php echo FreshRSS_Entry::STATE_ALL; ?>"<?php echo $this->conf->default_view === FreshRSS_Entry::STATE_ALL ? ' checked="checked"' : ''; ?> />
-					<?php echo Minz_Translate::t ('show_all_articles'); ?>
-				</label>
-				<label class="radio" for="radio_not_read">
-					<input type="radio" name="default_view" id="radio_not_read" value="<?php echo FreshRSS_Entry::STATE_NOT_READ; ?>"<?php echo $this->conf->default_view === FreshRSS_Entry::STATE_NOT_READ ? ' checked="checked"' : ''; ?> />
-					<?php echo Minz_Translate::t ('show_not_reads'); ?>
-				</label>
+			</div>
+		</div>
+
+		<div class="form-group">
+			<label class="group-name" for="view_mode"><?php echo Minz_Translate::t ('articles_to_display'); ?></label>
+			<div class="group-controls">
+				<select name="default_view" id="default_view">
+					<option value="<?php echo FreshRSS_Entry::STATE_ALL; ?>"<?php echo $this->conf->default_view === FreshRSS_Entry::STATE_ALL ? ' selected="selected"' : ''; ?>><?php echo Minz_Translate::t ('show_all_articles'); ?></option>
+					<option value="<?php echo FreshRSS_Entry::STATE_NOT_READ; ?>"<?php echo $this->conf->default_view === FreshRSS_Entry::STATE_NOT_READ ? ' selected="selected"' : ''; ?>><?php echo Minz_Translate::t ('show_not_reads_with_fallback'); ?></option>
+					<option value="<?php echo FreshRSS_Entry::STATE_NOT_READ_STRICT; ?>"<?php echo $this->conf->default_view === FreshRSS_Entry::STATE_NOT_READ_STRICT ? ' selected="selected"' : ''; ?>><?php echo Minz_Translate::t ('show_not_reads'); ?></option>
+				</select>
 			</div>
 		</div>
 
-- 
cgit v1.2.3


From ce239f83c4812d1999d1be0be104e00a2ad23f90 Mon Sep 17 00:00:00 2001
From: Alexis Degrugillier <github@ainw.org>
Date: Mon, 15 Sep 2014 17:53:08 -0400
Subject: Add a feature to add only unique shares

Before, it was possible to have different shares of the same type with the same information.
Now, even if you try to input identical shares, only the first one is kept. Of course, the verification is simple, so for instance if you input two shares to the same shaarli instance with different names, they are kept.

See #614
---
 app/Models/Configuration.php | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

(limited to 'app/Models/Configuration.php')

diff --git a/app/Models/Configuration.php b/app/Models/Configuration.php
index 3a408faa5..e4408df73 100644
--- a/app/Models/Configuration.php
+++ b/app/Models/Configuration.php
@@ -212,6 +212,7 @@ class FreshRSS_Configuration {
 	}
 	public function _sharing ($values) {
 		$this->data['sharing'] = array();
+		$unique = array();
 		foreach ($values as $value) {
 			if (!is_array($value)) {
 				continue;
@@ -237,7 +238,11 @@ class FreshRSS_Configuration {
 				$value['name'] = $value['type'];
 			}
 
-			$this->data['sharing'][] = $value;
+			$json_value = json_encode($value);
+			if (!in_array($json_value, $unique)) {
+				$unique[] = $json_value;
+				$this->data['sharing'][] = $value;
+			}
 		}
 	}
 	public function _queries ($values) {
-- 
cgit v1.2.3


From 9fec7f328b077993499c282ccb59414fb50ca84f Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Wed, 17 Sep 2014 11:22:45 +0200
Subject: Coding style + i18n

Change "Show only unread or read if no unread" into "Adjust showing". It
is less explicit but shorter.
---
 app/Models/Configuration.php      | 24 ++++++++++++------------
 app/i18n/en.php                   |  2 +-
 app/i18n/fr.php                   |  2 +-
 app/views/configure/reading.phtml |  8 ++++----
 4 files changed, 18 insertions(+), 18 deletions(-)

(limited to 'app/Models/Configuration.php')

diff --git a/app/Models/Configuration.php b/app/Models/Configuration.php
index e47b042c8..352e70f4f 100644
--- a/app/Models/Configuration.php
+++ b/app/Models/Configuration.php
@@ -141,18 +141,18 @@ class FreshRSS_Configuration {
 		}
 	}
 	public function _default_view ($value) {
-		switch ($value):
-			case FreshRSS_Entry::STATE_ALL:
-				// left blank on purpose
-			case FreshRSS_Entry::STATE_NOT_READ:
-				// left blank on purpose
-			case FreshRSS_Entry::STATE_NOT_READ_STRICT:
-				$this->data['default_view'] = $value;
-				break;
-			default:
-				$this->data['default_view'] = FreshRSS_Entry::STATE_ALL;
-				break;
-		endswitch;
+		switch ($value) {
+		case FreshRSS_Entry::STATE_ALL:
+			// left blank on purpose
+		case FreshRSS_Entry::STATE_NOT_READ:
+			// left blank on purpose
+		case FreshRSS_Entry::STATE_NOT_READ_STRICT:
+			$this->data['default_view'] = $value;
+			break;
+		default:
+			$this->data['default_view'] = FreshRSS_Entry::STATE_ALL;
+			break;
+		}
 	}
 	public function _display_posts ($value) {
 		$this->data['display_posts'] = ((bool)$value) && $value !== 'no';
diff --git a/app/i18n/en.php b/app/i18n/en.php
index 7c66864c1..562697585 100644
--- a/app/i18n/en.php
+++ b/app/i18n/en.php
@@ -92,7 +92,7 @@ return array (
 	'rss_view'			=> 'RSS feed',
 	'show_all_articles'		=> 'Show all articles',
 	'show_not_reads'		=> 'Show only unread',
-	'show_not_reads_with_fallback'	=> 'Show only unread or read if no unread',
+	'show_adaptive'			=> 'Adjust showing',
 	'show_read'			=> 'Show only read',
 	'show_favorite'			=> 'Show only favorites',
 	'show_not_favorite'		=> 'Show all but favorites',
diff --git a/app/i18n/fr.php b/app/i18n/fr.php
index 327661035..9516f66cb 100644
--- a/app/i18n/fr.php
+++ b/app/i18n/fr.php
@@ -92,7 +92,7 @@ return array (
 	'rss_view'			=> 'Flux RSS',
 	'show_all_articles'		=> 'Afficher tous les articles',
 	'show_not_reads'		=> 'Afficher les non lus',
-	'show_not_reads_with_fallback'	=> 'Afficher les non lus ou les lus si aucun non lus',
+	'show_adaptive'			=> 'Adapter l’affichage',
 	'show_read'			=> 'Afficher les lus',
 	'show_favorite'			=> 'Afficher les favoris',
 	'show_not_favorite'		=> 'Afficher tout sauf les favoris',
diff --git a/app/views/configure/reading.phtml b/app/views/configure/reading.phtml
index 9bd145a3b..3dd457a2b 100644
--- a/app/views/configure/reading.phtml
+++ b/app/views/configure/reading.phtml
@@ -38,12 +38,12 @@
 		</div>
 
 		<div class="form-group">
-			<label class="group-name" for="view_mode"><?php echo Minz_Translate::t ('articles_to_display'); ?></label>
+			<label class="group-name" for="view_mode"><?php echo _t('articles_to_display'); ?></label>
 			<div class="group-controls">
 				<select name="default_view" id="default_view">
-					<option value="<?php echo FreshRSS_Entry::STATE_ALL; ?>"<?php echo $this->conf->default_view === FreshRSS_Entry::STATE_ALL ? ' selected="selected"' : ''; ?>><?php echo Minz_Translate::t ('show_all_articles'); ?></option>
-					<option value="<?php echo FreshRSS_Entry::STATE_NOT_READ; ?>"<?php echo $this->conf->default_view === FreshRSS_Entry::STATE_NOT_READ ? ' selected="selected"' : ''; ?>><?php echo Minz_Translate::t ('show_not_reads_with_fallback'); ?></option>
-					<option value="<?php echo FreshRSS_Entry::STATE_NOT_READ_STRICT; ?>"<?php echo $this->conf->default_view === FreshRSS_Entry::STATE_NOT_READ_STRICT ? ' selected="selected"' : ''; ?>><?php echo Minz_Translate::t ('show_not_reads'); ?></option>
+					<option value="<?php echo FreshRSS_Entry::STATE_NOT_READ; ?>"<?php echo $this->conf->default_view === FreshRSS_Entry::STATE_NOT_READ ? ' selected="selected"' : ''; ?>><?php echo _t('show_adaptive'); ?></option>
+					<option value="<?php echo FreshRSS_Entry::STATE_ALL; ?>"<?php echo $this->conf->default_view === FreshRSS_Entry::STATE_ALL ? ' selected="selected"' : ''; ?>><?php echo _t('show_all_articles'); ?></option>
+					<option value="<?php echo FreshRSS_Entry::STATE_NOT_READ_STRICT; ?>"<?php echo $this->conf->default_view === FreshRSS_Entry::STATE_NOT_READ_STRICT ? ' selected="selected"' : ''; ?>><?php echo _t('show_not_reads'); ?></option>
 				</select>
 			</div>
 		</div>
-- 
cgit v1.2.3


From 4211539c24e36531f2c5440ad454c4e208131047 Mon Sep 17 00:00:00 2001
From: plopoyop <clement@iMac-de-Clement.local>
Date: Thu, 18 Sep 2014 10:46:34 +0200
Subject: Add timeout option for HTML5 notification

---
 app/Controllers/configureController.php | 1 +
 app/Models/Configuration.php            | 7 +++++++
 app/i18n/de.php                         | 2 ++
 app/i18n/en.php                         | 2 ++
 app/i18n/fr.php                         | 2 ++
 app/views/configure/display.phtml       | 7 +++++++
 app/views/helpers/javascript_vars.phtml | 2 ++
 p/scripts/main.js                       | 6 ++++++
 8 files changed, 29 insertions(+)

(limited to 'app/Models/Configuration.php')

diff --git a/app/Controllers/configureController.php b/app/Controllers/configureController.php
index bb96bfae3..b1cd45014 100755
--- a/app/Controllers/configureController.php
+++ b/app/Controllers/configureController.php
@@ -157,6 +157,7 @@ class FreshRSS_configure_Controller extends Minz_ActionController {
 			$this->view->conf->_bottomline_tags(Minz_Request::param('bottomline_tags', false));
 			$this->view->conf->_bottomline_date(Minz_Request::param('bottomline_date', false));
 			$this->view->conf->_bottomline_link(Minz_Request::param('bottomline_link', false));
+			$this->view->conf->_html5_notif_timeout(Minz_Request::param('html5_notif_timeout', 0));
 			$this->view->conf->save();
 
 			Minz_Session::_param('language', $this->view->conf->language);
diff --git a/app/Models/Configuration.php b/app/Models/Configuration.php
index e4408df73..830d39f0d 100644
--- a/app/Models/Configuration.php
+++ b/app/Models/Configuration.php
@@ -60,6 +60,7 @@ class FreshRSS_Configuration {
 		'bottomline_link' => true,
 		'sharing' => array(),
 		'queries' => array(),
+		'html5_notif_timeout' => 0,
 	);
 
 	private $available_languages = array(
@@ -269,6 +270,12 @@ class FreshRSS_Configuration {
 			$this->data['content_width'] = 'thin';
 		}
 	}
+	
+	public function _html5_notif_timeout ($value) {
+		$value = intval($value);
+		$this->data['html5_notif_timeout'] = $value >= 0 ? $value : 0;
+	}
+	
 	public function _token($value) {
 		$this->data['token'] = $value;
 	}
diff --git a/app/i18n/de.php b/app/i18n/de.php
index 4301a8b6d..3f7d8ca27 100644
--- a/app/i18n/de.php
+++ b/app/i18n/de.php
@@ -212,6 +212,8 @@ return array (
 	'reading_icons'			=> 'Lese Symbol',
 	'top_line'			=> 'Kopfzeile',
 	'bottom_line'			=> 'Fusszeile',
+	'html5_notif_timeout'	=> 'HTML5 notification timeout',
+	'seconds_(0_means_no_timeout)'	=> 'seconds (0 means no timeout)',
 	'img_with_lazyload'		=> 'Verwende die "tr&auml;ge laden" Methode zum laden von Bildern',
 	'auto_read_when'		=> 'Artikel als gelesen markieren…',
 	'article_selected'		=> 'wenn der Artikel ausgew&auml;hlt ist',
diff --git a/app/i18n/en.php b/app/i18n/en.php
index 8f39115ad..1e842a1e1 100644
--- a/app/i18n/en.php
+++ b/app/i18n/en.php
@@ -280,6 +280,8 @@ return array (
 	'article_icons'			=> 'Article icons',
 	'top_line'			=> 'Top line',
 	'bottom_line'			=> 'Bottom line',
+	'html5_notif_timeout'	=> 'HTML5 notification timeout',
+	'seconds_(0_means_no_timeout)'	=> 'seconds (0 means no timeout)',
 	'img_with_lazyload'		=> 'Use "lazy load" mode to load pictures',
 	'sticky_post'			=> 'Stick the article to the top when opened',
 	'reading_confirm'		=> 'Display a confirmation dialog on “mark all as read” actions',
diff --git a/app/i18n/fr.php b/app/i18n/fr.php
index 48b4c1732..bbfa71f66 100644
--- a/app/i18n/fr.php
+++ b/app/i18n/fr.php
@@ -280,6 +280,8 @@ return array (
 	'article_icons'			=> 'Icônes d’article',
 	'top_line'			=> 'Ligne du haut',
 	'bottom_line'			=> 'Ligne du bas',
+	'html5_notif_timeout'	=> 'Temps d\'affichage de la notification HTML5',
+	'seconds_(0_means_no_timeout)'	=> 'secondes (0 signifie aucun timeout ) ',
 	'img_with_lazyload'		=> 'Utiliser le mode “chargement différé” pour les images',
 	'sticky_post'			=> 'Aligner l’article en haut quand il est ouvert',
 	'reading_confirm'		=> 'Afficher une confirmation lors des actions “marquer tout comme lu”',
diff --git a/app/views/configure/display.phtml b/app/views/configure/display.phtml
index 955fc6747..8eb3a156b 100644
--- a/app/views/configure/display.phtml
+++ b/app/views/configure/display.phtml
@@ -91,6 +91,13 @@
 				</tbody>
 			</table><br />
 		</div>
+		
+		<div class="form-group">
+			<label class="group-name" for="posts_per_page"><?php echo Minz_Translate::t ('html5_notif_timeout'); ?></label>
+			<div class="group-controls">
+				<input type="number" id="html5_notif_timeout" name="html5_notif_timeout" value="<?php echo $this->conf->html5_notif_timeout; ?>" /> <?php echo Minz_Translate::t ('seconds_(0_means_no_timeout)'); ?>
+			</div>
+		</div>
 
 		<div class="form-group form-actions">
 			<div class="group-controls">
diff --git a/app/views/helpers/javascript_vars.phtml b/app/views/helpers/javascript_vars.phtml
index 2144f1576..bf0ffdb76 100644
--- a/app/views/helpers/javascript_vars.phtml
+++ b/app/views/helpers/javascript_vars.phtml
@@ -54,6 +54,8 @@ echo 'authType="', $authType, '",',
 echo 'str_confirmation="', Minz_Translate::t('confirm_action'), '"', ",\n";
 echo 'str_notif_title_articles="', Minz_Translate::t('notif_title_new_articles'), '"', ",\n";
 echo 'str_notif_body_articles="', Minz_Translate::t('notif_body_new_articles'), '"', ",\n";
+echo 'html5_notif_timeout=', $this->conf->html5_notif_timeout,",\n";
+
 
 $autoActualise = Minz_Session::param('actualize_feeds', false);
 echo 'auto_actualize_feeds=', $autoActualise ? 'true' : 'false', ";\n";
diff --git a/p/scripts/main.js b/p/scripts/main.js
index fd49d62ba..c568bac35 100644
--- a/p/scripts/main.js
+++ b/p/scripts/main.js
@@ -866,6 +866,12 @@ function notifs_html5_show(nb) {
 	notification.onclick = function() {
 		window.location.reload();
 	}
+
+	if (html5_notif_timeout !== 0){
+		setTimeout(function() {
+					notification.close();
+				}, html5_notif_timeout * 1000);
+	}
 }
 
 function init_notifs_html5() {
-- 
cgit v1.2.3


From 71617080e224b8d3a3397a27b78e1f509499431c Mon Sep 17 00:00:00 2001
From: Alexis Degrugillier <github@ainw.org>
Date: Thu, 18 Sep 2014 21:06:38 -0400
Subject: Refactor code for strict unread message display

Before, when you choose the show unread message option and the hide categories and feeds options, the categories and feeds weren't hidden. Now it is working properly.
Before, the unread filter icon was not selected with the previous way of using the constants. Now, the filter is highlighted when selected in strict mode.

See #619
---
 app/Models/Configuration.php      | 2 +-
 app/Models/Entry.php              | 3 +--
 app/Models/EntryDAO.php           | 5 ++---
 app/i18n/en.php                   | 2 +-
 app/i18n/fr.php                   | 2 +-
 app/views/configure/reading.phtml | 2 +-
 6 files changed, 7 insertions(+), 9 deletions(-)

(limited to 'app/Models/Configuration.php')

diff --git a/app/Models/Configuration.php b/app/Models/Configuration.php
index f94d82402..ea1556cbb 100644
--- a/app/Models/Configuration.php
+++ b/app/Models/Configuration.php
@@ -147,7 +147,7 @@ class FreshRSS_Configuration {
 			// left blank on purpose
 		case FreshRSS_Entry::STATE_NOT_READ:
 			// left blank on purpose
-		case FreshRSS_Entry::STATE_NOT_READ_STRICT:
+		case FreshRSS_Entry::STATE_STRICT + FreshRSS_Entry::STATE_NOT_READ:
 			$this->data['default_view'] = $value;
 			break;
 		default:
diff --git a/app/Models/Entry.php b/app/Models/Entry.php
index 5f1c8abc4..9d7dd5dc4 100644
--- a/app/Models/Entry.php
+++ b/app/Models/Entry.php
@@ -6,8 +6,7 @@ class FreshRSS_Entry extends Minz_Model {
 	const STATE_NOT_READ = 2;
 	const STATE_FAVORITE = 4;
 	const STATE_NOT_FAVORITE = 8;
-	const STATE_READ_STRICT = 16;
-	const STATE_NOT_READ_STRICT = 32;
+	const STATE_STRICT = 16;
 
 	private $id = 0;
 	private $guid;
diff --git a/app/Models/EntryDAO.php b/app/Models/EntryDAO.php
index dee49212d..c1f87ee34 100644
--- a/app/Models/EntryDAO.php
+++ b/app/Models/EntryDAO.php
@@ -333,14 +333,13 @@ class FreshRSS_EntryDAO extends Minz_ModelPdo {
 		if ($state & FreshRSS_Entry::STATE_NOT_READ) {
 			if (!($state & FreshRSS_Entry::STATE_READ)) {
 				$where .= 'AND e1.is_read=0 ';
+			} elseif ($state & FreshRSS_Entry::STATE_STRICT) {
+				$where .= 'AND e1.is_read=0 ';
 			}
 		}
 		elseif ($state & FreshRSS_Entry::STATE_READ) {
 			$where .= 'AND e1.is_read=1 ';
 		}
-		elseif ($state & FreshRSS_Entry::STATE_NOT_READ_STRICT) {
-			$where .= 'AND e1.is_read=0 ';
-		}
 		if ($state & FreshRSS_Entry::STATE_FAVORITE) {
 			if (!($state & FreshRSS_Entry::STATE_NOT_FAVORITE)) {
 				$where .= 'AND e1.is_favorite=1 ';
diff --git a/app/i18n/en.php b/app/i18n/en.php
index 8598e61cb..c53adb409 100644
--- a/app/i18n/en.php
+++ b/app/i18n/en.php
@@ -281,7 +281,7 @@ return array (
 	'auto_load_more'		=> 'Load next articles at the page bottom',
 	'display_articles_unfolded'	=> 'Show articles unfolded by default',
 	'display_categories_unfolded'	=> 'Show categories folded by default',
-	'hide_read_feeds'		=> 'Hide categories &amp; feeds with no unread article (only in “unread articles” display mode)',
+	'hide_read_feeds'		=> 'Hide categories &amp; feeds with no unread article (does not work with “Show all articles” configuration)',
 	'after_onread'			=> 'After “mark all as read”,',
 	'jump_next'			=> 'jump to next unread sibling (feed or category)',
 	'article_icons'			=> 'Article icons',
diff --git a/app/i18n/fr.php b/app/i18n/fr.php
index 4af819cac..58dccd2d4 100644
--- a/app/i18n/fr.php
+++ b/app/i18n/fr.php
@@ -281,7 +281,7 @@ return array (
 	'auto_load_more'		=> 'Charger les articles suivants en bas de page',
 	'display_articles_unfolded'	=> 'Afficher les articles dépliés par défaut',
 	'display_categories_unfolded'	=> 'Afficher les catégories pliées par défaut',
-	'hide_read_feeds'		=> 'Cacher les catégories &amp; flux sans article non-lu (uniquement en affichage “articles non lus”)',
+	'hide_read_feeds'		=> 'Cacher les catégories &amp; flux sans article non-lu (ne fonctionne pas avec la configuration “Afficher tous les articles”)',
 	'after_onread'			=> 'Après “marquer tout comme lu”,',
 	'jump_next'			=> 'sauter au prochain voisin non lu (flux ou catégorie)',
 	'article_icons'			=> 'Icônes d’article',
diff --git a/app/views/configure/reading.phtml b/app/views/configure/reading.phtml
index 3dd457a2b..86d816eb3 100644
--- a/app/views/configure/reading.phtml
+++ b/app/views/configure/reading.phtml
@@ -43,7 +43,7 @@
 				<select name="default_view" id="default_view">
 					<option value="<?php echo FreshRSS_Entry::STATE_NOT_READ; ?>"<?php echo $this->conf->default_view === FreshRSS_Entry::STATE_NOT_READ ? ' selected="selected"' : ''; ?>><?php echo _t('show_adaptive'); ?></option>
 					<option value="<?php echo FreshRSS_Entry::STATE_ALL; ?>"<?php echo $this->conf->default_view === FreshRSS_Entry::STATE_ALL ? ' selected="selected"' : ''; ?>><?php echo _t('show_all_articles'); ?></option>
-					<option value="<?php echo FreshRSS_Entry::STATE_NOT_READ_STRICT; ?>"<?php echo $this->conf->default_view === FreshRSS_Entry::STATE_NOT_READ_STRICT ? ' selected="selected"' : ''; ?>><?php echo _t('show_not_reads'); ?></option>
+					<option value="<?php echo FreshRSS_Entry::STATE_STRICT + FreshRSS_Entry::STATE_NOT_READ; ?>"<?php echo $this->conf->default_view === FreshRSS_Entry::STATE_STRICT + FreshRSS_Entry::STATE_NOT_READ ? ' selected="selected"' : ''; ?>><?php echo _t('show_not_reads'); ?></option>
 				</select>
 			</div>
 		</div>
-- 
cgit v1.2.3


From 5a1baff9be7cf9fe3f59fe2a7dc34fbadacc1a99 Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Wed, 24 Sep 2014 13:28:09 +0200
Subject: Refactor removing query by get param

See https://github.com/marienfressinaud/FreshRSS/issues/625
---
 app/Controllers/configureController.php | 10 +---------
 app/Models/Configuration.php            | 10 ++++++++++
 2 files changed, 11 insertions(+), 9 deletions(-)

(limited to 'app/Models/Configuration.php')

diff --git a/app/Controllers/configureController.php b/app/Controllers/configureController.php
index e6e9172e6..231865bd7 100755
--- a/app/Controllers/configureController.php
+++ b/app/Controllers/configureController.php
@@ -59,15 +59,7 @@ class FreshRSS_configure_Controller extends Minz_ActionController {
 					$catDAO->deleteCategory($ids[$key]);
 
 					// Remove related queries.
-					$final_queries = array();
-					$id_cat_in_query = 'c_' . $ids[$key];
-					foreach ($this->view->conf->queries as $key => $query) {
-						if (empty($query['get']) ||
-								$query['get'] !== $id_cat_in_query) {
-							$final_queries[$key] = $query;
-						}
-					}
-					$this->view->conf->_queries($final_queries);
+					$this->view->conf->remove_query_by_get('c_' . $ids[$key]);
 					$this->view->conf->save();
 				}
 			}
diff --git a/app/Models/Configuration.php b/app/Models/Configuration.php
index ea1556cbb..91d2ab846 100644
--- a/app/Models/Configuration.php
+++ b/app/Models/Configuration.php
@@ -124,6 +124,16 @@ class FreshRSS_Configuration {
 		return $this->available_languages;
 	}
 
+	public function remove_query_by_get($get) {
+		$final_queries = array();
+		foreach ($this->queries as $key => $query) {
+			if (empty($query['get']) || $query['get'] !== $get) {
+				$final_queries[$key] = $query;
+			}
+		}
+		$this->_queries($final_queries);
+	}
+
 	public function _language($value) {
 		if (!isset($this->available_languages[$value])) {
 			$value = 'en';
-- 
cgit v1.2.3


From c14162221365077bcaeecde7127806190490dd58 Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Fri, 26 Sep 2014 14:32:52 +0200
Subject: Remove German language for 0.8 release

---
 app/Models/Configuration.php |   1 -
 app/i18n/de.php              | 328 -------------------------------------------
 2 files changed, 329 deletions(-)
 delete mode 100644 app/i18n/de.php

(limited to 'app/Models/Configuration.php')

diff --git a/app/Models/Configuration.php b/app/Models/Configuration.php
index 91d2ab846..95f819779 100644
--- a/app/Models/Configuration.php
+++ b/app/Models/Configuration.php
@@ -64,7 +64,6 @@ class FreshRSS_Configuration {
 	);
 
 	private $available_languages = array(
-		'de' => 'Deutsch',
 		'en' => 'English',
 		'fr' => 'Français',
 	);
diff --git a/app/i18n/de.php b/app/i18n/de.php
deleted file mode 100644
index 77fb805fb..000000000
--- a/app/i18n/de.php
+++ /dev/null
@@ -1,328 +0,0 @@
-<?php
-
-return array (
-	// LAYOUT
-	'login'				=> 'Login',
-	'login_with_persona'		=> 'Login mit Persona',
-	'logout'			=> 'Logout',
-	'search'			=> 'Suche nach Worten oder #tags',
-	'search_short'			=> 'Suche',
-
-	'configuration'			=> 'Konfiguration',
-	'users'				=> 'Nutzer',
-	'categories'			=> 'Kategorien',
-	'category'			=> 'Kategorie',
-	'feed'				=> 'Feed',
-	'feeds'				=> 'Feeds',
-	'shortcuts'			=> 'Shortcuts',
-	'about'				=> 'Über',
-	'stats'				=> 'Statistiken',
-
-	'your_rss_feeds'		=> 'Ihre RSS Feeds',
-	'add_rss_feed'			=> 'RSS-Feed hinzufügen',
-	'no_rss_feed'			=> 'Kein RSS Feed',
-	'import_export_opml'		=> 'Import / Export (OPML)',
-
-	'subscription_management'	=> 'Abonnementsverwaltung',
-	'main_stream'			=> 'Haupt-Nachrichtenfluß',
-	'all_feeds'			=> 'Alle Feeds',
-	'favorite_feeds'		=> 'Favoriten (%d)',
-	'not_read'			=> '%d ungelesen',
-	'not_reads'			=> '%d ungelesen',
-
-	'filter'			=> 'Filter',
-	'see_website'			=> 'Website ansehen',
-	'administration'		=> 'Verwaltung',
-	'actualize'			=> 'Aktualisierung',
-
-	'mark_read'			=> 'Als gelesen markieren',
-	'mark_favorite'			=> 'Als Favoriten markieren',
-	'mark_all_read'			=> 'Alle als gelesen markieren',
-	'mark_feed_read'		=> 'Feed als gelesen markieren',
-	'mark_cat_read'			=> 'Kategorie als gelesen markieren',
-	'before_one_day'		=> 'Vor einem Tag',
-	'before_one_week'		=> 'Vor einer Woche',
-	'display'			=> 'Anzeige',
-	'normal_view'			=> 'Normale Anzeige',
-	'reader_view'			=> 'Leseanzeige-Modus',
-	'global_view'			=> 'Globale Anzeige',
-	'rss_view'			=> 'RSS-Feed',
-	'show_all_articles'		=> 'zeige alle Artikel',
-	'show_not_reads'		=> 'zeige nicht gelesene',
-	'show_read'			=> 'zeige nur gelesene',
-	'show_favorite'			=> 'Favoriten anzeigen',
-	'older_first'			=> 'Älteste zuerst',
-	'newer_first'			=> 'Neuere zuerst',
-
-	// Pagination
-	'first'				=> 'Erste',
-	'previous'			=> 'Vorherige',
-	'next'				=> 'Nächste',
-	'last'				=> 'Letzte',
-
-	// CONTROLLERS
-	'article_published_on'		=> 'Dieser Artikel erschien im Original bei <a href="%s">%s</a>',
-	'article_published_on_author'	=> 'Dieser Artikel erschien im Original bei <a href="%s">%s</a> von %s',
-
-	'access_denied'			=> 'Sie haben nicht die Berechtigung, diese Seite aufzurufen',
-	'page_not_found'		=> 'Sie suchen nach einer Seite, die es nicht gibt',
-	'error_occurred'		=> 'Es gab einen Fehler',
-	'error_occurred_update'		=> 'Es wurde nichts geändert',
-
-	'default_category'		=> 'Unkategorisiert',
-	'categories_updated'		=> 'Kategorien wurden aktualisiert',
-	'categories_management'		=> 'Kategorienverwaltung',
-	'feed_updated'			=> 'Der Feed wurde aktualisiert',
-	'rss_feed_management'		=> 'Verwaltung der RSS Feeds',
-	'configuration_updated'		=> 'Die Konfiguration wurde aktualisiert',
-	'sharing_management'		=> 'Verwaltung der Optionen für das Teilen',
-	'bad_opml_file'			=> 'Ihre OPML-Datei ist ungültig',
-	'shortcuts_updated'		=> 'Shortcuts wurden aktualisiert',
-	'shortcuts_management'		=> 'Verwaltung der Shortcuts',
-	'shortcuts_navigation'		=> 'Navigation',
-	'shortcuts_navigation_help'	=> 'Mit der "Shift" Taste gelten die Navigations-Shortcuts für Feeds.<br/>Mit der "Alt" Taste gelten die Navigations-Shortcuts für Kategorien.',
-	'shortcuts_article_action'	=> 'Artikelaktionen',
-	'shortcuts_other_action'	=> 'Andere Aktionen',
-	'feeds_marked_read'		=> 'Die Feeds wurden als gelesen markiert',
-	'updated'			=> 'Die Änderungen wurden aktualisiert',
-
-	'already_subscribed'		=> 'Sie haben bereits <em>%s</em> abonniert',
-	'feed_added'			=> 'Der RSS Feed <em>%s</em> wurde hinzugefügt',
-	'feed_not_added'		=> '<em>%s</em> konnte nicht hinzugefügt werden',
-	'internal_problem_feed'		=> 'Der RSS Feed konnte nicht hinzugefügt werden. überprüfen Sie die Protokolldateien von FressRSS für weitere Informationen.',
-	'invalid_url'			=> 'URL <em>%s</em> ist ungültig',
-	'feed_actualized'		=> '<em>%s</em> wurde aktualisiert',
-	'n_feeds_actualized'		=> '%d Feeds wurden aktualisiert',
-	'feeds_actualized'		=> 'RSS Feeds wurden aktualisiert',
-	'no_feed_actualized'		=> 'Es wurden keine RSS Feeds aktualisiert',
-	'n_entries_deleted'		=> '%d Artikel wurden gelöscht',
-	'feeds_imported_with_errors'	=> 'Ihre Feeds wurden importiert, es gab aber einige Fehler',
-	'feeds_imported'		=> 'Ihre Feeds wurden importiert und werden jetzt aktualisiert',
-	'category_emptied'		=> 'Die Kategorie wurde geleert',
-	'feed_deleted'			=> 'Der Feed wurde gelöscht',
-	'feed_validator'		=> 'Überprüfen Sie die Gültigkeit des Feeds',
-
-	'optimization_complete'		=> 'Die Optimierung ist beendet',
-
-	'your_rss_feeds'		=> 'Ihre RSS Feeds',
-	'your_favorites'		=> 'Ihre Favoriten',
-	'public'			=> 'Öffentlich',
-	'invalid_login'			=> 'Das Login ist ungültig',
-
-	// VIEWS
-	'save'				=> 'Speichern',
-	'delete'			=> 'Löschen',
-	'cancel'			=> 'Abbrechen',
-
-	'back_to_rss_feeds'		=> '← Zurück zu den RSS Feeds gehen',
-	'feeds_moved_category_deleted'	=> 'Wenn Sie eine Kategorie löschen, werden deren Feeds automatisch in die Kategorie <em>%s</em> eingefügt.',
-	'category_number'		=> 'Kategorie n°%d',
-	'ask_empty'			=> 'Leeren?',
-	'number_feeds'			=> '%d Feeds',
-	'can_not_be_deleted'		=> 'Kann nicht gelöscht werden',
-	'add_category'			=> 'Füge eine Kategorie hinzu',
-	'new_category'			=> 'Neue Kategorie',
-
-	'javascript_for_shortcuts'	=> 'JavaScript muss ermöglicht werden, wenn Shortcuts verwendet werden sollen',
-	'javascript_should_be_activated'=> 'JavaScript muss ermöglicht werden',
-	'shift_for_all_read'		=> '+ <code>shift</code> um alle Artikel als gelesen zu markieren',
-	'see_on_website'		=> 'Auf der Originalwebseite anschauen',
-	'next_article'			=> 'Zum nächsten Artikel springen',
-	'last_article'			=> 'Zum letzten Artikel springen',
-	'previous_article'		=> 'Zum vorherigen Artikel springen',
-	'first_article'			=> 'Zum ersten Artikel springen',
-	'next_page'			=> 'Zur nächsten Seite springen',
-	'previous_page'			=> 'Zur vorherigen Seite springen',
-	'collapse_article'		=> 'Zusammenfalten',
-	'auto_share'			=> 'Teilen',
-	'auto_share_help'		=> 'Wenn es nur eine Option zum Teilen gibt, wird die verwendet. Ansonsten werden die Optionen über die Nummer ausgewählt.',
-
-	'file_to_import'		=> 'Datei zum importieren',
-	'import'			=> 'Import',
-	'export'			=> 'Export',
-	'or'				=> 'oder',
-
-	'informations'			=> 'Information',
-	'damn'				=> 'Verdammt!',
-	'feed_in_error'			=> 'Dieser Feed hat ein Problem verursacht. Bitte stellen Sie sicher, dass er immer lesbar ist und aktualisieren Sie ihn dann.',
-	'feed_empty'			=> 'Dieser Feed ist leer. Bitte stellen Sie sicher, dass er noch gepflegt wird.',
-	'feed_description'		=> 'Beschreibung',
-	'website_url'			=> 'Webseiten-Adresse URL',
-	'feed_url'			=> 'Feed URL',
-	'articles'			=> 'Artikel',
-	'number_articles'		=> '%d Artikel',
-	'by_feed'			=> 'per Feed',
-	'by_default'			=> 'Als Vorgabe',
-	'keep_history'			=> 'Kleinste Anzahl der Artikel, die behalten werden',
-	'categorize'			=> 'In einer Kategorie speichern',
-	'truncate'			=> 'Alle Artikel löschen',
-	'advanced'			=> 'Erweitert',
-	'show_in_all_flux'		=> 'Im Hauptstrom anzeigen',
-	'yes'				=> 'Ja',
-	'no'				=> 'Nein',
-	'css_path_on_website'		=> 'Pfad zur CSS-Datei des Artikels auf der Original Webseite',
-	'retrieve_truncated_feeds'	=> 'Gekürzte RSS Feeds abrufen (Achtung, benötigt mehr Zeit!)',
-	'http_authentication'		=> 'HTTP Authentifizierung',
-	'http_username'			=> 'HTTP Nutzername',
-	'http_password'			=> 'HTTP Passwort',
-	'blank_to_disable'		=> 'Zum Ausschalten frei lassen',
-	'not_yet_implemented'		=> 'Noch nicht implementiert',
-	'access_protected_feeds'	=> 'Die Verbindung erlaubt Zugriff zu HTTP-geschützten RSS Feeds',
-	'no_selected_feed'		=> 'Kein Feed ausgewählt.',
-	'think_to_add'			=> 'Sie können Feeds hinzufügen.',
-
-	'current_user'			=> 'Aktuelle Nutzung',
-	'default_user'			=> 'Nutzername des Standardnutzers <small>(maximal 16 Zeichen - alphanumerisch)</small>',
-	'password_form'			=> 'Passwort<br /><small>(für die Anmeldemethode per Webformular)</small>',
-	'persona_connection_email'	=> 'Login E-Mail Adresse<br /><small>(für <a href="https://persona.org/" rel="external">Mozilla Persona</a>)</small>',
-	'allow_anonymous'		=> 'Anonymes lesen der Artikel des Standardnutzers (%s) wird erlaubt',
-	'allow_anonymous_refresh'	=> 'Aktualisieren der Artikel wird anonymen Nutzern erlaubt',
-	'auth_token'			=> 'Authentifizierungs-Token',
-	'explain_token'			=> 'Erlaube den Zugriff auf die RSS-Ausgabe des Standardnutzers ohne Authentifizierung.<br /><kbd>%s?output=rss&amp;token=%s</kbd>',
-	'login_configuration'		=> 'Login',
-	'is_admin'			=> 'ist Administrator',
-	'auth_type'			=> 'Authentifizierungsmethode',
-	'auth_none'			=> 'Keine (gefährlich)',
-	'auth_form'			=> 'Webformular (traditionell, JavaScript wird benötigt)',
-	'http_auth'			=> 'HTTP (mit HTTPS für erfahrene Nutzer)',
-	'auth_persona'			=> 'Mozilla Persona (modern, JavaScript wird benötigt)',
-	'users_list'			=> 'Liste der Nutzer',
-	'create_user'			=> 'Neuen Nutzer erstellen',
-	'username'			=> 'Nutzername',
-	'password'			=> 'Passwort',
-	'create'			=> 'Erstellen',
-	'user_created'			=> 'Nutzer %s wurde erstellt',
-	'user_deleted'			=> 'Nutzer %s wurde gelöscht',
-
-	'language'			=> 'Sprache',
-	'month'				=> 'Monate',
-	'archiving_configuration'	=> 'Archivieren',
-	'delete_articles_every'	=> 'Entfernen von Artikeln nach',
-	'purge_now'			=> 'Jetzt bereinigen',
-	'purge_completed'		=> 'Die Bereinigung ist abgeschlossen (%d Artikel wurden gelöscht)',
-	'archiving_configuration_help'	=> 'Es gibt weitere Optionen bei den Einstellungen der individuellen Nachrichtenströme',
-	'reading_configuration'		=> 'Lesen',
-	'articles_per_page'		=> 'Anzahl der Artikel pro Seite',
-	'default_view'			=> 'Standard-Ansicht',
-	'sort_order'			=> 'Sortierreihenfolge',
-	'auto_load_more'		=> 'Die nächsten Artikel am Seitenende laden',
-	'display_articles_unfolded'	=> 'Die Artikel als Standard zusammen gefaltet anzeigen',
-	'after_onread'			=> 'Nach “als gelesen markieren”',
-	'jump_next'			=> 'springe zum nächsten ungelesenen Geschwisterelement (Feed oder Kategorie)',
-	'reading_icons'			=> 'Lese Symbol',
-	'top_line'			=> 'Kopfzeile',
-	'bottom_line'			=> 'Fusszeile',
-	'html5_notif_timeout'		=> 'HTML5 notification timeout',
-	'seconds_(0_means_no_timeout)'	=> 'seconds (0 means no timeout)',
-	'img_with_lazyload'		=> 'Verwende die "träge laden" Methode zum laden von Bildern',
-	'auto_read_when'		=> 'Artikel als gelesen markieren…',
-	'article_selected'		=> 'wenn der Artikel ausgewählt ist',
-	'article_open_on_website'	=> 'wenn der Artikel auf der Originalwebseite geöffnet ist',
-	'scroll'			=> 'während des Seiten-Scrollens',
-	'upon_reception'		=> 'beim Empfang des Artikels',
-	'your_shaarli'			=> 'Ihr Shaarli',
-	'your_wallabag'			=> 'Ihr wallabag',
-	'your_diaspora_pod'		=> 'Ihr Diaspora* pod',
-	'sharing'			=> 'Teilen',
-	'share'				=> 'teile',
-	'by_email'			=> 'Per E-Mail',
-	'optimize_bdd'			=> 'Datenbank optimieren',
-	'optimize_todo_sometimes'	=> 'Sollte gelegentlich gemacht werden, um die Größe der Datenbank zu reduzieren',
-	'theme'				=> 'Thema',
-	'more_information'		=> 'Weitere Informationen',
-	'activate_sharing'		=> 'Teilen aktivieren',
-	'shaarli'			=> 'Shaarli',
-	'wallabag'			=> 'wallabag',
-	'diaspora'			=> 'Diaspora*',
-	'twitter'			=> 'Twitter',
-	'g+'				=> 'Google+',
-	'facebook'			=> 'Facebook',
-	'email'				=> 'E-Mail',
-	'print'				=> 'Drucken',
-
-	'article'			=> 'Artikel',
-	'title'				=> 'Titel',
-	'author'			=> 'Autor',
-	'publication_date'		=> 'Datum der Veröffentlichung',
-	'by'				=> 'von',
-
-	'load_more'			=> 'Weitere Artikel laden',
-	'nothing_to_load'		=> 'Es gibt keine weiteren Artikel',
-
-	'rss_feeds_of'			=> 'RSS Feed von %s',
-
-	'refresh'			=> 'Aktualisieren',
-	'no_feed_to_refresh'		=> 'Es gibt keinen Feed zum aktualisieren',
-
-	'today'				=> 'Heute',
-	'yesterday'			=> 'Gestern',
-	'before_yesterday'		=> 'vor Gestern',
-	'new_article'			=> 'Es gibt neue Artikel. Bitte klicken Sie hier, um die Seite erneut zu laden.',
-	'by_author'			=> 'Von <em>%s</em>',
-	'related_tags'			=> 'Verwandte tags',
-	'no_feed_to_display'		=> 'Es gibt keinen Artikel zum anzeigen.',
-
-	'about_freshrss'		=> 'Über FreshRSS',
-	'project_website'		=> 'Projekt Webseite',
-	'lead_developer'		=> 'Hauptentwickler',
-	'website'			=> 'Webseite',
-	'bugs_reports'			=> 'Fehlerberichte',
-	'github_or_email'		=> '<a href="https://github.com/marienfressinaud/FreshRSS/issues">auf Github</a> oder <a href="mailto:dev@marienfressinaud.fr">per Mail</a>',
-	'license'			=> 'Lizenz',
-	'agpl3'				=> '<a href="https://www.gnu.org/licenses/agpl-3.0.html">AGPL 3</a>',
-	'freshrss_description'		=> 'FreshRSS ist ein RSS Feedsaggregator zum selbst hosten wie zum Beispiel <a href="http://tontof.net/kriss/feed/">Kriss Feed</a> oder <a href="http://projet.idleman.fr/leed/">Leed</a>. Es ist leicht und einfach zu handhaben und gleichzeitig ein leistungsstark und konfigurierbares Werkzeug.',
-	'credits'			=> 'Credits',
-	'credits_content'		=> 'Einige Designelemente sind von <a href="http://twitter.github.io/bootstrap/">Bootstrap</a> obwohl FreshRSS dieses Framework nicht nutzt. <a href="https://git.gnome.org/browse/gnome-icon-theme-symbolic">Icons</a> sind vom <a href="https://www.gnome.org/">GNOME Projekt</a>. <em>Open Sans</em> Font police wurde von <a href="https://www.google.com/webfonts/specimen/Open+Sans">Steve Matteson erstellt</a>. Favicons wurden mit <a href="https://getfavicon.appspot.com/">getFavicon API gesammelt</a>. FreshRSS basiert auf <a href="https://github.com/marienfressinaud/MINZ">Minz</a>, einem PHP Framework.',
-	'version'			=> 'Version',
-
-	'logs'				=> 'Protokolle',
-	'logs_empty'			=> 'Die Protokolldatei ist leer',
-	'clear_logs'			=> 'Protokolldateien leeren',
-
-	'forbidden_access'		=> 'Der Zugriff ist verboten!',
-	'login_required'		=> 'Das Login ist nötig:',
-
-	'confirm_action'		=> 'Sind Sie sicher, dass Sie diese Aktion durchführen wollen? Die Aktion kann nicht abgebrochen werden!',
-
-	// DATE
-	'january'			=> 'januar',
-	'february'			=> 'februar',
-	'march'				=> 'märz',
-	'april'				=> 'april',
-	'may'				=> 'mai',
-	'june'				=> 'juni',
-	'july'				=> 'juli',
-	'august'			=> 'august',
-	'september'			=> 'september',
-	'october'			=> 'oktober',
-	'november'			=> 'november',
-	'december'			=> 'dezember',
-	// special format for date() function
-	'Jan'				=> '\J\a\n\u\a\r',
-	'Feb'				=> '\F\e\b\r\u\a\r',
-	'Mar'				=> '\M\a\e\r\z',
-	'Apr'				=> '\A\p\r\i\l',
-	'May'				=> '\M\a\i',
-	'Jun'				=> '\J\u\n\i',
-	'Jul'				=> '\J\u\l\i',
-	'Aug'				=> '\A\u\g\u\s\t',
-	'Sep'				=> '\S\e\p\t\e\m\b\e\r',
-	'Oct'				=> '\O\k\t\o\b\e\r',
-	'Nov'				=> '\N\o\v\e\m\b\e\r',
-	'Dec'				=> '\D\e\z\e\m\b\e\r',
-	// format for date() function, %s allows to indicate month in letter
-	'format_date'			=> 'd\.\ %s  Y',
-	'format_date_hour'		=> 'd\.\ %s  Y \u\m H\:i',
-	
-	'status_favorites'		=> 'Favoriten',
-	'status_read'			=> 'Gelesen',
-	'status_unread'			=> 'Ungelesen',
-	'status_total'			=> 'Gesamt',
-	
-	'stats_entry_repartition'	=> 'Verteilung der Einträge',
-	'stats_entry_per_day'		=> 'Einträge pro Tag (während der letzten 30 Tage)',
-	'stats_feed_per_category'	=> 'Feeds pro Kategorie',
-	'stats_entry_per_category'	=> 'Einträge pro Kategorie',
-	'stats_top_feed'		=> 'Top 10 Feeds',
-	'stats_entry_count'		=> 'Zähler für Einträge',
-);
-- 
cgit v1.2.3