summaryrefslogtreecommitdiffstats
path: root/assets/pages-src
diff options
context:
space:
mode:
Diffstat (limited to 'assets/pages-src')
-rw-r--r--assets/pages-src/changelog.bvr13
-rw-r--r--assets/pages-src/meals.bvr20
-rw-r--r--assets/pages-src/misc/grading-add-modal.bvr1
-rw-r--r--assets/pages-src/misc/matomo.bvr52
-rw-r--r--assets/pages-src/misc/msg-compose-modal.bvr1
-rw-r--r--assets/pages-src/misc/navigation.bvr4
6 files changed, 54 insertions, 37 deletions
diff --git a/assets/pages-src/changelog.bvr b/assets/pages-src/changelog.bvr
index 56b883c..e112765 100644
--- a/assets/pages-src/changelog.bvr
+++ b/assets/pages-src/changelog.bvr
@@ -53,6 +53,18 @@
</h3>
<ul class="collapsible">
<li>
+
+ <div class="collapsible-header">Version 1.0.16-beta</div>
+ <div class="collapsible-body">
+ <ul class="collection">
+ <li class="collection-item">Fixed meals</li>
+ <li class="collection-item">Removed LopolisAPI, created
+ lopolisc.js</li>
+ <li class="collection-item">Removed GimB Meet</li>
+ <li class="collection-item">Added checkout option to meals</li>
+ </ul>
+ </div>
+
<div class="collapsible-header">Version 1.0.15-beta</div>
<div class="collapsible-body">
<ul class="collection">
@@ -60,7 +72,6 @@
</ul>
</div>
-
<div class="collapsible-header">Version 1.0.14-beta</div>
<div class="collapsible-body">
<ul class="collection">
diff --git a/assets/pages-src/meals.bvr b/assets/pages-src/meals.bvr
index c0d655b..2fd4840 100644
--- a/assets/pages-src/meals.bvr
+++ b/assets/pages-src/meals.bvr
@@ -17,20 +17,18 @@
<script src="/js/lib/jquery.min.js"></script>
<!-- localForage -->
<script type="text/javascript" src="/js/lib/localforage.min.js"></script>
+ <!-- i18n bundle -->
+ <script src="/js/lang/bundle.js"></script>
<!-- mergedeep.js -->
<script type="text/javascript" src="/js/lib/mergedeep.js"></script>
<!-- stylesheet for custom styles -->
<link type="text/css" href="/css/styles.css" rel="stylesheet">
- <!-- page-specific javascript code -->
- <script type="text/javascript" src="/js/meals.js"></script>
<!-- PWA manifest -->
<link rel="manifest" href="/manifest.json">
<!-- app global code -->
<script src="/js/app.js"></script>
<!-- code for custom theme switcher -->
<script src="/js/lib/themes.js"></script>
- <!-- i18n bundle -->
- <script src="/js/lang/bundle.js"></script>
<!-- favicon -->
<link rel="shortcut icon" type="image/png" href="/favicon.png" />
<!-- iOS support -->
@@ -43,6 +41,10 @@
<link href="/css/fullcalendar/custom.css" rel="stylesheet" />
<script src="/js/lib/fullcalendar/core/main.min.js"></script>
<script src="/js/lib/fullcalendar/daygrid/main.min.js"></script>
+ <!-- lopolis client API library - unofficial by sijanec -->
+ <script src="/js/lopolisc.js"></script>
+ <!-- page-specific javascript code -->
+ <script type="text/javascript" src="/js/meals.js"></script>
</head>
<body>
@@ -81,6 +83,16 @@
<x-du>readOnly</x-du>
</a>
</li>
+ <li>
+ <div class=switch style=margin-left:0.7cm>
+ <label id=checkbox_label style>
+ <x-su>checkedOut</x-su>
+ <input id=checkout_checkbox type=checkbox>
+ <span class=lever></span>
+ <x-su>checkedIn</x-su>
+ </label>
+ </div>
+ </li>
<div class=divider></div>
<li id=meal-options>
diff --git a/assets/pages-src/misc/grading-add-modal.bvr b/assets/pages-src/misc/grading-add-modal.bvr
index 0b7189d..6017189 100644
--- a/assets/pages-src/misc/grading-add-modal.bvr
+++ b/assets/pages-src/misc/grading-add-modal.bvr
@@ -1,3 +1,4 @@
+<!-- @begin=html@ -->
<!-- Modal Structure -->
<div id="beziapp-add-grading" class="modal modal-fixed-footer">
diff --git a/assets/pages-src/misc/matomo.bvr b/assets/pages-src/misc/matomo.bvr
index d57beb0..614e210 100644
--- a/assets/pages-src/misc/matomo.bvr
+++ b/assets/pages-src/misc/matomo.bvr
@@ -28,42 +28,32 @@ let promises_to_run_app = [
Promise.all(promises_to_run_app).then(() => {
-if (BEZIAPP_USERNAME == null || BEZIAPP_USERNAME == "") {
- var username_report = "neprijavljen.uporabnik";
-} else {
- var username_report = BEZIAPP_USERNAME;
-}
-if (BEZIAPP_LOPOLIS_USERNAME == null || BEZIAPP_LOPOLIS_USERNAME == "") {
- var lopolis_username_report = "NEPRIJAVLJENUPORABNIK";
-} else {
- var lopolis_username_report = BEZIAPP_LOPOLIS_USERNAME;
-}
-if (BEZIAPP_LANGUAGE == null || BEZIAPP_LANGUAGE == "") {
- var language_report = "unspecified_language";
-} else {
- var language_report = BEZIAPP_LANGUAGE
-}
-if (BEZIAPP_THEME == null || BEZIAPP_THEME == "") {
- var theme_report = "unspecified_theme";
-} else {
- var theme_report = BEZIAPP_THEME;
-}
-if (BEZIAPP_ERRORREPORTING == null || BEZIAPP_ERRORREPORTING == "") {
- var errorreporting_report = "unspecified-errorreporting";
-} else {
- var errorreporting_report = BEZIAPP_ERRORREPORTING;
-}
-
var _paq = window._paq = window._paq || [];
/* tracker methods like "setCustomDimension" should be called before "trackPageView" */
_paq.push(["setDocumentTitle", document.domain + "/" + document.title]);
_paq.push(["setDoNotTrack", true]);
- _paq.push(['setUserId', username_report]);
+
+ if (BEZIAPP_USERNAME == null || BEZIAPP_USERNAME == "") {
+ } else {
+ _paq.push(['setUserId', BEZIAPP_USERNAME]);
+ }
+ if (BEZIAPP_LOPOLIS_USERNAME == null || BEZIAPP_LOPOLIS_USERNAME == "") {
+ } else {
+ _paq.push(['setCustomVariable', 1, 'lopolis-username', BEZIAPP_LOPOLIS_USERNAME, 'visit']);
+ }
+ if (BEZIAPP_LANGUAGE == null || BEZIAPP_LANGUAGE == "") {
+ } else {
+ _paq.push(['setCustomVariable', 2, 'language', BEZIAPP_LANGUAGE, 'visit']);
+ }
+ if (BEZIAPP_THEME == null || BEZIAPP_THEME == "") {
+ } else {
+ _paq.push(['setCustomVariable', 3, 'theme', BEZIAPP_THEME, 'visit']);
+ }
+ if (BEZIAPP_ERRORREPORTING == null || BEZIAPP_ERRORREPORTING == "") {
+ } else {
+ _paq.push(['setCustomVariable', 4, 'errorreporting', BEZIAPP_ERRORREPORTING, 'visit']);
+ }
_paq.push(['enableHeartBeatTimer', 30]);
- _paq.push(['setCustomVariable', 1, 'lopolis-username', lopolis_username_report, 'visit']);
- _paq.push(['setCustomVariable', 2, 'language', language_report, 'visit']);
- _paq.push(['setCustomVariable', 3, 'theme', theme_report, 'visit']);
- _paq.push(['setCustomVariable', 4, 'errorreporting', errorreporting_report, 'visit']);
_paq.push(['setCustomVariable', 5, 'domain', window.location.host, 'visit']);
_paq.push(['trackPageView']);
_paq.push(['trackAllContentImpressions']);
diff --git a/assets/pages-src/misc/msg-compose-modal.bvr b/assets/pages-src/misc/msg-compose-modal.bvr
index 48afaaf..ac91b83 100644
--- a/assets/pages-src/misc/msg-compose-modal.bvr
+++ b/assets/pages-src/misc/msg-compose-modal.bvr
@@ -1,3 +1,4 @@
+<!-- @begin=html@ -->
<!-- Modal Structure -->
<div id="beziapp-new-message" class="modal modal-fixed-footer">
diff --git a/assets/pages-src/misc/navigation.bvr b/assets/pages-src/misc/navigation.bvr
index 2f0da71..3b5b1a5 100644
--- a/assets/pages-src/misc/navigation.bvr
+++ b/assets/pages-src/misc/navigation.bvr
@@ -1,3 +1,4 @@
+<!-- @begin=html@ -->
<ul id="side-menu" class="sidenav side-menu">
<li><a class="subheader"><h4 class="sidenav-beziapp-subheader"><b>Beži</b>App</h4></a></li>
<li><a href="/pages/timetable.html" class="waves-effect"><i class="material-icons">view_module</i><x-su>timetable</x-su></a></li>
@@ -8,7 +9,8 @@
<li><a href="/pages/messaging.html" class="waves-effect"><i class="material-icons">message</i><x-su>messaging</x-su></a></li>
<!-- chats not done yet, expecting merge so removing from navigation panel --sijanec -->
<!-- <li><a href="/pages/chats.html" class="waves-effect"><i class="material-icons">chat</i><x-su>chat</x-su></a></li> -->
- <li><a href="/pages/jitsi.html" class="waves-effect"><i class="material-icons">video_call</i><x-su>videoconferences</x-su></a></li>
+ <!-- <li><a href="/pages/jitsi.html" class="waves-effect"><i class="material-icons">video_call</i><x-su>videoconferences</x-su></a></li> -->
+ <!-- jitsi got reverted to jitsi from gimb meet so it's sucky to show this -->
<li><a href="/pages/meals.html" class="waves-effect"><i class="material-icons">fastfood</i><x-su>meals</x-su></a></li>
<li><div class="divider"></div></li>
<li><a href="/pages/about.html" class="waves-effect"><i class="material-icons">info</i><x-su>about</x-su></a></li>
generated by cgit v1.2.3 (git 2.25.1) at 2024-10-30 17:13:11 +0100