From 87bfa195a6ff4ff73baadd3c04b7b6f28c9f9b73 Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Tue, 24 Dec 2013 01:21:11 +0100
Subject: Permet de configurer plus finement le nombre d’articles minimum à
 conserver par flux
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/configure/display.phtml | 29 +++++++++++++++++++++--------
 app/views/configure/feed.phtml    | 22 ++++++++++++++++++----
 2 files changed, 39 insertions(+), 12 deletions(-)

(limited to 'app/views/configure')

diff --git a/app/views/configure/display.phtml b/app/views/configure/display.phtml
index ad35d7c71..68ef26bbf 100644
--- a/app/views/configure/display.phtml
+++ b/app/views/configure/display.phtml
@@ -31,13 +31,6 @@
 			</div>
 		</div>
 
-		<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" value="<?php echo $this->conf->oldEntries (); ?>" /> <?php echo Minz_Translate::t ('month'); ?>
-			</div>
-		</div>
-
 		<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 (); ?>
@@ -59,7 +52,27 @@
 				<?php echo FreshRSS_Themes::icon('help'); ?> <?php echo Minz_Translate::t('explain_token', Minz_Url::display(null, 'html', true), $token); ?>
 			</div>
 		</div>
-	
+
+		<legend><?php echo Minz_Translate::t ('archiving_configuration'); ?></legend>
+
+		<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'); ?>
+			</div>
+		</div>
+
 		<legend><?php echo Minz_Translate::t ('reading_configuration'); ?></legend>
 
 		<div class="form-group">
diff --git a/app/views/configure/feed.phtml b/app/views/configure/feed.phtml
index 4504b8d76..3fe7d1b3a 100644
--- a/app/views/configure/feed.phtml
+++ b/app/views/configure/feed.phtml
@@ -52,6 +52,9 @@
 				</select>
 			</div>
 		</div>
+
+		<legend><?php echo Minz_Translate::t ('archiving_configuration'); ?></legend>
+
 		<div class="form-group">
 			<label class="group-name"></label>
 			<div class="group-controls">
@@ -64,10 +67,21 @@
 			<label class="group-name"><?php echo Minz_Translate::t ('number_articles'); ?></label>
 			<div class="group-controls">
 				<span class="control"><?php echo $this->flux->nbEntries (); ?></span>
-				<label class="checkbox" for="keep_history">
-					<input type="checkbox" name="keep_history" id="keep_history" value="yes"<?php echo $this->flux->keepHistory () == 'yes' ? ' checked="checked"' : ''; ?> />
-					<?php echo Minz_Translate::t ('keep_history'); ?>
-				</label>
+			</div>
+		</div>
+		<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'); ?>
 			</div>
 		</div>
 		<div class="form-group">
-- 
cgit v1.2.3