diff --git a/app.py b/app.py index 06c3fb4..f8154e5 100644 --- a/app.py +++ b/app.py @@ -1636,7 +1636,7 @@ def server_info(id): if resp.status_code == 200: data = resp.json() return { - "hostname": format_host(host), + "hostname": host.resolved_daemon if host.daemon_url else host.resolved_hostname, "ip": host.raw_ip, "cpu": data.get('cpu_percent'), "mem": data.get('memory_percent'), diff --git a/static/css/custom.css b/static/css/custom.css new file mode 100644 index 0000000..bc9236f --- /dev/null +++ b/static/css/custom.css @@ -0,0 +1,71 @@ + /* Style trybu ciemnego – stosujemy je tylko, gdy body ma klasę dark-mode */ + body.dark-mode { + background-color: #121212; + color: #e0e0e0; + } + body.dark-mode footer { + background-color: #1e1e1e !important; + } + /* Tabele – style ciemnego motywu */ + body.dark-mode .table { + color: #e0e0e0; + background-color: #1e1e1e; + border: 1px solid #444; + } + body.dark-mode .table th, + body.dark-mode .table td { + border: 1px solid #444; + } + body.dark-mode .table-striped tbody tr:nth-of-type(odd) { + background-color: #2e2e2e; + } + body.dark-mode .table-striped tbody tr:nth-of-type(even) { + background-color: #1e1e1e; + } + body.dark-mode .table thead { + background-color: #333; + color: #e0e0e0; + } + /* Karty */ + body.dark-mode .card { + background-color: #1e1e1e; + color: #e0e0e0; + border-color: #333; + } + /* Formularze */ + body.dark-mode .form-control, + body.dark-mode .form-select { + background-color: #2e2e2e; + color: #e0e0e0; + border: 1px solid #444; + } + body.dark-mode .form-control:focus, + body.dark-mode .form-select:focus { + background-color: #2e2e2e; + color: #e0e0e0; + border-color: #777; + box-shadow: none; + } + /* Przycisk Wyloguj – solidny przycisk, by był czytelny */ + .btn-logout { + color: #fff; + } + + /* Zmniejszenie rozmiaru czcionki w navbarze */ + .navbar { + font-size: 0.9rem; /* zmniejszony rozmiar czcionki */ + } + + /* Sprytne odwracanie kolorow dla svg */ + html[data-bs-theme="dark"] .mikrotik-logo { + filter: invert(1); + } + html[data-bs-theme="dark"] .linux-logo { + filter: invert(1); + } + + .progress-bar { + display: flex; + justify-content: center; + align-items: center; + } \ No newline at end of file diff --git a/static/img/linux.svg b/static/img/linux.svg new file mode 100644 index 0000000..d502fe2 --- /dev/null +++ b/static/img/linux.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/static/img/mikrotik.svg b/static/img/mikrotik.svg new file mode 100644 index 0000000..7308daf --- /dev/null +++ b/static/img/mikrotik.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/templates/base.html b/templates/base.html index 2153e54..7864502 100644 --- a/templates/base.html +++ b/templates/base.html @@ -6,66 +6,10 @@ {% block title %}/etc/hosts Manager{% endblock %} + {% block extra_css %}{% endblock %} diff --git a/templates/server_list.html b/templates/server_list.html index 6bd4ab0..a2bb9f6 100644 --- a/templates/server_list.html +++ b/templates/server_list.html @@ -8,6 +8,27 @@ max-width: 300px; text-align: left; } + + /* Zmniejsz tekst w nagłówku tabeli i wyśrodkuj go */ + thead th { + font-size: 0.75rem; + text-align: center; + } + /* Klasa zmniejszająca przyciski akcji */ + .btn-action { + font-size: 0.65rem; + padding: 0.25rem 0.4rem; + line-height: 1; + } + + form.inline-button button.btn { + background-color: #dc3545; /* btn-danger */ + border-color: #dc3545; + font-size: 0.65rem; + padding: 0.25rem 0.4rem; + line-height: 1; + /* ewentualnie dodatkowe właściwości, aby upodobnić go do linków */ +} {% endblock %} @@ -21,15 +42,15 @@ ID - Nazwa hosta + Serwer Użytkownik Port Typ Uwierzytelnianie - Wybrany plik /etc/hosts + Wybrany /etc/hosts Auto Deploy Auto Backup - Wyłącz CIDR/regex deploy + Wyłącz CIDR / regex Akcje @@ -44,7 +65,6 @@ {{ h.resolved_hostname }} {% endif %} - {% if h.use_daemon and h.type == 'linux' %} @@ -60,75 +80,96 @@ {{ h.port }} {% endif %} - + + {% if h.type == 'linux' %} - Linux{% if h.use_daemon %} (Demon){% endif %} - {% else %} - Mikrotik - {% endif %} + + {% else %} + + {% endif %} + {% if h.use_daemon and h.type == 'linux' %} - - używa Demona - + - linux daemon - {% else %} {% if h.auth_method == 'password' %} - Hasło + Hasło {% elif h.auth_method == 'ssh_key' %} - Klucz SSH + Klucz SSH {% elif h.auth_method == 'global_key' %} - Globalny klucz + Globalny klucz {% else %} - {{ h.auth_method }} + {{ h.auth_method }} {% endif %} {% endif %} - - {% if h.preferred_hostfile %} - {{ h.preferred_hostfile.title }} - {% else %} - (Default) - {% endif %} - - -
- - -
- - -
- - -
- - -
- - -
+ + + {% if h.preferred_hostfile %} + {{ h.preferred_hostfile.title }} + {% else %} + (Default) + {% endif %} + + + +
+ +
+ + +
+
+ + +
+ +
+ + +
+
+ + +
+ +
+ + +
+
+ +
- Edytuj - + Edytuj {% if h.use_daemon and h.type == 'linux' %} - - + {% else %} - - Testuj + Test {% endif %} - - Backup -
- -
+ Backup +
+ +
+ {% endfor %} @@ -180,48 +221,49 @@ {% endblock %} {% block extra_js %} - -{% endblock %} \ No newline at end of file +{% endblock %}