summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--admin/WebConsole/idiomas/php/cat/aulas_cat.php5
-rw-r--r--admin/WebConsole/idiomas/php/eng/aulas_eng.php6
-rw-r--r--admin/WebConsole/idiomas/php/esp/aulas_esp.php7
-rw-r--r--admin/WebConsole/images/ordenador_OPG.gif (renamed from admin/WebConsole/images/ordenador_RMB.gif)bin1060 -> 1060 bytes
-rw-r--r--admin/WebConsole/jscripts/aula.js4
-rw-r--r--admin/WebConsole/principal/aula.php11
-rw-r--r--doc/CHANGELOG.es.txt1
7 files changed, 28 insertions, 6 deletions
diff --git a/admin/WebConsole/idiomas/php/cat/aulas_cat.php b/admin/WebConsole/idiomas/php/cat/aulas_cat.php
index 00e15d1e..42c3d7e7 100644
--- a/admin/WebConsole/idiomas/php/cat/aulas_cat.php
+++ b/admin/WebConsole/idiomas/php/cat/aulas_cat.php
@@ -54,5 +54,10 @@
$TbMsg[46]='Identificador ámbito';
$TbMsg[47]='"Log historico"';
$TbMsg[48]='"Log en tiempo real"';
+ $TbMsg["STATUS_BSY"]="Ejecutando";
+ $TbMsg["STATUS_OFF"]="Apagado";
+ $TbMsg["STATUS_OPG"]="OpenGnSys";
+ $TbMsg["STATUS_LNX"]="GNU/Linux";
+ $TbMsg["STATUS_WXP"]="Windows";
?>
diff --git a/admin/WebConsole/idiomas/php/eng/aulas_eng.php b/admin/WebConsole/idiomas/php/eng/aulas_eng.php
index 6f27779c..61feb594 100644
--- a/admin/WebConsole/idiomas/php/eng/aulas_eng.php
+++ b/admin/WebConsole/idiomas/php/eng/aulas_eng.php
@@ -54,6 +54,10 @@
$TbMsg[46]='Scope id';
$TbMsg[47]='"Historical log"';
$TbMsg[48]='"Real time log"';
-
+ $TbMsg["STATUS_BSY"]="Bussy";
+ $TbMsg["STATUS_OFF"]="Off";
+ $TbMsg["STATUS_OPG"]="OpenGnSys";
+ $TbMsg["STATUS_LNX"]="GNU/Linux";
+ $TbMsg["STATUS_WXP"]="Windows";
?>
diff --git a/admin/WebConsole/idiomas/php/esp/aulas_esp.php b/admin/WebConsole/idiomas/php/esp/aulas_esp.php
index d5a8368f..b2972c0b 100644
--- a/admin/WebConsole/idiomas/php/esp/aulas_esp.php
+++ b/admin/WebConsole/idiomas/php/esp/aulas_esp.php
@@ -54,7 +54,10 @@
$TbMsg[46]='Identificador ámbito';
$TbMsg[47]='"Log historico"';
$TbMsg[48]='"Log en tiempo real"';
-
-
+ $TbMsg["STATUS_BSY"]="Ejecutando";
+ $TbMsg["STATUS_OFF"]="Apagado";
+ $TbMsg["STATUS_OPG"]="OpenGnSys";
+ $TbMsg["STATUS_LNX"]="GNU/Linux";
+ $TbMsg["STATUS_WXP"]="Windows";
?>
diff --git a/admin/WebConsole/images/ordenador_RMB.gif b/admin/WebConsole/images/ordenador_OPG.gif
index 5d9306fc..5d9306fc 100644
--- a/admin/WebConsole/images/ordenador_RMB.gif
+++ b/admin/WebConsole/images/ordenador_OPG.gif
Binary files differ
diff --git a/admin/WebConsole/jscripts/aula.js b/admin/WebConsole/jscripts/aula.js
index ef031911..aa328055 100644
--- a/admin/WebConsole/jscripts/aula.js
+++ b/admin/WebConsole/jscripts/aula.js
@@ -111,13 +111,13 @@ function soIMG(so)
var MimgOrdenador="";
switch(so){
case 'INI':
- MimgOrdenador="ordenador_INI.gif"; // Cliente ocupado
+ MimgOrdenador="ordenador_INI.gif"; // Iniciando cliente
break;
case 'BSY':
MimgOrdenador="ordenador_BSY.gif"; // Cliente ocupado
break;
case 'OPG':
- MimgOrdenador="ordenador_RMB.gif"; // Cliente Rembo
+ MimgOrdenador="ordenador_OPG.gif"; // Cliente OpenGnSys
break;
case 'WS2':
MimgOrdenador="ordenador_WS2.gif"; // Windows Server 2003
diff --git a/admin/WebConsole/principal/aula.php b/admin/WebConsole/principal/aula.php
index e92f8367..7f6e7f8f 100644
--- a/admin/WebConsole/principal/aula.php
+++ b/admin/WebConsole/principal/aula.php
@@ -282,6 +282,15 @@ function pintaordenadores(){
}
}
echo '</TABLE>';
+ echo '
+<p>
+<table style="border: #d4d0c8 1px solid; background: #eeeeee" align=center>
+ <tr align="center">';
+ foreach ( Array ("OPG", "BSY", "WXP", "LNX", "OFF") as $status) {
+ echo ' <td><img src="../images/ordenador_'.$status.'.gif" alt="'.$status.'" width="24" /><br /><font color="#003300" size="1" face="Arial, Helvetica, sans-serif">'.$TbMsg["STATUS_$status"].'</font></td>';
+ }
+ echo ' </tr>';
+ echo '</table>';
if ($nombreaula!="")
echo '</DIV>';
}
@@ -602,4 +611,4 @@ function ContextualXMLAsistentes($litambito,$ambito){
$finallayerXML=$prelayerXML.$layerXML;
return($finallayerXML);
}
-} \ No newline at end of file
+}
diff --git a/doc/CHANGELOG.es.txt b/doc/CHANGELOG.es.txt
index 3127746c..17b17c12 100644
--- a/doc/CHANGELOG.es.txt
+++ b/doc/CHANGELOG.es.txt
@@ -42,6 +42,7 @@ Tickets resueltos en módulo OpenGnSys Web Admin Console:
#502 Tamaño Iframe propiedades ordenadores
#503 Asistente con seguimiento predeterminado (no válido)
#509 Incluir foto/imagen en propiedades de ordenadores y aulas
+#539 Leyenda en estaus de ordenadores
Tickets resueltos en módulo OpenGnSys Installer:
#414 Instalar OpenGnSys en otras distribuciones Linux