paxton
/
mailcow
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #70 from PhoenixPeca/dev 

HTML Improvement
master
André Peters 2017-02-26 11:50:08 +01:00 committed by GitHub
parent 1668a4e871 9196e00d7f
commit 9e9f70e43e
3 changed files with 43 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
data/web/lang/lang.en.php
View File

@ -246,6 +246,7 @@ $lang['mailbox']['add_domain_alias'] = 'Add domain alias';
$lang['mailbox']['add_mailbox'] = 'Add mailbox'; $lang['mailbox']['add_mailbox'] = 'Add mailbox';
$lang['mailbox']['add_resource'] = 'Add resource'; $lang['mailbox']['add_resource'] = 'Add resource';
$lang['mailbox']['add_alias'] = 'Add alias'; $lang['mailbox']['add_alias'] = 'Add alias';
$lang['mailbox']['add_domain_record_first'] = 'Please add a domain first';
$lang['info']['no_action'] = 'No action applicable'; $lang['info']['no_action'] = 'No action applicable';

58
data/web/mailbox.php
View File

@ -91,7 +91,7 @@ $_SESSION['return_to'] = $_SERVER['REQUEST_URI'];
endforeach; endforeach;
else: else:
?> ?>
<tr id="no-data"><td colspan="8" style="text-align: center; font-style: italic;"><?=$lang['mailbox']['no_record_single'];?></td></tr> <tr id="no-data"><td colspan="999" style="text-align: center; font-style: italic;"><?=$lang['mailbox']['no_record_single'];?></td></tr>
<?php <?php
endif; endif;
?> ?>
@ -101,7 +101,7 @@ $_SESSION['return_to'] = $_SERVER['REQUEST_URI'];
?> ?>
<tfoot> <tfoot>
<tr id="no-data"> <tr id="no-data">
<td colspan="8" style="text-align: center; font-style: normal; border-top: 1px solid #e7e7e7;"> <td colspan="999" style="text-align: center; font-style: normal; border-top: 1px solid #e7e7e7;">
<a href="/add.php?domain"><?=$lang['mailbox']['add_domain'];?></a> <a href="/add.php?domain"><?=$lang['mailbox']['add_domain'];?></a>
</td> </td>
</tr> </tr>
@ -146,6 +146,7 @@ $_SESSION['return_to'] = $_SERVER['REQUEST_URI'];
</thead> </thead>
<tbody> <tbody>
<?php <?php
if (!empty($domains)) {
foreach (mailbox_get_domains() as $domain) { foreach (mailbox_get_domains() as $domain) {
$mailboxes = mailbox_get_mailboxes($domain); $mailboxes = mailbox_get_mailboxes($domain);
if (!empty($mailboxes)) { if (!empty($mailboxes)) {
@ -182,15 +183,20 @@ $_SESSION['return_to'] = $_SERVER['REQUEST_URI'];
} }
else { else {
?> ?>
<tr id="no-data"><td colspan="8" style="text-align: center; font-style: italic;"><?=sprintf($lang['mailbox']['no_record'], $domain);?></td></tr> <tr id="no-data"><td colspan="999" style="text-align: center; font-style: italic;"><?=sprintf($lang['mailbox']['no_record'], $domain);?></td></tr>
<?php <?php
} }
} }
} else {
?>
<tr id="no-data"><td colspan="999" style="text-align: center; font-style: italic;"><?=$lang['mailbox']['add_domain_record_first'];?></td></tr>
<?php
}
?> ?>
</tbody> </tbody>
<tfoot> <tfoot>
<tr id="no-data"> <tr id="no-data">
<td colspan="8" style="text-align: center; border-top: 1px solid #e7e7e7;"> <td colspan="999" style="text-align: center; border-top: 1px solid #e7e7e7;">
<a href="/add.php?mailbox"><?=$lang['mailbox']['add_mailbox'];?></a> <a href="/add.php?mailbox"><?=$lang['mailbox']['add_mailbox'];?></a>
</td> </td>
</tr> </tr>
@ -229,6 +235,7 @@ $_SESSION['return_to'] = $_SERVER['REQUEST_URI'];
</thead> </thead>
<tbody> <tbody>
<?php <?php
if (!empty($domains)) {
foreach (mailbox_get_domains() as $domain) { foreach (mailbox_get_domains() as $domain) {
$resources = mailbox_get_resources($domain); $resources = mailbox_get_resources($domain);
if (!empty($resources)) { if (!empty($resources)) {
@ -253,15 +260,20 @@ $_SESSION['return_to'] = $_SERVER['REQUEST_URI'];
} }
else { else {
?> ?>
<tr id="no-data"><td colspan="8" style="text-align: center; font-style: italic;"><?=sprintf($lang['mailbox']['no_record'], $domain);?></td></tr> <tr id="no-data"><td colspan="999" style="text-align: center; font-style: italic;"><?=sprintf($lang['mailbox']['no_record'], $domain);?></td></tr>
<?php <?php
} }
} }
} else {
?>
<tr id="no-data"><td colspan="999" style="text-align: center; font-style: italic;"><?=$lang['mailbox']['add_domain_record_first'];?></td></tr>
<?php
}
?> ?>
</tbody> </tbody>
<tfoot> <tfoot>
<tr id="no-data"> <tr id="no-data">
<td colspan="8" style="text-align: center; border-top: 1px solid #e7e7e7;"> <td colspan="999" style="text-align: center; border-top: 1px solid #e7e7e7;">
<a href="/add.php?resource"><?=$lang['mailbox']['add_resource'];?></a> <a href="/add.php?resource"><?=$lang['mailbox']['add_resource'];?></a>
</td> </td>
</tr> </tr>
@ -298,6 +310,7 @@ $_SESSION['return_to'] = $_SERVER['REQUEST_URI'];
</thead> </thead>
<tbody> <tbody>
<?php <?php
if (!empty($domains)) {
foreach (mailbox_get_domains() as $domain) { foreach (mailbox_get_domains() as $domain) {
$alias_domains = mailbox_get_alias_domains($domain); $alias_domains = mailbox_get_alias_domains($domain);
if (!empty($alias_domains)) { if (!empty($alias_domains)) {
@ -320,15 +333,20 @@ $_SESSION['return_to'] = $_SERVER['REQUEST_URI'];
} }
else { else {
?> ?>
<tr id="no-data"><td colspan="8" style="text-align: center; font-style: italic;"><?=sprintf($lang['mailbox']['no_record'], $domain);?></td></tr> <tr id="no-data"><td colspan="999" style="text-align: center; font-style: italic;"><?=sprintf($lang['mailbox']['no_record'], $domain);?></td></tr>
<?php <?php
} }
} }
} else {
?> ?>
<tr id="no-data"><td colspan="999" style="text-align: center; font-style: italic;"><?=$lang['mailbox']['add_domain_record_first'];?></td></tr>
<?php
}
?>
</tbody> </tbody>
<tfoot> <tfoot>
<tr id="no-data"> <tr id="no-data">
<td colspan="8" style="text-align: center; border-top: 1px solid #e7e7e7;"> <td colspan="999" style="text-align: center; border-top: 1px solid #e7e7e7;">
<a href="/add.php?aliasdomain"><?=$lang['mailbox']['add_domain_alias'];?></a> <a href="/add.php?aliasdomain"><?=$lang['mailbox']['add_domain_alias'];?></a>
</td> </td>
</tr> </tr>
@ -367,6 +385,7 @@ $_SESSION['return_to'] = $_SERVER['REQUEST_URI'];
</thead> </thead>
<tbody> <tbody>
<?php <?php
if (!empty($domains)) {
foreach (array_merge(mailbox_get_domains(), mailbox_get_alias_domains()) as $domain) { foreach (array_merge(mailbox_get_domains(), mailbox_get_alias_domains()) as $domain) {
$aliases = mailbox_get_aliases($domain); $aliases = mailbox_get_aliases($domain);
if (!empty($aliases)) { if (!empty($aliases)) {
@ -394,19 +413,24 @@ $_SESSION['return_to'] = $_SERVER['REQUEST_URI'];
</td> </td>
</tr> </tr>
<?php <?php
} }
} }
else { else {
?> ?>
<tr id="no-data"><td colspan="8" style="text-align: center; font-style: italic;"><?=sprintf($lang['mailbox']['no_record'], $domain);?></td></tr> <tr id="no-data"><td colspan="999" style="text-align: center; font-style: italic;"><?=sprintf($lang['mailbox']['no_record'], $domain);?></td></tr>
<?php <?php
} }
} }
} else {
?>
<tr id="no-data"><td colspan="999" style="text-align: center; font-style: italic;"><?=$lang['mailbox']['add_domain_record_first'];?></td></tr>
<?php
}
?> ?>
</tbody> </tbody>
<tfoot> <tfoot>
<tr id="no-data"> <tr id="no-data">
<td colspan="8" style="text-align: center; border-top: 1px solid #e7e7e7;"> <td colspan="999" style="text-align: center; border-top: 1px solid #e7e7e7;">
<a href="/add.php?alias"><?=$lang['mailbox']['add_alias'];?></a> <a href="/add.php?alias"><?=$lang['mailbox']['add_alias'];?></a>
</td> </td>
</tr> </tr>

2
data/web/user.php
View File

@ -402,7 +402,7 @@ elseif (isset($_SESSION['mailcow_cc_role']) && $_SESSION['mailcow_cc_role'] == '
<th class="sort-table" style="min-width: 35px;"><?=$lang['user']['interval'];?></th> <th class="sort-table" style="min-width: 35px;"><?=$lang['user']['interval'];?></th>
<th class="sort-table" style="min-width: 35px;"><?=$lang['user']['last_run'];?></th> <th class="sort-table" style="min-width: 35px;"><?=$lang['user']['last_run'];?></th>
<th class="sort-table" style="min-width: 35px;">Log</th> <th class="sort-table" style="min-width: 35px;">Log</th>
<th class="sort-table" style="max-width: 35px;"><?=$lang['user']['active'];?></th> <th class="sort-table" style="max-width: 95px;"><?=$lang['user']['active'];?></th>
<th style="text-align: right; min-width: 200px;" data-sortable="false"><?=$lang['user']['action'];?></th> <th style="text-align: right; min-width: 200px;" data-sortable="false"><?=$lang['user']['action'];?></th>
</tr> </tr>
</thead> </thead>