github/myvesta
1
0
Fork 0
mirror of https://github.com/myvesta/vesta synced 2025-07-16 10:03:23 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'master' of github.com:serghey-rodin/vesta

Browse source
This commit is contained in:
Serghey Rodin 2012-01-10 11:56:35 +02:00
commit dbe277b042
9 changed files with 1395 additions and 73 deletions
Download patch file Download diff file Expand all files Collapse all files

6
web/index.html
View file

@ -217,7 +217,7 @@
<div id="batch-processor" class="b-row-selector">
<div class="checkbox-selector cc">
<input class="styled do_action_toggle_batch_selector" autocomplete="off" type="checkbox" value="" />
<span class="selector-title">All</span>
<span class="selector-title">None</span>
</div>
<div class="context-actions c-s-box">
<div class="b-cust-sel complex-select c-s-opt">
@ -226,6 +226,10 @@
<div class="cust-sel-arrow do_action_toggle_custom_select c-s-opt"><i class="do_action_toggle_custom_select">&nbsp;</i></div>
<div class="cust-sel-options complex-select-content c-s-opt hidden">
<div class="cust-sel-option ico_gray c-s-opt do_action_update_cs_value">
<input type="hidden" class="c-s-value" value="Nothing">
Nothing
</div>
<div class="cust-sel-option ico_gray c-s-opt do_action_update_cs_value">
<input type="hidden" class="c-s-value" value="Suspend">
Suspend
</div>

20
web/js/actions.js
View file

@ -54,6 +54,11 @@ App.Actions.update_cs_value = function(evt)
var val = elm.find('.c-s-value').val();
$('.complex-select-content').addClass('hidden');
if (val.toLowerCase() == 'nothing') {
App.Actions.mass_nothing();
return;
}
if (App.Tmp[App.Env.world + '_selected_records'] > 0) {
var confirm_message_key = App.Tmp[App.Env.world + '_selected_records'] == 1 ? 1 + ' record' : App.Tmp[App.Env.world + '_selected_records'] + ' records';
var confirmed = confirm('This action will ' + val.toLowerCase() + ' ' + confirm_message_key + '. Do you want to proceede?');
@ -83,6 +88,11 @@ App.Actions.mass_unsuspend = function()
App.Actions.reset_batch();
}
App.Actions.mass_nothing = function()
{
$('.complex-select-content').addClass('hidden');
}
App.Actions.mass_action = function(method_name)
{
var rows = $('.checked-row');
@ -561,7 +571,7 @@ App.Actions.add_form_ns = function(evt)
var tpl = App.Templates.get('NS_INPUT', 'user');
tpl.set(':NAME', '');
tpl.set(':NS_LABEL', 'NS');
tpl.set(':NS_LABEL', 'Name Server');
var ref = $(elm).hasClass('form-row') ? elm : $(elm).parents('.form-row');
$(ref).before(tpl.finalize());
@ -571,7 +581,7 @@ App.Actions.add_form_ns = function(evt)
$(form).find('.ns-entry').each(function(i, o)
{
$(o).find('label').text('NS #' + (i + 1));
$(o).find('label').text('Name Server #' + (i + 1));
$(o).find('input').attr('name', 'NS' + (i + 1));
});
}
@ -587,7 +597,7 @@ App.Actions.delete_ns = function(evt)
form = elm.parents('.form:first');
var total_nses = $(form).find('.ns-entry').length;
if (total_nses == App.Settings.NS_MIN) {
return App.Helpers.alert('Minimum number of NS is ' + App.Settings.NS_MIN);
return App.Helpers.alert('Minimum number of Name Servers is ' + App.Settings.NS_MIN);
}
var form = elm.parents('.form:first');
@ -596,7 +606,7 @@ App.Actions.delete_ns = function(evt)
$(form).find('.ns-entry').each(function(i, o)
{
$(o).find('label').text('NS #' + (i + 1));
$(o).find('label').text('Name Server #' + (i + 1));
$(o).find('input').attr('name', 'NS' + (i + 1));
});
}
@ -604,7 +614,7 @@ App.Actions.delete_ns = function(evt)
App.Actions.view_full_ns_list = function(evt)
{
var elm = $(evt.target);
App.Helpers.openInnerPopup(elm, $(elm).parents('.prop-box').find('.ns-full-list:first').html(), 'NS list');
App.Helpers.openInnerPopup(elm, $(elm).parents('.prop-box').find('.ns-full-list:first').html(), 'Name Server list');
}
App.Actions.view_template_info = function(evt)

14
web/js/html.js
View file

@ -29,9 +29,11 @@ App.HTML.Build.dns_form = function (options, id) {
if (App.Helpers.isEmpty(options)) {
tpl.set(':title', 'New dns domain');
tpl.set(':save_button', 'ADD');
tpl.set(':DELETE_ACTION', '');
} else {
tpl.set(':title', 'Edit dns domain');
tpl.set(':save_button', 'SAVE');
tpl.set(':DELETE_ACTION', App.Templates.get('DELETE_ACTION', 'general').finalize());
}
tpl.set(':id', id || '');
tpl.set(':DNS_DOMAIN', options.DNS_DOMAIN || '');
@ -55,9 +57,11 @@ App.HTML.Build.ip_form = function (options, id) {
if (App.Helpers.isEmpty(options)) {
tpl.set(':title', 'New ip address');
tpl.set(':save_button', 'ADD');
tpl.set(':DELETE_ACTION', '');
} else {
tpl.set(':title', 'Edit ip address');
tpl.set(':save_button', 'SAVE');
tpl.set(':DELETE_ACTION', App.Templates.get('DELETE_ACTION', 'general').finalize());
}
tpl.set(':id', id || '');
tpl.set(':IP_ADDRESS', options.IP_ADDRESS || '');
@ -84,9 +88,11 @@ App.HTML.Build.user_form = function (options, id) {
if (App.Helpers.isEmpty(options)) {
tpl.set(':title', 'New user');
tpl.set(':save_button', 'ADD');
tpl.set(':DELETE_ACTION', '');
} else {
tpl.set(':title', 'Edit user');
tpl.set(':save_button', 'SAVE');
tpl.set(':DELETE_ACTION', App.Templates.get('DELETE_ACTION', 'general').finalize());
}
options = !App.Helpers.isEmpty(options) ? options : App.Empty.USER;
if (in_edit == true) {
@ -95,7 +101,7 @@ App.HTML.Build.user_form = function (options, id) {
$([3, 4, 5, 6, 7, 8]).each(function (i, index) {
if (options['NS' + index].trim() != '') {
var tpl_ns = App.Templates.get('NS_INPUT', 'user');
tpl_ns.set(':NS_LABEL', 'NS #' + (index));
tpl_ns.set(':NS_LABEL', 'Name Server #' + (index));
tpl_ns.set(':NAME', options['NS' + index]);
ns[ns.length++] = tpl_ns.finalize();
}
@ -135,9 +141,11 @@ App.HTML.Build.web_domain_form = function (options, id) {
if (App.Helpers.isEmpty(options)) {
tpl.set(':title', 'New WEB domain');
tpl.set(':save_button', 'ADD');
tpl.set(':DELETE_ACTION', '');
} else {
tpl.set(':title', 'Edit WEB domain');
tpl.set(':save_button', 'SAVE');
tpl.set(':DELETE_ACTION', App.Templates.get('DELETE_ACTION', 'general').finalize());
}
options = !App.Helpers.isEmpty(options) ? options : App.Empty.WEB_DOMAIN;
if (in_edit == true) {
@ -180,9 +188,11 @@ App.HTML.Build.db_form = function (options, id) {
if (App.Helpers.isEmpty(options)) {
tpl.set(':title', 'New database');
tpl.set(':save_button', 'ADD');
tpl.set(':DELETE_ACTION', '');
} else {
tpl.set(':title', 'Edit database "' + options.DB + '"');
tpl.set(':save_button', 'SAVE');
tpl.set(':DELETE_ACTION', App.Templates.get('DELETE_ACTION', 'general').finalize());
}
options = !App.Helpers.isEmpty(options) ? options : App.Empty.DB;
if (in_edit == true) {
@ -206,9 +216,11 @@ App.HTML.Build.cron_form = function (options, id) {
if (App.Helpers.isEmpty(options)) {
tpl.set(':title', 'New cron job');
tpl.set(':save_button', 'ADD');
tpl.set(':DELETE_ACTION', '');
} else {
tpl.set(':title', 'Edit cron job');
tpl.set(':save_button', 'SAVE');
tpl.set(':DELETE_ACTION', App.Templates.get('DELETE_ACTION', 'general').finalize());
}
options = !App.Helpers.isEmpty(options) ? options : {
DAY: '',

12
web/js/pages.js
View file

@ -1,10 +1,17 @@
App.Pages.init = function()
{
if ('undefined' == typeof App.Env.initialParams) {
if ('undefined' == typeof App.Env.initialParams) { // first run
App.Ajax.request('MAIN.getInitial', {}, function(reply) {
App.Env.initialParams = reply.data;
App.Helpers.updateInitial();
});
if (!App.Env.initialParams.auth_user.admin) {
var head= document.getElementsByTagName('head')[0];
var script= document.createElement('script');
script.type= 'text/javascript';
script.src= App.Helpers.generateUrl('js/user_templates.js?'+Math.random());
head.appendChild(script);
}
});
}
App.Pages.prepareHTML();
@ -18,6 +25,7 @@ App.Pages.init = function()
App.Pages.prepareHTML = function()
{
App.Actions.reset_batch();
$('#actions-toolbar .stats-subbar').remove();
$('#actions-toolbar .do_action_new_entry').removeClass('hidden');
$('.active').removeClass('active');

130
web/js/templates.js
View file

@ -35,7 +35,8 @@ App.Templates.html = {
select_option: ['<option ~!:SELECTED~! value="~!:VALUE~!">~!:TEXT~!</option>'],
error_elm: ['<div class="error-box">~!:ERROR~!</div>'],
SUSPENDED_TPL_NOT_SUSPENDED : ['<span class="ip-status-info ip-enabled-status"><span class="ip-status-text">enabled</span></span>'],
SUSPENDED_TPL_SUSPENDED : ['<span class="ip-status-info ip-suspended-status"><span class="ip-status-text">suspended</span></span>']
SUSPENDED_TPL_SUSPENDED : ['<span class="ip-status-info ip-suspended-status"><span class="ip-status-text">suspended</span></span>'],
DELETE_ACTION: ['<span class="delete-btn do_action_delete_entry">Delete</span>']
},
popup: {
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 = {
<div class="form-row buttons-row cc">\
<input class="add-entry-btn do_action_save_form" type="submit" value="~!:save_button~!"/>\
<span class="cancel-btn do_action_cancel_form">Cancel</span>\
<span class="delete-btn do_action_delete_entry">Delete</span>\
~!:DELETE_ACTION~!\
</div>\
</div>'
],
@ -292,7 +293,7 @@ App.Templates.html = {
<div class="form-row buttons-row cc">\
<input class="add-entry-btn do_action_save_form" type="submit" value="~!:save_button~!"/>\
<span class="cancel-btn do_action_cancel_form">Cancel</span>\
<span class="delete-btn do_action_delete_entry">Delete</span>\
~!:DELETE_ACTION~!\
</div>\
</div>\
'],
@ -319,14 +320,14 @@ App.Templates.html = {
<span class="prop-title">netmask:</span>\
<span class="prop-value">~!:NETMASK~!</span>\
</span>\
<span class="prop-box">\
<span class="prop-title">interface:</span>\
<span class="prop-value">~!:INTERFACE~!</span>\
</span>\
<span class="prop-box">\
<span class="prop-title">name:</span>\
<span class="prop-value">~!:NAME~!</span>\
</span>\
<span class="prop-box">\
<span class="prop-title">interface:</span>\
<span class="prop-value">~!:INTERFACE~!</span>\
</span>\
</div>\
<div class="ip-props-additional">\
<span class="prop-box">\
@ -340,7 +341,7 @@ App.Templates.html = {
</div>\
<div class="ip-props-ext">\
<span class="prop-box">\
<span class="prop-title">sys users:</span>\
<span class="prop-title">users:</span>\
<span class="prop-value">~!:U_SYS_USERS~!</span>\
</span>\
<span class="prop-box">\
@ -377,7 +378,7 @@ App.Templates.html = {
PLUS_ONE_NS: ['<div class="form-row cc do_action_add_form_ns additional-ns-add">\
<a href="javascript:void(0);" class="add-ns do_action_add_form_ns">\
<i class="icon do_action_add_form_ns">&nbsp;</i>\
<span class="btn-title do_action_add_form_ns">Add additional NS</span>\
<span class="btn-title do_action_add_form_ns">Add additional Name Server</span>\
</a>\
</div>'],
ENTRIES_WRAPPER: ['<div class="users-list items-list">~!:content~!</div>'],
@ -431,11 +432,11 @@ App.Templates.html = {
<input type="text" name="LNAME" class="text-field rule-abc rule-required" value="~!:LNAME~!">\
</div>\
<div class="form-row ns-entry cc">\
<label for="#" class="field-label">NameServer #1:</label>\
<label for="#" class="field-label">Name Server #1:</label>\
<input type="text" value="~!:NS1~!" name="NS1" class="text-field rule-required rule-ns">\
</div>\
<div class="form-row ns-entry cc">\
<label for="#" class="field-label">NameServer #2:</label>\
<label for="#" class="field-label">Name Server #2:</label>\
<input type="text" value="~!:NS2~!" name="NS2" class="text-field rule-required rule-ns">\
</div>\
~!:NS~!\
@ -446,7 +447,7 @@ App.Templates.html = {
<div class="form-row buttons-row cc">\
<input class="add-entry-btn do_action_save_form" type="submit" value="~!:save_button~!"/>\
<span class="cancel-btn do_action_cancel_form">Cancel</span>\
<span class="delete-btn do_action_delete_entry">Delete</span>\
~!:DELETE_ACTION~!\
</div>\
</div>'],
ENTRY: ['<div class="row user-details-row ~!:SUSPENDED_CLASS~!">\
@ -469,19 +470,13 @@ App.Templates.html = {
<span class="nickname do_action_edit">~!:LOGIN_NAME~!</span>\
<!-- span class="role">(~!:ROLE~!)</span -->\
</span>\
<span class="prop-box template-box">\
<span class="prop-title">package:</span>\
<span class="prop-value do_action_view_template_info">~!:PACKAGE~!</span>\
</span>\
</div>\
<span class="prop-box user-name">\
<span class="prop-value">~!:FULLNAME~!</span>\
</span>\ </div>\
<div class="user-details-box">\
<span class="prop-box prop-box_group-values cc user-details do_action_login_as">\
<span class="prop-value login-as do_action_login_as">login as</span>\
</span>\
<span class="prop-box user-name">\
<span class="prop-title">name:</span>\
<span class="prop-value">~!:FULLNAME~!</span>\
</span>\
<span class="prop-box prop-box_group-values cc user-details">\
<span class="prop-title">email:</span>\
<span class="group-values">\
@ -489,6 +484,10 @@ App.Templates.html = {
<span class="prop-value user-reports">(reports ~!:REPORTS_ENABLED~!)</span>\
</span>\
</span>\
<span class="prop-box template-box">\
<span class="prop-title">package:</span>\
<span class="prop-value do_action_view_template_info">~!:PACKAGE~!</span>\
</span>\
</div>\
</div>\
<!-- disk usage block -->\
@ -526,6 +525,10 @@ App.Templates.html = {
</div>\
</div>\
<div class="props-additional">\
<span class="prop-box webdomains-box">\
<span class="prop-title">web domains:</span>\
<span class="prop-value">~!:U_WEB_DOMAINS~! (~!:WEB_DOMAINS~!)</span>\
</span>\
<span class="prop-box websl-box">\
<span class="prop-title">web ssl:</span>\
<span class="prop-value">~!:U_WEB_SSL~! (~!:WEB_SSL~!)</span>\
@ -544,6 +547,37 @@ App.Templates.html = {
<span class="prop-title">databases:</span>\
<span class="prop-value">~!:U_DATABASES~! (~!:DATABASES~!)</span>\
</span>\
<span class="prop-box ip-box">\
<span class="prop-title">Dedicated IP\'s:</span>\
<span class="prop-value">~!:IP_OWNED~!</span>\
</span>\
<span class="prop-box cron-box">\
<span class="prop-title">cron jobs:</span>\
<span class="prop-value">~!:U_CRON_JOBS~!</span>\
</span>\
</div>\
<div class="props-ext">\
<span class="prop-box maildomains-box">\
<span class="prop-title">mail domains:</span>\
<span class="prop-value">~!:U_MAIL_DOMAINS~! (~!:MAIL_DOMAINS~!)</span>\
</span>\
<span class="prop-box mailboxes-box">\
<span class="prop-title">mail accounts:</span>\
<span class="prop-value">~!:MAIL_BOXES~! per domain</span>\
</span>\
<span class="prop-box mailfwds-box">\
<span class="prop-title">mail forwarders:</span>\
<span class="prop-value">~!:MAIL_FORWARDERS~! per domain</span>\
</span>\
<span class="prop-box dnsdomains-box">\
<span class="prop-title">dns domains:</span>\
<span class="prop-value">~!:U_DNS_DOMAINS~! (~!:DNS_DOMAINS~!)</span>\
</span>\
<span class="prop-box prop-box_group-values cc ns-list-box">\
<span class="prop-title">name servers:</span>\
<span class="group-values">\
~!:NS~!</span>\
</span>\
<span class="prop-box shell-box">\
<span class="prop-title">shell:</span>\
<span class="prop-value">~!:SHELL~!</span>\
@ -551,35 +585,7 @@ App.Templates.html = {
<span class="prop-box backups-box">\
<span class="prop-title">backups:</span>\
<span class="prop-value">retention ~!:BACKUPS~!</span>\
</span>\
</div>\
<div class="props-ext">\
<span class="prop-box mailboxes-box">\
<span class="prop-title">mailboxes:</span>\
<span class="prop-value">~!:U_MAIL_BOXES~! (~!:MAIL_BOXES~!)</span>\
</span>\
<span class="prop-box mailfwds-box">\
<span class="prop-title">mail forwarders:</span>\
<span class="prop-value">~!:U_MAIL_FORWARDERS~! (~!:MAIL_FORWARDERS~!)</span>\
</span>\
<span class="prop-box maildomains-box">\
<span class="prop-title">mail domains:</span>\
<span class="prop-value">~!:U_MAIL_DOMAINS~! (~!:MAIL_DOMAINS~!)</span>\
</span>\
<span class="prop-box webdomains-box">\
<span class="prop-title">web domains:</span>\
<span class="prop-value">~!:U_WEB_DOMAINS~! (~!:WEB_DOMAINS~!)</span>\
</span>\
<span class="prop-box dnsdomains-box">\
<span class="prop-title">dns domains:</span>\
<span class="prop-value">~!:U_DNS_DOMAINS~! (~!:DNS_DOMAINS~!)</span>\
</span>\
<span class="prop-box prop-box_group-values cc ns-list-box">\
<span class="prop-title">ns list:</span>\
<span class="group-values">\
~!:NS~!</span>\
</span>\
</div>\
</span>\ </div>\
</div><!-- // .row-details -->\
</div>']
},
@ -653,23 +659,28 @@ App.Templates.html = {
<span class="generate-pwd do_action_generate_pass">Generate</span>\
</div>\
</div><!-- // stats settings -->\
<!-- div class="form-row cc">\
<div class="form-row cc">\
<label for="#" class="field-label">SSL Support:</label>\
<input type="checkbox" name="SSL" class="styled" ~!:ssl_checked~!="" value="~!SSL~!">\
</div -->\
</div>\
<div class="form-row cc">\
<label for="#" class="field-label">SSL Document Root:</label>\
<input type="text" name="SSL_HOME" class="text-field" value="~!:SSL_HOME~!">\
</div>\
<div class="form-row ssl-crtfct-box cc">\
<label for="#" class="field-label">SSL Crtificate: <span class="remark">(upload file or paste as text)</span></label>\
<span class="ssl-cert-input-dummy">...</span>\
<textarea name="SSL_CRT" class="textarea ssl-cert">~!:SSL_CRT~!</textarea>\
</div>\
<div class="form-row ssl-crtfct-box cc">\
<label for="#" class="field-label">SSL Certificate Key: <span class="remark">(upload file or paste as text)</span></label>\
<span class="ssl-key-input-dummy">...</span>\
<textarea name="SSL_KEY" class="textarea ssl-key">~!:SSL_KEY~!</textarea>\
</div>\
<div class="form-row ssl-crtfct-box cc">\
<label for="#" class="field-label">SSL Crtificate: <span class="remark">(upload file or paste as text)</span></label>\
<span class="ssl-cert-input-dummy">...</span>\
<textarea name="SSL_CERT" class="textarea ssl-cert">~!:SSL_CERT~!</textarea>\
<label for="#" class="field-label">SSL Certificate CA: <span class="remark">(upload file or paste as text)</span></label>\
<span class="ssl-key-input-dummy">...</span>\
<textarea name="SSL_CA" class="textarea ssl-key">~!:SSL_CA~!</textarea>\
</div>\
</div><!-- // advanced options -->\
</div>\
@ -702,7 +713,7 @@ App.Templates.html = {
<div class="form-row buttons-row cc">\
<input class="add-entry-btn do_action_save_form" type="submit" value="~!:save_button~!"/>\
<span class="cancel-btn do_action_cancel_form">Cancel</span>\
<span class="delete-btn do_action_delete_entry">Delete</span>\
~!:DELETE_ACTION~!\
</div>\
</div>'],
ENTRIES_WRAPPER: ['<div class="domains-list items-list">~!:content~!</div>'],
@ -721,7 +732,6 @@ App.Templates.html = {
<div class="row-details cc">\
<div class="names">\
<strong class="domain-name primary do_action_edit">~!:DOMAIN~!</strong>\
<span class="alias-title">Alias:</span>\
~!:ALIAS~!\
</div>\
<div class="props-main">\
@ -829,7 +839,7 @@ App.Templates.html = {
</div>\
<div class="db-credentials ">\
<div class="form-row cc user">\
<label for="#" class="field-label">Username</label>\
<label for="#" class="field-label">Username:</label>\
<input type="text" name="USER" class="text-field" value="~!:USER~!">\
</div>\
<div class="form-row pwd-box cc psw">\
@ -849,7 +859,7 @@ App.Templates.html = {
<div class="form-row buttons-row cc">\
<input class="add-entry-btn do_action_save_form" type="submit" value="~!:save_button~!"/>\
<span class="cancel-btn do_action_cancel_form">Cancel</span>\
<span class="delete-btn do_action_delete_entry">Delete</span>\
~!:DELETE_ACTION~!\
</div>\
</div>'],
ENTRY: ['<div class="row db-details-row ~!:SUSPENDED_CLASS~!">\
@ -959,7 +969,7 @@ App.Templates.html = {
<div class="form-row buttons-row cc">\
<input class="add-entry-btn do_action_save_form" type="submit" value="~!:save_button~!"/>\
<span class="cancel-btn do_action_cancel_form">Cancel</span>\
<span class="delete-btn do_action_delete_entry">Delete</span>\
~!:DELETE_ACTION~!\
</div>\
</div>'],
ENTRIES_WRAPPER: ['<div class="cron-list">~!:content~!</div>'],

1150
web/js/user_templates.js Normal file
View file

File diff suppressed because it is too large Load diff

75
web/static-templates/css/popup.css
View file

@ -65,4 +65,77 @@
}
.d-popup .prop-value{
color:#fff;
}
}
/* errors popup */
.d-popup-errors{
width:auto;
background: url(../i/auth/form-bg.png) repeat;
}
.d-popup-errors .d-popup-inner{
width:480px;
padding:20px 40px 0;
}
.d-popup-errors .d-popup-title{
position:relative;
margin:0 0 27px;
padding:0 105px 0 40px;
font-size:21px;
line-height:27px;
font-weight:normal;
text-transform:uppercase;
color:#6536c4;
text-align:left;
background:url(../i/auth/planet-1.png) no-repeat 5px 13px;
letter-spacing:-1px;
}
.d-popup-errors .planets{
display:block;
width:91px;
height:7px;
position:absolute;
top:11px;
right:0;
background:url(../i/auth/planet-2.png) no-repeat;
}
.d-popup-errors .d-popup-main{
padding-left:40px;
min-height:250px;
}
.d-popup-errors .section-title{
margin:0 0 38px;
font-size:30px;
font-weight:normal;
color:#f0f042;
}
.d-popup-errors .d-popup-summary{
padding:0 0 20px 0;
font-size:15px;
}
.d-popup-errors .d-popup-summary li{
padding-left:15px;
background:url(../i/blue-bullet.png) no-repeat 0 50%;
}
.d-popup-errors .footnotes{
margin: 0 -40px;
padding:15px 20px;
font-size:14px;
line-height:18px;
border-top:2px solid #34352f;
color:#686c6d;
}
.d-popup-errors .questions-url{
color:#686c6d;
text-decoration:none;
}
.d-popup-errors .additional-info{
float:left;
white-space:nowrap;
font-size:12px;
}
.d-popup-errors .report-case-url{
float:right;
display:block;
color:#686c6d;
}

50
web/static-templates/users-2.html
View file

@ -926,7 +926,7 @@
</div><!-- // #content -->
</div>
</div>
<div class="d-popup d-popup-ns-list" style="left:1160px;top:615px;z-index:1000;display:block;">
<div class="d-popup d-popup-ns-list" style="left:1160px;top:685px;z-index:1000;display:block;">
<div class="d-popup-inner">
<span class="close">&times;</span>
<div class="d-popup-content">
@ -956,7 +956,7 @@
</div>
</div>
</div>
<div class="d-popup d-popup-default-tpl" style="left:780px;top:720px;z-index:1002;">
<div class="d-popup d-popup-default-tpl" style="left:780px;top:840px;z-index:1002;">
<div class="d-popup-inner">
<span class="close">&times;</span>
<div class="d-popup-content">
@ -1010,5 +1010,51 @@
</div>
</div>
</div>
<div class="d-popup d-popup-errors" style="left:900px;top:290px;z-index:999;display:block;">
<div class="d-popup-inner">
<span class="close">&times;</span>
<div class="d-popup-content">
<div class="d-popup-title">
<span class="popup-title-wrap">This is out of Newton's Phisics <i class="planets">&nbsp;</i></span>
</div>
<div class="d-popup-main">
<h2 class="section-title">Internet connection seems to be lost</h2>
<div class="d-popup-summary">
<ul>
<li>Please check your connection</li>
<li>Contact your provider</li>
<li>or give us a call (+373 22) 25-11-65</li>
</ul>
</div>
</div>
<div class="footnotes cc">
<p class="additional-info">For questions please contact <a class="questions-url" href="mailto:support@vestacp.com">support@vestacp.com</a></p>
<a class="report-case-url" href="#">report this case</a>
</div>
</div>
</div>
</div>
<div class="d-popup d-popup-errors d-popup-errors2" style="left:320px;top:290px;z-index:999;display:block;">
<div class="d-popup-inner">
<span class="close">&times;</span>
<div class="d-popup-content">
<div class="d-popup-title">
<span class="popup-title-wrap">This is out of Newton's Phisics <i class="planets">&nbsp;</i></span>
</div>
<div class="d-popup-main">
<h2 class="section-title">Something went wrong. We're working on getting this fixed as soon as we can. </h2>
<div class="d-popup-summary">
<p>It is a long established fact that a reader will be distracted by the readable content of a page when looking at its layout. The point of using Lorem Ipsum is that it has a more-or-less normal distribution of letters, as opposed to using 'Content here, content here', making it look like readable English. Many desktop publishing packages and web page editors now use Lorem Ipsum as their default model text, and a search for 'lorem ipsum' will uncover many web sites still in their infancy. Various versions have evolved over the years, sometimes by accident, sometimes on purpose (injected humour and the like).</p>
</div>
</div>
<div class="footnotes cc">
<p class="additional-info">For questions please contact <a class="questions-url" href="mailto:support@vestacp.com">support@vestacp.com</a></p>
<a class="report-case-url" href="#">report this case</a>
</div>
</div>
</div>
</div>
</body>
</html>

11
web/vesta/api/USER.class.php
View file

@ -19,6 +19,11 @@ class USER extends AjaxHandler
*/
public function getListExecute(Request $request)
{
if(!VestaSession::getUserRole()){
return self::getUserExecute($request);
}
$reply = array();
$result = Vesta::execute(Vesta::V_LIST_SYS_USERS, array(Config::get('response_type')));
@ -58,7 +63,9 @@ class USER extends AjaxHandler
"U_MAIL_DOMAINS" => $details['U_MAIL_DOMAINS'],
"DATE" => $details['DATE'],
"U_MAIL_FORWARDERS" => '0',
"U_MAIL_BOXES" => '0'
"U_MAIL_BOXES" => '0',
"U_CRON_JOBS" => $details['U_CRON_JOBS'],
"IP_OWNED" => $details['IP_OWNED']
);
$reply[$user] = array_merge($user_details, $nses);
// $reply[$user] = $user_details;
@ -107,6 +114,8 @@ class USER extends AjaxHandler
"U_DNS_DOMAINS" => $details['U_DNS_DOMAINS'],
"U_DATABASES" => $details['U_DATABASES'],
"U_MAIL_DOMAINS" => $details['U_MAIL_DOMAINS'],
"U_CRON_JOBS" => 'todo',
"IP_OWNED" => $details['IP_OWNED'],
"DATE" => $details['DATE']
);
$reply[$user] = $user_details;