Skip to content

Commit d38f94c

Browse files
author
Kristan Kenney
committed
Update standard user view
1 parent c478f75 commit d38f94c

File tree

11 files changed

+762
-1218
lines changed

11 files changed

+762
-1218
lines changed

‎web/templates/user/edit_dns.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
echo "<span class=\"vst-error\"> → ".htmlentities($_SESSION['error_msg'])."</span>";
88
} else {
99
if (!empty($_SESSION['ok_msg'])) {
10-
echo "<span class=\"vst-ok\"> → ".htmlentities($_SESSION['ok_msg'])."</span>";
10+
echo "<span class=\"vst-ok\"> → ".$_SESSION['ok_msg']."</span>";
1111
}
1212
}
1313
?>

‎web/templates/user/edit_user.html‎

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -64,18 +64,13 @@
6464
<input type="text" size="20" class="vst-input password" name="v_password" value="<?=htmlentities(trim($v_password, "'"))?>">
6565
</td>
6666
</tr>
67-
<tr>
68-
<td class="vst-text input-label">
69-
<?php print __('2 Factor Authentication');?>
70-
</td>
71-
</tr>
7267
<tr>
7368
<td>
74-
<label><input type="checkbox" class="vst-checkbox" name="v_twofa" <?php if(!empty($v_twofa)) echo "checked=yes" ?> onclick="App.Actions.WEB.toggle_twofa(this)"> <?php print __('Enable 2FA');?></label>
69+
<label><input type="checkbox" class="vst-checkbox password-option" name="v_twofa" <?php if(!empty($v_twofa)) echo "checked=yes" ?> onclick="App.Actions.WEB.toggle_twofa(this)"> <?php print __('Enable 2FA');?></label>
7570
<?php if (!empty($v_twofa)) { ?>
7671
<p><?php echo __('2FA Reset Code:').' '.$v_twofa; ?></br></p>
7772
<p><?php echo __('Please scan the code below in your 2FA application:'); ?></p>
78-
<img src="<?php echo $v_qrcode; ?>">
73+
<div><img class="qr-code" src="<?php echo $v_qrcode; ?>"></div>
7974
<?php } ?>
8075
</td>
8176
</tr>

‎web/templates/user/edit_web.html‎

Lines changed: 83 additions & 86 deletions
Large diffs are not rendered by default.

‎web/templates/user/list_cron.html‎

Lines changed: 76 additions & 92 deletions
Original file line numberDiff line numberDiff line change
@@ -1,35 +1,33 @@
11
<div class="l-center">
22
<div class="l-sort clearfix noselect">
3-
<a href="/add/cron/" class="l-sort__create-btn" title="<?=__('Add Cron Job')?>"></a>
3+
<div class="l-unit-toolbar__buttonstrip">
4+
<a href="/add/cron/" class="ui-button cancel" title="<?=__('Add Cron Job')?>"><i class="fas fa-plus-circle status-icon green"></i> <?=__('Add Cron Job')?></a>
5+
<?
6+
if($panel[$user]['CRON_REPORTS'] == 'yes') {
7+
echo '<a class="ui-button cancel" href="/delete/cron/reports/?token='.$_SESSION['token'].'"><i class="fas fa-bell status-icon orange"></i> '.__('turn off notifications').'</a>';
8+
} else {
9+
echo '<a class="ui-button cancel" href="/add/cron/reports/?token='.$_SESSION['token'].'"><i class="fas fa-bell-slash status-icon orange"></i> '.__('turn on notifications').'</a>';
10+
}
11+
?>
12+
</div>
413
<ul class="context-menu sort-order animated fadeIn" style="display:none;">
5-
<li entity="sort-date" sort_as_int="1"><span class="name active"><?=__('Date')?></span><span class="up"><i class="fas fa-sort-amount-up"></i></span></li>
6-
<li entity="sort-name"><span class="name"><?=__('Command')?></span><span class="up"><i class="fas fa-sort-amount-up"></i></span></li>
7-
<li entity="sort-star" sort_as_int="1"><span class="name"><?=__('Starred')?></span><span class="up"><i class="fas fa-sort-amount-up"></i></span></li>
14+
<li entity="sort-date" sort_as_int="1"><span class="name active"><?=__('Date')?> <i class="fas fa-sort-amount-down"></i></span><span class="up"><i class="fas fa-sort-amount-up"></i></span></li>
15+
<li entity="sort-name"><span class="name"><?=__('Command')?> <i class="fas fa-sort-amount-down"></i></span><span class="up"><i class="fas fa-sort-amount-up"></i></span></li>
16+
<li entity="sort-star" sort_as_int="1"><span class="name"><?=__('Starred')?> <i class="fas fa-sort-amount-down"></i></span><span class="up"><i class="fas fa-sort-amount-up"></i></span></li>
817
</ul>
918
<div class="l-sort-toolbar clearfix">
1019
<table>
1120
<tr>
12-
<td>
13-
<?
14-
if($panel[$user]['CRON_REPORTS'] == 'yes') {
15-
echo '<a class="vst" href="/delete/cron/reports/?token='.$_SESSION['token'].'">'.__('turn off notifications').'</a>';
16-
} else {
17-
echo '<a class="vst" href="/add/cron/reports/?token='.$_SESSION['token'].'">'.__('turn on notifications').'</a>';
18-
}
19-
?>
21+
<td class="sort-by">
22+
<?=__('sort by');?>: <span><b><?=__('Date')?> <i class="fas fa-sort-amount-down"></i></b></span>
2023
</td>
21-
2224
<td class="l-sort-toolbar__search-box">
2325
<form action="/search/" method="get">
2426
<input type="hidden" name="token" value="<?=$_SESSION['token']?>" />
2527
<input type="text" name="q" class="search-input" value="<? echo isset($_POST['q']) ? htmlspecialchars($_POST['q']) : '' ?>" />
2628
<button type="submit" class="l-sort-toolbar__filter-apply" onclick="return doSearch('/search/')" value=""><i class="fas fa-search"></i></button>
2729
</form>
2830
</td>
29-
<td class="toggle-all">
30-
<input id="toggle-all" type="checkbox" name="toggle-all" value="toggle-all" onChange="checkedAll('objects');">
31-
<label for="toggle-all" class="check-label toggle-all"><?=__('toggle all')?></label>
32-
</td>
3331
<td class="">
3432
<form action="/bulk/cron/" method="post" id="objects">
3533
<input type="hidden" name="token" value="<?=$_SESSION['token']?>" />
@@ -38,27 +36,36 @@
3836
<option value=""><?=__('apply to selected')?></option>
3937
<? if($panel[$user]['CRON_REPORTS'] == 'yes') echo '<option value="delete-cron-reports">'.__('turn off notifications').'</option>'; ?>
4038
<? if($panel[$user]['CRON_REPORTS'] == 'no') echo '<option value="add-cron-reports">'.__('turn on notifications').'</option>'; ?>
39+
<option value="suspend"><?=__('suspend')?></option>
40+
<option value="unsuspend"><?=__('unsuspend')?></option>
4141
<option value="delete"><?=__('delete')?></option>
4242
</select>
4343
</div>
4444
<button type="submit" class="l-sort-toolbar__filter-apply" value=""><i class="fas fa-arrow-right"></i></button>
4545
</td>
46-
<td class="sort-by">
47-
<?=__('sort by');?>: <span><b><?=__('Date')?> <i class="fas fa-sort-amount-down"></i></b></span>
48-
</td>
4946
</tr>
5047
</table>
5148
</div>
5249
</div>
53-
<!-- /.l-sort -->
5450
</div>
5551

5652
<div class="l-separator"></div>
57-
<!-- /.l-separator -->
58-
59-
6053

6154
<div class="l-center units animated fadeIn">
55+
<div class="header table-header">
56+
<div class="l-unit__col l-unit__col--right step-top">
57+
<div class="clearfix l-unit__stat-col--left super-compact">
58+
<input id="toggle-all" type="checkbox" name="toggle-all" value="toggle-all" onChange="checkedAll('objects');">
59+
</div>
60+
<div class="clearfix l-unit__stat-col--left wide-5"><b><?php print __('Cron Job');?></b></div>
61+
<div class="clearfix l-unit__stat-col--left compact-2 text-right"><b>&nbsp;</b></div>
62+
<div class="clearfix l-unit__stat-col--left compact-3 text-center"><b><?=__('Min')?></b></div>
63+
<div class="clearfix l-unit__stat-col--left compact-3 text-center"><b><?=__('Hour')?></b></div>
64+
<div class="clearfix l-unit__stat-col--left compact-3 text-center"><b><?=__('Day')?></b></div>
65+
<div class="clearfix l-unit__stat-col--left compact-3 text-center"><b><?=__('Month')?></b></div>
66+
<div class="clearfix l-unit__stat-col--left compact-3 text-center"><b><?=__('Day of week')?></b></div>
67+
</div>
68+
</div>
6269
<?
6370
foreach ($data as $key => $value) {
6471
++$i;
@@ -73,88 +80,65 @@
7380
}
7481
?>
7582

76-
77-
<div class="l-unit <? if($status == 'suspended') echo 'l-unit--suspended'; if($_SESSION['favourites'][CRON][$key] == 1) echo ' l-unit--starred'; ?>" v_unit_id="<?=$key?>" v_section="cron"
78-
sort-date="<?=strtotime($data[$key]['DATE'].' '.$data[$key]['TIME'])?>" sort-name="<?=htmlspecialchars($data[$key]['CMD'], ENT_NOQUOTES)?>" sort-star="<? if($_SESSION['favourites']['CRON'][$key] == 1) echo '1'; else echo '0'; ?>">
79-
<div class="l-unit-toolbar clearfix">
80-
<div class="l-unit-toolbar__col l-unit-toolbar__col--left">
81-
<input id="check<?php echo $i ?>" class="ch-toggle" type="checkbox" name="job[]" value="<?php echo $key ?>">
82-
83-
</div>
84-
<!-- l-unit-toolbar__col -->
83+
<div class="l-unit <? if($status == 'suspended') echo 'l-unit--suspended'; if($_SESSION['favourites']['CRON'][$key] == 1) echo ' l-unit--starred'; ?>" v_unit_id="<?=$key?>" v_section="cron"
84+
sort-date="<?=strtotime($data[$key]['DATE'].' '.$data[$key]['TIME'])?>" sort-name="<?=htmlspecialchars($data[$key]['CMD'], ENT_NOQUOTES)?>"
85+
sort-star="<? if($_SESSION['favourites']['CRON'][$key] == 1) echo '1'; else echo '0'; ?>">
86+
<div class="l-unit__col l-unit__col--right">
87+
<div class="clearfix l-unit__stat-col--left super-compact">
88+
<input id="check<?php echo $i ?>" class="ch-toggle" type="checkbox" name="job[]" value="<?php echo $key ?>">
89+
</div>
90+
<div class="clearfix l-unit__stat-col--left wide-5"><b><a href="/edit/cron/?job=<?=$data[$key]['JOB']?>&token=<?=$_SESSION['token']?>"><?=htmlspecialchars($data[$key]['CMD'], ENT_NOQUOTES)?></a></b></div>
91+
<!-- START QUICK ACTION TOOLBAR AREA -->
92+
<div class="clearfix l-unit__stat-col--left compact-2 text-right">
8593
<div class="l-unit-toolbar__col l-unit-toolbar__col--right noselect">
8694
<div class="actions-panel clearfix">
87-
<div class="actions-panel__col actions-panel__edit shortcut-enter" key-action="href"><a href="/edit/cron/?job=<?=$data[$key]['JOB']?>"><?=__('edit')?> <i></i></a><span class="shortcut enter">&nbsp;&#8629;</span></div>
88-
<div class="actions-panel__col actions-panel__delete shortcut-delete" key-action="js">
89-
<a id="delete_link_<?=$i?>" class="data-controls do_delete">
90-
<?=__('delete')?> <i class="do_delete"></i>
91-
<input type="hidden" name="delete_url" value="/delete/cron/?job=<?=$data[$key]['JOB']?>&token=<?=$_SESSION['token']?>" />
92-
<div id="delete_dialog_<?=$i?>" class="confirmation-text-delete hidden" title="<?=__('Confirmation')?>">
93-
<p class="confirmation"><?=__('DELETE_CRON_CONFIRMATION',$key)?></p>
94-
</div>
95-
</a>
96-
<span class="shortcut delete">&nbsp;Del</span>
95+
<div class="actions-panel__col actions-panel__download shortcut-d" key-action="href"><a href="/edit/cron/?job=<?=$data[$key]['JOB']?>&token=<?=$_SESSION['token']?>"><i class="fas fa-pencil-alt status-icon orange status-icon dim"></i></a></div>
96+
<div class="actions-panel__col actions-panel__suspend shortcut-s" key-action="js">
97+
<a id="<?=$spnd_action ?>_link_<?=$i?>" class="data-controls do_<?=$spnd_action?>">
98+
<i class="fas fa-pause status-icon highlight status-icon dim do_<?=$spnd_action?>"></i>
99+
<input type="hidden" name="<?=$spnd_action?>_url" value="/<?=$spnd_action?>/cron/?job=<?=$data[$key]['JOB']?>&token=<?=$_SESSION['token']?>" />
100+
<div id="<?=$spnd_action?>_dialog_<?=$i?>" class="confirmation-text-suspention hidden" title="<?=__('Confirmation')?>">
101+
<p class="confirmation"><?=__($spnd_confirmation,$key)?></p>
102+
</div>
103+
</a>
104+
</div>
105+
<div class="actions-panel__col actions-panel__delete shortcut-delete" key-action="js">
106+
<a id="delete_link_<?=$i?>" class="data-controls do_delete">
107+
<i class="fas fa-trash status-icon red status-icon dim do_delete"></i>
108+
<input type="hidden" name="delete_url" value="/delete/cron/?job=<?=$data[$key]['JOB']?>&token=<?=$_SESSION['token']?>" />
109+
<div id="delete_dialog_<?=$i?>" class="confirmation-text-delete hidden" title="<?=__('Confirmation')?>">
110+
<p class="confirmation"><?=__('DELETE_CRON_CONFIRMATION',$key)?></p>
111+
</div>
112+
</a>
113+
</div>
97114
</div>
98-
115+
</div>
99116
</div>
100-
<!-- /.actiona-panel -->
101-
</div>
102-
<!-- l-unit-toolbar__col -->
103-
</div>
104-
<!-- /.l-unit-toolbar -->
105-
106-
<div class="l-unit__col l-unit__col--left clearfix">
107-
<div class="l-unit__date">
108-
<?=translate_date($data[$key]['DATE'])?>
109-
</div>
110-
<div class="l-unit__suspended"><?__('suspended')?></div>
111-
<div class="text-center">
112-
<i class="l-icon-star" title="<?=__('save to favorites')?>"></i>
113-
</div>
114-
</div>
115-
<!-- /.l-unit__col -->
116-
<div class="l-unit__col l-unit__col--right">
117-
<div class="l-unit__name separate small-2">
118-
<?=htmlspecialchars($data[$key]['CMD'], ENT_NOQUOTES)?>
119-
</div>
120-
<!-- /.l-unit__name -->
121-
<div class="l-unit__stats separate">
122-
<div class="l-unit__stat-col l-unit__stat-col--left tiny"><?=__('Min')?><br><b><?=$data[$key]['MIN']?></b></div>
123-
<div class="l-unit__stat-col l-unit__stat-col--left tiny"><?=__('Hour')?><br><b><?=$data[$key]['HOUR']?></b></div>
124-
<div class="l-unit__stat-col l-unit__stat-col--left tiny"><?=__('Day')?><br><b><?=$data[$key]['DAY']?></b></div>
125-
<div class="l-unit__stat-col l-unit__stat-col--left tiny"><?=__('Month')?><br><b><?=$data[$key]['MONTH']?></b></div>
126-
<div class="l-unit__stat-col l-unit__stat-col--left tiny"><?=__('Day of week')?><br><b><?=$data[$key]['WDAY']?></b></div>
127-
</div>
128-
129-
<div class="l-unit__stats">
117+
<!-- END QUICK ACTION TOOLBAR AREA -->
118+
<div class="clearfix l-unit__stat-col--left compact-3 text-center"><?=$data[$key]['MIN']?></div>
119+
<div class="clearfix l-unit__stat-col--left compact-3 text-center"><?=$data[$key]['HOUR']?></div>
120+
<div class="clearfix l-unit__stat-col--left compact-3 text-center"><?=$data[$key]['DAY']?></div>
121+
<div class="clearfix l-unit__stat-col--left compact-3 text-center"><?=$data[$key]['MONTH']?></div>
122+
<div class="clearfix l-unit__stat-col--left compact-3 text-center"><?=$data[$key]['WDAY']?></div>
130123
</div>
131-
<!-- /.l-unit__stats -->
132-
133124
</div>
134-
<!-- /.l-unit__col -->
135-
</div>
136-
<!-- /.l-unit -->
137-
<!--div class="l-separator"></div-->
138-
<!-- /.l-separator -->
139-
<?}?>
140-
141-
</div>
125+
<?}?>
126+
</div>
142127

143-
144-
<div id="vstobjects">
145-
<div class="l-separator"></div>
146-
<div class="l-center">
147-
<div class="l-unit-ft">
148-
<table class='data'></table>
149-
<div class="data-count l-unit__col l-unit__col--right clearfix">
128+
<div id="vstobjects">
129+
<div class="l-separator"></div>
130+
<div class="l-center">
131+
<div class="l-unit-ft">
132+
<table class='data'></table>
133+
<div class="data-count l-unit__col l-unit__col--right clearfix">
150134
<?php
151135
if ( $i == 1) {
152136
echo __('1 cron job');
153137
} else {
154138
echo __('%s cron jobs',$i);
155139
}
156140
?>
157-
</div>
158141
</div>
159142
</div>
160143
</div>
144+
</div>

0 commit comments

Comments
 (0)