Skip to content

Commit 99c8860

Browse files
LupulLupul
committed
Add a unique selector id to 'back/cancel' Button
1 parent 89fb007 commit 99c8860

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

51 files changed

+55
-54
lines changed

‎web/js/init.js‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -176,12 +176,13 @@ $(document).ready(function(){
176176
);
177177

178178
shortcut.add("Ctrl+Backspace", function(){
179-
if(VE.tmp.form_changed && $('form#vstobjects .button.cancel')[0]){
180-
VE.helpers.createConfirmationDialog($('.confirmation-text-redirect'), '', $('form#vstobjects input.cancel').attr('onclick').replace("location.href='", "").replace("'",""));
179+
var redirect = $('a.ui-button#btn-back').attr('href')
180+
if(VE.tmp.form_changed && redirect){
181+
VE.helpers.createConfirmationDialog($('.confirmation-text-redirect'), '', redirect);
181182
} else if($('form#vstobjects .button.cancel')[0]){
182183
location.href=$('form#vstobjects input.cancel').attr('onclick').replace("location.href='", "").replace("'","");
183-
} else if($('a.ui-button.cancel')[0]){
184-
location.href=$('a.ui-button.cancel').attr('href');
184+
} else if(redirect){
185+
location.href = redirect;
185186
}
186187
}, {
187188
'type': 'keydown',

‎web/templates/admin/add_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 edit">
22
<div class="l-sort clearfix">
33
<div class="l-unit-toolbar__buttonstrip">
4-
<a class="ui-button cancel" href="/list/cron/"><i class="fas fa-arrow-left status-icon blue"></i> <?=__('Back')?></a>
4+
<a class="ui-button cancel" id="btn-back" href="/list/cron/"><i class="fas fa-arrow-left status-icon blue"></i> <?=__('Back')?></a>
55
</div>
66
<div class="l-unit-toolbar__buttonstrip float-right">
77
<?php

‎web/templates/admin/add_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 edit">
22
<div class="l-sort clearfix">
33
<div class="l-unit-toolbar__buttonstrip">
4-
<a class="ui-button cancel" href="/list/db/"><i class="fas fa-arrow-left status-icon blue"></i> <?=__('Back')?></a>
4+
<a class="ui-button cancel" id="btn-back" href="/list/db/"><i class="fas fa-arrow-left status-icon blue"></i> <?=__('Back')?></a>
55
</div>
66
<div class="l-unit-toolbar__buttonstrip float-right">
77
<?php

‎web/templates/admin/add_dns.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<div class="l-center edit">
22
<div class="l-sort clearfix">
33
<div class="l-unit-toolbar__buttonstrip">
4-
<a class="ui-button cancel" href="/list/dns/"><i class="fas fa-arrow-left status-icon blue"></i> <?=__('Back')?></a>
4+
<a class="ui-button cancel" id="btn-back" href="/list/dns/"><i class="fas fa-arrow-left status-icon blue"></i> <?=__('Back')?></a>
55
</div>
66
<div class="l-unit-toolbar__buttonstrip float-right">
77
<?php

‎web/templates/admin/add_dns_rec.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<div class="l-center edit">
22
<div class="l-sort clearfix">
33
<div class="l-unit-toolbar__buttonstrip">
4-
<a class="ui-button cancel" href="javascript:window.history.back();"><i class="fas fa-arrow-left status-icon blue"></i> <?=__('Back')?></a>
4+
<a class="ui-button cancel" id="btn-back" href="javascript:window.history.back();"><i class="fas fa-arrow-left status-icon blue"></i> <?=__('Back')?></a>
55
</div>
66
<div class="l-unit-toolbar__buttonstrip float-right">
77
<?php

‎web/templates/admin/add_firewall.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<div class="l-center edit">
22
<div class="l-sort clearfix">
33
<div class="l-unit-toolbar__buttonstrip">
4-
<a class="ui-button cancel" href="/list/firewall/"><i class="fas fa-arrow-left status-icon blue"></i> <?=__('Back')?></a>
4+
<a class="ui-button cancel" id="btn-back" href="/list/firewall/"><i class="fas fa-arrow-left status-icon blue"></i> <?=__('Back')?></a>
55
</div>
66
<div class="l-unit-toolbar__buttonstrip float-right">
77
<?php

‎web/templates/admin/add_firewall_banlist.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<div class="l-center edit">
22
<div class="l-sort clearfix">
33
<div class="l-unit-toolbar__buttonstrip">
4-
<a class="ui-button cancel" href="/list/firewall/banlist/"><i class="fas fa-arrow-left status-icon blue"></i> <?=__('Back')?></a>
4+
<a class="ui-button cancel" id="btn-back" href="/list/firewall/banlist/"><i class="fas fa-arrow-left status-icon blue"></i> <?=__('Back')?></a>
55
</div>
66
<div class="l-unit-toolbar__buttonstrip float-right">
77
<?php

‎web/templates/admin/add_ip.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<div class="l-center edit">
22
<div class="l-sort clearfix">
33
<div class="l-unit-toolbar__buttonstrip">
4-
<a class="ui-button cancel" href="/list/ip/"><i class="fas fa-arrow-left status-icon blue"></i> <?=__('Back')?></a>
4+
<a class="ui-button cancel" id="btn-back" href="/list/ip/"><i class="fas fa-arrow-left status-icon blue"></i> <?=__('Back')?></a>
55
</div>
66
<div class="l-unit-toolbar__buttonstrip float-right">
77
<?php

‎web/templates/admin/add_mail.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<div class="l-center edit">
22
<div class="l-sort clearfix">
33
<div class="l-unit-toolbar__buttonstrip">
4-
<a class="ui-button cancel" href="/list/mail/"><i class="fas fa-arrow-left status-icon blue"></i> <?=__('Back')?></a>
4+
<a class="ui-button cancel" id="btn-back" href="/list/mail/"><i class="fas fa-arrow-left status-icon blue"></i> <?=__('Back')?></a>
55
</div>
66
<div class="l-unit-toolbar__buttonstrip float-right">
77
<?php

‎web/templates/admin/add_mail_acc.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<div class="l-center edit">
22
<div class="l-sort clearfix">
33
<div class="l-unit-toolbar__buttonstrip">
4-
<a class="ui-button cancel" href="javascript:window.history.back();"><i class="fas fa-arrow-left status-icon blue"></i> <?=__('Back')?></a>
4+
<a class="ui-button cancel" id="btn-back" href="javascript:window.history.back();"><i class="fas fa-arrow-left status-icon blue"></i> <?=__('Back')?></a>
55
</div>
66
<div class="l-unit-toolbar__buttonstrip float-right">
77
<?php

0 commit comments

Comments
 (0)