From 38ade1af70a08d278a56bcec4f7a9e32b09f4336 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Sun, 29 Jul 2012 00:55:22 -0400
Subject: better noscript UI

---
 templates/longpolling.julius |  6 +++---
 templates/metarefresh.hamlet |  2 +-
 templates/transfers.hamlet   | 13 +++++++++++++
 3 files changed, 17 insertions(+), 4 deletions(-)

(limited to 'templates')

diff --git a/templates/longpolling.julius b/templates/longpolling.julius
index 945ef1251..926249a35 100644
--- a/templates/longpolling.julius
+++ b/templates/longpolling.julius
@@ -17,7 +17,7 @@ $.LongPoll = (function() {
 				'dataType': 'html',
 				'success': function(data, status, jqxhr) {
 					$('##{ident}').replaceWith(data);
-					setTimeout($.LongPoll.send, #{delay});
+					setTimeout($.LongPoll.send, #{show delay});
 					numerrs=0;
 				},
 				'error': function(jqxhr, msg, e) {
@@ -26,7 +26,7 @@ $.LongPoll = (function() {
 						window.close();
 					}
 					else {
-						setTimeout($.LongPoll.send, #{delay});
+						setTimeout($.LongPoll.send, #{show delay});
 					}
 				},
 			});
@@ -35,7 +35,7 @@ $.LongPoll = (function() {
 }());
 
 $(document).bind('ready.app', function() {
-	setTimeout($.LongPoll.send, #{startdelay});
+	setTimeout($.LongPoll.send, #{show startdelay});
 });
 
 })( jQuery );
diff --git a/templates/metarefresh.hamlet b/templates/metarefresh.hamlet
index ddbd225fe..89a2e0b2c 100644
--- a/templates/metarefresh.hamlet
+++ b/templates/metarefresh.hamlet
@@ -1,2 +1,2 @@
 <noscript>
-  <meta http-equiv="refresh" content="#{show delayseconds}; URL=@{NoScriptR}">
+  <meta http-equiv="refresh" content="#{show delayseconds}; URL=@{this}">
diff --git a/templates/transfers.hamlet b/templates/transfers.hamlet
index 154e8d58b..5df453315 100644
--- a/templates/transfers.hamlet
+++ b/templates/transfers.hamlet
@@ -1,4 +1,17 @@
 <span ##{ident}>
+  $if warnNoScript
+    <noscript>
+      <div .alert .alert-block>
+        <h4 .alert-heading>Javascript is disabled
+        <p>
+          This display cannot update in real-time without Javascript. #
+          Can you turn it on?
+        <p>
+          Otherwise, there are two options:
+        <p>
+          <div .btn-group>
+            <a .btn href="@{NoScriptAutoR}">Auto-refresh every 3 seconds #
+            <a .btn href="@{NoScriptR}">Manually refresh
   <div .span9>
     $if null transfers
       <h2>No current transfers
-- 
cgit v1.2.3