maketank/Froxlor
2
0
Fork 0
Code Pull Requests Releases Activity

multiple ui improvements

Browse Source
This commit is contained in:
envoyr
2022-03-14 18:18:35 +01:00
parent 31fbe434b4
commit 2c5c0258bf
52 changed files with 414 additions and 323 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
templates/Froxlor/user/dashboard-item.html.twig
View File

@@ -20,8 +20,8 @@
aria-valuemax="{% if available < 0 %}100{% else %}{{ available }}{% endif %}"></div>
</div>
{% if assigned is not empty %}
<div class="progress progress-thin my-auto">
<div class="progress-bar bg-info" role="progressbar"
<div class="progress progress-thin mt-2 my-auto">
<div class="progress-bar bg-primary" role="progressbar"
style="width:{% if available > 0 %}{{ (assigned / available) * 100|round }}{% else %}1{% endif %}%;"
aria-valuenow="{{ assigned }}" aria-valuemin="0"
aria-valuemax="{{ available }}"></div>

18
templates/Froxlor/user/form.html.twig
View File

@@ -1,5 +1,23 @@
{% extends "Froxlor/userarea.html.twig" %}
{% block heading %}
{% if formdata.title is not empty %}
<div>
<h5 class="mb-1">
{% if form_data.image is not empty %}
<i class="{{ form_data.image }} me-1"></i>
{% endif %}
{{ formdata.title }}
</h5>
{% if formdata.description is not empty %}
<span class="text-muted">{{ formdata.description }}</span>
{% endif %}
</div>
{% endif %}
{% endblock %}
{% block content %}
{% import "Froxlor/form/form.html.twig" as form %}

66
templates/Froxlor/user/table.html.twig
View File

@@ -1,26 +1,48 @@
{% extends "Froxlor/userarea.html.twig" %}
{% block content %}
<div class="row">
<div class="col-12 {% if actions_links is iterable or (entity_info is defined and entity_info is not empty) %}col-md-10 order-2 order-md-1{% endif %}">
{% import "Froxlor/table/table.html.twig" as table %}
{{ table.table(listing) }}
</div>
{% if actions_links is iterable or (entity_info is defined and entity_info is not empty) %}
<div class="col-12 col-md-2 order-1 order-md-2">
{% if actions_links is iterable %}
{% for link in actions_links %}
<a class="btn {{ link.class|default('btn-success') }} d-block mb-2" href="{{ link.href|raw }}">
<i class="{{ link.icon|default('fa-solid fa-plus-circle') }} me-1"></i>
{{ link.label }}</a>
{% endfor %}
{% endif %}
{% if entity_info is defined and entity_info is not empty %}
<div class="alert alert-info" role="alert">
{{ entity_info|raw }}
</div>
{% endif %}
</div>
{% block heading %}
{% if listing.title is not empty %}
<h5 class="mb-1">
{% if listing.icon is not empty %}
<i class="{{ listing.icon }} me-1"></i>
{% endif %}
{{ listing.title }}
</h5>
{% if listing.description is not empty %}
<span class="text-muted mt-2">{{ listing.description }}</span>
{% endif %}
</div>
{% endif %}
{% 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/table/table.html.twig" as table %}
{{ table.table(listing) }}
{% endblock %}