Skip to content

Commit bc18642

Browse files
serghey-rodinserghey-rodin
committed
Merge branch 'master' of github.com:serghey-rodin/vesta
2 parents 5d717c8 + b7710ee commit bc18642

File tree

8 files changed

+113
-173
lines changed

8 files changed

+113
-173
lines changed

‎web/css/main.css‎

Lines changed: 5 additions & 64 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ Title : Vesta
33
Author : Eugen Lobicov, eugen.lobicov@gmail.com
44
55
created : November 27, 2009
6-
last updated : January 11, 2012
6+
last updated : January 12, 2012
77
- - - - - - - - - - - - - - - - - - */
88

99
html{
@@ -585,7 +585,7 @@ input::-moz-focus-inner{
585585
width:11px;
586586
height:11px;
587587
margin:2px 5px 0 0;
588-
background:url(../images/chekbox-selector.png) no-repeat;
588+
background:url(../images/checkbox-selector.png) no-repeat;
589589
cursor:pointer;
590590
}
591591
.checkbox-selector .selector-title{
@@ -610,18 +610,6 @@ input::-moz-focus-inner{
610610
font-size: 12px;
611611

612612
background-color: #fff;
613-
/* background-image: -webkit-gradient(linear, left bottom, left top, color-stop(0, #eeeeee), color-stop(0.5, white));
614-
background-image: -webkit-linear-gradient(center bottom, #eeeeee 0%, white 50%);
615-
background-image: -moz-linear-gradient(center bottom, #eeeeee 0%, white 50%);
616-
background-image: -o-linear-gradient(top, #eeeeee 0%,#ffffff 50%);
617-
background-image: -ms-linear-gradient(top, #eeeeee 0%,#ffffff 50%);
618-
filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#eeeeee', endColorstr='#ffffff',GradientType=0 );
619-
background-image: linear-gradient(top, #eeeeee 0%,#ffffff 50%);
620-
621-
-moz-background-clip : padding;
622-
-webkit-background-clip: padding-box;
623-
background-clip : padding-box;
624-
*/
625613

626614
box-shadow: inset 1px 1px 4px 0px rgba(0, 0, 0, 0.10);
627615
-moz-box-shadow: inset 1px 1px 4px 0px rgba(0, 0, 0, 0.10);
@@ -652,15 +640,6 @@ input::-moz-focus-inner{
652640
background-clip : padding-box;
653641
background: #ccc;
654642

655-
/* background-image: -webkit-gradient(linear, left bottom, left top, color-stop(0, #ccc), color-stop(0.6, #eee));
656-
background-image: -webkit-linear-gradient(center bottom, #ccc 0%, #eee 60%);
657-
background-image: -moz-linear-gradient(center bottom, #ccc 0%, #eee 60%);
658-
background-image: -o-linear-gradient(bottom, #ccc 0%, #eee 60%);
659-
background-image: -ms-linear-gradient(top, #cccccc 0%,#eeeeee 60%);
660-
filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#cccccc', endColorstr='#eeeeee',GradientType=0 );
661-
background-image: linear-gradient(top, #cccccc 0%,#eeeeee 60%);
662-
*/
663-
664643
background-image: -webkit-gradient(linear, left bottom, left top, color-stop(0, #fff), color-stop(0.6, #f5f4ef));
665644
background-image: -webkit-linear-gradient(center bottom, #fff 0%, #f5f4ef 60%);
666645
background-image: -moz-linear-gradient(center bottom, #fff 0%, #f5f4ef 60%);
@@ -1676,21 +1655,17 @@ input::-moz-focus-inner{
16761655
width:18px;
16771656
height:18px;
16781657
margin:6px 0 0;
1679-
background:url(../images/checkboxes.png) no-repeat;
1658+
background:url(/images/form-checkboxes.png) no-repeat;
16801659
}
16811660
.b-new-entry .checkbox:hover{
1682-
background-position:0 -98px;
1661+
background-position:0 -100px;
16831662
}
16841663
.b-new-entry .stats-settings{
16851664
padding-left:40px;
16861665
}
16871666
.b-new-entry .db-credentials .field-label{
16881667
text-indent:40px;
16891668
}
1690-
/*.b-new-entry .pwd-box .text-field{
1691-
float:left;
1692-
margin:0 15px 0 0;
1693-
}*/
16941669
.b-new-entry_user .lastname-box{
16951670
margin-bottom:30px;
16961671
}
@@ -1774,26 +1749,6 @@ input::-moz-focus-inner{
17741749
border-top:1px solid #dcdbad;
17751750
background:url(../images/form-bottom-bg.png) repeat-x;
17761751
}
1777-
/* .b-new-entry .help-btn{
1778-
position:absolute;
1779-
top:13px;
1780-
right:20px;
1781-
font-size:11px;
1782-
line-height:12px;
1783-
color:#b4b39f;
1784-
text-transform:uppercase;
1785-
cursor:pointer;
1786-
border-bottom:1px solid #b4b39f;
1787-
text-decoration:none;
1788-
}
1789-
.b-new-entry .help-btn:hover{
1790-
color:#000;
1791-
border-bottom-color:#9fb35a;
1792-
}
1793-
.b-new-entry .help-btn:active{
1794-
color:#4B9427;
1795-
}
1796-
*/
17971752

17981753
.b-new-entry .cancel-btn{
17991754

@@ -1893,7 +1848,6 @@ input::-moz-focus-inner{
18931848
height:32px;
18941849
font-size:0;
18951850
line-height:0;
1896-
/* background:#fff url(../images/select-arrow.png) no-repeat 100% 50%;*/
18971851
background:#fff url(../images/autocomplete-field-arrows-sprite.png) no-repeat;
18981852
cursor:pointer;
18991853
}
@@ -1981,12 +1935,6 @@ input::-moz-focus-inner{
19811935
.b-new-detailed-restore .add-entry-btn{
19821936
padding:0 30px;
19831937
}
1984-
/*
1985-
.b-new-detailed-restore .cancel-btn{
1986-
left:auto;
1987-
right:16px;
1988-
}
1989-
*/
19901938

19911939
/* Show/edit dns records form
19921940
- - - - - - - - - - - - - - - - - - - */
@@ -2206,19 +2154,12 @@ input::-moz-focus-inner{
22062154
background:url(../images/stats-brace.png) no-repeat 0 50%;
22072155
}
22082156
.stats-box-title{
2209-
/*
2210-
background: url("../images/stats-curve.png") no-repeat 85% 50%;
2211-
2212-
line-height: 61px;
2213-
margin-right: 33px;
2214-
padding-right: 35px;
2215-
*/
22162157
position:absolute;
22172158
top:50%;
22182159
left:-68px;
22192160

22202161
width:28px;
2221-
margin-top:-10px;
2162+
margin-top:-6px;
22222163
padding-right:35px;
22232164
text-transform:uppercase;
22242165
font-size:9px;

‎web/images/checkbox-selector.png‎

2.93 KB
Loading

‎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: 48 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,20 @@ 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 == 'on') {
150+
tpl.set(':ssl_checked', 'checked="checked"');
151+
}
152+
else {
153+
tpl.set(':ssl_checked', '');
154+
}
155+
if (options.SSL_HOME == 'on') {
156+
tpl.set(':ssl_home_checked', 'checked="checked"');
157+
}
158+
else{
159+
tpl.set(':ssl_home_checked', '');
160+
}
149161
}
162+
150163
options = !App.Helpers.isEmpty(options) ? options : App.Empty.WEB_DOMAIN;
151164
if (in_edit == true) {
152165
options.STATS_PASSWORD = options.STATS_LOGIN.trim() != '' ? App.Settings.PASSWORD_IMMUTE : '';
@@ -170,6 +183,25 @@ App.HTML.Build.web_domain_form = function (options, id) {
170183
tpl.set(':ACTIVE_PASSWORD', 'hidden');
171184
tpl.set(':stats_auth_checked', '');
172185
}
186+
187+
if (options.SSL == 'on') {
188+
tpl.set(':ssl_checked', 'checked="checked"');
189+
if (options.SSL_HOME == 'on') {
190+
tpl.set(':ssl_home_checked', 'checked="checked"');
191+
}
192+
else{
193+
tpl.set(':ssl_home_checked', '');
194+
}
195+
}
196+
else {
197+
tpl.set(':ssl_checked', '');
198+
tpl.set(':ssl_home_checked', '');
199+
tpl.set(':SSL_HOME', '');
200+
tpl.set(':SSL_CRT', '');
201+
tpl.set(':SSL_KEY', '');
202+
tpl.set(':SSL_CA', '');
203+
}
204+
173205
return tpl.finalize();
174206
}
175207

@@ -581,6 +613,9 @@ App.HTML.Build.ssl_key_file = function () {
581613
App.HTML.Build.ssl_cert_file = function () {
582614
return '<iframe src="' + App.Helpers.getUploadUrl() + '?action=show&type=cert" width="500px;" height="53px;" framevorder="0" scroll="no">..</iframe>';
583615
}
616+
App.HTML.Build.ssl_ca_file = function () {
617+
return '<iframe src="' + App.Helpers.getUploadUrl() + '?action=show&type=ca" width="500px;" height="53px;" framevorder="0" scroll="no">..</iframe>';
618+
}
584619
App.HTML.Build.user_selects = function (tpl, options) {
585620
var acc = [];
586621
var pkg = App.Env.initialParams.USERS.PACKAGE;
@@ -615,6 +650,7 @@ App.HTML.Build.db_selects = function (tpl, options) {
615650
acc[acc.length++] = tpl.finalize();
616651
});
617652
tpl.set(':TYPE_OPTIONS', acc.done());
653+
618654
acc = [];
619655
var items = App.Env.initialParams.DB.HOST;
620656
$.each(items, function (val) {
@@ -625,6 +661,18 @@ App.HTML.Build.db_selects = function (tpl, options) {
625661
acc[acc.length++] = tpl.finalize();
626662
});
627663
tpl.set(':HOST_OPTIONS', acc.done());
664+
665+
acc = [];
666+
var items = App.Env.initialParams.DB.ENCODING;
667+
$.each(items, function (val) {
668+
var tpl = App.Templates.get('select_option', 'general');
669+
tpl.set(':VALUE', val);
670+
tpl.set(':TEXT', items[val]);
671+
tpl.set(':SELECTED', val == options.ENCODING ? 'selected="selected"' : '');
672+
acc[acc.length++] = tpl.finalize();
673+
});
674+
tpl.set(':ENCODING_OPTIONS', acc.done());
675+
628676
return tpl;
629677
}
630678
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: 13 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -666,11 +666,11 @@ 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">\
672-
<label for="#" class="field-label">SSL Document Root:</label>\
673-
<input type="text" name="SSL_HOME" class="text-field" value="~!:SSL_HOME~!">\
671+
<div class="form-row cc ssl-crtfct-box">\
672+
<label for="#" class="field-label">SSL Shared DocRoot:</label>\
673+
<input type="checkbox" name="SSL_HOME" class="styled" ~!:ssl_home_checked~! value="~!SSL_HOME~!">\
674674
</div>\
675675
<div class="form-row ssl-crtfct-box cc">\
676676
<label for="#" class="field-label">SSL Crtificate: <span class="remark">(upload file or paste as text)</span></label>\
@@ -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 -->\
@@ -715,6 +715,10 @@ App.Templates.html = {
715715
</div>\
716716
</div>\
717717
</div><!-- Mail options -->\
718+
<div class="form-row cc">\
719+
<label for="#" class="field-label">create DNS domain:</label>\
720+
<input type="checkbox" value="" name="DNS_DOMAIN" class="styled">\
721+
</div>\
718722
<div class="form-row buttons-row cc">\
719723
<input class="add-entry-btn do_action_save_form" type="submit" value="~!:save_button~!"/>\
720724
<span class="cancel-btn do_action_cancel_form">Cancel</span>\
@@ -856,13 +860,13 @@ App.Templates.html = {
856860
<span class="generate-pwd do_action_generate_pass">Generate</span>\
857861
</div>\
858862
</div>\
859-
<div class="form-row hidden cc">\
863+
<!--div class="form-row hidden cc">\
860864
<label for="#" class="field-label">Host:</label>\
861865
<select name="HOST" class="styled">~!:HOST_OPTIONS~!</select>\
862-
</div>\
866+
</div -->\
863867
<div class="form-row cc">\
864868
<label for="#" class="field-label">Encoding:</label>\
865-
<select name="TYPE" class="styled">~!:ENCODING_OPTIONS~!</select>\
869+
<select name="ENCODING" class="styled">~!:ENCODING_OPTIONS~!</select>\
866870
</div>\
867871
<div class="form-row suspended cc">\
868872
<label for="#" class="field-label">Suspended:</label>\

0 commit comments

Comments
 (0)