From 7bbb273c1cccddd1208fc4ccc39995080a5203c3 Mon Sep 17 00:00:00 2001
From: rugk <rugk@posteo.de>
Date: Tue, 25 Oct 2016 21:13:43 +0200
Subject: [PATCH 1/7] Add "JS not working" error message

It is:
* hidden by JS code executed as early as possible
* not hidden by noscript tags, so that it is *not* shown when JavaScript is just no activated

Fix https://github.com/PrivateBin/PrivateBin/issues/103
---
 css/noscript.css            | 15 +++++++++++++++
 css/privatebin.css          | 14 +++++++-------
 js/privatebin.js            |  5 +++++
 tpl/bootstrap-compact.php   |  2 +-
 tpl/bootstrap-dark-page.php |  2 +-
 tpl/bootstrap-dark.php      |  2 +-
 tpl/bootstrap-page.php      |  2 +-
 tpl/bootstrap.php           |  6 ++++--
 tpl/page.php                |  2 +-
 9 files changed, 36 insertions(+), 14 deletions(-)
 create mode 100644 css/noscript.css

diff --git a/css/noscript.css b/css/noscript.css
new file mode 100644
index 00000000..97ef60d5
--- /dev/null
+++ b/css/noscript.css
@@ -0,0 +1,15 @@
+/**
+ * PrivateBin
+ *
+ * CSS file only loaded when no JavaScript available.
+ *
+ * @link      https://github.com/PrivateBin/PrivateBin
+ * @copyright 2012 Sébastien SAUVAGE (sebsauvage.net)
+ * @license   https://www.opensource.org/licenses/zlib-license.php The zlib/libpng License
+ * @version   1.0
+ */
+
+/* When there is no script at all other */
+.noscript-hide {
+	display: none;
+}
diff --git a/css/privatebin.css b/css/privatebin.css
index 5a6d80d6..fa97c89c 100644
--- a/css/privatebin.css
+++ b/css/privatebin.css
@@ -1,7 +1,7 @@
 /**
  * PrivateBin
  *
- * a zero-knowledge paste bin
+ * Main CSS file.
  *
  * @link      https://github.com/PrivateBin/PrivateBin
  * @copyright 2012 Sébastien SAUVAGE (sebsauvage.net)
@@ -161,7 +161,7 @@ button, .button {
 	background-clip: padding-box;
 }
 
-button:hover  { 
+button:hover  {
 	background-image: linear-gradient(bottom, #424b57 0%, #61707e 100%);
 	background-image: -o-linear-gradient(bottom, #424b57 0%, #61707e 100%);
 	background-image: -moz-linear-gradient(bottom, #424b57 0%, #61707e 100%);
@@ -193,8 +193,8 @@ button img {
 	top: 2px;
 }
 
-.button { 
-	background-color: #414d5a; 
+.button {
+	background-color: #414d5a;
 	padding: 6px 8px;
 	margin: 0 5px 0 0;
 	position: relative;
@@ -218,7 +218,7 @@ button img {
 }
 
 #remainingtime, #password {
-	color: #94a3b4; 
+	color: #94a3b4;
 	display: inline;
 	font-size: 0.85em;
 }
@@ -298,7 +298,7 @@ h4.title {
 	font-size: 1.2em;
 	color: #94a3b4;
 	font-style: italic;
-	font-weight: bold; 
+	font-weight: bold;
 	position: relative;
 	margin-left: 30px;
 }
@@ -356,7 +356,7 @@ h4.title {
 	background-clip: padding-box;
 }
 
-.comment button:hover  { 
+.comment button:hover  {
 	background-image: linear-gradient(bottom, #ccd 0, #fff 100%);
 	background-image: -o-linear-gradient(bottom, #ccd 0, #fff 100%);
 	background-image: -moz-linear-gradient(bottom, #ccd 0, #fff 100%);
diff --git a/js/privatebin.js b/js/privatebin.js
index faf09602..b6d104dc 100644
--- a/js/privatebin.js
+++ b/js/privatebin.js
@@ -20,6 +20,11 @@
 /** global: showdown */
 /** global: sjcl */
 
+$(document).ready(function() {
+    // hide "no javascript" message as early as possible
+    $('#noscript').hide();
+})
+
 // Immediately start random number generator collector.
 sjcl.random.startCollectors();
 
diff --git a/tpl/bootstrap-compact.php b/tpl/bootstrap-compact.php
index 657b5788..b4790be7 100644
--- a/tpl/bootstrap-compact.php
+++ b/tpl/bootstrap-compact.php
@@ -52,7 +52,7 @@ if ($MARKDOWN):
 <?php
 endif;
 ?>
-		<script type="text/javascript" src="js/privatebin.js?<?php echo rawurlencode($VERSION); ?>" integrity="sha512-h/cw2lgocVvgjmYWShhbnz5nSzyUv4rVY1JgN7vmkZq8VJX9KVXPoC7oYX+YGFk+0FYw+c/uofVW9yyU5TJv+w==" crossorigin="anonymous"></script>
+		<script type="text/javascript" src="js/privatebin.js?<?php echo rawurlencode($VERSION); ?>" integrity="sha512-tnG2Ai1USFqZM26ChISDXXq5YCpc4ae760JPSoN1wFLcu8wgu1VuOeZztWme9naCTgWRpOHSlg2PnvQbgoCjIg==" crossorigin="anonymous"></script>
 		<!--[if lt IE 10]>
 		<style type="text/css">body {padding-left:60px;padding-right:60px;} #ienotice {display:block;} #oldienotice {display:block;}</style>
 		<![endif]-->
diff --git a/tpl/bootstrap-dark-page.php b/tpl/bootstrap-dark-page.php
index b57e880e..14676c01 100644
--- a/tpl/bootstrap-dark-page.php
+++ b/tpl/bootstrap-dark-page.php
@@ -52,7 +52,7 @@ if ($MARKDOWN):
 <?php
 endif;
 ?>
-		<script type="text/javascript" src="js/privatebin.js?<?php echo rawurlencode($VERSION); ?>" integrity="sha512-h/cw2lgocVvgjmYWShhbnz5nSzyUv4rVY1JgN7vmkZq8VJX9KVXPoC7oYX+YGFk+0FYw+c/uofVW9yyU5TJv+w==" crossorigin="anonymous"></script>
+		<script type="text/javascript" src="js/privatebin.js?<?php echo rawurlencode($VERSION); ?>" integrity="sha512-tnG2Ai1USFqZM26ChISDXXq5YCpc4ae760JPSoN1wFLcu8wgu1VuOeZztWme9naCTgWRpOHSlg2PnvQbgoCjIg==" crossorigin="anonymous"></script>
 		<!--[if lt IE 10]>
 		<style type="text/css">body {padding-left:60px;padding-right:60px;} #ienotice {display:block;} #oldienotice {display:block;}</style>
 		<![endif]-->
diff --git a/tpl/bootstrap-dark.php b/tpl/bootstrap-dark.php
index 9ceb15f7..2da3d02f 100644
--- a/tpl/bootstrap-dark.php
+++ b/tpl/bootstrap-dark.php
@@ -52,7 +52,7 @@ if ($MARKDOWN):
 <?php
 endif;
 ?>
-		<script type="text/javascript" src="js/privatebin.js?<?php echo rawurlencode($VERSION); ?>" integrity="sha512-h/cw2lgocVvgjmYWShhbnz5nSzyUv4rVY1JgN7vmkZq8VJX9KVXPoC7oYX+YGFk+0FYw+c/uofVW9yyU5TJv+w==" crossorigin="anonymous"></script>
+		<script type="text/javascript" src="js/privatebin.js?<?php echo rawurlencode($VERSION); ?>" integrity="sha512-tnG2Ai1USFqZM26ChISDXXq5YCpc4ae760JPSoN1wFLcu8wgu1VuOeZztWme9naCTgWRpOHSlg2PnvQbgoCjIg==" crossorigin="anonymous"></script>
 		<!--[if lt IE 10]>
 		<style type="text/css">body {padding-left:60px;padding-right:60px;} #ienotice {display:block;} #oldienotice {display:block;}</style>
 		<![endif]-->
diff --git a/tpl/bootstrap-page.php b/tpl/bootstrap-page.php
index fe49a3fd..235f4877 100644
--- a/tpl/bootstrap-page.php
+++ b/tpl/bootstrap-page.php
@@ -52,7 +52,7 @@ if ($MARKDOWN):
 <?php
 endif;
 ?>
-		<script type="text/javascript" src="js/privatebin.js?<?php echo rawurlencode($VERSION); ?>" integrity="sha512-h/cw2lgocVvgjmYWShhbnz5nSzyUv4rVY1JgN7vmkZq8VJX9KVXPoC7oYX+YGFk+0FYw+c/uofVW9yyU5TJv+w==" crossorigin="anonymous"></script>
+		<script type="text/javascript" src="js/privatebin.js?<?php echo rawurlencode($VERSION); ?>" integrity="sha512-tnG2Ai1USFqZM26ChISDXXq5YCpc4ae760JPSoN1wFLcu8wgu1VuOeZztWme9naCTgWRpOHSlg2PnvQbgoCjIg==" crossorigin="anonymous"></script>
 		<!--[if lt IE 10]>
 		<style type="text/css">body {padding-left:60px;padding-right:60px;} #ienotice {display:block;} #oldienotice {display:block;}</style>
 		<![endif]-->
diff --git a/tpl/bootstrap.php b/tpl/bootstrap.php
index 56150908..cd9a787a 100644
--- a/tpl/bootstrap.php
+++ b/tpl/bootstrap.php
@@ -52,7 +52,7 @@ if ($MARKDOWN):
 <?php
 endif;
 ?>
-		<script type="text/javascript" src="js/privatebin.js?<?php echo rawurlencode($VERSION); ?>" integrity="sha512-h/cw2lgocVvgjmYWShhbnz5nSzyUv4rVY1JgN7vmkZq8VJX9KVXPoC7oYX+YGFk+0FYw+c/uofVW9yyU5TJv+w==" crossorigin="anonymous"></script>
+		<script type="text/javascript" src="js/privatebin.js?<?php echo rawurlencode($VERSION); ?>" integrity="sha512-tnG2Ai1USFqZM26ChISDXXq5YCpc4ae760JPSoN1wFLcu8wgu1VuOeZztWme9naCTgWRpOHSlg2PnvQbgoCjIg==" crossorigin="anonymous"></script>
 		<!--[if lt IE 10]>
 		<style type="text/css">body {padding-left:60px;padding-right:60px;} #ienotice {display:block;} #oldienotice {display:block;}</style>
 		<![endif]-->
@@ -279,7 +279,9 @@ if (!strlen($ERROR)):
 ?>hidden <?php
 endif;
 ?>alert alert-danger"><span class="glyphicon glyphicon-alert" aria-hidden="true"></span> <?php echo htmlspecialchars($ERROR); ?></div>
-			<noscript><div id="noscript" role="alert" class="nonworking alert alert-warning"><span class="glyphicon glyphicon-exclamation-sign" aria-hidden="true"></span> <?php echo I18n::_('Javascript is required for PrivateBin to work.<br />Sorry for the inconvenience.'); ?></div></noscript>
+			<noscript><div id="noscript" role="alert" class="nonworking alert alert-warning"><span class="glyphicon glyphicon-exclamation-sign" aria-hidden="true"></span> <?php echo I18n::_('JavaScript is required for PrivateBin to work.<br />Sorry for the inconvenience.'); ?></div></noscript>
+			<div id="noscript" role="alert" class="nonworking alert alert-warning noscript-hide"><span class="glyphicon glyphicon-exclamation-sign" aria-hidden="true"></span> <?php echo I18n::_('The required JavaScripts for PrivateBin could not be loaded. This might <br />Please see <a href="">this FAQ for more information</a>.'); ?></div>
+			<noscript><link type="text/css" rel="stylesheet" href="css/noscript.css" /></noscript>
 			<div id="oldienotice" role="alert" class="hidden nonworking alert alert-danger"><span class="glyphicon glyphicon-alert" aria-hidden="true"></span> <?php echo I18n::_('PrivateBin requires a modern browser to work.'); ?></div>
 			<div id="ienotice" role="alert" class="hidden alert alert-warning"><span class="glyphicon glyphicon-question-sign" aria-hidden="true"></span> <?php echo I18n::_('Still using Internet Explorer? Do yourself a favor, switch to a modern browser:'), PHP_EOL; ?>
 				<a href="https://www.mozilla.org/firefox/">Firefox</a>,
diff --git a/tpl/page.php b/tpl/page.php
index b4d12322..b48db34e 100644
--- a/tpl/page.php
+++ b/tpl/page.php
@@ -47,7 +47,7 @@ if ($MARKDOWN):
 <?php
 endif;
 ?>
-		<script type="text/javascript" src="js/privatebin.js?<?php echo rawurlencode($VERSION); ?>" integrity="sha512-h/cw2lgocVvgjmYWShhbnz5nSzyUv4rVY1JgN7vmkZq8VJX9KVXPoC7oYX+YGFk+0FYw+c/uofVW9yyU5TJv+w==" crossorigin="anonymous"></script>
+		<script type="text/javascript" src="js/privatebin.js?<?php echo rawurlencode($VERSION); ?>" integrity="sha512-tnG2Ai1USFqZM26ChISDXXq5YCpc4ae760JPSoN1wFLcu8wgu1VuOeZztWme9naCTgWRpOHSlg2PnvQbgoCjIg==" crossorigin="anonymous"></script>
 		<!--[if lt IE 10]>
 		<style type="text/css">body {padding-left:60px;padding-right:60px;} #ienotice {display:block;} #oldienotice {display:block;}</style>
 		<![endif]-->

From f9149595c9a1344be54193e70d66a6fa0ecc49e7 Mon Sep 17 00:00:00 2001
From: rugk <rugk@posteo.de>
Date: Mon, 31 Oct 2016 12:20:07 +0100
Subject: [PATCH 2/7] Change alert to loading info message

---
 css/bootstrap/privatebin.css | 4 ++++
 css/privatebin.css           | 6 +++++-
 js/privatebin.js             | 5 -----
 tpl/bootstrap-compact.php    | 2 +-
 tpl/bootstrap-dark-page.php  | 2 +-
 tpl/bootstrap-dark.php       | 2 +-
 tpl/bootstrap-page.php       | 2 +-
 tpl/bootstrap.php            | 9 +++++++--
 tpl/page.php                 | 2 +-
 9 files changed, 21 insertions(+), 13 deletions(-)

diff --git a/css/bootstrap/privatebin.css b/css/bootstrap/privatebin.css
index b26421b4..e63e63fe 100644
--- a/css/bootstrap/privatebin.css
+++ b/css/bootstrap/privatebin.css
@@ -98,6 +98,10 @@ body.navbar-spacing {
 	margin-bottom: 10px;
 }
 
+.smallErrorText {
+	font-size: 80%;
+}
+
 .comment {
 	border-left: 1px solid #ccc;
 	padding: 5px 0 5px 10px;
diff --git a/css/privatebin.css b/css/privatebin.css
index fa97c89c..0fa76234 100644
--- a/css/privatebin.css
+++ b/css/privatebin.css
@@ -117,7 +117,7 @@ h3.title {
 #pasteresult { 
 	background-color: #1F2833;
 	color: #fff;
-	padding: 4px 12px; 
+	padding: 4px 12px;
 	clear: both;
 	-moz-box-shadow: inset 0 2px 2px #000;
 	-webkit-box-shadow: inset 0 2px 2px #000;
@@ -285,6 +285,10 @@ input {
 	color:#ff0;
 }
 
+.smallErrorText {
+	font-size: 80%;
+}
+
 /* --- discussion related CSS ------- */
 
 #discussion {  /* Discussion container */
diff --git a/js/privatebin.js b/js/privatebin.js
index b6d104dc..faf09602 100644
--- a/js/privatebin.js
+++ b/js/privatebin.js
@@ -20,11 +20,6 @@
 /** global: showdown */
 /** global: sjcl */
 
-$(document).ready(function() {
-    // hide "no javascript" message as early as possible
-    $('#noscript').hide();
-})
-
 // Immediately start random number generator collector.
 sjcl.random.startCollectors();
 
diff --git a/tpl/bootstrap-compact.php b/tpl/bootstrap-compact.php
index b4790be7..657b5788 100644
--- a/tpl/bootstrap-compact.php
+++ b/tpl/bootstrap-compact.php
@@ -52,7 +52,7 @@ if ($MARKDOWN):
 <?php
 endif;
 ?>
-		<script type="text/javascript" src="js/privatebin.js?<?php echo rawurlencode($VERSION); ?>" integrity="sha512-tnG2Ai1USFqZM26ChISDXXq5YCpc4ae760JPSoN1wFLcu8wgu1VuOeZztWme9naCTgWRpOHSlg2PnvQbgoCjIg==" crossorigin="anonymous"></script>
+		<script type="text/javascript" src="js/privatebin.js?<?php echo rawurlencode($VERSION); ?>" integrity="sha512-h/cw2lgocVvgjmYWShhbnz5nSzyUv4rVY1JgN7vmkZq8VJX9KVXPoC7oYX+YGFk+0FYw+c/uofVW9yyU5TJv+w==" crossorigin="anonymous"></script>
 		<!--[if lt IE 10]>
 		<style type="text/css">body {padding-left:60px;padding-right:60px;} #ienotice {display:block;} #oldienotice {display:block;}</style>
 		<![endif]-->
diff --git a/tpl/bootstrap-dark-page.php b/tpl/bootstrap-dark-page.php
index 14676c01..b57e880e 100644
--- a/tpl/bootstrap-dark-page.php
+++ b/tpl/bootstrap-dark-page.php
@@ -52,7 +52,7 @@ if ($MARKDOWN):
 <?php
 endif;
 ?>
-		<script type="text/javascript" src="js/privatebin.js?<?php echo rawurlencode($VERSION); ?>" integrity="sha512-tnG2Ai1USFqZM26ChISDXXq5YCpc4ae760JPSoN1wFLcu8wgu1VuOeZztWme9naCTgWRpOHSlg2PnvQbgoCjIg==" crossorigin="anonymous"></script>
+		<script type="text/javascript" src="js/privatebin.js?<?php echo rawurlencode($VERSION); ?>" integrity="sha512-h/cw2lgocVvgjmYWShhbnz5nSzyUv4rVY1JgN7vmkZq8VJX9KVXPoC7oYX+YGFk+0FYw+c/uofVW9yyU5TJv+w==" crossorigin="anonymous"></script>
 		<!--[if lt IE 10]>
 		<style type="text/css">body {padding-left:60px;padding-right:60px;} #ienotice {display:block;} #oldienotice {display:block;}</style>
 		<![endif]-->
diff --git a/tpl/bootstrap-dark.php b/tpl/bootstrap-dark.php
index 2da3d02f..9ceb15f7 100644
--- a/tpl/bootstrap-dark.php
+++ b/tpl/bootstrap-dark.php
@@ -52,7 +52,7 @@ if ($MARKDOWN):
 <?php
 endif;
 ?>
-		<script type="text/javascript" src="js/privatebin.js?<?php echo rawurlencode($VERSION); ?>" integrity="sha512-tnG2Ai1USFqZM26ChISDXXq5YCpc4ae760JPSoN1wFLcu8wgu1VuOeZztWme9naCTgWRpOHSlg2PnvQbgoCjIg==" crossorigin="anonymous"></script>
+		<script type="text/javascript" src="js/privatebin.js?<?php echo rawurlencode($VERSION); ?>" integrity="sha512-h/cw2lgocVvgjmYWShhbnz5nSzyUv4rVY1JgN7vmkZq8VJX9KVXPoC7oYX+YGFk+0FYw+c/uofVW9yyU5TJv+w==" crossorigin="anonymous"></script>
 		<!--[if lt IE 10]>
 		<style type="text/css">body {padding-left:60px;padding-right:60px;} #ienotice {display:block;} #oldienotice {display:block;}</style>
 		<![endif]-->
diff --git a/tpl/bootstrap-page.php b/tpl/bootstrap-page.php
index 235f4877..fe49a3fd 100644
--- a/tpl/bootstrap-page.php
+++ b/tpl/bootstrap-page.php
@@ -52,7 +52,7 @@ if ($MARKDOWN):
 <?php
 endif;
 ?>
-		<script type="text/javascript" src="js/privatebin.js?<?php echo rawurlencode($VERSION); ?>" integrity="sha512-tnG2Ai1USFqZM26ChISDXXq5YCpc4ae760JPSoN1wFLcu8wgu1VuOeZztWme9naCTgWRpOHSlg2PnvQbgoCjIg==" crossorigin="anonymous"></script>
+		<script type="text/javascript" src="js/privatebin.js?<?php echo rawurlencode($VERSION); ?>" integrity="sha512-h/cw2lgocVvgjmYWShhbnz5nSzyUv4rVY1JgN7vmkZq8VJX9KVXPoC7oYX+YGFk+0FYw+c/uofVW9yyU5TJv+w==" crossorigin="anonymous"></script>
 		<!--[if lt IE 10]>
 		<style type="text/css">body {padding-left:60px;padding-right:60px;} #ienotice {display:block;} #oldienotice {display:block;}</style>
 		<![endif]-->
diff --git a/tpl/bootstrap.php b/tpl/bootstrap.php
index cd9a787a..2eade554 100644
--- a/tpl/bootstrap.php
+++ b/tpl/bootstrap.php
@@ -52,7 +52,7 @@ if ($MARKDOWN):
 <?php
 endif;
 ?>
-		<script type="text/javascript" src="js/privatebin.js?<?php echo rawurlencode($VERSION); ?>" integrity="sha512-tnG2Ai1USFqZM26ChISDXXq5YCpc4ae760JPSoN1wFLcu8wgu1VuOeZztWme9naCTgWRpOHSlg2PnvQbgoCjIg==" crossorigin="anonymous"></script>
+		<script type="text/javascript" src="js/privatebin.js?<?php echo rawurlencode($VERSION); ?>" integrity="sha512-h/cw2lgocVvgjmYWShhbnz5nSzyUv4rVY1JgN7vmkZq8VJX9KVXPoC7oYX+YGFk+0FYw+c/uofVW9yyU5TJv+w==" crossorigin="anonymous"></script>
 		<!--[if lt IE 10]>
 		<style type="text/css">body {padding-left:60px;padding-right:60px;} #ienotice {display:block;} #oldienotice {display:block;}</style>
 		<![endif]-->
@@ -280,7 +280,6 @@ if (!strlen($ERROR)):
 endif;
 ?>alert alert-danger"><span class="glyphicon glyphicon-alert" aria-hidden="true"></span> <?php echo htmlspecialchars($ERROR); ?></div>
 			<noscript><div id="noscript" role="alert" class="nonworking alert alert-warning"><span class="glyphicon glyphicon-exclamation-sign" aria-hidden="true"></span> <?php echo I18n::_('JavaScript is required for PrivateBin to work.<br />Sorry for the inconvenience.'); ?></div></noscript>
-			<div id="noscript" role="alert" class="nonworking alert alert-warning noscript-hide"><span class="glyphicon glyphicon-exclamation-sign" aria-hidden="true"></span> <?php echo I18n::_('The required JavaScripts for PrivateBin could not be loaded. This might <br />Please see <a href="">this FAQ for more information</a>.'); ?></div>
 			<noscript><link type="text/css" rel="stylesheet" href="css/noscript.css" /></noscript>
 			<div id="oldienotice" role="alert" class="hidden nonworking alert alert-danger"><span class="glyphicon glyphicon-alert" aria-hidden="true"></span> <?php echo I18n::_('PrivateBin requires a modern browser to work.'); ?></div>
 			<div id="ienotice" role="alert" class="hidden alert alert-warning"><span class="glyphicon glyphicon-question-sign" aria-hidden="true"></span> <?php echo I18n::_('Still using Internet Explorer? Do yourself a favor, switch to a modern browser:'), PHP_EOL; ?>
@@ -325,6 +324,12 @@ endif;
 				<div id="comments"></div>
 			</div>
 		</section>
+        <section class="container">
+            <div id="noscript" role="alert" class="nonworking alert alert-info noscript-hide"><span class="glyphicon glyphicon-exclamation-sign" aria-hidden="true">
+                <span> <?php echo I18n::_('Loading...'); ?></span><br>
+                <span class="smallErrorText"><?php echo I18n::_('In case this message never disappears please have a look at <a href="">this FAQ for information to troubleshoot</a>.'); ?></span>
+            </div>
+        </section>
 		<footer class="container">
 			<div class="row">
 				<h4 class="col-md-5 col-xs-8"><?php echo I18n::_('PrivateBin'); ?> <small>- <?php echo I18n::_('Because ignorance is bliss'); ?></small></h4>
diff --git a/tpl/page.php b/tpl/page.php
index b48db34e..b4d12322 100644
--- a/tpl/page.php
+++ b/tpl/page.php
@@ -47,7 +47,7 @@ if ($MARKDOWN):
 <?php
 endif;
 ?>
-		<script type="text/javascript" src="js/privatebin.js?<?php echo rawurlencode($VERSION); ?>" integrity="sha512-tnG2Ai1USFqZM26ChISDXXq5YCpc4ae760JPSoN1wFLcu8wgu1VuOeZztWme9naCTgWRpOHSlg2PnvQbgoCjIg==" crossorigin="anonymous"></script>
+		<script type="text/javascript" src="js/privatebin.js?<?php echo rawurlencode($VERSION); ?>" integrity="sha512-h/cw2lgocVvgjmYWShhbnz5nSzyUv4rVY1JgN7vmkZq8VJX9KVXPoC7oYX+YGFk+0FYw+c/uofVW9yyU5TJv+w==" crossorigin="anonymous"></script>
 		<!--[if lt IE 10]>
 		<style type="text/css">body {padding-left:60px;padding-right:60px;} #ienotice {display:block;} #oldienotice {display:block;}</style>
 		<![endif]-->

From 9dcdb3172c69c97466bd0e1d1a81486c44b37aa6 Mon Sep 17 00:00:00 2001
From: El RIDO <elrido@gmx.net>
Date: Sun, 13 Nov 2016 12:27:09 +0100
Subject: [PATCH 3/7] added translation string to JSON files, removed
 unneccessary class (already covered by bootstrap CSS) and moved noscript CSS
 load into head (allowed when not using XHTML)

---
 css/bootstrap/privatebin.css |  4 ----
 i18n/de.json                 |  3 ++-
 i18n/fr.json                 |  3 ++-
 i18n/it.json                 |  3 ++-
 i18n/pl.json                 |  3 ++-
 i18n/sl.json                 |  3 ++-
 i18n/zh.json                 |  3 ++-
 tpl/bootstrap-dark.php       |  7 +++++++
 tpl/bootstrap.php            | 14 +++++++-------
 9 files changed, 26 insertions(+), 17 deletions(-)

diff --git a/css/bootstrap/privatebin.css b/css/bootstrap/privatebin.css
index e63e63fe..b26421b4 100644
--- a/css/bootstrap/privatebin.css
+++ b/css/bootstrap/privatebin.css
@@ -98,10 +98,6 @@ body.navbar-spacing {
 	margin-bottom: 10px;
 }
 
-.smallErrorText {
-	font-size: 80%;
-}
-
 .comment {
 	border-left: 1px solid #ccc;
 	padding: 5px 0 5px 10px;
diff --git a/i18n/de.json b/i18n/de.json
index d99672c0..fb6c7839 100644
--- a/i18n/de.json
+++ b/i18n/de.json
@@ -140,5 +140,6 @@
     "Editor": "Bearbeiten",
     "Preview": "Vorschau",
     "PrivateBin requires the PATH to end in a \"%s\". Please update the PATH in your index.php.":
-        "Der PATH muss bei PrivateBin mit einem \"%s\" enden. Bitte passe Deinen PATH in Deiner index.php an."
+        "Der PATH muss bei PrivateBin mit einem \"%s\" enden. Bitte passe Deinen PATH in Deiner index.php an.",
+    "Loading…": "Lädt…"
 }
diff --git a/i18n/fr.json b/i18n/fr.json
index 3fe3baac..2b649c32 100644
--- a/i18n/fr.json
+++ b/i18n/fr.json
@@ -149,5 +149,6 @@
     "Editor": "Éditer",
     "Preview": "Prévisualiser",
     "PrivateBin requires the PATH to end in a \"%s\". Please update the PATH in your index.php.":
-        "PrivateBin requires the PATH to end in a \"%s\". Please update the PATH in your index.php."
+        "PrivateBin requires the PATH to end in a \"%s\". Please update the PATH in your index.php.",
+    "Loading…": "Loading…"
 }
diff --git a/i18n/it.json b/i18n/it.json
index 45cf68a3..7d0ecafe 100644
--- a/i18n/it.json
+++ b/i18n/it.json
@@ -140,5 +140,6 @@
     "Editor": "Editor",
     "Preview": "Preview",
     "PrivateBin requires the PATH to end in a \"%s\". Please update the PATH in your index.php.":
-        "PrivateBin necessita che PATH termini con \"%s\". Aggiorna la variabile PATH nel tuo index.php."
+        "PrivateBin necessita che PATH termini con \"%s\". Aggiorna la variabile PATH nel tuo index.php.",
+    "Loading…": "Loading…"
 }
diff --git a/i18n/pl.json b/i18n/pl.json
index 26771ffb..656ba024 100644
--- a/i18n/pl.json
+++ b/i18n/pl.json
@@ -140,5 +140,6 @@
     "Editor": "Edytować",
     "Preview": "Zapowiedź",
     "PrivateBin requires the PATH to end in a \"%s\". Please update the PATH in your index.php.":
-        "PrivateBin requires the PATH to end in a \"%s\". Please update the PATH in your index.php."
+        "PrivateBin requires the PATH to end in a \"%s\". Please update the PATH in your index.php.",
+    "Loading…": "Loading…"
 }
diff --git a/i18n/sl.json b/i18n/sl.json
index 625fb897..9c9c3440 100644
--- a/i18n/sl.json
+++ b/i18n/sl.json
@@ -149,5 +149,6 @@
     "Editor": "Uredi",
     "Preview": "Predogled",
     "PrivateBin requires the PATH to end in a \"%s\". Please update the PATH in your index.php.":
-        "PrivateBin requires the PATH to end in a \"%s\". Please update the PATH in your index.php."
+        "PrivateBin requires the PATH to end in a \"%s\". Please update the PATH in your index.php.",
+    "Loading…": "Loading…"
 }
diff --git a/i18n/zh.json b/i18n/zh.json
index e79add03..1666c74b 100644
--- a/i18n/zh.json
+++ b/i18n/zh.json
@@ -140,5 +140,6 @@
     "Editor": "編輯",
     "Preview": "預習",
     "PrivateBin requires the PATH to end in a \"%s\". Please update the PATH in your index.php.":
-        "PrivateBin requires the PATH to end in a \"%s\". Please update the PATH in your index.php."
+        "PrivateBin requires the PATH to end in a \"%s\". Please update the PATH in your index.php.",
+    "Loading…": "Loading…"
 }
diff --git a/tpl/bootstrap-dark.php b/tpl/bootstrap-dark.php
index 831b7c86..6cc8626b 100644
--- a/tpl/bootstrap-dark.php
+++ b/tpl/bootstrap-dark.php
@@ -24,6 +24,7 @@ if ($SYNTAXHIGHLIGHTING):
     endif;
 endif;
 ?>
+		<noscript><link type="text/css" rel="stylesheet" href="css/noscript.css" /></noscript>
 		<script type="text/javascript" src="js/jquery-3.1.1.js" integrity="sha512-U6K1YLIFUWcvuw5ucmMtT9HH4t0uz3M366qrF5y4vnyH6dgDzndlcGvH/Lz5k8NFh80SN95aJ5rqGZEdaQZ7ZQ==" crossorigin="anonymous"></script>
 		<script type="text/javascript" src="js/sjcl-1.0.4.js" integrity="sha512-BqVQ8GgWfMCcdsDuP6Ggm1BV7+mmoWH3PC4UqcYpEKSdEq1rthy6NUsa6gu5sydewbi/ilI3E3ohdCxlPPF9ww==" crossorigin="anonymous"></script>
 <?php
@@ -323,6 +324,12 @@ endif;
 				<div id="comments"></div>
 			</div>
 		</section>
+		<section class="container">
+			<div id="noscript" role="alert" class="nonworking alert alert-info noscript-hide"><span class="glyphicon glyphicon-exclamation-sign" aria-hidden="true">
+				<span> <?php echo I18n::_('Loading...'); ?></span><br>
+				<span class="small"><?php echo I18n::_('In case this message never disappears please have a look at <a href="">this FAQ for information to troubleshoot</a>.'); ?></span>
+			</div>
+		</section>
 		<footer class="container">
 			<div class="row">
 				<h4 class="col-md-5 col-xs-8"><?php echo I18n::_('PrivateBin'); ?> <small>- <?php echo I18n::_('Because ignorance is bliss'); ?></small></h4>
diff --git a/tpl/bootstrap.php b/tpl/bootstrap.php
index f92cbb45..ab09f1ac 100644
--- a/tpl/bootstrap.php
+++ b/tpl/bootstrap.php
@@ -24,6 +24,7 @@ if ($SYNTAXHIGHLIGHTING):
     endif;
 endif;
 ?>
+		<noscript><link type="text/css" rel="stylesheet" href="css/noscript.css" /></noscript>
 		<script type="text/javascript" src="js/jquery-3.1.1.js" integrity="sha512-U6K1YLIFUWcvuw5ucmMtT9HH4t0uz3M366qrF5y4vnyH6dgDzndlcGvH/Lz5k8NFh80SN95aJ5rqGZEdaQZ7ZQ==" crossorigin="anonymous"></script>
 		<script type="text/javascript" src="js/sjcl-1.0.4.js" integrity="sha512-BqVQ8GgWfMCcdsDuP6Ggm1BV7+mmoWH3PC4UqcYpEKSdEq1rthy6NUsa6gu5sydewbi/ilI3E3ohdCxlPPF9ww==" crossorigin="anonymous"></script>
 <?php
@@ -280,7 +281,6 @@ if (!strlen($ERROR)):
 endif;
 ?>alert alert-danger"><span class="glyphicon glyphicon-alert" aria-hidden="true"></span> <?php echo htmlspecialchars($ERROR); ?></div>
 			<noscript><div id="noscript" role="alert" class="nonworking alert alert-warning"><span class="glyphicon glyphicon-exclamation-sign" aria-hidden="true"></span> <?php echo I18n::_('JavaScript is required for PrivateBin to work.<br />Sorry for the inconvenience.'); ?></div></noscript>
-			<noscript><link type="text/css" rel="stylesheet" href="css/noscript.css" /></noscript>
 			<div id="oldienotice" role="alert" class="hidden nonworking alert alert-danger"><span class="glyphicon glyphicon-alert" aria-hidden="true"></span> <?php echo I18n::_('PrivateBin requires a modern browser to work.'); ?></div>
 			<div id="ienotice" role="alert" class="hidden alert alert-warning"><span class="glyphicon glyphicon-question-sign" aria-hidden="true"></span> <?php echo I18n::_('Still using Internet Explorer? Do yourself a favor, switch to a modern browser:'), PHP_EOL; ?>
 				<a href="https://www.mozilla.org/firefox/">Firefox</a>,
@@ -324,12 +324,12 @@ endif;
 				<div id="comments"></div>
 			</div>
 		</section>
-        <section class="container">
-            <div id="noscript" role="alert" class="nonworking alert alert-info noscript-hide"><span class="glyphicon glyphicon-exclamation-sign" aria-hidden="true">
-                <span> <?php echo I18n::_('Loading...'); ?></span><br>
-                <span class="smallErrorText"><?php echo I18n::_('In case this message never disappears please have a look at <a href="">this FAQ for information to troubleshoot</a>.'); ?></span>
-            </div>
-        </section>
+		<section class="container">
+			<div id="noscript" role="alert" class="nonworking alert alert-info noscript-hide"><span class="glyphicon glyphicon-exclamation-sign" aria-hidden="true">
+				<span> <?php echo I18n::_('Loading…'); ?></span><br>
+				<span class="small"><?php echo I18n::_('In case this message never disappears please have a look at <a href="">this FAQ for information to troubleshoot</a>.'); ?></span>
+			</div>
+		</section>
 		<footer class="container">
 			<div class="row">
 				<h4 class="col-md-5 col-xs-8"><?php echo I18n::_('PrivateBin'); ?> <small>- <?php echo I18n::_('Because ignorance is bliss'); ?></small></h4>

From c2aa931392aecc86e97f2b74269a48d3537e22e5 Mon Sep 17 00:00:00 2001
From: El RIDO <elrido@gmx.net>
Date: Sun, 13 Nov 2016 12:38:55 +0100
Subject: [PATCH 4/7] updated changelog and fixed missing translation and CSS
 change

---
 CHANGELOG.md       | 1 +
 css/privatebin.css | 2 +-
 i18n/de.json       | 4 ++--
 i18n/fr.json       | 4 ++--
 i18n/it.json       | 4 ++--
 i18n/pl.json       | 2 +-
 i18n/sl.json       | 4 ++--
 i18n/zh.json       | 2 +-
 8 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5424a91a..93433b97 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,7 @@
 
   * **next (not yet released)**
     * ADDED: Translations for Italian
+    * ADDED: Loading message displayed until decryption succeeded for slower (in terms of CPU or network) systems
     * CHANGED: Suppressed referrer HTTP header sending when following links in a paste or comment (#96) and added additional HTTP headers for XSS mitigation (#91)
     * CHANGED: Updated random_compat and jQuery libraries
   * **1.0 (2016-08-25)**
diff --git a/css/privatebin.css b/css/privatebin.css
index 0fa76234..57568825 100644
--- a/css/privatebin.css
+++ b/css/privatebin.css
@@ -285,7 +285,7 @@ input {
 	color:#ff0;
 }
 
-.smallErrorText {
+.small {
 	font-size: 80%;
 }
 
diff --git a/i18n/de.json b/i18n/de.json
index fb6c7839..eaafd086 100644
--- a/i18n/de.json
+++ b/i18n/de.json
@@ -31,8 +31,8 @@
         "PrivateBin ist ein minimalistischer, quelloffener \"Pastebin\"-artiger Dienst, bei dem der Server keinerlei Kenntnis der Inhalte hat. Die Daten werden <i>im Browser</i> mit 256 Bit AES ver- und entschlüsselt. Weitere Informationen sind auf der <a href=\"https://privatebin.info/\">Projektseite</a> zu finden.",
     "Because ignorance is bliss":
         "Unwissenheit ist ein Segen",
-    "Javascript is required for PrivateBin to work.<br />Sorry for the inconvenience.":
-        "Javascript ist eine Voraussetzung, um PrivateBin zu nutzen.<br />Bitte entschuldige die Unannehmlichkeiten.",
+    "JavaScript is required for PrivateBin to work.<br />Sorry for the inconvenience.":
+        "JavaScript ist eine Voraussetzung, um PrivateBin zu nutzen.<br />Bitte entschuldige die Unannehmlichkeiten.",
     "PrivateBin requires a modern browser to work.":
         "PrivateBin setzt einen modernen Browser voraus, um funktionieren zu können.",
     "Still using Internet Explorer? Do yourself a favor, switch to a modern browser:":
diff --git a/i18n/fr.json b/i18n/fr.json
index 2b649c32..586c0f98 100644
--- a/i18n/fr.json
+++ b/i18n/fr.json
@@ -31,8 +31,8 @@
         "PrivateBin est un 'pastebin' (ou gestionnaire d'extraits de texte et de code source) minimaliste et open source, dans lequel le serveur n'a aucune connaissance des données envoyées. Les données sont chiffrées/déchiffrées <i>dans le navigateur</i> par un chiffrage AES 256 bits. Plus d'informations sur <a href=\"https://privatebin.info/\">la page du projet</a>.",
     "Because ignorance is bliss":
         "Parce que l'ignorance c'est le bonheur",
-    "Javascript is required for PrivateBin to work.<br />Sorry for the inconvenience.":
-        "Javascript est requis pour faire fonctionner PrivateBin. <br />Désolé pour cet inconvénient.",
+    "JavaScript is required for PrivateBin to work.<br />Sorry for the inconvenience.":
+        "JavaScript est requis pour faire fonctionner PrivateBin. <br />Désolé pour cet inconvénient.",
     "PrivateBin requires a modern browser to work.":
         "PrivateBin nécessite un navigateur moderne pour fonctionner.",
     "Still using Internet Explorer? Do yourself a favor, switch to a modern browser:":
diff --git a/i18n/it.json b/i18n/it.json
index 7d0ecafe..e8c31023 100644
--- a/i18n/it.json
+++ b/i18n/it.json
@@ -31,8 +31,8 @@
         "PrivateBin è un sistema di tipo \"Pastebin\" online, open source, minimalista. Il server non possiede alcuna conoscenza (\"Zero Knowledge\") del contenuto dei dati inviati. I dati sono cifrati/decifrati <i>nel Browser</i> con algoritmo AES a 256 Bit. Per ulteriori informazioni, vedi <a href=\"https://privatebin.info/\">Sito del progetto</a>.",
     "Because ignorance is bliss":
         "Perché l'ignoranza è una benedizione (Because ignorance is bliss)",
-    "Javascript is required for PrivateBin to work.<br />Sorry for the inconvenience.":
-        "PrivateBin funziona solo con Javascript attivo.<br />Ci dispiace per l'inconveniente.",
+    "JavaScript is required for PrivateBin to work.<br />Sorry for the inconvenience.":
+        "PrivateBin funziona solo con JavaScript attivo.<br />Ci dispiace per l'inconveniente.",
     "PrivateBin requires a modern browser to work.":
         "PrivateBin richiede un browser moderno e aggiornato per funzionare.",
     "Still using Internet Explorer? Do yourself a favor, switch to a modern browser:":
diff --git a/i18n/pl.json b/i18n/pl.json
index 656ba024..1dd21e8d 100644
--- a/i18n/pl.json
+++ b/i18n/pl.json
@@ -31,7 +31,7 @@
         "PrivateBin jest minimalistycznym, otwartoźródłowym serwisem typu pastebin, w którym serwer nie ma jakichkolwiek informacji o tym, co jest wklejane. Dane są szyfrowane i deszyfrowane <i>w przeglądarce</i> z użyciem 256-bitowego klucza AES. Więcej informacji na <a href=\"https://privatebin.info/\">stronie projektu</a>.",
     "Because ignorance is bliss":
         "Ponieważ ignorancja jest cnotą",
-    "Javascript is required for PrivateBin to work.<br />Sorry for the inconvenience.":
+    "JavaScript is required for PrivateBin to work.<br />Sorry for the inconvenience.":
         "Do działania PrivateBina jest wymagany JavaScript. Przepraszamy za tę niedogodność.",
     "PrivateBin requires a modern browser to work.":
         "PrivateBin wymaga do działania nowoczesnej przeglądarki.",
diff --git a/i18n/sl.json b/i18n/sl.json
index 9c9c3440..06a51f0d 100644
--- a/i18n/sl.json
+++ b/i18n/sl.json
@@ -31,8 +31,8 @@
         "PrivateBin je minimalističen, odprtokodni spletni 'pastebin', kjer server ne ve ničesar o prilepljenih podatkih. Podatki so zakodirani/odkodirani <i>v brskalniku</i> z uporabo 256 bitnega AES. Več informacij na < href=\"https://privatebin.info/\">spletni strani projekta.</a>.",
     "Because ignorance is bliss":
         "Ker kar ne veš ne boli.",
-    "Javascript is required for PrivateBin to work.<br />Sorry for the inconvenience.":
-        "Da PrivateBin deluje, moraš vklopiti Javascript.<br />Oprosti za povročene nevšečnosti.",
+    "JavaScript is required for PrivateBin to work.<br />Sorry for the inconvenience.":
+        "Da PrivateBin deluje, moraš vklopiti JavaScript.<br />Oprosti za povročene nevšečnosti.",
     "PrivateBin requires a modern browser to work.":
         "PrivateBin za svoje delovanje potrebuje moderen brskalnik.",
     "Still using Internet Explorer? Do yourself a favor, switch to a modern browser:":
diff --git a/i18n/zh.json b/i18n/zh.json
index 1666c74b..aa03c25a 100644
--- a/i18n/zh.json
+++ b/i18n/zh.json
@@ -31,7 +31,7 @@
         "PrivateBin是一个极简，开源，对粘贴内容毫不知情的在线粘贴板，数据<i>在浏览器内</i>进行AES-256加密。更多信息请查看<a href=\"https://privatebin.info/\">项目主页</a>。",
     "Because ignorance is bliss":
         "因为无知是福",
-    "Javascript is required for PrivateBin to work.<br />Sorry for the inconvenience.":
+    "JavaScript is required for PrivateBin to work.<br />Sorry for the inconvenience.":
         "PrivateBin需要JavaScript来进行加解密。<br />带来的不便敬请谅解。",
     "PrivateBin requires a modern browser to work.":
         "PrivateBin需要工作于现代化的浏览器。",

From bdf15865395d5edcbc89cd215560fb6ef67d376d Mon Sep 17 00:00:00 2001
From: rugk <rugk@posteo.de>
Date: Mon, 12 Dec 2016 18:37:54 +0100
Subject: [PATCH 5/7] Add FAQ link & add to all templates

---
 tpl/bootstrap-compact.php   | 6 ++++++
 tpl/bootstrap-dark-page.php | 6 ++++++
 tpl/bootstrap-dark.php      | 6 ++++++
 tpl/bootstrap-page.php      | 6 ++++++
 tpl/bootstrap.php           | 2 +-
 tpl/page.php                | 6 ++++++
 6 files changed, 31 insertions(+), 1 deletion(-)

diff --git a/tpl/bootstrap-compact.php b/tpl/bootstrap-compact.php
index fa937b59..08133314 100644
--- a/tpl/bootstrap-compact.php
+++ b/tpl/bootstrap-compact.php
@@ -344,6 +344,12 @@ endif;
 				<div id="comments"></div>
 			</div>
 		</section>
+		<section class="container">
+			<div id="noscript" role="alert" class="nonworking alert alert-info noscript-hide"><span class="glyphicon glyphicon-exclamation-sign" aria-hidden="true">
+				<span> <?php echo I18n::_('Loading…'); ?></span><br>
+				<span class="small"><?php echo I18n::_('In case this message never disappears please have a look at <a href="https://github.com/PrivateBin/PrivateBin/wiki/FAQ#why-does-not-the-loading-message-go-away">this FAQ for information to troubleshoot</a>.'); ?></span>
+			</div>
+		</section>
 		<footer class="container">
 			<div class="row">
 				<h4 class="col-md-5 col-xs-8"><?php echo I18n::_('PrivateBin'); ?> <small>- <?php echo I18n::_('Because ignorance is bliss'); ?></small></h4>
diff --git a/tpl/bootstrap-dark-page.php b/tpl/bootstrap-dark-page.php
index b1b92f85..24f3d8f9 100644
--- a/tpl/bootstrap-dark-page.php
+++ b/tpl/bootstrap-dark-page.php
@@ -338,6 +338,12 @@ endif;
 				<div id="comments"></div>
 			</div>
 		</section>
+		<section class="container">
+			<div id="noscript" role="alert" class="nonworking alert alert-info noscript-hide"><span class="glyphicon glyphicon-exclamation-sign" aria-hidden="true">
+				<span> <?php echo I18n::_('Loading…'); ?></span><br>
+				<span class="small"><?php echo I18n::_('In case this message never disappears please have a look at <a href="https://github.com/PrivateBin/PrivateBin/wiki/FAQ#why-does-not-the-loading-message-go-away">this FAQ for information to troubleshoot</a>.'); ?></span>
+			</div>
+		</section>
 		<footer class="container">
 			<div class="row">
 				<h4 class="col-md-5 col-xs-8"><?php echo I18n::_('PrivateBin'); ?> <small>- <?php echo I18n::_('Because ignorance is bliss'); ?></small></h4>
diff --git a/tpl/bootstrap-dark.php b/tpl/bootstrap-dark.php
index 9d9d764f..10a8b541 100644
--- a/tpl/bootstrap-dark.php
+++ b/tpl/bootstrap-dark.php
@@ -345,6 +345,12 @@ endif;
 				<span class="small"><?php echo I18n::_('In case this message never disappears please have a look at <a href="">this FAQ for information to troubleshoot</a>.'); ?></span>
 			</div>
 		</section>
+		<section class="container">
+			<div id="noscript" role="alert" class="nonworking alert alert-info noscript-hide"><span class="glyphicon glyphicon-exclamation-sign" aria-hidden="true">
+				<span> <?php echo I18n::_('Loading…'); ?></span><br>
+				<span class="small"><?php echo I18n::_('In case this message never disappears please have a look at <a href="https://github.com/PrivateBin/PrivateBin/wiki/FAQ#why-does-not-the-loading-message-go-away">this FAQ for information to troubleshoot</a>.'); ?></span>
+			</div>
+		</section>
 		<footer class="container">
 			<div class="row">
 				<h4 class="col-md-5 col-xs-8"><?php echo I18n::_('PrivateBin'); ?> <small>- <?php echo I18n::_('Because ignorance is bliss'); ?></small></h4>
diff --git a/tpl/bootstrap-page.php b/tpl/bootstrap-page.php
index 591cf68a..1f95724a 100644
--- a/tpl/bootstrap-page.php
+++ b/tpl/bootstrap-page.php
@@ -338,6 +338,12 @@ endif;
 				<div id="comments"></div>
 			</div>
 		</section>
+        <section class="container">
+			<div id="noscript" role="alert" class="nonworking alert alert-info noscript-hide"><span class="glyphicon glyphicon-exclamation-sign" aria-hidden="true">
+				<span> <?php echo I18n::_('Loading…'); ?></span><br>
+				<span class="small"><?php echo I18n::_('In case this message never disappears please have a look at <a href="https://github.com/PrivateBin/PrivateBin/wiki/FAQ#why-does-not-the-loading-message-go-away">this FAQ for information to troubleshoot</a>.'); ?></span>
+			</div>
+		</section>
 		<footer class="container">
 			<div class="row">
 				<h4 class="col-md-5 col-xs-8"><?php echo I18n::_('PrivateBin'); ?> <small>- <?php echo I18n::_('Because ignorance is bliss'); ?></small></h4>
diff --git a/tpl/bootstrap.php b/tpl/bootstrap.php
index 4c97c166..dc15d312 100644
--- a/tpl/bootstrap.php
+++ b/tpl/bootstrap.php
@@ -342,7 +342,7 @@ endif;
 		<section class="container">
 			<div id="noscript" role="alert" class="nonworking alert alert-info noscript-hide"><span class="glyphicon glyphicon-exclamation-sign" aria-hidden="true">
 				<span> <?php echo I18n::_('Loading…'); ?></span><br>
-				<span class="small"><?php echo I18n::_('In case this message never disappears please have a look at <a href="">this FAQ for information to troubleshoot</a>.'); ?></span>
+				<span class="small"><?php echo I18n::_('In case this message never disappears please have a look at <a href="https://github.com/PrivateBin/PrivateBin/wiki/FAQ#why-does-not-the-loading-message-go-away">this FAQ for information to troubleshoot</a>.'); ?></span>
 			</div>
 		</section>
 		<footer class="container">
diff --git a/tpl/page.php b/tpl/page.php
index fabd17c8..a658706f 100644
--- a/tpl/page.php
+++ b/tpl/page.php
@@ -227,5 +227,11 @@ endif;
 			</div>
 		</section>
 		<div id="cipherdata" class="hidden"><?php echo htmlspecialchars($CIPHERDATA, ENT_NOQUOTES); ?></div>
+        <section class="container">
+			<div id="noscript" role="alert" class="nonworking alert alert-info noscript-hide"><span class="glyphicon glyphicon-exclamation-sign" aria-hidden="true">
+				<span> <?php echo I18n::_('Loading…'); ?></span><br>
+				<span class="small"><?php echo I18n::_('In case this message never disappears please have a look at <a href="https://github.com/PrivateBin/PrivateBin/wiki/FAQ#why-does-not-the-loading-message-go-away">this FAQ for information to troubleshoot</a>.'); ?></span>
+			</div>
+		</section>
 	</body>
 </html>

From 67094022ddba18edfb5cdd86f92b8f0cc2779717 Mon Sep 17 00:00:00 2001
From: rugk <rugk@posteo.de>
Date: Mon, 12 Dec 2016 19:29:29 +0100
Subject: [PATCH 6/7] Remove code duplication

---
 tpl/bootstrap-dark.php | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/tpl/bootstrap-dark.php b/tpl/bootstrap-dark.php
index 10a8b541..f8870f9d 100644
--- a/tpl/bootstrap-dark.php
+++ b/tpl/bootstrap-dark.php
@@ -339,12 +339,6 @@ endif;
 				<div id="comments"></div>
 			</div>
 		</section>
-		<section class="container">
-			<div id="noscript" role="alert" class="nonworking alert alert-info noscript-hide"><span class="glyphicon glyphicon-exclamation-sign" aria-hidden="true">
-				<span> <?php echo I18n::_('Loading...'); ?></span><br>
-				<span class="small"><?php echo I18n::_('In case this message never disappears please have a look at <a href="">this FAQ for information to troubleshoot</a>.'); ?></span>
-			</div>
-		</section>
 		<section class="container">
 			<div id="noscript" role="alert" class="nonworking alert alert-info noscript-hide"><span class="glyphicon glyphicon-exclamation-sign" aria-hidden="true">
 				<span> <?php echo I18n::_('Loading…'); ?></span><br>

From ac53f0abdb73fec1ee45d6ffaa9b5e9f6dd24f15 Mon Sep 17 00:00:00 2001
From: rugk <rugk@posteo.de>
Date: Tue, 13 Dec 2016 23:19:19 +0100
Subject: [PATCH 7/7] Add translation string

---
 i18n/de.json | 4 +++-
 i18n/fr.json | 4 +++-
 i18n/it.json | 4 +++-
 i18n/pl.json | 4 +++-
 i18n/sl.json | 4 +++-
 i18n/zh.json | 4 +++-
 6 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/i18n/de.json b/i18n/de.json
index 5d274de1..0b6a4255 100644
--- a/i18n/de.json
+++ b/i18n/de.json
@@ -145,5 +145,7 @@
         "Entschlüsseln",
     "Enter password":
         "Passwort eingeben",
-    "Loading…": "Lädt…"
+    "Loading…": "Lädt…",
+    "In case this message never disappears please have a look at <a href=\"https://github.com/PrivateBin/PrivateBin/wiki/FAQ#why-does-not-the-loading-message-go-away\">this FAQ for information to troubleshoot</a>.":
+        "Wenn diese Nachricht nicht mehr verschwindet, schau bitte in <a href=\"https://github.com/PrivateBin/PrivateBin/wiki/FAQ#why-does-not-the-loading-message-go-away\">die FAQ</a> (englisch), um zu sehen, wie der Fehler behoben werden kann."
 }
diff --git a/i18n/fr.json b/i18n/fr.json
index 9652f43a..263c1dda 100644
--- a/i18n/fr.json
+++ b/i18n/fr.json
@@ -154,5 +154,7 @@
         "Decrypt",
     "Enter password":
         "Entrez le mot de passe",
-    "Loading…": "Loading…"
+    "Loading…": "Loading…",
+    "In case this message never disappears please have a look at <a href=\"https://github.com/PrivateBin/PrivateBin/wiki/FAQ#why-does-not-the-loading-message-go-away\">this FAQ for information to troubleshoot</a>.":
+        "In case this message never disappears please have a look at <a href=\"https://github.com/PrivateBin/PrivateBin/wiki/FAQ#why-does-not-the-loading-message-go-away\">this FAQ for information to troubleshoot</a> (in English)."
 }
diff --git a/i18n/it.json b/i18n/it.json
index a67528b1..5c5aae38 100644
--- a/i18n/it.json
+++ b/i18n/it.json
@@ -145,5 +145,7 @@
         "Decrypt",
     "Enter password":
         "Inserisci la password",
-    "Loading…": "Loading…"
+    "Loading…": "Loading…",
+    "In case this message never disappears please have a look at <a href=\"https://github.com/PrivateBin/PrivateBin/wiki/FAQ#why-does-not-the-loading-message-go-away\">this FAQ for information to troubleshoot</a>.":
+        "In case this message never disappears please have a look at <a href=\"https://github.com/PrivateBin/PrivateBin/wiki/FAQ#why-does-not-the-loading-message-go-away\">this FAQ for information to troubleshoot</a> (in English)."
 }
diff --git a/i18n/pl.json b/i18n/pl.json
index 54708dde..b5fce72b 100644
--- a/i18n/pl.json
+++ b/i18n/pl.json
@@ -145,5 +145,7 @@
         "Decrypt",
     "Enter password":
         "Wpisz hasło",
-    "Loading…": "Loading…"
+    "Loading…": "Loading…",
+    "In case this message never disappears please have a look at <a href=\"https://github.com/PrivateBin/PrivateBin/wiki/FAQ#why-does-not-the-loading-message-go-away\">this FAQ for information to troubleshoot</a>.":
+        "In case this message never disappears please have a look at <a href=\"https://github.com/PrivateBin/PrivateBin/wiki/FAQ#why-does-not-the-loading-message-go-away\">this FAQ for information to troubleshoot</a> (in English)."
 }
diff --git a/i18n/sl.json b/i18n/sl.json
index c5cc0adf..cf4d3173 100644
--- a/i18n/sl.json
+++ b/i18n/sl.json
@@ -154,5 +154,7 @@
         "Decrypt",
     "Enter password":
         "Prosim vnesi geslo",
-    "Loading…": "Loading…"
+    "Loading…": "Loading…",
+    "In case this message never disappears please have a look at <a href=\"https://github.com/PrivateBin/PrivateBin/wiki/FAQ#why-does-not-the-loading-message-go-away\">this FAQ for information to troubleshoot</a>.":
+        "In case this message never disappears please have a look at <a href=\"https://github.com/PrivateBin/PrivateBin/wiki/FAQ#why-does-not-the-loading-message-go-away\">this FAQ for information to troubleshoot</a> (in English)."
 }
diff --git a/i18n/zh.json b/i18n/zh.json
index 9b748e20..1a88f2fe 100644
--- a/i18n/zh.json
+++ b/i18n/zh.json
@@ -145,5 +145,7 @@
         "Decrypt",
     "Enter password":
         "Enter password",
-    "Loading…": "Loading…"
+    "Loading…": "Loading…",
+    "In case this message never disappears please have a look at <a href=\"https://github.com/PrivateBin/PrivateBin/wiki/FAQ#why-does-not-the-loading-message-go-away\">this FAQ for information to troubleshoot</a>.":
+        "In case this message never disappears please have a look at <a href=\"https://github.com/PrivateBin/PrivateBin/wiki/FAQ#why-does-not-the-loading-message-go-away\">this FAQ for information to troubleshoot</a> (in English)."
 }