Skip to content

Commit ff84992

Browse files
very-twivery-twi
committed
Closes hestiacp#2 
1 parent 138d79d commit ff84992

File tree

5 files changed

+52
-6
lines changed

5 files changed

+52
-6
lines changed

‎web/js/_settings.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ App.Settings.Imutable.IP = ['INTERFACE'];
6969
// Empty
7070
App.Empty = {};
7171
App.Empty.USER = {'CONTACT':'', 'PASSWORD':'','LOGIN_NAME':'','LNAME':'', 'FNAME':'','NS1':'','NS2':'','NS3':'','NS4':'','NS5':'','NS6':'','NS7':'','NS8':''};
72-
App.Empty.WEB_DOMAIN = {'CONTACT':'', 'PASSWORD':'','LOGIN_NAME':'','NS':'', 'DOMAIN':'','SSL_CERT':'','SSL_KEY':'','SSL_HOME':'','STATS_PASSWORD':'','STATS_LOGIN':'','ALIAS':''};
72+
App.Empty.WEB_DOMAIN = {'CONTACT':'', 'PASSWORD':'','LOGIN_NAME':'','NS':'', 'DOMAIN':'','SSL_CERT':'','SSL_KEY':'','SSL_HOME':'','STATS_PASSWORD':'','STATS_LOGIN':'','ALIAS':'', 'SSL_CA':'', 'SSL_CRT':'','NGINX_EXT':''};
7373
App.Empty.DB = {'DB':'', 'USER':'','FORM':'', 'PASSWORD': ''};
7474

7575
App.Settings.getMethodName = function(action)

‎web/js/actions.js‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,19 @@
1+
App.Actions.toggle_ssl_support = function(evt, elm)
2+
{
3+
if (!elm) {
4+
var elm = $(evt.target);
5+
}
6+
7+
var ref = elm.hasClass('form') ? elm : elm.parents('.form');
8+
fb.log(ref);
9+
if (ref.find('.ssl_support').attr('checked')) {
10+
$('.ssl-crtfct-box', ref).removeClass('hidden');
11+
}
12+
else {
13+
$('.ssl-crtfct-box', ref).addClass('hidden');
14+
}
15+
}
16+
117
App.Actions.view_nginx_extensions = function(evt)
218
{
319
var elm = $(evt.target);

‎web/js/html.js‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -146,6 +146,12 @@ App.HTML.Build.web_domain_form = function (options, id) {
146146
tpl.set(':title', 'Edit WEB domain');
147147
tpl.set(':save_button', 'SAVE');
148148
tpl.set(':DELETE_ACTION', App.Templates.get('DELETE_ACTION', 'general').finalize());
149+
if (options.SSL == 'yes') {
150+
tpl.set(':ssl_checked', 'checked="checked"');
151+
}
152+
else {
153+
tpl.set(':ssl_checked', '');
154+
}
149155
}
150156
options = !App.Helpers.isEmpty(options) ? options : App.Empty.WEB_DOMAIN;
151157
if (in_edit == true) {
@@ -581,6 +587,9 @@ App.HTML.Build.ssl_key_file = function () {
581587
App.HTML.Build.ssl_cert_file = function () {
582588
return '<iframe src="' + App.Helpers.getUploadUrl() + '?action=show&type=cert" width="500px;" height="53px;" framevorder="0" scroll="no">..</iframe>';
583589
}
590+
App.HTML.Build.ssl_ca_file = function () {
591+
return '<iframe src="' + App.Helpers.getUploadUrl() + '?action=show&type=ca" width="500px;" height="53px;" framevorder="0" scroll="no">..</iframe>';
592+
}
584593
App.HTML.Build.user_selects = function (tpl, options) {
585594
var acc = [];
586595
var pkg = App.Env.initialParams.USERS.PACKAGE;
@@ -615,6 +624,7 @@ App.HTML.Build.db_selects = function (tpl, options) {
615624
acc[acc.length++] = tpl.finalize();
616625
});
617626
tpl.set(':TYPE_OPTIONS', acc.done());
627+
618628
acc = [];
619629
var items = App.Env.initialParams.DB.HOST;
620630
$.each(items, function (val) {
@@ -625,6 +635,18 @@ App.HTML.Build.db_selects = function (tpl, options) {
625635
acc[acc.length++] = tpl.finalize();
626636
});
627637
tpl.set(':HOST_OPTIONS', acc.done());
638+
639+
acc = [];
640+
var items = App.Env.initialParams.DB.ENCODING;
641+
$.each(items, function (val) {
642+
var tpl = App.Templates.get('select_option', 'general');
643+
tpl.set(':VALUE', val);
644+
tpl.set(':TEXT', items[val]);
645+
tpl.set(':SELECTED', val == options.ENCODING ? 'selected="selected"' : '');
646+
acc[acc.length++] = tpl.finalize();
647+
});
648+
tpl.set(':ENCODING_OPTIONS', acc.done());
649+
628650
return tpl;
629651
}
630652
App.HTML.Build.ip_selects = function (tpl, options) {

‎web/js/pages.js‎

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,8 +87,11 @@ App.Pages.WEB_DOMAIN.new_entry = function(evt)
8787
$('#'+form_id).find('.ns-entry, .additional-ns-add').addClass('hidden');
8888
var ssl_key_upload = App.HTML.Build.ssl_key_file();
8989
var ssl_cert_upload = App.HTML.Build.ssl_cert_file();
90+
var ssl_ca_upload = App.HTML.Build.ssl_ca_file();
9091
$('#'+form_id).find('.ssl-key-input-dummy:first').replaceWith(ssl_key_upload);
9192
$('#'+form_id).find('.ssl-cert-input-dummy:first').replaceWith(ssl_cert_upload);
93+
$('#'+form_id).find('.ssl-ca-input-dummy:first').replaceWith(ssl_ca_upload);
94+
App.Actions.toggle_ssl_support({}, $('#'+form_id));
9295
}
9396

9497
App.Pages.WEB_DOMAIN.edit = function(evt)
@@ -102,9 +105,14 @@ App.Pages.WEB_DOMAIN.edit = function(evt)
102105
// ssls uploads
103106
var ssl_key_upload = App.HTML.Build.ssl_key_file();
104107
var ssl_cert_upload = App.HTML.Build.ssl_cert_file();
108+
var ssl_ca_upload = App.HTML.Build.ssl_ca_file();
105109
tpl = tpl.replace('<span class="ssl-key-input-dummy">...</span>', ssl_key_upload);
106110
tpl = tpl.replace('<span class="ssl-cert-input-dummy">...</span>', ssl_cert_upload);
107-
elm.replaceWith(tpl);
111+
tpl = tpl.replace('<span class="ssl-ca-input-dummy">...</span>', ssl_cert_upload);
112+
var tmp_elm = $('<div>').html(tpl);
113+
App.Actions.toggle_ssl_support({}, tmp_elm.find('.form'));
114+
elm.replaceWith(tmp_elm.html());
115+
108116

109117
App.Helpers.disableNotEditable();
110118
App.Helpers.updateScreen();

‎web/js/templates.js‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -666,9 +666,9 @@ App.Templates.html = {
666666
</div><!-- // stats settings -->\
667667
<div class="form-row cc">\
668668
<label for="#" class="field-label">SSL Support:</label>\
669-
<input type="checkbox" name="SSL" class="styled" ~!:ssl_checked~!="" value="~!SSL~!">\
669+
<input type="checkbox" name="SSL" class="styled do_action_toggle_ssl_support ssl_support" ~!:ssl_checked~! value="~!SSL~!">\
670670
</div>\
671-
<div class="form-row cc">\
671+
<div class="form-row cc ssl-crtfct-box">\
672672
<label for="#" class="field-label">SSL Document Root:</label>\
673673
<input type="text" name="SSL_HOME" class="text-field" value="~!:SSL_HOME~!">\
674674
</div>\
@@ -684,7 +684,7 @@ App.Templates.html = {
684684
</div>\
685685
<div class="form-row ssl-crtfct-box cc">\
686686
<label for="#" class="field-label">SSL Certificate CA: <span class="remark">(upload file or paste as text)</span></label>\
687-
<span class="ssl-key-input-dummy">...</span>\
687+
<span class="ssl-ca-input-dummy">...</span>\
688688
<textarea name="SSL_CA" class="textarea ssl-key">~!:SSL_CA~!</textarea>\
689689
</div>\
690690
</div><!-- // advanced options -->\
@@ -697,7 +697,7 @@ App.Templates.html = {
697697
</div>\
698698
<div class="sub_section hidden">\
699699
<div class="form-row cc">\
700-
<label for="#" class="field-label">create dns domain:</label>\
700+
<label for="#" class="field-label">create DNS domain:</label>\
701701
<input type="checkbox" value="~!:DNS~!" ~!:CHECKED_DNS~! name="DNS" class="styled">\
702702
</div>\
703703
</div><!-- DNS options -->\

0 commit comments

Comments
 (0)