Skip to content

Commit 35870e7

Browse files
Merge pull request #142 from geoCML/desktop-connect-imgs
Update geoCML Desktop to request background images from images.geocml.com
2 parents 1594d0a + 7901794 commit 35870e7

File tree

7 files changed

+1
-23
lines changed

7 files changed

+1
-23
lines changed

Dockerfiles/Dockerfile.geocml-desktop

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@ RUN ./make.sh
1616
COPY ./build-resources/geocml-desktop/connect.html /usr/share/xpra/www/connect.html
1717
COPY ./build-resources/geocml-desktop/connect.css /usr/share/xpra/www/css/connect.css
1818
COPY ./build-resources/geocml-desktop/geocml-desktop-logo.png /usr/share/xpra/www/icons/geocml-desktop-logo.png
19-
COPY ./build-resources/geocml-desktop/html5-backgrounds/* /usr/share/xpra/www/
2019

2120
######### Customize Container Here ###########
2221
######### End Customizations ###########

build-resources/geocml-desktop/connect.css

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -204,7 +204,7 @@ div.bg-image {
204204
margin: 0;
205205
top: 0;
206206
left: 0;
207-
//background-image: url(../background.png);
207+
background-image: url("https://images.geocml.com/");
208208
background-position: center center;
209209
background-repeat: no-repeat;
210210
background-size: cover;

build-resources/geocml-desktop/connect.html

Lines changed: 0 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -263,26 +263,6 @@ <h4 class="panel-title">Advanced options</h4>
263263
<div class="bg-image"></div>
264264
<script type="text/javascript">
265265

266-
function setBackgroundImage() {
267-
const time = new Date();
268-
const hour = time.getHours();
269-
const backgroundImg = document.getElementsByClassName("bg-image")[0]
270-
271-
if (hour >= 5 && hour < 11) {
272-
backgroundImg.style.backgroundImage = "url('../morning-background.png')";
273-
} else if (hour >= 11 && hour < 17) {
274-
backgroundImg.style.backgroundImage = "url('../day-background.png')";
275-
} else if (hour >= 17 && hour < 21) {
276-
backgroundImg.style.backgroundImage = "url('../evening-background.png')";
277-
} else {
278-
backgroundImg.style.backgroundImage = "url('../night-background.png')";
279-
}
280-
281-
setTimeout(() => {
282-
setBackgroundImage();
283-
}, 10 * 1000)
284-
}
285-
286266
function doConnect() {
287267
// url to client
288268
var url = "./index.html";
@@ -333,7 +313,6 @@ <h4 class="panel-title">Advanced options</h4>
333313
}
334314

335315
$(document).ready(function() {
336-
setBackgroundImage();
337316
var getparam = Utilities.getparam;
338317
var getboolparam = Utilities.getboolparam;
339318

Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.

0 commit comments

Comments
 (0)