From 945e84c538d78014eaaddfa6519bdb0f9749179f Mon Sep 17 00:00:00 2001 From: Robert Scullin Date: Fri, 19 May 2017 14:59:25 -0400 Subject: [PATCH 1/2] Improves UX when JavaScript is disabled/blocked --- css/glowingbear.css | 5 +++++ index.html | 44 ++++++++++++++++++++++++++++++++++---------- 2 files changed, 39 insertions(+), 10 deletions(-) diff --git a/css/glowingbear.css b/css/glowingbear.css index c1a36f0..335a7e1 100644 --- a/css/glowingbear.css +++ b/css/glowingbear.css @@ -906,3 +906,8 @@ img.emojione { padding-right: 0px !important; } } + +/* ng-cloak hides elements until Angular loads, preventing flickering */ +[ng\:cloak], [ng-cloak], [data-ng-cloak], [x-ng-cloak], .ng-cloak, .x-ng-cloak { + display: none !important; +} diff --git a/index.html b/index.html index ea7df19..c0d1649 100644 --- a/index.html +++ b/index.html @@ -1,5 +1,5 @@ - + @@ -49,7 +49,7 @@ -
+

Upload error: Image upload failed.

@@ -58,17 +58,41 @@ Glowing Bear WeeChat web frontend -
You're using Glowing Bear over an unencrypted connection (http://). This is not recommended! We recommend using our secure hosted version at https://www.glowing-bear.org/, or https://latest.glowing-bear.org for the latest development version. If your relay is on your local network, that is unfortunately impossible, but be aware of the implications.
-
+
You're using Glowing Bear over an unencrypted connection (http://). This is not recommended! We recommend using our secure hosted version at https://www.glowing-bear.org/, or https://latest.glowing-bear.org for the latest development version. If your relay is on your local network, that is unfortunately impossible, but be aware of the implications.
+
Connection error The client was unable to connect to the WeeChat relay
-
+
Secure connection error A secure connection with the WeeChat relay could not be initiated. This is most likely because your browser does not trust your relay's certificate. Please read the encryption instructions below!
-
+
Secure connection error Unable to connect to unencrypted relay when you are connecting to Glowing Bear over HTTPS. Please use an encrypted relay or load the page without using HTTPS.
+
+
+

+ + Important Note! + +

+
+
+
+
+
+

@@ -94,7 +118,7 @@

-
+
Error: wrong password
@@ -117,7 +141,7 @@
- +
@@ -235,7 +259,7 @@ npm run build-electron-{windows, darwin, linux}
-
+
-
+

Connection to WeeChat lost

Reconnecting... Click to try to reconnect now From c3214a2ad65f57ff49358f0ed343bbbe904e8acc Mon Sep 17 00:00:00 2001 From: Robert Scullin Date: Fri, 19 May 2017 15:09:57 -0400 Subject: [PATCH 2/2] Noscript code cleanup --- index.html | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/index.html b/index.html index c0d1649..0f98a8b 100644 --- a/index.html +++ b/index.html @@ -72,23 +72,18 @@

- + Important Note!

-
+
-