admin-updates, settings-import and some minor ui tweaks

Signed-off-by: Michael Kaufmann <d00p@froxlor.org>

templates/Froxlor/form/form.html.twig

@@ -31,8 +31,14 @@
 			<input type="hidden" name="send" value="send"/>
 
 			<div class="col-12 text-end">
-				<button type="reset" class="btn btn-outline-secondary">{{ lng('panel.cancel') }}</button>
-				<button type="submit" class="btn btn-primary">{{ lng('panel.save') }}</button>
+				{% if form_data.buttons is defined and form_data.buttons is iterable %}
+					{% for btn in form_data.buttons %}
+						<button type="{{ btn.type|default("submit") }}" class="btn {{ btn.class|default(" btn-primary") }}">{{ btn.label }}</button>
+					{% endfor %}
+				{% else %}
+					<button type="reset" class="btn btn-outline-secondary">{{ lng('panel.cancel') }}</button>
+					<button type="submit" class="btn btn-primary">{{ lng('panel.save') }}</button>
+				{% endif %}
 			</div>
 		</div>
 	</form>

templates/Froxlor/user/form-replacers.html.twig

@@ -5,7 +5,7 @@
 	{{ parent() }}
 
 	{% if replacers is not empty and replacers is iterable %}
-		<div class="card mb-3">
+		<div class="card my-3">
 			<div class="card-body">
 				<h5 class="card-title">{{ lng('admin.templates.template_replace_vars') }}</h5>
 				<dl class="row">

templates/Froxlor/user/form.html.twig

@@ -18,6 +18,28 @@
 
 {% endblock %}
 
+{% block actions %}
+
+	{% if actions_links is iterable or (entity_info is defined and entity_info is not empty) %}
+		<div>
+			{% if actions_links is iterable %}
+				{% for link in actions_links %}
+					<a class="btn {{ link.class|default('btn-outline-primary') }}" href="{{ link.href|raw }}">
+						<i class="{{ link.icon|default('fa-solid fa-plus-circle') }}"></i><span class="d-none d-lg-inline ms-lg-1">{{ link.label }}</span>
+					</a>
+				{% endfor %}
+			{% endif %}
+			{# TODO: eventually not used anymore because of using a documentation link
+			{% if entity_info is defined and entity_info is not empty %}
+				<div class="alert alert-info" role="alert">
+					{{ entity_info|raw }}
+				</div>
+			{% endif %}
+			#}
+		</div>
+	{% endif %}
+{% endblock %}
+
 {% block content %}
 
 	{% import "Froxlor/form/form.html.twig" as form %}

templates/Froxlor/user/index.html.twig

@@ -48,7 +48,7 @@
 	<div class="row">
 		{% if userinfo.adminsession == 1 %}
 			<div
-				class="col-7">
+				class="col-12 col-lg-6">
 				{# system infos #}
 				<div class="card mb-3">
 					<div class="card-header">
@@ -121,7 +121,7 @@
 			</div>
 		{% else %}
 			<div
-				class="col-4">
+				class="col-12 col-md-6 col-lg-4">
 				{# account info #}
 				<div class="card mb-3">
 					<div class="card-header">
@@ -184,7 +184,7 @@
 				</div>
 			</div>
 			<div
-				class="col-4">
+				class="col-12 col-md-6 col-lg-4">
 				{# customer details #}
 				<div class="card">
 					<div class="card-header">
@@ -245,7 +245,7 @@
 				</div>
 			</div>
 		{% endif %}
-		<div class="{% if userinfo.adminsession == 1 %}col-5{% else %}col-4{% endif %}">
+		<div class="col-12 {% if userinfo.adminsession == 1 %}col-lg-6{% else %}col-lg-4{% endif %}">
 			{% if userinfo.adminsession == 1 %}
 				{# froxlor-details #}
 				<div class="card mb-3">

templates/Froxlor/user/table-tpl.html.twig

@@ -1,11 +1,18 @@
 {% extends "Froxlor/user/table.html.twig" %}
 
-{% block content %}
+{% block heading %}
+	{% set listing = maillisting %}
+	{{ parent() }}
+
+	{% set listing = filelisting %}
+	{{ parent() }}
+{% endblock %}
+
+
+{% block content %}
 	{% set listing = maillisting %}
-	{% set actions_links = mail_actions_links %}
 	{{ parent() }}
 
 	{% set listing = filelisting %}
-	{% set actions_links = file_actions_links %}
 	{{ parent() }}
 {% endblock %}