loleaflet/debug/document/admin.html | 20 +++++---------------
loleaflet/debug/document/adminAnalytics.html | 12 ++++++------
loleaflet/debug/document/adminSettings.html | 12 ++++++------
3 files changed, 17 insertions(+), 27 deletions(-)
New commits:
commit 95598c9fd3eff80e58608fd219bc48bec0d8e471
Author: Pranav Kant <pran...@collabora.com>
Date: Tue Mar 22 01:42:29 2016 +0530
loleaflet: Use SSL for admin websockets for docs in debug/
Change-Id: I49495fb68076cc2b7e797f1bc5318dc4b464afa0
diff --git a/loleaflet/debug/document/admin.html
b/loleaflet/debug/document/admin.html
index 2e66709..98bc593 100644
--- a/loleaflet/debug/document/admin.html
+++ b/loleaflet/debug/document/admin.html
@@ -33,21 +33,11 @@
<script
src="https://ajax.googleapis.com/ajax/libs/jquery/1.11.3/jquery.min.js";></script>
<script>window.jQuery || document.write('<script
src="../../dist/bootstrap/assets/js/vendor/jquery.min.js"><\/script>')</script>
<script src="../../dist/dialog/vex.combined.min.js"></script>
- <script src="../../dist/admin-src.js"></script>
+ <script src="../../dist/admin/admin-src.js"></script>
<script>vex.defaultOptions.className = 'vex-theme-plain';</script>
<script>
- function getParameterByName(name) {
- name = name.replace(/[\[]/, "\\[").replace(/[\]]/, "\\]");
- var regex = new RegExp("[\\?&]" + name + "=([^&#]*)"),
- results = regex.exec(location.search);
- return results === null ? "" : results[1].replace(/\+/g, " ");
- }
-
- var host = getParameterByName('host');
- if (host === '') {
- vex.dialog.alert('Wrong host, usage: host=ws://localhost:9989');
- }
+ var host = 'wss://' + window.location.host + '/adminws/';
new AdminSocketOverview(host);
</script>
@@ -65,8 +55,8 @@
</div>
<div id="navbar" class="navbar-collapse collapse">
<ul class="nav navbar-nav navbar-right">
- <li><a
href="admin.html?host=ws://localhost:9989">Dashboard</a></li>
- <li><a
href="adminSettings.html?host=ws://localhost:9989">Settings</a></li>
+ <li><a href="admin.html">Dashboard</a></li>
+ <li><a href="adminSettings.html">Settings</a></li>
<li><a href="#">Help</a></li>
</ul>
<form class="navbar-form navbar-right">
@@ -81,7 +71,7 @@
<div class="col-sm-3 col-md-2 sidebar">
<ul class="nav nav-sidebar">
<li class="active"><a href="#">Overview <span
class="sr-only">(current)</span></a></li>
- <li><a
href="adminAnalytics.html?host=ws://localhost:9989">Analytics</a></li>
+ <li><a href="adminAnalytics.html">Analytics</a></li>
</ul>
</div>
<div class="col-sm-9 col-sm-offset-3 col-md-10 col-md-offset-2 main">
diff --git a/loleaflet/debug/document/adminAnalytics.html
b/loleaflet/debug/document/adminAnalytics.html
index d066961..13c124c 100644
--- a/loleaflet/debug/document/adminAnalytics.html
+++ b/loleaflet/debug/document/adminAnalytics.html
@@ -35,10 +35,10 @@
<script src="../../dist/dialog/vex.combined.min.js"></script>
<script>vex.defaultOptions.className = 'vex-theme-plain';</script>
<script src="https://d3js.org/d3.v3.min.js"; charset="utf-8"></script>
- <script src="../../dist/admin-src.js"></script>
+ <script src="../../dist/admin/admin-src.js"></script>
<script>
- host = 'wss://' + window.location.hostname + ':9989';
+ host = 'wss://' + window.location.host + '/adminws/';
new AdminSocketAnalytics(host);
</script>
@@ -56,8 +56,8 @@
</div>
<div id="navbar" class="navbar-collapse collapse">
<ul class="nav navbar-nav navbar-right">
- <li><a href="admin.html?host=ws://localhost:9989">Dashboard</a></li>
- <li><a
href="adminSettings.html?host=ws://localhost:9989">Settings</a></li>
+ <li><a href="admin.html">Dashboard</a></li>
+ <li><a href="adminSettings.html">Settings</a></li>
<li><a href="#">Help</a></li>
</ul>
<form class="navbar-form navbar-right">
@@ -71,8 +71,8 @@
<div class="row">
<div class="col-sm-3 col-md-2 sidebar">
<ul class="nav nav-sidebar">
- <li><a href="admin.html?host=ws://localhost:9989">Overview <span
class="sr-only">(current)</span></a></li>
- <li class="active"><a
href="adminAnalytics.html?host=ws://localhost:9989">Analytics</a></li>
+ <li><a href="admin.html">Overview <span
class="sr-only">(current)</span></a></li>
+ <li class="active"><a href="adminAnalytics.html">Analytics</a></li>
</ul>
</div>
<div class="col-sm-9 col-sm-offset-3 col-md-10 col-md-offset-2 main">
diff --git a/loleaflet/debug/document/adminSettings.html
b/loleaflet/debug/document/adminSettings.html
index 3262211..a86b137 100644
--- a/loleaflet/debug/document/adminSettings.html
+++ b/loleaflet/debug/document/adminSettings.html
@@ -34,10 +34,10 @@
<script>window.jQuery || document.write('<script
src="../../dist/bootstrap/assets/js/vendor/jquery.min.js"><\/script>')</script>
<script src="../../dist/dialog/vex.combined.min.js"></script>
<script>vex.defaultOptions.className = 'vex-theme-plain';</script>
- <script src="../../dist/admin-src.js"></script>
+ <script src="../../dist/admin/admin-src.js"></script>
<script>
- host = 'wss://' + window.location.hostname + ':9989';
+ host = 'wss://' + window.location.host + '/adminws/';
new AdminSocketSettings(host);
</script>
@@ -55,8 +55,8 @@
</div>
<div id="navbar" class="navbar-collapse collapse">
<ul class="nav navbar-nav navbar-right">
- <li><a
href="admin.html?host=ws://localhost:9989">Dashboard</a></li>
- <li><a
href="adminSettings.html?host=ws://localhost:9989">Settings</a></li>
+ <li><a href="admin.html">Dashboard</a></li>
+ <li><a href="adminSettings.html">Settings</a></li>
<li><a href="#">Help</a></li>
</ul>
<form class="navbar-form navbar-right">
@@ -70,8 +70,8 @@
<div class="row">
<div class="col-sm-3 col-md-2 sidebar">
<ul class="nav nav-sidebar">
- <li><a href="admin.html?host=ws://localhost:9989">Overview <span
class="sr-only">(current)</span></a></li>
- <li><a
href="adminAnalytics.html?host=ws://localhost:9989">Analytics</a></li>
+ <li><a href="admin.html">Overview <span
class="sr-only">(current)</span></a></li>
+ <li><a href="adminAnalytics.html">Analytics</a></li>
</ul>
</div>
<div class="col-sm-9 col-sm-offset-3 col-md-10 col-md-offset-2 main">
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
