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

rearrange logfiles-view template contents to suite the overall layout better

Browse Source 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
This commit is contained in:
Michael Kaufmann
2022-06-30 14:02:21 +02:00
parent 546a001092
commit d4e94c0390
3 changed files with 28 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
logfiles_viewer.php
View File

@@ -94,21 +94,19 @@ if (function_exists('exec')) {
'access_log_content' => $access_log_content, 'access_log_content' => $access_log_content,
'actions_links' => [ 'actions_links' => [
[ [
'class' => 'btn-secondary',
'href' => $linker->getLink([ 'href' => $linker->getLink([
'section' => 'domains', 'section' => 'domains',
'page' => 'domains', 'page' => 'domains',
'action' => 'edit', 'action' => 'edit',
'id' => $domain_id 'id' => $domain_id
]), ]),
'label' => lng('panel.edit'), 'label' => lng('admin.domain_edit'),
'icon' => 'fa fa-pen' 'icon' => 'fa fa-pen'
], ],
[ [
'class' => 'btn-secondary',
'href' => $linker->getLink(['section' => 'domains', 'page' => 'domains']), 'href' => $linker->getLink(['section' => 'domains', 'page' => 'domains']),
'label' => lng('menue.domains.domains'), 'label' => lng('panel.backtooverview'),
'icon' => 'fa fa-globe' 'icon' => 'fa fa-reply'
] ]
] ]
]); ]);

BIN
templates/Froxlor/assets/img/icon.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 19 KiB

37
templates/Froxlor/user/logfiles.html.twig
View File

@@ -9,22 +9,35 @@
</div> </div>
{% endblock %} {% endblock %}
{% block content %} {% block actions %}
<div class="row">
<div class="col-12 col-md-10 order-2 order-md-1"> {% if actions_links is iterable or (entity_info is defined and entity_info is not empty) %}
<h4>Error-Log</h4> <div>
<textarea rows="16" class="logcontent" readonly>{{ error_log_content }}</textarea>
<h4>Access-Log</h4>
<textarea rows="16" class="logcontent" readonly>{{ access_log_content }}</textarea>
</div>
<div class="col-12 col-md-2 order-1 order-md-2">
{% if actions_links is iterable %} {% if actions_links is iterable %}
{% for link in actions_links %} {% for link in actions_links %}
<a class="btn {{ link.class|default('btn-success') }} d-block mb-2" href="{{ link.href|raw }}"> <a class="btn {{ link.class|default('btn-outline-primary') }}" href="{{ link.href|raw }}">
<i class="{{ link.icon|default('fa-solid fa-plus-circle') }} me-1"></i> <i class="{{ link.icon|default('fa-solid fa-plus-circle') }}"></i>
{{ link.label }}</a> <span class="d-none d-lg-inline ms-lg-1">{{ link.label }}</span>
</a>
{% endfor %} {% endfor %}
{% endif %} {% endif %}
</div> </div>
{% endif %}
{% endblock %}
{% block content %}
<div class="d-md-flex align-items-start">
<div class="nav flex-column nav-pills me-md-3 mb-3 mb-md-0" id="v-pills-tab" role="tablist" aria-orientation="vertical">
<button class="nav-link active" id="v-pills-error-tab" data-bs-toggle="pill" data-bs-target="#v-pills-error" type="button" role="tab" aria-controls="v-pills-error" aria-selected="true">Error log</button>
<button class="nav-link" id="v-pills-access-tab" data-bs-toggle="pill" data-bs-target="#v-pills-access" type="button" role="tab" aria-controls="v-pills-access" aria-selected="false">Access log</button>
</div>
<div class="tab-content flex-grow-1" id="v-pills-tabContent">
<div class="tab-pane fade show active" id="v-pills-error" role="tabpanel" aria-labelledby="v-pills-error-tab">
<textarea rows="16" class="logcontent" readonly>{{ error_log_content }}</textarea>
</div>
<div class="tab-pane fade" id="v-pills-access" role="tabpanel" aria-labelledby="v-pills-access-tab">
<textarea rows="16" class="logcontent" readonly>{{ access_log_content }}</textarea>
</div>
</div>
</div> </div>
{% endblock %} {% endblock %}