diff --git a/README.md b/README.md index 8a74a56ed8e4df91d7fd183f3288b6f500306aed..47bd46cb8c26b24e04549ae979f1ab74fc98eeb0 100644 --- a/README.md +++ b/README.md @@ -28,12 +28,13 @@ This application is an Add-ons for ISPConfig used for VPS Management (Proxmox) - Admin display : - Per client assignation + - Task history (need to implement link to ispconfig user and pve user for non admin version) ## Screenshots - + - + ## How To implement this module - Create Proxmox user for ISPConfig communication with PVEVMUser right @@ -53,8 +54,7 @@ This application is an Add-ons for ISPConfig used for VPS Management (Proxmox) - Networks : Enable / Disable, Vlan, rate limit - Display: - - Event log - - Vps consol integration (stuck for the moment ... :( ) + - Vps console integration (stuck for the moment ... :( ) # License Copyright (c) 2016, Oricom Internet diff --git a/form/proxmox_vm_informations.tform.php b/form/proxmox_vm_informations.tform.php index 9fbf92cf11fb25e5c2035e40f7e7987618b04973..622b3917279091c40c956b2c1672d39f0f70fb97 100755 --- a/form/proxmox_vm_informations.tform.php +++ b/form/proxmox_vm_informations.tform.php @@ -110,4 +110,32 @@ $form["tabs"]['graphics'] = array ( )*/ ); +$form["tabs"]['networks'] = array ( + 'title' => "Networks", // Need to translate with variable + 'width' => 100, + 'template' => "templates/proxmox_vm_networks.htm", + 'readonly' => false, + /* + 'fields' => array ( + //################################# + // Begin Datatable fields + //################################# + 'id' => array ( + 'datatype' => 'INTEGER', + 'formtype' => 'TEXT', + 'default' => '', + 'value' => '', + 'separator' => '', + 'width' => '30', + 'maxlength' => '255', + 'rows' => '', + 'cols' => '', + 'searchable' => 2 + ), + + //################################# + // ENDE Datatable fields + //################################# + )*/ +); ?> diff --git a/lib/lang/ca.lng b/lib/lang/ca.lng index 923411f8b798076052cf83d523a706623f916a2d..b13e58114a84af11da9be233bff6ca10537559b0 100755 --- a/lib/lang/ca.lng +++ b/lib/lang/ca.lng @@ -4,5 +4,20 @@ $wb['Virtuals servers'] = 'Serveurs virtuels'; $wb['Assignation'] = 'Assigner un serveur virtuel'; $wb['Graphiques'] = 'Graphiques'; $wb['VPS'] = 'Serveurs virtuels'; - +$wb['task_title_txt'] = 'Historique des tâches'; +$wb['task_description_txt'] = ''; +$wb['start_time_txt'] = 'Date de début'; +$wb['end_time_txt'] = 'Date de fin'; +$wb['username_txt'] = 'Utilisateur'; +$wb['description_txt'] = 'Description'; +$wb['status_txt'] = 'Status'; +$wb['qmstart'] = 'Démarrer' ; +$wb['qmstop'] = 'Terminer' ; +$wb['qmshutdown'] = 'Arrêter' ; +$wb['qmsnapshot'] = 'Instantané' ; +$wb['qmdelsnapshot'] = 'Suression de l\'instantané' ; +$wb['qmreset'] = 'Réinitialiser' ; +$wb['vncproxy'] = 'Console' ; +$wb['qmsuspend'] = 'Suspendre' ; +$wb['qmresume'] = 'Reprendre' ; ?> diff --git a/lib/lang/en.lng b/lib/lang/en.lng index f442443096c0a04eba8dd42405b16f1444863ab4..c29d3fbfce14e54b2127488e9f04bd42be280543 100755 --- a/lib/lang/en.lng +++ b/lib/lang/en.lng @@ -4,5 +4,20 @@ $wb['Virtuals servers'] = 'Virtuals servers'; $wb['Assignation'] = 'Assign a virtual server'; $wb['Graphiques'] = 'Graphics'; $wb['VPS'] = 'Virtuals servers'; - +$wb['task_title_txt'] = 'Task history'; +$wb['task_description_txt'] = ''; +$wb['start_time_txt'] = 'Start time'; +$wb['end_time_txt'] = 'End time'; +$wb['username_txt'] = 'Username'; +$wb['description_txt'] = 'Description'; +$wb['status_txt'] = 'Status'; +$wb['qmstart'] = 'Start' ; +$wb['qmstop'] = 'Stop' ; +$wb['qmshutdown'] = 'Shutdown' ; +$wb['qmsnapshot'] = 'Snapshot' ; +$wb['qmdelsnapshot'] = 'Snapshot removed' ; +$wb['qmreset'] = 'Reset' ; +$wb['vncproxy'] = 'Console' ; +$wb['qmsuspend'] = 'Suspend' ; +$wb['qmresume'] = 'Resume' ; ?> diff --git a/lib/lang/fr.lng b/lib/lang/fr.lng index 923411f8b798076052cf83d523a706623f916a2d..b13e58114a84af11da9be233bff6ca10537559b0 100755 --- a/lib/lang/fr.lng +++ b/lib/lang/fr.lng @@ -4,5 +4,20 @@ $wb['Virtuals servers'] = 'Serveurs virtuels'; $wb['Assignation'] = 'Assigner un serveur virtuel'; $wb['Graphiques'] = 'Graphiques'; $wb['VPS'] = 'Serveurs virtuels'; - +$wb['task_title_txt'] = 'Historique des tâches'; +$wb['task_description_txt'] = ''; +$wb['start_time_txt'] = 'Date de début'; +$wb['end_time_txt'] = 'Date de fin'; +$wb['username_txt'] = 'Utilisateur'; +$wb['description_txt'] = 'Description'; +$wb['status_txt'] = 'Status'; +$wb['qmstart'] = 'Démarrer' ; +$wb['qmstop'] = 'Terminer' ; +$wb['qmshutdown'] = 'Arrêter' ; +$wb['qmsnapshot'] = 'Instantané' ; +$wb['qmdelsnapshot'] = 'Suression de l\'instantané' ; +$wb['qmreset'] = 'Réinitialiser' ; +$wb['vncproxy'] = 'Console' ; +$wb['qmsuspend'] = 'Suspendre' ; +$wb['qmresume'] = 'Reprendre' ; ?> diff --git a/lib/module.conf.php b/lib/module.conf.php index 7c9edd31f40d1db38b2df8a4f28933ccb95414d7..a1f83ebe953229bfd39ed2e3ad84f15f3219ddc6 100755 --- a/lib/module.conf.php +++ b/lib/module.conf.php @@ -21,14 +21,19 @@ if($_SESSION["s"]["user"]["typ"] == 'admin') { } + +$items[] = array( 'title' => 'Virtuals servers', + 'target' => 'content', + 'link' => 'proxmox/proxmox_vm_list.php', + 'html_id' => 'proxmox_vm_list'); + if($_SESSION["s"]["user"]["typ"] == 'admin') { - $items[] = array( 'title' => 'Virtuals servers', + $items[] = array( 'title' => 'Tasks logs', 'target' => 'content', - 'link' => 'proxmox/proxmox_vm_list.php', - 'html_id' => 'proxmox_vm_list'); + 'link' => 'proxmox/proxmox_vm_logs.php', + 'html_id' => 'proxmox_vm_logs'); } - if(count($items)) { $module['nav'][] = array( 'title' => 'VPS', diff --git a/proxmox_vm_informations.php b/proxmox_vm_informations.php index f4a6204255a2d46b7d268d86b0383ce449f06e5b..c4cec7a99ee6b408483a125e3ddab0da02f9b4bb 100755 --- a/proxmox_vm_informations.php +++ b/proxmox_vm_informations.php @@ -24,6 +24,7 @@ $app->auth->check_module_permissions('proxmox'); $app->uses('tpl,tform,tform_actions'); $app->load('tform'); +print_r($_REQUEST); class page_action extends tform_actions { @@ -48,12 +49,17 @@ class page_action extends tform_actions { $app->tpl->setVar("vm_id", $vm_info['vm_id']); $app->tpl->setVar("vm_pvesvr", $vm_pvesvr); + switch($_REQUEST['next_tab']) { case 'graphics': //DO SOMETHING HERE break; + + case 'networks': + //DO SOMETHING HERE + break; case 'informations': default: $vm_status = $pve2->get("/nodes/{$vm_pvesvr}/{$vm_containers}/{$vm_id}/status/current"); diff --git a/templates/proxmox_vm_graphiques.htm b/templates/proxmox_vm_graphiques.htm old mode 100644 new mode 100755 diff --git a/templates/proxmox_vm_informations.htm b/templates/proxmox_vm_informations.htm old mode 100644 new mode 100755