Issue #143 : amélioration du formulaire

Suppression radio buttons au profit d'une checkbox

3 files changed, 14 insertions, 16 deletions

diff --git a/app/i18n/en.php b/app/i18n/en.php
index 9e671a386..cd512d1e5 100644
--- a/app/i18n/en.php
+++ b/app/i18n/en.php
@@ -160,7 +160,8 @@ return array (
 	'sort_order'			=> 'Sort order',
 	'auto_load_more'		=> 'Load next articles at the page bottom',
 	'display_articles_unfolded'	=> 'Show articles unfolded by default',
-	'onread_jump_next'    => 'On marked as read jump to next unread sibling',
+	'after_onread'			=> 'After marked as read,',
+	'jump_next'			=> 'jump to next unread sibling',
 	'img_with_lazyload'		=> 'Use "lazy load" mode to load pictures',
 	'auto_read_when'		=> 'Mark as read when',
 	'article_selected'		=> 'article is selected',
diff --git a/app/i18n/fr.php b/app/i18n/fr.php
index a62f26a8e..8756ea490 100644
--- a/app/i18n/fr.php
+++ b/app/i18n/fr.php
@@ -160,7 +160,8 @@ 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',
-	'onread_jump_next'    => 'Après marqué comme lu, sauter au voisin non lu',
+	'after_onread'			=> 'Après marqué comme lu,',
+	'jump_next'			=> 'sauter au prochain voisin non lu',
 	'img_with_lazyload'		=> 'Utiliser le mode "lazy load" pour charger les images',
 	'auto_read_when'		=> 'Marquer comme lu lorsque',
 	'article_selected'		=> 'l\'article est sélectionné',
diff --git a/app/views/configure/display.phtml b/app/views/configure/display.phtml
index 676294047..3d92a0dfc 100644
--- a/app/views/configure/display.phtml
+++ b/app/views/configure/display.phtml
@@ -119,20 +119,6 @@
 		</div>
 
 		<div class="form-group">
-			<label class="group-name"><?php echo Translate::t ('onread_jump_next'); ?></label>
-			<div class="group-controls">
-				<label class="radio" for="onread_jump_next_yes">
-					<input type="radio" name="onread_jump_next" id="onread_jump_next_yes" value="yes"<?php echo $this->conf->onread_jump_next () == 'yes' ? ' checked="checked"' : ''; ?> />
-					<?php echo Translate::t ('yes'); ?><noscript> - <b><?php echo Translate::t ('javascript_should_be_activated'); ?></b></noscript>
-				</label>
-				<label class="radio" for="onread_jump_next_no">
-					<input type="radio" name="onread_jump_next" id="onread_jump_next_no" value="no"<?php echo $this->conf->onread_jump_next () == 'no' ? ' checked="checked"' : ''; ?> />
-					<?php echo Translate::t ('no'); ?>
-				</label>
-			</div>
-		</div>
-
-		<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"' : ''; ?> />
@@ -160,6 +146,16 @@
 			</div>
 		</div>
 
+		<div class="form-group">
+			<label class="group-name"><?php echo 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"' : ''; ?> />
+					<?php echo Translate::t ('jump_next'); ?>
+				</label>
+			</div>
+		</div>
+
 		<legend><?php echo Translate::t ('sharing'); ?></legend>
 		<div class="form-group">
 			<label class="group-name" for="shaarli"><?php echo Translate::t ('your_shaarli'); ?></label>