Skip to content

Commit 01063d7

Browse files
author
Kristan Kenney
committed
Merge branch 'winterfell-cron' into winterfell-quickactions
2 parents 686cd89 + 4dc3876 commit 01063d7

File tree

4 files changed

+80
-80
lines changed

4 files changed

+80
-80
lines changed

‎web/css/styles.min.css‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1554,9 +1554,9 @@ div.l-content > div.l-separator:nth-of-type(4) {
15541554

15551555
.l-unit {
15561556
color: #707070;
1557-
padding: 0 0 0 24px;
1557+
padding: 0 0 0 14px;
15581558
overflow: hidden;
1559-
font-size: 0.8rem;
1559+
font-size: 0.85rem;
15601560
border-radius: 0;
15611561
}
15621562

@@ -1907,6 +1907,9 @@ div.l-content > div.l-separator:nth-of-type(4) {
19071907
.l-unit__stat-col--left.wide-5 {
19081908
width: 330px;
19091909
}
1910+
.l-unit__stat-col--left.wide-6 {
1911+
width: 370px;
1912+
}
19101913

19111914
.l-unit__stat-col--left.small-2 {
19121915
line-height: 11px;

‎web/inc/i18n/en.php‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@
5050
'Add Mail Domain' => 'Add Mail Domain',
5151
'Add Mail Account' => 'Add Mail Account',
5252
'Add Database' => 'Add Database',
53-
'Add Cron Job' => 'Add Task',
53+
'Add Cron Job' => 'Add Job',
5454
'Create Backup' => 'Create Backup',
5555
'Configure' => 'Configure',
5656
'Restore All' => 'Restore All',
@@ -107,8 +107,8 @@
107107
'reread IP' => 'Verify IP address',
108108
'enable autoupdate' => 'Automatic Updates: Off',
109109
'disable autoupdate' => 'Automatic Updates: On',
110-
'turn on notifications' => 'Enable Notifications',
111-
'turn off notifications' => 'Disable Notifications',
110+
'turn on notifications' => 'Turn on notifications',
111+
'turn off notifications' => 'Turn off notifications',
112112
'configure' => 'Configure',
113113

114114
'Adding User' => 'Add User',
@@ -124,8 +124,8 @@
124124
'Adding Mail Account' => 'Add Mail Account',
125125
'Editing Mail Account' => 'Edit Mail Account',
126126
'Adding database' => 'Add Database',
127-
'Editing Cron Job' => 'Edit Task',
128-
'Adding Cron Job' => 'Add Task',
127+
'Editing Cron Job' => 'Edit Job',
128+
'Adding Cron Job' => 'Add Job',
129129
'Editing Database' => 'Edit Database',
130130
'Adding Package' => 'Add Package',
131131
'Editing Package' => 'Edit Package',

‎web/templates/admin/list_backup.html‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,6 @@
3939
<div class="l-separator"></div>
4040
<!-- /.l-separator -->
4141

42-
4342
<div class="l-center units animated fadeIn">
4443
<div class="l-unit header table-header">
4544
<div class="l-unit__col l-unit__col--left clearfix">

‎web/templates/admin/list_cron.html‎

Lines changed: 70 additions & 72 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@
44
<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>
55
<?
66
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-slash status-icon-orange"></i> '.__('turn off notifications').'</a>';
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>';
88
} else {
9-
echo '<a class="ui-button cancel" href="/add/cron/reports/?token='.$_SESSION['token'].'"><i class="fas fa-bell status-icon-orange"></i> '.__('turn on notifications').'</a>';
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>';
1010
}
1111
?>
1212
</div>
@@ -57,9 +57,24 @@
5757
<div class="l-separator"></div>
5858
<!-- /.l-separator -->
5959

60-
61-
6260
<div class="l-center units animated fadeIn">
61+
<div class="l-unit header table-header">
62+
<div class="l-unit__col l-unit__col--left clearfix">
63+
<div class="text-center jump-small-top"></div>
64+
</div>
65+
66+
<div class="l-unit__col l-unit__col--right step-top">
67+
<div>
68+
<div class="clearfix l-unit__stat-col--left wide-6"><b><?php print __('Cron Job');?></b></div>
69+
<div class="clearfix l-unit__stat-col--left compact-2 text-right"><b>&nbsp;</b></div>
70+
<div class="clearfix l-unit__stat-col--left compact-2 text-center"><b><?=__('Min')?></b></div>
71+
<div class="clearfix l-unit__stat-col--left compact-2 text-center"><b><?=__('Hour')?></b></div>
72+
<div class="clearfix l-unit__stat-col--left compact-2 text-center"><b><?=__('Day')?></b></div>
73+
<div class="clearfix l-unit__stat-col--left compact-2 text-center"><b><?=__('Month')?></b></div>
74+
<div class="clearfix l-unit__stat-col--left compact-2 text-center"><b><?=__('Day of week')?></b></div>
75+
</div>
76+
</div>
77+
</div>
6378
<?
6479
foreach ($data as $key => $value) {
6580
++$i;
@@ -78,76 +93,59 @@
7893
sort-date="<?=strtotime($data[$key]['DATE'].' '.$data[$key]['TIME'])?>" sort-name="<?=htmlspecialchars($data[$key]['CMD'], ENT_NOQUOTES)?>"
7994
sort-star="<? if($_SESSION['favourites']['CRON'][$key] == 1) echo '1'; else echo '0'; ?>">
8095
<div class="l-unit-toolbar clearfix">
81-
<div class="l-unit-toolbar__col l-unit-toolbar__col--left">
82-
<input id="check<?php echo $i ?>" class="ch-toggle" type="checkbox" name="job[]" value="<?php echo $key ?>">
83-
84-
</div>
85-
<!-- l-unit-toolbar__col -->
86-
<div class="l-unit-toolbar__col l-unit-toolbar__col--right noselect">
87-
<div class="actions-panel clearfix">
88-
<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>
89-
<div class="actions-panel__col actions-panel__suspend shortcut-s" key-action="js">
90-
<a id="<?=$spnd_action ?>_link_<?=$i?>" class="data-controls do_<?=$spnd_action?>">
91-
<?=__($spnd_action)?> <i class="do_<?=$spnd_action?>"></i>
92-
<input type="hidden" name="<?=$spnd_action?>_url" value="/<?=$spnd_action?>/cron/?job=<?=$data[$key]['JOB']?>&token=<?=$_SESSION['token']?>" />
93-
<div id="<?=$spnd_action?>_dialog_<?=$i?>" class="confirmation-text-suspention hidden" title="<?=__('Confirmation')?>">
94-
<p class="confirmation"><?=__($spnd_confirmation,$key)?></p>
95-
</div>
96-
</a>
97-
<span class="shortcut">&nbsp;S</span>
98-
</div>
99-
<div class="actions-panel__col actions-panel__delete shortcut-delete" key-action="js">
100-
<a id="delete_link_<?=$i?>" class="data-controls do_delete">
101-
<?=__('delete')?> <i class="do_delete"></i>
102-
<input type="hidden" name="delete_url" value="/delete/cron/?job=<?=$data[$key]['JOB']?>&token=<?=$_SESSION['token']?>" />
103-
<div id="delete_dialog_<?=$i?>" class="confirmation-text-delete hidden" title="<?=__('Confirmation')?>">
104-
<p class="confirmation"><?=__('DELETE_CRON_CONFIRMATION',$key)?></p>
105-
</div>
106-
</a>
107-
<span class="shortcut delete">&nbsp;Del</span>
108-
</div>
109-
110-
111-
</div>
112-
<!-- /.actiona-panel -->
113-
</div>
114-
<!-- l-unit-toolbar__col -->
11596
</div>
11697
<!-- /.l-unit-toolbar -->
98+
<div class="l-unit__col l-unit__col--right">
99+
<div>
100+
<div class="clearfix l-unit__stat-col--left">
101+
<input id="check<?php echo $i ?>" class="ch-toggle" type="checkbox" name="job[]" value="<?php echo $key ?>">
102+
</div>
103+
<div class="clearfix l-unit__stat-col--left wide-6"><b><a href="/edit/cron/?job=<?=$data[$key]['JOB']?>"><?=htmlspecialchars($data[$key]['CMD'], ENT_NOQUOTES)?></a></b></div>
104+
<div class="clearfix l-unit__stat-col--left compact-2 text-right"><b>
105+
<!-- START QUICK ACTION TOOLBAR AREA -->
106+
107+
<!-- l-unit-toolbar__col -->
108+
<div class="l-unit-toolbar__col l-unit-toolbar__col--right noselect">
109+
<div class="actions-panel clearfix">
110+
<div class="actions-panel__col actions-panel__download shortcut-d" key-action="href"><a href="/edit/cron/?job=<?=$data[$key]['JOB']?>"><i class="fas fa-pencil-alt status-icon-orange status-icon-dim"></i></a></div>
111+
<div class="actions-panel__col actions-panel__suspend shortcut-s" key-action="js">
112+
<a id="<?=$spnd_action ?>_link_<?=$i?>" class="data-controls do_<?=$spnd_action?>">
113+
<i class="fas fa-pause status-icon-highlight status-icon-dim do_<?=$spnd_action?>"></i>
114+
<input type="hidden" name="<?=$spnd_action?>_url" value="/<?=$spnd_action?>/cron/?job=<?=$data[$key]['JOB']?>&token=<?=$_SESSION['token']?>" />
115+
<div id="<?=$spnd_action?>_dialog_<?=$i?>" class="confirmation-text-suspention hidden" title="<?=__('Confirmation')?>">
116+
<p class="confirmation"><?=__($spnd_confirmation,$key)?></p>
117+
</div>
118+
</a>
119+
</div>
120+
<div class="actions-panel__col actions-panel__delete shortcut-delete" key-action="js">
121+
<a id="delete_link_<?=$i?>" class="data-controls do_delete">
122+
<i class="fas fa-trash status-icon-red status-icon-dim do_delete"></i>
123+
<input type="hidden" name="delete_url" value="/delete/cron/?job=<?=$data[$key]['JOB']?>&token=<?=$_SESSION['token']?>" />
124+
<div id="delete_dialog_<?=$i?>" class="confirmation-text-delete hidden" title="<?=__('Confirmation')?>">
125+
<p class="confirmation"><?=__('DELETE_CRON_CONFIRMATION',$key)?></p>
126+
</div>
127+
</a>
128+
</div>
129+
130+
</div>
131+
<!-- /.actiona-panel -->
132+
</div>
133+
<!-- END QUICK ACTION TOOLBAR AREA -->
134+
</b></div>
135+
<div class="clearfix l-unit__stat-col--left compact-2 text-center"><?=$data[$key]['MIN']?></div>
136+
<div class="clearfix l-unit__stat-col--left compact-2 text-center"><?=$data[$key]['HOUR']?></div>
137+
<div class="clearfix l-unit__stat-col--left compact-2 text-center"><?=$data[$key]['DAY']?></div>
138+
<div class="clearfix l-unit__stat-col--left compact-2 text-center"><?=$data[$key]['MONTH']?></div>
139+
<div class="clearfix l-unit__stat-col--left compact-2 text-center"><?=$data[$key]['WDAY']?></div>
140+
</div>
141+
</div>
142+
<!-- /.l-unit__col -->
143+
</div>
144+
<!-- /.l-unit -->
145+
<!--div class="l-separator"></div-->
146+
<!-- /.l-separator -->
117147

118-
<div class="l-unit__col l-unit__col--left clearfix">
119-
<div class="l-unit__date">
120-
<?=translate_date($data[$key]['DATE'])?>
121-
</div>
122-
<div class="l-unit__suspended"><?=__('suspended')?></div>
123-
<div class="text-center">
124-
<i class="l-icon-star" title="<?=__('save to favorites')?>"></i>
125-
</div>
126-
</div>
127-
<!-- /.l-unit__col -->
128-
<div class="l-unit__col l-unit__col--right">
129-
<div class="l-unit__name separate small-2">
130-
<a href="/edit/cron/?job=<?=$data[$key]['JOB']?>"><?=htmlspecialchars($data[$key]['CMD'], ENT_NOQUOTES)?></a>
131-
</div>
132-
<!-- /.l-unit__name -->
133-
<div class="l-unit__stats separate">
134-
<div class="l-unit__stat-col l-unit__stat-col--left tiny"><?=__('Min')?><br><b><?=$data[$key]['MIN']?></b></div>
135-
<div class="l-unit__stat-col l-unit__stat-col--left tiny"><?=__('Hour')?><br><b><?=$data[$key]['HOUR']?></b></div>
136-
<div class="l-unit__stat-col l-unit__stat-col--left tiny"><?=__('Day')?><br><b><?=$data[$key]['DAY']?></b></div>
137-
<div class="l-unit__stat-col l-unit__stat-col--left tiny"><?=__('Month')?><br><b><?=$data[$key]['MONTH']?></b></div>
138-
<div class="l-unit__stat-col l-unit__stat-col--left tiny"><?=__('Day of week')?><br><b><?=$data[$key]['WDAY']?></b></div>
139-
</div>
140-
141-
<div class="l-unit__stats">
142-
</div>
143-
<!-- /.l-unit__stats -->
144148

145-
</div>
146-
<!-- /.l-unit__col -->
147-
</div>
148-
<!-- /.l-unit -->
149-
<!--div class="l-separator"></div-->
150-
<!-- /.l-separator -->
151149
<?}?>
152150

153151
</div>
@@ -162,9 +160,9 @@
162160
<div class="data-count l-unit__col l-unit__col--right clearfix">
163161
<?php
164162
if ( $i == 1) {
165-
echo __('1 task');
163+
echo __('1 cron job');
166164
} else {
167-
echo __('%s tasks',$i);
165+
echo __('%s cron jobs',$i);
168166
}
169167
?>
170168
</div>

0 commit comments

Comments
 (0)