Merge branch 'dev' into beta

Conflicts:
	README.fr.md
	README.md

7 files changed, 32 insertions, 12 deletions

diff --git a/p/f.php b/p/f.php
index fefbf9a10..c904e1fcb 100644
--- a/p/f.php
+++ b/p/f.php
@@ -4,6 +4,7 @@ require('../constants.php');
 
 include(LIB_PATH . '/Favicon/Favicon.php');
 include(LIB_PATH . '/Favicon/DataAccess.php');
+require(LIB_PATH . '/http-conditional.php');
 
 
 $favicons_dir = DATA_PATH . '/favicons/';
@@ -46,10 +47,13 @@ function download_favicon($website, $dest) {
 function show_default_favicon() {
 	global $default_favicon;
 
-	header('HTTP/1.1 404 Not Found');
-	header('Content-Type: image/ico');
-	readfile($default_favicon);
-	die();
+	header('Content-Type: image/x-icon');
+	header('Content-Disposition: inline; filename="default_favicon.ico"');
+
+	$default_mtime = @filemtime($default_favicon);
+	if (!httpConditional($default_mtime, 2592000, 2)) {
+		readfile($default_favicon);
+	}
 }
 
 
@@ -64,19 +68,22 @@ $ico = $favicons_dir . $id . '.ico';
 $ico_mtime = @filemtime($ico);
 $txt_mtime = @filemtime($txt);
 
-if (($ico_mtime == false) || ($txt_mtime > $ico_mtime)) {
+
+if ($ico_mtime == false || $txt_mtime > $ico_mtime) {
 	if ($txt_mtime == false) {
 		show_default_favicon();
+		return;
 	}
 
+	// no ico file or we should download a new one.
 	$url = file_get_contents($txt);
 	if (!download_favicon($url, $ico)) {
+		// Download failed, show the default favicon
 		show_default_favicon();
+		return;
 	}
 }
 
-require(LIB_PATH . '/http-conditional.php');
-
 header('Content-Type: image/x-icon');
 header('Content-Disposition: inline; filename="' . $id . '.ico"');
 
diff --git a/p/scripts/main.js b/p/scripts/main.js
index 9b6524b01..1be75bb12 100644
--- a/p/scripts/main.js
+++ b/p/scripts/main.js
@@ -155,6 +155,9 @@ function mark_read(active, only_not_read) {
 		faviconNbUnread();
 
 		pending_feeds.splice(index_pending, 1);
+	}).fail(function (data) {
+		openNotification(i18n.notif_request_failed, 'bad');
+		pending_feeds.splice(index_pending, 1);
 	});
 }
 
@@ -210,6 +213,9 @@ function mark_favorite(active) {
 		}
 
 		pending_feeds.splice(index_pending, 1);
+	}).fail(function (data) {
+		openNotification(i18n.notif_request_failed, 'bad');
+		pending_feeds.splice(index_pending, 1);
 	});
 }
 
@@ -513,7 +519,7 @@ function init_column_categories() {
 		if ($(this).nextAll('.dropdown-menu').length === 0) {
 			var feed_id = $(this).closest('.item').attr('id').substr(2),
 				feed_web = $(this).data('fweb'),
-				template = $('#feed_config_template').html().replace(/!!!!!!/g, feed_id).replace('http://example.net/', feed_web);
+				template = $('#feed_config_template').html().replace(/------/g, feed_id).replace('http://example.net/', feed_web);
 			$(this).attr('href', '#dropdown-' + feed_id).prev('.dropdown-target').attr('id', 'dropdown-' + feed_id).parent().append(template);
 		}
 	});
diff --git a/p/themes/BlueLagoon/README.md b/p/themes/BlueLagoon/README.md
index 62afc234b..a83dd6743 100644
--- a/p/themes/BlueLagoon/README.md
+++ b/p/themes/BlueLagoon/README.md
@@ -1,7 +1,7 @@
 Blue Lagoon
 =======
 
-**C'est un cocktail (bis)! C'est la version plus "fresh" de [Screwdriver](https://github.com/misterair/Screwdriver). C'est... c'est... un thème pour l'agrégateur de flux RSS [FreshRSS](https://github.com/marienfressinaud/FreshRSS/)**
+**C'est un cocktail (bis)! C'est la version plus "fresh" de [Screwdriver](https://github.com/misterair/Screwdriver). C'est... c'est... un thème pour l'agrégateur de flux RSS [FreshRSS](https://github.com/FreshRSS/FreshRSS/)**
 
 
 En toute modestie, ce thème tue du Nyan Cat.
diff --git a/p/themes/Dark/dark.css b/p/themes/Dark/dark.css
index dd7502f25..cd2f85ebf 100644
--- a/p/themes/Dark/dark.css
+++ b/p/themes/Dark/dark.css
@@ -879,6 +879,12 @@ a.btn {
 	border-radius: 3px;
 }
 
+/*=== Slider */
+#slider {
+	background-color: #1c1c1c;
+	border-left: 1px solid #666;
+}
+
 /*=== DIVERS */
 /*===========*/
 .aside.aside_feed .nav-form input,
diff --git a/p/themes/Screwdriver/README.md b/p/themes/Screwdriver/README.md
index 4b10eb90f..385e1dc71 100644
--- a/p/themes/Screwdriver/README.md
+++ b/p/themes/Screwdriver/README.md
@@ -1,7 +1,7 @@
 Screwdriver 
 =======
 
-**C'est un cocktail! C'est chaud mais "fresh" à la fois. C'est... c'est... un thème pour l'agrégateur de flux RSS<a href="https://github.com/marienfressinaud/FreshRSS/" target="blank">FreshRSS</a>!!**
+**C'est un cocktail! C'est chaud mais "fresh" à la fois. C'est... c'est... un thème pour l'agrégateur de flux RSS<a href="https://github.com/FreshRSS/FreshRSS/" target="blank">FreshRSS</a>!!**
 En toute modestie, ce thème tue du chaton.
 
 ![screenshot](https://github.com/misterair/Screwdriver/blob/master/screenshot.png)
diff --git a/p/themes/base-theme/README.md b/p/themes/base-theme/README.md
index 6f186e15c..9f7d635ca 100644
--- a/p/themes/base-theme/README.md
+++ b/p/themes/base-theme/README.md
@@ -8,5 +8,5 @@ A base theme for [FreshRSS](http://freshrss.org)
 3. Choose your new theme in FreshRSS configuration
 4. Enjoy your wonderful theme!
 
-Don't hesitate to share your theme with us [on Github](https://github.com/marienfressinaud/FreshRSS/issues) :)
+Don't hesitate to share your theme with us [on Github](https://github.com/FreshRSS/FreshRSS/issues) :)
 
diff --git a/p/themes/base-theme/template.css b/p/themes/base-theme/template.css
index 25f206106..a299a5ddf 100644
--- a/p/themes/base-theme/template.css
+++ b/p/themes/base-theme/template.css
@@ -75,6 +75,7 @@ input {
 }
 textarea,
 input[type="file"],
+input.long,
 input.extend:focus {
 	width: 300px;
 }
@@ -485,7 +486,7 @@ a.btn {
 	text-decoration: none;
 }
 .flux .item.date {
-	width: 145px;
+	width: 155px;
 	text-align: right;
 	overflow: hidden;
 }