From 5a62535bce15f58d7077f851a3a24d8c3516f8e1 Mon Sep 17 00:00:00 2001 From: Captain ALM Date: Sat, 30 Jul 2022 15:07:10 +0100 Subject: [PATCH] Initial script stuff. --- README.md | 2 + base.css | 4 +- index.go.html | 39 ++++++++++++------ index.js | 44 +++++++++++++++++++++ pageHandler/pages/index/template-marshal.go | 9 ++++- 5 files changed, 83 insertions(+), 15 deletions(-) diff --git a/README.md b/README.md index 9aab2a3..3ad7cbd 100644 --- a/README.md +++ b/README.md @@ -4,6 +4,8 @@ This provides my template and cache supporting web / application server for my city university portfolio subdomain. +[Production Server](https://cityuni.captainalm.com/) + Maintainer: [Captain ALM](https://code.mrmelon54.xyz/alfred) diff --git a/base.css b/base.css index 1b94da4..81dff8c 100644 --- a/base.css +++ b/base.css @@ -20,10 +20,12 @@ main{ .centered{ text-align: center; } -.content > p{ +.content, .content > *{ word-break: break-word; -ms-word-wrap: break-word; word-wrap: break-word; +} +.content > p, .content > h1, .content > h2, .content > h3, .content > h4, .content > h5, .content > h6{ margin-top: 0.5em; margin-bottom: 0.5em; } diff --git a/index.go.html b/index.go.html index a9b54ef..324d145 100644 --- a/index.go.html +++ b/index.go.html @@ -11,7 +11,15 @@ {{ else }} {{ end }} - + +
@@ -94,7 +102,7 @@
-
+
@@ -114,8 +122,13 @@
+ {{ $c := 0 }} {{ range .GetEntries }} -
+ {{ $c = $.CounterPlusPlus }} +
+
@@ -134,14 +147,19 @@
{{ .GetContent }}
-
+
{{ if eq .VideoLocation "" }} No Video {{ else }} - + + {{ end }}
@@ -156,11 +174,6 @@
{{ end }}
-
{{ end }}
diff --git a/index.js b/index.js index a2fbdec..2fd15ea 100644 --- a/index.js +++ b/index.js @@ -2,3 +2,47 @@ This file is (C) Captain ALM Under the Creative Commons Attribution-NonCommercial-NoDerivatives 4.0 International License */ +const EntryData = [] +function CreateEntry(name, videourl, videotype, start, end, duration) { + return { + name: name, + videourl: videourl, + videotype: videotype, + start: Date.parse(start), + end: Date.parse(end), + duration : duration + }; +} +function CreateVideoPlaceholder(id) { + let imgPH = document.createElement("img") + imgPH.src = PlayImageURL + imgPH.id = "play-"+id + imgPH.alt = "Play Video" + imgPH.width = 360 + imgPH.style.cursor = "pointer" + if (document.addEventListener) { + imgPH.addEventListener("click", function () {ActivateVideo(id);}) + } else { + imgPH.setAttribute("onclick", "ActivateVideo("+id+");") + imgPH.onclick = function () {ActivateVideo(id);} + } + document.getElementById("video-" + id).appendChild(imgPH) +} +function ActivateVideo(id) { + let holder = document.getElementById("video-" + id) + holder.removeChild(document.getElementById("play-"+id)) + let vid = document.createElement("video") + vid.controls = true + let vids = document.createElement("source") + vids.src = EntryData[id].videourl + vids.type = EntryData[id].videotype + let vida = document.createElement("a") + vida.href = EntryData[id].videourl + vida.innerText = "The Video" + vid.appendChild(vids) + vid.appendChild(vida) + holder.appendChild(vid) + if (vid.play) { + vid.play() + } +} diff --git a/pageHandler/pages/index/template-marshal.go b/pageHandler/pages/index/template-marshal.go index 32cfdea..0e5f2c4 100644 --- a/pageHandler/pages/index/template-marshal.go +++ b/pageHandler/pages/index/template-marshal.go @@ -13,9 +13,10 @@ type Marshal struct { OrderName int8 OrderDuration int8 Light bool + Counter int } -func (m Marshal) GetEntries() (toReturn []EntryYaml) { +func (m *Marshal) GetEntries() (toReturn []EntryYaml) { toReturn = m.Data.Entries if m.OrderStartDate > 0 { sort.Slice(toReturn, func(i, j int) bool { @@ -59,3 +60,9 @@ func (m Marshal) GetEntries() (toReturn []EntryYaml) { } return toReturn } + +func (m *Marshal) CounterPlusPlus() int { + toret := m.Counter + m.Counter++ + return toret +}