7x31
/
mailcow-dockerized
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #4915 from mailcow/staging 

Automatic PR to nightly from 2022-12-24T17:45:14Z
This commit is contained in:
Niklas Meyer 2022-12-24 23:27:33 +01:00 committed by GitHub
parent fcf512b6a8 3281b97ea9
commit 9bb85d3e85
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
data/web/js/site/quarantine.js
View File

@ -97,7 +97,7 @@ jQuery(function($){
},
{
title: lang.subj,
data: 'sender',
data: 'subject',
defaultContent: ''
},
{

1
data/web/lang/lang.de-de.json
View File

@ -488,6 +488,7 @@
"chart_this_server": "Chart (dieser Server)",
"containers_info": "Container-Information",
"container_running": "Läuft",
"container_disabled": "Container gestoppt oder deaktiviert",
"container_stopped": "Angehalten",
"cores": "Kerne",
"current_time": "Systemzeit",

1
data/web/lang/lang.en-gb.json
View File

@ -491,6 +491,7 @@
"chart_this_server": "Chart (this server)",
"containers_info": "Container information",
"container_running": "Running",
"container_disabled": "Container stopped or disabled",
"container_stopped": "Stopped",
"cores": "Cores",
"current_time": "System Time",

12
data/web/templates/debug.twig
View File

@ -160,8 +160,14 @@
<div class="d-flex p-2 list-group-header">
<div>
<span class="fw-bold">solr-mailcow</span>
{% if containers["solr-mailcow"].State.Running == 1 %}
<span class="d-block d-md-inline">({{ containers["solr-mailcow"].Config.Image }})</span>
{% endif %}
{% if containers["solr-mailcow"].State.Running == 1 %}
<small class="d-block">({{ lang.debug.started_on }} <span class="parse_date">{{ containers["solr-mailcow"].State.StartedAtHR }}</span>)</small>
{% elseif containers["solr-mailcow"].State.Running != 1 %}
<small class="d-block">{{ lang.debug.container_disabled }}</small>
{% endif %}
{% if containers["solr-mailcow"].State.Running == 1 %}
<span class="badge fs-7 bg-success loader" style="min-width:100px">
{{ lang.debug.container_running }}
@ -169,19 +175,22 @@
<span class="loader-dot">.</span>
<span class="loader-dot">.</span>
</span>
{% elseif containers["solr-mailcow"].State %}
{% elseif containers["solr-mailcow"].State.Running != 1 %}
<span class="badge fs-7 bg-danger" style="min-width:100px">
{{ lang.debug.container_stopped }}
<i class="bi-x ms-1"></i>
</span>
{% endif %}
</div>
{% if containers["solr-mailcow"].State.Running == 1 %}
<div class="mt-auto ms-auto">
<button class="btn btn-light" type="button" data-bs-toggle="collapse" data-bs-target="#solr-mailcowCollapse" aria-expanded="false" aria-controls="solr-mailcowCollapse">
<i class="bi bi-caret-down-fill caret"></i>
</button>
</div>
{% endif %}
</div>
{% if containers["solr-mailcow"].State.Running == 1 %}
<div class="collapse p-0 list-group-details container-details-collapse" id="solr-mailcowCollapse" data-id="{{ containers["solr-mailcow"].Id }}">
<div class="row p-2 pt-4">
<div class="col-sm-3">
@ -238,6 +247,7 @@
</div>
</div>
</div>
{% endif %}
</div>
</div>