summaryrefslogtreecommitdiffstats
path: root/assets/js
diff options
context:
space:
mode:
authorrstular <rok@stular.eu>2020-05-20 11:14:52 +0200
committerrstular <rok@stular.eu>2020-05-20 11:53:56 +0200
commit01f9eef0a5b397c12f3eee9c801167f851d77251 (patch)
treed708cf68f2640eff7ce69b314dd91a2770d2ee93 /assets/js
parentBug fix - modal opens when hash is proivded (diff)
downloadbeziapp-01f9eef0a5b397c12f3eee9c801167f851d77251.tar
beziapp-01f9eef0a5b397c12f3eee9c801167f851d77251.tar.gz
beziapp-01f9eef0a5b397c12f3eee9c801167f851d77251.tar.bz2
beziapp-01f9eef0a5b397c12f3eee9c801167f851d77251.tar.lz
beziapp-01f9eef0a5b397c12f3eee9c801167f851d77251.tar.xz
beziapp-01f9eef0a5b397c12f3eee9c801167f851d77251.tar.zst
beziapp-01f9eef0a5b397c12f3eee9c801167f851d77251.zip
Diffstat (limited to 'assets/js')
-rw-r--r--assets/js/lib/themes.js8
-rw-r--r--assets/js/meals.js8
-rw-r--r--assets/js/messaging.js8
3 files changed, 15 insertions, 9 deletions
diff --git a/assets/js/lib/themes.js b/assets/js/lib/themes.js
index 8917aaa..14ef436 100644
--- a/assets/js/lib/themes.js
+++ b/assets/js/lib/themes.js
@@ -15,6 +15,7 @@ const THEME_COLOR_SCHEMES = {
"color-header-span": "rgba(255, 255, 255, 1)",
"color-text": "rgba(0, 0, 0, 1)",
+ "color-text-light": "rgba(97, 97, 97, 1)",
"color-label-text": "rgba(158, 158, 158, 1)",
"color-table-hover": "rgba(242, 242, 242, 0.5)",
@@ -42,13 +43,14 @@ const THEME_COLOR_SCHEMES = {
"color-header-bold": "rgba(255, 255, 255, 1)",
"color-header-span": "rgba(255, 255, 255, 1)",
- "color-text": "rgba(255, 255, 255, 1)",
+ "color-text": "rgba(189, 189, 189, 1)",
+ "color-text-light": "rgba(160, 160, 160, 1)",
"color-label-text": "rgba(158, 158, 158, 1)",
"color-table-hover": "rgba(70, 70, 70, 0.5)",
"color-sidenav-background": "rgba(31, 31, 31, 1)",
- "color-sidenav-text": "rgba(255, 255, 255, 1)",
- "color-sidenav-header": "rgba(255, 255, 255, 0.54)",
+ "color-sidenav-text": "rgba(189, 189, 189, 1)",
+ "color-sidenav-header": "rgba(189, 189, 189, 0.54)",
"color-divider": "rgba(80, 80, 80, 1)",
"color-btn-flat": "rgba(178, 178, 178, 1)",
diff --git a/assets/js/meals.js b/assets/js/meals.js
index e9b3af8..78de032 100644
--- a/assets/js/meals.js
+++ b/assets/js/meals.js
@@ -4,10 +4,10 @@ async function checkLogin() {
localforage.getItem("logged_in_lopolis").then((value) => {
if (value != true) {
$("#meals-container").hide();
- $("#meals-login").show();
+ $("#meals-login-container").show();
} else {
$("#meals-container").show();
- $("#meals-login").hide();
+ $("#meals-login-container").hide();
loadMeals();
}
}).catch((err) => {
@@ -240,8 +240,8 @@ function lopolisLogout() {
async function lopolisLogin() {
setLoading(true);
- var usernameEl = $("#meals_username");
- var passwordEl = $("#meals_password");
+ var usernameEl = $("#meals-username");
+ var passwordEl = $("#meals-password");
$.ajax({
url: API_ENDPOINT+"gettoken",
crossDomain: true,
diff --git a/assets/js/messaging.js b/assets/js/messaging.js
index 5426c7b..f829cd5 100644
--- a/assets/js/messaging.js
+++ b/assets/js/messaging.js
@@ -93,7 +93,11 @@ function populateAutocomplete() {
$(document).ready(function () {
if (window.location.hash.length > 1 && !window.location.hash.substring(1).startsWith("beziapp")) {
- $("#full-name").val(decodeURIComponent(window.location.hash.substring(1)));
+ var hashValue = decodeURIComponent(window.location.hash.substring(1));
+ $("#full-name").val(hashValue);
+ if (hashValue in directory) {
+ $("#msg-send").removeAttr("disabled");
+ }
$("#beziapp-new-message").modal();
$("#beziapp-new-message").modal("open");
}
@@ -346,7 +350,7 @@ function displayData(messageType) {
</button>
<p>
</div>
- <div class="card-action">
+ <div class="card-action general-text">
<a onclick="deleteMsg('${filterXSS(element["id"])}')">
<i class="material-icons">delete</i>
</a>