ChaoticByte/drinks-manager
1
1
Fork 0
Code Issues Pull requests Projects Releases 20 Packages Wiki Activity Actions

Release 11 (devel -> main)

Browse source 
See merge request W13R/drinks-manager!9
This commit is contained in:
Julian Müller 2022-07-05 15:45:06 +00:00
commit 284c08d350
3 changed files with 7 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

4
application/app/templates/registration/login.html
View file

@ -45,8 +45,8 @@
<td><button type="button" class="pinpadBtn" data-btn="9">9</button></td> <td><button type="button" class="pinpadBtn" data-btn="9">9</button></td>
</tr> </tr>
<tr> <tr>
<td><button type="button" class="pinpadBtn" data-btn="0">0</button></td>
<td><button type="button" class="pinpadBtn" data-btn="x">x</button></td> <td><button type="button" class="pinpadBtn" data-btn="x">x</button></td>
<td><button type="button" class="pinpadBtn" data-btn="0">0</button></td>
<td><button type="button" class="pinpadBtn" data-btn="enter">&#9166;</button></td> <td><button type="button" class="pinpadBtn" data-btn="enter">&#9166;</button></td>
</tr> </tr>
</table> </table>
@ -64,7 +64,7 @@
<h1>{% translate "Choose your account" %}</h1> <h1>{% translate "Choose your account" %}</h1>
<div class="userlistContainer"> <div class="userlistContainer" id="userlistContainer">
<ul class="userlist"> <ul class="userlist">
{% for user_ in user_list %} {% for user_ in user_list %}
<li class="userlistButton button" data-username="{{ user_.username }}"> <li class="userlistButton button" data-username="{{ user_.username }}">

2
lib/env.sh
View file

@ -2,5 +2,5 @@
export DJANGO_SK_ABS_FP="$(pwd)/config/secret_key.txt" export DJANGO_SK_ABS_FP="$(pwd)/config/secret_key.txt"
export STATIC_FILES="$(pwd)/static/" export STATIC_FILES="$(pwd)/static/"
export APP_VERSION="10" export APP_VERSION="11"
export PYTHONPATH="$(pwd)/packages/" export PYTHONPATH="$(pwd)/packages/"

8
static/js/login.js
View file

@ -5,11 +5,11 @@
let username_input; let username_input;
let password_input; let password_input;
let submit_button; let submit_button;
let username_display;
let password_overlay; let password_overlay;
let pw_overlay_cancel; let pw_overlay_cancel;
let userlist_buttons; let userlist_buttons;
let pinpad_buttons; let pinpad_buttons;
let userlist_container;
// Add event listeners after DOM Content loaded // Add event listeners after DOM Content loaded
@ -23,6 +23,7 @@
submit_button = document.getElementById("submit_login"); submit_button = document.getElementById("submit_login");
password_overlay = document.getElementById("passwordOverlayContainer"); password_overlay = document.getElementById("passwordOverlayContainer");
pw_overlay_cancel = document.getElementById("pwoCancel"); pw_overlay_cancel = document.getElementById("pwoCancel");
userlist_container = document.getElementById("userlistContainer");
userlist_buttons = document.getElementsByClassName("userlistButton"); userlist_buttons = document.getElementsByClassName("userlistButton");
pinpad_buttons = document.getElementsByClassName("pinpadBtn"); pinpad_buttons = document.getElementsByClassName("pinpadBtn");
@ -59,15 +60,14 @@
window.scrollTo(0, 0); window.scrollTo(0, 0);
password_overlay.classList.remove("nodisplay"); password_overlay.classList.remove("nodisplay");
document.body.classList.add("overflowHidden"); userlist_container.classList.add("nodisplay");
//password_input.focus();
} }
function hide_password_overlay() { function hide_password_overlay() {
password_overlay.classList.add("nodisplay"); password_overlay.classList.add("nodisplay");
document.body.classList.remove("overflowHidden"); userlist_container.classList.remove("nodisplay");
password_input.value = ""; password_input.value = "";
} }