diff --git a/web/index.html b/web/index.html index 8bcb52b0..febb7127 100644 --- a/web/index.html +++ b/web/index.html @@ -217,7 +217,7 @@
- All + None
@@ -226,6 +226,10 @@
 
' ], @@ -292,7 +293,7 @@ App.Templates.html = {
\ \ Cancel\ - Delete\ + ~!:DELETE_ACTION~!\
\
\ '], @@ -319,14 +320,14 @@ App.Templates.html = { netmask:\ ~!:NETMASK~!\ \ - \ - interface:\ - ~!:INTERFACE~!\ - \ \ name:\ ~!:NAME~!\ \ + \ + interface:\ + ~!:INTERFACE~!\ + \
\
\ \ @@ -340,7 +341,7 @@ App.Templates.html = {
\
\ \ - sys users:\ + users:\ ~!:U_SYS_USERS~!\ \ \ @@ -377,7 +378,7 @@ App.Templates.html = { PLUS_ONE_NS: ['
\ \  \ - Add additional NS\ + Add additional Name Server\ \
'], ENTRIES_WRAPPER: ['
~!:content~!
'], @@ -431,11 +432,11 @@ App.Templates.html = { \
\
\ - \ + \ \
\
\ - \ + \ \
\ ~!:NS~!\ @@ -446,7 +447,7 @@ App.Templates.html = {
\ \ Cancel\ - Delete\ + ~!:DELETE_ACTION~!\
\
'], ENTRY: ['
\ @@ -469,19 +470,13 @@ App.Templates.html = { ~!:LOGIN_NAME~!\ \ \ - \ - package:\ - ~!:PACKAGE~!\ - \ -
\ + \ + ~!:FULLNAME~!\ + \ \
\ \ \ \ - \ - name:\ - ~!:FULLNAME~!\ - \ \ email:\ \ @@ -489,6 +484,10 @@ App.Templates.html = { (reports ~!:REPORTS_ENABLED~!)\ \ \ + \ + package:\ + ~!:PACKAGE~!\ + \
\ \ \ @@ -526,6 +525,10 @@ App.Templates.html = { \ \
\ + \ + web domains:\ + ~!:U_WEB_DOMAINS~! (~!:WEB_DOMAINS~!)\ + \ \ web ssl:\ ~!:U_WEB_SSL~! (~!:WEB_SSL~!)\ @@ -544,6 +547,37 @@ App.Templates.html = { databases:\ ~!:U_DATABASES~! (~!:DATABASES~!)\ \ + \ + Dedicated IP\'s:\ + ~!:IP_OWNED~!\ + \ + \ + cron jobs:\ + ~!:U_CRON_JOBS~!\ + \ +
\ +
\ + \ + mail domains:\ + ~!:U_MAIL_DOMAINS~! (~!:MAIL_DOMAINS~!)\ + \ + \ + mail accounts:\ + ~!:MAIL_BOXES~! per domain\ + \ + \ + mail forwarders:\ + ~!:MAIL_FORWARDERS~! per domain\ + \ + \ + dns domains:\ + ~!:U_DNS_DOMAINS~! (~!:DNS_DOMAINS~!)\ + \ + \ + name servers:\ + \ + ~!:NS~!\ + \ \ shell:\ ~!:SHELL~!\ @@ -551,35 +585,7 @@ App.Templates.html = { \ backups:\ retention ~!:BACKUPS~!\ - \ -
\ -
\ - \ - mailboxes:\ - ~!:U_MAIL_BOXES~! (~!:MAIL_BOXES~!)\ - \ - \ - mail forwarders:\ - ~!:U_MAIL_FORWARDERS~! (~!:MAIL_FORWARDERS~!)\ - \ - \ - mail domains:\ - ~!:U_MAIL_DOMAINS~! (~!:MAIL_DOMAINS~!)\ - \ - \ - web domains:\ - ~!:U_WEB_DOMAINS~! (~!:WEB_DOMAINS~!)\ - \ - \ - dns domains:\ - ~!:U_DNS_DOMAINS~! (~!:DNS_DOMAINS~!)\ - \ - \ - ns list:\ - \ - ~!:NS~!\ - \ -
\ + \ \ \ '] }, @@ -653,23 +659,28 @@ App.Templates.html = { Generate\ \ \ - \ + \
\ \ \
\ +
\ + \ + ...\ + \ +
\
\ \ ...\ \
\
\ - \ - ...\ - \ + \ + ...\ + \
\ \ \ @@ -702,7 +713,7 @@ App.Templates.html = {
\ \ Cancel\ - Delete\ + ~!:DELETE_ACTION~!\
\ '], ENTRIES_WRAPPER: ['
~!:content~!
'], @@ -721,7 +732,6 @@ App.Templates.html = {
\
\ ~!:DOMAIN~!\ - Alias:\ ~!:ALIAS~!\
\
\ @@ -829,7 +839,7 @@ App.Templates.html = {
\
\
\ - \ + \ \
\
\ @@ -849,7 +859,7 @@ App.Templates.html = {
\ \ Cancel\ - Delete\ + ~!:DELETE_ACTION~!\
\
'], ENTRY: ['
\ @@ -959,7 +969,7 @@ App.Templates.html = {
\ \ Cancel\ - Delete\ + ~!:DELETE_ACTION~!\
\
'], ENTRIES_WRAPPER: ['
~!:content~!
'], diff --git a/web/js/user_templates.js b/web/js/user_templates.js new file mode 100644 index 00000000..d4a853a0 --- /dev/null +++ b/web/js/user_templates.js @@ -0,0 +1,1150 @@ +alert('User templates loaded'); +App.Templates.html = { + help: { + DNS_form: ['

Some Things You Just Can\'t Explain

\ + A farmer was sitting in the neighborhood bar getting drunk. A man came in and asked the farmer, "Hey, why are you sitting here on this beautiful day, getting drunk?" The farmer shook his head and replied, "Some things you just can\'t explain."\ + "So what happened that\'s so horrible?" the man asked as he sat down next to the farmer.\ + "Well," the farmer said, "today I was sitting by my cow, milking her. Just as I got the bucket full, she lifted her left leg and kicked over the bucket."\ + "Okay," said the man, "but that\'s not so bad." "Some things you just can\'t explain," the farmer replied. "So what happened then?" the man asked. The farmer said, "I took her left leg and tied it to the post on the left."\ + "And then?"\ + "Well, I sat back down and continued to milk her. Just as I got the bucket full, she took her right leg and kicked over the bucket."\ + The man laughed and said, "Again?" The farmer replied, "Some things you just can\'t explain." "So, what did you do then?" the man asked.\ + "I took her right leg this time and tied it to the post on the right."\ + "And then?"\ + "Well, I sat back down and began milking her again. Just as I got the bucket full, the stupid cow knocked over the bucket with her tail."\ + "Hmmm," the man said and nodded his head. "Some things you just can\'t explain," the farmer said.\ + "So, what did you do?" the man asked.\ + "Well," the farmer said, "I didn\'t have anymore rope, so I took off my belt and tied her tail to the rafter. In that moment, my pants fell down and my wife walked in ... Some things you just can\'t explain."'] + }, + general: { + logged_as: ['
You (~!:YOU_ARE~!) are viewing ~!:USER~! interface. Exit it to return to your own.
'], + over_bar: [''], + loading: ['
\ +
\ +
'], + popup: ['\ +
~!:content~!
'], + inner_popup: ['
\ +
\ + ×\ +
~!:POPUP_TITLE~!
\ +
\ + ~!:CONTENT~!\ +
\ +
\ +
'], + select_option: [''], + error_elm: ['
~!:ERROR~!
'], + SUSPENDED_TPL_NOT_SUSPENDED : ['enabled'], + SUSPENDED_TPL_SUSPENDED : ['suspended'] + }, + popup: { + error: ['

Important: An Error Has Occured.

    Something went wrong and some of your actions can be not saved in system. Mostly, it happens when you have network connection errors.
,    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 this email: BLABLA,

Sorry for inconvinience. (We recommend you to reload the page)
'], + change_psw: [ + '
\ +
\ +
\ + \ + ~!:VERSION~!\ +
\ + ~!:PRODUCT_NAME~! \ +
\ +
\ +
\ + \ + \ +
\ +
\ + \ + \ + \ +
\ + \ + \ +
\ +
\ +  \ +
\ + \ +
\ +
\ +

\ +
\ +

For questions please contact ~!:EMAIL~!

\ +
© ~!:YEAR~! Vesta Control Panel
\ +
\ +
\ +
\ +
' + ], + login: ['
\ +
\ +
\ + \ + ~!:VERSION~!\ +
\ + ~!:PRODUCT_NAME~! \ +
\ +
\ +
\ + \ + \ +
\ +
\ + \ + \ +
\ + \ +
\ +
\ + \ + \ +
\ + \ +
\ +
\ +

forgot password?

\ +
\ +

For questions please contact ~!:EMAIL~!

\ +
© ~!:YEAR~! Vesta Control Panel
\ +
\ +
\ +
\ +
'] + }, + dates: { + 'lock_plan_date' : [''], + 'save_forecasted_date' : [''] + }, + dns: { + FORM: [ + '
\ + \ + \ +
~!:title~!
\ + \ +
\ + \ + \ + \ +
\ +
\ + \ +
\ + \ +  \ +
\ +
\ +
\ + \ + ~!:TPL_DEFAULT_VALUE~!\ + \ + View template settings\ +
\ +
\ + \ + \ +
\ +
\ + \ + \ +
\ +
\ + \ + \ +
\ +
\ + \ + Cancel\ + Delete\ +
\ +
' + ], + ENTRIES_WRAPPER: ['
~!:content~!
'], + ENTRY: ['
\ + \ + \ +
\ +
\ +
\ + ~!:SUSPENDED_TPL~!\ +
\ +
\ +
\ +
~!:DATE~!
\ +
\ +
\ +
\ +
\ + ~!:DNS_DOMAIN~!\ +
\ +
Show records
\ +
\ +
\ +
\ + ~!:IP~!\ + \ + template:\ + \ + ~!:TPL~!\ + \ +
\ +
\ +
\ + \ + ttl:\ + ~!:TTL~!\ + \ + \ + soa:\ + ~!:SOA~!\ + \ +
\ +
\ +
'], + SUBFORM: ['
\ +
\ +
Hide records
\ +
\ +
\ +
\ +
\ +  add dns record\ +
\ + ~!:SUBRECORDS~!\ +
\ + \ + Cancel\ + \ +
\ +
'], + SUBENTRY: ['
\ + \ +
\ + \ +
\ + \ +
in
\ +
\ +
\ +
\ + \ + \ + \ +
\ +
\ + \ + \ +
\ +
\ +
'] + }, + ip: { + FORM: ['\ +
\ + \ + \ +
~!:title~!
\ + \ +
\ + \ + \ +
\ +
\ + \ +
\ + \ +
\ +
\ +
\ + \ + \ + \ +
\ +
\ + \ + \ +
\ +
\ + \ + \ + \ +
\ +
\ + \ + \ +
\ +
\ + \ + \ +
\ +
\ + \ + Cancel\ + Delete\ +
\ +
\ + '], + DOT: ['.'], + ENTRY: ['\ +
\ + \ + \ +
\ +
\ +
\ + ~!:SUSPENDED_TPL~!\ +
\ +
\ +
\ +
~!:DATE~!
\ +
\ +
\ +
\ +
\ + ~!:IP_ADDRESS~!\ +
\ + \ + netmask:\ + ~!:NETMASK~!\ + \ + \ + interface:\ + ~!:INTERFACE~!\ + \ + \ + name:\ + ~!:NAME~!\ + \ +
\ +
\ + \ + owner:\ + ~!:OWNER~!\ + \ + \ + status:\ + ~!:STATUS~!\ + \ +
\ +
\ + \ + sys users:\ + ~!:U_SYS_USERS~!\ + \ + \ + web domains:\ + ~!:U_WEB_DOMAINS~!\ + \ +
\ +
\ +
\ + '], + ENTRIES_WRAPPER: ['
~!:content~!
'], + SUSPENDED_TPL_ENABLED : ['enabled\ + delete'], + SUSPENDED_TPL_DISABLED : ['suspended'] + }, + + + user: { + WEB_TPL_MINIMIZED: ['~!:WEB_TPL_MINI~!\ + \ + ~!:MORE_NUMBER~! more\ + '], + WEB_TPL: ['~!:NAME~!'], + NS_MINIMIZED: ['~!:NS_MINI~!\ + \ + ~!:MORE_NUMBER~! more\ + '], + NS_RECORD: ['~!:NAME~!'], + NS_INPUT: ['
\ + \ + \ + \ +
'], + PLUS_ONE_NS: ['
\ + \ +  \ + Add additional NS\ + \ +
'], + ENTRIES_WRAPPER: ['
~!:content~!
'], + FORM: ['
\ + \ + \ +
~!:title~!
\ + \ +
\ + \ + \ +
\ +
\ + \ + \ + Generate\ +
\ +
\ + \ + \ +
\ +
\ + \ + \ +
\ + \ +
\ + \ + \ +
\ +
\ + \ + \ +
\ +
\ + \ + \ +
\ +
\ + \ + \ +
\ +
\ + \ + \ +
\ +
\ + \ + \ +
\ + ~!:NS~!\ +
\ + \ + \ +
\ +
\ + \ + Cancel\ + Delete\ +
\ +
'], + ENTRY: ['
\ + \ + \ +
\ +
\ +
\ + ~!:SUSPENDED_TPL~!\ +
\ +
\ +
\ +
~!:DATE~!
\ +
\ +
\ +
\ +
\ +
\ + \ + ~!:LOGIN_NAME~!\ + \ + \ + \ + package:\ + ~!:PACKAGE~!\ + \ +
\ +
\ + \ + name:\ + ~!:FULLNAME~!\ + \ + \ + email:\ + \ + ~!:CONTACT~!\ + (reports ~!:REPORTS_ENABLED~!)\ + \ + \ +
\ +
\ + \ + \ +
\ +
stats
\ + \ +
\ + disk usage:\ +
\ +
\ +
\ + ~!:U_DISK_PERCENTAGE~!% (~!:U_DISK~! ~!:DISK_QUOTA_MEASURE~!)\ + \ + ~!:OVER_BAR~!\ +
\ +
\ +
~!:DISK_QUOTA~! ~!:DISK_QUOTA_MEASURE_2~!
\ +
\ +
\ +
\ + \ +
\ + bandwidth:\ +
\ +
\ +
\ + ~!:U_BANDWIDTH_PERCENTAGE~!% (~!:U_BANDWIDTH~! ~!:BANDWIDTH_MEASURE~!)\ + \ + ~!:OVER_BAR_2~!\ +
\ +
\ +
~!:BANDWIDTH~! ~!:BANDWIDTH_MEASURE_2~!
\ +
\ +
\ +
\ +
\ + \ + web ssl:\ + ~!:U_WEB_SSL~! (~!:WEB_SSL~!)\ + \ + \ + web alias:\ + ~!:WEB_ALIASES~! per domain\ + \ + \ + web templates:\ + \ + ~!:WEB_TPL~!\ + \ + \ + \ + databases:\ + ~!:U_DATABASES~! (~!:DATABASES~!)\ + \ + \ + shell:\ + ~!:SHELL~!\ + \ + \ + backups:\ + retention ~!:BACKUPS~!\ + \ +
\ +
\ + \ + mailboxes:\ + ~!:U_MAIL_BOXES~! (~!:MAIL_BOXES~!)\ + \ + \ + mail forwarders:\ + ~!:U_MAIL_FORWARDERS~! (~!:MAIL_FORWARDERS~!)\ + \ + \ + mail domains:\ + ~!:U_MAIL_DOMAINS~! (~!:MAIL_DOMAINS~!)\ + \ + \ + web domains:\ + ~!:U_WEB_DOMAINS~! (~!:WEB_DOMAINS~!)\ + \ + \ + dns domains:\ + ~!:U_DNS_DOMAINS~! (~!:DNS_DOMAINS~!)\ + \ + \ + ns list:\ + \ + ~!:NS~!\ + \ +
\ +
\ +
'] + }, + web_domain: { + FORM: ['
\ + \ + \ +
~!:title~!
\ + \ +
\ + \ + \ +
\ +
\ + \ +
\ + \ +
\ +
\ +
\ + \ + \ +
\ +
\ + \ + \ +
\ + \ +
\ + \ + \ +
\ + \ +
\ + \ + Cancel\ + Delete\ +
\ +
'], + ENTRIES_WRAPPER: ['
~!:content~!
'], + ENTRY: ['
\ + \ + \ +
\ +
\ +
\ + ~!:SUSPENDED_TPL~!\ +
\ +
\ +
\ +
~!:DATE~!
\ +
\ +
\ +
\ + ~!:DOMAIN~!\ + Alias:\ + ~!:ALIAS~!\ +
\ +
\ +
\ + ~!:IP~!\ + \ + template:\ + ~!:TPL~!\ + \ +
\ +
\ +
stats
\ + \ +
\ + disk usage:\ +
\ +
\ +
\ + ~!:U_DISK_PERCENTAGE~!% (~!:U_DISK~! ~!:DISK_QUOTA_MEASURE~!)\ + \ + ~!:OVER_BAR~!\ +
\ +
\ +
~!:DISK_QUOTA~! ~!:DISK_QUOTA_MEASURE_2~!
\ +
\ +
\ +
\ + \ +
\ + bandwidth:\ +
\ +
\ +
\ + ~!:U_BANDWIDTH_PERCENTAGE~!% (~!:U_BANDWIDTH~! ~!:BANDWIDTH_MEASURE~!)\ + \ + ~!:OVER_BAR_2~!\ +
\ +
\ +
~!:BANDWIDTH~! ~!:BANDWIDTH_MEASURE_2~!
\ +
\ +
\ +
\ +
\ + \ + php:\ + ~!:PHP~!\ + \ + \ + cgi:\ + ~!:CGI~!\ + \ + \ + elog:\ + ~!:ELOG~!\ + \ + \ + stats:\ + ~!:STAT~!\ + \ + ~!:STATS_AUTH~!\ + \ + \ +
\ +
\ + \ + ssl:\ + ~!:SSL~!\ + \ + \ + nginx:\ + ~!:NGINX~!\ + extension list\ + \ +
\ +
\ +
'] + }, + db: { + USER_ITEMS_WRAPPER: ['
~!:CONTENT~!
'], + USER_ITEM: ['\ + ~!:NAME~!\ + \ + change password'], + DIVIDER: ['
\ + \ + \ + ~!:TYPE~!\ + \ + \ +
'], + ENTRIES_WRAPPER: ['
~!:content~!
'], + FORM: ['
\ + \ + \ +
~!:title~!
\ + \ +
\ + \ + \ +
\ +
\ + \ + \ +
\ +
\ +
\ + \ + \ +
\ +
\ + \ + \ + Generate\ +
\ +
\ + \ +
\ + \ + \ +
\ +
\ + \ + Cancel\ + Delete\ +
\ +
'], + ENTRY: ['
\ + \ + \ +
\ +
\ +
\ + ~!:SUSPENDED_TPL~!\ +
\ +
\ +
\ +
\ + \ + ~!:OWNER~!\ + \ +
\ +
~!:DATE~!
\ +
\ +
\ +
\ +
\ + ~!:DB~!\ +
\ +
\ + \ +
\ + backup\ + \ +
\ +
\ +
\ + ~!:U_DISK~! Mb\ +
\ + \ +
\ +
\ +
~!:DISK~! ~!:DISK_MEASURE~!
\ +
\ +
\ +
\ +
\ +
'] + }, + cron: { + FORM: ['
\ + \ + \ +
~!:title~!
\ + \ +
\ + Schedule Time:\ +
\ + \ +
\ + \ +
\ +
\ +
\ + \ +
\ + \ +
\ +
\ +
\ + \ +
\ + \ +
\ +
\ +
\ + \ +
\ + \ +
\ +
\ +
\ + \ +
\ + \ +
\ +
\ +
\ +
\ + \ + \ +
\ + \ +
\ + \ + \ +
\ +
\ + \ + Cancel\ + Delete\ +
\ +
'], + ENTRIES_WRAPPER: ['
~!:content~!
'], + ENTRY: ['
\ + \ + \ +
\ +
\ +
\ + ~!:SUSPENDED_TPL~!\ +
\ +
\ +
\ +
~!:DATE~!
\ +
\ +
\ +
\ + \ + min\ + ~!:MIN~!\ + \ + \ + hour\ + ~!:HOUR~!\ + \ + \ + day of Month\ + ~!:DAY~!\ + \ + \ + Month\ + ~!:MONTH~!\ + \ + \ + day of Week\ + ~!:WDAY~!\ + \ +
\ +
\ + ~!:CMD~!\ +
\ + \ +
\ +
'] + }, + backup: { + WRAPPER: ['
~!:CONTENT~!
'], + ENTRY: ['
\ + \ +
\ +
\ +
\ + \ + owner:\ + ~!:OWNER~!\ + \ +
\ +
\ +
\ +
\ + \ + \ + ~!:CREATED_AT~!\ + ~!:CREATED_AT_TIME~!\ + \ + ~!:CREATED_AT_WDAY~!\ + \ + \ + Generation time:\ + ~!:GENERATION_TIME~!\ + \ +
\ +
\ + \ + ~!:SIZE~!\ + \ + download\ +
\ +
\ +
\ + restore\ + \ + detailed\ + restore\ + \ +
\ +
\ +
\ +
'] + }, + stats: { + WRAPPER: ['
~!:CONTENT~!
'], + ENTRY: ['
\ +

~!:HEADER~!

\ +
\ + \ +
\ +
'], + SUBMENU: ['today\ + week\ + month\ + year
'] + } +} + + +// Internals +var Tpl = App.Templates; +var Templator = function() +{ + var init = function() { + fb.info('Templator work'); + Templator.splitThemAll(); + Templator.freezeTplIndexes(); + }; + + /** + * Split the tpl strings into arrays + */ + Templator.splitThemAll = function() + { + fb.info('splitting tpls'); + $.each(App.Templates.html, function(o) { + var tpls = App.Templates.html[o]; + $.each(tpls, function(t) { + tpls[t] = tpls[t][0].split('~!'); + }); + }); + }, + + /** + * Iterates tpls + */ + Templator.freezeTplIndexes = function() + { + fb.info('freezing tpl keys'); + $.each(App.Templates.html, Templator.cacheTplIndexes); + }, + + /** + * Grab the tpl group key and process it + */ + Templator.cacheTplIndexes = function(key) + { + var tpls = App.Templates.html[key]; + $.each(tpls, function(o) { + var tpl = tpls[o]; + Templator.catchIndex(key, o, tpl); + }); + }, + + /** + * Set the indexes + */ + Templator.catchIndex = function(key, ref_key, tpl) + { + 'undefined' == typeof App.Templates._indexes[key] ? App.Templates._indexes[key] = {} : false; + 'undefined' == typeof App.Templates._indexes[key][ref_key] ? App.Templates._indexes[key][ref_key] = {} : false; + $(tpl).each(function(index, o) { + if(':' == o.charAt(0)){ + App.Templates._indexes[key][ref_key][o.toString()] = index; + } + }); + } + + /** + * Get concrete templates + */ + init(); + return Templator; +}; +Templator.getTemplate = function(ns, key) +{ + return [ + App.Templates._indexes[ns][key], + App.Templates.html[ns][key].slice(0) + ]; +} +// init templator +Tpl.Templator = Templator(); +Tpl.get = function(key, group) +{ + return Tpl.Templator.getTemplate(group, key); +} diff --git a/web/static-templates/css/popup.css b/web/static-templates/css/popup.css index d38b22b8..f33952ff 100644 --- a/web/static-templates/css/popup.css +++ b/web/static-templates/css/popup.css @@ -65,4 +65,77 @@ } .d-popup .prop-value{ color:#fff; -} \ No newline at end of file +} + +/* 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; + } diff --git a/web/static-templates/users-2.html b/web/static-templates/users-2.html index d6490df4..abf4b9cc 100644 --- a/web/static-templates/users-2.html +++ b/web/static-templates/users-2.html @@ -926,7 +926,7 @@
-
+
×
@@ -956,7 +956,7 @@
-
+
×
@@ -1010,5 +1010,51 @@
+
+
+ × +
+
+ This is out of Newton's Phisics   +
+
+

Internet connection seems to be lost

+
+
    +
  • Please check your connection
    • +
  • Contact your provider
    • +
  • or give us a call (+373 22) 25-11-65
    • +
+
+
+
+

For questions please contact support@vestacp.com

+ report this case +
+
+
+
+ +
+
+ × +
+
+ This is out of Newton's Phisics   +
+
+

Something went wrong. We're working on getting this fixed as soon as we can.

+
+

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).

+
+
+
+

For questions please contact support@vestacp.com

+ report this case +
+
+
+
+ diff --git a/web/vesta/api/USER.class.php b/web/vesta/api/USER.class.php index 9aade6f3..6be4cf19 100644 --- a/web/vesta/api/USER.class.php +++ b/web/vesta/api/USER.class.php @@ -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;