diff --git a/application-main/pom.xml b/application-main/pom.xml index c961a68..682a63f 100644 --- a/application-main/pom.xml +++ b/application-main/pom.xml @@ -11,8 +11,8 @@ application-main - 2024.8.1-beta.2 - Solus Lupus (2.0.0-build369) + 2024.8.1-beta.3 + Solus Lupus (2.0.0-build370) 17 diff --git a/application-main/src/main/resources/content.zip b/application-main/src/main/resources/content.zip index 8a31166..bbacff4 100644 Binary files a/application-main/src/main/resources/content.zip and b/application-main/src/main/resources/content.zip differ diff --git a/application-ui/content/assets/application/css/app-settings.css b/application-ui/content/assets/application/css/app-settings.css index 9b6af7d..503e9c0 100644 --- a/application-ui/content/assets/application/css/app-settings.css +++ b/application-ui/content/assets/application/css/app-settings.css @@ -123,6 +123,48 @@ right: 0.7rem; } +.settings { + .settings-content { + h3 { + .value { + .setting-button { + position: absolute; + right: 0.15rem; + top: 0.1rem; + font-size: 1rem; + border-radius: 0.4rem; + padding: 0.2rem 0.2rem 0 0.2rem; + border: 2px solid var(--border) !important; + background: var(--background2); + color: var(--foreground2); + transition: all 0.25s ease; + } + + .setting-value { + position: absolute; + font-weight: 1; + right: 2rem; + top: 0.1375rem; + } + } + } + + h3:hover { + .setting-button { + border: 2px solid var(--border1) !important; + background: var(--background3); + } + + .setting-button:hover { + border: 2px solid var(--highlight) !important; + background: var(--highlight); + color: var(--background5); + cursor: pointer; + } + } + } +} + .settings .settings-content h3 select { position: absolute; top: 0; right: 0; diff --git a/application-ui/content/assets/application/javascript/app-discover.js b/application-ui/content/assets/application/javascript/app-discover.js index d7960bd..a635da5 100644 --- a/application-ui/content/assets/application/javascript/app-discover.js +++ b/application-ui/content/assets/application/javascript/app-discover.js @@ -237,7 +237,17 @@ function showTab(tabId) { addEventListener("DOMContentLoaded", () => { showTab("home"); initDiscover(); - setMenuPanel("", "web app", "undefined version", true) + setMenuPanel("", "web app", "undefined version", true); + + let theme = document.getElementById("css-colors").href; + if(theme.includes("app-colors-light.css")) { + theme="default.light"; + } else if(theme.includes("app-colors-zyneon.css")) { + theme="default.zyneon"; + } else { + theme="default.dark"; + } + document.getElementById("news-frame").src="https://danieldieeins.github.io/Zyneon-Application/news/news.html?type=new&theme="+theme; document.getElementById("search-bar").addEventListener('keydown', function(event) { if (event.keyCode === 13) { diff --git a/application-ui/content/assets/application/javascript/app-settings.js b/application-ui/content/assets/application/javascript/app-settings.js index 1d83dbf..22a854b 100644 --- a/application-ui/content/assets/application/javascript/app-settings.js +++ b/application-ui/content/assets/application/javascript/app-settings.js @@ -118,14 +118,11 @@ function addModuleSetting(icon,text,onclick,id,image,group) { if(onclick) { entry.onclick = function() { connector(onclick); + log(entry.id); }; } template.parentNode.insertBefore(entry,template); - - if(!document.getElementById("settings-modules-section").classList.contains("active")) { - document.getElementById("settings-modules-section").classList.add("active"); - } } function highlight(newHighlight) { @@ -230,4 +227,27 @@ function addSelectToGroup(title,group,id,options,onchangeRequest) { } } } +} + +function addValueToGroup(title,group,id,onclickRequest,defaultValue) { + if(title&&group) { + const g = document.getElementById(group); + let i = (group+"-"+title).replaceAll(" ", "-").replace(/[^a-z0-9-_]/gi, '').toLowerCase(); + if(id) { + i = id; + } + g.innerHTML += "

"+title+"

"; + if(defaultValue) { + document.getElementById(i).querySelector(".setting-value").innerText = defaultValue; + } + if(onclickRequest) { + document.getElementById(i).querySelector(".setting-button").onclick = function () { + connector(onclickRequest); + } + } else { + document.getElementById(i).querySelector(".setting-button").onclick = function () { + connector(i); + } + } + } } \ No newline at end of file diff --git a/application-ui/content/de/discover.html b/application-ui/content/de/discover.html index ad832ce..af483a2 100644 --- a/application-ui/content/de/discover.html +++ b/application-ui/content/de/discover.html @@ -141,7 +141,7 @@

- +
diff --git a/application-ui/content/de/firstrun.html b/application-ui/content/de/firstrun.html index 9d57354..c686982 100644 --- a/application-ui/content/de/firstrun.html +++ b/application-ui/content/de/firstrun.html @@ -53,7 +53,7 @@

Please select a language

Zurück - Weiter + Weiter
diff --git a/application-ui/content/en/discover.html b/application-ui/content/en/discover.html index 797f81b..cd7437a 100644 --- a/application-ui/content/en/discover.html +++ b/application-ui/content/en/discover.html @@ -141,7 +141,7 @@

- +