Skip to content

Commit ff039e3

Browse files
committed
web: adjust SSL warning text since we can use wss now
1 parent 7d2f113 commit ff039e3

File tree

6 files changed

+40
-27
lines changed

6 files changed

+40
-27
lines changed

web/annunciators.html

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,14 @@
1212
<body>
1313

1414
<div class="ssl-warning" style="display:none; color: maroon">
15-
You are currently using HTTPS. Unfortunately OBS probably isn't
16-
using SSL and browsers only allow SSL websocket connections from
17-
SSL pages, so you need to turn SSL off. Please try changing the
15+
You are currently using HTTPS. Unfortunately if the OBS
16+
websocket isn't using SSL, then a SSL webpage can't connect to
17+
it. (From SSL webpages, browsers only allow SSL websocket
18+
connections). Thus, you need to turn SSL off. Please try changing the
1819
URL to 'http' instead of 'https' which might require telling
1920
your browser to not force SSL for this page (try clicking lock or
20-
shield icons by the URL bar).
21+
shield icons by the URL bar). This message will disappear if
22+
you successfully connect to a wss:// (websocket+SSL) URL.
2123
</div>
2224

2325
<div class="audio-warning" style="display:none; color: maroon">

web/director.html

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,14 @@
1212
<body>
1313

1414
<div class="ssl-warning" style="display:none; color: maroon">
15-
You are currently using HTTPS. Unfortunately OBS probably isn't
16-
using SSL and browsers only allow SSL websocket connections from
17-
SSL pages, so you need to turn SSL off. Please try changing the
15+
You are currently using HTTPS. Unfortunately if the OBS
16+
websocket isn't using SSL, then a SSL webpage can't connect to
17+
it. (From SSL webpages, browsers only allow SSL websocket
18+
connections). Thus, you need to turn SSL off. Please try changing the
1819
URL to 'http' instead of 'https' which might require telling
1920
your browser to not force SSL for this page (try clicking lock or
20-
shield icons by the URL bar).
21+
shield icons by the URL bar). This message will disappear if
22+
you successfully connect to a wss:// (websocket+SSL) URL.
2123
</div>
2224

2325
<div class="audio-warning" style="display:none; color: maroon">

web/index.html

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,14 @@
1616
<div class="status"></div>
1717

1818
<div class="ssl-warning" style="display:none; color: maroon">
19-
You are currently using HTTPS. Unfortunately OBS probably isn't
20-
using SSL and browsers only allow SSL websocket connections from
21-
SSL pages, so you need to turn SSL off. Please try changing the
19+
You are currently using HTTPS. Unfortunately if the OBS
20+
websocket isn't using SSL, then a SSL webpage can't connect to
21+
it. (From SSL webpages, browsers only allow SSL websocket
22+
connections). Thus, you need to turn SSL off. Please try changing the
2223
URL to 'http' instead of 'https' which might require telling
2324
your browser to not force SSL for this page (try clicking lock or
24-
shield icons by the URL bar).
25+
shield icons by the URL bar). This message will disappear if
26+
you successfully connect to a wss:// (websocket+SSL) URL.
2527
</div>
2628

2729
<ul>

web/preview.html

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -34,13 +34,16 @@
3434
</head>
3535
<body>
3636

37-
<div id="ssl-warning" style="display:none; color: maroon">You are currently using
38-
HTTPS. Unfortunately OBS probably isn't using SSL and browsers
39-
only allow SSL websocket connections from SSL pages, so you need
40-
to turn SSL off. Please try changing the URL to 'http' instead of
41-
'https' which might require telling your browser to not force SSL for this
42-
page (try clicking lock or
43-
shield icons by the URL bar)..</div>
37+
<div id="ssl-warning" style="display:none; color: maroon">
38+
You are currently using HTTPS. Unfortunately if the OBS
39+
websocket isn't using SSL, then a SSL webpage can't connect to
40+
it. (From SSL webpages, browsers only allow SSL websocket
41+
connections). Thus, you need to turn SSL off. Please try changing the
42+
URL to 'http' instead of 'https' which might require telling
43+
your browser to not force SSL for this page (try clicking lock or
44+
shield icons by the URL bar). This message will disappear if
45+
you successfully connect to a wss:// (websocket+SSL) URL.
46+
</div>
4447

4548
<div id="header">
4649
<span id="status">Status is updated here</span>.

web/small.html

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,14 @@
1212
<body>
1313

1414
<div class="ssl-warning" style="display:none; color: maroon">
15-
You are currently using HTTPS. Unfortunately OBS probably isn't
16-
using SSL and browsers only allow SSL websocket connections from
17-
SSL pages, so you need to turn SSL off. Please try changing the
15+
You are currently using HTTPS. Unfortunately if the OBS
16+
websocket isn't using SSL, then a SSL webpage can't connect to
17+
it. (From SSL webpages, browsers only allow SSL websocket
18+
connections). Thus, you need to turn SSL off. Please try changing the
1819
URL to 'http' instead of 'https' which might require telling
1920
your browser to not force SSL for this page (try clicking lock or
20-
shield icons by the URL bar).
21+
shield icons by the URL bar). This message will disappear if
22+
you successfully connect to a wss:// (websocket+SSL) URL.
2123
</div>
2224

2325
<div class="audio-warning" style="display:none; color: maroon">

web/tablet.html

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,12 +21,14 @@
2121
<body>
2222

2323
<div class="ssl-warning" style="display:none; color: maroon">
24-
You are currently using HTTPS. Unfortunately OBS probably isn't
25-
using SSL and browsers only allow SSL websocket connections from
26-
SSL pages, so you need to turn SSL off. Please try changing the
24+
You are currently using HTTPS. Unfortunately if the OBS
25+
websocket isn't using SSL, then a SSL webpage can't connect to
26+
it. (From SSL webpages, browsers only allow SSL websocket
27+
connections). Thus, you need to turn SSL off. Please try changing the
2728
URL to 'http' instead of 'https' which might require telling
2829
your browser to not force SSL for this page (try clicking lock or
29-
shield icons by the URL bar).
30+
shield icons by the URL bar). This message will disappear if
31+
you successfully connect to a wss:// (websocket+SSL) URL.
3032
</div>
3133

3234
<div class="audio-warning" style="display:none; color: maroon">

0 commit comments

Comments
 (0)