predelava web vmesnika - zaslonska tipkovnica + drugi gumbi

projector.py

@@ -8,6 +8,7 @@ import os
 import math
 import subprocess
 import sys
+import ctypes
 import tkinter.messagebox as messagebox
 from web.server import start_server_thread
 
@@ -159,12 +160,40 @@ class SongProjector:
             except Exception as e:
                 print(f"Napaka pri zagonu web serverja: {e}")
 
+        # --------------------------------------------------
+        #  Preprečevanje ohranjevalnika zaslona
+        # --------------------------------------------------
+        self.keep_awake()
+
+    def keep_awake(self):
+        """
+        Prepreči vklop ohranjevalnika zaslona ali spanja.
+        """
+        try:
+            if sys.platform.startswith("win"):
+                # Windows: ES_CONTINUOUS | ES_DISPLAY_REQUIRED | ES_SYSTEM_REQUIRED
+                # 0x80000000 | 0x00000002 | 0x00000001
+                # Uporabimo c_uint za zagotovitev pravilnega tipa
+                ctypes.windll.kernel32.SetThreadExecutionState(ctypes.c_uint(0x80000003))
+            elif sys.platform == "linux":
+                # Zaženi inhibitor, dokler tvoj program dela (hrani handle!)
+                inhibitor = subprocess.Popen([
+                    "gnome-session-inhibit",
+                    "--inhibit", "idle",
+                    "--inhibit", "suspend",
+                    "--reason", "Projecting lyrics",
+                    "sleep", "infinity"
+                ])
+
+        except Exception as e:
+            print(f"Napaka pri preprečevanju spanja: {e}")
+
     # ------------------------------------------------------
     #  NOVA METODA: enakomeren prelom predolgih vrstic
     # ------------------------------------------------------
     def split_long_line(self, line):
         """
-        Vrne seznam pod‑vrstic, ki skupaj tvorijo `line`,
+        Vrne seznam pod-vrstic, ki skupaj tvorijo `line`,
         pri čemer so (približno) enako dolge glede na število znakov.
         """
         avg_char_width = int(self.settings["font_size"]) * 0.57
@@ -245,6 +274,15 @@ class SongProjector:
             else:
                 subprocess.Popen(["shutdown", "-h", "now"])
             return
+        elif self.song_number == "9998":
+            if sys.platform.startswith("win"):
+                subprocess.Popen(["shutdown", "/r", "/t", "0"])
+            else:
+                subprocess.Popen(["shutdown", "-r", "now"])
+            return
+        elif self.song_number == "9997":
+            self.restart_program()
+            return
         elif self.song_number == "7777":
             subprocess.Popen([sys.executable, os.path.join(BASE_DIR, "nastavitve.py")])         # fixme: novi proces ne dobi stdin-a; predelati na tkinter aplikacijo?
             self.exit_program()
@@ -463,10 +501,42 @@ class SongProjector:
     #  Izhod
     # ------------------------------------------------------
     def exit_program(self, event=None):
+        # Ponastavi stanje preprečevanja spanja na Windows
+        if sys.platform.startswith("win"):
+            try:
+                # ES_CONTINUOUS (0x80000000)
+                ctypes.windll.kernel32.SetThreadExecutionState(ctypes.c_uint(0x80000000))
+            except:
+                pass
+        elif sys.platform == "linux":
+            try:
+                # Ponovno vklopi ohranjevalnik in DPMS (privzete vrednosti)
+                subprocess.Popen(["xset", "s", "on", "+dpms"], stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL)
+                
+                # Za Wayland/DBus inhibit običajno ni treba eksplicitno sprostiti,
+                # če se proces konča, vendar bi za popolnost lahko uporabili UnInhibit,
+                # če bi shranili cookie. Ker ga nismo, se zanašamo na to, da DBus
+                # samodejno sprosti inhibit ob zaprtju povezave/procesa.
+            except:
+                pass
+
         self.conn.close()
         self.root.destroy()
+    # ------------------------------------------------------
+    #  Restart programa
+    # ------------------------------------------------------
+    def restart_program(self):
+        try:
+            if self.conn:
+                self.conn.close()
+        except Exception:
+            pass
 
+        python = sys.executable
+        args = [python] + sys.argv
+        subprocess.Popen(args)
 
+        self.root.after(200, self.exit_program)
 # ----------------------------------------------------------
 #  Zagon aplikacije
 # ----------------------------------------------------------

startup.bat

@@ -1,25 +1,55 @@
 @echo off
 cls
 
-set "TARGET=%USERPROFILE%\OneDrive\Namizje"
+set "TARGET=%USERPROFILE%\OneDrive\Namizje\Projekcije cerkev"
+set "BACKUP_DIR=%TARGET%\backup"
 
-:: Najprej preveri ali obstaja mapa Projekcije cerkev
+:: Najprej preveri ali obstaja mapa Projekcije cerkev na USB (D:)
 IF EXIST "D:\Projekcije cerkev" (
-    echo Mapa 'Projekcije cerkev' obstaja.
-    echo Kopiram mapo na namizje...
+    echo Mapa 'Projekcije cerkev' na USB pogonu obstaja.
+    
+    :: 1. Ustvari backup obstoječe baze na namizju, če obstaja
+    IF EXIST "%TARGET%\songs.db" (
+        echo Ustvarjam backup baze...
+        if not exist "%BACKUP_DIR%" mkdir "%BACKUP_DIR%"
+        
+        :: Pridobi timestamp (YYYYMMDD_HHMMSS)
+        for /f "tokens=2-4 delims=/ " %%a in ('date /t') do (set mydate=%%c%%a%%b)
+        for /f "tokens=1-2 delims=: " %%a in ('time /t') do (set mytime=%%a%%b)
+        set "TS=%date:~10,4%%date:~4,2%%date:~7,2%_%time:~0,2%%time:~3,2%%time:~6,2%"
+        set "TS=%TS: =0%"
+        
+        set "CURRENT_BACKUP=%BACKUP_DIR%\backup_%TS%"
+        mkdir "%CURRENT_BACKUP%"
+        
+        if exist "%TARGET%\settings.conf" copy "%TARGET%\settings.conf" "%CURRENT_BACKUP%\" >nul
+        if exist "%TARGET%\songs.db" copy "%TARGET%\songs.db" "%CURRENT_BACKUP%\" >nul
+        
+        echo Backup ustvarjen v: %CURRENT_BACKUP%
+        
+        :: 2. Ohrani samo zadnjih 6 backupov (pobriši starejše)
+        pushd "%BACKUP_DIR%"
+        for /f "skip=6 delims=" %%F in ('dir /b /ad /o-n backup_*') do (
+            echo Brisanje starega backupa: %%F
+            rd /s /q "%%F"
+        )
+        popd
+    )
 
-    :: Kopiranje z robocopy
-    robocopy "D:\Projekcije cerkev" "%TARGET%\Projekcije cerkev" /E
+    echo Kopiram nove datoteke z USB na namizje...
+    :: Kopiranje z robocopy (/E - vse podmape, /XO - samo novejše datoteke, da ne povozimo backupa če ni treba)
+    robocopy "D:\Projekcije cerkev" "%TARGET%" /E
 
     echo Zagon projector.py ...
-    pushd "%TARGET%\Projekcije cerkev"
+    pushd "%TARGET%"
     python projector.py
     popd
 ) ELSE (
     cls
+    echo USB ključek ni najden. Zagon lokalne verzije...
     echo Zagon projector.py ...
-    pushd "%TARGET%\Projekcije cerkev"
-    python projector.py
+    pushd "%TARGET%"
+    py "projekcija\projector.py"
     popd
 )
 

startup.sh

@@ -0,0 +1,44 @@
+#!/bin/bash
+
+# Ciljna mapa na Linuxu (v uporabnikovem home-u)
+TARGET="$HOME/Projekcije cerkev"
+BACKUP_DIR="$TARGET/backup"
+
+# Iskanje vira na vseh priklopljenih medijih (USB ključek)
+SOURCE=$(find /media/$USER -maxdepth 2 -type d -name "Projekcije cerkev" 2>/dev/null | head -n 1)
+
+if [ -n "$SOURCE" ]; then
+    echo "Najden ključek: $SOURCE"
+    
+    # 1. Ustvari backup obstoječe baze, če obstaja
+    if [ -f "$TARGET/songs.db" ]; then
+        echo "Ustvarjam backup baze..."
+        mkdir -p "$BACKUP_DIR"
+        
+        # Časovni žig po ISO 8601 formatu (npr. 2026-03-08T20:56:42)
+        TS=$(date +"%Y-%m-%dT%H:%M:%S")
+        CURRENT_BACKUP="$BACKUP_DIR/backup_$TS"
+        mkdir -p "$CURRENT_BACKUP"
+        
+        [ -f "$TARGET/settings.conf" ] && cp "$TARGET/settings.conf" "$CURRENT_BACKUP/"
+        [ -f "$TARGET/songs.db" ] && cp "$TARGET/songs.db" "$CURRENT_BACKUP/"
+        
+        echo "Backup ustvarjen v: $CURRENT_BACKUP"
+        
+        # 2. Ohrani samo zadnjih 6 backupov (pobriši starejše)
+        # ls -dt izpiše mape po času (novejše prej), tail -n +7 pa preskoči prvih šest
+        cd "$BACKUP_DIR" && ls -dt backup_* 2>/dev/null | tail -n +7 | xargs -r rm -rf
+    fi
+
+    echo "Sinhronizacija datotek z USB v home mapo..."
+    mkdir -p "$TARGET"
+    # rsync -av --exclude='backup' sinhronizira vsebino brez backup mape
+    rsync -av --exclude='backup' "$SOURCE/" "$TARGET/"
+fi
+
+echo "Zagon projector.py..."
+if [ -d "$TARGET" ]; then
+    cd "$TARGET" && projekcija/projector.py
+else
+    echo "Napaka: Mapa $TARGET ne obstaja."
+fi

web/static/script.js

@@ -3,90 +3,130 @@ console.log('JavaScript se izvaja...');
 // DOM elementi
 const songNumberInput = document.getElementById('song-number');
 const loadBtn = document.getElementById('load-btn');
-const searchQueryInput = document.getElementById('search-query');
-const searchBtn = document.getElementById('search-btn');
-const capsBtn = document.getElementById('caps-btn');
 const displayArea = document.getElementById('display-area');
 const prevBtn = document.getElementById('prev-btn');
 const nextBtn = document.getElementById('next-btn');
 const darkBtn = document.getElementById('dark-btn');
 const pageInfo = document.getElementById('page-info');
-
-console.log('DOM elementi najdeni:', { songNumberInput: !!songNumberInput, loadBtn: !!loadBtn, searchQueryInput: !!searchQueryInput, searchBtn: !!searchBtn, capsBtn: !!capsBtn, displayArea: !!displayArea, prevBtn: !!prevBtn, nextBtn: !!nextBtn, darkBtn: !!darkBtn, pageInfo: !!pageInfo });
+const clearBtn = document.getElementById('clear-btn');
+const keypadButtons = document.querySelectorAll('.btn-key');
+const keypadWrapper = document.getElementById('keypad-wrapper');
+const toggleKeypadBtn = document.getElementById('toggle-keypad-btn');
 
 let capsMode = false;
+let wakeLock = null;
+let lastStateSignature = "";
 
-// Naloži trenutne podatke
-async function updateState() {
-    console.log('updateState() se kliče...');
+// vibracija telefona
+function vibrate() {
+    if (navigator.vibrate && /Android|iPhone|iPad|iPod/i.test(navigator.userAgent)) {
+        navigator.vibrate([25, 30, 25]);
+    }
+}
+
+// poskus, da se zaslon ne ugaša
+async function requestWakeLock() {
     try {
-        console.log('Pošiljam fetch za /api/state...');
-        const response = await fetch('/api/state');
-        console.log('Response status:', response.status);
+        if ('wakeLock' in navigator) {
+            wakeLock = await navigator.wakeLock.request('screen');
+            console.log('Wake lock aktiviran');
+
+            wakeLock.addEventListener('release', () => {
+                console.log('Wake lock sproščen');
+            });
+        }
+    } catch (err) {
+        console.log('Wake lock ni uspel:', err);
+    }
+}
+
+// ob vrnitvi v zavihek ponovno zahtevaj wake lock
+document.addEventListener('visibilitychange', async () => {
+    if (document.visibilityState === 'visible') {
+        await requestWakeLock();
+    }
+});
+
+// posodobi stanje
+async function updateState(force = false) {
+    try {
+        const response = await fetch('/api/state', { cache: 'no-store' });
         const data = await response.json();
-        console.log('Response data:', data);
-        
+
+        const signature = JSON.stringify({
+            current_text: data.current_text || '',
+            page_info: data.page_info || '',
+            caps_mode: data.caps_mode || false,
+            can_prev: !!data.can_prev
+        });
+
+        if (!force && signature === lastStateSignature) {
+            return;
+        }
+
+        lastStateSignature = signature;
+
         displayArea.textContent = data.current_text || 'Pripravljeno. Vpiši številko pesmi.';
         pageInfo.textContent = data.page_info || '';
+
         capsMode = data.caps_mode || false;
-        
+
         if (capsMode) {
-            capsBtn.classList.add('active');
+            darkBtn.classList.add('active');
         } else {
-            capsBtn.classList.remove('active');
+            darkBtn.classList.remove('active');
         }
-        
+
         prevBtn.disabled = !data.can_prev;
-        nextBtn.disabled = !data.can_next;
-        console.log('updateState() uspešno zaključeno');
     } catch (error) {
         console.error('Napaka pri posodabljanju stanja:', error);
         displayArea.innerHTML = '<span class="status-message">Napaka: ni povezave do strežnika</span>';
-        prevBtn.disabled = true; nextBtn.disabled = true; loadBtn.disabled = true; searchBtn.disabled = true; capsBtn.disabled = true; darkBtn.disabled = true;
     }
 }
 
-// Naloži pesem
+// dodaj številko
+function addDigit(digit) {
+    songNumberInput.value += digit;
+}
+
+// počisti vnos
+function clearInput() {
+    songNumberInput.value = '';
+}
+
+// Enter:
+// - če je številka -> naloži pesem
+// - če ni številke -> naslednja kitica
 async function loadSong() {
-    console.log('loadSong() se kliče');
     const songNumber = songNumberInput.value.trim();
-    console.log('Song number:', songNumber);
-    if (!songNumber) return;
-    
+
     try {
-        console.log('Pošiljam POST za /api/load_song...');
-        const response = await fetch('/api/load_song', { method: 'POST', headers: {'Content-Type': 'application/json'}, body: JSON.stringify({song_number: songNumber}) });
-        console.log('Response status:', response.status);
-        const data = await response.json();
-        console.log('Response data:', data);
-        
-        songNumberInput.value = '';
-        updateState();
+        if (songNumber) {
+            await fetch('/api/load_song', {
+                method: 'POST',
+                headers: { 'Content-Type': 'application/json' },
+                body: JSON.stringify({ song_number: songNumber })
+            });
+
+            songNumberInput.value = '';
+        } else {
+            await fetch('/api/next_page', { method: 'POST' });
+        }
+
+        await updateState(true);
     } catch (error) {
-        console.error('Napaka pri nalaganju pesmi:', error);
+        console.error('Napaka:', error);
         displayArea.innerHTML = '<span class="status-message">Napaka: ni povezave do strežnika</span>';
     }
 }
 
-// Naslednja stran
-async function nextPage() {
-    try {
-        await fetch('/api/next_page', {method: 'POST'});
-        updateState();
-    } catch (error) {
-        console.error('Napaka pri navigaciji:', error);
-        displayArea.innerHTML = '<span class="status-message">Napaka: ni povezave do strežnika</span>';
-    }
-}
-
-// Prejšnja stran
+// prejšnja kitica
 async function prevPage() {
     try {
-        await fetch('/api/prev_page', {method: 'POST'});
-        updateState();
+        await fetch('/api/prev_page', { method: 'POST' });
+        await updateState(true);
     } catch (error) {
         console.error('Napaka pri navigaciji:', error);
-        displayArea.innerHTML = '<span class="status-message">Napaka: ni povezave do strežnika</span>';
     }
 }
 
@@ -94,7 +134,7 @@ async function prevPage() {
 async function clearScreen() {
     try {
         await fetch('/api/clear_screen', {method: 'POST'});
-        updateState();
+        await updateState(true);
     } catch (error) {
         console.error('Napaka pri zatamnitvi ekrana:', error);
         displayArea.innerHTML = '<span class="status-message">Napaka: ni povezave do strežnika</span>';
@@ -104,54 +144,140 @@ async function clearScreen() {
 // Preklop VELIKIH ČRK
 async function toggleCaps() {
     try {
-        const response = await fetch('/api/toggle_caps', {method: 'POST'});
-        updateState();
+        await fetch('/api/toggle_caps', { method: 'POST' });
+        await updateState(true);
     } catch (error) {
-        console.error('Napaka pri preklopa velikih črk:', error);                    displayArea.innerHTML = '<span class="status-message">Napaka: ni povezave do strežnika</span>';                }
-}
-
-// Iskanje pesmi
-async function searchSongs() {
-    const query = searchQueryInput.value.trim();
-    if (!query) return;
-    
-    try {
-        const response = await fetch('/api/search_songs', { method: 'POST', headers: {'Content-Type': 'application/json'}, body: JSON.stringify({query: query}) });
-        const data = await response.json();
-        
-        if (data.results && data.results.length > 0) {
-            const resultList = data.results.map(item => `${item[0]}: ${item[1]}`).join('\n');
-            displayArea.innerHTML = '<span class="status-message">' + resultList.replace(/</g, '&lt;').replace(/>/g, '&gt;').replace(/\n/g, '<br>') + '</span>';
-        } else {
-            displayArea.innerHTML = '<span class="status-message">Ni zadetkov.</span>';
-        }
-        searchQueryInput.value = '';
-    } catch (error) {
-        console.error('Napaka pri iskanju:', error);
-        displayArea.innerHTML = '<span class="status-message">Napaka: ni povezave do strežnika</span>';
+        console.error('Napaka pri preklopu velikih črk:', error);
     }
 }
 
-// Dodaj poslušalce
-console.log('Dodajam event listenerje...');
-loadBtn.addEventListener('click', loadSong);
-console.log('loadBtn listener dodan');
-songNumberInput.addEventListener('keypress', (e) => { if (e.key === 'Enter') loadSong(); });
-console.log('songNumberInput listener dodan');
+// skrij/pokaži tipkovnico
+function toggleKeypad() {
+    if (!keypadWrapper || !toggleKeypadBtn) return;
 
-/* searchBtn.addEventListener('click', searchSongs);
-searchQueryInput.addEventListener('keypress', (e) => { if (e.key === 'Enter') searchSongs(); }); */
+    keypadWrapper.classList.toggle('hidden');
 
-capsBtn.addEventListener('click', toggleCaps);
-prevBtn.addEventListener('click', prevPage);
-nextBtn.addEventListener('click', nextPage);
-darkBtn.addEventListener('click', clearScreen);
-console.log('Vsi event listenerji dodani');
+    if (keypadWrapper.classList.contains('hidden')) {
+        toggleKeypadBtn.textContent = 'Pokaži tipkovnico';
+    } else {
+        toggleKeypadBtn.textContent = 'Skrij tipkovnico';
+    }
+}
 
-// Začetna inicijalizacija
-console.log('Začenjam začetno inicijalizacijo...');
-updateState();
+// ============================
+// EVENT LISTENERJI
+// ============================
+
+// številke na zaslonu
+keypadButtons.forEach(btn => {
+    btn.addEventListener('click', () => {
+        vibrate();
+        const key = btn.dataset.key;
+        if (key !== undefined) {
+            addDigit(key);
+        }
+    });
+});
+
+// Enter
+loadBtn.addEventListener('click', () => {
+    vibrate();
+    loadSong();
+});
+
+// C
+clearBtn.addEventListener('click', () => {
+    vibrate();
+    clearInput();
+});
+
+// Nazaj
+prevBtn.addEventListener('click', () => {
+    vibrate();
+    prevPage();
+});
+
+// Zastri
+nextBtn.addEventListener('click', () => {
+    vibrate();
+    clearScreen();
+});
+
+// AAaa
+darkBtn.addEventListener('click', () => {
+    vibrate();
+    toggleCaps();
+});
+
+// Skrij/Pokaži tipkovnico
+if (toggleKeypadBtn) {
+    toggleKeypadBtn.addEventListener('click', toggleKeypad);
+}
+
+// fizična tipkovnica
+document.addEventListener('keydown', (e) => {
+    // na telefonu ni potrebe; na velikih ekranih pa naj dela
+    if (window.innerWidth < 901) return;
+
+    // da ne ponavlja pri držanju tipke
+    if (e.repeat) return;
+
+    // številke
+    if (e.key >= '0' && e.key <= '9') {
+        e.preventDefault();
+        addDigit(e.key);
+        return;
+    }
+
+    // Enter
+    if (e.key === 'Enter' || e.code === 'NumpadEnter') {
+        e.preventDefault();
+        loadSong();
+        return;
+    }
+
+    // C
+    if (e.key === 'Backspace' || e.key === 'Delete') {
+        e.preventDefault();
+        clearInput();
+        return;
+    }
+
+    // Zastri
+    if (e.key === '+' || e.code === 'NumpadAdd') {
+        e.preventDefault();
+        clearScreen();
+        return;
+    }
+
+    // Nazaj
+    if (e.key === '-' || e.code === 'NumpadSubtract') {
+        e.preventDefault();
+        prevPage();
+        return;
+    }
+
+    // AAaa
+    if (e.key === '*' || e.code === 'NumpadMultiply') {
+        e.preventDefault();
+        toggleCaps();
+        return;
+    }
+
+    // numpad številke
+    if (e.code.startsWith('Numpad') && /\d/.test(e.key)) {
+        e.preventDefault();
+        addDigit(e.key);
+    }
+});
+
+// začetno stanje
+updateState(true);
+requestWakeLock();
+
+// osveževanje za sinhronizacijo med več napravami
+setInterval(() => {
+    updateState(false);
+}, 1000);
 
-// Osveži stanje vsako sekundo (za sinhronizacijo s tipkovnico)
-// setInterval(updateState, 1000);
 console.log('JavaScript inicializacija zaključena');

web/static/styles.css

@@ -4,101 +4,109 @@
     box-sizing: border-box;
 }
 
+:root {
+    --vh: 100vh;
+    --container-min-h: 100vh;
+    --keypad-gap: 10px;
+    --panel-bg: #111111;
+    --body-bg: #000000;
+    --text-main: #ffffff;
+    --text-muted: #aaaaaa;
+}
+
+@supports (height: 100svh) {
+    :root {
+        --vh: 100svh;
+        --container-min-h: 100svh;
+    }
+}
+
+@supports (height: 100dvh) {
+    :root {
+        --vh: 100dvh;
+    }
+}
+
 body {
     font-family: 'Times New Roman', serif;
     background-color: #0a0a0a;
     color: #ffffff;
-    display: flex;
-    flex-direction: column;
-    height: 100vh;
-    overflow: hidden; /* Prevent body scroll */
+    min-height: var(--container-min-h);
+    overflow: auto;
 }
 
 .container {
     display: flex;
     flex-direction: column;
-    height: 100%;
-    padding: 0;
+    min-height: var(--vh);
+    height: var(--vh);
     overflow: hidden;
+    background-color: var(--body-bg);
 }
 
-/* Gornja vrstica - Vnos pesmi */
-.top-bar {
-    background-color: #1a1a1a;
-    padding: 15px;
-    border-bottom: 2px solid #333;
+/* skrito vnosno polje - script.js ga še vedno uporablja */
+#song-number {
+    display: none;
+}
+
+/* vrstica s stanjem */
+.status-bar {
+    background-color: #111111;
+    border-bottom: 1px solid #222;
+    color: #dddddd;
+    padding: 8px 12px;
+    flex-shrink: 0;
+    min-height: 40px;
     display: flex;
-    gap: 10px;
     align-items: center;
-    flex-wrap: wrap;
-    flex-shrink: 0; /* Keep fixed size */
+    justify-content: space-between;
+    gap: 12px;
 }
 
-.top-bar label {
-    font-size: 16px;
-    font-weight: bold;
+.page-info {
+    color: #cccccc;
+    font-size: 20px;
+    line-height: 1.2;
+    white-space: nowrap;
 }
 
-.top-bar input {
-    padding: 10px 15px;
-    font-size: 16px;
-    background-color: #2a2a2a;
-    border: 1px solid #444;
-    color: #ffffff;
-    border-radius: 4px;
-    width: 100px;
-}
-
-.top-bar button {
-    padding: 10px 20px;
-    font-size: 16px;
-    background-color: #3a7ca5;
+.toggle-keypad-btn {
+    display: none;
+    background-color: #333;
+    color: #fff;
     border: none;
-    color: white;
+    border-radius: 8px;
+    padding: 8px 12px;
+    font-size: 15px;
     cursor: pointer;
-    border-radius: 4px;
-    transition: background-color 0.3s;
 }
 
-.top-bar button:hover {
-    background-color: #2d6183;
+.toggle-keypad-btn:hover {
+    filter: brightness(1.08);
 }
 
-.caps-toggle {
-    padding: 10px 15px;
-    font-size: 14px;
-    background-color: #4a4a4a;
-    border: 1px solid #666;
-    color: #ffffff;
-    cursor: pointer;
-    border-radius: 4px;
-    transition: background-color 0.3s;
-}
-
-.caps-toggle.active {
-    background-color: #3a7ca5;
-}
-
-/* Sredenska vrstica - Prikaz besedila */
+/* glavni prikaz besedila */
 .content {
     flex: 1;
     display: flex;
-    align-items: flex-start; /* Better for scrolling long text */
+    align-items: flex-start;
     justify-content: center;
-    padding: 20px;
+    padding: 20px 16px;
     overflow-y: auto;
     background-color: #000000;
-    -webkit-overflow-scrolling: touch; /* Smooth scroll on iOS */
+    -webkit-overflow-scrolling: touch;
 }
 
 .lyrics-display {
     text-align: center;
-    font-size: 24px; /* Adjusted for mobile */
-    line-height: 1.4;
+    font-size: 24px;
+    line-height: 1.45;
     white-space: pre-wrap;
     word-wrap: break-word;
     max-width: 100%;
+    width: 100%;
     padding-bottom: 20px;
+    color: #ffffff;
 }
 
 .status-message {
@@ -106,125 +114,198 @@ body {
     font-size: 20px;
 }
 
-/* Donja vrstica - Navigacijski gumbi */
-.bottom-bar {
-    background-color: #1a1a1a;
-    padding: 15px;
-    border-top: 2px solid #333;
-    display: flex;
-    justify-content: space-around;
-    gap: 10px;
-    align-items: center;
-    flex-shrink: 0; /* Keep fixed size */
+/* ovijalec tipkovnice */
+.keypad-wrapper {
+    flex-shrink: 0;
+    background-color: #111111;
+    border-top: 1px solid #222;
 }
 
-.bottom-bar button {
-    padding: 12px 10px;
-    font-size: 16px;
+.keypad-wrapper.hidden {
+    display: none;
+}
+
+/* numerična tipkovnica */
+.keypad {
+    background-color: #111111;
+    padding: 12px;
+    padding-bottom: calc(12px + env(safe-area-inset-bottom, 0px));
+    display: grid;
+    grid-template-columns: repeat(4, 1fr);
+    gap: var(--keypad-gap);
+    width: 100%;
+}
+
+/* osnovni videz gumbov */
+.keypad button {
+    min-height: 58px;
     border: none;
-    color: white;
+    border-radius: 10px;
     cursor: pointer;
-    border-radius: 4px;
-    transition: background-color 0.3s;
-    flex: 1;
-    min-width: 0; /* Allow shrinking */
-    max-width: 120px;
+    font-family: Arial, sans-serif;
+    font-size: 28px;
+    font-weight: bold;
+    transition: transform 0.05s ease, filter 0.2s ease, opacity 0.2s ease, box-shadow 0.05s ease;
+    -webkit-tap-highlight-color: transparent;
+    box-shadow: 0 3px 0 rgba(0, 0, 0, 0.35);
 }
 
-.btn-nav {
-    background-color: #556b79;
+.keypad button:active {
+    transform: scale(0.80);
+    box-shadow: 0 1px 0 rgba(0, 0, 0, 0.25);
 }
 
-.btn-nav:hover {
-    background-color: #3d4a52;
-}
-
-.btn-nav:disabled {
-    background-color: #2a2a2a;
+.keypad button:disabled {
+    opacity: 0.45;
     cursor: not-allowed;
-    opacity: 0.5;
 }
 
+/* številke */
+.btn-key {
+    background-color: #f2f2f2;
+    color: #111111;
+}
+
+/* Zastri / Nazaj */
+.btn-action {
+    background-color: #c28b24;
+    color: #ffffff;
+    font-size: 20px;
+}
+
+/* AAaa */
 .btn-dark {
     background-color: #8b4513;
+    color: #ffffff;
+    font-size: 20px;
 }
 
-.btn-dark:hover {
-    background-color: #6b3410;
+.btn-dark.active {
+    outline: 2px solid #ffffff;
+    outline-offset: -2px;
 }
 
-.page-info {
-    color: #999;
-    font-size: 16px;
-    min-width: 60px;
+/* C */
+.btn-clear {
+    background-color: #555555;
+    color: #ffffff;
+    font-size: 20px;
 }
 
-/* ====== Viewport & varni odmik (mobilni) ====== */
-
-/* Fallback: najprej uporabimo 100vh, potem nove enote (svh/dvh) kjer so podprte */
-:root {
-  --vh: 100vh;                /* fallback */
-  --container-min-h: 100vh;   /* fallback */
-  --bottom-bar-h: 60px;       /* realna višina spodnje vrstice (glej .bottom-bar padding) */
+/* Enter čez dve vrstici */
+.btn-enter {
+    background-color: #1f8a46;
+    color: #ffffff;
+    grid-row: span 2;
+    font-size: 24px;
 }
 
-/* Novejši brskalniki – stabilna višina toolbara */
-@supports (height: 100svh) {
-  :root { --vh: 100svh; --container-min-h: 100svh; }
-}
-/* Alternativa: dinamična višina (ko toolbar skrije/prikaže) */
-@supports (height: 100dvh) {
-  :root { --vh: 100dvh; }
+/* hover samo za naprave z miško */
+@media (hover: hover) and (pointer: fine) {
+    .btn-key:hover {
+        filter: brightness(0.92);
+    }
+
+    .btn-action:hover,
+    .btn-dark:hover,
+    .btn-clear:hover,
+    .btn-enter:hover,
+    .toggle-keypad-btn:hover {
+        filter: brightness(1.08);
+    }
 }
 
-/* Odstrani zaklepanje scrolla – to pogosto povzroči prekrivanje na mobilnih */
-body {
-  /* odstrani prejšnje overflow: hidden; */
-  overflow: auto !important;
-  min-height: var(--container-min-h);
+/* tablica / manjši laptop */
+@media (max-width: 900px) {
+    .lyrics-display {
+        font-size: 22px;
+    }
+
+    .page-info {
+        font-size: 18px;
+    }
+
+    .keypad button {
+        min-height: 54px;
+        font-size: 24px;
+    }
 }
 
-/* Glavni vsebnik naj razpne celoten pogled in upošteva varne robove */
-.container {
-  min-height: var(--vh);
-  padding-bottom: calc(var(--bottom-bar-h) + env(safe-area-inset-bottom, 0px));
-  /* ostalo iz tvojega CSS lahko ostane */
+/* telefon */
+@media (max-width: 600px) {
+    .content {
+        padding: 14px 10px;
+    }
+
+    .lyrics-display {
+        font-size: 20px;
+        line-height: 1.4;
+    }
+
+    .status-message {
+        font-size: 18px;
+    }
+
+    .page-info {
+        font-size: 18px;
+    }
+
+    .keypad {
+        gap: 8px;
+        padding: 10px;
+        padding-bottom: calc(10px + env(safe-area-inset-bottom, 0px));
+    }
+
+    .keypad button {
+        min-height: 52px;
+        font-size: 22px;
+        border-radius: 9px;
+    }
 }
 
-/* Vsebinski del naj dopušča scroll, kot že imaš */
-.content {
-  /* ostane: flex:1; overflow-y:auto; ... */
-  /* vendar dodamo malo dna, da zadnja vrstica besedila ne trči v panel */
-  padding-bottom: 12px;
+/* zelo majhen telefon */
+@media (max-width: 400px) {
+    .lyrics-display {
+        font-size: 18px;
+    }
+
+    .page-info {
+        font-size: 16px;
+    }
+
+    .keypad button {
+        min-height: 48px;
+        font-size: 20px;
+    }
 }
 
-/* Spodnja vrstica – naj bo vedno vidna in nad UI brskalnika */
-.bottom-bar {
-  position: sticky;   /* ostane z dokumentom, a se prilepi na dno ob scrollu */
-  bottom: 0;
-  z-index: 1000;      /* nad vsebino */
-  /* ozadje + robovi ostanejo */
-  padding-bottom: calc(15px + env(safe-area-inset-bottom, 0px));
-  /* poravnaj navidezno višino: */
-  min-height: var(--bottom-bar-h);
-}
+/* veliki ekrani */
+@media (min-width: 901px) {
+    .toggle-keypad-btn {
+        display: inline-block;
+    }
 
-/* Gumbi v spodnjem panelu: malenkost večja višina za lažji tap */
-.bottom-bar button {
-  min-height: 44px;   /* Apple/Google priporočilo za ‘tap targets’ */
-}
+    .keypad {
+        width: fit-content;
+        margin: 0 auto;
+        grid-template-columns: repeat(4, 120px);
+        gap: 10px;
+    }
 
-/* Top bar: zadrži stabilno višino, a brez vpliva na dno */
-.top-bar {
-  position: sticky;
-  top: 0;
-  z-index: 1000;
-}
+    .keypad button {
+        height: 80px;
+        min-height: 80px;
+        font-size: 22px;
+    }
 
-/* --- (Opcijsko) tema: prilagodi spodnji panel za boljši kontrast nad browser UI --- */
-@supports (backdrop-filter: blur(4px)) {
-  .bottom-bar {
-    background-color: rgba(26, 26, 26, 0.95);
-    backdrop-filter: saturate(120%) blur(4px);
-  }
+    .btn-action,
+    .btn-dark,
+    .btn-clear {
+        font-size: 18px;
+    }
+
+    .btn-enter {
+        font-size: 22px;
+        height: auto;
+    }
 }

web/templates/index.html

@@ -3,41 +3,53 @@
 <head>
     <meta charset="UTF-8">
     <meta  name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no, viewport-fit=cover">
-    <title>Projektor pesmi - Web sučelje</title>
+    <title>Projektor pesmi</title>
     <link rel="stylesheet" href="{{ url_for('static', filename='styles.css') }}">
 </head>
+
 <body>
-    <div class="container">
-        <!-- Gornja vrstica -->
-        <div class="top-bar">
-            <!-- <label for="song-number">Pesem:</label> -->
-            <input type="number" id="song-number" placeholder="Vpiši številko" min="0">
-            <button id="load-btn">Naloži</button>
-            
-        <!--     <label for="search-query">Iskanje:</label>
-            <input type="text" id="search-query" placeholder="Naslovna beseda...">
-            <button id="search-btn">Išči</button> -->
-            
-            <button id="caps-btn" class="btn-dark">A/a</button>
-        </div>
-        
-        <!-- Sredenska vrstica - Prikaz -->
-        <div class="content">
-            <div id="display-area" class="lyrics-display">
-                <span class="status-message">Pripravljeno. Vpiši številko pesmi.</span>
-            </div>
-        </div>
-        
-        <!-- Spodnja vrstica - Navigacija -->
-        <div class="bottom-bar">
-            <button id="prev-btn" class="btn-nav">◀ Nazaj</button>
-            <span id="page-info" class="page-info"></span>
-            <button id="dark-btn" class="btn-dark">**</button>
-            <span id="page-info-right" class="page-info"></span>
-            <button id="next-btn" class="btn-nav">Naprej ▶</button>
+<div class="container">
+
+    <input type="text" id="song-number">
+
+    <div class="status-bar">
+        <span id="page-info" class="page-info"></span>
+        <button id="toggle-keypad-btn" class="toggle-keypad-btn" type="button">Skrij tipkovnico</button>
+    </div>
+
+    <div class="content">
+        <div id="display-area" class="lyrics-display">
+            <span class="status-message">Pripravljeno. Vpiši številko pesmi.</span>
         </div>
     </div>
-    
-    <script src="{{ url_for('static', filename='script.js') }}"></script>
+
+    <div id="keypad-wrapper" class="keypad-wrapper">
+        <div class="keypad">
+
+            <button class="btn-key" data-key="7">7</button>
+            <button class="btn-key" data-key="8">8</button>
+            <button class="btn-key" data-key="9">9</button>
+            <button id="next-btn" class="btn-action">Zastri</button>
+
+            <button class="btn-key" data-key="4">4</button>
+            <button class="btn-key" data-key="5">5</button>
+            <button class="btn-key" data-key="6">6</button>
+            <button id="prev-btn" class="btn-action">Nazaj</button>
+
+            <button class="btn-key" data-key="1">1</button>
+            <button class="btn-key" data-key="2">2</button>
+            <button class="btn-key" data-key="3">3</button>
+            <button id="load-btn" class="btn-enter">Enter</button>
+
+            <button id="dark-btn" class="btn-dark">AAaa</button>
+            <button class="btn-key" data-key="0">0</button>
+            <button id="clear-btn" class="btn-clear">C</button>
+
+        </div>
+    </div>
+
+</div>
+
+<script src="{{ url_for('static', filename='script.js') }}"></script>
 </body>
 </html>