2008-06-26 Esteban Sanchez <estebans@artica.es>

* images/console/background/africa.jpg,
        images/console/background/asia.jpg,
        images/console/background/europe.jpg,
        images/console/background/north_america.jpg,
        images/console/background/south_america.jpg,
        images/console/background/world.jpg,
        images/console/background/oceania.jpg: Resized to fit better in
        Pandora default theme.

        * operation/visual_console/index.php: Delete view column and use a
        link in the name instead.

        * operation/visual_console/render_view.php: Replaced id_usuario with
        config variable.

        * operation/menu.php: Changed default option in reporting menu.



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

pandora_console/ChangeLog

@@ -1,3 +1,22 @@
+2008-06-26  Esteban Sanchez  <estebans@artica.es>
+
+	* images/console/background/africa.jpg,
+	images/console/background/asia.jpg,
+	images/console/background/europe.jpg,
+	images/console/background/north_america.jpg,
+	images/console/background/south_america.jpg,
+	images/console/background/world.jpg,
+	images/console/background/oceania.jpg: Resized to fit better in
+	Pandora default theme.
+
+	* operation/visual_console/index.php: Delete view column and use a
+	link in the name instead.
+
+	* operation/visual_console/render_view.php: Replaced id_usuario with
+	config variable.
+
+	* operation/menu.php: Changed default option in reporting menu.
+
 2008-06-26  Esteban Sanchez  <estebans@artica.es>
 
 	* general/logon_ok.php: Use pandora functions to show last sessions.

pandora_console/operation/menu.php

@@ -258,7 +258,8 @@ if (give_acl($_SESSION["id_usuario"], 0, "AR")==1) {
 	} else {
 		echo '<li class="bb0">';
 	}
-	echo '<a href="index.php?sec=reporting&sec2=operation/reporting/graph_viewer" class="mn">'. lang_string ("reporting").'</a></li></ul></div>';
+	echo '<a href="index.php?sec=reporting&sec2=operation/reporting/custom_reporting" class="mn">'.
+		lang_string ("reporting").'</a></li></ul></div>';
 
 	// Custom reporting
 	if (isset($_GET["sec"]) && $_GET["sec"] == "reporting"){

pandora_console/operation/visual_console/index.php

@@ -43,21 +43,18 @@ $table->head = array ();
 $table->head[0] = lang_string ('name');
 $table->head[1] = lang_string ('group');
 $table->head[2] = lang_string ('elements');
-$table->head[3] = lang_string ('view');
 $table->align = array ();
 $table->align[2] = 'center';
-$table->align[3] = 'center';
 
 foreach ($layouts as $layout) {
 	$data = array ();
 	
-	$data[0] = $layout['name'];
+	$data[0] = '<a href="index.php?sec=visualc&sec2=operation/visual_console/render_view&id='.
+		$layout['id'].'">'.$layout['name'].'</a>';
 	$data[1] = '<img src="images/'.dame_grupo_icono($layout["id_group"]).'.png" 
 		title="'.dame_nombre_grupo ($layout["id_group"]).'"> ';
 	$data[1] .= dame_nombre_grupo ($layout["id_group"]);
 	$data[2] = get_db_value ('COUNT(*)', 'tlayout_data', 'id_layout', $layout['id']);
-	$data[3] = '<a href="index.php?sec=visualc&sec2=operation/visual_console/render_view&id='.
-		$layout['id'].'"><img src="images/images.png"></a>';
 	
 	array_push ($table->data, $data);
 }

pandora_console/operation/visual_console/render_view.php

@@ -35,7 +35,7 @@ $refr = (int) get_parameter ('refr');
 // Get input parameter for layout id
 // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 if (! $id_layout) {
-	audit_db($id_usuario,$REMOTE_ADDR, "ACL Violation","Trying to access visual console without id layout");
+	audit_db ($config["id_user"],$REMOTE_ADDR, "ACL Violation","Trying to access visual console without id layout");
 	include ("general/noaccess.php");
 	exit;
 }
@@ -43,7 +43,7 @@ if (! $id_layout) {
 $layout = get_db_row ('tlayout', 'id', $id_layout);
 
 if (! $layout) {
-	audit_db($id_usuario,$REMOTE_ADDR, "ACL Violation","Trying to access visual console without id layout");
+	audit_db ($config["id_user"], $REMOTE_ADDR, "ACL Violation","Trying to access visual console without id layout");
 	include ("general/noaccess.php");
 	exit;
 }
@@ -57,10 +57,8 @@ $bheight = $layout["height"];
 
 $pure_url = "&pure=".$config["pure"];
 
-// ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+// Render map
-// RENDER MAP !
+echo "<h1>".$layout_name."</h1>";
-// ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-echo "<h1>".$layout_name;
 
 if ($config["pure"] == 0){
 	echo lang_string("Full screen mode");
@@ -75,9 +73,7 @@ if ($config["pure"] == 0){
 	echo "<img src='images/monitor.png' title='".lang_string("Back to normal mode")."'>";
 	echo "</a>";
 }
-
+echo '<br />';
-echo "</h1>";
-
 if ($refr) {
 	echo '<div id="countdown">';
 	echo '</div>';