Small status fix

This commit is contained in:
Pinga 2023-12-16 08:30:45 +02:00
parent b4ccc2b0e8
commit 783c3b4e2b
2 changed files with 72 additions and 25 deletions

View file

@ -32,8 +32,14 @@
<h3 class="card-title"> <h3 class="card-title">
Domain {{ domain.name }}&nbsp;<input type="hidden" name="domainName" value="{{ domain.name }}"> Domain {{ domain.name }}&nbsp;<input type="hidden" name="domainName" value="{{ domain.name }}">
{% if domainStatus.status or domain.rgpstatus %} {% if domainStatus.status or domain.rgpstatus %}
{% if domainStatus.status %} {% if domainStatus is iterable %}
<span class="status status-green" title="Status">{{ domainStatus.status }}</span>&nbsp; {% for status in domainStatus %}
<span class="status status-green" title="Status">{{ status.status }}</span>&nbsp;
{% endfor %}
{% else %}
{% if domainStatus.status %}
<span class="status status-green" title="Status">{{ domainStatus.status }}</span>&nbsp;
{% endif %}
{% endif %} {% endif %}
{% if domain.rgpstatus %} {% if domain.rgpstatus %}
<span class="status status-info" title="Status">{{ domain.rgpstatus }}</span> <span class="status status-info" title="Status">{{ domain.rgpstatus }}</span>

View file

@ -29,8 +29,14 @@
<h3 class="card-title"> <h3 class="card-title">
Domain {{ domain.name }}&nbsp; Domain {{ domain.name }}&nbsp;
{% if domainStatus.status or domain.rgpstatus %} {% if domainStatus.status or domain.rgpstatus %}
{% if domainStatus.status %} {% if domainStatus is iterable %}
<span class="status status-green" title="Status">{{ domainStatus.status }}</span>&nbsp; {% for status in domainStatus %}
<span class="status status-green" title="Status">{{ status.status }}</span>&nbsp;
{% endfor %}
{% else %}
{% if domainStatus.status %}
<span class="status status-green" title="Status">{{ domainStatus.status }}</span>&nbsp;
{% endif %}
{% endif %} {% endif %}
{% if domain.rgpstatus %} {% if domain.rgpstatus %}
<span class="status status-info" title="Status">{{ domain.rgpstatus }}</span> <span class="status status-info" title="Status">{{ domain.rgpstatus }}</span>
@ -113,27 +119,62 @@
<div class="col-md-12"> <div class="col-md-12">
<div class="card h-100"> <div class="card h-100">
<div class="card-body"> <div class="card-body">
<h5 class="card-title">DNSSEC Data</h5> <h5 class="card-title">{{ __('DNSSEC Data') }}</h5>
<div class="table-responsive"> {% if domainSecdns|length > 0 %}
<table class="table table-vcenter card-table table-striped"> <div id="dnssecTable" class="mb-3">
{% for row in domainSecdns %} <div class="table-responsive">
<tr> <table class="table table-vcenter card-table table-striped">
{% for key, value in row %} <thead>
{% if key not in ['id', 'domain_id', 'maxsiglife'] %} <tr>
<th>{{ key }}</th> {% set dsDataExists = false %}
{% endif %} {% set keyDataExists = false %}
{% endfor %}
</tr> {% for row in domainSecdns %}
<tr> {% if row.interface == 'dsData' %}
{% for key, value in row %} {% set dsDataExists = true %}
{% if key not in ['id', 'domain_id', 'maxsiglife'] %} {% elseif row.interface == 'keyData' %}
<td>{{ value }}</td> {% set keyDataExists = true %}
{% endif %} {% endif %}
{% endfor %} {% endfor %}
</tr>
{% endfor %} <!-- Headers for dsData -->
</table> {% if dsDataExists %}
</div> <th>Keytag</th>
<th>Algorithm</th>
<th>Digest Type</th>
<th>Digest</th>
{% endif %}
<!-- Headers for keyData -->
{% if keyDataExists %}
<th>Flags</th>
<th>Protocol</th>
<th>Keydata Algorithm</th>
<th>Public Key</th>
{% endif %}
</tr>
</thead>
<tbody>
{% for row in domainSecdns %}
<tr>
{% if row.interface == 'dsData' %}
<td>{{ row.keytag }}</td>
<td>{{ row.alg }}</td>
<td>{{ row.digesttype }}</td>
<td>{{ row.digest }}</td>
{% elseif row.interface == 'keyData' %}
<td>{{ row.flags }}</td>
<td>{{ row.protocol }}</td>
<td>{{ row.keydata_alg }}</td>
<td>{{ row.pubkey }}</td>
{% endif %}
</tr>
{% endfor %}
</tbody>
</table>
</div>
</div>
{% endif %}
</div> </div>
</div> </div>
</div> </div>