Design + suppression 2 raccourcis

Les raccourcis page suivante et précédente n'avait plus lieu d'être avec
le mode endless

Petite correction du design pour les formulaire : les labels (float left)
dépassaient des form-group

5 files changed, 11 insertions, 31 deletions

diff --git a/app/models/RSSConfiguration.php b/app/models/RSSConfiguration.php
index 700aedb1f..038ce2a2c 100755
--- a/app/models/RSSConfiguration.php
+++ b/app/models/RSSConfiguration.php
@@ -240,9 +240,7 @@ class RSSConfigurationDAO extends Model_array {
 		'mark_favorite' => 'f',
 		'go_website' => 'space',
 		'next_entry' => 'j',
-		'prev_entry' => 'k',
-		'next_page' => 'right',
-		'prev_page' => 'left',
+		'prev_entry' => 'k'
 	);
 	public $mail_login = '';
 	public $mark_when = array (
diff --git a/app/views/configure/shortcut.phtml b/app/views/configure/shortcut.phtml
index 4c7884234..01e66adb4 100644
--- a/app/views/configure/shortcut.phtml
+++ b/app/views/configure/shortcut.phtml
@@ -54,20 +54,6 @@
 			</div>
 		</div>
 
-		<div class="form-group">
-			<label class="group-name" for="next_page"><?php echo Translate::t ('next_page'); ?></label>
-			<div class="group-controls">
-				<input type="text" id="next_page" name="shortcuts[next_page]" list="keys" value="<?php echo $s['next_page']; ?>" />
-			</div>
-		</div>
-
-		<div class="form-group">
-			<label class="group-name" for="prev_page"><?php echo Translate::t ('previous_page'); ?></label>
-			<div class="group-controls">
-				<input type="text" id="prev_page" name="shortcuts[prev_page]" list="keys" value="<?php echo $s['prev_page']; ?>" />
-			</div>
-		</div>
-
 		<div class="form-group form-actions">
 			<div class="group-controls">
 				<button type="submit" class="btn btn-important"><?php echo Translate::t ('save'); ?></button>
diff --git a/app/views/javascript/main.phtml b/app/views/javascript/main.phtml
index dd17fce36..7ee42b88a 100644
--- a/app/views/javascript/main.phtml
+++ b/app/views/javascript/main.phtml
@@ -302,18 +302,6 @@ function init_shortcuts () {
 	}, {
 		'disable_in_input':true
 	});
-	shortcut.add("<?php echo $s['next_page']; ?>", function () {
-		url = $(".pager-next a").attr ("href");
-		redirect (url, false);
-	}, {
-		'disable_in_input':true
-	});
-	shortcut.add("<?php echo $s['prev_page']; ?>", function () {
-		url = $(".pager-previous a").attr ("href");
-		redirect (url, false);
-	}, {
-		'disable_in_input':true
-	});
 	shortcut.add("<?php echo $s['go_website']; ?>", function () {
 		url_website = $(".flux.active .link a").attr ("href");
 
diff --git a/public/themes/default/global.css b/public/themes/default/global.css
index 0fc0f835e..37192cb22 100644
--- a/public/themes/default/global.css
+++ b/public/themes/default/global.css
@@ -110,8 +110,12 @@ input, select, textarea {
 
 .form-group {
 	margin: 0;
-	clear: both;
 }
+	.form-group:after {
+		content: "";
+		display: block;
+		clear: both;
+	}
 	.form-group.form-actions {
 		min-width: 250px;
 		padding: 5px 0;
diff --git a/public/themes/flat-design/global.css b/public/themes/flat-design/global.css
index f24966b33..e4db6c59f 100644
--- a/public/themes/flat-design/global.css
+++ b/public/themes/flat-design/global.css
@@ -110,9 +110,13 @@ input, select, textarea {
 
 .form-group {
 	margin: 5px 0;
-	clear: both;
 	border: 1px solid transparent;
 }
+	.form-group:after {
+		content: "";
+		display: block;
+		clear: both;
+	}
 	.form-group:hover {
 		background: #fff;
 		border: 1px solid #eee;