Skip to content

Commit 90280ff

Browse files
author
Kristan Kenney
authored
Merge pull request hestiacp#349 from Lupul/Cleanup-0618
2 parents 4f1e24c + 0b0f375 commit 90280ff

25 files changed

+44
-3566
lines changed

‎web/filemanager/index.php‎

Lines changed: 0 additions & 3524 deletions
This file was deleted.

‎web/js/init.js‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -208,8 +208,9 @@ $(document).ready(function(){
208208
if (evt.charCode == 97 && tag != 'input' && tag != 'textarea' && tag != 'selectbox') {
209209
evt.preventDefault();
210210
if (!evt.ctrlKey && !evt.shiftKey) {
211-
if ($('.l-sort__create-btn')[0]) {
212-
location.href=$('.l-sort__create-btn').attr('href');
211+
//if ($('.l-sort__create-btn')[0]) {
212+
if ($('.ui-button#btn-create').length) {
213+
location.href=$('.ui-button#btn-create').attr('href');
213214
}
214215
}
215216
else {

‎web/templates/admin/list_cron.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="/add/cron/" class="ui-button cancel" title="<?=__('Add Cron Job')?>"><i class="fas fa-plus-circle status-icon green"></i> <?=__('Add Cron Job')?></a>
4+
<a href="/add/cron/" id="btn-create" 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') {
77
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>';

‎web/templates/admin/list_db.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="/add/db/" class="ui-button cancel" title="<?=__('Add Database')?>"><i class="fas fa-plus-circle status-icon green"></i> <?=__('Add Database')?></a>
4+
<a href="/add/db/" id="btn-create" class="ui-button cancel" title="<?=__('Add Database')?>"><i class="fas fa-plus-circle status-icon green"></i> <?=__('Add Database')?></a>
55
<?
66
$mysql = 0;
77
$pgsql = 0;

‎web/templates/admin/list_dns.html‎

Lines changed: 2 additions & 2 deletions
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="/add/dns/" class="ui-button cancel" title="<?=__('Add DNS Domain')?>"><i class="fas fa-plus-circle status-icon green"></i> <?=__('Add DNS Domain')?></a>
4+
<a href="/add/dns/" id="btn-create" class="ui-button cancel" title="<?=__('Add DNS Domain')?>"><i class="fas fa-plus-circle status-icon green"></i> <?=__('Add DNS Domain')?></a>
55
</div>
66
<ul class="context-menu sort-order animated fadeIn" style="display:none;">
77
<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>
@@ -89,7 +89,7 @@
8989
<div class="actions-panel clearfix">
9090

9191
<div class="actions-panel__col actions-panel__logs shortcut-n" key-action="href"><a href="/add/dns/?domain=<?=$key?>&token=<?=$_SESSION['token']?>" title="<?=__('Add DNS Record')?>"><i class="fas fa-plus-circle status-icon green status-icon dim"></i></a></div>
92-
<div class="actions-panel__col actions-panel__edit shortcut-l" key-action="href"><a href="/list/dns/?domain=<?=$key?>&token=<?=$_SESSION['token']?>" title="<?=__('DNS records')?>"><i class="fas fa-list status-icon lightblue status-icon dim"></i></div>
92+
<div class="actions-panel__col actions-panel__edit shortcut-l" key-action="href"><a href="/list/dns/?domain=<?=$key?>&token=<?=$_SESSION['token']?>" title="<?=__('DNS records')?>"><i class="fas fa-list status-icon lightblue status-icon dim"></i></a></div>
9393
<div class="actions-panel__col actions-panel__logs shortcut-enter" key-action="href"><a href="/edit/dns/?domain=<?=$key?>&token=<?=$_SESSION['token']?>" title="<?=__('Editing DNS Domain')?>"><i class="fas fa-pencil-alt status-icon orange status-icon dim"></i></a></div>
9494

9595
<div class="actions-panel__col actions-panel__suspend shortcut-s" key-action="js">

‎web/templates/admin/list_dns_rec.html‎

Lines changed: 1 addition & 1 deletion
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
<a class="ui-button cancel" id="btn-back" href="/list/dns/"><i class="fas fa-arrow-left status-icon blue"></i> <?=__('Back')?></a>
5-
<a href="/add/dns/?domain=<?=htmlentities($_GET['domain'])?>" class="ui-button cancel" title="<?=__('Add DNS Record')?>"><i class="fas fa-plus-circle status-icon green"></i> <?=__('Add Record')?></a>
5+
<a href="/add/dns/?domain=<?=htmlentities($_GET['domain'])?>" id="btn-create" class="ui-button cancel" title="<?=__('Add DNS Record')?>"><i class="fas fa-plus-circle status-icon green"></i> <?=__('Add Record')?></a>
66
</div>
77
<div class="l-sort-toolbar clearfix">
88
<table>

‎web/templates/admin/list_firewall.html‎

Lines changed: 1 addition & 1 deletion
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
<a class="ui-button cancel" id="btn-back" href="/list/server/"><i class="fas fa-arrow-left status-icon blue"></i> <?=__('Back')?></a>
5-
<a href="/add/firewall/" class="ui-button cancel" title="<?=__('Add Rule')?>"><i class="fas fa-plus-circle status-icon green"></i> <?=__('Add Rule')?></a>
5+
<a href="/add/firewall/" id="btn-create" class="ui-button cancel" title="<?=__('Add Rule')?>"><i class="fas fa-plus-circle status-icon green"></i> <?=__('Add Rule')?></a>
66
<? if(!empty($_SESSION['FIREWALL_EXTENSION'])) {
77
echo '<a class="ui-button cancel" href="/list/firewall/banlist/"><i class="fas fa-eye status-icon red"></i> '.__('list fail2ban').'</a>';
88
} ?>

‎web/templates/admin/list_firewall_banlist.html‎

Lines changed: 1 addition & 1 deletion
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
<a class="ui-button cancel" id="btn-back" href="/list/firewall/"><i class="fas fa-arrow-left status-icon blue"></i> <?=__('Back')?></a>
5-
<a href="/add/firewall/banlist/" class="ui-button cancel" title="<?=__('Ban IP Address')?>"><i class="fas fa-plus-circle status-icon green"></i> <?=__('Ban IP Address')?></a>
5+
<a href="/add/firewall/banlist/" id="btn-create" class="ui-button cancel" title="<?=__('Ban IP Address')?>"><i class="fas fa-plus-circle status-icon green"></i> <?=__('Ban IP Address')?></a>
66
</div>
77
<div class="l-sort-toolbar clearfix">
88
<table>

‎web/templates/admin/list_ip.html‎

Lines changed: 1 addition & 1 deletion
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
<a class="ui-button cancel" id="btn-back" href="/list/server/"><i class="fas fa-arrow-left status-icon blue"></i> <?=__('Back')?></a>
5-
<a href="/add/ip/" class="ui-button cancel" title="<?=__('Add IP')?>"><i class="fas fa-plus-circle status-icon green"></i> <?=__('Add IP')?></a>
5+
<a href="/add/ip/" id="btn-create" class="ui-button cancel" title="<?=__('Add IP')?>"><i class="fas fa-plus-circle status-icon green"></i> <?=__('Add IP')?></a>
66
</div>
77
<ul class="context-menu sort-order animated fadeIn" style="display:none;">
88
<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>

‎web/templates/admin/list_mail.html‎

Lines changed: 3 additions & 3 deletions
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="/add/mail/" class="ui-button cancel" title="<?=__('Add Mail Domain')?>"><i class="fas fa-plus-circle status-icon green"></i> <?=__('Add Mail Domain')?></a>
4+
<a href="/add/mail/" id="btn-create" class="ui-button cancel" title="<?=__('Add Mail Domain')?>"><i class="fas fa-plus-circle status-icon green"></i> <?=__('Add Mail Domain')?></a>
55
</div>
66
<ul class="context-menu sort-order animated fadeIn" style="display:none;">
77
<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>
@@ -98,8 +98,8 @@
9898
<div class="l-unit-toolbar__col l-unit-toolbar__col--right noselect">
9999
<div class="actions-panel clearfix">
100100
<div class="actions-panel__col actions-panel__logs shortcut-n" key-action="href"><a href="/add/mail/?domain=<?=$key?>&token=<?=$_SESSION['token']?>" title="<?=__('Add Mail Account')?>"><i class="fas fa-plus-circle status-icon green status-icon dim"></i></a></div>
101-
<div class="actions-panel__col actions-panel__edit shortcut-l" key-action="href"><a href="?domain=<?=$key?>&token=<?=$_SESSION['token']?>" title="<?=__('mail accounts')?>"><i class="fas fa-users status-icon blue status-icon dim"></i></div>
102-
<div class="actions-panel__col actions-panel__edit" key-action="href"><a href="http://webmail.<?=$key?>/" target="_blank" title="<?=__('open webmail')?>"><i class="fas fa-paper-plane status-icon lightblue status-icon dim"></i></div>
101+
<div class="actions-panel__col actions-panel__edit shortcut-l" key-action="href"><a href="?domain=<?=$key?>&token=<?=$_SESSION['token']?>" title="<?=__('mail accounts')?>"><i class="fas fa-users status-icon blue status-icon dim"></i></a></div>
102+
<div class="actions-panel__col actions-panel__edit" key-action="href"><a href="http://webmail.<?=$key?>/" target="_blank" title="<?=__('open webmail')?>"><i class="fas fa-paper-plane status-icon lightblue status-icon dim"></i></a></div>
103103
<div class="actions-panel__col actions-panel__logs shortcut-enter" key-action="href"><a href="/edit/mail/?domain=<?=$key?>&token=<?=$_SESSION['token']?>" title="<?=__('Editing Mail Domain')?>"><i class="fas fa-pencil-alt status-icon orange status-icon dim"></i></a></div>
104104

105105
<div class="actions-panel__col actions-panel__suspend shortcut-s" key-action="js">

0 commit comments

Comments
 (0)