summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorsijanec <sijanecantonluka@gmail.com>2020-05-17 17:37:09 +0200
committersijanec <sijanecantonluka@gmail.com>2020-05-17 17:37:09 +0200
commitb2c1b20b7c90ea481082c82ca2dba0e0e907566b (patch)
treef4e6f8fda3a3e21b072859676c0b6ad2654c1fd7
parentExperimental theme support (diff)
downloadbeziapp-b2c1b20b7c90ea481082c82ca2dba0e0e907566b.tar
beziapp-b2c1b20b7c90ea481082c82ca2dba0e0e907566b.tar.gz
beziapp-b2c1b20b7c90ea481082c82ca2dba0e0e907566b.tar.bz2
beziapp-b2c1b20b7c90ea481082c82ca2dba0e0e907566b.tar.lz
beziapp-b2c1b20b7c90ea481082c82ca2dba0e0e907566b.tar.xz
beziapp-b2c1b20b7c90ea481082c82ca2dba0e0e907566b.tar.zst
beziapp-b2c1b20b7c90ea481082c82ca2dba0e0e907566b.zip
-rw-r--r--assets/js/lang/bundle.js2
-rw-r--r--assets/js/settings.js2
-rwxr-xr-xbin/jsbundlebin0 -> 13296 bytes
-rwxr-xr-xbin/jsminbin0 -> 13664 bytes
-rwxr-xr-xconfigure2
5 files changed, 5 insertions, 1 deletions
diff --git a/assets/js/lang/bundle.js b/assets/js/lang/bundle.js
index 8d0d6b9..b5844d6 100644
--- a/assets/js/lang/bundle.js
+++ b/assets/js/lang/bundle.js
@@ -225,6 +225,7 @@ var langstrings = {
recipientNotInDirectory: "recipient is not in directory.",
chatExternalInfo: "you have just received a chat. Chats are not supported by GimSIS, so you must reply by changing the subject to something else. Chat body: ",
// meals
+ loginError: "login error",
loginToLopolis: "login to Lopolis",
loginToLopolisNote: "it seems like you're not currently logged in to eRestavracija, so this form has been presented to you. You have a different username and password combination used for applying and opting out of of menus. In order to use this feature, you have to log in with your Lopolis account.",
logInToLopolis: "log in to Lopolis",
@@ -414,6 +415,7 @@ var langstrings = {
recipientNotInDirectory: "izbrane osebe ni v imeniku",
chatExternalInfo: "dobili ste kratko sporočilo v standardu, ki ga GimSIS ne podpira. Pri odgovarjanju spremenite zadevo. Vsebina sporočila: ",
// meals
+ loginError: "napaka pri prijavi",
loginToLopolis: "prijava v Lopolis",
loginToLopolisNote: "izgleda, da niste prijavljeni v eRestavracijo, zato se vam je prikazal prijavni obrazec. Za uporavljanje s prehrano se uporablja druga kombinacija uporabniškega imena in gesla, zato se prijavite s svojimi Lopolis prijavnimi podatki za nadaljevanje.",
logInToLopolis: "prijava v Lopolis",
diff --git a/assets/js/settings.js b/assets/js/settings.js
index 411a38e..9a76ea5 100644
--- a/assets/js/settings.js
+++ b/assets/js/settings.js
@@ -32,7 +32,7 @@ document.addEventListener("DOMContentLoaded", async () => {
}).catch(() => {});
localforage.getItem("theme").then((value) => {
- let selectedTheme = value ?? "sl";
+ let selectedTheme = value ?? "themeLight";
$(`#option-${selectedTheme}`).attr("selected", true);
}).catch(() => {});
diff --git a/bin/jsbundle b/bin/jsbundle
new file mode 100755
index 0000000..d1bc0dc
--- /dev/null
+++ b/bin/jsbundle
Binary files differ
diff --git a/bin/jsmin b/bin/jsmin
new file mode 100755
index 0000000..34d72a2
--- /dev/null
+++ b/bin/jsmin
Binary files differ
diff --git a/configure b/configure
index c067913..13d7a7f 100755
--- a/configure
+++ b/configure
@@ -6,6 +6,8 @@ git clone https://github.com/sijanec/bverbose
cd bverbose
gcc test/tape-test.c -I lib -I src -o ../../bin/compose-single
gcc test/compose-all-in-dir.c -I lib -I src -o ../../bin/compose-html
+gcc test/jsbundle-test.c -I lib -I src -o ../../bin/jsbundle
+gcc test/jsmin-test.c -I lib -I src -o ../../bin/jsmin
cd ..
rm -rf bverbose
cd ..