From bdab0409c4e47a2df112196de915a06d208293ce Mon Sep 17 00:00:00 2001
From: ringmaster <epithet@gmail.com>
Date: Thu, 5 Dec 2013 09:19:46 -0500
Subject: Add overlay noscript message to fix #6032

---
 core/templates/layout.user.php | 1 +
 1 file changed, 1 insertion(+)

(limited to 'core/templates')

diff --git a/core/templates/layout.user.php b/core/templates/layout.user.php
index 9e1d8022ecb..7492af799b3 100644
--- a/core/templates/layout.user.php
+++ b/core/templates/layout.user.php
@@ -37,6 +37,7 @@
 	</head>
 
 	<body id="<?php p($_['bodyid']);?>">
+	<noscript><div id="nojavascript"><div>ownCloud requires JavaScript to be enabled for correct operation.  Please enable JavaScript and re-load this interface.</div></div></noscript>
 	<div id="notification-container">
 		<div id="notification"></div>
 		<?php if ($_['updateAvailable']): ?>
-- 
cgit v1.2.3


From 1687ec0cd2f2f615cf4e6fe42d0d684ca7ce6067 Mon Sep 17 00:00:00 2001
From: ringmaster <epithet@gmail.com>
Date: Thu, 5 Dec 2013 09:52:13 -0500
Subject: Make noscript message translatable

---
 core/templates/layout.user.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'core/templates')

diff --git a/core/templates/layout.user.php b/core/templates/layout.user.php
index 7492af799b3..3aef3ecd047 100644
--- a/core/templates/layout.user.php
+++ b/core/templates/layout.user.php
@@ -37,7 +37,7 @@
 	</head>
 
 	<body id="<?php p($_['bodyid']);?>">
-	<noscript><div id="nojavascript"><div>ownCloud requires JavaScript to be enabled for correct operation.  Please enable JavaScript and re-load this interface.</div></div></noscript>
+	<noscript><div id="nojavascript"><div><?php p($l->t('ownCloud requires JavaScript to be enabled for correct operation.  Please enable JavaScript and re-load this interface.')); ?></div></div></noscript>
 	<div id="notification-container">
 		<div id="notification"></div>
 		<?php if ($_['updateAvailable']): ?>
-- 
cgit v1.2.3


From e7748613eff294113eb2039b46ddeb5beb6ac88e Mon Sep 17 00:00:00 2001
From: ringmaster <epithet@gmail.com>
Date: Thu, 5 Dec 2013 12:06:20 -0500
Subject: Link to enable-javascript.com

---
 core/css/styles.css            | 7 +++++++
 core/templates/layout.user.php | 2 +-
 2 files changed, 8 insertions(+), 1 deletion(-)

(limited to 'core/templates')

diff --git a/core/css/styles.css b/core/css/styles.css
index 53cce7b733b..2a86b026597 100644
--- a/core/css/styles.css
+++ b/core/css/styles.css
@@ -66,6 +66,13 @@ body { background:#fefefe; font:normal .8em/1.6em "Helvetica Neue",Helvetica,Ari
 	left: 50%;
 	margin-left: -25%;
 }
+#nojavascript a {
+	color: #ccc;
+	text-decoration: underline;
+}
+#nojavascript a:hover {
+	color: #aaa;
+}
 
 /* INPUTS */
 input[type="text"],
diff --git a/core/templates/layout.user.php b/core/templates/layout.user.php
index 3aef3ecd047..a782c69156c 100644
--- a/core/templates/layout.user.php
+++ b/core/templates/layout.user.php
@@ -37,7 +37,7 @@
 	</head>
 
 	<body id="<?php p($_['bodyid']);?>">
-	<noscript><div id="nojavascript"><div><?php p($l->t('ownCloud requires JavaScript to be enabled for correct operation.  Please enable JavaScript and re-load this interface.')); ?></div></div></noscript>
+	<noscript><div id="nojavascript"><div><?php print_unescaped($l->t('ownCloud requires JavaScript to be enabled for correct operation.  Please <a href="http://enable-javascript.com/" target="_blank">enable JavaScript</a> and re-load this interface.')); ?></div></div></noscript>
 	<div id="notification-container">
 		<div id="notification"></div>
 		<?php if ($_['updateAvailable']): ?>
-- 
cgit v1.2.3


From 1dc9998920f7b0dcb85e019e69d75fb71cf3d897 Mon Sep 17 00:00:00 2001
From: ringmaster <epithet@gmail.com>
Date: Thu, 5 Dec 2013 17:01:51 -0500
Subject: Remove reference to ownCloud.

---
 core/templates/layout.user.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'core/templates')

diff --git a/core/templates/layout.user.php b/core/templates/layout.user.php
index a782c69156c..45b7e39686d 100644
--- a/core/templates/layout.user.php
+++ b/core/templates/layout.user.php
@@ -37,7 +37,7 @@
 	</head>
 
 	<body id="<?php p($_['bodyid']);?>">
-	<noscript><div id="nojavascript"><div><?php print_unescaped($l->t('ownCloud requires JavaScript to be enabled for correct operation.  Please <a href="http://enable-javascript.com/" target="_blank">enable JavaScript</a> and re-load this interface.')); ?></div></div></noscript>
+	<noscript><div id="nojavascript"><div><?php print_unescaped($l->t('This application requires JavaScript to be enabled for correct operation.  Please <a href="http://enable-javascript.com/" target="_blank">enable JavaScript</a> and re-load this interface.')); ?></div></div></noscript>
 	<div id="notification-container">
 		<div id="notification"></div>
 		<?php if ($_['updateAvailable']): ?>
-- 
cgit v1.2.3