Commit 40630080 authored by Cédric's avatar Cédric

Adding task history for admin

parent 1705e557
......@@ -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
<img src="/misc/admin_vue_1.png" width="400px"> <img src="/misc/admin_vue_2.png" width="400px">
<img src="/misc/admin_vue_1.png" width="400px"> <img src="/misc/admin_vue_2.png" width="400px">
<img src="/misc/admin_vue_3.png" width="400px"> <img src="/misc/graph_vue_1.png" width="400px">
<img src="/misc/admin_vue_3.png" width="400px"> <img src="/misc/graph_vue_1.png" width="400px">
## 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
......
......@@ -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
//#################################
)*/
);
?>
......@@ -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' ;
?>
......@@ -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' ;
?>
......@@ -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' ;
?>
......@@ -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',
......
......@@ -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");
......
File mode changed from 100644 to 100755
File mode changed from 100644 to 100755
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment