Show default TTL values in gray
Hanno Böck commited on 2025-08-28 14:30:43
Zeige 3 geänderte Dateien mit 16 Einfügungen und 5 Löschungen.
Also use the same CSS class in the vhost view for default dirs consistency.
- modules/dns/dns_domain.php e21b712..8304e7d
- modules/vhosts/vhosts.php 5747cad..d00cdff
- themes/default/desktop.css 65fbdc8..248f2c8
| ... | ... |
@@ -81,7 +81,11 @@ foreach ($records as $rec) {
|
| 81 | 81 |
if ($rec['type'] == 'caa') {
|
| 82 | 82 |
$data = $caa_properties[(int) $rec['spec']] . ' 0 "' . $data . '"'; |
| 83 | 83 |
} |
| 84 |
- $ttl = ($rec['ttl'] ? $rec['ttl'] : $domainttl); |
|
| 84 |
+ if ($rec['ttl']) {
|
|
| 85 |
+ $ttl = "<td>" . $rec['ttl'] . " Sek.</td>"; |
|
| 86 |
+ } else {
|
|
| 87 |
+ $ttl = "<td class='gray'>$domainttl Sek.</td>"; |
|
| 88 |
+ } |
|
| 85 | 89 |
$link = $rec['fqdn']; |
| 86 | 90 |
if (!in_array($rec['type'], $implemented_record_types)) {
|
| 87 | 91 |
$editable = false; |
| ... | ... |
@@ -94,7 +98,7 @@ foreach ($records as $rec) {
|
| 94 | 98 |
if ($editable) {
|
| 95 | 99 |
$link = internal_link('dns_record_edit', $rec['fqdn'], "id={$rec['id']}");
|
| 96 | 100 |
} |
| 97 |
- output("<tr><td>{$link}</td><td>" . strtoupper($rec['type']) . "</td><td>" . $data . "</td><td>{$ttl} Sek.</td><td>" . $delete . "</td></tr>\n");
|
|
| 101 |
+ output("<tr><td>{$link}</td><td>" . strtoupper($rec['type']) . "</td><td>" . $data . "</td>" . $ttl . "<td>" . $delete . "</td></tr>\n");
|
|
| 98 | 102 |
} |
| 99 | 103 |
foreach ($auto_records as $rec) {
|
| 100 | 104 |
$data = filter_output_html($rec['ip'] ? $rec['ip'] : $rec['data']); |
| ... | ... |
@@ -104,8 +108,12 @@ foreach ($auto_records as $rec) {
|
| 104 | 108 |
if (($rec['type'] == 'txt') && (strlen($data) > 100)) {
|
| 105 | 109 |
$data = substr($data, 0, 100) . "<em>[...]</em>"; |
| 106 | 110 |
} |
| 107 |
- $ttl = ($rec['ttl'] ? $rec['ttl'] : $domainttl); |
|
| 108 |
- output("<tr><td><em>{$rec['fqdn']}</em></td><td>" . strtoupper($rec['type']) . "</td><td>$data</td><td>{$ttl} Sek.</td><td> </td></tr>\n");
|
|
| 111 |
+ if ($rec['ttl']) {
|
|
| 112 |
+ $ttl = "<td>" . $rec['ttl'] . " Sek.</td>"; |
|
| 113 |
+ } else {
|
|
| 114 |
+ $ttl = "<td class='gray'>$domainttl Sek.</td>"; |
|
| 115 |
+ } |
|
| 116 |
+ output("<tr><td><em>{$rec['fqdn']}</em></td><td>" . strtoupper($rec['type']) . "</td><td>$data</td>" . $ttl . "<td> </td></tr>\n");
|
|
| 109 | 117 |
} |
| 110 | 118 |
|
| 111 | 119 |
|
| ... | ... |
@@ -174,7 +174,7 @@ if (count($vhosts) > 0) {
|
| 174 | 174 |
} |
| 175 | 175 |
output("<td>{$php}</td>");
|
| 176 | 176 |
if ($vhost['docroot_is_default'] == 1) {
|
| 177 |
- output("<td><span style=\"color:#777;\">{$vhost['docroot']}</span></td>");
|
|
| 177 |
+ output("<td class='gray'>{$vhost['docroot']}</td>");
|
|
| 178 | 178 |
} else {
|
| 179 | 179 |
output("<td><strong>{$vhost['docroot']}</strong></td>");
|
| 180 | 180 |
} |