Merge branch 'dev' into beta

Conflicts:
	README.fr.md
	README.md

7 files changed, 23 insertions, 23 deletions

diff --git a/app/views/configure/shortcut.phtml b/app/views/configure/shortcut.phtml
index fdbeed3ea..f68091af9 100644
--- a/app/views/configure/shortcut.phtml
+++ b/app/views/configure/shortcut.phtml
@@ -114,7 +114,7 @@
 		<div class="form-group">
 			<label class="group-name" for="close_dropdown_shortcut"><?php echo _t('conf.shortcut.close_dropdown'); ?></label>
 			<div class="group-controls">
-				<input type="text" id="help_shortcut" name="shortcuts[close_dropdown]" list="keys" value="<?php echo $s['close_dropdown']; ?>" />
+				<input type="text" id="close_dropdown" name="shortcuts[close_dropdown]" list="keys" value="<?php echo $s['close_dropdown']; ?>" />
 			</div>
 		</div>
 
diff --git a/app/views/helpers/javascript_vars.phtml b/app/views/helpers/javascript_vars.phtml
index fec3a6f7c..adf0783f3 100644
--- a/app/views/helpers/javascript_vars.phtml
+++ b/app/views/helpers/javascript_vars.phtml
@@ -35,20 +35,20 @@ echo 'var context={',
 "},\n";
 
 echo 'shortcuts={',
-	'mark_read:"', $s['mark_read'], '",',
-	'mark_favorite:"', $s['mark_favorite'], '",',
-	'go_website:"', $s['go_website'], '",',
-	'prev_entry:"', $s['prev_entry'], '",',
-	'next_entry:"', $s['next_entry'], '",',
-	'first_entry:"', $s['first_entry'], '",',
-	'last_entry:"', $s['last_entry'], '",',
-	'collapse_entry:"', $s['collapse_entry'], '",',
-	'load_more:"', $s['load_more'], '",',
-	'auto_share:"', $s['auto_share'], '",',
-	'focus_search:"', $s['focus_search'], '",',
-	'user_filter:"', $s['user_filter'], '",',
-	'help:"', $s['help'], '",',
-	'close_dropdown:"', $s['close_dropdown'], '"',
+	'mark_read:"', @$s['mark_read'], '",',
+	'mark_favorite:"', @$s['mark_favorite'], '",',
+	'go_website:"', @$s['go_website'], '",',
+	'prev_entry:"', @$s['prev_entry'], '",',
+	'next_entry:"', @$s['next_entry'], '",',
+	'first_entry:"', @$s['first_entry'], '",',
+	'last_entry:"', @$s['last_entry'], '",',
+	'collapse_entry:"', @$s['collapse_entry'], '",',
+	'load_more:"', @$s['load_more'], '",',
+	'auto_share:"', @$s['auto_share'], '",',
+	'focus_search:"', @$s['focus_search'], '",',
+	'user_filter:"', @$s['user_filter'], '",',
+	'help:"', @$s['help'], '",',
+	'close_dropdown:"', @$s['close_dropdown'], '"',
 "},\n";
 
 echo 'url={',
@@ -60,8 +60,9 @@ echo 'url={',
 
 echo 'i18n={',
 	'confirmation_default:"', _t('gen.js.confirm_action'), '",',
-	'notif_title_articles:"', _t('gen.js.notif_title_new_articles'), '",',
-	'notif_body_articles:"', _t('gen.js.notif_body_new_articles'), '",',
+	'notif_title_articles:"', _t('gen.js.feedback.title_new_articles'), '",',
+	'notif_body_articles:"', _t('gen.js.feedback.body_new_articles'), '",',
+	'notif_request_failed:"', _t('gen.js.feedback.request_failed'), '",',
 	'category_empty:"', _t('gen.js.category_empty'), '"',
 "},\n";
 
diff --git a/app/views/index/about.phtml b/app/views/index/about.phtml
index ff2c538a2..3fdb5160d 100644
--- a/app/views/index/about.phtml
+++ b/app/views/index/about.phtml
@@ -7,11 +7,8 @@
 		<dt><?php echo _t('index.about.project_website'); ?></dt>
 		<dd><a href="<?php echo FRESHRSS_WEBSITE; ?>"><?php echo FRESHRSS_WEBSITE; ?></a></dd>
 
-		<dt><?php echo _t('index.about.lead_developer'); ?></dt>
-		<dd><a href="mailto:contact@marienfressinaud.fr">Marien Fressinaud</a> — <a href="http://marienfressinaud.fr"><?php echo _t('index.about.website'); ?></a></dd>
-
 		<dt><?php echo _t('index.about.bugs_reports'); ?></dt>
-		<dd><?php echo _t('index.about.github_or_email'); ?></dd>
+		<dd><?php echo _t('index.about.github'); ?></dd>
 
 		<dt><?php echo _t('index.about.license'); ?></dt>
 		<dd><?php echo _t('index.about.agpl3'); ?></dd>
diff --git a/app/views/index/global.phtml b/app/views/index/global.phtml
index cf95bd0f5..0ffa3bc54 100644
--- a/app/views/index/global.phtml
+++ b/app/views/index/global.phtml
@@ -13,7 +13,7 @@
 <?php
 	$url_base = array(
 		'c' => 'index',
-		'a' => 'index',
+		'a' => 'normal',
 		'params' => Minz_Request::params()
 	);
 
diff --git a/app/views/subscription/index.phtml b/app/views/subscription/index.phtml
index b9e40988c..331e8244e 100644
--- a/app/views/subscription/index.phtml
+++ b/app/views/subscription/index.phtml
@@ -7,7 +7,7 @@
 
 	<form id="add_rss" method="post" action="<?php echo _url('feed', 'add'); ?>" autocomplete="off">
 		<div class="stick">
-			<input type="url" name="url_rss" class="extend" placeholder="<?php echo _t('sub.feed.add'); ?>" />
+			<input type="url" name="url_rss" class="long" placeholder="<?php echo _t('sub.feed.add'); ?>" />
 			<div class="dropdown">
 				<div id="dropdown-cat" class="dropdown-target"></div>
 
diff --git a/app/views/user/manage.phtml b/app/views/user/manage.phtml
index 11562093e..fe1b6618b 100644
--- a/app/views/user/manage.phtml
+++ b/app/views/user/manage.phtml
@@ -32,6 +32,7 @@
 					<input type="password" id="new_user_passwordPlain" name="new_user_passwordPlain" autocomplete="off" pattern=".{7,}" />
 					<a class="btn toggle-password" data-toggle="new_user_passwordPlain"><?php echo _i('key'); ?></a>
 				</div>
+				<?php echo _i('help'); ?> <?php echo _t('admin.user.password_format'); ?>
 				<noscript><b><?php echo _t('gen.js.should_be_activated'); ?></b></noscript>
 			</div>
 		</div>
diff --git a/app/views/user/profile.phtml b/app/views/user/profile.phtml
index 4e61664bc..c44202edd 100644
--- a/app/views/user/profile.phtml
+++ b/app/views/user/profile.phtml
@@ -24,6 +24,7 @@
 					<input type="password" id="passwordPlain" name="passwordPlain" autocomplete="off" pattern=".{7,}" <?php echo cryptAvailable() ? '' : 'disabled="disabled" '; ?>/>
 					<a class="btn toggle-password" data-toggle="passwordPlain"><?php echo _i('key'); ?></a>
 				</div>
+				<?php echo _i('help'); ?> <?php echo _t('conf.profile.password_format'); ?>
 				<noscript><b><?php echo _t('gen.js.should_be_activated'); ?></b></noscript>
 			</div>
 		</div>