Compare commits
3 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 68dc2f71c6 | |||
| 736dafd1e1 | |||
| 123ad6f0a7 |
+4
-2
@@ -9935,6 +9935,7 @@ def admin_school_settings():
|
||||
'school_number': sanitize_form_value(request.form.get('school_number')),
|
||||
'it_admin': sanitize_form_value(request.form.get('it_admin')),
|
||||
'logo_path': sanitize_form_value(request.form.get('logo_path')),
|
||||
'logo_thumb': sanitize_form_value(request.form.get('logo_thumb')),
|
||||
}
|
||||
|
||||
uploaded_logo = request.files.get('logo_upload')
|
||||
@@ -9950,8 +9951,7 @@ def admin_school_settings():
|
||||
|
||||
if saved_logo_filename:
|
||||
school_info['logo_path'] = saved_logo_filename
|
||||
if saved_thumb_filename:
|
||||
school_info['logo_thumb'] = saved_thumb_filename
|
||||
school_info['logo_thumb'] = saved_thumb_filename or ''
|
||||
|
||||
# remove previous files if different
|
||||
if previous_logo_path and previous_logo_path != saved_logo_filename:
|
||||
@@ -9974,6 +9974,8 @@ def admin_school_settings():
|
||||
|
||||
if not school_info.get('logo_path') and current_school.get('logo_path'):
|
||||
school_info['logo_path'] = current_school.get('logo_path', '')
|
||||
if not school_info.get('logo_thumb') and current_school.get('logo_thumb'):
|
||||
school_info['logo_thumb'] = current_school.get('logo_thumb', '')
|
||||
|
||||
missing_fields = [
|
||||
label for label, key in [
|
||||
|
||||
@@ -69,6 +69,8 @@ DEFAULTS = {
|
||||
'school_number': '000000',
|
||||
'it_admin': 'IT-Beauftragte oder IT-Beauftragter',
|
||||
'logo_path': '',
|
||||
'logo_thumb': '',
|
||||
'logo_thumb': '',
|
||||
},
|
||||
'schoolPeriods': {
|
||||
"1": {"start": "08:00", "end": "08:45", "label": "1. Stunde (08:00 - 08:45)"},
|
||||
|
||||
+10
-4
@@ -1127,6 +1127,7 @@
|
||||
{% if current_permissions.pages.get('manage_locations', True) %}
|
||||
<li><a class="dropdown-item" href="{{ url_for('manage_locations') }}">Orte verwalten</a></li>
|
||||
{% endif %}
|
||||
<li><a class="dropdown-item" href="{{ url_for('admin_school_settings') }}">Schulstammdaten</a></li>
|
||||
{% if current_permissions.pages.get('admin_borrowings', True) %}
|
||||
<li><a class="dropdown-item" href="{{ url_for('admin_borrowings') }}">Ausleihen</a></li>
|
||||
{% endif %}
|
||||
@@ -1252,6 +1253,7 @@
|
||||
{% if student_cards_module_enabled %}
|
||||
<li><a class="dropdown-item" href="{{ url_for('student_cards_admin') }}">Bibliotheksausweis</a></li>
|
||||
{% endif %}
|
||||
<li><a class="dropdown-item" href="{{ url_for('admin_school_settings') }}">Schulstammdaten</a></li>
|
||||
<li><hr class="dropdown-divider"></li>
|
||||
{% if current_permissions.actions.get('can_manage_users', True) %}
|
||||
<li><h6 class="dropdown-header">System</h6></li>
|
||||
@@ -1312,11 +1314,13 @@
|
||||
<nav class="navbar navbar-expand-lg navbar-dark" id="loginNavbar">
|
||||
<div class="container-fluid">
|
||||
<a class="navbar-brand py-0" href="{{ url_for('home') }}">
|
||||
{% if school_info and (school_info.logo_thumb or school_info.logo_path) %}
|
||||
{% if school_info.logo_thumb %}
|
||||
<img src="{{ url_for('uploaded_file', filename=school_info.logo_thumb) }}" alt="{{ school_info.name or 'Schullogo' }}" class="invario-logo">
|
||||
{% set school_logo_thumb = school_info.get('logo_thumb') if school_info else '' %}
|
||||
{% set school_logo_path = school_info.get('logo_path') if school_info else '' %}
|
||||
{% if school_logo_thumb or school_logo_path %}
|
||||
{% if school_logo_thumb %}
|
||||
<img src="{{ url_for('uploaded_file', filename=school_logo_thumb) }}" alt="{{ school_info.name or 'Schullogo' }}" class="invario-logo">
|
||||
{% else %}
|
||||
<img src="{{ url_for('uploaded_file', filename=school_info.logo_path) }}" alt="{{ school_info.name or 'Schullogo' }}" class="invario-logo">
|
||||
<img src="{{ url_for('uploaded_file', filename=school_logo_path) }}" alt="{{ school_info.name or 'Schullogo' }}" class="invario-logo">
|
||||
{% endif %}
|
||||
{% else %}
|
||||
<img src="{{ url_for('static', filename='img/invario-logo.png') }}" alt="Invario" class="invario-logo">
|
||||
@@ -1527,6 +1531,7 @@
|
||||
<option value="Defekte Items"></option>
|
||||
<option value="Filter verwalten"></option>
|
||||
<option value="Orte verwalten"></option>
|
||||
<option value="Schulstammdaten"></option>
|
||||
<option value="Audit Dashboard"></option>
|
||||
<option value="Logs"></option>
|
||||
<option value="Benutzer verwalten"></option>
|
||||
@@ -1596,6 +1601,7 @@
|
||||
{ label: 'Defekte Items', keywords: ['defekte items', 'defekt', 'schaden'], url: {{ url_for('admin_damaged_items')|tojson }} },
|
||||
{ label: 'Filter verwalten', keywords: ['filter verwalten', 'filter'], url: {{ url_for('manage_filters')|tojson }} },
|
||||
{ label: 'Orte verwalten', keywords: ['orte verwalten', 'orte', 'location'], url: {{ url_for('manage_locations')|tojson }} },
|
||||
{ label: 'Schulstammdaten', keywords: ['schule', 'settings', 'stammdaten', 'school settings'], url: {{ url_for('admin_school_settings')|tojson }} },
|
||||
{ label: 'Audit Dashboard', keywords: ['audit', 'audit dashboard'], url: {{ url_for('admin_audit_dashboard')|tojson }} },
|
||||
{ label: 'Logs', keywords: ['logs', 'protokoll'], url: {{ url_for('logs')|tojson }} },
|
||||
{ label: 'Benutzer verwalten', keywords: ['benutzer verwalten', 'user'], url: {{ url_for('user_del')|tojson }} },
|
||||
|
||||
@@ -2353,10 +2353,6 @@ document.addEventListener('DOMContentLoaded', ()=>{
|
||||
{% if school_info and school_info.school_number %} | Schulnummer: {{ school_info.school_number }}{% endif %}
|
||||
</div>
|
||||
</div>
|
||||
<div style="display:flex; gap:10px; flex-wrap:wrap;">
|
||||
<a href="{{ url_for('admin_school_settings') }}" class="btn btn-primary">Schulstammdaten bearbeiten</a>
|
||||
<a href="{{ url_for('admin_audit') }}" class="btn btn-outline-secondary">Audit-Export öffnen</a>
|
||||
</div>
|
||||
</div>
|
||||
<div id="items-indicator" class="items-indicator">Objekte im System: 0</div>
|
||||
<div id="bulk-delete-drawer" class="bulk-delete-drawer" aria-hidden="true">
|
||||
|
||||
Reference in New Issue
Block a user