Skip to content

Commit 6b738f9

Browse files
author
Kristan Kenney
committed
Merge branch 'main' into feature/user-roles
2 parents b4c3b8f + a85c3f7 commit 6b738f9

File tree

5 files changed

+23
-15
lines changed

5 files changed

+23
-15
lines changed

‎web/css/src/themes/default.css‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1506,6 +1506,14 @@ div.l-content > div.l-separator:nth-of-type(4) {
15061506
padding-right: 6px;
15071507
}
15081508

1509+
.body-user .l-unit.animated.fadeIn {
1510+
line-height: 2rem;
1511+
}
1512+
1513+
.body-user .actions-panel {
1514+
line-height: 2rem;
1515+
}
1516+
15091517
.subtitle {
15101518
color: #cc3366;
15111519
font-size: 0.8rem;

‎web/css/themes/default.min.css‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎web/list/log/auth/index.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?php
22
error_reporting(NULL);
33
ob_start();
4-
$TAB = 'USER';
4+
$TAB = 'LOG';
55

66
// Main include
77
include($_SERVER['DOCUMENT_ROOT']."/inc/main.php");

‎web/templates/admin/edit_mail.html‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -116,9 +116,9 @@
116116
<label><input type="checkbox" size="20" class="vst-checkbox" name="v_ssl" <?php if ($v_ssl == 'yes') echo "checked=yes" ?> onclick="javascript:elementHideShow('ssltable');"><?php print _('SSL Support');?></label>
117117
</td>
118118
</tr>
119-
<tr>
120-
<td class="step-left">
121-
<table style="display:<?php if ($v_ssl == 'no' ) { echo 'none';} else {echo 'block';}?> ;" id="ssltable">
119+
<tr id="ssltable" style="display:<?php if ($v_ssl == 'no' ) { echo 'none';} else {echo 'block';}?> ;" class="step-left">
120+
<td>
121+
<table>
122122
<tr>
123123
<td class="input-label vst-text">
124124
<label><input type="checkbox" size="20" class="vst-checkbox" name="v_letsencrypt" <?php if($v_letsencrypt == 'yes' || $v_letencrypt == 'on') echo "checked=yes" ?> onclick="App.Actions.MAIL.toggle_letsencrypt(this)"><?php print _('Lets Encrypt Support');?></label>
@@ -234,7 +234,7 @@
234234
</td>
235235
</tr>
236236
<tr>
237-
<td class="vst-text">
237+
<td class="vst-text input-label">
238238
<label>
239239
<input type="checkbox" size="20" class="vst-checkbox" name="v_smtp_relay" <?php if ($v_smtp_relay == 'true') echo "checked=yes"; ?> onclick="javascript:elementHideShow('smtp_relay_table');"><?php print _('SMTP Relay');?>
240240
</label>

‎web/templates/admin/edit_server.html‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -232,7 +232,7 @@
232232
<?php if (!empty($_SESSION['PROXY_SYSTEM'])) { ?>
233233
<tr>
234234
<td class="vst-text">
235-
<?php print _('Proxy Server') ?> / <a class="generate" href="/edit/server/<? echo $_SESSION['PROXY_SYSTEM'] ?>/"><?=_('configure')?></a>
235+
<?php print _('Proxy Server') ?> <a href="/edit/server/<? echo $_SESSION['PROXY_SYSTEM'] ?>/"><i class="fas fa-pencil-alt status-icon orange icon-pad-right"></i></a>
236236
</td>
237237
</tr>
238238
<tr>
@@ -244,7 +244,7 @@
244244
<?php } ?>
245245
<tr>
246246
<td class="vst-text">
247-
<?php print _('Web Server') ?> / <a class="generate" href="/edit/server/<? echo $_SESSION['WEB_SYSTEM'] ?>/"><?=_('configure')?></a>
247+
<?php print _('Web Server') ?> <a href="/edit/server/<? echo $_SESSION['WEB_SYSTEM'] ?>/"><i class="fas fa-pencil-alt status-icon orange icon-pad-right"></i></a>
248248
</td>
249249
</tr>
250250
<tr>
@@ -256,7 +256,7 @@
256256
<?php if (!empty($_SESSION['WEB_BACKEND'])) { ?>
257257
<tr>
258258
<td class="vst-text">
259-
<?php print _('Backend Server') ?> / <a class="generate" href="/edit/server/<? echo $_SESSION['WEB_BACKEND'] ?>/"><?=_('configure')?></a>
259+
<?php print _('Backend Server') ?> <a href="/edit/server/<? echo $_SESSION['WEB_BACKEND'] ?>/"><i class="fas fa-pencil-alt status-icon orange icon-pad-right"></i></a>
260260
</td>
261261
</tr>
262262
<tr>
@@ -331,7 +331,7 @@
331331
<table style="display:<?php if (empty($v_adv)) echo 'none';?> ;" id="dns">
332332
<tr>
333333
<td class="vst-text step-top">
334-
<?php print _('DNS Server') ?> / <a class="generate" href="/edit/server/<? echo $_SESSION['DNS_SYSTEM'] ?>/"><?=_('configure')?></a>
334+
<?php print _('DNS Server') ?> <a href="/edit/server/<? echo $_SESSION['DNS_SYSTEM'] ?>/"><i class="fas fa-pencil-alt status-icon orange icon-pad-right"></i></a>
335335
</td>
336336
</tr>
337337
<tr>
@@ -389,7 +389,7 @@
389389
<table style="display:<?php if (empty($v_mail_adv)) echo 'none';?> ;" id="mail">
390390
<tr>
391391
<td class="vst-text step-top">
392-
<?php print _('Mail Server') ?> / <a class="generate" href="/edit/server/<? echo $_SESSION['MAIL_SYSTEM'] ?>/"><?=_('configure')?></a>
392+
<?php print _('Mail Server') ?> <a href="/edit/server/<? echo $_SESSION['MAIL_SYSTEM'] ?>/"><i class="fas fa-pencil-alt status-icon orange icon-pad-right"></i></a>
393393
</td>
394394
</tr>
395395
<tr>
@@ -401,7 +401,7 @@
401401
<?php if (!empty($_SESSION['ANTIVIRUS_SYSTEM'])) { ?>
402402
<tr>
403403
<td class="vst-text">
404-
<?php print _('Antivirus') ?> / <a class="generate" href="/edit/server/<? echo $_SESSION['ANTIVIRUS_SYSTEM'] ?>/"><?=_('configure')?></a>
404+
<?php print _('Antivirus') ?> <a href="/edit/server/<? echo $_SESSION['ANTIVIRUS_SYSTEM'] ?>/"><i class="fas fa-pencil-alt status-icon orange icon-pad-right"></i></a>
405405
</td>
406406
</tr>
407407
<tr>
@@ -414,7 +414,7 @@
414414
<?php if (!empty($_SESSION['ANTISPAM_SYSTEM'])) { ?>
415415
<tr>
416416
<td class="vst-text">
417-
<?php print _('AntiSpam') ?> / <a class="generate" href="/edit/server/<? echo $_SESSION['ANTISPAM_SYSTEM'] ?>/"><?=_('configure')?></a>
417+
<?php print _('AntiSpam') ?> <a href="/edit/server/<? echo $_SESSION['ANTISPAM_SYSTEM'] ?>/"><i class="fas fa-pencil-alt status-icon orange icon-pad-right"></i></a>
418418
</td>
419419
</tr>
420420
<tr>
@@ -511,7 +511,7 @@
511511
<table style="display:<?php if (empty($v_db_adv)) echo 'none';?> ;" id="db">
512512
<tr>
513513
<td class="vst-text step-top">
514-
<?php print _('MySQL Support');?> / <a class="generate" href="/edit/server/mysql/"><?=_('configure')?></a>
514+
<?php print _('MySQL Support');?> <a href="/edit/server/mysql/"><i class="fas fa-pencil-alt status-icon orange icon-pad-right"></i></a>
515515
</td>
516516
</tr>
517517
<tr>
@@ -604,7 +604,7 @@
604604
<?php }} ?>
605605
<tr>
606606
<td class="vst-text input-label">
607-
<?php print _('PostgreSQL Support');?> / <a class="generate" href="/edit/server/postgresql/"><?=_('configure')?></a>
607+
<?php print _('PostgreSQL Support');?> <a href="/edit/server/postgresql/"><i class="fas fa-pencil-alt status-icon orange icon-pad-right"></i></a>
608608
</td>
609609
</tr>
610610
<tr>

0 commit comments

Comments
 (0)