Option globale pour la taille minimale de l'historique par défaut

Plus une réorganisation des options

5 files changed, 16 insertions, 2 deletions

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;