From 6def94865615d5bccba3bae278ea54932643db9a Mon Sep 17 00:00:00 2001
From: sijanec <sijanecantonluka@gmail.com>
Date: Wed, 20 May 2020 19:33:31 +0200
Subject: should be ok to merge

---
 assets/css/styles.css         | 6 +++++-
 assets/js/lang/bundle.js      | 2 ++
 assets/js/settings.js         | 3 +++
 assets/js/setup-storage.js    | 2 +-
 assets/pages-src/settings.bvr | 9 ++++-----
 5 files changed, 15 insertions(+), 7 deletions(-)

(limited to 'assets')

diff --git a/assets/css/styles.css b/assets/css/styles.css
index e2fa509..ae21606 100644
--- a/assets/css/styles.css
+++ b/assets/css/styles.css
@@ -383,4 +383,8 @@ p {
 
 .select-dropdown {
     color: var(--color-text) !important;
-}
\ No newline at end of file
+}
+
+h1, h2, h3, h4, h5, h6 {
+	color: var(--color-text) !important;
+}
diff --git a/assets/js/lang/bundle.js b/assets/js/lang/bundle.js
index 7e269b0..9f0497b 100644
--- a/assets/js/lang/bundle.js
+++ b/assets/js/lang/bundle.js
@@ -296,6 +296,7 @@ var langstrings = {
 				errorReporting: "error reporting",
 				on: "on",
 				off: "off",
+				selectErrorReporting: "should error reports be submitted to the developers?",
         // gsec
         gsecErrNet: "GimSIS connection error",
         gsecErrLogin: "GimSIS login error (bad password?), try logging out",
@@ -491,6 +492,7 @@ var langstrings = {
 				errorReporting: "pošiljanje napak",
 				on: "vklopljeno",
 				off: "izklopljeno",
+				selectErrorReporting: "ali naj so napake v aplikaciji posredovane razvijalcem?",
         // gsec
         gsecErrNet: "napaka povezave na GimSIS",
         gsecErrLogin: "prijava v GimSIS ni uspela (napačno geslo?), poskusite se odjaviti",
diff --git a/assets/js/settings.js b/assets/js/settings.js
index 7ea0b47..1dd3bfc 100644
--- a/assets/js/settings.js
+++ b/assets/js/settings.js
@@ -66,6 +66,9 @@ document.addEventListener("DOMContentLoaded", async () => {
     var elems = document.querySelectorAll(".theme-select");
     M.FormSelect.init(elems, {});
     
+    var elems = document.querySelectorAll(".errorreporting-select");
+    M.FormSelect.init(elems, {});
+    
     // Setup language select dropdown
     var elems = document.querySelectorAll(".lang-select");
     M.FormSelect.init(elems, {});
diff --git a/assets/js/setup-storage.js b/assets/js/setup-storage.js
index ce66bba..7aaa089 100644
--- a/assets/js/setup-storage.js
+++ b/assets/js/setup-storage.js
@@ -19,7 +19,7 @@ async function setupStorage(force = false) {
         localforage.setItem("directory", {}), //\\ well I could remember my own code but I didn't.
         localforage.setItem("meals", {}),
         localforage.setItem("chosenLang", "en"),
-        localforage.setItem("theme", "light")
+        localforage.setItem("theme", "light"),
         localforage.setItem("errorReporting", "on")
     ];
 
diff --git a/assets/pages-src/settings.bvr b/assets/pages-src/settings.bvr
index 4c55da6..d460093 100644
--- a/assets/pages-src/settings.bvr
+++ b/assets/pages-src/settings.bvr
@@ -75,8 +75,8 @@
             <div class="input-field col s12">
                 <i class="material-icons prefix">palette</i>
                 <select class="theme-select input-select" id="select-theme">
-                    <option value="light" id="option-light" data-theme="light" selected><x-su>themeLight</x-su></option>
-                    <option value="dark" id="option-dark" data-theme="dark"><x-su>themeDark</x-su></option>
+                    <option value="light" id="option-light" data-theme="light" selected>Light / svetla</option>
+                    <option value="dark" id="option-dark" data-theme="dark">Dark / temna</option>
                 </select>
                 <label><x-su>selectTheme</x-su></label>
             </div>
@@ -90,13 +90,12 @@
             <div class="input-field col s12">
                 <i class="material-icons prefix">report_problem</i>
                 <select class="errorreporting-select input-select" id="select-errorreporting">
-                    <option value="on" id="option-on" data-errorreporting="on" selected><x-su>on</x-su></option>
-                   <option value="off" id="option-off" data-errorreporting="off"><x-su>off</x-su></option>
+                    <option value="on" id="option-on" data-errorreporting="on" selected>On / Vklopljeno</option>
+                   <option value="off" id="option-off" data-errorreporting="off">Off / Izklopljeno</option>
                 </select>
                 <label><x-su>selectErrorReporting</x-su></label>
             </div>
         </div>
-
     </div>
 </body>
 
-- 
cgit v1.2.3