From 26299dfd3087319b4e3908003db30c55e2b784cb Mon Sep 17 00:00:00 2001
From: Benjamin Bertrand <benjamin.bertrand@esss.se>
Date: Fri, 26 Apr 2019 23:00:53 +0200
Subject: [PATCH] Use relative URLs
---
WebSites/instruments/dashboard.json | 14 +++++++-------
WebSites/instruments/index.html | 8 ++++----
WebSites/interlocks/dashboard.json | 2 +-
WebSites/interlocks/index.html | 8 ++++----
WebSites/pos-dev/dashboard.json | 16 ++++++++--------
WebSites/pos/dashboard.json | 2 +-
WebSites/pos/index.html | 10 +++++-----
WebSites/pvs/dashboard.json | 2 +-
WebSites/pvs/index.html | 8 ++++----
9 files changed, 35 insertions(+), 35 deletions(-)
diff --git a/WebSites/instruments/dashboard.json b/WebSites/instruments/dashboard.json
index 23fa690..0deee95 100644
--- a/WebSites/instruments/dashboard.json
+++ b/WebSites/instruments/dashboard.json
@@ -96,7 +96,7 @@
{
"type": "html",
"settings": {
- "html": "<img width=\"100%\" height=\"100%\" id=\"npmhImage\", src=\"https://data.pos.esss.lu.se/npm-himage.png\"></img>\n<script>\n setInterval(function() { \n var npmhImage = document.getElementById('npmhImage'); \n npmhImage.src = 'https://data.pos.esss.lu.se/npm-himage.png?rnd=' + Math.random(); \n }, 1000); \n</script>",
+ "html": "<img width=\"100%\" height=\"100%\" id=\"npmhImage\", src=\"/data/npm-himage.png\"></img>\n<script>\n setInterval(function() { \n var npmhImage = document.getElementById('npmhImage'); \n npmhImage.src = '/data/npm-himage.png?rnd=' + Math.random(); \n }, 1000); \n</script>",
"height": 4
}
},
@@ -135,7 +135,7 @@
{
"type": "html",
"settings": {
- "html": "<img width=\"100%\" height=\"100%\" id=\"npmhImageComm\", src=\"https://data.pos.esss.lu.se/npm-commissioning-himage.png\"></img>\n<script>\n setInterval(function() { \n var npmhImageComm = document.getElementById('npmhImageComm'); \n npmhImageComm.src = 'https://data.pos.esss.lu.se/npm-commissioning-himage.png?rnd=' + Math.random(); \n }, 1000); \n</script>",
+ "html": "<img width=\"100%\" height=\"100%\" id=\"npmhImageComm\", src=\"/data/npm-commissioning-himage.png\"></img>\n<script>\n setInterval(function() { \n var npmhImageComm = document.getElementById('npmhImageComm'); \n npmhImageComm.src = '/data/npm-commissioning-himage.png?rnd=' + Math.random(); \n }, 1000); \n</script>",
"height": 4
}
},
@@ -175,7 +175,7 @@
{
"type": "html",
"settings": {
- "html": "<img width=\"100%\" height=\"100%\" id=\"npmvImageComm\", src=\"https://data.pos.esss.lu.se/npm-commissioning-vimage.png\"></img>\n<script>\nsetInterval(function() {Â \nvar npmvImageComm = document.getElementById('npmvImageComm');Â \nnpmvImageComm.src = 'https://data.pos.esss.lu.se/npm-commissioning-vimage.png?rnd=' + Math.random();Â \n}, 1000);Â \n</script>",
+ "html": "<img width=\"100%\" height=\"100%\" id=\"npmvImageComm\", src=\"/data/npm-commissioning-vimage.png\"></img>\n<script>\nsetInterval(function() {Â \nvar npmvImageComm = document.getElementById('npmvImageComm');Â \nnpmvImageComm.src = '/data/npm-commissioning-vimage.png?rnd=' + Math.random();Â \n}, 1000);Â \n</script>",
"height": 4
}
},
@@ -220,7 +220,7 @@
{
"type": "html",
"settings": {
- "html": "<img width=\"100%\" height=\"100%\" id=\"npmvImage\", src=\"https://data.pos.esss.lu.se/npm-vimage.png\"></img>\n<script>\n setInterval(function() { \n var npmvImage = document.getElementById('npmvImage'); \n npmvImage.src = 'https://data.pos.esss.lu.se/npm-vimage.png?rnd=' + Math.random(); \n }, 1000); \n</script>",
+ "html": "<img width=\"100%\" height=\"100%\" id=\"npmvImage\", src=\"/data/npm-vimage.png\"></img>\n<script>\n setInterval(function() { \n var npmvImage = document.getElementById('npmvImage'); \n npmvImage.src = '/data/npm-vimage.png?rnd=' + Math.random(); \n }, 1000); \n</script>",
"height": 4
}
},
@@ -265,7 +265,7 @@
{
"type": "html",
"settings": {
- "html": "<img width=\"100%\" height=\"100%\" id=\"emuhImage\", src=\"https://data.pos.esss.lu.se/emu-himage.png\"></img>\n<script>\n setInterval(function() { \n var emuhImage = document.getElementById('emuhImage'); \n emuhImage.src = 'https://data.pos.esss.lu.se/emu-himage.png?rnd=' + Math.random(); \n }, 1000); \n</script>",
+ "html": "<img width=\"100%\" height=\"100%\" id=\"emuhImage\", src=\"/data/emu-himage.png\"></img>\n<script>\n setInterval(function() { \n var emuhImage = document.getElementById('emuhImage'); \n emuhImage.src = '/data/emu-himage.png?rnd=' + Math.random(); \n }, 1000); \n</script>",
"height": 4
}
}
@@ -297,7 +297,7 @@
{
"type": "html",
"settings": {
- "html": "<img width=\"100%\" height=\"100%\" id=\"emuvImage\", src=\"https://data.pos.esss.lu.se/emu-vimage.png\"></img>\n<script>\n setInterval(function() { \n var emuvImage = document.getElementById('emuvImage'); \n emuvImage.src = 'https://data.pos.esss.lu.se/emu-vimage.png?rnd=' + Math.random(); \n }, 1000); \n</script>",
+ "html": "<img width=\"100%\" height=\"100%\" id=\"emuvImage\", src=\"/data/emu-vimage.png\"></img>\n<script>\n setInterval(function() { \n var emuvImage = document.getElementById('emuvImage'); \n emuvImage.src = '/data/emu-vimage.png?rnd=' + Math.random(); \n }, 1000); \n</script>",
"height": 4
}
}
@@ -309,7 +309,7 @@
"name": "Instruments",
"type": "JSON",
"settings": {
- "url": "https://data.pos.esss.lu.se/getInstruments",
+ "url": "/data/getInstruments",
"use_thingproxy": false,
"refresh": 1,
"method": "GET"
diff --git a/WebSites/instruments/index.html b/WebSites/instruments/index.html
index d377dae..0b08301 100644
--- a/WebSites/instruments/index.html
+++ b/WebSites/instruments/index.html
@@ -66,10 +66,10 @@
</head>
<body>
<ul id="menu">
- <li><a href="https://pos.esss.lu.se">Public Operations Screen</a></li>
- <li><a href="https://interlocks.pos.esss.lu.se">High Voltage Interlocks</a></li>
- <li><a href="https://instruments.pos.esss.lu.se">Beam Instruments</a></li>
- <li><a href="https://pvs.pos.esss.lu.se">PV Search Engine</a></li>
+ <li><a href="/">Public Operations Screen</a></li>
+ <li><a href="/interlocks/">High Voltage Interlocks</a></li>
+ <li><a href="/instruments/">Beam Instruments</a></li>
+ <li><a href="/pvs/">PV Search Engine</a></li>
</ul>
<div id="board-content">
<img id="dash-logo" data-bind="attr:{src: header_image}, visible:header_image()">
diff --git a/WebSites/interlocks/dashboard.json b/WebSites/interlocks/dashboard.json
index b6d69f3..b29929c 100644
--- a/WebSites/interlocks/dashboard.json
+++ b/WebSites/interlocks/dashboard.json
@@ -148,7 +148,7 @@
"name": "Public Data",
"type": "JSON",
"settings": {
- "url": "https://data.pos.esss.lu.se/getInterlocks",
+ "url": "/data/getInterlocks",
"use_thingproxy": false,
"refresh": 1,
"method": "GET"
diff --git a/WebSites/interlocks/index.html b/WebSites/interlocks/index.html
index 5085eb9..cc1e147 100644
--- a/WebSites/interlocks/index.html
+++ b/WebSites/interlocks/index.html
@@ -66,10 +66,10 @@
</head>
<body>
<ul id="menu">
- <li><a href="https://pos.esss.lu.se">Public Operations Screen</a></li>
- <li><a href="https://interlocks.pos.esss.lu.se">High Voltage Interlocks</a></li>
- <li><a href="https://instruments.pos.esss.lu.se">Beam Instruments</a></li>
- <li><a href="https://pvs.pos.esss.lu.se">PV Search Engine</a></li>
+ <li><a href="/">Public Operations Screen</a></li>
+ <li><a href="/interlocks/">High Voltage Interlocks</a></li>
+ <li><a href="/instruments/">Beam Instruments</a></li>
+ <li><a href="/pvs/">PV Search Engine</a></li>
</ul>
<div id="board-content">
<img id="dash-logo" data-bind="attr:{src: header_image}, visible:header_image()">
diff --git a/WebSites/pos-dev/dashboard.json b/WebSites/pos-dev/dashboard.json
index 19a4684..39d4672 100644
--- a/WebSites/pos-dev/dashboard.json
+++ b/WebSites/pos-dev/dashboard.json
@@ -96,7 +96,7 @@
{
"type": "html",
"settings": {
- "html": "<img width=\"100%\" height=\"100%\" id=\"npmhImage\", src=\"https://data.pos.esss.lu.se/npm-himage.png\"></img>\n<script>\n setInterval(function() { \n var npmhImage = document.getElementById('npmhImage'); \n npmhImage.src = 'https://data.pos.esss.lu.se/npm-himage.png?rnd=' + Math.random(); \n }, 1000); \n</script>",
+ "html": "<img width=\"100%\" height=\"100%\" id=\"npmhImage\", src=\"/data/npm-himage.png\"></img>\n<script>\n setInterval(function() { \n var npmhImage = document.getElementById('npmhImage'); \n npmhImage.src = '/data/npm-himage.png?rnd=' + Math.random(); \n }, 1000); \n</script>",
"height": 4
}
},
@@ -135,7 +135,7 @@
{
"type": "html",
"settings": {
- "html": "<img width=\"100%\" height=\"100%\" id=\"npmhImageComm\", src=\"https://data.pos.esss.lu.se/npm-commissioning-himage.png\"></img>\n<script>\n setInterval(function() { \n var npmhImageComm = document.getElementById('npmhImageComm'); \n npmhImageComm.src = 'https://data.pos.esss.lu.se/npm-commissioning-himage.png?rnd=' + Math.random(); \n }, 1000); \n</script>",
+ "html": "<img width=\"100%\" height=\"100%\" id=\"npmhImageComm\", src=\"/data/npm-commissioning-himage.png\"></img>\n<script>\n setInterval(function() { \n var npmhImageComm = document.getElementById('npmhImageComm'); \n npmhImageComm.src = '/data/npm-commissioning-himage.png?rnd=' + Math.random(); \n }, 1000); \n</script>",
"height": 4
}
},
@@ -175,7 +175,7 @@
{
"type": "html",
"settings": {
- "html": "<img width=\"100%\" height=\"100%\" id=\"npmvImageComm\", src=\"https://data.pos.esss.lu.se/npm-commissioning-vimage.png\"></img>\n<script>\nsetInterval(function() {Â \nvar npmvImageComm = document.getElementById('npmvImageComm');Â \nnpmvImageComm.src = 'https://data.pos.esss.lu.se/npm-commissioning-vimage.png?rnd=' + Math.random();Â \n}, 1000);Â \n</script>",
+ "html": "<img width=\"100%\" height=\"100%\" id=\"npmvImageComm\", src=\"/data/npm-commissioning-vimage.png\"></img>\n<script>\nsetInterval(function() {Â \nvar npmvImageComm = document.getElementById('npmvImageComm');Â \nnpmvImageComm.src = '/data/npm-commissioning-vimage.png?rnd=' + Math.random();Â \n}, 1000);Â \n</script>",
"height": 4
}
},
@@ -220,7 +220,7 @@
{
"type": "html",
"settings": {
- "html": "<img width=\"100%\" height=\"100%\" id=\"npmvImage\", src=\"https://data.pos.esss.lu.se/npm-vimage.png\"></img>\n<script>\n setInterval(function() { \n var npmvImage = document.getElementById('npmvImage'); \n npmvImage.src = 'https://data.pos.esss.lu.se/npm-vimage.png?rnd=' + Math.random(); \n }, 1000); \n</script>",
+ "html": "<img width=\"100%\" height=\"100%\" id=\"npmvImage\", src=\"/data/npm-vimage.png\"></img>\n<script>\n setInterval(function() { \n var npmvImage = document.getElementById('npmvImage'); \n npmvImage.src = '/data/npm-vimage.png?rnd=' + Math.random(); \n }, 1000); \n</script>",
"height": 4
}
},
@@ -265,7 +265,7 @@
{
"type": "html",
"settings": {
- "html": "<img width=\"100%\" height=\"100%\" id=\"emuhImage\", src=\"https://data.pos.esss.lu.se/emu-himage.png\"></img>\n<script>\n setInterval(function() { \n var emuhImage = document.getElementById('emuhImage'); \n emuhImage.src = 'https://data.pos.esss.lu.se/emu-himage.png?rnd=' + Math.random(); \n }, 1000); \n</script>",
+ "html": "<img width=\"100%\" height=\"100%\" id=\"emuhImage\", src=\"/data/emu-himage.png\"></img>\n<script>\n setInterval(function() { \n var emuhImage = document.getElementById('emuhImage'); \n emuhImage.src = '/data/emu-himage.png?rnd=' + Math.random(); \n }, 1000); \n</script>",
"height": 4
}
}
@@ -297,7 +297,7 @@
{
"type": "html",
"settings": {
- "html": "<img width=\"100%\" height=\"100%\" id=\"emuvImage\", src=\"https://data.pos.esss.lu.se/emu-vimage.png\"></img>\n<script>\n setInterval(function() { \n var emuvImage = document.getElementById('emuvImage'); \n emuvImage.src = 'https://data.pos.esss.lu.se/emu-vimage.png?rnd=' + Math.random(); \n }, 1000); \n</script>",
+ "html": "<img width=\"100%\" height=\"100%\" id=\"emuvImage\", src=\"/data/emu-vimage.png\"></img>\n<script>\n setInterval(function() { \n var emuvImage = document.getElementById('emuvImage'); \n emuvImage.src = '/data/emu-vimage.png?rnd=' + Math.random(); \n }, 1000); \n</script>",
"height": 4
}
}
@@ -309,7 +309,7 @@
"name": "Instruments",
"type": "JSON",
"settings": {
- "url": "https://data.pos.esss.lu.se/getInstruments",
+ "url": "/data/getInstruments",
"use_thingproxy": false,
"refresh": 1,
"method": "GET"
@@ -317,4 +317,4 @@
}
],
"columns": 4
-}
\ No newline at end of file
+}
diff --git a/WebSites/pos/dashboard.json b/WebSites/pos/dashboard.json
index 6a7e7a2..80cfbd2 100644
--- a/WebSites/pos/dashboard.json
+++ b/WebSites/pos/dashboard.json
@@ -486,7 +486,7 @@
"name": "Public Data",
"type": "JSON",
"settings": {
- "url": "https://data.pos.esss.lu.se/getPublicData",
+ "url": "/data/getPublicData",
"use_thingproxy": false,
"refresh": 1,
"method": "GET"
diff --git a/WebSites/pos/index.html b/WebSites/pos/index.html
index 39049cd..1519c50 100644
--- a/WebSites/pos/index.html
+++ b/WebSites/pos/index.html
@@ -5,7 +5,7 @@
<meta charset="UTF-8">
<title>European Spallation Source ERIC - Public OPI</title>
<meta property="og:title" content="European Spallation Source ERIC - Public OPI"/>
- <meta property="og:image" content="https://pos.esss.lu.se/img/pos.png"/>
+ <meta property="og:image" content="/img/pos.png"/>
<meta property="og:description" content="Realtime operations information directly from the Control Room of the European Spallation Source ERIC"/>
<meta property="og:url" content="https://pos.esss.lu.se" />
<meta name="twitter:card" content="summary_large_image">
@@ -73,10 +73,10 @@
</head>
<body>
<ul id="menu">
- <li><a href="https://pos.esss.lu.se">Public Operations Screen</a></li>
- <li><a href="https://interlocks.pos.esss.lu.se">High Voltage Interlocks</a></li>
- <li><a href="https://instruments.pos.esss.lu.se">Beam Instruments</a></li>
- <li><a href="https://pvs.pos.esss.lu.se">PV Search Engine</a></li>
+ <li><a href="/">Public Operations Screen</a></li>
+ <li><a href="/interlocks/">High Voltage Interlocks</a></li>
+ <li><a href="/instruments/">Beam Instruments</a></li>
+ <li><a href="/pvs/">PV Search Engine</a></li>
</ul>
<div id="board-content">
<img id="dash-logo" data-bind="attr:{src: header_image}, visible:header_image()">
diff --git a/WebSites/pvs/dashboard.json b/WebSites/pvs/dashboard.json
index 391c690..99bff62 100644
--- a/WebSites/pvs/dashboard.json
+++ b/WebSites/pvs/dashboard.json
@@ -53,7 +53,7 @@
{
"type": "html",
"settings": {
- "html": "<script>\nfunction clickPress(event) {\n if (event.which == 13) {\n freeboard.showLoadingIndicator(true);\n \tvar searchVar = document.getElementById(\"searchBar\").value;\n $.get(\"https://data.pos.esss.lu.se/search/\"+searchVar).done(function(data) {\n\t\t\tdocument.getElementById('result_div').innerHTML=data[\"pvs\"];\n freeboard.showLoadingIndicator(false);\n });\n\t};\n};\n\nfunction searchPV(PVname) {\n\tfreeboard.showLoadingIndicator(true);\n\t$.get(\"https://data.pos.esss.lu.se/getPVHTML/\"+PVname).done(function(data) {\n if (typeof data[\"link\"] === 'undefined') {\n\t\t\tdocument.getElementById('result_pv').innerHTML=data[\"info\"]+\"<p>\"+data[\"archiver\"];\n }\n else {\n document.getElementById('result_pv').innerHTML=data[\"info\"]+\"<p>\"+data[\"archiver\"]+\"<p>\"+data[\"link\"];\n };\n freeboard.showLoadingIndicator(false);\n });\n};\n</script>\n<center><input id=\"searchBar\" type=\"text\" onkeypress=\"clickPress(event)\" placeholder=\"Search for a PV\"></input></center>\n\n",
+ "html": "<script>\nfunction clickPress(event) {\n if (event.which == 13) {\n freeboard.showLoadingIndicator(true);\n \tvar searchVar = document.getElementById(\"searchBar\").value;\n $.get(\"/data/search/\"+searchVar).done(function(data) {\n\t\t\tdocument.getElementById('result_div').innerHTML=data[\"pvs\"];\n freeboard.showLoadingIndicator(false);\n });\n\t};\n};\n\nfunction searchPV(PVname) {\n\tfreeboard.showLoadingIndicator(true);\n\t$.get(\"/data/getPVHTML/\"+PVname).done(function(data) {\n if (typeof data[\"link\"] === 'undefined') {\n\t\t\tdocument.getElementById('result_pv').innerHTML=data[\"info\"]+\"<p>\"+data[\"archiver\"];\n }\n else {\n document.getElementById('result_pv').innerHTML=data[\"info\"]+\"<p>\"+data[\"archiver\"]+\"<p>\"+data[\"link\"];\n };\n freeboard.showLoadingIndicator(false);\n });\n};\n</script>\n<center><input id=\"searchBar\" type=\"text\" onkeypress=\"clickPress(event)\" placeholder=\"Search for a PV\"></input></center>\n\n",
"height": 1
}
}
diff --git a/WebSites/pvs/index.html b/WebSites/pvs/index.html
index 690f158..daef00a 100644
--- a/WebSites/pvs/index.html
+++ b/WebSites/pvs/index.html
@@ -66,10 +66,10 @@
</head>
<body>
<ul id="menu">
- <li><a href="https://pos.esss.lu.se">Public Operations Screen</a></li>
- <li><a href="https://interlocks.pos.esss.lu.se">High Voltage Interlocks</a></li>
- <li><a href="https://instruments.pos.esss.lu.se">Beam Instruments</a></li>
- <li><a href="https://pvs.pos.esss.lu.se">PV Search Engine</a></li>
+ <li><a href="/">Public Operations Screen</a></li>
+ <li><a href="/interlocks/">High Voltage Interlocks</a></li>
+ <li><a href="/instruments/">Beam Instruments</a></li>
+ <li><a href="/pvs/">PV Search Engine</a></li>
</ul>
<div id="board-content">
<img id="dash-logo" data-bind="attr:{src: header_image}, visible:header_image()">
--
GitLab