Skip to content

Commit f98668d

Browse files
author
Kristan Kenney
committed
Merge branch 'fix/2021-03-ui-fixes' into main
2 parents 55799c8 + 812d06f commit f98668d

File tree

5 files changed

+67
-5
lines changed

5 files changed

+67
-5
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 $_SESSION['user'];?>" id="btn-list" class="ui-button cancel" title="<?=_('Login history');?>"><i class="fas fa-key status-icon orange"></i><?=_('Login history')?></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>
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: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<div class="l-center">
22
<div class="l-sort clearfix noselect">
33
<div class="l-unit-toolbar__buttonstrip">
4-
<a href="javascript:window.history.back()" id="btn-back" class="ui-button cancel"><i class="fas fa-arrow-left status-icon blue"></i> <?=_('Back')?></a>
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>
55
<a href="javascript:location.reload();" class="ui-button cancel"><i class="fas fa-redo status-icon green"></i> <?=_('Refresh')?></a>
66
<div class="actions-panel display-inline-block" key-action="js">
77
<a class="data-controls do_delete ui-button danger cancel">

‎web/templates/user/edit_user.html‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,8 @@
22
<div class="l-sort clearfix">
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>
5-
<a href="/list/key/" id="btn-create" class="ui-button cancel" title="<?=_('SSH_KEY');?>"><i class="fas fa-key status-icon green"></i><?=_('SSH KEY')?></a>
5+
<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>
67
</div>
78
<div class="l-unit-toolbar__buttonstrip float-right">
89
<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: 61 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,61 @@
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="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>
10+
</div>
11+
12+
<div class="l-separator"></div>
13+
14+
<div class="l-center units animated fadeIn">
15+
<div class="header table-header">
16+
<div class="l-unit__col l-unit__col--right">
17+
<div class="clearfix l-unit__stat-col--left super-compact">
18+
&nbsp;
19+
</div>
20+
<div class="clearfix l-unit__stat-col--left small"><b><?php print _('Date');?></b></div>
21+
<div class="clearfix l-unit__stat-col--left compact"><b><?php print _('Time');?></b></div>
22+
<div class="clearfix l-unit__stat-col--left "><b><?php print _('IP address');?></b></div>
23+
<div class="clearfix l-unit__stat-col--left "><b><?php print _('Active');?></b></div>
24+
<div class="clearfix l-unit__stat-col--left wide-4"><b><?php print _('Browser Fingerprint');?></b></div>
25+
</div>
26+
</div>
27+
<?php
28+
foreach ($data as $key => $value) {
29+
++$i;
30+
?>
31+
<div class="l-unit header">
32+
<div class="l-unit__col l-unit__col--right">
33+
<div class="clearfix l-unit__stat-col--left super-compact">
34+
<i class="fas fa-info-circle status-icon dim"></i>
35+
</div>
36+
<div class="clearfix l-unit__stat-col--left small"><b><?=translate_date($data[$key]['DATE'])?></b></div>
37+
<div class="clearfix l-unit__stat-col--left compact"><b><?=$data[$key]['TIME']?></b></div>
38+
<div class="clearfix l-unit__stat-col--left "><?=$data[$key]['IP']?></div>
39+
<div class="clearfix l-unit__stat-col--left "><?=$data[$key]['ACTIVE']?></div>
40+
<div class="clearfix l-unit__stat-col--left "><?=$data[$key]['FINGERPRINT']?></div>
41+
42+
43+
</div>
44+
</div>
45+
<?}?>
46+
47+
</div>
48+
49+
<div id="vstobjects">
50+
<div class="l-separator"></div>
51+
<div class="l-center">
52+
<div class="l-unit-ft">
53+
<table class='data'></table>
54+
<div class="data-count l-unit_col l-unit_col--right clearfix">
55+
<?
56+
printf(ngettext('%d log record', '%d log records', $i),$i);
57+
?>
58+
</div>
59+
</div>
60+
</div>
61+
</div>

‎web/templates/user/list_user.html‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -94,9 +94,9 @@
9494
<div class="clearfix l-unit__stat-col--left super-compact">
9595
<input id="check<?=$i?>" class="ch-toggle" type="checkbox" name="user[]" value="<?=$key?>">
9696
</div>
97-
<div class="clearfix l-unit__stat-col--left wide-3 userlist-username"><b><a href="/login/?loginas=<?=$key?>&token=<?=$_SESSION['token']?>" title="<?=_('login as')?>"><?php echo $data[$key]['FNAME'];?> <span style="font-weight: normal !important;">(<?=$key?>)</span></b></a>
97+
<div class="clearfix l-unit__stat-col--left wide-3 userlist-username"><b><a href="/login/?loginas=<?=$key?>&token=<?=$_SESSION['token']?>" title="<?=_('login as')?> <?=$key?>"><?=$key?> <span style="font-weight: normal !important;">(<?php echo $data[$key]['NAME'];?>)</span></b></a>
9898
<br />
99-
<span class="userlist-email"><b><?=_('Email')?>:</b> <?=$data[$key]['CONTACT']?></span>
99+
<div class="userlist-email"><b><?=_('Email')?>:</b> <?=$data[$key]['CONTACT']?></div>
100100
</div>
101101
<!-- START QUICK ACTION TOOLBAR AREA -->
102102
<div class="clearfix l-unit__stat-col--left text-right compact-3">

0 commit comments

Comments
 (0)