2006-12-04 Raul Mateos <raulofpandora@gmail.com>

/branches/pandora_1.2/pandora_console and /trunk/pandora_console:
	    * help/[en|es]/images/servers1.png, servers2.png: New files.
	
	    * help/[en|es]/chap2.php, chap7.php: Update files.
	
	    * godmode/admin_access_logs.php: Add help icon.

	/trunk/pandora_doc/:
	    * en/images/servers1.png, servers2.png: Renamed files.

	    * pandora_chapter2.xml, pandora_chapter7.xml: Updated files.

git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@304 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f

pandora_console/ChangeLog

@@ -1,3 +1,11 @@
+2006-12-04 Raul Mateos  <raulofpandora@gmail.com>
+
+	* help/[en|es]/images/servers1.png, servers2.png: New files.
+	
+	* help/[en|es]/chap2.php, chap7.php: Update files.
+	
+	* godmode/admin_access_logs.php: Add help icon.
+
 2006-12-03 Sancho Lerena <slerena@artica.es>
 
         * godmode/agentes/configurar_agente.php: Fixed bug editing alerts.

pandora_console/godmode/admin_access_logs.php

@@ -45,7 +45,9 @@ if (comprueba_login() == 0)
 
 	// generate select 
 	
-	echo "<h3>".$lang_label["filter"]."</h3>"; 
+	echo "<h3>".$lang_label["filter"];
+	echo "<a href='help/".$help_code."/chap6.php#6' target='_help' class='help'>
+	&nbsp;<span>".$lang_label["help"]."</span></a></h3>";
 	echo "<form name='query_sel' method='post' action='index.php?sec=godmode&sec2=godmode/admin_access_logs'>";
 	echo "<table border='0'><tr><td valign='middle'>";
 	echo "<select name='tipo_log' onChange='javascript:this.form.submit();'>";

pandora_console/help/en/chap2.php

@@ -44,7 +44,7 @@ div.rayah {clear:both; border-top: 1px solid #708090; width: 100%;}
 
 <a name="2"><h1>2. Users</h1></a>
 
-<p>The definition of a user is based on the user's
+<p>The definition of a user is based on the user
 daily activity. One or more profiles can be assigned to a single user</p>
 
 <p>A profile is a list of actions a user can or
@@ -134,7 +134,7 @@ a user usually reflects the user's activity.</p>
 <p>To create a new message to other user, go to "Messages" section in the Operation menu. You can also read the received messages, but the sent messages are not stored.</p>
 
 <h3><a name="251">2.5.1. Messages to groups</a></h3>
-<p>From "Messages"&gt;"Messages to groups" section in the Operation menu you can send messages to groups of users. The sent messages will not be stores.</p>
+<p>From "Messages"&gt;"Messages to groups" section in the Operation menu you can send messages to groups of users. The sent messages will not be stored.</p>
 
 </body>
 </html>

pandora_console/help/en/chap7.php

@@ -44,9 +44,67 @@ div.rayah {clear:both; border-top: 1px solid #708090; width: 100%;}
 
 <a name="7"><h1>7. Pandora Servers</h1></a>
 
-<p>From "Manage Servers" section, in the Administration menu you can see a list of configured Pandora Servers and also can manage them.</p>
+<p>In Pandora 1.2 there are three different type of servers, Network Server,
+Data Server and SNMP Server.</p>
 
-<p>From "Pandora Servers" in the Operation menu you can see a list of the Pandora Servers.</p>
+<p>It is possible to manage the Pandora Servers from "Pandora Servers" option 
+in the Operation menu.</p>
 
+<p class="center"><img src="images/servers1.png"></p>
+<p>The following fields are displayed:</p>
+  <ul>
+  <li>
+   <b>Name:</b> Name of the server.
+  </li>
+  <li>
+    <b>Status:</b> Status of the server. Green OK and Red FAIL.
+  </li>
+  <li>
+    <b>IP address:</b> IP of the Server.
+  </li>
+  <li>
+    <b>Description:</b> Server description.
+  </li>
+  <li>
+    <b>Network:</b> Mark for Network Server.
+  </li>
+  <li>
+    <b>Data:</b> Mark for Data Server.
+  </li>
+  <li>
+    <b>SNMP:</b> Mark for SNMP Server.
+  </li>
+  <li>
+    <b>Master:</b> Marked when the server is Master and not 
+    marked when the master is backup.
+  </li>
+  <li>
+    <b>Check:</b>
+  </li>
+  <li>
+    <b>Started at:</b> Date when the Server started.
+  </li>
+  <li>
+    <b>Updated at:</b> The date of the last update.
+  </li>
+  <li>
+     <b>Action:</b> Icons to modify server properties or
+     to delete a server (only in Administration menu).
+  </li>
+  </ul>
+  <p>From "Manage Servers", Administration menu you can configure and manage
+  servers.</p>
+  <p>
+   It is possible delete a server using the icon
+   <img src="../../images/cancel.gif">
+   </p>
+   <p>
+    It is possible to change the server properties using the icon 
+	<img src="../../images/config.gif"> 
+   </p>
+   <p>
+    In a Server it is possible to modify: Name, IP Address and Description.
+   </p>
+<p class="center"><img src="images/servers2.png"></p>
 </body>
 </html>

pandora_console/help/es/chap2.php

@@ -128,10 +128,12 @@ el men&uacute; de operaci&oacute;n.</p>
 
 <h2><a name="25">2.5. Mensajes a usuarios</a></h2>
 
-<p>Desde «Mensajes», en el men&uacute; de operaci&oacute;n podemos enviar mensajes a otros usuarios y leer los mensajes que hemos recibido. No se almacenan los que se han enviado.</p>
+<p>Desde «Mensajes», en el men&uacute; de operaci&oacute;n podemos enviar mensajes a otros usuarios y leer los mensajes que hemos recibido. No se almacenan los correos
+que se han enviado.</p>
 
 <h3><a name="251">2.5.1. Mensajes a grupos</a></h3>
-<p>Desde «Mensajes» &gt; «Mensajes a grupos» en el men&uacute; de operaci&oacute;n podemos enviar mensajes a grupos de usuarios. No se almacenan los que se han enviado.</p>
+<p>Desde «Mensajes» &gt; «Mensajes a grupos» en el men&uacute; de operaci&oacute;n podemos enviar mensajes a grupos de usuarios. No se almacenan los correos que se han enviado.
+</p>
 
 </body>
 </html>

pandora_console/help/es/chap7.php

@@ -40,9 +40,70 @@ div.rayah {clear:both; border-top: 1px solid #708090; width: 100%;}
 
 <h1><a name="7">7. Servidores Pandora</a></h1>
 
-<p>Desde «Gesti&oacute;n» en el men&uacute; de administraci&oacute;n se puede acceder a la lista de los Servidores Pandora que est&aacute;n configurados y administrarlos.</p>
+<p>En Pandora 1.2 hay tres tipos diferentes de servidores, Servidor de red, 
+Servidor de datos y servidor SNMP.</p>
 
-<p>Desde «Servidores Pandora» en el men&uacute; de operaci&oacute;n se puede acceder a la lista de los Servidores Pandora.</p>
+<p>Desde «Servidores Pandora» en el men&uacute; de operaci&oacute;n se puede
+acceder a la lista de los Servidores Pandora.</p>
+
+<p class="center"><img src="images/servers1.png"></p>
+<p>Se muestran los siguientes campos:</p>
+  <ul>
+  <li>
+   <b>Nombre:</b> Nombre del servidor.
+  </li>
+  <li>
+    <b>Estado:</b> Estado del servidor. Si es verde todo est&aacute; correto,
+	si est&aacute; rojo, hay fallos.
+  </li>
+  <li>
+    <b>Direcci&oacute;n IP:</b> Direcci&oacute;n IP del Servidor.
+  </li>
+  <li>
+    <b>Descripci&oacute;n:</b> Descripci&oacute;n del Servidor.
+  </li>
+  <li>
+    <b>Red:</b> Marca el servidor de red.
+  </li>
+  <li>
+    <b>Datos:</b> Marca el servidor de datos.
+  </li>
+  <li>
+    <b>SNMP:</b> Marca el servidor SNMP.
+  </li>
+  <li>
+    <b>Principal:</b> Marcado cuando el servidor es el <i>Master</i>
+	y no marcado cuando es de <i>backup</i>.
+  </li>
+  <li>
+    <b>Check:</b>
+  </li>
+  <li>
+    <b>Arrancado el:</b> Fecha y hora de inicio del servidor.
+  </li>
+  <li>
+    <b>Actualizado el:</b> Fecha y hora de la &uacute;ltima actualizaci&oacute;n.
+  </li>
+  <li>
+     <b>Acci&oacute;n:</b> Iconos para modificar las propiedades del servidor o
+	 borrarlo (esta opci&oacute;n s&oacute;lo aparece en el men&uacute; de 
+	 administraci&oacute;n).
+  </li>
+  </ul>
+     <p>Desde «Gesti&oacute;n» en el men&uacute; de administraci&oacute;n se puede acceder a la lista de los Servidores Pandora que est&aacute;n configurados y administrarlos.</p>
+  <p>
+   Para borrar un servidor utilizamos el icono
+   <img src="../../images/cancel.gif">
+   </p>
+   <p>
+   Para modificar un servidor utilizamos el icono 
+	<img src="../../images/config.gif"> 
+   </p>
+   <p>
+    Si estamos modificando un servidor podemos cambiar las siguientes 
+	propiedades: Nombre, direcci&oacute;n IP y descripci&oacute;n.
+   </p>
+<p class="center"><img src="images/servers2.png"></p>
 
 </body>
 </html>

pandora_doc/ChangeLog

@@ -1,3 +1,10 @@
+2006-12-04 Raul Mateos  <raulofpandora@gmail.com>
+
+	* en/images/servers1.png, servers2.png: Renamed files from Servers.png and
+	servers1.png.
+	
+	* pandora_chapter2.xml, pandora_chapter7.xml: Updated files.
+
 2006-12-03  Sancho Lerena  <slerena@artica.es>
 
 	* pandora.xml: Updated header, now is Pandora FMS not Pandora. Add

pandora_doc/en/pandora_chapter2.xml

@@ -31,9 +31,9 @@
   <sect1 id="sec2.1">
     <title>Profile manager</title>
     <para>
-      Pandora's profile manager is used to assign specific profiles to
+      Pandora profile manager is used to assign specific profiles to
       each user. A hierarchy of users is created, structured by the
-      user's profile within the company. With this system different
+      user profile within the company. With this system different
       security levels can be implemented: read-only users, agent group
       coordinators or system administrators.
     </para>
@@ -161,7 +161,7 @@
       <para>
 	From "Messages" &gt; "Messages to groups" section in the
 	Operation menu you can send messages to groups of users. The
-	sent messages will not be stores.
+	sent messages will not be stored.
     </para>
   </sect2>
 </sect1>

pandora_doc/en/pandora_chapter7.xml

@@ -9,7 +9,7 @@
    It is possible to manage the Pandora Servers from the "Manage Servers"
    option of the Administration menu.
   </para>
-  <graphic scale='60' fileref="images/Servers.png" valign="bottom" 
+  <graphic scale='60' fileref="images/servers1.png" valign="bottom" 
 	   align="center"/>
   <para>
    The following fields are displayed in the Managed Servers page:
@@ -22,8 +22,8 @@
   </listitem>
   <listitem>
    <para>
-    <emphasis>Status:</emphasis> Status of the server. Green ok and 
+    <emphasis>Status:</emphasis> Status of the server. Green OK and 
-    Red fail.
+    Red FAIL.
    </para>
   </listitem>
   <listitem>
@@ -33,12 +33,12 @@
   </listitem>
   <listitem>
    <para>
-    <emphasis>Description:</emphasis> Server´s description.
+    <emphasis>Description:</emphasis> Server description.
    </para> 
   </listitem>
   <listitem>
    <para>
-    <emphasis>Network:</emphasis> Mark for Network Server..
+    <emphasis>Network:</emphasis> Mark for Network Server.
    </para> 
   </listitem>
   <listitem>
@@ -53,8 +53,8 @@
   </listitem>
   <listitem>
    <para>
-    <emphasis>Master:</emphasis> Mark when the server is Master and not 
+    <emphasis>Master:</emphasis> Marked when the server is Master and not 
-    mark when the master is backup.
+    marked when the master is backup.
    </para> 
   </listitem>
   <listitem>
@@ -74,22 +74,26 @@
   </listitem>
   <listitem>
     <para>
-     <emphasis>Action:</emphasis> Icons to modify a server's properties or
+     <emphasis>Action:</emphasis> Icons to modify server properties or
-     to delete a server.
+     to delete a server (only in Administration menu).
     </para> 
   </listitem>
   </itemizedlist>
+  <para>
+  From "Manage Servers", Administration menu you can configure and manage
+  servers.
+  </para>
   <para>
    It is possible delete a server using the icon <inlinegraphic 
    fileref="images/cancel.png"/> 
    </para>
    <para>
-    It is posible to change the server's properties using the icon 
+    It is possible to change the server properties using the icon 
 	<inlinegraphic fileref="images/config.png"/> 
    </para>
    <para>
-    In a Server is posiible modify: Name, IP Address and Description.
+    In a Server it is possible to modify: Name, IP Address and Description.
    </para>
-   <graphic scale='70' fileref="images/Servers1.png" valign="bottom" 
+   <graphic scale='70' fileref="images/servers2.png" valign="bottom" 
 	   align="center"/>
 </chapter>