diff options
author | Javier Sánchez Parra <jsanchez@soleta.eu> | 2020-06-25 11:06:42 +0200 |
---|---|---|
committer | OpenGnSys Support Team <soporte-og@soleta.eu> | 2020-06-26 14:43:12 +0200 |
commit | 756b483456158227cca9a52ae1b0bd82ec5dc5bd (patch) | |
tree | df2b9b95a6469b8ca1564c13d2242a20bb9f20b0 | |
parent | 4e56964e89d7d0309bfa9848aa3d6d54cd288a3d (diff) |
#980 Add Virtual status
Since version 1.2.0, OpenGnsys supports ogVDI hypervisor OS. This commit
a new status which indicates that clients are running ogVDI
-rw-r--r-- | admin/WebConsole/comandos/includes/FiltradoAmbito.php | 10 | ||||
-rw-r--r-- | admin/WebConsole/comandos/includes/FiltradoAmbitoMovAulas.php | 7 | ||||
-rw-r--r-- | admin/WebConsole/idiomas/php/cat/estados_cat.php | 1 | ||||
-rw-r--r-- | admin/WebConsole/idiomas/php/eng/estados_eng.php | 1 | ||||
-rw-r--r-- | admin/WebConsole/idiomas/php/esp/estados_esp.php | 1 | ||||
-rw-r--r-- | admin/WebConsole/images/ordenador_VDI.png | bin | 0 -> 5319 bytes | |||
-rw-r--r-- | admin/WebConsole/jscripts/aula.js | 3 | ||||
-rw-r--r-- | admin/WebConsole/principal/aula.php | 5 |
8 files changed, 28 insertions, 0 deletions
diff --git a/admin/WebConsole/comandos/includes/FiltradoAmbito.php b/admin/WebConsole/comandos/includes/FiltradoAmbito.php index 42ca61e7..7ea5dfbe 100644 --- a/admin/WebConsole/comandos/includes/FiltradoAmbito.php +++ b/admin/WebConsole/comandos/includes/FiltradoAmbito.php @@ -191,6 +191,9 @@ function RecorriendoOrdenadores($cmd) <TD align="center">'.$TbMsg["STATUS_OSX"].'</TD> <TD><INPUT type="checkbox" checked onclick="selector(this,8,'.$cid.')"></TD> +<TD align="center">'.$TbMsg["STATUS_VDI"].'</TD> +<TD><INPUT type="checkbox" checked onclick="selector(this,9,'.$cid.')"></TD> + </TR> </TABLE>'; @@ -312,6 +315,9 @@ function soIMG(so) case 'OSX': MimgOrdenador="ordenador_OSX.png"; // macOS break; + case 'VDI': + MimgOrdenador="ordenador_VDI.png"; // macOS + break; default: MimgOrdenador="ordenador_OFF.png"; // Apagado break; @@ -365,6 +371,10 @@ function selector(oSLCT,op,id) if(estado=="ordenador_OSX.png") oCHK.checked=sw; break; + case 9: // Virtual + if(estado=="ordenador_VDI.png") + oCHK.checked=sw; + break; } } } diff --git a/admin/WebConsole/comandos/includes/FiltradoAmbitoMovAulas.php b/admin/WebConsole/comandos/includes/FiltradoAmbitoMovAulas.php index 37e76afd..b8408b57 100644 --- a/admin/WebConsole/comandos/includes/FiltradoAmbitoMovAulas.php +++ b/admin/WebConsole/comandos/includes/FiltradoAmbitoMovAulas.php @@ -198,6 +198,9 @@ function soIMG(so) case 'OSX': MimgOrdenador="ordenador_OSX.png"; // macOS break; + case 'VDI': + MimgOrdenador="ordenador_VDI.png"; // macOS + break; default: MimgOrdenador="ordenador_OFF.png"; // Apagado break; @@ -251,6 +254,10 @@ function selector(oSLCT,op,id) if(estado=="ordenador_OSX.png") oCHK.checked=sw; break; + case 9: // Virtual + if(estado=="ordenador_VDI.png") + oCHK.checked=sw; + break; } } } diff --git a/admin/WebConsole/idiomas/php/cat/estados_cat.php b/admin/WebConsole/idiomas/php/cat/estados_cat.php index 40a37436..e82751d0 100644 --- a/admin/WebConsole/idiomas/php/cat/estados_cat.php +++ b/admin/WebConsole/idiomas/php/cat/estados_cat.php @@ -12,6 +12,7 @@ $TbMsg["STATUS_OFF"]="Apagat"; $TbMsg["STATUS_OPG"]="OpenGnsys"; $TbMsg["STATUS_LNX"]="GNU/Linux"; $TbMsg["STATUS_WXP"]="Windows"; +$TbMsg["STATUS_VDI"]="Virtual"; // Estats nou agent OGAgent. $TbMsg["STATUS_LNXS"]="Sessió GNU/Linux"; $TbMsg["STATUS_OSX"]="macOS"; diff --git a/admin/WebConsole/idiomas/php/eng/estados_eng.php b/admin/WebConsole/idiomas/php/eng/estados_eng.php index 6d9f239c..6609b5b8 100644 --- a/admin/WebConsole/idiomas/php/eng/estados_eng.php +++ b/admin/WebConsole/idiomas/php/eng/estados_eng.php @@ -12,6 +12,7 @@ $TbMsg["STATUS_OFF"]="Off"; $TbMsg["STATUS_OPG"]="OpenGnsys"; $TbMsg["STATUS_LNX"]="GNU/Linux"; $TbMsg["STATUS_WXP"]="Windows"; +$TbMsg["STATUS_VDI"]="Virtual"; // New OGAgent states. $TbMsg["STATUS_LNXS"]="GNU/Linux session"; $TbMsg["STATUS_OSX"]="MacOS"; diff --git a/admin/WebConsole/idiomas/php/esp/estados_esp.php b/admin/WebConsole/idiomas/php/esp/estados_esp.php index cf911251..e98c70c8 100644 --- a/admin/WebConsole/idiomas/php/esp/estados_esp.php +++ b/admin/WebConsole/idiomas/php/esp/estados_esp.php @@ -12,6 +12,7 @@ $TbMsg["STATUS_OFF"]="Apagado"; $TbMsg["STATUS_OPG"]="OpenGnsys"; $TbMsg["STATUS_LNX"]="GNU/Linux"; $TbMsg["STATUS_WXP"]="Windows"; +$TbMsg["STATUS_VDI"]="Virtual"; // Estados nuevo agente OGAgent. $TbMsg["STATUS_LNXS"]="Sesión GNU/Linux"; $TbMsg["STATUS_OSX"]="macOS"; diff --git a/admin/WebConsole/images/ordenador_VDI.png b/admin/WebConsole/images/ordenador_VDI.png Binary files differnew file mode 100644 index 00000000..857f4762 --- /dev/null +++ b/admin/WebConsole/images/ordenador_VDI.png diff --git a/admin/WebConsole/jscripts/aula.js b/admin/WebConsole/jscripts/aula.js index be1d1503..ce87b6e2 100644 --- a/admin/WebConsole/jscripts/aula.js +++ b/admin/WebConsole/jscripts/aula.js @@ -135,6 +135,9 @@ function soIMG(so) case 'OSX': MimgOrdenador="ordenador_OSX.png"; // macOS break; + case 'VDI': + MimgOrdenador="ordenador_VDI.png"; // Virtual + break; default: MimgOrdenador="ordenador_OFF.png"; // Apagado break; diff --git a/admin/WebConsole/principal/aula.php b/admin/WebConsole/principal/aula.php index ec3549fc..081c423f 100644 --- a/admin/WebConsole/principal/aula.php +++ b/admin/WebConsole/principal/aula.php @@ -352,11 +352,16 @@ function pintaordenadores(){ foreach (Array ("OPG", "WIN", "LNX", "OSX") as $status) { echo ' <td><img src="../images/ordenador_'.$status.'.png" alt="'.$status.'" width="24" /><br /><font color="#003300" size="1" face="Arial, Helvetica, sans-serif">'.$TbMsg["STATUS_$status"].'</font></td>'; } + echo ' </tr>'; echo ' <tr align="center" valign="top">'; foreach (Array ("BSY", "WINS", "LNXS", "OFF") as $status) { echo ' <td><img src="../images/ordenador_'.$status.'.png" alt="'.$status.'" width="24" /><br /><font color="#003300" size="1" face="Arial, Helvetica, sans-serif">'.str_replace(" ", "<br>", $TbMsg["STATUS_$status"]).'</font></td>'; } echo ' </tr>'; + echo ' <tr align="center" valign="top">'; + foreach (Array ("VDI") as $status) { + echo ' <td><img src="../images/ordenador_'.$status.'.png" alt="'.$status.'" width="24" /><br /><font color="#003300" size="1" face="Arial, Helvetica, sans-serif">'.str_replace(" ", "<br>", $TbMsg["STATUS_$status"]).'</font></td>'; + } echo ' </tr>'; echo '</table>'; if ($nombreaula!="") |