From a814ef4e939fe42c49955d920201eb34ba8ca3d0 Mon Sep 17 00:00:00 2001 From: sijanec Date: Tue, 25 Aug 2020 23:24:12 +0200 Subject: added developer's note to the login screen --- assets/js/login.js | 21 +++++++++++++++++++-- assets/root/login.html | 3 +++ assets/root/server-message-at-login.html | 11 +++++++++++ 3 files changed, 33 insertions(+), 2 deletions(-) create mode 100644 assets/root/server-message-at-login.html (limited to 'assets') diff --git a/assets/js/login.js b/assets/js/login.js index cdecf38..88bf501 100644 --- a/assets/js/login.js +++ b/assets/js/login.js @@ -1,7 +1,24 @@ // const API_ENDPOINT = "https://gimb.tk/test.php"; // deprecated document.addEventListener("DOMContentLoaded", () => { - setupEventListeners(); -}) + setupEventListeners(); + try { + load_server_message_at_login(); + } catch (e) { + console.log("login.js: load_server-message-at-login: silently failed."); + } +}); + +function load_server_message_at_login() { + $.ajax({ + url: "/server-message-at-login.html", + success: (data) => { + $("#server-message-at-login").html(data); + }, + error: () => { + $("#server-message-at-login").html(""); + } + }); +} function setupEventListeners() { // Setup login button listener diff --git a/assets/root/login.html b/assets/root/login.html index 542b157..95bcc2e 100644 --- a/assets/root/login.html +++ b/assets/root/login.html @@ -60,6 +60,9 @@ thePrivacyPolicy

+
+ +
diff --git a/assets/root/server-message-at-login.html b/assets/root/server-message-at-login.html new file mode 100644 index 0000000..ce28176 --- /dev/null +++ b/assets/root/server-message-at-login.html @@ -0,0 +1,11 @@ +
+ Opozorilo razvijalcev / developer's note: +
+

+ Aplikacija do 28. avgusta 2020 do predvidoma 9. ure ne bo dostopna, ker je + gimnazijski sistem nedelujoč. +

+

+ The application will not be accessible until 28th of August 2020 due to + school system malfunction. +

-- cgit v1.2.3 From ff8cdc6b1c36c2784455ac506e679092d98debdb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Anton=20Luka=20=C5=A0ijanec?= Date: Fri, 28 Aug 2020 12:37:48 +0200 Subject: spremenil server message --- assets/root/server-message-at-login.html | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) (limited to 'assets') diff --git a/assets/root/server-message-at-login.html b/assets/root/server-message-at-login.html index ce28176..d0ec9e2 100644 --- a/assets/root/server-message-at-login.html +++ b/assets/root/server-message-at-login.html @@ -2,10 +2,5 @@ Opozorilo razvijalcev / developer's note:

- Aplikacija do 28. avgusta 2020 do predvidoma 9. ure ne bo dostopna, ker je - gimnazijski sistem nedelujoč. -

-

- The application will not be accessible until 28th of August 2020 due to - school system malfunction. + Srečno v novem šolskem letu 2020/21!

-- cgit v1.2.3 From d9969379798e23b2a62f8bf6eab3967d0497b1a8 Mon Sep 17 00:00:00 2001 From: sijanec Date: Sun, 30 Aug 2020 20:14:01 +0200 Subject: popravil meal selection --- assets/js/meals.js | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'assets') diff --git a/assets/js/meals.js b/assets/js/meals.js index 78de032..891feae 100644 --- a/assets/js/meals.js +++ b/assets/js/meals.js @@ -209,8 +209,9 @@ function displayMeals(meals) { meal_node.appendChild(meal_node_div); subject_body_root.appendChild(meal_node); } - - subject_header.appendChild(subject_header_text); + var subject_header_text_span = document.createElement("span"); + subject_header_text_span.innerText = subject_header_text; + subject_header.appendChild(subject_header_text_span); subject_body.append(subject_body_root); subject_entry.append(subject_header); subject_entry.append(subject_body); -- cgit v1.2.3 From 9e714c50e8877a6c8218c82379160409cadaeebd Mon Sep 17 00:00:00 2001 From: sijanec Date: Sun, 30 Aug 2020 20:56:41 +0200 Subject: koslila => kosila @ bundle.js --- assets/js/lang/bundle.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'assets') diff --git a/assets/js/lang/bundle.js b/assets/js/lang/bundle.js index b311bf4..10cfd20 100644 --- a/assets/js/lang/bundle.js +++ b/assets/js/lang/bundle.js @@ -447,7 +447,7 @@ var langstrings = { readOnly: "samo za branje", usage: "uporaba", mealsUsageNote: "kliknite na datum za prikaz menijev, nato pa si enega izberite s klikom na ime menija. Po nastavitvi menijev ponovno naložite menije in se prepričajte o pravilnih nastavitvah.", - lunchesNote: "aplikacija ni testirana za naročanje na koslila, zato verjetno to ne deluje. Če ste naročeni na kosila lahko naročanje na menije sploh ne deluje ali pa deluje narobe.", + lunchesNote: "aplikacija ni testirana za naročanje na kosila, zato verjetno to ne deluje. Če ste naročeni na kosila lahko naročanje na menije sploh ne deluje ali pa deluje narobe.", mealNotShownNote: "če nek dan manjka med meniji, to verjetno pomeni, da ni več spremenljiv in zanj niste ročno spremenili menija", mealsContributeNote: "vabimo vas k urejanju LopolisAPI programa za upravljanje z meniji.", authenticationError: "napaka avtentikacije", -- cgit v1.2.3