Skip to content

Commit 0419871

Browse files
author
Kristan Kenney
committed
Merge branch 'feature/user-roles' into feature/user-auth-log
2 parents 9ed879d + 2210734 commit 0419871

File tree

9 files changed

+392
-292
lines changed

9 files changed

+392
-292
lines changed

‎web/templates/admin/list_backup.html‎

Lines changed: 28 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
<div class="l-center">
22
<div class="l-sort clearfix noselect">
33
<div class="l-unit-toolbar__buttonstrip">
4-
<a href="/schedule/backup/?token=<?=$_SESSION['token']?>" class="ui-button cancel" dir="ltr"><i class="fas fa-plus-circle status-icon green"></i><?=_('Create Backup')?></a>
54
<? if (($_SESSION['userContext'] === 'admin') && ($_SESSION['look'] === 'admin')) {?>
6-
<!-- Restrict ability to edit backup exclusions when impersonating 'admin' account -->
5+
<!-- Hide item creation button when impersonating 'admin' account -->
76
<? } else { ?>
7+
<a href="/schedule/backup/?token=<?=$_SESSION['token']?>" class="ui-button cancel" dir="ltr"><i class="fas fa-plus-circle status-icon green"></i><?=_('Create Backup')?></a>
88
<a href="/list/backup/exclusions/" class="ui-button cancel" dir="ltr"><i class="fas fa-folder-minus status-icon orange"></i><?=_('backup exclusions')?></a>
99
<? } ?>
1010
</div>
@@ -18,17 +18,21 @@
1818
<button type="submit" class="l-sort-toolbar__filter-apply" onclick="return doSearch('/search/')" value=""><i class="fas fa-search"></i></button>
1919
</form>
2020
</td>
21-
<td>
22-
<form action="/bulk/backup/" method="post" id="objects">
23-
<input type="hidden" name="token" value="<?=$_SESSION['token']?>" />
24-
<div class="l-select">
25-
<select name="action" id="">
26-
<option value=""><?=_('apply to selected')?></option>
27-
<option value="delete"><?php print _('delete') ?></option>
28-
</select>
29-
</div>
30-
<button type="submit" class="l-sort-toolbar__filter-apply" value=""><i class="fas fa-arrow-right"></i></button>
31-
</td>
21+
<? if (($_SESSION['userContext'] === 'admin') && ($_SESSION['look'] === 'admin')) {?>
22+
<!-- Hide bulk actions for domain items when impersonating 'admin' account-->
23+
<? } else { ?>
24+
<td>
25+
<form action="/bulk/backup/" method="post" id="objects">
26+
<input type="hidden" name="token" value="<?=$_SESSION['token']?>" />
27+
<div class="l-select">
28+
<select name="action" id="">
29+
<option value=""><?=_('apply to selected')?></option>
30+
<option value="delete"><?php print _('delete') ?></option>
31+
</select>
32+
</div>
33+
<button type="submit" class="l-sort-toolbar__filter-apply" value=""><i class="fas fa-arrow-right"></i></button>
34+
</td>
35+
<? } ?>
3236
</tr>
3337
</table>
3438
</div>
@@ -78,16 +82,23 @@
7882
<div class="clearfix l-unit__stat-col--left super-compact">
7983
<input id="check<?php echo $i ?>" class="ch-toggle" type="checkbox" name="backup[]" value="<?php echo $key ?>">
8084
</div>
81-
<div class="clearfix l-unit__stat-col--left wide-3 truncate"><b><a href="/list/backup/?backup=<?=$key?>&token=<?=$_SESSION['token']?>" title="<?=_('restore')?>"><?=$key?></a></b></div>
85+
<div class="clearfix l-unit__stat-col--left wide-3 truncate">
86+
<? if (($_SESSION['userContext'] === 'admin') && ($_SESSION['look'] === 'admin')) {?>
87+
<b><?=$key?></b>
88+
<? } else { ?>
89+
<b><a href="/list/backup/?backup=<?=$key?>&token=<?=$_SESSION['token']?>" title="<?=_('restore')?>"><?=$key?></a></b>
90+
<? } ?>
91+
</div>
8292
<!-- START QUICK ACTION TOOLBAR AREA -->
8393
<div class="clearfix l-unit__stat-col--left compact-4 text-right">
8494
<div class="l-unit-toolbar__col l-unit-toolbar__col--right noselect">
8595
<div class="actions-panel clearfix">
86-
<div class="actions-panel__col actions-panel__download shortcut-d" key-action="href"><a href="/download/backup/?backup=<?=$key?>&token=<?=$_SESSION['token']?>" title="<?=_('download')?>"><i class="fas fa-file-download status-icon lightblue status-icon dim"></i></a></div>
87-
<div class="actions-panel__col actions-panel__list shortcut-enter" key-action="href"><a href="/list/backup/?backup=<?=$key?>&token=<?=$_SESSION['token']?>" title="<?=_('restore')?>"><i class="fas fa-undo status-icon green status-icon dim"></i></a></div>
8896
<? if (($_SESSION['userContext'] === 'admin') && ($_SESSION['look'] === 'admin')) {?>
89-
<!-- Restrict ability to delete backups when impersonating 'admin' account -->
97+
<!-- Restrict ability to restore or delete backups when impersonating 'admin' account -->
98+
&nbsp;
9099
<? } else { ?>
100+
<div class="actions-panel__col actions-panel__download shortcut-d" key-action="href"><a href="/download/backup/?backup=<?=$key?>&token=<?=$_SESSION['token']?>" title="<?=_('download')?>"><i class="fas fa-file-download status-icon lightblue status-icon dim"></i></a></div>
101+
<div class="actions-panel__col actions-panel__list shortcut-enter" key-action="href"><a href="/list/backup/?backup=<?=$key?>&token=<?=$_SESSION['token']?>" title="<?=_('restore')?>"><i class="fas fa-undo status-icon green status-icon dim"></i></a></div>
91102
<div class="actions-panel__col actions-panel__delete shortcut-delete" key-action="js">
92103
<a id="delete_link_<?=$i?>" class="data-controls do_delete" title="<?=_('delete')?>">
93104
<i class="fas fa-trash status-icon red status-icon dim do_delete"></i>

‎web/templates/admin/list_cron.html‎

Lines changed: 21 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<div class="l-sort clearfix noselect">
33
<div class="l-unit-toolbar__buttonstrip">
44
<? if (($_SESSION['userContext'] === 'admin') && ($_SESSION['look'] === 'admin')) {?>
5-
<!-- Restrict ability to add cron jobs or disable/enable cron job notifications when impersonating 'admin' account -->
5+
<!-- Hide item creation button when impersonating 'admin' account -->
66
<? } else { ?>
77
<a href="/add/cron/" id="btn-create" class="ui-button cancel" dir="ltr"><i class="fas fa-plus-circle status-icon green"></i><?=_('Add Cron Job')?></a>
88
<? if($panel[$user]['CRON_REPORTS'] == 'yes') { ?>
@@ -29,21 +29,25 @@
2929
<button type="submit" class="l-sort-toolbar__filter-apply" onclick="return doSearch('/search/')" value=""><i class="fas fa-search"></i></button>
3030
</form>
3131
</td>
32-
<td class="">
33-
<form action="/bulk/cron/" method="post" id="objects">
34-
<input type="hidden" name="token" value="<?=$_SESSION['token']?>" />
35-
<div class="l-select">
36-
<select name="action" id="">
37-
<option value=""><?=_('apply to selected')?></option>
38-
<? if($panel[$user]['CRON_REPORTS'] == 'yes') echo '<option value="delete-cron-reports">'._('turn off notifications').'</option>'; ?>
39-
<? if($panel[$user]['CRON_REPORTS'] == 'no') echo '<option value="add-cron-reports">'._('turn on notifications').'</option>'; ?>
40-
<option value="suspend"><?=_('suspend')?></option>
41-
<option value="unsuspend"><?=_('unsuspend')?></option>
42-
<option value="delete"><?=_('delete')?></option>
43-
</select>
44-
</div>
45-
<button type="submit" class="l-sort-toolbar__filter-apply" value=""><i class="fas fa-arrow-right"></i></button>
46-
</td>
32+
<? if (($_SESSION['userContext'] === 'admin') && ($_SESSION['look'] === 'admin')) {?>
33+
<!-- Hide bulk actions for domain items when impersonating 'admin' account-->
34+
<? } else { ?>
35+
<td class="">
36+
<form action="/bulk/cron/" method="post" id="objects">
37+
<input type="hidden" name="token" value="<?=$_SESSION['token']?>" />
38+
<div class="l-select">
39+
<select name="action" id="">
40+
<option value=""><?=_('apply to selected')?></option>
41+
<? if($panel[$user]['CRON_REPORTS'] == 'yes') echo '<option value="delete-cron-reports">'._('turn off notifications').'</option>'; ?>
42+
<? if($panel[$user]['CRON_REPORTS'] == 'no') echo '<option value="add-cron-reports">'._('turn on notifications').'</option>'; ?>
43+
<option value="suspend"><?=_('suspend')?></option>
44+
<option value="unsuspend"><?=_('unsuspend')?></option>
45+
<option value="delete"><?=_('delete')?></option>
46+
</select>
47+
</div>
48+
<button type="submit" class="l-sort-toolbar__filter-apply" value=""><i class="fas fa-arrow-right"></i></button>
49+
</td>
50+
<? } ?>
4751
</tr>
4852
</table>
4953
</div>
@@ -103,6 +107,7 @@
103107
<div class="actions-panel clearfix">
104108
<? if (($_SESSION['userContext'] === 'admin') && (isset($_SESSION['look'])) && ($_SESSION['look'] === 'admin')) {?>
105109
<!-- Restrict other administrators from editing, deleting, or suspending 'admin' user cron jobs -->
110+
&nbsp;
106111
<? } else { ?>
107112
<div class="actions-panel__col actions-panel__download shortcut-enter" key-action="href"><a href="/edit/cron/?job=<?=$data[$key]['JOB']?>&token=<?=$_SESSION['token']?>" title="<?=_('Editing Cron Job')?>"><i class="fas fa-pencil-alt status-icon orange status-icon dim"></i></a></div>
108113
<div class="actions-panel__col actions-panel__suspend shortcut-s" key-action="js">

0 commit comments

Comments
 (0)