3 files changed, 14 insertions, 3 deletions

diff --git a/themes/_global/js/keyboard.js b/themes/_global/js/keyboard.js
index 4469248d..04000f47 100644
--- a/themes/_global/js/keyboard.js
+++ b/themes/_global/js/keyboard.js
@@ -63,6 +63,9 @@ function actionArticle(id) {
       case 77:
         markReadArticle(id); // m key letter
       break;
+      case 78:
+        markReadAndNextArticle(id); // n letter
+      break;
     }
 
   }, false);
@@ -86,6 +89,12 @@ function markReadArticle(id) {
   }
 }
 
+function markReadAndNextArticle(id) {
+   if (id) {
+          window.location = window.location.origin + window.location.pathname + '?action=archive_and_next&id=' + id;
+  }
+}
+
 function homeNavigation() {
   selectedArticle = $('.entrie:first');
   window.addEventListener("keydown", function (event) {
@@ -144,5 +153,7 @@ function goSelectPrev(selectedArticle,number) {
 }
 
 function enterArticle(selectedArticle) {
-  window.location = selectedArticle.find('a:first').attr('href');
+  if (!$("#bagit").hasClass("current")) {
+    window.location = selectedArticle.find('a:first').attr('href');
+  }
 }
\ No newline at end of file
diff --git a/themes/baggy/config.twig b/themes/baggy/config.twig
index 2e40178e..6f55cd75 100755
--- a/themes/baggy/config.twig
+++ b/themes/baggy/config.twig
@@ -17,7 +17,7 @@
             <h3>{% trans "Browser Addons" %}</h3>
             <ul>
                 <li><a href="https://addons.mozilla.org/firefox/addon/wallabag/" target="_blank">{% trans "Standard Firefox Add-On" %}</a></li>
-                <li><button onclick="activateSocialFeature(this)">{% trans "Mozilla Services (Social API) Extension" %}</button></li>
+                {% if https %}<li><button onclick="activateSocialFeature(this)">{% trans "Mozilla Services (Social API) Extension" %}</button></li>{% else %}<li>{% trans "Mozilla Services (Social API) Extension needs an https connection" %}</li>{% endif %}
                 <li><a href="https://chrome.google.com/webstore/detail/wallabag/bepdcjnnkglfjehplaogpoonpffbdcdj" target="_blank">{% trans "Chrome Extension" %}</a></li>
             </ul>
             <h3>{% trans "Mobile Apps" %}</h3>
diff --git a/themes/default/config.twig b/themes/default/config.twig
index e39826c3..24e3e570 100755
--- a/themes/default/config.twig
+++ b/themes/default/config.twig
@@ -17,7 +17,7 @@
             <h3>Browser Plugins</h3>
             <ul>
                 <li><a href="https://addons.mozilla.org/firefox/addon/wallabag/" target="_blank">{% trans "Standard Firefox Add-On" %}</a></li>
-                <li><button onclick="activateSocialFeature(this)">{% trans "Mozilla Services (Social API) Extension" %}</button></li>
+                {% if https %}<li><button onclick="activateSocialFeature(this)">{% trans "Mozilla Services (Social API) Extension" %}</button></li>{% else %}<li>{% trans "Mozilla Services (Social API) Extension needs an https connection" %}</li>{% endif %}
                 <li><a href="https://chrome.google.com/webstore/detail/wallabag/bepdcjnnkglfjehplaogpoonpffbdcdj" target="_blank">{% trans "Chrome Extension" %}</a></li>
             </ul>
             <h3>Mobile Apps</h3>