diff --git a/php/clonos.php b/php/clonos.php index 5be50b8d..f7880100 100644 --- a/php/clonos.php +++ b/php/clonos.php @@ -158,6 +158,8 @@ class ClonOS { } echo json_encode($new_array); return; + }else{ + echo json_encode(array('error'=>true,'error_message'=>'PHP Method is not exists: '.$this->mode)); } $included_result_array=''; @@ -2160,6 +2162,16 @@ class ClonOS { return array('error'=>'true','errorMessage'=>'something wrong...'); } } + + function ccmd_settingsUpdateCheck() + { + return array('error'=>true,'error_message'=>'Ещё не реализовано...'); + } + + + + + function postCurl($url,$vars=false) { diff --git a/public/css/styles.css b/public/css/styles.css index 8372a00e..61c79416 100644 --- a/public/css/styles.css +++ b/public/css/styles.css @@ -1009,7 +1009,7 @@ td.error { width:60%; max-width:60%; /*margin-left:-30% !important;*/ - left:50%; + /*left:50%;*/ } .tasklog .window-content { user-select:auto; diff --git a/public/dialogs/settings-update.php b/public/dialogs/settings-update.php new file mode 100644 index 00000000..83a82988 --- /dev/null +++ b/public/dialogs/settings-update.php @@ -0,0 +1,9 @@ + diff --git a/public/js/clonos.js b/public/js/clonos.js index 68dafcfb..4949e740 100644 --- a/public/js/clonos.js +++ b/public/js/clonos.js @@ -232,6 +232,10 @@ var clonos={ this.getFreeCname(); // Берём с сервера свободное имя kubernetes //this.trids=this.getTrIdsForCheck('jailslist'); } + if(id='settings-update') + { + this.settingsUpdateCheck(); + } this.dialogShow1(id); } }, @@ -872,6 +876,14 @@ var clonos={ $('dialog#k8s-new input[name="cname"]').val(data.freejname); //$('dialog#jail-settings input[name="host_hostname"]').val(data.freecname+'.my.domain'); }, + settingsUpdateCheck:function() + { + this.loadData('settingsUpdateCheck',$.proxy(this.onSettingsUpdateCheck,this)); + }, + onSettingsUpdateCheck:function(data) + { + + }, onUsersAdd:function(data) { diff --git a/public/pages/k8s/a.json.php b/public/pages/k8s/a.json.php index 8ab29f06..a91ab876 100644 --- a/public/pages/k8s/a.json.php +++ b/public/pages/k8s/a.json.php @@ -2,7 +2,7 @@ /* hardcode API ip. Change it later */ //$api_ip='https://bitclouds.convectix.com:1443'; -$api_ip = 'http://144.76.225.238'; +$api_ip = 'http://127.0.0.1:65531'; function getSslPage($url) { $ch = curl_init(); diff --git a/public/pages/settings/en.index.php b/public/pages/settings/en.index.php index 19522d61..7644a604 100644 --- a/public/pages/settings/en.index.php +++ b/public/pages/settings/en.index.php @@ -1,4 +1,21 @@ -
+ +
| Login | +First Name | +Last Name | +Registration | +Last login | +Active | +Action | +
|---|
+ + +
| Компонент | +Версия | +
|---|