author: Anton L. Šijanec <sijanecantonluka@gmail.com> 2020-05-12 21:13:59 +0200
committer: Anton L. Šijanec <sijanecantonluka@gmail.com> 2020-05-12 21:13:59 +0200
commit: 9df939a73fca559081523477cdcc9805c225fa23 (patch)
tree: e175fea49e66bb722b1284ff0251a171af55b6ab /pages
parent: chats.js not done yet (diff)
download: beziapp-9df939a73fca559081523477cdcc9805c225fa23.tar
beziapp-9df939a73fca559081523477cdcc9805c225fa23.tar.gz
beziapp-9df939a73fca559081523477cdcc9805c225fa23.tar.bz2
beziapp-9df939a73fca559081523477cdcc9805c225fa23.tar.lz
beziapp-9df939a73fca559081523477cdcc9805c225fa23.tar.xz
beziapp-9df939a73fca559081523477cdcc9805c225fa23.tar.zst
beziapp-9df939a73fca559081523477cdcc9805c225fa23.zip
29 files changed, 1641 insertions, 151 deletions
diff --git a/pages-src/about.bvr b/pages-src/about.bvr
new file mode 100644
index 0000000..d349799
--- /dev/null
+++ b/pages-src/about.bvr
@@ -0,0 +1,116 @@
+<@?i global@>
+<!DOCTYPE html>
+<html>
+<head>
+    <meta charset="UTF-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=no">
+    <meta http-equiv="X-UA-Compatible" content="ie=edge">
+    <meta name="google" content="notranslate">
+    <title>About &laquo; BežiApp</title>
+
+    <!-- Materialize -->
+    <link type="text/css" href="/css/materialize.min.css" rel="stylesheet">
+    <link href="/css/materialicons.css" rel="stylesheet">
+    <link href="/css/fontawesome.min.css" rel="stylesheet">
+    <script type="text/javascript" src="/js/lib/materialize.min.js"></script>
+
+    <script src="/js/lib/jquery.min.js"></script>
+    <script type="text/javascript" src="/js/lib/localforage.min.js"></script>
+
+    <link type="text/css" href="/css/styles.css" rel="stylesheet">
+    <script type="text/javascript" src="/js/about.js"></script>
+
+    <link rel="manifest" href="/manifest.json">
+    <script src="/js/app.js"></script>
+    <script src="/js/lang/bundle.js"></script>
+    <link rel="shortcut icon" type="image/png" href="/favicon.png" />
+
+    <!-- iOS support -->
+    <link rel="apple-touch-icon" href="/img/icons/icon_96.png">
+    <link rel="apple-touch-icon" href="/img/icons/icon_512.png">
+    <meta name="apple-mobile-web-app-status-bar" content="#004d32">
+</head>
+
+<body>
+    <nav class="z-depth-0" id="navigation-main">
+        <div class="nav-wrapper container">
+            <b>Beži</b><span>App</span> &raquo; <x-su>about</x-su>
+            <span class="right white-text">
+                <i class="material-icons sidenav-trigger" data-target="side-menu">menu</i>
+            </span>
+        </div>
+        <div id="loading-bar" class="progress hidden">
+            <div class="indeterminate"></div>
+        </div>
+    </nav>
+
+		<@?i navigation@>
+    <div class="container">
+        <div class="row">
+            <div class="col s12">
+                <h3><b class="title-secondary">Beži</b><span class="title-primary">App</span>
+                </h3>
+                <h5 class="subheader"><x-su>version</x-su> 1.0.12-beta</h5>
+            </div>
+        </div>
+        <div class="row">
+            <div class="col s12">
+                <ul class="collection with-header">
+                    <li class="collection-header">
+                        <h5><x-su>authors</x-su></h5>
+                    </li>
+                    <li class="collection-item avatar">
+                        <img src="/img/avatars/rstular.png" class="circle">
+                        <span class="title about-text">Rok Štular</span>
+			&nbsp;&nbsp;&nbsp;&nbsp; <!-- technology -->
+			<a href="messaging.html#Rok Štular" class="btn waves-effect waves-light" type="button">
+                            <i class="material-icons">message</i>
+                        </a>
+                        <a target="_blank" href="https://instagram.com/rstular/"
+                            class="secondary-content btn-floating btn-medium waves-effect waves-light button-theme-gimb"><i
+                                class="fab fa-instagram"></i></a>
+                    </li>
+
+                    <li class="collection-item avatar">
+                        <img src="/img/avatars/asijanec.png" class="circle">
+                        <span class="title about-text">Anton Luka Šijanec</span>
+                        <a target="_blank" href="https://instagram.com/asijanec/"
+                            class="secondary-content btn-floating btn-medium waves-effect waves-light button-theme-gimb"><i
+                                class="fab fa-instagram"></i></a>
+			</a>
+			&nbsp;&nbsp;&nbsp;&nbsp; <!-- technology -->
+			<a href="messaging.html#Anton Luka Šijanec" class="btn waves-effect waves-light" type="button">
+                            <i class="material-icons">message</i>
+                        </a>
+                    </li>
+                </ul>
+            </div>
+        </div>
+        <div class="row">
+            <div class="col s12">
+                <ul class="collection with-header">
+                    <li class="collection-header">
+                        <h5><x-su>translatorsForThisLanguage</x-su> - <x-su>miscTranslationLanguage</x-su></h5>
+                    </li>
+                    <li class="collection-item avatar">
+                        <span class="title about-text"><x-su>miscTranslationAuthors</x-su></span>
+                    </li>
+                </ul>
+            </div>
+        </div>
+        <div class="row">
+            <div class="col s12">
+                <div class="collection">
+                    <a href="/pages/changelog.html" class="collection-item"><x-su>whatIsNew</x-su></a>
+                    <a href="/pages/tos.html" class="collection-item"><x-su>theToS</x-su></a>
+                    <a href="/pages/privacypolicy.html" class="collection-item"><x-su>thePrivacyPolicy</x-su></a>
+                    <a href="https://instagram.com/beziapp/" target="_blank" class="collection-item">
+											<x-su>reportABug</x-su> / <x-su>sendASuggestion</x-su> (<x-su>instagram></x-su>: @beziapp)
+										</a>
+                </div>
+            </div>
+        </div>
+    </div>
+</body>
+
+</html>
diff --git a/pages-src/absences.bvr b/pages-src/absences.bvr
new file mode 100644
index 0000000..60ee008
--- /dev/null
+++ b/pages-src/absences.bvr
@@ -0,0 +1,72 @@
+<@?i global@>
+<!DOCTYPE html>
+<html>
+<head>
+    <meta charset="UTF-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=no">
+    <meta http-equiv="X-UA-Compatible" content="ie=edge">
+    <meta name="google" content="notranslate">
+    <title>Absences &laquo; BežiApp</title>
+
+    <!-- Materialize -->
+    <link type="text/css" href="/css/materialize.min.css" rel="stylesheet">
+    <link href="/css/materialicons.css" rel="stylesheet">
+    <script type="text/javascript" src="/js/lib/materialize.min.js"></script>
+
+    <script src="/js/lib/jquery.min.js"></script>
+    <script type="text/javascript" src="/js/lib/localforage.min.js"></script>
+
+    <link type="text/css" href="/css/styles.css" rel="stylesheet">
+    <script type="text/javascript" src="/js/absences.js"></script>
+
+    <link rel="manifest" href="/manifest.json">
+    <script src="/js/app.js"></script>
+    <script src="/js/gsec.js"></script> <!-- gimsisextclient -->
+    <script src="/js/lang/bundle.js"></script>
+    <link rel="shortcut icon" type="image/png" href="/favicon.png" />
+
+    <!-- iOS support -->
+    <link rel="apple-touch-icon" href="/img/icons/icon_96.png">
+    <link rel="apple-touch-icon" href="/img/icons/icon_512.png">
+    <meta name="apple-mobile-web-app-status-bar" content="#004d32">
+</head>
+
+<body>
+    <nav class="z-depth-0" id="navigation-main">
+        <div class="nav-wrapper container">
+            <b>Beži</b><span>App</span> &raquo; <x-su>absences</x-su>
+            <span class="right white-text">
+                <i class="material-icons sidenav-trigger" data-target="side-menu">menu</i>
+            </span>
+            <span class="right white-text" id="refresh-icon">
+                <a href="#"><i class="material-icons">refresh</i></a>
+            </span>
+        </div>
+        <div id="loading-bar" class="progress hidden">
+            <div class="indeterminate"></div>
+        </div>
+    </nav>
+		<@?i navigation@>
+    <br>
+    <div class="container">
+        <div class="row">
+            <div class="col s6 l6">
+                <input type="text" class="datepicker" id="datepicker-from">
+                <label for="datepicker-from"><x-su>from</x-su></label>
+            </div>
+            <div class="col s6 l6">
+                <input type="text" class="datepicker" id="datepicker-to">
+                <label for="datepicker-to"><x-su>to</x-su></label>
+            </div>
+        </div>
+        <div class="row">
+            <div class="col s12">
+                <ul class="collapsible" id="absences-col">
+                </ul>
+            </div>
+        </div>
+    </div>
+
+</body>
+
+</html>
diff --git a/pages-src/changelog.bvr b/pages-src/changelog.bvr
new file mode 100644
index 0000000..11ab78f
--- /dev/null
+++ b/pages-src/changelog.bvr
@@ -0,0 +1,127 @@
+<@?i global@>
+<!DOCTYPE html>
+<html>
+<head>
+    <meta charset="UTF-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=no">
+    <meta http-equiv="X-UA-Compatible" content="ie=edge">
+    <meta name="google" content="notranslate">
+    <title>Changelog &laquo; BežiApp</title>
+
+    <!-- Materialize -->
+    <link type="text/css" href="/css/materialize.min.css" rel="stylesheet">
+    <link href="/css/materialicons.css" rel="stylesheet">
+    <link href="/css/fontawesome.min.css" rel="stylesheet">
+    <script type="text/javascript" src="/js/lib/materialize.min.js"></script>
+
+    <script src="/js/lib/jquery.min.js"></script>
+    <script type="text/javascript" src="/js/lib/localforage.min.js"></script>
+
+    <link type="text/css" href="/css/styles.css" rel="stylesheet">
+    <script type="text/javascript" src="/js/changelog.js"></script>
+
+    <link rel="manifest" href="/manifest.json">
+    <script src="/js/app.js"></script>
+    <script src="/js/lang/bundle.js"></script>
+    <link rel="shortcut icon" type="image/png" href="/favicon.png" />
+
+    <!-- iOS support -->
+    <link rel="apple-touch-icon" href="/img/icons/icon_96.png">
+    <link rel="apple-touch-icon" href="/img/icons/icon_512.png">
+    <meta name="apple-mobile-web-app-status-bar" content="#004d32">
+</head>
+
+<body>
+    <nav class="z-depth-0" id="navigation-main">
+        <div class="nav-wrapper container">
+            <b>Beži</b><span>App</span> &raquo; <x-su>changelog</x-su>
+            <span class="right white-text" id="nav-back-button">
+                <i class="material-icons">arrow_back</i>
+            </span>
+        </div>
+        <div id="loading-bar" class="progress hidden">
+            <div class="indeterminate"></div>
+        </div>
+    </nav>
+
+    <div class="container">
+        <div class="row">
+            <h3><x-su>changelog</x-su></h3>
+            <ul class="collapsible">
+                <li>
+                    <div class="collapsible-header">Version 1.0.12-beta</div>
+                    <div class="collapsible-body">
+                        <ul class="collection">
+                            <li class="collection-item">1.0.12.28-beta: Now update does not clear whole database => you stay logged in</li>
+                            <li class="collection-item">Added multilanguage support</li>
+                        </ul>
+                    </div>
+
+                    <div class="collapsible-header">Version 1.0.11-beta</div> <!-- i think -->
+                    <div class="collapsible-body">
+                        <ul class="collection">
+                            <li class="collection-item">Added end-to-end encrypton support to messaging</li>
+                        </ul>
+                    </div>
+
+                    <div class="collapsible-header">Version 1.0.10-beta</div>
+                    <div class="collapsible-body">
+                        <ul class="collection">
+                            <li class="collection-item">Added meals</li>
+                        </ul>
+                    </div>
+
+                    <div class="collapsible-header">Version 1.0.9-beta</div>
+                    <div class="collapsible-body">
+                        <ul class="collection">
+                            <li class="collection-item">Added image sending support to messaging</li>
+                        </ul>
+                    </div>
+
+                    <div class="collapsible-header">Version 1.0.8-beta</div>
+                    <div class="collapsible-body">
+                        <ul class="collection">
+                            <li class="collection-item">Added messaging</li>
+                        </ul>
+                    </div>
+
+                    <div class="collapsible-header">Version 1.0.7-beta</div>
+                    <div class="collapsible-body">
+                        <ul class="collection">
+                            <li class="collection-item">Enter key now triggers login in the login form</li>
+                        </ul>
+                    </div>
+
+                    <div class="collapsible-header">Version 1.0.6-beta</div>
+                    <div class="collapsible-body">
+                        <ul class="collection">
+                            <li class="collection-item">Fixed a typo (related to #5)</li>
+                        </ul>
+                    </div>
+
+                    <div class="collapsible-header">Version 1.0.5-beta</div>
+                    <div class="collapsible-body">
+                        <ul class="collection">
+                            <li class="collection-item">Fixed default view on startup</li>
+                            <li class="collection-item">Changed promise handling in gradings (#5)</li>
+                        </ul>
+                    </div>
+
+                    <div class="collapsible-header">Version 1.0.4-beta</div>
+                    <div class="collapsible-body">
+                        <ul class="collection">
+                            <li class="collection-item">Introduced the changelog</li>
+                            <li class="collection-item">Fixed date picker color</li>
+                            <li class="collection-item">Changed weekly timetable accent color</li>
+                            <li class="collection-item">Option for including/excluding temporary grades in average
+                                calculation (credit: Tinkara)</li>
+                        </ul>
+                    </div>
+                </li>
+            </ul>
+        </div>
+    </div>
+
+</body>
+
+</html>
diff --git a/pages-src/chats.bvr b/pages-src/chats.bvr
new file mode 100644
index 0000000..39e72b1
--- /dev/null
+++ b/pages-src/chats.bvr
@@ -0,0 +1,91 @@
+<@?i global@>
+<!DOCTYPE html>
+<html>
+	<head>
+		<meta charset="UTF-8">
+		<meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=no">
+		<meta http-equiv="X-UA-Compatible" content="ie=edge">
+		<meta name="google" content="notranslate">
+		<title>Chats &laquo; BežiApp</title>
+		<!-- Materialize -->
+		<link type="text/css" href="/css/materialize.min.css" rel="stylesheet">
+		<link href="/css/materialicons.css" rel="stylesheet">
+		<script type="text/javascript" src="/js/lib/materialize.min.js"></script>
+		<script src="/js/lib/jquery.min.js"></script>
+		<script type="text/javascript" src="/js/lib/localforage.min.js"></script>
+		<link type="text/css" href="/css/styles.css" rel="stylesheet">
+		<link type="text/css" href="/css/bubbles.css" rel="stylesheet">
+		<script type="text/javascript" src="/js/gsec.js" ></script>
+		<script type="text/javascript" src="/js/chats.js"></script>
+		<link rel="manifest" href="/manifest.json">
+		<script src="/js/app.js"></script>
+		<script src="/js/lang/bundle.js"></script>
+		<script src="/js/lib/xss.js"></script>
+		<script src="/js/lib/sjcl.js"></script>
+		<link rel="shortcut icon" type="image/png" href="/favicon.png" />
+		<!-- iOS support -->
+		<link rel="apple-touch-icon" href="/img/icons/icon_96.png">
+		<link rel="apple-touch-icon" href="/img/icons/icon_512.png">
+		<meta name="apple-mobile-web-app-status-bar" content="#004d32">
+	</head>
+	<body>
+		<nav class="z-depth-0" id="navigation-main">
+			<div class="nav-wrapper container">
+				<span class="left white-text directory-opener">
+					<i class="material-icons sidenav-trigger" data-target="directory-side-menu">contacts</i>
+				</span>
+				<!-- | <x-su>chattingWith</x-su> --> <!-- too much for smaller devices -->
+					<span class="msg-chattingWith"><b>Beži</b><span>App</span> &raquo; <x-su>chat</x-su></span> &nbsp;
+				<span class="right white-text">
+					<i class="material-icons sidenav-trigger" data-target="side-menu">menu</i>
+				</span>
+			</div>
+			<div id="loading-bar" class="progress hidden">
+				<div class="indeterminate"></div>
+			</div>
+		</nav>
+		<@?i navigation@>
+		<ul id="directory-side-menu" class="sidenav side-modal">
+			<br>
+			<li><a class="header"><h5><x-su>directory</x-su></h5></a></li>
+			<li>
+				<div class="container">
+					<div class="row">
+						<div class="input-field">
+							<i class="material-icons prefix">account_circle</i>
+							<input oninput="validateName();" id="full-name" type="text" class="autocomplete-fullname validate">
+							<label for="full-name"><x-su>recipient</x-su></label>
+						</div>
+					</div>
+					<div class="row">
+						<button id="chat-recipient-select-btn" onclick="setRecipient()" class="btn waves-effect">
+							<x-su>select</x-su>
+						</button>
+					</div>
+				</div>
+			</li>
+		</ul>
+		<div class="container">
+			<h6 id="chat-mustSelectRecipient"><x-du>mustSelectRecipient</x-du></h6>
+			<div style="text-align:center" class="msg-messagesPlaceholder">
+				<br />
+				<x-du class="msg-messagesPlaceholderText"></x-du> <!-- stillLoading / noMessages -->
+			</div>
+			<div class="chat"></div> <!-- <div data-remark="a child, so chatarea.children does not scare of losing all of her kids"></div> -->
+			<div class="chat-sticky-input">
+				<div class="row">
+					<div class="input-field col s10">
+						<i class="material-icons prefix">mode_edit</i>
+						<textarea maxlength="180" disabled="disabled" oninput="updateSendButton();" id="msg-body" class="materialize-textarea"></textarea>
+						<label for="msg-body"><x-su>messageBody</x-su></label>
+					</div>
+					<div class="input-field col s2">
+						<button class="btn waves-effect waves-light" onclick="sendMessage();" id="msg-send" type="button" disabled="disabled" name="action">
+							<i class="material-icons">send</i>
+						</button>
+					</div>
+			</div>
+			</div>
+		</div>
+	</body>
+</html>
diff --git a/pages-src/grades.bvr b/pages-src/grades.bvr
new file mode 100644
index 0000000..7615e65
--- /dev/null
+++ b/pages-src/grades.bvr
@@ -0,0 +1,98 @@
+<@?i global@>
+<!DOCTYPE html>
+<html>
+<head>
+    <meta charset="UTF-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=no">
+    <meta http-equiv="X-UA-Compatible" content="ie=edge">
+    <meta name="google" content="notranslate">
+    <title>Grades &laquo; BežiApp</title>
+
+    <!-- Materialize -->
+    <link type="text/css" href="/css/materialize.min.css" rel="stylesheet">
+    <link href="/css/materialicons.css" rel="stylesheet">
+    <script type="text/javascript" src="/js/lib/materialize.min.js"></script>
+
+    <script src="/js/lib/jquery.min.js"></script>
+    <script type="text/javascript" src="/js/lib/localforage.min.js"></script>
+
+    <link type="text/css" href="/css/styles.css" rel="stylesheet">
+    <script type="text/javascript" src="/js/gsec.js"></script> <!-- gimsisextclient -->
+    <script type="text/javascript" src="/js/grades.js"></script>
+
+    <link rel="manifest" href="/manifest.json">
+    <script src="/js/app.js"></script>
+    <script src="/js/lang/bundle.js"></script>
+    <link rel="shortcut icon" type="image/png" href="/favicon.png" />
+
+    <!-- iOS support -->
+    <link rel="apple-touch-icon" href="/img/icons/icon_96.png">
+    <link rel="apple-touch-icon" href="/img/icons/icon_512.png">
+    <meta name="apple-mobile-web-app-status-bar" content="#004d32">
+</head>
+
+<body>
+    <nav class="z-depth-0" id="navigation-main">
+        <div class="nav-wrapper container">
+            <b>Beži</b><span>App</span> &raquo; <x-su>grades</x-su>
+            <span class="right white-text">
+                <i class="material-icons sidenav-trigger" data-target="side-menu">menu</i>
+            </span>
+            <span class="right white-text" id="refresh-icon">
+                <a href="#"><i class="material-icons">refresh</i></a>
+            </span>
+        </div>
+        <div id="loading-bar" class="progress hidden">
+            <div class="indeterminate"></div>
+        </div>
+    </nav>
+		<@?i navigation@>
+    <ul id="grade-info" class="sidenav side-modal">
+        <br>
+        <li><a class="header">
+                <h5 id="grade-header"></h5>
+            </a></li>
+        <br>
+        <li id="grade-temporary-root"><a class="subheader">
+                <h6 id="grade-temporary"></h6>
+            </a></li>
+        <li><a class="subheader" id="grade-date">
+            </a></li>
+        <li>
+            <div class="divider"></div>
+        </li>
+        <li><a class="waves-effect" id="grade-title"></a></li>
+        <li><a class="waves-effect" id="grade-term"></a></li>
+        <li><a class="waves-effect" id="grade-teacher"></a></li>
+        <li><a class="waves-effect" id="grade-type"></a></li>
+    </ul>
+
+    <div id="help-modal" class="modal bottom-sheet">
+        <div class="modal-content">
+            <h4><x-su>useOnlyPermanentGrades</x-su></h4>
+            <p><x-du>useOnlyPermanentGradesNote1</x-du></p>
+            <p><x-du>useOnlyPermanentGradesNote2</x-du></p>
+        </div>
+        <!-- <div class="modal-footer">
+            <a href="#!" class="modal-close waves-effect waves-green btn-flat">Agree</a>
+        </div> -->
+    </div>
+
+    <br>
+    <div class="container">
+ 				<p>
+					<label>
+						<input id="permanent-grades-checkbox" class="no-select" type="checkbox" />
+						<span style="vertical-align: sub;"><x-su>useOnlyPermanentGrades</x-su>
+							<a id="help-icon" class="modal-trigger" href="#help-modal">
+								<i class="material-icons" style="vertical-align: sub;">help_outline</i>
+							</a>
+						</span>
+					</label>
+				</p>
+        <ul class="collapsible" id="grades-collapsible"></ul>
+    </div>
+
+</body>
+
+</html>
diff --git a/pages-src/gradings.bvr b/pages-src/gradings.bvr
new file mode 100644
index 0000000..3239e68
--- /dev/null
+++ b/pages-src/gradings.bvr
@@ -0,0 +1,110 @@
+<@?i global@>
+<!DOCTYPE html>
+<html>
+<head>
+    <meta charset="UTF-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=no">
+    <meta http-equiv="X-UA-Compatible" content="ie=edge">
+    <meta name="google" content="notranslate">
+    <title>Gradings &laquo; BežiApp</title>
+
+    <!-- Materialize -->
+    <link type="text/css" href="/css/materialize.min.css" rel="stylesheet">
+    <link href="/css/materialicons.css" rel="stylesheet">
+    <script type="text/javascript" src="/js/lib/materialize.min.js"></script>
+
+    <script src="/js/lib/jquery.min.js"></script>
+    <script type="text/javascript" src="/js/lib/localforage.min.js"></script>
+
+    <!-- FullCalendar -->
+    <link href="/css/fullcalendar/core/main.min.css" rel="stylesheet" />
+    <link href="/css/fullcalendar/daygrid/main.min.css" rel="stylesheet" />
+    <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>
+
+    <link type="text/css" href="/css/styles.css" rel="stylesheet">
+    <script type="text/javascript" src="/js/gsec.js"></script> <!-- gimsisextclient -->
+    <script type="text/javascript" src="/js/gradings.js"></script>
+
+    <link rel="manifest" href="/manifest.json">
+    <script src="/js/app.js"></script>
+    <script src="/js/lang/bundle.js"></script>
+    <link rel="shortcut icon" type="image/png" href="/favicon.png" />
+
+    <!-- iOS support -->
+    <link rel="apple-touch-icon" href="/img/icons/icon_96.png">
+    <link rel="apple-touch-icon" href="/img/icons/icon_512.png">
+    <meta name="apple-mobile-web-app-status-bar" content="#004d32">
+</head>
+
+<body>
+    <nav class="z-depth-0" id="navigation-main">
+        <div class="nav-wrapper container">
+            <b>Beži</b><span>App</span> &raquo; <x-su>gradings</x-su>
+            <span class="right white-text">
+                <i class="material-icons sidenav-trigger" data-target="side-menu">menu</i>
+            </span>
+            <span class="right white-text" id="refresh-icon">
+                <a href="#"><i class="material-icons">refresh</i></a>
+            </span>
+        </div>
+        <div id="loading-bar" class="progress hidden">
+            <div class="indeterminate"></div>
+        </div>
+    </nav>
+		<@?i navigation@>
+    <ul id="grading-info" class="sidenav side-modal">
+        <br>
+        <li><a class="header">
+                <h5 id="grading-subject"></h5>
+            </a></li>
+        <li>
+            <a class="subheader">
+                <h6 id="grading-date"></h6>
+            </a>
+        </li>
+        <div class="divider"></div>
+        </li>
+        <li><a class="waves-effect" id="grading-description"></a></li>
+    </ul>
+
+
+    <div class="container">
+        <br>
+        <div id="calendar"></div>
+   </div>
+<!--
+   <div class="container">
+        <div class="row">
+		<div class="col s12">
+	                <h4>Add a personal event</h4>
+	                <div class="row">
+	                        <div class="input-field col s5">
+	                                <input required="required" type="text" class="datepicker" id="datepicker-add">
+	                                <label for="datepicker-add">Date</label>
+				</div>
+	                        <div class="input-field col s5">
+	                                <input required="required" id="event_name" type="text" class="validate">
+	                                <label for="event_name">Name</label>
+	                        </div>
+	                        <div class="input-field col s2">
+	                                <button id="event_btn" class="btn waves-effect waves-light" type="text" class="validate">
+						<i class="material-icons">event_available</i>
+					</button>
+	                        </div>
+	                </div>
+	                <div class="row">
+	                        <div class="input-field col s12">
+	                                  <textarea required="required" id="event_description" class="materialize-textarea"></textarea>
+	                                  <label for="event_description">Description</label>
+	                        </div>
+	                </div>
+		</div>
+        </div>
+
+    </div>
+-->
+</body>
+
+</html>
diff --git a/pages-src/jitsi.bvr b/pages-src/jitsi.bvr
new file mode 100644
index 0000000..797a339
--- /dev/null
+++ b/pages-src/jitsi.bvr
@@ -0,0 +1,52 @@
+<@?i global@>
+<!DOCTYPE html>
+<html>
+	<head>
+		<meta charset="UTF-8">
+		<meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=no">
+		<meta http-equiv="X-UA-Compatible" content="ie=edge">
+		<meta name="google" content="notranslate">
+		<title>About &laquo; BežiApp</title>
+		<!-- Materialize -->
+		<link type="text/css" href="/css/materialize.min.css" rel="stylesheet">
+		<link href="/css/materialicons.css" rel="stylesheet">
+		<link href="/css/fontawesome.min.css" rel="stylesheet">
+		<script type="text/javascript" src="/js/lib/materialize.min.js"></script>
+		<script src="/js/lib/jquery.min.js"></script>
+		<script type="text/javascript" src="/js/lib/localforage.min.js"></script>
+		<link type="text/css" href="/css/styles.css" rel="stylesheet">
+		<link rel="manifest" href="/manifest.json">
+		<script src="/js/app.js"></script>
+		<script src="/js/lang/bundle.js"></script>
+		<link rel="shortcut icon" type="image/png" href="/favicon.png" />
+		<!-- iOS support -->
+		<link rel="apple-touch-icon" href="/img/icons/icon_96.png">
+		<link rel="apple-touch-icon" href="/img/icons/icon_512.png">
+		<meta name="apple-mobile-web-app-status-bar" content="#004d32">
+	</head>
+	<body>
+		<nav class="z-depth-0" id="navigation-main">
+			<div class="nav-wrapper container">
+				<b>Beži</b><span>App</span> &raquo; <x-su>videoconferences</x-su>
+					<span class="right white-text">
+						<i class="material-icons sidenav-trigger" data-target="side-menu">menu</i>
+					</span>
+			</div>
+			<div id="loading-bar" class="progress hidden">
+				<div class="indeterminate"></div>
+			</div>
+		</nav>
+		<@?i navigation@>
+		<div class="container">
+			<iframe src="https://video.gimb.tk" style="width: 100%; height: 100%">
+				Ur browser does not support iframes, you have no Internet connection or the GimB videoconference server is down or does
+				not allow iframes. Probably we fucked something up, so drop us a message.
+				<hr>
+				Vaš brkljalnik ne podpira iframov, nimate povezave v medmrežje ali pa so se GimB videokonferenčni strežniki odločili ne
+				dovoliti iframov ali pa so sploh nedostopni. Kakorkoli že, verjetno smo mi kaj zajebali, zato nam napiši sporočilo!
+				<hr>
+				Danke schön.
+			</iframe>
+		</div>
+	</body>
+</html>
diff --git a/pages-src/meals.bvr b/pages-src/meals.bvr
new file mode 100644
index 0000000..a92a6d7
--- /dev/null
+++ b/pages-src/meals.bvr
@@ -0,0 +1,115 @@
+<@?i global@>
+<!DOCTYPE html>
+<html>
+<head>
+    <meta charset="UTF-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=no">
+    <meta http-equiv="X-UA-Compatible" content="ie=edge">
+    <meta name="google" content="notranslate">
+    <title>Meals &laquo; BežiApp</title>
+
+    <!-- Materialize -->
+    <link type="text/css" href="/css/materialize.min.css" rel="stylesheet">
+    <link href="/css/materialicons.css" rel="stylesheet">
+    <script type="text/javascript" src="/js/lib/materialize.min.js"></script>
+
+    <script src="/js/lib/jquery.min.js"></script>
+    <script type="text/javascript" src="/js/lib/localforage.min.js"></script>
+    <script type="text/javascript" src="/js/lib/mergedeep.js"></script>
+
+    <link type="text/css" href="/css/styles.css" rel="stylesheet">
+    <script type="text/javascript" src="/js/meals.js"></script>
+
+    <link rel="manifest" href="/manifest.json">
+    <script src="/js/app.js"></script>
+    <script src="/js/lang/bundle.js"></script>
+    <link rel="shortcut icon" type="image/png" href="/favicon.png" />
+
+    <!-- iOS support -->
+    <link rel="apple-touch-icon" href="/img/icons/icon_96.png">
+    <link rel="apple-touch-icon" href="/img/icons/icon_512.png">
+    <meta name="apple-mobile-web-app-status-bar" content="#004d32">
+</head>
+
+<body>
+    <nav class="z-depth-0" id="navigation-main">
+        <div class="nav-wrapper container">
+            <b>Beži</b><span>App</span> &raquo; <x-su>meals</x-su>
+            <span class="right white-text">
+                <i class="material-icons sidenav-trigger" data-target="side-menu">menu</i>
+            </span>
+            <span class="right white-text" id="refresh-icon">
+                <a href="#"><i class="material-icons">refresh</i></a>
+            </span>
+        </div>
+        <div id="loading-bar" class="progress hidden">
+            <div class="indeterminate"></div>
+        </div>
+    </nav>
+		<@?i navigation@>
+    <br>
+    <div class="container login" hidden="hidden" id="meals-login">
+	<h4><x-su>loginToLopolis</x-su></h4>
+	<p>
+		<x-du>loginToLopolisNote</x-du>
+	</p>
+	  <div class="row">
+	    <div class="col s12">
+	      <div class="row">
+	        <div class="input-field col s12">
+	          <input id="meals_username" type="text" value="" required="required" name="meals_password" class="validate">
+	          <label for="meals_username">Lopolis <x-su>username</x-su></label>
+	        </div>
+	      </div>
+	      <div class="row">
+	        <div class="input-field col s12">
+	          <input autocomplete="new-password" id="meals_password" type="password" value="" required="required" name="meals_password" class="validate">
+	          <label for="meals_password">Lopolis <x-su>password</x-su></label>
+	        </div>
+	      </div>
+	      <div class="row">
+	        <div class="input-field col s12">
+	          <button id="meals_login" type="button" class="waves-effect waves-light btn" onclick="lopolisLogin();">
+							<x-su>loginToLopolis</x-su>
+							<i class="material-icons right">arrow_right_alt</i>
+		  			</button>
+	        </div>
+	      </div>
+	    </div>
+	  </div>
+    </div>
+    <div class="meals-container container" hidden="hidden" id="meals-container">
+	<h4>Meals
+		<button id="meals_logout" onclick="lopolisLogout();" type="button" class="waves-effect waves-light btn" style="float: right">
+			<x-su>logOutFromLopolis</x-su>
+			<i class="material-icons right">exit_to_app</i>
+		</button>
+	</h4>
+	<ul id="meals-collapsible" class="collapsible"></ul>
+	<p>
+		<small>
+			<b>
+				<x-su>usage</x-su>:
+			</b>
+			<x-du>mealsUsageNote</x-du>
+			<br>
+			<b>
+				<x-su>note</x-su>:
+			</b>
+			<x-du>lunchesNote</x-du>
+			<br>
+			<b>
+				<x-su>note</x-su>:
+			</b>
+			<x-du>mealNotShownNote</x-du>
+			<br>
+			<b>
+				Note:
+			</b>
+				<x-du>mealsContributeNote</x-du>
+		</small>
+	</p>
+	</div>
+</body>
+
+</html>
diff --git a/pages-src/messaging.bvr b/pages-src/messaging.bvr
new file mode 100644
index 0000000..ed52e8f
--- /dev/null
+++ b/pages-src/messaging.bvr
@@ -0,0 +1,130 @@
+<@?i global@>
+<!DOCTYPE html>
+<html>
+<head>
+    <meta charset="UTF-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=no">
+    <meta http-equiv="X-UA-Compatible" content="ie=edge">
+    <meta name="google" content="notranslate">
+    <title>Messaging &laquo; BežiApp</title>
+
+    <!-- Materialize -->
+    <link type="text/css" href="/css/materialize.min.css" rel="stylesheet">
+    <link href="/css/materialicons.css" rel="stylesheet">
+    <script type="text/javascript" src="/js/lib/materialize.min.js"></script>
+
+    <script src="/js/lib/jquery.min.js"></script>
+    <script type="text/javascript" src="/js/lib/localforage.min.js"></script>
+
+    <link type="text/css" href="/css/styles.css" rel="stylesheet">
+    <script type="text/javascript" src="/js/messaging.js"></script>
+
+    <link rel="manifest" href="/manifest.json">
+    <script src="/js/app.js"></script>
+    <script src="/js/lang/bundle.js"></script>
+    <script src="/js/lib/xss.js"></script>
+    <script src="/js/lib/sjcl.js"></script>
+    <link rel="shortcut icon" type="image/png" href="/favicon.png" />
+
+    <!-- iOS support -->
+    <link rel="apple-touch-icon" href="/img/icons/icon_96.png">
+    <link rel="apple-touch-icon" href="/img/icons/icon_512.png">
+    <meta name="apple-mobile-web-app-status-bar" content="#004d32">
+</head>
+
+<body>
+    <nav class="z-depth-0" id="navigation-main">
+        <div class="nav-wrapper container">
+            <b>Beži</b><span>App</span> &raquo; <x-su>messaging</x-su>
+            <span class="right white-text">
+                <i class="material-icons sidenav-trigger" data-target="side-menu">menu</i>
+            </span>
+        </div>
+        <div id="loading-bar" class="progress hidden">
+            <div class="indeterminate"></div>
+        </div>
+    </nav>
+		<@?i navigation@>
+    <div class="container">
+        <h4><x-su>sendAMessage</x-su></h4>
+        <div class="row">
+            <div class="col s12">
+                <div class="row">
+                    <div class="input-field col s5">
+                        <i class="material-icons prefix">account_circle</i>
+                        <input id="full-name" type="text" class="autocomplete-fullname validate">
+                        <label for="full-name"><x-su>recipient</x-su></label>
+                    </div>
+                    <div class="input-field col s5">
+                        <i class="material-icons prefix">subject</i>
+                        <input id="msg-subject" type="text" class="">
+                        <label for="msg-subject"><x-su>messageSubject</x-su></label>
+                    </div>
+                    <div class="input-field col s2">
+                        <button class="btn waves-effect waves-light" id="msg-send" type="button" disabled="disabled" name="action">
+                            <i class="material-icons">send</i>
+                        </button>
+                    </div>
+                </div>
+                <div class="row">
+                    <div class="input-field col s8">
+                        <i class="material-icons prefix">mode_edit</i>
+                        <textarea id="msg-body" class="materialize-textarea"></textarea>
+                        <label for="msg-body"><x-su>messageBody</x-su></label>
+                    </div>
+                    <div class="input-field col s2">
+                        <button class="btn waves-effect waves-light" id="msg-add-photo" type="button">
+                            <i class="material-icons" style="margin: 0 auto">add_a_photo</i>
+                        </button>
+                    </div>
+                    <div class="input-field col s2">
+                        <button onclick="document.getElementById('msg-e2ee-pass').hidden = false" class="btn waves-effect waves-light" id="msg-use-e2ee" type="button">
+                            <i class="material-icons" style="margin: 0 auto">vpn_key</i>
+                        </button>
+                    </div>
+                </div>
+		<div hidden="hidden" class="row" id="msg-e2ee-pass">
+                    <div class="input-field col s12">
+                        <i class="material-icons prefix">lock</i>
+                        <input id="msg-e2ee-pass-input" type="password" autocomplete="new-password" class="">
+                        <label for="msg-e2ee-pass-input"><x-su>passwordForE2EE</x-su></label>
+                    </div>
+		</div>
+            </div>
+            <div id="msg-added-image"></div>
+        </div>
+        <h4><x-su>messages</x-su></h4>
+        <button class="btn waves-effect waves-light" id="msg-load-btn" onclick="loadMessages(true, 0);" type="button">
+					<x-su>received</x-su>
+					<i class="material-icons right">system_update</i>
+        </button>
+        <button class="btn waves-effect waves-light" id="msg-load-btn" onclick="loadMessages(true, 1);" type="button">
+					<x-su>sent</x-su>
+					<i class="material-icons right">system_update</i>
+        </button>
+        <button class="btn waves-effect waves-light" id="msg-load-btn" onclick="loadMessages(true, 2);" type="button">
+					<x-su>deleted</x-su>
+					<i class="material-icons right">system_update</i>
+        </button>
+        <div id="msg-list"></div>
+	<p>
+		<div class="row" id="storage-bar">
+			<div class="col s4">
+				<x-su>messageStorageUsed</x-su>: 
+			</div>
+			<div class="col s3" id="storage-desc">
+				0/120 <x-sl>messages</x-sl> 10%
+			</div>
+			<div class="progress col s5">
+				<div class="determinate" id="storage-progressbar" style="width: 0%"></div>
+			</div>
+		</div>
+		<div class="row">
+			<p>
+				<x-du>maxMessagesNote</x-du>
+			</p>
+		</div>
+	</p>
+    </div>
+</body>
+</html>
diff --git a/pages-src/misc/navigation.bvr b/pages-src/misc/navigation.bvr
new file mode 100644
index 0000000..4bae848
--- /dev/null
+++ b/pages-src/misc/navigation.bvr
@@ -0,0 +1,18 @@
+<ul id="side-menu" class="sidenav side-menu">
+  <li><a class="subheader"><h4><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>
+  <li><a href="/pages/gradings.html" class="waves-effect"><i class="material-icons">event</i><x-su>gradings</x-su></a></li>
+  <li><a href="/pages/grades.html" class="waves-effect"><i class="material-icons">receipt</i><x-su>grades</x-su></a></li>
+  <li><a href="/pages/teachers.html" class="waves-effect"><i class="material-icons">supervisor_account</i><x-su>teachers</x-su></a></li>
+  <li><a href="/pages/absences.html" class="waves-effect"><i class="material-icons">query_builder</i><x-su>absences</x-su></a></li>
+  <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>videoconference</x-su></a></li>
+	<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>
+  <li><a href="/logout.html" class="waves-effect"><i class="material-icons">exit_to_app</i><x-su>logout</x-su></a></li>
+  <li><a href="/pages/settings.html" class="waves-effect"><i class="material-icons">settings</i><x-su>settings</x-su></a></li>
+</ul>
+
diff --git a/pages-src/privacypolicy.bvr b/pages-src/privacypolicy.bvr
new file mode 100644
index 0000000..fc52475
--- /dev/null
+++ b/pages-src/privacypolicy.bvr
@@ -0,0 +1,55 @@
+<@?i global@>
+<!DOCTYPE html>
+<html>
+<head>
+    <meta charset="UTF-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=no">
+    <meta http-equiv="X-UA-Compatible" content="ie=edge">
+    <meta name="google" content="notranslate">
+    <title>Privacy policy &laquo; BežiApp</title>
+
+    <!-- Materialize -->
+    <link type="text/css" href="/css/materialize.min.css" rel="stylesheet">
+    <link href="/css/materialicons.css" rel="stylesheet">
+    <link href="/css/fontawesome.min.css" rel="stylesheet">
+    <script type="text/javascript" src="/js/lib/materialize.min.js"></script>
+
+    <script src="/js/lib/jquery.min.js"></script>
+    <script type="text/javascript" src="/js/lib/localforage.min.js"></script>
+
+    <link type="text/css" href="/css/styles.css" rel="stylesheet">
+    <script type="text/javascript" src="/js/privacypolicy.js"></script>
+
+    <link rel="manifest" href="/manifest.json">
+    <script src="/js/app.js"></script>
+    <script src="/js/lang/bundle.js"></script>
+    <link rel="shortcut icon" type="image/png" href="/favicon.png" />
+
+    <!-- iOS support -->
+    <link rel="apple-touch-icon" href="/img/icons/icon_96.png">
+    <link rel="apple-touch-icon" href="/img/icons/icon_512.png">
+    <meta name="apple-mobile-web-app-status-bar" content="#004d32">
+</head>
+<body>
+    <nav class="z-depth-0" id="navigation-main">
+        <div class="nav-wrapper container">
+            <b>Beži</b><span>App</span> &raquo; <x-su>thePrivacyPolicy</x-su>
+            <span class="right white-text">
+                <i class="material-icons" id="nav-home-button">home</i>
+            </span>
+        </div>
+    </nav>
+    <div class="container">
+        <h2><x-su>thePrivacyPolicy</x-su></h2>
+        <p class="flow-text"><x-du>privacyImportant</x-du></p>
+        <p class="flow-text"><x-du>privacyOnlyAskedWhen</x-du></p>
+        <p class="flow-text"><x-du>privacyDataCollection</x-du></p>
+        <p class="flow-text"><x-du>privacySharingData</x-du></p>
+        <p class="flow-text"><x-du>privacyExternalSites</x-du></p>
+        <p class="flow-text"><x-du>privacyRefuse</x-du></p>
+        <p class="flow-text"><x-du>privacyAcceptWithUse</x-du></p>
+        <hr>
+        <p class="flow-text"><x-su>privacyEffectiveAsOf</x-su> 29 January 2020.</p>
+    </div>
+</body>
+</html>
diff --git a/pages-src/settings.bvr b/pages-src/settings.bvr
new file mode 100644
index 0000000..130def1
--- /dev/null
+++ b/pages-src/settings.bvr
@@ -0,0 +1,103 @@
+<@?i global@>
+<!DOCTYPE html>
+<html>
+<head>
+    <meta charset="UTF-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=no">
+    <meta http-equiv="X-UA-Compatible" content="ie=edge">
+    <meta name="google" content="notranslate">
+    <title>Settings &laquo; BežiApp</title>
+
+    <!-- Materialize -->
+    <link type="text/css" href="/css/materialize.min.css" rel="stylesheet">
+    <link href="/css/materialicons.css" rel="stylesheet">
+    <link href="/css/fontawesome.min.css" rel="stylesheet">
+    <script type="text/javascript" src="/js/lib/materialize.min.js"></script>
+
+    <script src="/js/lib/jquery.min.js"></script>
+    <script type="text/javascript" src="/js/lib/localforage.min.js"></script>
+
+    <link type="text/css" href="/css/styles.css" rel="stylesheet">
+    <script type="text/javascript" src="/js/settings.js"></script>
+
+    <link rel="manifest" href="/manifest.json">
+    <script src="/js/app.js"></script>
+    <script src="/js/lang/bundle.js"></script>
+    <link rel="shortcut icon" type="image/png" href="/favicon.png" />
+
+    <!-- iOS support -->
+    <link rel="apple-touch-icon" href="/img/icons/icon_96.png">
+    <link rel="apple-touch-icon" href="/img/icons/icon_512.png">
+    <meta name="apple-mobile-web-app-status-bar" content="#004d32">
+</head>
+
+<body>
+    <nav class="z-depth-0" id="navigation-main">
+        <div class="nav-wrapper container">
+            <b>Beži</b><span>App</span> &raquo; <x-su>settings</x-su>
+            <span class="right white-text">
+                <i class="material-icons sidenav-trigger" data-target="side-menu">menu</i>
+            </span>
+        </div>
+        <div id="loading-bar" class="progress hidden">
+            <div class="indeterminate"></div>
+        </div>
+    </nav>
+		<@?i navigation@>
+
+    <div class="container">
+        <div class="row">
+            <div class="col s12">
+                <h3><b class="title-secondary">Beži</b><span class="title-primary">App</span>
+                </h3>
+                <h5 class="subheader"><x-su>settings</x-su></h5>
+            </div>
+        </div>
+        <div class="row">
+            <div class="col s12">
+                <ul class="collection with-header">
+                    <li class="collection-header">
+                        <h5><x-su>language</x-su></h5>
+                    </li>
+                    <li data-language="sl" class="settings-language-selector collection-item waves-effect">
+                        <span class="title about-text">Slovenščina</span>
+                    </li>
+                    <li date-language="en" class="collection-item waves-effect">
+                        <span class="title about-text">English</span>
+                    </li>
+										<!--
+	                    <li class="collection-item waves-effect">
+	                        <span class="title about-text">Srpskohrvatski</span>
+	                    </li>
+	                    <li class="collection-item waves-effect">
+	                        <span class="title about-text">Македонски</span>
+	                    </li>
+	                    <li class="collection-item waves-effect">
+	                        <span class="title about-text">Français</span>
+	                    </li>
+	                    <li class="collection-item waves-effect">
+	                        <span class="title about-text">Deutsch</span>
+	                    </li>
+	                    <li class="collection-item waves-effect">
+	                        <span class="title about-text">Español</span>
+	                    </li>
+	                    <li class="collection-item waves-effect">
+	                        <span class="title about-text">Русский</span>
+	                    </li>
+	                    <li class="collection-item waves-effect">
+	                        <span class="title about-text">汉语</span>
+	                    </li>
+	                    <li class="collection-item waves-effect">
+	                        <span class="title about-text">日本語</span>
+	                    </li>
+	                    <li class="collection-item waves-effect">
+	                        <span class="title about-text">Lingua latīna</span>
+	                    </li>
+										-->
+                </ul>
+            </div>
+        </div>
+    </div>
+</body>
+
+</html>
diff --git a/pages-src/teachers.bvr b/pages-src/teachers.bvr
new file mode 100644
index 0000000..37ff3e2
--- /dev/null
+++ b/pages-src/teachers.bvr
@@ -0,0 +1,81 @@
+<@?i global@>
+<!DOCTYPE html>
+<html>
+<head>
+    <meta charset="UTF-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=no">
+    <meta http-equiv="X-UA-Compatible" content="ie=edge">
+    <meta name="google" content="notranslate">
+    <title>Teachers &laquo; BežiApp</title>
+
+    <!-- Materialize -->
+    <link type="text/css" href="/css/materialize.min.css" rel="stylesheet">
+    <link href="/css/materialicons.css" rel="stylesheet">
+    <script type="text/javascript" src="/js/lib/materialize.min.js"></script>
+
+    <script src="/js/lib/jquery.min.js"></script>
+    <script type="text/javascript" src="/js/lib/localforage.min.js"></script>
+
+    <link type="text/css" href="/css/styles.css" rel="stylesheet">
+    <script type="text/javascript" src="/js/gsec.js"></script>
+    <script type="text/javascript" src="/js/teachers.js"></script>
+
+    <link rel="manifest" href="/manifest.json">
+    <script src="/js/app.js"></script>
+    <script src="/js/lang/bundle.js"></script>
+    <link rel="shortcut icon" type="image/png" href="/favicon.png" />
+
+    <!-- iOS support -->
+    <link rel="apple-touch-icon" href="/img/icons/icon_96.png">
+    <link rel="apple-touch-icon" href="/img/icons/icon_512.png">
+    <meta name="apple-mobile-web-app-status-bar" content="#004d32">
+</head>
+
+<body>
+    <nav class="z-depth-0" id="navigation-main">
+        <div class="nav-wrapper container">
+            <b>Beži</b><span>App</span> &raquo; <x-su>teachers</x-su>
+            <span class="right white-text">
+                <i class="material-icons sidenav-trigger" data-target="side-menu">menu</i>
+            </span>
+            <span class="right white-text" id="refresh-icon">
+                <a href="#"><i class="material-icons">refresh</i></a>
+            </span>
+        </div>
+        <div id="loading-bar" class="progress hidden">
+            <div class="indeterminate"></div>
+        </div>
+    </nav>
+		<@?i navigation@>
+    <ul id="teacher-info" class="sidenav side-modal">
+        <br>
+        <li><a class="subheader">
+                <h5 id="teacher-name"></h5>
+            </a></li>
+        <li><a class="waves-effect" id="teacher-subject"></a></li>
+        <li>
+            <div class="divider"></div>
+        </li>
+        <br>
+        <li><a class="subheader">
+                <h6><x-su>tpMeetings</x-su></h6>
+            </a></li>
+        <li><a class="waves-effect" id="teacher-office"></a></li>
+    </ul>
+
+    <br>
+    <div class="container">
+        <table class="highlight">
+            <thead>
+                <tr>
+                    <th><x-su>name</x-su></th>
+                    <th><x-su>schoolSubject</x-su></th>
+                </tr>
+            </thead>
+            <tbody id="teachers-body"></tbody>
+        </table>
+    </div>
+
+</body>
+
+</html>
diff --git a/pages-src/timetable.bvr b/pages-src/timetable.bvr
new file mode 100644
index 0000000..0d8363c
--- /dev/null
+++ b/pages-src/timetable.bvr
@@ -0,0 +1,85 @@
+<@?i global@>
+<!DOCTYPE html>
+<html>
+<head>
+    <meta charset="UTF-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=no">
+    <meta http-equiv="X-UA-Compatible" content="ie=edge">
+    <meta name="google" content="notranslate">
+    <title>Timetable &laquo; BežiApp</title>
+
+    <!-- Materialize -->
+    <link type="text/css" href="/css/materialize.min.css" rel="stylesheet">
+    <link href="/css/materialicons.css" rel="stylesheet">
+    <script type="text/javascript" src="/js/lib/materialize.min.js"></script>
+
+    <script src="/js/lib/jquery.min.js"></script>
+    <script type="text/javascript" src="/js/lib/localforage.min.js"></script>
+
+    <!-- FullCalendar -->
+    <script src="/js/lib/fullcalendar/core/main.min.js"></script>
+    <script src="/js/lib/fullcalendar/daygrid/main.min.js"></script>
+    <script src="/js/lib/fullcalendar/timegrid/main.min.js"></script>
+    <link href="/css/fullcalendar/custom.css" rel="stylesheet" />
+    <link href="/css/fullcalendar/core/main.min.css" rel="stylesheet" />
+    <link href="/css/fullcalendar/daygrid/main.min.css" rel="stylesheet" />
+    <link href="/css/fullcalendar/timegrid/main.min.css" rel="stylesheet" />
+
+    <link type="text/css" href="/css/styles.css" rel="stylesheet">
+    <script type="text/javascript" src="/js/gsec.js"></script> <!-- gimsisextclient -->
+    <script type="text/javascript" src="/js/timetable.js"></script>
+
+    <link rel="manifest" href="/manifest.json">
+    <script src="/js/app.js"></script>
+    <script src="/js/lang/bundle.js"></script>
+    <link rel="shortcut icon" type="image/png" href="/favicon.png" />
+
+    <!-- iOS support -->
+    <link rel="apple-touch-icon" href="/img/icons/icon_96.png">
+    <link rel="apple-touch-icon" href="/img/icons/icon_512.png">
+    <meta name="apple-mobile-web-app-status-bar" content="#004d32">
+</head>
+
+<body>
+    <nav class="z-depth-0" id="navigation-main">
+        <div class="nav-wrapper container">
+            <b>Beži</b><span>App</span> &raquo; <x-su>timetable</x-su>
+            <span class="right white-text">
+                <i class="material-icons sidenav-trigger" data-target="side-menu">menu</i>
+            </span>
+            <span class="right white-text" id="refresh-icon">
+                <a href="#"><i class="material-icons">refresh</i></a>
+            </span>
+        </div>
+        <div id="loading-bar" class="progress hidden">
+            <div class="indeterminate"></div>
+        </div>
+    </nav>
+		<@?i navigation@>
+    <ul id="lesson-info" class="sidenav side-modal">
+        <br>
+        <li><a class="header">
+                <h5 id="lesson-subject"></h5>
+            </a></li>
+        <br>
+        <li>
+            <a class="subheader">
+                <h6 id="lesson-teacher"></h6>
+            </a>
+        </li>
+        <div class="divider"></div>
+        </li>
+        <li><a class="waves-effect" id="lesson-classroom"></a></li>
+        <li><a class="waves-effect" id="lesson-duration"></a></li>
+        <li><a class="waves-effect" id="lesson-class"></a></li>
+    </ul>
+
+
+    <div class="container">
+        <br>
+        <div id="calendar"></div>
+    </div>
+
+</body>
+
+</html>
diff --git a/pages-src/tos.bvr b/pages-src/tos.bvr
new file mode 100644
index 0000000..b96eccc
--- /dev/null
+++ b/pages-src/tos.bvr
@@ -0,0 +1,69 @@
+<@?i global@>
+<!DOCTYPE html>
+<html>
+<head>
+    <meta charset="UTF-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=no">
+    <meta http-equiv="X-UA-Compatible" content="ie=edge">
+    <meta name="google" content="notranslate">
+    <title>Terms and Conditions &laquo; BežiApp</title>
+
+    <!-- Materialize -->
+    <link type="text/css" href="/css/materialize.min.css" rel="stylesheet">
+    <link href="/css/materialicons.css" rel="stylesheet">
+    <link href="/css/fontawesome.min.css" rel="stylesheet">
+    <script type="text/javascript" src="/js/lib/materialize.min.js"></script>
+
+    <script src="/js/lib/jquery.min.js"></script>
+    <script type="text/javascript" src="/js/lib/localforage.min.js"></script>
+
+    <link type="text/css" href="/css/styles.css" rel="stylesheet">
+    <script type="text/javascript" src="/js/tos.js"></script>
+
+    <link rel="manifest" href="/manifest.json">
+    <script src="/js/app.js"></script>
+    <script src="/js/lang/bundle.js"></script>
+    <link rel="shortcut icon" type="image/png" href="/favicon.png" />
+
+    <!-- iOS support -->
+    <link rel="apple-touch-icon" href="/img/icons/icon_96.png">
+    <link rel="apple-touch-icon" href="/img/icons/icon_512.png">
+    <meta name="apple-mobile-web-app-status-bar" content="#004d32">
+</head>
+
+<body>
+    <nav class="z-depth-0" id="navigation-main">
+        <div class="nav-wrapper container">
+            <b>Beži</b><span>App</span> &raquo; <x-su>theTos</x-su>
+            <span class="right white-text">
+                <i class="material-icons" id="nav-home-button">home</i>
+            </span>
+        </div>
+    </nav>
+
+    <div class="container">
+        <h2 class="code-line" data-line-start=0 data-line-end=1><a id="Terms_and_conditions_0"></a><x-su>theToS</x-su></h2>
+        <h3 class="code-line" data-line-start=2 data-line-end=3><a id="Terms_of_use_2"></a><x-su>termsOfUse</x-su></h3>
+        <p class="has-line-data flow-text" data-line-start="3" data-line-end="4"><x-su>termsOfUseDescription</x-su>:</p>
+        <ol>
+            <li class="flow-text has-line-data" data-line-start="4" data-line-end="5"><x-su>termsOfUseHarass</x-su>;</li>
+            <li class="flow-text has-line-data" data-line-start="5" data-line-end="6"><x-su>termsOfUsePost</x-su>;</li>
+            <li class="flow-text has-line-data" data-line-start="6" data-line-end="7"><x-su>termsOfUseCommunicate</x-su>;</li>
+            <li class="flow-text has-line-data" data-line-start="7" data-line-end="8"><x-su>termsOfUsePurpose</x-su>;</li>
+            <li class="flow-text has-line-data" data-line-start="8" data-line-end="9"><x-su>termsOfUseExploit</x-su>;</li>
+            <li class="flow-text has-line-data" data-line-start="9" data-line-end="11"><x-du>termsOfUseSpam</x-du></li>
+        </ol>
+        <p class="flow-text"><x-du>termsOfUseModify<x-du></p>
+        <h3 class="code-line" data-line-start=11 data-line-end=12><a id="Termination_of_services_11"></a><x-su>terminationOfServices</x-su></h3>
+        <p class="flow-text has-line-data" data-line-start="12" data-line-end="13"><x-su>terminationOfServicesDescriptions</x-su>:</p>
+        <ul>
+            <li class="flow-text has-line-data" data-line-start="13" data-line-end="14"><x-su>terminationOfServicesBreaching</x-su>;</li>
+            <li class="flow-text has-line-data" data-line-start="14" data-line-end="16"><x-du>terminationOfServicesRequest</x-du></li>
+        </ul>
+        <h3 class="code-line" data-line-start=16 data-line-end=17><a id="Limitation_of_Liability_16"></a><x-su>limitationOfLiability</x-su></h3>
+        <p class="flow-text has-line-data" data-line-start="17" data-line-end="18"><x-du>limitationOfLiabilityContent</x-du></p>
+        <hr>
+        <p class="flow-text"><x-su>tosAreEffectiveAsOf</x-su> 29 January, 2020.</p>
+    </div>
+</body>
+</html>
diff --git a/pages/about.html b/pages/about.html
index 1da0e03..c4a7c84 100644
--- a/pages/about.html
+++ b/pages/about.html
@@ -1,3 +1,7 @@
+
+
+
+
 <!DOCTYPE html>
 <html>
 <head>
@@ -43,21 +47,25 @@
         </div>
     </nav>
 
-    <ul id="side-menu" class="sidenav side-menu">
-			<li><a class="subheader"><h4><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>
-      <li><a href="/pages/gradings.html" class="waves-effect"><i class="material-icons">event</i><x-su>gradings</x-su></a></li>
-      <li><a href="/pages/grades.html" class="waves-effect"><i class="material-icons">receipt</i><x-su>grades</x-su></a></li>
-      <li><a href="/pages/teachers.html" class="waves-effect"><i class="material-icons">supervisor_account</i><x-su>teachers</x-su></a></li>
-      <li><a href="/pages/absences.html" class="waves-effect"><i class="material-icons">query_builder</i><x-su>absences</x-su></a></li>
-      <li><a href="/pages/messaging.html" class="waves-effect"><i class="material-icons">message</i><x-su>messaging</x-su></a></li>
-			<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/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>
-      <li><a href="/logout.html" class="waves-effect"><i class="material-icons">exit_to_app</i><x-su>logout</x-su></a></li>
-      <li><a href="/pages/settings.html" class="waves-effect"><i class="material-icons">settings</i><x-su>settings</x-su></a></li>
-    </ul>
+		
+<ul id="side-menu" class="sidenav side-menu">
+  <li><a class="subheader"><h4><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>
+  <li><a href="/pages/gradings.html" class="waves-effect"><i class="material-icons">event</i><x-su>gradings</x-su></a></li>
+  <li><a href="/pages/grades.html" class="waves-effect"><i class="material-icons">receipt</i><x-su>grades</x-su></a></li>
+  <li><a href="/pages/teachers.html" class="waves-effect"><i class="material-icons">supervisor_account</i><x-su>teachers</x-su></a></li>
+  <li><a href="/pages/absences.html" class="waves-effect"><i class="material-icons">query_builder</i><x-su>absences</x-su></a></li>
+  <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>videoconference</x-su></a></li>
+	<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>
+  <li><a href="/logout.html" class="waves-effect"><i class="material-icons">exit_to_app</i><x-su>logout</x-su></a></li>
+  <li><a href="/pages/settings.html" class="waves-effect"><i class="material-icons">settings</i><x-su>settings</x-su></a></li>
+</ul>
+
 
     <div class="container">
         <div class="row">
diff --git a/pages/absences.html b/pages/absences.html
index d0acee6..a53709f 100644
--- a/pages/absences.html
+++ b/pages/absences.html
@@ -1,3 +1,7 @@
+
+
+
+
 <!DOCTYPE html>
 <html>
 <head>
@@ -45,22 +49,26 @@
             <div class="indeterminate"></div>
         </div>
     </nav>
+		
+<ul id="side-menu" class="sidenav side-menu">
+  <li><a class="subheader"><h4><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>
+  <li><a href="/pages/gradings.html" class="waves-effect"><i class="material-icons">event</i><x-su>gradings</x-su></a></li>
+  <li><a href="/pages/grades.html" class="waves-effect"><i class="material-icons">receipt</i><x-su>grades</x-su></a></li>
+  <li><a href="/pages/teachers.html" class="waves-effect"><i class="material-icons">supervisor_account</i><x-su>teachers</x-su></a></li>
+  <li><a href="/pages/absences.html" class="waves-effect"><i class="material-icons">query_builder</i><x-su>absences</x-su></a></li>
+  <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>videoconference</x-su></a></li>
+	<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>
+  <li><a href="/logout.html" class="waves-effect"><i class="material-icons">exit_to_app</i><x-su>logout</x-su></a></li>
+  <li><a href="/pages/settings.html" class="waves-effect"><i class="material-icons">settings</i><x-su>settings</x-su></a></li>
+</ul>
+
 
-    <ul id="side-menu" class="sidenav side-menu">
-      <li><a class="subheader"><h4><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>
-      <li><a href="/pages/gradings.html" class="waves-effect"><i class="material-icons">event</i><x-su>gradings</x-su></a></li>
-      <li><a href="/pages/grades.html" class="waves-effect"><i class="material-icons">receipt</i><x-su>grades</x-su></a></li>
-      <li><a href="/pages/teachers.html" class="waves-effect"><i class="material-icons">supervisor_account</i><x-su>teachers</x-su></a></li>
-      <li><a href="/pages/absences.html" class="waves-effect"><i class="material-icons">query_builder</i><x-su>absences</x-su></a></li>
-      <li><a href="/pages/messaging.html" class="waves-effect"><i class="material-icons">message</i><x-su>messaging</x-su></a></li>
-			<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/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>
-      <li><a href="/logout.html" class="waves-effect"><i class="material-icons">exit_to_app</i><x-su>logout</x-su></a></li>
-      <li><a href="/pages/settings.html" class="waves-effect"><i class="material-icons">settings</i><x-su>settings</x-su></a></li>
-    </ul>
     <br>
     <div class="container">
         <div class="row">
diff --git a/pages/changelog.html b/pages/changelog.html
index 4b34997..9a67316 100644
--- a/pages/changelog.html
+++ b/pages/changelog.html
@@ -1,3 +1,7 @@
+
+
+
+
 <!DOCTYPE html>
 <html>
 <head>
diff --git a/pages/chats.html b/pages/chats.html
index fc35048..d6e9bc3 100644
--- a/pages/chats.html
+++ b/pages/chats.html
@@ -1,3 +1,7 @@
+
+
+
+
 <!DOCTYPE html>
 <html>
 	<head>
@@ -43,21 +47,26 @@
 				<div class="indeterminate"></div>
 			</div>
 		</nav>
-		<ul id="side-menu" class="sidenav side-menu">
-			<li><a class="subheader"><h4><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>
-			<li><a href="/pages/gradings.html" class="waves-effect"><i class="material-icons">event</i><x-su>gradings</x-su></a></li>
-			<li><a href="/pages/grades.html" class="waves-effect"><i class="material-icons">receipt</i><x-su>grades</x-su></a></li>
-			<li><a href="/pages/teachers.html" class="waves-effect"><i class="material-icons">supervisor_account</i><x-su>teachers</x-su></a></li>
-			<li><a href="/pages/absences.html" class="waves-effect"><i class="material-icons">query_builder</i><x-su>absences</x-su></a></li>
-			<li><a href="/pages/messaging.html" class="waves-effect"><i class="material-icons">message</i><x-su>messaging</x-su></a></li>
-			<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/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>
-			<li><a href="/logout.html" class="waves-effect"><i class="material-icons">exit_to_app</i><x-su>logout</x-su></a></li>
-			<li><a href="/pages/settings.html" class="waves-effect"><i class="material-icons">settings</i><x-su>settings</x-su></a></li>
-		</ul>
+		
+<ul id="side-menu" class="sidenav side-menu">
+  <li><a class="subheader"><h4><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>
+  <li><a href="/pages/gradings.html" class="waves-effect"><i class="material-icons">event</i><x-su>gradings</x-su></a></li>
+  <li><a href="/pages/grades.html" class="waves-effect"><i class="material-icons">receipt</i><x-su>grades</x-su></a></li>
+  <li><a href="/pages/teachers.html" class="waves-effect"><i class="material-icons">supervisor_account</i><x-su>teachers</x-su></a></li>
+  <li><a href="/pages/absences.html" class="waves-effect"><i class="material-icons">query_builder</i><x-su>absences</x-su></a></li>
+  <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>videoconference</x-su></a></li>
+	<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>
+  <li><a href="/logout.html" class="waves-effect"><i class="material-icons">exit_to_app</i><x-su>logout</x-su></a></li>
+  <li><a href="/pages/settings.html" class="waves-effect"><i class="material-icons">settings</i><x-su>settings</x-su></a></li>
+</ul>
+
+
 		<ul id="directory-side-menu" class="sidenav side-modal">
 			<br>
 			<li><a class="header"><h5><x-su>directory</x-su></h5></a></li>
@@ -101,4 +110,4 @@
 			</div>
 		</div>
 	</body>
-</html>
-\ No newline at end of file
+</html>
diff --git a/pages/grades.html b/pages/grades.html
index 0c7e161..abddcb0 100644
--- a/pages/grades.html
+++ b/pages/grades.html
@@ -1,3 +1,7 @@
+
+
+
+
 <!DOCTYPE html>
 <html>
 <head>
@@ -45,22 +49,26 @@
             <div class="indeterminate"></div>
         </div>
     </nav>
+		
+<ul id="side-menu" class="sidenav side-menu">
+  <li><a class="subheader"><h4><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>
+  <li><a href="/pages/gradings.html" class="waves-effect"><i class="material-icons">event</i><x-su>gradings</x-su></a></li>
+  <li><a href="/pages/grades.html" class="waves-effect"><i class="material-icons">receipt</i><x-su>grades</x-su></a></li>
+  <li><a href="/pages/teachers.html" class="waves-effect"><i class="material-icons">supervisor_account</i><x-su>teachers</x-su></a></li>
+  <li><a href="/pages/absences.html" class="waves-effect"><i class="material-icons">query_builder</i><x-su>absences</x-su></a></li>
+  <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>videoconference</x-su></a></li>
+	<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>
+  <li><a href="/logout.html" class="waves-effect"><i class="material-icons">exit_to_app</i><x-su>logout</x-su></a></li>
+  <li><a href="/pages/settings.html" class="waves-effect"><i class="material-icons">settings</i><x-su>settings</x-su></a></li>
+</ul>
+
 
-    <ul id="side-menu" class="sidenav side-menu">
-      <li><a class="subheader"><h4><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>
-      <li><a href="/pages/gradings.html" class="waves-effect"><i class="material-icons">event</i><x-su>gradings</x-su></a></li>
-      <li><a href="/pages/grades.html" class="waves-effect"><i class="material-icons">receipt</i><x-su>grades</x-su></a></li>
-      <li><a href="/pages/teachers.html" class="waves-effect"><i class="material-icons">supervisor_account</i><x-su>teachers</x-su></a></li>
-      <li><a href="/pages/absences.html" class="waves-effect"><i class="material-icons">query_builder</i><x-su>absences</x-su></a></li>
-      <li><a href="/pages/messaging.html" class="waves-effect"><i class="material-icons">message</i><x-su>messaging</x-su></a></li>
-			<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/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>
-      <li><a href="/logout.html" class="waves-effect"><i class="material-icons">exit_to_app</i><x-su>logout</x-su></a></li>
-      <li><a href="/pages/settings.html" class="waves-effect"><i class="material-icons">settings</i><x-su>settings</x-su></a></li>
-    </ul>
     <ul id="grade-info" class="sidenav side-modal">
         <br>
         <li><a class="header">
diff --git a/pages/gradings.html b/pages/gradings.html
index 72a809a..3705976 100644
--- a/pages/gradings.html
+++ b/pages/gradings.html
@@ -1,3 +1,7 @@
+
+
+
+
 <!DOCTYPE html>
 <html>
 <head>
@@ -52,22 +56,26 @@
             <div class="indeterminate"></div>
         </div>
     </nav>
+		
+<ul id="side-menu" class="sidenav side-menu">
+  <li><a class="subheader"><h4><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>
+  <li><a href="/pages/gradings.html" class="waves-effect"><i class="material-icons">event</i><x-su>gradings</x-su></a></li>
+  <li><a href="/pages/grades.html" class="waves-effect"><i class="material-icons">receipt</i><x-su>grades</x-su></a></li>
+  <li><a href="/pages/teachers.html" class="waves-effect"><i class="material-icons">supervisor_account</i><x-su>teachers</x-su></a></li>
+  <li><a href="/pages/absences.html" class="waves-effect"><i class="material-icons">query_builder</i><x-su>absences</x-su></a></li>
+  <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>videoconference</x-su></a></li>
+	<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>
+  <li><a href="/logout.html" class="waves-effect"><i class="material-icons">exit_to_app</i><x-su>logout</x-su></a></li>
+  <li><a href="/pages/settings.html" class="waves-effect"><i class="material-icons">settings</i><x-su>settings</x-su></a></li>
+</ul>
+
 
-    <ul id="side-menu" class="sidenav side-menu">
-      <li><a class="subheader"><h4><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>
-      <li><a href="/pages/gradings.html" class="waves-effect"><i class="material-icons">event</i><x-su>gradings</x-su></a></li>
-      <li><a href="/pages/grades.html" class="waves-effect"><i class="material-icons">receipt</i><x-su>grades</x-su></a></li>
-      <li><a href="/pages/teachers.html" class="waves-effect"><i class="material-icons">supervisor_account</i><x-su>teachers</x-su></a></li>
-      <li><a href="/pages/absences.html" class="waves-effect"><i class="material-icons">query_builder</i><x-su>absences</x-su></a></li>
-      <li><a href="/pages/messaging.html" class="waves-effect"><i class="material-icons">message</i><x-su>messaging</x-su></a></li>
-			<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/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>
-      <li><a href="/logout.html" class="waves-effect"><i class="material-icons">exit_to_app</i><x-su>logout</x-su></a></li>
-      <li><a href="/pages/settings.html" class="waves-effect"><i class="material-icons">settings</i><x-su>settings</x-su></a></li>
-    </ul>
     <ul id="grading-info" class="sidenav side-modal">
         <br>
         <li><a class="header">
diff --git a/pages/jitsi.html b/pages/jitsi.html
new file mode 100644
index 0000000..c2156a1
--- /dev/null
+++ b/pages/jitsi.html
@@ -0,0 +1,74 @@
+
+
+
+
+<!DOCTYPE html>
+<html>
+	<head>
+		<meta charset="UTF-8">
+		<meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=no">
+		<meta http-equiv="X-UA-Compatible" content="ie=edge">
+		<meta name="google" content="notranslate">
+		<title>About &laquo; BežiApp</title>
+		<!-- Materialize -->
+		<link type="text/css" href="/css/materialize.min.css" rel="stylesheet">
+		<link href="/css/materialicons.css" rel="stylesheet">
+		<link href="/css/fontawesome.min.css" rel="stylesheet">
+		<script type="text/javascript" src="/js/lib/materialize.min.js"></script>
+		<script src="/js/lib/jquery.min.js"></script>
+		<script type="text/javascript" src="/js/lib/localforage.min.js"></script>
+		<link type="text/css" href="/css/styles.css" rel="stylesheet">
+		<link rel="manifest" href="/manifest.json">
+		<script src="/js/app.js"></script>
+		<script src="/js/lang/bundle.js"></script>
+		<link rel="shortcut icon" type="image/png" href="/favicon.png" />
+		<!-- iOS support -->
+		<link rel="apple-touch-icon" href="/img/icons/icon_96.png">
+		<link rel="apple-touch-icon" href="/img/icons/icon_512.png">
+		<meta name="apple-mobile-web-app-status-bar" content="#004d32">
+	</head>
+	<body>
+		<nav class="z-depth-0" id="navigation-main">
+			<div class="nav-wrapper container">
+				<b>Beži</b><span>App</span> &raquo; <x-su>videoconferences</x-su>
+					<span class="right white-text">
+						<i class="material-icons sidenav-trigger" data-target="side-menu">menu</i>
+					</span>
+			</div>
+			<div id="loading-bar" class="progress hidden">
+				<div class="indeterminate"></div>
+			</div>
+		</nav>
+		
+<ul id="side-menu" class="sidenav side-menu">
+  <li><a class="subheader"><h4><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>
+  <li><a href="/pages/gradings.html" class="waves-effect"><i class="material-icons">event</i><x-su>gradings</x-su></a></li>
+  <li><a href="/pages/grades.html" class="waves-effect"><i class="material-icons">receipt</i><x-su>grades</x-su></a></li>
+  <li><a href="/pages/teachers.html" class="waves-effect"><i class="material-icons">supervisor_account</i><x-su>teachers</x-su></a></li>
+  <li><a href="/pages/absences.html" class="waves-effect"><i class="material-icons">query_builder</i><x-su>absences</x-su></a></li>
+  <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>videoconference</x-su></a></li>
+	<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>
+  <li><a href="/logout.html" class="waves-effect"><i class="material-icons">exit_to_app</i><x-su>logout</x-su></a></li>
+  <li><a href="/pages/settings.html" class="waves-effect"><i class="material-icons">settings</i><x-su>settings</x-su></a></li>
+</ul>
+
+
+		<div class="container">
+			<iframe src="https://video.gimb.tk" style="width: 100%; height: 100%">
+				Ur browser does not support iframes, you have no Internet connection or the GimB videoconference server is down or does
+				not allow iframes. Probably we fucked something up, so drop us a message.
+				<hr>
+				Vaš brkljalnik ne podpira iframov, nimate povezave v medmrežje ali pa so se GimB videokonferenčni strežniki odločili ne
+				dovoliti iframov ali pa so sploh nedostopni. Kakorkoli že, verjetno smo mi kaj zajebali, zato nam napiši sporočilo!
+				<hr>
+				Danke schön.
+			</iframe>
+		</div>
+	</body>
+</html>
diff --git a/pages/meals.html b/pages/meals.html
index 00d150c..aff287b 100644
--- a/pages/meals.html
+++ b/pages/meals.html
@@ -1,3 +1,7 @@
+
+
+
+
 <!DOCTYPE html>
 <html>
 <head>
@@ -45,22 +49,26 @@
             <div class="indeterminate"></div>
         </div>
     </nav>
+		
+<ul id="side-menu" class="sidenav side-menu">
+  <li><a class="subheader"><h4><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>
+  <li><a href="/pages/gradings.html" class="waves-effect"><i class="material-icons">event</i><x-su>gradings</x-su></a></li>
+  <li><a href="/pages/grades.html" class="waves-effect"><i class="material-icons">receipt</i><x-su>grades</x-su></a></li>
+  <li><a href="/pages/teachers.html" class="waves-effect"><i class="material-icons">supervisor_account</i><x-su>teachers</x-su></a></li>
+  <li><a href="/pages/absences.html" class="waves-effect"><i class="material-icons">query_builder</i><x-su>absences</x-su></a></li>
+  <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>videoconference</x-su></a></li>
+	<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>
+  <li><a href="/logout.html" class="waves-effect"><i class="material-icons">exit_to_app</i><x-su>logout</x-su></a></li>
+  <li><a href="/pages/settings.html" class="waves-effect"><i class="material-icons">settings</i><x-su>settings</x-su></a></li>
+</ul>
+
 
-    <ul id="side-menu" class="sidenav side-menu">
-      <li><a class="subheader"><h4><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>
-      <li><a href="/pages/gradings.html" class="waves-effect"><i class="material-icons">event</i><x-su>gradings</x-su></a></li>
-      <li><a href="/pages/grades.html" class="waves-effect"><i class="material-icons">receipt</i><x-su>grades</x-su></a></li>
-      <li><a href="/pages/teachers.html" class="waves-effect"><i class="material-icons">supervisor_account</i><x-su>teachers</x-su></a></li>
-      <li><a href="/pages/absences.html" class="waves-effect"><i class="material-icons">query_builder</i><x-su>absences</x-su></a></li>
-      <li><a href="/pages/messaging.html" class="waves-effect"><i class="material-icons">message</i><x-su>messaging</x-su></a></li>
-			<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/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>
-      <li><a href="/logout.html" class="waves-effect"><i class="material-icons">exit_to_app</i><x-su>logout</x-su></a></li>
-      <li><a href="/pages/settings.html" class="waves-effect"><i class="material-icons">settings</i><x-su>settings</x-su></a></li>
-    </ul>
     <br>
     <div class="container login" hidden="hidden" id="meals-login">
 	<h4><x-su>loginToLopolis</x-su></h4>
diff --git a/pages/messaging.html b/pages/messaging.html
index 6fbf2db..9e96ce5 100644
--- a/pages/messaging.html
+++ b/pages/messaging.html
@@ -1,3 +1,7 @@
+
+
+
+
 <!DOCTYPE html>
 <html>
 <head>
@@ -43,21 +47,26 @@
             <div class="indeterminate"></div>
         </div>
     </nav>
-    <ul id="side-menu" class="sidenav side-menu">
-      <li><a class="subheader"><h4><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>
-      <li><a href="/pages/gradings.html" class="waves-effect"><i class="material-icons">event</i><x-su>gradings</x-su></a></li>
-      <li><a href="/pages/grades.html" class="waves-effect"><i class="material-icons">receipt</i><x-su>grades</x-su></a></li>
-      <li><a href="/pages/teachers.html" class="waves-effect"><i class="material-icons">supervisor_account</i><x-su>teachers</x-su></a></li>
-      <li><a href="/pages/absences.html" class="waves-effect"><i class="material-icons">query_builder</i><x-su>absences</x-su></a></li>
-      <li><a href="/pages/messaging.html" class="waves-effect"><i class="material-icons">message</i><x-su>messaging</x-su></a></li>
-      <li><a href="/pages/meals.html" class="waves-effect"><i class="material-icons">fastfood</i><x-su>meals</x-su></a></li>
-			<li><a href="/pages/chats.html" class="waves-effect"><i class="material-icons">chat</i><x-su>chat</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>
-      <li><a href="/logout.html" class="waves-effect"><i class="material-icons">exit_to_app</i><x-su>logout</x-su></a></li>
-      <li><a href="/pages/settings.html" class="waves-effect"><i class="material-icons">settings</i><x-su>settings</x-su></a></li>
-    </ul>
+		
+<ul id="side-menu" class="sidenav side-menu">
+  <li><a class="subheader"><h4><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>
+  <li><a href="/pages/gradings.html" class="waves-effect"><i class="material-icons">event</i><x-su>gradings</x-su></a></li>
+  <li><a href="/pages/grades.html" class="waves-effect"><i class="material-icons">receipt</i><x-su>grades</x-su></a></li>
+  <li><a href="/pages/teachers.html" class="waves-effect"><i class="material-icons">supervisor_account</i><x-su>teachers</x-su></a></li>
+  <li><a href="/pages/absences.html" class="waves-effect"><i class="material-icons">query_builder</i><x-su>absences</x-su></a></li>
+  <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>videoconference</x-su></a></li>
+	<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>
+  <li><a href="/logout.html" class="waves-effect"><i class="material-icons">exit_to_app</i><x-su>logout</x-su></a></li>
+  <li><a href="/pages/settings.html" class="waves-effect"><i class="material-icons">settings</i><x-su>settings</x-su></a></li>
+</ul>
+
+
     <div class="container">
         <h4><x-su>sendAMessage</x-su></h4>
         <div class="row">
diff --git a/pages/privacypolicy.html b/pages/privacypolicy.html
index 26bf17a..24048d4 100644
--- a/pages/privacypolicy.html
+++ b/pages/privacypolicy.html
@@ -1,3 +1,7 @@
+
+
+
+
 <!DOCTYPE html>
 <html>
 <head>
diff --git a/pages/settings.html b/pages/settings.html
index 9cde7ac..f38e30c 100644
--- a/pages/settings.html
+++ b/pages/settings.html
@@ -1,3 +1,7 @@
+
+
+
+
 <!DOCTYPE html>
 <html>
 <head>
@@ -42,22 +46,26 @@
             <div class="indeterminate"></div>
         </div>
     </nav>
+		
+<ul id="side-menu" class="sidenav side-menu">
+  <li><a class="subheader"><h4><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>
+  <li><a href="/pages/gradings.html" class="waves-effect"><i class="material-icons">event</i><x-su>gradings</x-su></a></li>
+  <li><a href="/pages/grades.html" class="waves-effect"><i class="material-icons">receipt</i><x-su>grades</x-su></a></li>
+  <li><a href="/pages/teachers.html" class="waves-effect"><i class="material-icons">supervisor_account</i><x-su>teachers</x-su></a></li>
+  <li><a href="/pages/absences.html" class="waves-effect"><i class="material-icons">query_builder</i><x-su>absences</x-su></a></li>
+  <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>videoconference</x-su></a></li>
+	<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>
+  <li><a href="/logout.html" class="waves-effect"><i class="material-icons">exit_to_app</i><x-su>logout</x-su></a></li>
+  <li><a href="/pages/settings.html" class="waves-effect"><i class="material-icons">settings</i><x-su>settings</x-su></a></li>
+</ul>
+
 
-    <ul id="side-menu" class="sidenav side-menu">
-			<li><a class="subheader"><h4><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>
-      <li><a href="/pages/gradings.html" class="waves-effect"><i class="material-icons">event</i><x-su>gradings</x-su></a></li>
-      <li><a href="/pages/grades.html" class="waves-effect"><i class="material-icons">receipt</i><x-su>grades</x-su></a></li>
-      <li><a href="/pages/teachers.html" class="waves-effect"><i class="material-icons">supervisor_account</i><x-su>teachers</x-su></a></li>
-      <li><a href="/pages/absences.html" class="waves-effect"><i class="material-icons">query_builder</i><x-su>absences</x-su></a></li>
-      <li><a href="/pages/messaging.html" class="waves-effect"><i class="material-icons">message</i><x-su>messaging</x-su></a></li>
-			<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/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>
-      <li><a href="/logout.html" class="waves-effect"><i class="material-icons">exit_to_app</i><x-su>logout</x-su></a></li>
-      <li><a href="/pages/settings.html" class="waves-effect"><i class="material-icons">settings</i><x-su>settings</x-su></a></li>
-    </ul>
 
     <div class="container">
         <div class="row">
diff --git a/pages/teachers.html b/pages/teachers.html
index 55a9a92..9741a3a 100644
--- a/pages/teachers.html
+++ b/pages/teachers.html
@@ -1,3 +1,7 @@
+
+
+
+
 <!DOCTYPE html>
 <html>
 <head>
@@ -45,22 +49,26 @@
             <div class="indeterminate"></div>
         </div>
     </nav>
+		
+<ul id="side-menu" class="sidenav side-menu">
+  <li><a class="subheader"><h4><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>
+  <li><a href="/pages/gradings.html" class="waves-effect"><i class="material-icons">event</i><x-su>gradings</x-su></a></li>
+  <li><a href="/pages/grades.html" class="waves-effect"><i class="material-icons">receipt</i><x-su>grades</x-su></a></li>
+  <li><a href="/pages/teachers.html" class="waves-effect"><i class="material-icons">supervisor_account</i><x-su>teachers</x-su></a></li>
+  <li><a href="/pages/absences.html" class="waves-effect"><i class="material-icons">query_builder</i><x-su>absences</x-su></a></li>
+  <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>videoconference</x-su></a></li>
+	<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>
+  <li><a href="/logout.html" class="waves-effect"><i class="material-icons">exit_to_app</i><x-su>logout</x-su></a></li>
+  <li><a href="/pages/settings.html" class="waves-effect"><i class="material-icons">settings</i><x-su>settings</x-su></a></li>
+</ul>
+
 
-    <ul id="side-menu" class="sidenav side-menu">
-      <li><a class="subheader"><h4><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>
-      <li><a href="/pages/gradings.html" class="waves-effect"><i class="material-icons">event</i><x-su>gradings</x-su></a></li>
-      <li><a href="/pages/grades.html" class="waves-effect"><i class="material-icons">receipt</i><x-su>grades</x-su></a></li>
-      <li><a href="/pages/teachers.html" class="waves-effect"><i class="material-icons">supervisor_account</i><x-su>teachers</x-su></a></li>
-      <li><a href="/pages/absences.html" class="waves-effect"><i class="material-icons">query_builder</i><x-su>absences</x-su></a></li>
-      <li><a href="/pages/messaging.html" class="waves-effect"><i class="material-icons">message</i><x-su>messaging</x-su></a></li>
-			<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/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>
-      <li><a href="/logout.html" class="waves-effect"><i class="material-icons">exit_to_app</i><x-su>logout</x-su></a></li>
-      <li><a href="/pages/settings.html" class="waves-effect"><i class="material-icons">settings</i><x-su>settings</x-su></a></li>
-    </ul>
     <ul id="teacher-info" class="sidenav side-modal">
         <br>
         <li><a class="subheader">
diff --git a/pages/timetable.html b/pages/timetable.html
index b7ce913..ad58153 100644
--- a/pages/timetable.html
+++ b/pages/timetable.html
@@ -1,3 +1,7 @@
+
+
+
+
 <!DOCTYPE html>
 <html>
 <head>
@@ -54,22 +58,26 @@
             <div class="indeterminate"></div>
         </div>
     </nav>
+		
+<ul id="side-menu" class="sidenav side-menu">
+  <li><a class="subheader"><h4><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>
+  <li><a href="/pages/gradings.html" class="waves-effect"><i class="material-icons">event</i><x-su>gradings</x-su></a></li>
+  <li><a href="/pages/grades.html" class="waves-effect"><i class="material-icons">receipt</i><x-su>grades</x-su></a></li>
+  <li><a href="/pages/teachers.html" class="waves-effect"><i class="material-icons">supervisor_account</i><x-su>teachers</x-su></a></li>
+  <li><a href="/pages/absences.html" class="waves-effect"><i class="material-icons">query_builder</i><x-su>absences</x-su></a></li>
+  <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>videoconference</x-su></a></li>
+	<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>
+  <li><a href="/logout.html" class="waves-effect"><i class="material-icons">exit_to_app</i><x-su>logout</x-su></a></li>
+  <li><a href="/pages/settings.html" class="waves-effect"><i class="material-icons">settings</i><x-su>settings</x-su></a></li>
+</ul>
+
 
-    <ul id="side-menu" class="sidenav side-menu">
-      <li><a class="subheader"><h4><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>
-      <li><a href="/pages/gradings.html" class="waves-effect"><i class="material-icons">event</i><x-su>gradings</x-su></a></li>
-      <li><a href="/pages/grades.html" class="waves-effect"><i class="material-icons">receipt</i><x-su>grades</x-su></a></li>
-      <li><a href="/pages/teachers.html" class="waves-effect"><i class="material-icons">supervisor_account</i><x-su>teachers</x-su></a></li>
-      <li><a href="/pages/absences.html" class="waves-effect"><i class="material-icons">query_builder</i><x-su>absences</x-su></a></li>
-      <li><a href="/pages/messaging.html" class="waves-effect"><i class="material-icons">message</i><x-su>messaging</x-su></a></li>
-			<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/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>
-      <li><a href="/logout.html" class="waves-effect"><i class="material-icons">exit_to_app</i><x-su>logout</x-su></a></li>
-      <li><a href="/pages/settings.html" class="waves-effect"><i class="material-icons">settings</i><x-su>settings</x-su></a></li>
-    </ul>
     <ul id="lesson-info" class="sidenav side-modal">
         <br>
         <li><a class="header">
diff --git a/pages/tos.html b/pages/tos.html
index 9c31b76..ad4b23b 100644
--- a/pages/tos.html
+++ b/pages/tos.html
@@ -1,3 +1,7 @@
+
+
+
+
 <!DOCTYPE html>
 <html>
 <head>
author	Anton L. Šijanec <sijanecantonluka@gmail.com>	2020-05-12 21:13:59 +0200
committer	Anton L. Šijanec <sijanecantonluka@gmail.com>	2020-05-12 21:13:59 +0200
commit	9df939a73fca559081523477cdcc9805c225fa23 (patch)
tree	e175fea49e66bb722b1284ff0251a171af55b6ab /pages
parent	chats.js not done yet (diff)
download	beziapp-9df939a73fca559081523477cdcc9805c225fa23.tar beziapp-9df939a73fca559081523477cdcc9805c225fa23.tar.gz beziapp-9df939a73fca559081523477cdcc9805c225fa23.tar.bz2 beziapp-9df939a73fca559081523477cdcc9805c225fa23.tar.lz beziapp-9df939a73fca559081523477cdcc9805c225fa23.tar.xz beziapp-9df939a73fca559081523477cdcc9805c225fa23.tar.zst beziapp-9df939a73fca559081523477cdcc9805c225fa23.zip