#867 La ayuda incluye información de las funciones, engine.cfg, changelog, etc

9 files changed, 111 insertions, 33 deletions

diff --git a/admin/WebConsole/barramenu.php b/admin/WebConsole/barramenu.php
index dfb618ed..7584c0d3 100644
--- a/admin/WebConsole/barramenu.php
+++ b/admin/WebConsole/barramenu.php
@@ -60,7 +60,7 @@ if (!$cmd)
 				var 	href2="nada.php";
 				var 	href3="./api/tree.html";
 				var 	href4="./api/main.html";
-				var 	href5="./api/index.html";
+				var 	href5="./principal/ayuda.php";
 				var	device="<?php echo $device;?>";
 				var	version="<?php echo $version;?>";
 
@@ -160,9 +160,6 @@ if (!$cmd)
 							case 22: 		
 									opadre.frames["frame_contenidos"].document.location.href=href5;
 									break;
-							case 23:                
-                                                                        opadre.frames["frame_contenidos"].document.location.href="./principal/acercade.php";
-                                                                        break;
 						}
 				}
 		}
@@ -234,12 +231,6 @@ if (!$cmd)
 											&nbsp;<A href="#" style="text-decoration: none"><IMG border=0 src="./images/iconos/ayuda.gif">&nbsp;<SPAN class=menupral ><?php echo  $TbMsg[11] ?></SPAN></A>&nbsp;</TD>
  											<TD width=4 align=middle><IMG src="./images/iconos/separitem.gif"></TD>
 
-
-											<TD onclick=eleccion(this,23); onmouseout=desresaltar(this); onmouseover=resaltar(this); align=middle>
-											&nbsp;<A href="#" style="text-decoration: none"><IMG border=0 src="./images/iconos/logocirculos.png">&nbsp;<SPAN class=menupral ><?php echo  $TbMsg[17] ?></SPAN></A>&nbsp;</TD>
-											<TD width=4 align=middle><IMG src="./images/iconos/separitem.gif"></TD>
-
-
 											<TD onclick=eleccion(this,21); onmouseout=desresaltar(this); onmouseover=resaltar(this); align=middle>
 											&nbsp;<A href="#" style="text-decoration: none"><IMG border=0 src="./images/iconos/usuarioslog.gif">&nbsp;<SPAN class=menupral ><?php echo  $TbMsg[10] ?></SPAN></A>&nbsp;</TD>
 											<TD width=4 align=middle><IMG src="./images/iconos/separitem.gif"></TD>
diff --git a/admin/WebConsole/estilos.css b/admin/WebConsole/estilos.css
index 4b37be1f..302d0f6a 100644
--- a/admin/WebConsole/estilos.css
+++ b/admin/WebConsole/estilos.css
@@ -431,4 +431,8 @@ A.tabla_listados_sin:link{
     FONT-SIZE: 14px;
     FONT-WEIGHT: 300;
 }
-
+/* Ayuda enlaces sin subrayado */
+a.nounderline:link
+{
+text-decoration:none;
+}
diff --git a/admin/WebConsole/idiomas/php/cat/barramenu_cat.php b/admin/WebConsole/idiomas/php/cat/barramenu_cat.php
index 338ebb32..27c54de3 100644
--- a/admin/WebConsole/idiomas/php/cat/barramenu_cat.php
+++ b/admin/WebConsole/idiomas/php/cat/barramenu_cat.php
@@ -21,7 +21,3 @@
 	$TbMsg[14]='Cercar';
 	$TbMsg[15]='Netboot Avançat';
 	$TbMsg[16]='Unitat Organitzativa';
-	$TbMsg[17]='Acerca&nbsp;de';
-
-?>
-
diff --git a/admin/WebConsole/idiomas/php/eng/barramenu_eng.php b/admin/WebConsole/idiomas/php/eng/barramenu_eng.php
index 66fb6173..faf0d422 100644
--- a/admin/WebConsole/idiomas/php/eng/barramenu_eng.php
+++ b/admin/WebConsole/idiomas/php/eng/barramenu_eng.php
@@ -21,4 +21,3 @@
 	$TbMsg[14]='Search';
 	$TbMsg[15]='Advanced Netboot';
 	$TbMsg[16]='Organizational Unit';
-        $TbMsg[17]='About';
diff --git a/admin/WebConsole/idiomas/php/esp/barramenu_esp.php b/admin/WebConsole/idiomas/php/esp/barramenu_esp.php
index 1ea51290..6d863015 100644
--- a/admin/WebConsole/idiomas/php/esp/barramenu_esp.php
+++ b/admin/WebConsole/idiomas/php/esp/barramenu_esp.php
@@ -21,6 +21,5 @@
 	$TbMsg[14]='Buscar';
 	$TbMsg[15]='Netboot Avanzado';
 	$TbMsg[16]='Unidad Organizativa';
-	$TbMsg[17]='Acerca&nbsp;de';
 ?>
 
diff --git a/admin/WebConsole/principal/acercade.php b/admin/WebConsole/principal/acercade.php
index f95e07c1..30a8e90b 100644
--- a/admin/WebConsole/principal/acercade.php
+++ b/admin/WebConsole/principal/acercade.php
@@ -131,21 +131,5 @@ fclose($crearficheroinicio);
 
 <p><?php echo $TbMsg["LICENSE"] ?> <a href="https://www.gnu.org/licenses/gpl.html"  target="_blank" ><img alt="GPL v3"  src="../images/gplv3-88x31.png" height="20em" /></a></p>
 
-<p><?php
- if (file_exists ($changelogfile)){ 
-	system("cp ../../doc/$buschangelog ../api");
-	echo "<strong><a href='../api/$buschangelog' target='_blank'>".$TbMsg["CHANGE"]."</a></strong>"
-	    .@$data->project.' '.@$data->version.' '.(isset($data->codename)?'('.$data->codename.')':'');
- }
-?></p>
-
-<p><?php echo "<strong><a href='$ficheroinicio' target='_blank'>".$TbMsg["MANUAL"]."</a></strong>";?></p>
-
-<p><strong><?php echo $TbMsg["LINK"]; ?> <a href="https://opengnsys.es"  target="_blank" >opengnsys.es</a><strong></p>
-
-
-
-
-
 </body>
 </html>
diff --git a/admin/WebConsole/principal/ayuda.php b/admin/WebConsole/principal/ayuda.php
new file mode 100644
index 00000000..ef4f0fdc
--- /dev/null
+++ b/admin/WebConsole/principal/ayuda.php
@@ -0,0 +1,37 @@
+<?php
+//********************************************************************
+// Descripción : 
+//              Pagina de ayuda
+//********************************************************************
+include_once("../includes/ctrlacc.php");
+include_once("../idiomas/php/".$idioma."/ayuda_".$idioma.".php");
+
+// Añadir versión.
+$versionfile="../../doc/VERSION.txt";
+$version=(file_exists ($versionfile)) ? file_get_contents($versionfile, TRUE) : "";
+?>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<html>
+<head>
+<title> Administración web de aulas </title>
+<meta http-equiv="Content-Type" content="text/html;charset=UTF-8">
+<link rel="stylesheet" type="text/css" href="../estilos.css" />
+</head>
+
+<body>
+
+<div><p align=center class=cabeceras><img  border=0 nod="aulas-1" value="Sala Virtual" style="cursor:pointer" src="../images/iconos/logocirculos.png" >&nbsp;&nbsp;<?php echo $TbMsg["AYUDA_TITULO"]; ?></p>
+</div>
+
+<div style="margin-left: 20%">
+    <p><a class="nounderline" href="../api/userManual/Inicio.php"> <span class=subcabeceras> <?php echo $TbMsg["MANUAL"] ?> </span></a> </p>
+    <p><a class="nounderline" href="../api/index.html"><span class=subcabeceras>  <?php echo $TbMsg["API"] ?> </span></a></p>
+    <p><a class="nounderline" href="engine.php"><span class=subcabeceras> <?php echo $TbMsg["CFG"] ?></span></a> </p>
+    <p>&nbsp;</p>
+    <p><a class="nounderline" href="changelog.php"><span class=subcabeceras> <?php echo $TbMsg["CHANGELOG"]." ".$version ?>  </span></a> </p>
+    <p><a class="nounderline" href="https://listas.unizar.es/cgi-bin/mailman/listinfo/opengnsys-users" target="_blank"><span class=subcabeceras> <?php echo $TbMsg["USERMAIL"] ?>  </span></a> </p>
+    <p><a class="nounderline" href="https://opengnsys.es/" target="_blank"><span class=subcabeceras> <?php echo $TbMsg["WEB"] ?> </span></a> </p>
+    <p><a class="nounderline" href="acercade.php"><span class=subcabeceras> <?php echo  $TbMsg["ABOUT"] ?> </span></a> </p>
+</div>
+</body>
+</html>
diff --git a/admin/WebConsole/principal/changelog.php b/admin/WebConsole/principal/changelog.php
new file mode 100644
index 00000000..643a063d
--- /dev/null
+++ b/admin/WebConsole/principal/changelog.php
@@ -0,0 +1,36 @@
+<?php
+//**********************************************************************
+// Descripción : Muestra la configuración de los clientes en engine.cfg
+//**********************************************************************
+include_once("../includes/ctrlacc.php");
+include_once("../idiomas/php/".$idioma."/changelog_".$idioma.".php");
+
+// Añadir versión.
+$versionfile="../../doc/VERSION.txt";
+$version=(file_exists ($versionfile)) ? file_get_contents($versionfile, TRUE) : "";
+
+$changelogfile="../../doc/CHANGELOG.es.txt";
+$changelog=(file_exists ($changelogfile)) ? file_get_contents($changelogfile, TRUE) : "";
+?>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<html>
+    <head>
+        <title> Administración web de aulas </title>
+        <meta http-equiv="Content-Type" content="text/html;charset=UTF-8">
+        <link rel="stylesheet" type="text/css" href="../estilos.css" />
+    </head>
+
+    <body>
+
+        <div><p align=center class=cabeceras><img  border=0 nod="aulas-1" value="Sala Virtual" style="cursor:pointer" src="../images/iconos/aula.gif" >&nbsp;&nbsp;<?php echo $TbMsg["CHANGELOG_TITULO"] ?><br>
+        <span id="aulas-1" class=subcabeceras><?php echo $version ?></span></p>
+        </div>
+
+        <div style="margin: 0 3em 0 3em">
+        <pre>
+        <?php echo $changelog; ?>
+        <pre>
+        </div>
+    </body>
+</html>
+
diff --git a/admin/WebConsole/principal/engine.php b/admin/WebConsole/principal/engine.php
new file mode 100644
index 00000000..cbec7664
--- /dev/null
+++ b/admin/WebConsole/principal/engine.php
@@ -0,0 +1,32 @@
+<?php
+//**********************************************************************
+// Descripción : Muestra la configuración de los clientes en engine.cfg
+//**********************************************************************
+include_once("../includes/ctrlacc.php");
+include_once("../idiomas/php/".$idioma."/engine_".$idioma.".php");
+
+$cfgfile="../../client/etc/engine.cfg";
+$config=(file_exists ($cfgfile)) ? file_get_contents($cfgfile, TRUE) : "No hay acceso al fichero de configuración";
+?>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<html>
+    <head>
+        <title> Administración web de aulas </title>
+        <meta http-equiv="Content-Type" content="text/html;charset=UTF-8">
+        <link rel="stylesheet" type="text/css" href="../estilos.css" />
+    </head>
+
+    <body>
+
+        <div><p align=center class=cabeceras><img  border=0 nod="aulas-1" value="Sala Virtual" style="cursor:pointer" src="../images/iconos/aula.gif" >&nbsp;&nbsp;<?php echo $TbMsg["ENGINE_TITULO"] ?><br>
+        <span id="aulas-1" class=subcabeceras><?php echo $TbMsg["ENGINE_SUBTITULO"] ?></span></p>
+        </div>
+
+        <div style="margin: 0 3em 0 3em">
+        <pre>
+        <?php echo $config; ?>
+        <pre>
+        </div>
+    </body>
+</html>
+