Skip to content

Commit e9c9e5f

Browse files
committed
Fixed pause and play icons when suspend or active actions
1 parent 9c9524c commit e9c9e5f

16 files changed

+79
-49
lines changed

web/templates/admin/list_cron.html

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,10 +71,12 @@
7171
if ($data[$key]['SUSPENDED'] == 'yes') {
7272
$status = 'suspended';
7373
$spnd_action = 'unsuspend';
74+
$spnd_icon = 'fa-play';
7475
$spnd_confirmation = 'UNSUSPEND_CRON_CONFIRMATION' ;
7576
} else {
7677
$status = 'active';
7778
$spnd_action = 'suspend';
79+
$spnd_icon = 'fa-pause';
7880
$spnd_confirmation = 'SUSPEND_CRON_CONFIRMATION' ;
7981
}
8082
?>
@@ -94,7 +96,7 @@
9496
<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>
9597
<div class="actions-panel__col actions-panel__suspend shortcut-s" key-action="js">
9698
<a id="<?=$spnd_action ?>_link_<?=$i?>" class="data-controls do_<?=$spnd_action?>" title="<?=__($spnd_action)?>">
97-
<i class="fas fa-pause status-icon highlight status-icon dim do_<?=$spnd_action?>"></i>
99+
<i class="fas <?=$spnd_icon?> status-icon highlight status-icon dim do_<?=$spnd_action?>"></i>
98100
<input type="hidden" name="<?=$spnd_action?>_url" value="/<?=$spnd_action?>/cron/?job=<?=$data[$key]['JOB']?>&token=<?=$_SESSION['token']?>" />
99101
<div id="<?=$spnd_action?>_dialog_<?=$i?>" class="confirmation-text-suspention hidden" title="<?=__('Confirmation')?>">
100102
<p class="confirmation"><?=__($spnd_confirmation,$key)?></p>

web/templates/admin/list_db.html

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -96,11 +96,13 @@
9696
++$i;
9797
if ($data[$key]['SUSPENDED'] == 'yes') {
9898
$status = 'suspended';
99-
$spnd_action = 'unsuspend' ;
99+
$spnd_action = 'unsuspend';
100+
$spnd_icon = 'fa-play';
100101
$spnd_confirmation = 'UNSUSPEND_DATABASE_CONFIRMATION' ;
101102
} else {
102103
$status = 'active';
103-
$spnd_action = 'suspend' ;
104+
$spnd_action = 'suspend';
105+
$spnd_icon = 'fa-pause';
104106
$spnd_confirmation = 'SUSPEND_DATABASE_CONFIRMATION' ;
105107
}
106108
if ($data[$key]['HOST'] != 'localhost' ) $http_host = $data[$key]['HOST'];
@@ -129,7 +131,7 @@
129131
<div class="actions-panel__col actions-panel__logs shortcut-enter" key-action="href"><a href="/edit/db/?database=<?=$key?>&token=<?=$_SESSION['token']?>" title="<?=__('Editing Database')?>"><i class="fas fa-pencil-alt status-icon orange status-icon dim"></i></a></div>
130132
<div class="actions-panel__col actions-panel__suspend shortcut-s" key-action="js">
131133
<a id="<?=$spnd_action ?>_link_<?=$i?>" class="data-controls do_<?=$spnd_action?>" title="<?=__($spnd_action)?>">
132-
<i class="fas fa-pause status-icon highlight status-icon dim do_<?=$spnd_action?>"></i>
134+
<i class="fas <?=$spnd_icon?> status-icon highlight status-icon dim do_<?=$spnd_action?>"></i>
133135
<input type="hidden" name="<?=$spnd_action?>_url" value="/<?=$spnd_action?>/db/?database=<?=$key?>&token=<?=$_SESSION['token']?>" />
134136
<div id="<?=$spnd_action?>_dialog_<?=$i?>" class="confirmation-text-suspention hidden" title="<?=__('Confirmation')?>">
135137
<p class="confirmation"><?=__($spnd_confirmation,$key)?></p>

web/templates/admin/list_dns.html

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -66,12 +66,14 @@
6666
++$i;
6767
if ($data[$key]['SUSPENDED'] == 'yes') {
6868
$status = 'suspended';
69-
$spnd_action = 'unsuspend' ;
70-
$spnd_confirmation = 'UNSUSPEND_DOMAIN_CONFIRMATION' ;
69+
$spnd_action = 'unsuspend';
70+
$spnd_icon = 'fa-play';
71+
$spnd_confirmation = 'UNSUSPEND_DOMAIN_CONFIRMATION';
7172
} else {
7273
$status = 'active';
73-
$spnd_action = 'suspend' ;
74-
$spnd_confirmation = 'SUSPEND_DOMAIN_CONFIRMATION' ;
74+
$spnd_action = 'suspend';
75+
$spnd_icon = 'fa-pause';
76+
$spnd_confirmation = 'SUSPEND_DOMAIN_CONFIRMATION';
7577
}
7678
?>
7779

@@ -94,7 +96,7 @@
9496

9597
<div class="actions-panel__col actions-panel__suspend shortcut-s" key-action="js">
9698
<a id="<?=$spnd_action ?>_link_<?=$i?>" class="data-controls do_<?=$spnd_action?>" title="<?=__($spnd_action)?>">
97-
<i class="fas fa-pause status-icon highlight status-icon dim do_<?=$spnd_action?>"></i>
99+
<i class="fas <?=$spnd_icon?> status-icon highlight status-icon dim do_<?=$spnd_action?>"></i>
98100
<input type="hidden" name="<?=$spnd_action?>_url" value="/<?=$spnd_action?>/dns/?domain=<?=$key?>&token=<?=$_SESSION['token']?>" />
99101
<div id="<?=$spnd_action?>_dialog_<?=$i?>" class="confirmation-text-suspention hidden" title="<?=__('Confirmation')?>">
100102
<p class="confirmation"><?=__($spnd_confirmation,$key)?></p>

web/templates/admin/list_firewall.html

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -61,11 +61,13 @@
6161
++$i;
6262
if ($data[$key]['SUSPENDED'] == 'yes') {
6363
$status = 'suspended';
64-
$spnd_action = 'unsuspend' ;
64+
$spnd_action = 'unsuspend';
65+
$spnd_icon = 'fa-play';
6566
$spnd_confirmation = 'UNSUSPEND_RULE_CONFIRMATION' ;
6667
} else {
6768
$status = 'active';
68-
$spnd_action = 'suspend' ;
69+
$spnd_action = 'suspend';
70+
$spnd_icon = 'fa-pause';
6971
$spnd_confirmation = 'SUSPEND_RULE_CONFIRMATION' ;
7072
}
7173
?>
@@ -102,7 +104,7 @@
102104

103105
<div class="actions-panel__col actions-panel__suspend shortcut-s" key-action="js">
104106
<a id="<?=$spnd_action ?>_link_<?=$i?>" class="data-controls do_<?=$spnd_action?>" title="<?=__($spnd_action)?>">
105-
<i class="fas fa-pause status-icon highlight status-icon dim do_<?=$spnd_action?>"></i>
107+
<i class="fas <?=$spnd_icon?> status-icon highlight status-icon dim do_<?=$spnd_action?>"></i>
106108
<input type="hidden" name="<?=$spnd_action?>_url" value="/<?=$spnd_action?>/firewall/?rule=<?=$key?>&token=<?=$_SESSION['token']?>" />
107109
<div id="<?=$spnd_action?>_dialog_<?=$i?>" class="confirmation-text-suspention hidden" title="<?=__('Confirmation')?>">
108110
<p class="confirmation"><?=__($spnd_confirmation,$key)?></p>

web/templates/admin/list_mail.html

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -71,12 +71,14 @@
7171
++$i;
7272
if ($data[$key]['SUSPENDED'] == 'yes') {
7373
$status = 'suspended';
74-
$spnd_action = 'unsuspend' ;
75-
$spnd_confirmation = 'SUSPEND_DOMAIN_CONFIRMATION' ;
74+
$spnd_action = 'unsuspend';
75+
$spnd_icon = 'fa-play';
76+
$spnd_confirmation = 'SUSPEND_DOMAIN_CONFIRMATION';
7677
} else {
7778
$status = 'active';
78-
$spnd_action = 'suspend' ;
79-
$spnd_confirmation = 'SUSPEND_DOMAIN_CONFIRMATION' ;
79+
$spnd_action = 'suspend';
80+
$spnd_icon = 'fa-pause';
81+
$spnd_confirmation = 'SUSPEND_DOMAIN_CONFIRMATION';
8082
}
8183
if (empty($data[$key]['CATCHALL'])) {
8284
$data[$key]['CATCHALL'] = '/dev/null';
@@ -104,7 +106,7 @@
104106

105107
<div class="actions-panel__col actions-panel__suspend shortcut-s" key-action="js">
106108
<a id="<?=$spnd_action ?>_link_<?=$i?>" class="data-controls do_<?=$spnd_action?>" title="<?=__($spnd_action)?>">
107-
<i class="fas fa-pause status-icon highlight status-icon dim do_<?=$spnd_action?>"></i>
109+
<i class="fas <?=$spnd_icon?> status-icon highlight status-icon dim do_<?=$spnd_action?>"></i>
108110
<input type="hidden" name="<?=$spnd_action?>_url" value="/<?=$spnd_action?>/mail/?domain=<?=$key?>&token=<?=$_SESSION['token']?>" />
109111
<div id="<?=$spnd_action?>_dialog_<?=$i?>" class="confirmation-text-suspention hidden" title="<?=__('Confirmation')?>">
110112
<p class="confirmation"><?=__($spnd_confirmation,$key)?></p>

web/templates/admin/list_mail_acc.html

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -67,12 +67,14 @@
6767
++$i;
6868
if ($data[$key]['SUSPENDED'] == 'yes') {
6969
$status = 'suspended';
70-
$spnd_action = 'unsuspend' ;
71-
$spnd_confirmation = 'UNSUSPEND_MAIL_ACCOUNT_CONFIRMATION' ;
70+
$spnd_action = 'unsuspend';
71+
$spnd_icon = 'fa-play';
72+
$spnd_confirmation = 'UNSUSPEND_MAIL_ACCOUNT_CONFIRMATION';
7273
} else {
7374
$status = 'active';
7475
$spnd_action = 'suspend';
75-
$spnd_confirmation = 'SUSPEND_MAIL_ACCOUNT_CONFIRMATION' ;
76+
$spnd_icon = 'fa-pause';
77+
$spnd_confirmation = 'SUSPEND_MAIL_ACCOUNT_CONFIRMATION';
7678
}
7779
?>
7880

@@ -96,7 +98,7 @@
9698

9799
<div class="actions-panel__col actions-panel__suspend shortcut-s" key-action="js">
98100
<a id="<?=$spnd_action ?>_link_<?=$i?>" class="data-controls do_<?=$spnd_action?>" title="<?=__($spnd_action)?>">
99-
<i class="fas fa-pause status-icon highlight status-icon dim do_<?=$spnd_action?>"></i>
101+
<i class="fas <?=$spnd_icon?> status-icon highlight status-icon dim do_<?=$spnd_action?>"></i>
100102
<input type="hidden" name="<?=$spnd_action?>_url" value="/<?=$spnd_action?>/mail/?domain=<?=htmlspecialchars($_GET['domain'])?>&account=<?php echo $key ?>&token=<?=$_SESSION['token']?>" />
101103
<div id="<?=$spnd_action?>_dialog_<?=$i?>" class="confirmation-text-suspention hidden" title="<?=__('Confirmation')?>">
102104
<p class="confirmation"><?=__($spnd_confirmation,$key)?></p>

web/templates/admin/list_services.html

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -108,9 +108,11 @@
108108
if ($data[$key]['STATE'] == 'running') {
109109
$status = 'active';
110110
$action = 'stop';
111+
$spnd_icon = 'fa-pause';
111112
} else {
112113
$status = 'suspended';
113114
$action = 'start';
115+
$spnd_icon = 'fa-play';
114116
}
115117

116118
$cpu = $data[$key]['CPU'] / 10;
@@ -140,7 +142,7 @@
140142
</div>
141143
<div class="actions-panel__col actions-panel__delete shortcut-delete" key-action="js">
142144
<a id="delete_link_<?=$i?>" class="data-controls do_servicestop" title="<?=__($action)?>">
143-
<i class="do_servicestop fas fa-pause status-icon red status-icon dim icon-large"></i>
145+
<i class="do_servicestop fas <?=$spnd_icon?> status-icon red status-icon dim icon-large"></i>
144146
<input type="hidden" name="servicestop_url" value="/<?php echo $action ?>/service/?srv=<?=$key?>&token=<?=$_SESSION['token']?>" />
145147
<div id="delete_dialog_<?=$i?>" class="confirmation-text-servicestop hidden" title="<?=__('Confirmation')?>">
146148
<p class="confirmation"><?=__('Are you sure you want to stop service',$key)?></p>

web/templates/admin/list_user.html

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -83,12 +83,14 @@
8383
++$i;
8484
if ($data[$key]['SUSPENDED'] == 'yes') {
8585
$status = 'suspended';
86-
$spnd_action = 'unsuspend' ;
87-
$spnd_confirmation = 'UNSUSPEND_USER_CONFIRMATION' ;
86+
$spnd_action = 'unsuspend';
87+
$spnd_icon = 'fa-play';
88+
$spnd_confirmation = 'UNSUSPEND_USER_CONFIRMATION';
8889
} else {
8990
$status = 'active';
90-
$spnd_action = 'suspend' ;
91-
$spnd_confirmation = 'SUSPEND_USER_CONFIRMATION' ;
91+
$spnd_action = 'suspend';
92+
$spnd_icon = 'fa-pause';
93+
$spnd_confirmation = 'SUSPEND_USER_CONFIRMATION';
9294
}
9395
?>
9496

@@ -118,7 +120,7 @@
118120
<div class="actions-panel__col actions-panel__edit shortcut-enter" key-action="href"><a href="/edit/user/?user=<?=$key?>&token=<?=$_SESSION['token']?>" title="<?=__('Editing User')?>"><i class="fas fa-pencil-alt status-icon orange status-icon dim"></i></a></div>
119121
<div class="actions-panel__col actions-panel__suspend shortcut-s" key-action="js">
120122
<a id="<?=$spnd_action ?>_link_<?=$i?>" class="data-controls do_<?=$spnd_action?>" title="<?=__($spnd_action)?>">
121-
<i class="fas fa-pause status-icon highlight status-icon dim do_<?=$spnd_action?>"></i>
123+
<i class="fas <?=$spnd_icon?> status-icon highlight status-icon dim do_<?=$spnd_action?>"></i>
122124
<input type="hidden" name="<?=$spnd_action?>_url" value="/<?=$spnd_action?>/user/?user=<?=$key?>&token=<?=$_SESSION['token']?>" />
123125
<div id="<?=$spnd_action?>_dialog_<?=$i?>" class="confirmation-text-suspention hidden" title="<?=__('Confirmation')?>">
124126
<p class="confirmation"><?=__($spnd_confirmation,$key)?></p>

web/templates/admin/list_web.html

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -65,12 +65,14 @@
6565
++$i;
6666
if ($data[$key]['SUSPENDED'] == 'yes') {
6767
$status = 'suspended';
68-
$spnd_action = 'unsuspend' ;
69-
$spnd_confirmation = 'UNSUSPEND_DOMAIN_CONFIRMATION' ;
68+
$spnd_action = 'unsuspend';
69+
$spnd_icon = 'fa-play';
70+
$spnd_confirmation = 'UNSUSPEND_DOMAIN_CONFIRMATION';
7071
} else {
7172
$status = 'active';
72-
$spnd_action = 'suspend' ;
73-
$spnd_confirmation = 'SUSPEND_DOMAIN_CONFIRMATION' ;
73+
$spnd_action = 'suspend';
74+
$spnd_icon = 'fa-pause';
75+
$spnd_confirmation = 'SUSPEND_DOMAIN_CONFIRMATION';
7476
}
7577
if (!empty($data[$key]['SSL_HOME'])) {
7678
if ($data[$key]['SSL_HOME'] == 'same') {
@@ -142,7 +144,7 @@
142144
<? } ?>
143145
<div class="actions-panel__col actions-panel__suspend shortcut-s" key-action="js">
144146
<a id="<?=$spnd_action ?>_link_<?=$i?>" class="data-controls do_<?=$spnd_action?>" title="<?=__($spnd_action)?>">
145-
<i class="fas fa-pause status-icon highlight status-icon dim do_<?=$spnd_action?>"></i>
147+
<i class="fas <?=$spnd_icon?> status-icon highlight status-icon dim do_<?=$spnd_action?>"></i>
146148
<input type="hidden" name="<?=$spnd_action?>_url" value="/<?=$spnd_action?>/web/?domain=<?=$key?>&token=<?=$_SESSION['token']?>" />
147149
<div id="<?=$spnd_action?>_dialog_<?=$i?>" class="confirmation-text-suspention hidden" title="<?=__('Confirmation')?>">
148150
<p class="confirmation"><?=__($spnd_confirmation,$key)?></p>

web/templates/user/list_cron.html

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,10 +71,12 @@
7171
if ($data[$key]['SUSPENDED'] == 'yes') {
7272
$status = 'suspended';
7373
$spnd_action = 'unsuspend';
74+
$spnd_icon = 'fa-play';
7475
$spnd_confirmation = 'UNSUSPEND_CRON_CONFIRMATION' ;
7576
} else {
7677
$status = 'active';
7778
$spnd_action = 'suspend';
79+
$spnd_icon = 'fa-pause';
7880
$spnd_confirmation = 'SUSPEND_CRON_CONFIRMATION' ;
7981
}
8082
?>
@@ -94,7 +96,7 @@
9496
<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>
9597
<div class="actions-panel__col actions-panel__suspend shortcut-s" key-action="js">
9698
<a id="<?=$spnd_action ?>_link_<?=$i?>" class="data-controls do_<?=$spnd_action?>" title="<?=__($spnd_action)?>">
97-
<i class="fas fa-pause status-icon highlight status-icon dim do_<?=$spnd_action?>"></i>
99+
<i class="fas <?=$spnd_icon?> status-icon highlight status-icon dim do_<?=$spnd_action?>"></i>
98100
<input type="hidden" name="<?=$spnd_action?>_url" value="/<?=$spnd_action?>/cron/?job=<?=$data[$key]['JOB']?>&token=<?=$_SESSION['token']?>" />
99101
<div id="<?=$spnd_action?>_dialog_<?=$i?>" class="confirmation-text-suspention hidden" title="<?=__('Confirmation')?>">
100102
<p class="confirmation"><?=__($spnd_confirmation,$key)?></p>

0 commit comments

Comments
 (0)