Skip to content

Commit 2a6e6ab

Browse files
very-twivery-twi
committed
Delete button removed from "new" forms. Closes hestiacp#26 
1 parent 1ee4699 commit 2a6e6ab

File tree

2 files changed

+69
-47
lines changed

2 files changed

+69
-47
lines changed

‎web/js/html.js‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,11 @@ App.HTML.Build.dns_form = function (options, id) {
2929
if (App.Helpers.isEmpty(options)) {
3030
tpl.set(':title', 'New dns domain');
3131
tpl.set(':save_button', 'ADD');
32+
tpl.set(':DELETE_ACTION', '');
3233
} else {
3334
tpl.set(':title', 'Edit dns domain');
3435
tpl.set(':save_button', 'SAVE');
36+
tpl.set(':DELETE_ACTION', App.Templates.get('DELETE_ACTION', 'general').finalize());
3537
}
3638
tpl.set(':id', id || '');
3739
tpl.set(':DNS_DOMAIN', options.DNS_DOMAIN || '');
@@ -55,9 +57,11 @@ App.HTML.Build.ip_form = function (options, id) {
5557
if (App.Helpers.isEmpty(options)) {
5658
tpl.set(':title', 'New ip address');
5759
tpl.set(':save_button', 'ADD');
60+
tpl.set(':DELETE_ACTION', '');
5861
} else {
5962
tpl.set(':title', 'Edit ip address');
6063
tpl.set(':save_button', 'SAVE');
64+
tpl.set(':DELETE_ACTION', App.Templates.get('DELETE_ACTION', 'general').finalize());
6165
}
6266
tpl.set(':id', id || '');
6367
tpl.set(':IP_ADDRESS', options.IP_ADDRESS || '');
@@ -84,9 +88,11 @@ App.HTML.Build.user_form = function (options, id) {
8488
if (App.Helpers.isEmpty(options)) {
8589
tpl.set(':title', 'New user');
8690
tpl.set(':save_button', 'ADD');
91+
tpl.set(':DELETE_ACTION', '');
8792
} else {
8893
tpl.set(':title', 'Edit user');
8994
tpl.set(':save_button', 'SAVE');
95+
tpl.set(':DELETE_ACTION', App.Templates.get('DELETE_ACTION', 'general').finalize());
9096
}
9197
options = !App.Helpers.isEmpty(options) ? options : App.Empty.USER;
9298
if (in_edit == true) {
@@ -135,9 +141,11 @@ App.HTML.Build.web_domain_form = function (options, id) {
135141
if (App.Helpers.isEmpty(options)) {
136142
tpl.set(':title', 'New WEB domain');
137143
tpl.set(':save_button', 'ADD');
144+
tpl.set(':DELETE_ACTION', '');
138145
} else {
139146
tpl.set(':title', 'Edit WEB domain');
140147
tpl.set(':save_button', 'SAVE');
148+
tpl.set(':DELETE_ACTION', App.Templates.get('DELETE_ACTION', 'general').finalize());
141149
}
142150
options = !App.Helpers.isEmpty(options) ? options : App.Empty.WEB_DOMAIN;
143151
if (in_edit == true) {
@@ -180,9 +188,11 @@ App.HTML.Build.db_form = function (options, id) {
180188
if (App.Helpers.isEmpty(options)) {
181189
tpl.set(':title', 'New database');
182190
tpl.set(':save_button', 'ADD');
191+
tpl.set(':DELETE_ACTION', '');
183192
} else {
184193
tpl.set(':title', 'Edit database "' + options.DB + '"');
185194
tpl.set(':save_button', 'SAVE');
195+
tpl.set(':DELETE_ACTION', App.Templates.get('DELETE_ACTION', 'general').finalize());
186196
}
187197
options = !App.Helpers.isEmpty(options) ? options : App.Empty.DB;
188198
if (in_edit == true) {
@@ -206,9 +216,11 @@ App.HTML.Build.cron_form = function (options, id) {
206216
if (App.Helpers.isEmpty(options)) {
207217
tpl.set(':title', 'New cron job');
208218
tpl.set(':save_button', 'ADD');
219+
tpl.set(':DELETE_ACTION', '');
209220
} else {
210221
tpl.set(':title', 'Edit cron job');
211222
tpl.set(':save_button', 'SAVE');
223+
tpl.set(':DELETE_ACTION', App.Templates.get('DELETE_ACTION', 'general').finalize());
212224
}
213225
options = !App.Helpers.isEmpty(options) ? options : {
214226
DAY: '',

‎web/js/templates.js‎

Lines changed: 57 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,8 @@ App.Templates.html = {
3535
select_option: ['<option ~!:SELECTED~! value="~!:VALUE~!">~!:TEXT~!</option>'],
3636
error_elm: ['<div class="error-box">~!:ERROR~!</div>'],
3737
SUSPENDED_TPL_NOT_SUSPENDED : ['<span class="ip-status-info ip-enabled-status"><span class="ip-status-text">enabled</span></span>'],
38-
SUSPENDED_TPL_SUSPENDED : ['<span class="ip-status-info ip-suspended-status"><span class="ip-status-text">suspended</span></span>']
38+
SUSPENDED_TPL_SUSPENDED : ['<span class="ip-status-info ip-suspended-status"><span class="ip-status-text">suspended</span></span>'],
39+
DELETE_ACTION: ['<span class="delete-btn do_action_delete_entry">Delete</span>']
3940
},
4041
popup: {
4142
error: ['<div class="error"><center><h1 style="color: red;">Important: An Error Has Occured.</h1><hr></center>&nbsp;&nbsp;&nbsp;&nbsp;Something went wrong and some of your actions can be not saved in system. Mostly, it happens when you have network connection errors.<br>,&nbsp;&nbsp;&nbsp;&nbsp;However, please notify us about the situation. It would be helpfull if you will write us approximate time the error occured and last actions you were performing. You send your petition on <a href="mail_to">this email: BLABLA</a>,<br><br><center><span style="color: rgb(92, 92, 92);">Sorry for inconvinience. (We recommend you to reload the page)</span></center></div>'],
@@ -158,7 +159,7 @@ App.Templates.html = {
158159
<div class="form-row buttons-row cc">\
159160
<input class="add-entry-btn do_action_save_form" type="submit" value="~!:save_button~!"/>\
160161
<span class="cancel-btn do_action_cancel_form">Cancel</span>\
161-
<span class="delete-btn do_action_delete_entry">Delete</span>\
162+
~!:DELETE_ACTION~!\
162163
</div>\
163164
</div>'
164165
],
@@ -292,7 +293,7 @@ App.Templates.html = {
292293
<div class="form-row buttons-row cc">\
293294
<input class="add-entry-btn do_action_save_form" type="submit" value="~!:save_button~!"/>\
294295
<span class="cancel-btn do_action_cancel_form">Cancel</span>\
295-
<span class="delete-btn do_action_delete_entry">Delete</span>\
296+
~!:DELETE_ACTION~!\
296297
</div>\
297298
</div>\
298299
'],
@@ -319,14 +320,14 @@ App.Templates.html = {
319320
<span class="prop-title">netmask:</span>\
320321
<span class="prop-value">~!:NETMASK~!</span>\
321322
</span>\
322-
<span class="prop-box">\
323-
<span class="prop-title">interface:</span>\
324-
<span class="prop-value">~!:INTERFACE~!</span>\
325-
</span>\
326323
<span class="prop-box">\
327324
<span class="prop-title">name:</span>\
328325
<span class="prop-value">~!:NAME~!</span>\
329326
</span>\
327+
<span class="prop-box">\
328+
<span class="prop-title">interface:</span>\
329+
<span class="prop-value">~!:INTERFACE~!</span>\
330+
</span>\
330331
</div>\
331332
<div class="ip-props-additional">\
332333
<span class="prop-box">\
@@ -340,7 +341,7 @@ App.Templates.html = {
340341
</div>\
341342
<div class="ip-props-ext">\
342343
<span class="prop-box">\
343-
<span class="prop-title">sys users:</span>\
344+
<span class="prop-title">users:</span>\
344345
<span class="prop-value">~!:U_SYS_USERS~!</span>\
345346
</span>\
346347
<span class="prop-box">\
@@ -446,7 +447,7 @@ App.Templates.html = {
446447
<div class="form-row buttons-row cc">\
447448
<input class="add-entry-btn do_action_save_form" type="submit" value="~!:save_button~!"/>\
448449
<span class="cancel-btn do_action_cancel_form">Cancel</span>\
449-
<span class="delete-btn do_action_delete_entry">Delete</span>\
450+
~!:DELETE_ACTION~!\
450451
</div>\
451452
</div>'],
452453
ENTRY: ['<div class="row user-details-row ~!:SUSPENDED_CLASS~!">\
@@ -469,26 +470,24 @@ App.Templates.html = {
469470
<span class="nickname do_action_edit">~!:LOGIN_NAME~!</span>\
470471
<!-- span class="role">(~!:ROLE~!)</span -->\
471472
</span>\
472-
<span class="prop-box template-box">\
473-
<span class="prop-title">package:</span>\
474-
<span class="prop-value do_action_view_template_info">~!:PACKAGE~!</span>\
475-
</span>\
476-
</div>\
473+
<span class="prop-box user-name">\
474+
<span class="prop-value">~!:FULLNAME~!</span>\
475+
</span>\ </div>\
477476
<div class="user-details-box">\
478477
<span class="prop-box prop-box_group-values cc user-details do_action_login_as">\
479478
<span class="prop-value login-as do_action_login_as">login as</span>\
480479
</span>\
481-
<span class="prop-box user-name">\
482-
<span class="prop-title">name:</span>\
483-
<span class="prop-value">~!:FULLNAME~!</span>\
484-
</span>\
485480
<span class="prop-box prop-box_group-values cc user-details">\
486481
<span class="prop-title">email:</span>\
487482
<span class="group-values">\
488483
<span class="prop-value user-email">~!:CONTACT~!</span>\
489484
<span class="prop-value user-reports">(reports ~!:REPORTS_ENABLED~!)</span>\
490485
</span>\
491486
</span>\
487+
<span class="prop-box template-box">\
488+
<span class="prop-title">package:</span>\
489+
<span class="prop-value do_action_view_template_info">~!:PACKAGE~!</span>\
490+
</span>\
492491
</div>\
493492
</div>\
494493
<!-- disk usage block -->\
@@ -526,6 +525,10 @@ App.Templates.html = {
526525
</div>\
527526
</div>\
528527
<div class="props-additional">\
528+
<span class="prop-box webdomains-box">\
529+
<span class="prop-title">web domains:</span>\
530+
<span class="prop-value">~!:U_WEB_DOMAINS~! (~!:WEB_DOMAINS~!)</span>\
531+
</span>\
529532
<span class="prop-box websl-box">\
530533
<span class="prop-title">web ssl:</span>\
531534
<span class="prop-value">~!:U_WEB_SSL~! (~!:WEB_SSL~!)</span>\
@@ -544,42 +547,45 @@ App.Templates.html = {
544547
<span class="prop-title">databases:</span>\
545548
<span class="prop-value">~!:U_DATABASES~! (~!:DATABASES~!)</span>\
546549
</span>\
547-
<span class="prop-box shell-box">\
548-
<span class="prop-title">shell:</span>\
549-
<span class="prop-value">~!:SHELL~!</span>\
550+
<span class="prop-box ip-box">\
551+
<span class="prop-title">Dedicated IP\'s:</span>\
552+
<span class="prop-value">~!:IP_OWNED~!</span>\
550553
</span>\
551-
<span class="prop-box backups-box">\
552-
<span class="prop-title">backups:</span>\
553-
<span class="prop-value">retention ~!:BACKUPS~!</span>\
554+
<span class="prop-box cron-box">\
555+
<span class="prop-title">cron jobs:</span>\
556+
<span class="prop-value">~!:U_CRON_JOBS~!</span>\
554557
</span>\
555558
</div>\
556559
<div class="props-ext">\
557-
<span class="prop-box mailboxes-box">\
558-
<span class="prop-title">mailboxes:</span>\
559-
<span class="prop-value">~!:U_MAIL_BOXES~! (~!:MAIL_BOXES~!)</span>\
560-
</span>\
561-
<span class="prop-box mailfwds-box">\
562-
<span class="prop-title">mail forwarders:</span>\
563-
<span class="prop-value">~!:U_MAIL_FORWARDERS~! (~!:MAIL_FORWARDERS~!)</span>\
564-
</span>\
565560
<span class="prop-box maildomains-box">\
566561
<span class="prop-title">mail domains:</span>\
567562
<span class="prop-value">~!:U_MAIL_DOMAINS~! (~!:MAIL_DOMAINS~!)</span>\
568563
</span>\
569-
<span class="prop-box webdomains-box">\
570-
<span class="prop-title">web domains:</span>\
571-
<span class="prop-value">~!:U_WEB_DOMAINS~! (~!:WEB_DOMAINS~!)</span>\
564+
<span class="prop-box mailboxes-box">\
565+
<span class="prop-title">mail accounts:</span>\
566+
<span class="prop-value">~!:MAIL_BOXES~! per domain</span>\
567+
</span>\
568+
<span class="prop-box mailfwds-box">\
569+
<span class="prop-title">mail forwarders:</span>\
570+
<span class="prop-value">~!:MAIL_FORWARDERS~! per domain</span>\
572571
</span>\
573572
<span class="prop-box dnsdomains-box">\
574573
<span class="prop-title">dns domains:</span>\
575574
<span class="prop-value">~!:U_DNS_DOMAINS~! (~!:DNS_DOMAINS~!)</span>\
576575
</span>\
577576
<span class="prop-box prop-box_group-values cc ns-list-box">\
578-
<span class="prop-title">ns list:</span>\
577+
<span class="prop-title">name servers:</span>\
579578
<span class="group-values">\
580579
~!:NS~!</span>\
581580
</span>\
582-
</div>\
581+
<span class="prop-box shell-box">\
582+
<span class="prop-title">shell:</span>\
583+
<span class="prop-value">~!:SHELL~!</span>\
584+
</span>\
585+
<span class="prop-box backups-box">\
586+
<span class="prop-title">backups:</span>\
587+
<span class="prop-value">retention ~!:BACKUPS~!</span>\
588+
</span>\ </div>\
583589
</div><!-- // .row-details -->\
584590
</div>']
585591
},
@@ -653,23 +659,28 @@ App.Templates.html = {
653659
<span class="generate-pwd do_action_generate_pass">Generate</span>\
654660
</div>\
655661
</div><!-- // stats settings -->\
656-
<!-- div class="form-row cc">\
662+
<div class="form-row cc">\
657663
<label for="#" class="field-label">SSL Support:</label>\
658664
<input type="checkbox" name="SSL" class="styled" ~!:ssl_checked~!="" value="~!SSL~!">\
659-
</div -->\
665+
</div>\
660666
<div class="form-row cc">\
661667
<label for="#" class="field-label">SSL Document Root:</label>\
662668
<input type="text" name="SSL_HOME" class="text-field" value="~!:SSL_HOME~!">\
663669
</div>\
670+
<div class="form-row ssl-crtfct-box cc">\
671+
<label for="#" class="field-label">SSL Crtificate: <span class="remark">(upload file or paste as text)</span></label>\
672+
<span class="ssl-cert-input-dummy">...</span>\
673+
<textarea name="SSL_CRT" class="textarea ssl-cert">~!:SSL_CRT~!</textarea>\
674+
</div>\
664675
<div class="form-row ssl-crtfct-box cc">\
665676
<label for="#" class="field-label">SSL Certificate Key: <span class="remark">(upload file or paste as text)</span></label>\
666677
<span class="ssl-key-input-dummy">...</span>\
667678
<textarea name="SSL_KEY" class="textarea ssl-key">~!:SSL_KEY~!</textarea>\
668679
</div>\
669680
<div class="form-row ssl-crtfct-box cc">\
670-
<label for="#" class="field-label">SSL Crtificate: <span class="remark">(upload file or paste as text)</span></label>\
671-
<span class="ssl-cert-input-dummy">...</span>\
672-
<textarea name="SSL_CERT" class="textarea ssl-cert">~!:SSL_CERT~!</textarea>\
681+
<label for="#" class="field-label">SSL Certificate CA: <span class="remark">(upload file or paste as text)</span></label>\
682+
<span class="ssl-key-input-dummy">...</span>\
683+
<textarea name="SSL_CA" class="textarea ssl-key">~!:SSL_CA~!</textarea>\
673684
</div>\
674685
</div><!-- // advanced options -->\
675686
</div>\
@@ -702,7 +713,7 @@ App.Templates.html = {
702713
<div class="form-row buttons-row cc">\
703714
<input class="add-entry-btn do_action_save_form" type="submit" value="~!:save_button~!"/>\
704715
<span class="cancel-btn do_action_cancel_form">Cancel</span>\
705-
<span class="delete-btn do_action_delete_entry">Delete</span>\
716+
~!:DELETE_ACTION~!\
706717
</div>\
707718
</div>'],
708719
ENTRIES_WRAPPER: ['<div class="domains-list items-list">~!:content~!</div>'],
@@ -721,7 +732,6 @@ App.Templates.html = {
721732
<div class="row-details cc">\
722733
<div class="names">\
723734
<strong class="domain-name primary do_action_edit">~!:DOMAIN~!</strong>\
724-
<span class="alias-title">Alias:</span>\
725735
~!:ALIAS~!\
726736
</div>\
727737
<div class="props-main">\
@@ -829,7 +839,7 @@ App.Templates.html = {
829839
</div>\
830840
<div class="db-credentials ">\
831841
<div class="form-row cc user">\
832-
<label for="#" class="field-label">Username</label>\
842+
<label for="#" class="field-label">Username:</label>\
833843
<input type="text" name="USER" class="text-field" value="~!:USER~!">\
834844
</div>\
835845
<div class="form-row pwd-box cc psw">\
@@ -849,7 +859,7 @@ App.Templates.html = {
849859
<div class="form-row buttons-row cc">\
850860
<input class="add-entry-btn do_action_save_form" type="submit" value="~!:save_button~!"/>\
851861
<span class="cancel-btn do_action_cancel_form">Cancel</span>\
852-
<span class="delete-btn do_action_delete_entry">Delete</span>\
862+
~!:DELETE_ACTION~!\
853863
</div>\
854864
</div>'],
855865
ENTRY: ['<div class="row db-details-row ~!:SUSPENDED_CLASS~!">\
@@ -959,7 +969,7 @@ App.Templates.html = {
959969
<div class="form-row buttons-row cc">\
960970
<input class="add-entry-btn do_action_save_form" type="submit" value="~!:save_button~!"/>\
961971
<span class="cancel-btn do_action_cancel_form">Cancel</span>\
962-
<span class="delete-btn do_action_delete_entry">Delete</span>\
972+
~!:DELETE_ACTION~!\
963973
</div>\
964974
</div>'],
965975
ENTRIES_WRAPPER: ['<div class="cron-list">~!:content~!</div>'],

0 commit comments

Comments
 (0)