From fe4f777d007676f149d4537c4f17dee77d275dd0 Mon Sep 17 00:00:00 2001 From: ramon Date: Fri, 1 Jun 2012 17:33:15 +0000 Subject: Versión 1.0.4, #539: Incluir leyenda en página de estatus de ordenadores. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit git-svn-id: https://opengnsys.es/svn/branches/version1.0@3129 a21b9725-9963-47de-94b9-378ad31fedc9 --- admin/WebConsole/idiomas/php/cat/aulas_cat.php | 5 +++++ admin/WebConsole/idiomas/php/eng/aulas_eng.php | 6 +++++- admin/WebConsole/idiomas/php/esp/aulas_esp.php | 7 +++++-- admin/WebConsole/images/ordenador_OPG.gif | Bin 0 -> 1060 bytes admin/WebConsole/images/ordenador_RMB.gif | Bin 1060 -> 0 bytes admin/WebConsole/jscripts/aula.js | 4 ++-- admin/WebConsole/principal/aula.php | 11 ++++++++++- doc/CHANGELOG.es.txt | 1 + 8 files changed, 28 insertions(+), 6 deletions(-) create mode 100644 admin/WebConsole/images/ordenador_OPG.gif delete mode 100644 admin/WebConsole/images/ordenador_RMB.gif 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_OPG.gif b/admin/WebConsole/images/ordenador_OPG.gif new file mode 100644 index 00000000..5d9306fc Binary files /dev/null and b/admin/WebConsole/images/ordenador_OPG.gif differ diff --git a/admin/WebConsole/images/ordenador_RMB.gif b/admin/WebConsole/images/ordenador_RMB.gif deleted file mode 100644 index 5d9306fc..00000000 Binary files a/admin/WebConsole/images/ordenador_RMB.gif and /dev/null 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 ''; + echo ' +

+ + '; + foreach ( Array ("OPG", "BSY", "WXP", "LNX", "OFF") as $status) { + echo ' '; + } + echo ' '; + echo '
'.$status.'
'.$TbMsg["STATUS_$status"].'
'; if ($nombreaula!="") echo ''; } @@ -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 -- cgit v1.2.3-18-g5258