Skip to content

Commit a243db4

Browse files
author
Kristan Kenney
committed
Merge branch 'feature/2021-03-ui-logs' into main
2 parents 3d22404 + 2ef7a17 commit a243db4

File tree

8 files changed

+89
-32
lines changed

8 files changed

+89
-32
lines changed

‎web/templates/admin/edit_user.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<div class="l-unit-toolbar__buttonstrip">
44
<a class="ui-button cancel" id="btn-back" href="/list/user/"><i class="fas fa-arrow-left status-icon blue"></i> <?=_('Back')?></a>
55
<a href="/list/key/" id="btn-create" class="ui-button cancel" title="<?=_('Manage SSH keys');?>"><i class="fas fa-key status-icon orange"></i><?=_('Manage SSH keys')?></a>
6-
<a href="/edit/user/log/?user=<?php echo $user; ?>" id="btn-list" class="ui-button cancel" title="<?=_('Login history');?>"><i class="fas fa-binoculars status-icon green"></i><?=_('Login history')?></a>
6+
<a href="/list/log/" id="btn-create" class="ui-button cancel" title="<?=_('Logs');?>"><i class="fas fa-history status-icon maroon"></i><?=_('Logs')?></a>
77
</div>
88
<div class="l-unit-toolbar__buttonstrip float-right">
99
<a href="#" class="ui-button" data-action="submit" data-id="vstobjects"><i class="fas fa-save status-icon purple"></i> <?=_('Save')?></a>

‎web/templates/admin/list_auth.html‎

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,23 @@
11
<div class="l-center">
2-
<div class="l-sort clearfix noselect">
3-
<div class="l-unit-toolbar__buttonstrip">
4-
<a href="/edit/user/?user=<?php echo $user; ?>" id="btn-back" class="ui-button cancel"><i class="fas fa-arrow-left status-icon blue"></i> <?=_('Back')?></a>
5-
<a href="javascript:location.reload();" class="ui-button cancel"><i class="fas fa-redo status-icon green"></i> <?=_('Refresh')?></a>
6-
<div class="actions-panel display-inline-block" key-action="js">
7-
<a class="data-controls do_delete ui-button danger cancel">
8-
<i class="do_delete fas fa-times-circle status-icon red"></i>
9-
<?=_('Delete')?>
10-
<input type="hidden" name="delete_url" value="/delete/user/log/?token=<?=$_SESSION['token']?>" />
11-
<div class="confirmation-text-delete hidden" title="<?=_('Confirmation')?>">
12-
<p class="confirmation"><?=_('Are you sure you want to delete the login history for this user?')?></p>
13-
</div>
14-
</a>
15-
</div>
16-
</div>
17-
<div class="l-sort-toolbar clearfix">
18-
</div>
2+
<div class="l-sort clearfix noselect">
3+
<div class="l-unit-toolbar__buttonstrip">
4+
<a href="/list/log/" id="btn-back" class="ui-button cancel"><i class="fas fa-arrow-left status-icon blue"></i> <?=_('Back')?></a>
5+
</div>
6+
<div class="l-unit-toolbar__buttonstrip float-right">
7+
<a href="javascript:location.reload();" class="ui-button cancel"><i class="fas fa-redo status-icon green"></i> <?=_('Refresh')?></a>
8+
<div class="actions-panel display-inline-block" key-action="js">
9+
<a class="data-controls do_delete ui-button danger cancel">
10+
<i class="do_delete fas fa-times-circle status-icon red"></i>
11+
<?=_('Delete')?>
12+
<input type="hidden" name="delete_url" value="/delete/user/log/?token=<?=$_SESSION['token']?>" />
13+
<div class="confirmation-text-delete hidden" title="<?=_('Confirmation')?>">
14+
<p class="confirmation"><?=_('Are you sure you want to delete the login history for this user?')?></p>
15+
</div>
16+
</a>
1917
</div>
2018
</div>
19+
</div>
20+
</div>
2121

2222
<div class="l-separator"></div>
2323

‎web/templates/admin/list_log.html‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,11 @@
11
<div class="l-center">
22
<div class="l-sort clearfix noselect">
33
<div class="l-unit-toolbar__buttonstrip">
4+
<a href="/edit/user/?user=<?php echo $user; ?>" id="btn-back" class="ui-button cancel"><i class="fas fa-arrow-left status-icon blue"></i> <?=_('Back')?></a>
5+
<a href="/edit/user/log/?user=<?php echo $user; ?>" id="btn-list" class="ui-button cancel" title="<?=_('Login history');?>"><i class="fas fa-binoculars status-icon green"></i><?=_('Login history')?></a>
6+
7+
</div>
8+
<div class="l-unit-toolbar__buttonstrip float-right">
49
<a href="javascript:location.reload();" class="ui-button cancel"><i class="fas fa-redo status-icon green"></i> <?=_('Refresh')?></a>
510
<div class="actions-panel display-inline-block" key-action="js">
611
<a class="data-controls do_delete ui-button danger cancel">
@@ -13,8 +18,6 @@
1318
</a>
1419
</div>
1520
</div>
16-
<div class="l-sort-toolbar clearfix">
17-
</div>
1821
</div>
1922
</div>
2023

‎web/templates/admin/panel.html‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@
1414
<?php if ((isset($_SESSION['FILE_MANAGER'])) && (!empty($_SESSION['FILE_MANAGER'])) && ($_SESSION['FILE_MANAGER'] == "true")) {?>
1515
<div class="l-menu__item <?php if($TAB == 'FM' ) echo 'l-menu__item--active' ?>"><a href="/fm/"><i class="fas fa-folder-open panel-icon"></i>&nbsp;&nbsp;&nbsp;<?=_('Files')?></a></div>
1616
<?php } ?>
17-
<div class="l-menu__item <?php if($TAB == 'LOG' ) echo 'l-menu__item--active' ?>"><a href="/list/log/"><i class="fas fa-history panel-icon"></i>&nbsp;&nbsp;&nbsp;<?=_('Log')?></a></div>
1817
<div class="l-menu__item <?php if($TAB == 'STATS' ) echo 'l-menu__item--active' ?>"><a href="/list/stats/"><i class="fas fa-chart-line panel-icon"></i>&nbsp;&nbsp;&nbsp;<?=_('Statistics')?></a></div>
1918
</div>
2019
<div class="l-profile noselect">

‎web/templates/user/edit_user.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<div class="l-unit-toolbar__buttonstrip">
44
<a class="ui-button cancel" id="btn-back" href="/list/user/"><i class="fas fa-arrow-left status-icon blue"></i> <?=_('Back')?></a>
55
<a href="/list/key/" id="btn-create" class="ui-button cancel" title="<?=_('Manage SSH keys');?>"><i class="fas fa-key status-icon orange"></i><?=_('Manage SSH keys')?></a>
6-
<a href="/edit/user/log/?user=<?php echo $user; ?>" id="btn-list" class="ui-button cancel" title="<?=_('Login history');?>"><i class="fas fa-binoculars status-icon green"></i><?=_('Login history')?></a>
6+
<a href="/list/log/" id="btn-create" class="ui-button cancel" title="<?=_('Logs');?>"><i class="fas fa-history status-icon maroon"></i><?=_('Logs')?></a>
77
</div>
88
<div class="l-unit-toolbar__buttonstrip float-right">
99
<a href="#" class="ui-button" data-action="submit" data-id="vstobjects"><i class="fas fa-save status-icon purple"></i> <?=_('Save')?></a>

‎web/templates/user/list_auth.html‎

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,13 @@
11
<div class="l-center">
2-
<div class="l-sort clearfix noselect">
3-
<div class="l-unit-toolbar__buttonstrip">
4-
<a href="/edit/user/?user=<?php echo $user; ?>" id="btn-back" class="ui-button cancel"><i class="fas fa-arrow-left status-icon blue"></i> <?=_('Back')?></a>
5-
<a href="javascript:location.reload();" class="ui-button cancel"><i class="fas fa-redo status-icon green"></i> <?=_('Refresh')?></a>
6-
</div>
7-
<div class="l-sort-toolbar clearfix">
8-
</div>
9-
</div>
2+
<div class="l-sort clearfix noselect">
3+
<div class="l-unit-toolbar__buttonstrip">
4+
<a href="/list/log/" id="btn-back" class="ui-button cancel"><i class="fas fa-arrow-left status-icon blue"></i> <?=_('Back')?></a>
105
</div>
11-
6+
<div class="l-unit-toolbar__buttonstrip float-right">
7+
<a href="javascript:location.reload();" class="ui-button cancel"><i class="fas fa-redo status-icon green"></i> <?=_('Refresh')?></a>
8+
</div>
9+
</div>
10+
</div>
1211
<div class="l-separator"></div>
1312

1413
<div class="l-center units animated fadeIn">

‎web/templates/user/list_log.html‎

Lines changed: 57 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,57 @@
1+
<div class="l-center">
2+
<div class="l-sort clearfix noselect">
3+
<div class="l-unit-toolbar__buttonstrip">
4+
<a href="/edit/user/?user=<?php echo $user; ?>" id="btn-back" class="ui-button cancel"><i class="fas fa-arrow-left status-icon blue"></i> <?=_('Back')?></a>
5+
<a href="/edit/user/log/?user=<?php echo $user; ?>" id="btn-list" class="ui-button cancel" title="<?=_('Login history');?>"><i class="fas fa-binoculars status-icon green"></i><?=_('Login history')?></a>
6+
</div>
7+
<div class="l-unit-toolbar__buttonstrip float-right">
8+
<a href="javascript:location.reload();" class="ui-button cancel"><i class="fas fa-redo status-icon green"></i> <?=_('Refresh')?></a>
9+
</div>
10+
</div>
11+
</div>
12+
13+
<div class="l-separator"></div>
14+
15+
<div class="l-center units animated fadeIn">
16+
17+
<div class="header table-header">
18+
<div class="l-unit__col l-unit__col--right">
19+
<div class="clearfix l-unit__stat-col--left super-compact">
20+
&nbsp;
21+
</div>
22+
<div class="clearfix l-unit__stat-col--left"><b><?php print _('Date');?></b></div>
23+
<div class="clearfix l-unit__stat-col--left"><b><?php print _('Time');?></b></div>
24+
<div class="clearfix l-unit__stat-col--left"><b><?php print _('Value');?></b></div>
25+
</div>
26+
</div>
27+
28+
<?php
29+
foreach ($data as $key => $value) {
30+
++$i;
31+
?>
32+
<div class="l-unit header">
33+
<div class="l-unit__col l-unit__col--right">
34+
<div class="clearfix l-unit__stat-col--left super-compact">
35+
<i class="fas fa-info-circle status-icon dim"></i>
36+
</div>
37+
<div class="clearfix l-unit__stat-col--left"><b><?=translate_date($data[$key]['DATE'])?></b></div>
38+
<div class="clearfix l-unit__stat-col--left"><b><?=$data[$key]['TIME']?></b></div>
39+
<div class="clearfix l-unit__stat-col--left wide-7"><?=htmlspecialchars($data[$key]['CMD'], ENT_QUOTES)?></div>
40+
</div>
41+
</div>
42+
<?}?>
43+
</div>
44+
45+
<div id="vstobjects">
46+
<div class="l-separator"></div>
47+
<div class="l-center">
48+
<div class="l-unit-ft">
49+
<table class='data'></table>
50+
<div class="data-count l-unit__col l-unit__col--right clearfix">
51+
<?
52+
printf(ngettext('%d log record', '%d log records', $i),$i);
53+
?>
54+
</div>
55+
</div>
56+
</div>
57+
</div>

‎web/templates/user/panel.html‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@
1414
<?php if ((isset($_SESSION['FILE_MANAGER'])) && (!empty($_SESSION['FILE_MANAGER'])) && ($_SESSION['FILE_MANAGER'] == "true")) {?>
1515
<div class="l-menu__item <?php if($TAB == 'FM' ) echo 'l-menu__item--active' ?>"><a href="/fm/"><i class="fas fa-folder-open panel-icon"></i>&nbsp;&nbsp;&nbsp;<?=_('Files')?></a></div>
1616
<?php } ?>
17-
<div class="l-menu__item <?php if($TAB == 'LOG' ) echo 'l-menu__item--active' ?>"><a href="/list/log/"><i class="fas fa-history panel-icon"></i>&nbsp;&nbsp;&nbsp;<?=_('Log')?></a></div>
1817
<div class="l-menu__item <?php if($TAB == 'STATS' ) echo 'l-menu__item--active' ?>"><a href="/list/stats/"><i class="fas fa-chart-line panel-icon"></i>&nbsp;&nbsp;&nbsp;<?=_('Statistics')?></a></div>
1918
</div>
2019
<div class="l-profile noselect">

0 commit comments

Comments
 (0)