Rename and move share card back into overflow menu. Closes: #13

This commit is contained in:
Ana Custura 2026-03-30 10:39:22 +01:00
parent e83914a661
commit 699d28da17
2 changed files with 9 additions and 5 deletions

View file

@ -91,8 +91,8 @@ def index():
usb_inserted = True usb_inserted = True
usb_has_maps = False # actual test of whether USB has maps folder usb_has_maps = False # actual test of whether USB has maps folder
usb_has_appstore = False # actual test of whether USB has an appstore usb_has_appstore = False # actual test of whether USB has an appstore
if enable_wifi_sharing == 'true': #if enable_wifi_sharing == 'true':
service_array.append({"name": _l("Share WiFi"), "image": url_for("static", filename="images/share-icon.svg"), "url": url_for("share")}) # service_array.append({"name": _l("Share Access"), "image": url_for("static", filename="images/share-icon.svg"), "url": url_for("share")})
if enable_deltachat == 'true': if enable_deltachat == 'true':
service_array.append({"name": _l("Secure Messenger"), "image": url_for("static", filename="images/deltachat-icon.svg"), "url": url_for("messaging") }) service_array.append({"name": _l("Secure Messenger"), "image": url_for("static", filename="images/deltachat-icon.svg"), "url": url_for("messaging") })
if enable_chat == 'true': if enable_chat == 'true':
@ -279,7 +279,6 @@ def admin():
@login_required @login_required
def admin_settings(): def admin_settings():
raspap_installed = os.path.exists("/var/www/html/raspap") raspap_installed = os.path.exists("/var/www/html/raspap")
raspap_installed = True
form = SettingsForm() form = SettingsForm()
populate_settings = ['butterbox_name', 'wifi_password', 'ssid', 'root_account_settings', 'ssh_access_settings', 'root_password', 'admin_password'] populate_settings = ['butterbox_name', 'wifi_password', 'ssid', 'root_account_settings', 'ssh_access_settings', 'root_password', 'admin_password']
bool_settings = ['enable_access_point','enable_file_viewer', 'enable_chat', 'enable_deltachat', 'enable_wifi_sharing'] bool_settings = ['enable_access_point','enable_file_viewer', 'enable_chat', 'enable_deltachat', 'enable_wifi_sharing']

View file

@ -31,8 +31,13 @@
<div id="navbarBasic" class="navbar-menu"> <div id="navbarBasic" class="navbar-menu">
<div class="navbar-start"> <div class="navbar-start">
<a href="{{ url_for('admin') }}" class="navbar-item">{{ _("Admin Settings") }} <a href="{{ url_for('admin') }}" class="navbar-item"> <span class="icon">
</a> <i class="fa fa-user" aria-hidden="true"></i>
</span>{{ _("Admin Settings") }}</a>
<a href="{{ url_for('share') }}" class="navbar-item"> <span class="icon">
<i class="fa fa-share" aria-hidden="true"></i>
</span>{{ _("Share Access") }}</a>
</div> </div>
<div class="navbar-end"> <div class="navbar-end">
{% block navbar_logout %}{% endblock %} {% block navbar_logout %}{% endblock %}