Merge branch 'dev' of https://github.com/FreshRSS/FreshRSS into FreshRSS/dev

Alkarex · Alkarex · commit e70d44102c20 · 2018-01-26T10:22:11.000+01:00
diff --git a/app/layout/nav_menu.phtml b/app/layout/nav_menu.phtml
@@ -155,7 +155,7 @@
 				$url_output['params']['hours'] = FreshRSS_Context::$user_conf->since_hours_posts_per_rss;
 			}
 		?>
-		<a class="view_rss btn" target="_blank" rel="noreferrer" title="<?php echo _t('index.menu.rss_view'); ?>" href="<?php echo Minz_Url::display($url_output); ?>">
+		<a class="view-rss btn" target="_blank" rel="noreferrer" title="<?php echo _t('index.menu.rss_view'); ?>" href="<?php echo Minz_Url::display($url_output); ?>">
 			<?php echo _i('rss'); ?>
 		</a>
 	</div>
diff --git a/p/scripts/main.js b/p/scripts/main.js
@@ -705,25 +705,25 @@ function init_shortcuts() {
 	});
 
 	shortcut.add(shortcuts.normal_view, function () {
-		$('#nav_menu_views a').get(0).click();
+		$('#nav_menu_views .view-normal').get(0).click();
 	}, {
 		'disable_in_input': true
 	});
 
 	shortcut.add(shortcuts.global_view, function () {
-		$('#nav_menu_views a').get(1).click();
+		$('#nav_menu_views .view-global').get(0).click();
 	}, {
 		'disable_in_input': true
 	});
 
 	shortcut.add(shortcuts.reading_view, function () {
-		$('#nav_menu_views a').get(2).click();
+		$('#nav_menu_views .view-reader').get(0).click();
 	}, {
 		'disable_in_input': true
 	});
 
 	shortcut.add(shortcuts.rss_view, function () {
-		$('#nav_menu_views a').get(-1).click();
+		$('#nav_menu_views .view-rss').get(0).click();
 	}, {
 		'disable_in_input': true
 	});

Original file line number	Diff line number	Diff line change
`@@ -155,7 +155,7 @@`
`155`	`155`	`$url_output['params']['hours'] = FreshRSS_Context::$user_conf->since_hours_posts_per_rss;`
`156`	`156`	`}`
`157`	`157`	`?>`
`158`		`- <a class="view_rss btn" target="_blank" rel="noreferrer" title="<?php echo _t('index.menu.rss_view'); ?>" href="<?php echo Minz_Url::display($url_output); ?>">`
	`158`	`+ <a class="view-rss btn" target="_blank" rel="noreferrer" title="<?php echo _t('index.menu.rss_view'); ?>" href="<?php echo Minz_Url::display($url_output); ?>">`
`159`	`159`	`<?php echo _i('rss'); ?>`
`160`	`160`	`</a>`
`161`	`161`	`</div>`