2012-04-16 Vanessa Gil <vanessa.gil@artica.es>
* extensions/tree.php extensions/tree/no_branch.png extensions/tree/branch.png extensions/tree/closed.png extensions/tree/expanded.png extensions/tree/first_closed.png extensions/tree/first_expanded.png extensions/tree/last_closed.png extensions/tree/last_expanded.png extensions/tree/last_leaf.png extensions/tree/leaf.png extensions/tree/one_closed.png extensions/tree/one_expanded.png. Changed tree view images. git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@5977 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
vgilc
parent
21e7df6936
commit
6b07dee452
|
|
@ -1,3 +1,19 @@
|
|||
2012-04-16 Vanessa Gil <vanessa.gil@artica.es>
|
||||
|
||||
* extensions/tree.php
|
||||
extensions/tree/no_branch.png
|
||||
extensions/tree/branch.png
|
||||
extensions/tree/closed.png
|
||||
extensions/tree/expanded.png
|
||||
extensions/tree/first_closed.png
|
||||
extensions/tree/first_expanded.png
|
||||
extensions/tree/last_closed.png
|
||||
extensions/tree/last_expanded.png
|
||||
extensions/tree/last_leaf.png
|
||||
extensions/tree/leaf.png
|
||||
extensions/tree/one_closed.png
|
||||
extensions/tree/one_expanded.png. Changed tree view images.
|
||||
|
||||
2012-04-14 Junichi Satoh <junichi@rworks.jp>
|
||||
|
||||
* include/functions_tags.php: Fixed SQL error with PostgreSQL.
|
||||
|
|
|
|||
|
|
@ -325,9 +325,9 @@ if (is_ajax ())
|
|||
echo "<ul style='margin: 0; padding: 0;'>\n";
|
||||
echo "<li style='margin: 0; padding: 0;'>";
|
||||
if ($lessBranchs == 1)
|
||||
echo html_print_image ("extensions/tree/no_branch_.png", true, array ("style" => 'vertical-align: middle;'));
|
||||
echo html_print_image ("extensions/tree/no_branch.png", true, array ("style" => 'vertical-align: middle;'));
|
||||
else
|
||||
echo html_print_image ("extensions/tree/branch_.png", true, array ("style" => 'vertical-align: middle;'));
|
||||
echo html_print_image ("extensions/tree/branch.png", true, array ("style" => 'vertical-align: middle;'));
|
||||
echo "<i>" . __("Empty") . "</i>";
|
||||
echo "</li>";
|
||||
echo "</ul>";
|
||||
|
|
@ -336,8 +336,8 @@ if (is_ajax ())
|
|||
|
||||
$new = true;
|
||||
$count = 0;
|
||||
$count_status++;
|
||||
echo "<ul style='margin: 0; padding: 0;'>\n";
|
||||
|
||||
while($row = db_get_all_row_by_steps_sql($new, $result, $sql)) {
|
||||
$new = false;
|
||||
$count++;
|
||||
|
|
@ -382,19 +382,19 @@ if (is_ajax ())
|
|||
|
||||
$less = $lessBranchs;
|
||||
if ($count != $countRows)
|
||||
$img = html_print_image ("extensions/tree/closed_.png", true, array ("style" => 'vertical-align: middle;', "id" => "tree_image" . $id . "_agent_" . $type . "_" . $row["id_agente"], "pos_tree" => "2"));
|
||||
$img = html_print_image ("extensions/tree/closed.png", true, array ("style" => 'vertical-align: middle;', "id" => "tree_image" . $id . "_agent_" . $type . "_" . $row["id_agente"], "pos_tree" => "2"));
|
||||
else {
|
||||
$less = $less + 2; // $less = $less or 0b10
|
||||
$img = html_print_image ("extensions/tree/last_closed_.png", true, array ("style" => 'vertical-align: middle;', "id" => "tree_image" . $id . "_agent_" . $row["id_agente"], "pos_tree" => "3"));
|
||||
$img = html_print_image ("extensions/tree/last_closed.png", true, array ("style" => 'vertical-align: middle;', "id" => "tree_image" . $id . "_agent_" . $row["id_agente"], "pos_tree" => "3"));
|
||||
}
|
||||
echo "<li style='margin: 0; padding: 0;'>";
|
||||
echo "<a onfocus='JavaScript: this.blur()'
|
||||
href='javascript: loadSubTree(\"agent_" . $type . "\"," . $row["id_agente"] . ", " . $less . ", \"" . $id . "\")'>";
|
||||
|
||||
if ($lessBranchs == 1)
|
||||
html_print_image ("extensions/tree/no_branch_.png", false, array ("style" => 'vertical-align: middle;'));
|
||||
html_print_image ("extensions/tree/no_branch.png", false, array ("style" => 'vertical-align: middle;'));
|
||||
else
|
||||
html_print_image ("extensions/tree/branch_.png", false, array ("style" => 'vertical-align: middle;'));
|
||||
html_print_image ("extensions/tree/branch.png", false, array ("style" => 'vertical-align: middle;'));
|
||||
|
||||
echo $img;
|
||||
ui_print_group_icon ($row["id_grupo"], false, "groups_small", "vertical-align: middle; width: 16px; height: 16px;", false);
|
||||
|
|
@ -436,10 +436,11 @@ if (is_ajax ())
|
|||
echo "</a>";
|
||||
echo "<div hiddenDiv='1' loadDiv='0' style='margin: 0px; padding: 0px;' class='tree_view' id='tree_div" . $id . "_agent_" . $type . "_" . $row["id_agente"] . "'></div>";
|
||||
echo "</li>";
|
||||
|
||||
}
|
||||
|
||||
echo "</ul>\n";
|
||||
break;
|
||||
|
||||
//also aknolegment as second subtree/branch
|
||||
case 'agent_group':
|
||||
case 'agent_module_group':
|
||||
|
|
@ -507,20 +508,20 @@ if (is_ajax ())
|
|||
echo "<li style='margin: 0; padding: 0;'>";
|
||||
switch ($lessBranchs) {
|
||||
case 0:
|
||||
html_print_image ("extensions/tree/branch_.png", false, array ("style" => 'vertical-align: middle;'));
|
||||
html_print_image ("extensions/tree/branch_.png", false, array ("style" => 'vertical-align: middle;'));
|
||||
html_print_image ("extensions/tree/branch.png", false, array ("style" => 'vertical-align: middle;'));
|
||||
html_print_image ("extensions/tree/branch.png", false, array ("style" => 'vertical-align: middle;'));
|
||||
break;
|
||||
case 1:
|
||||
html_print_image ("extensions/tree/no_branch_.png", false, array ("style" => 'vertical-align: middle;'));
|
||||
html_print_image ("extensions/tree/branch_.png", false, array ("style" => 'vertical-align: middle;'));
|
||||
html_print_image ("extensions/tree/no_branch.png", false, array ("style" => 'vertical-align: middle;'));
|
||||
html_print_image ("extensions/tree/branch.png", false, array ("style" => 'vertical-align: middle;'));
|
||||
break;
|
||||
case 2:
|
||||
html_print_image ("extensions/tree/branch_.png", false, array ("style" => 'vertical-align: middle;'));
|
||||
html_print_image ("extensions/tree/no_branch_.png", false, array ("style" => 'vertical-align: middle;'));
|
||||
html_print_image ("extensions/tree/branch.png", false, array ("style" => 'vertical-align: middle;'));
|
||||
html_print_image ("extensions/tree/no_branch.png", false, array ("style" => 'vertical-align: middle;'));
|
||||
break;
|
||||
case 3:
|
||||
html_print_image ("extensions/tree/no_branch_.png", false, array ("style" => 'vertical-align: middle;'));
|
||||
html_print_image ("extensions/tree/no_branch_.png", false, array ("style" => 'vertical-align: middle;'));
|
||||
html_print_image ("extensions/tree/no_branch.png", false, array ("style" => 'vertical-align: middle;'));
|
||||
html_print_image ("extensions/tree/no_branch.png", false, array ("style" => 'vertical-align: middle;'));
|
||||
break;
|
||||
}
|
||||
echo "<i>" . __("Empty") . "</i>";
|
||||
|
|
@ -539,27 +540,27 @@ if (is_ajax ())
|
|||
|
||||
switch ($lessBranchs) {
|
||||
case 0:
|
||||
html_print_image ("extensions/tree/branch_.png", false, array ("style" => 'vertical-align: middle;'));
|
||||
html_print_image ("extensions/tree/branch_.png", false, array ("style" => 'vertical-align: middle;'));
|
||||
html_print_image ("extensions/tree/branch.png", false, array ("style" => 'vertical-align: middle;'));
|
||||
html_print_image ("extensions/tree/branch.png", false, array ("style" => 'vertical-align: middle;'));
|
||||
break;
|
||||
case 1:
|
||||
html_print_image ("extensions/tree/no_branch_.png", false, array ("style" => 'vertical-align: middle;'));
|
||||
html_print_image ("extensions/tree/branch_.png", false, array ("style" => 'vertical-align: middle;'));
|
||||
html_print_image ("extensions/tree/no_branch.png", false, array ("style" => 'vertical-align: middle;'));
|
||||
html_print_image ("extensions/tree/branch.png", false, array ("style" => 'vertical-align: middle;'));
|
||||
break;
|
||||
case 2:
|
||||
html_print_image ("extensions/tree/branch_.png", false, array ("style" => 'vertical-align: middle;'));
|
||||
html_print_image ("extensions/tree/no_branch_.png", false, array ("style" => 'vertical-align: middle;'));
|
||||
html_print_image ("extensions/tree/branch.png", false, array ("style" => 'vertical-align: middle;'));
|
||||
html_print_image ("extensions/tree/no_branch.png", false, array ("style" => 'vertical-align: middle;'));
|
||||
break;
|
||||
case 3:
|
||||
html_print_image ("extensions/tree/no_branch_.png", false, array ("style" => 'vertical-align: middle;'));
|
||||
html_print_image ("extensions/tree/no_branch_.png", false, array ("style" => 'vertical-align: middle;'));
|
||||
html_print_image ("extensions/tree/no_branch.png", false, array ("style" => 'vertical-align: middle;'));
|
||||
html_print_image ("extensions/tree/no_branch.png", false, array ("style" => 'vertical-align: middle;'));
|
||||
break;
|
||||
}
|
||||
|
||||
if ($countRows != $count)
|
||||
html_print_image ("extensions/tree/leaf_.png", false, array ("style" => 'vertical-align: middle;', "id" => "tree_image_os_" . $row["id_agente"], "pos_tree" => "1" ));
|
||||
html_print_image ("extensions/tree/leaf.png", false, array ("style" => 'vertical-align: middle;', "id" => "tree_image_os_" . $row["id_agente"], "pos_tree" => "1" ));
|
||||
else
|
||||
html_print_image ("extensions/tree/last_leaf_.png", false, array ("style" => 'vertical-align: middle;', "id" => "tree_image_os_" . $row["id_agente"], "pos_tree" => "2" ));
|
||||
html_print_image ("extensions/tree/last_leaf.png", false, array ("style" => 'vertical-align: middle;', "id" => "tree_image_os_" . $row["id_agente"], "pos_tree" => "2" ));
|
||||
|
||||
// This line checks for (non-initialized) asyncronous modules
|
||||
if ($row["estado"] == 0 AND $row["utimestamp"] == 0 AND ($row["id_tipo_modulo"] >= 21 AND $row["id_tipo_modulo"] <= 23)){
|
||||
|
|
@ -624,9 +625,12 @@ if (is_ajax ())
|
|||
break;
|
||||
}
|
||||
|
||||
|
||||
return;
|
||||
|
||||
}
|
||||
|
||||
|
||||
include_once($config['homedir'] . "/include/functions_groups.php");
|
||||
include_once($config['homedir'] . "/include/functions_servers.php");
|
||||
include_once($config['homedir'] . "/include/functions_reporting.php");
|
||||
|
|
@ -777,6 +781,7 @@ function printTree_($type) {
|
|||
$num_critical = 0;
|
||||
$num_warning = 0;
|
||||
$num_unknown = 0;
|
||||
//html_debug_print($agentes);
|
||||
foreach ($agentes as $agente) {
|
||||
$stat = reporting_get_agent_module_info ($agente["id_agente"]);
|
||||
|
||||
|
|
@ -867,21 +872,21 @@ function printTree_($type) {
|
|||
$lessBranchs = 0;
|
||||
if ($first) {
|
||||
if ($item != end($list)) {
|
||||
$img = html_print_image ("extensions/tree/first_closed_.png", true, array ("style" => 'vertical-align: middle;', "id" => "tree_image_" . $type . "_" . $id, "pos_tree" => "0"));
|
||||
$img = html_print_image ("extensions/tree/first_closed.png", true, array ("style" => 'vertical-align: middle;', "id" => "tree_image_" . $type . "_" . $id, "pos_tree" => "0"));
|
||||
$first = false;
|
||||
}
|
||||
else {
|
||||
$lessBranchs = 1;
|
||||
$img = html_print_image ("extensions/tree/one_closed_.png", true, array ("style" => 'vertical-align: middle;', "id" => "tree_image_" . $type . "_" . $id, "pos_tree" => "1"));
|
||||
$img = html_print_image ("extensions/tree/one_closed.png", true, array ("style" => 'vertical-align: middle;', "id" => "tree_image_" . $type . "_" . $id, "pos_tree" => "1"));
|
||||
}
|
||||
}
|
||||
else {
|
||||
if ($item != end($list))
|
||||
$img = html_print_image ("extensions/tree/closed_.png", true, array ("style" => 'vertical-align: middle;', "id" => "tree_image_" . $type . "_" . $id, "pos_tree" => "2"));
|
||||
$img = html_print_image ("extensions/tree/closed.png", true, array ("style" => 'vertical-align: middle;', "id" => "tree_image_" . $type . "_" . $id, "pos_tree" => "2"));
|
||||
else
|
||||
{
|
||||
$lessBranchs = 1;
|
||||
$img = html_print_image ("extensions/tree/last_closed_.png", true, array ("style" => 'vertical-align: middle;', "id" => "tree_image_" . $type . "_" . $id, "pos_tree" => "3"));
|
||||
$img = html_print_image ("extensions/tree/last_closed.png", true, array ("style" => 'vertical-align: middle;', "id" => "tree_image_" . $type . "_" . $id, "pos_tree" => "3"));
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -953,16 +958,16 @@ function printJS_() {
|
|||
//change image of tree [+] to [-]
|
||||
switch (pos) {
|
||||
case 0:
|
||||
$('#tree_image'+id_father+'_'+type+'_'+div_id).attr('src','extensions/tree/first_expanded_.png');
|
||||
$('#tree_image'+id_father+'_'+type+'_'+div_id).attr('src','extensions/tree/first_expanded.png');
|
||||
break;
|
||||
case 1:
|
||||
$('#tree_image'+id_father+'_'+type+'_'+div_id).attr('src','extensions/tree/one_expanded_.png');
|
||||
$('#tree_image'+id_father+'_'+type+'_'+div_id).attr('src','extensions/tree/one_expanded.png');
|
||||
break;
|
||||
case 2:
|
||||
$('#tree_image'+id_father+'_'+type+'_'+div_id).attr('src','extensions/tree/expanded_.png');
|
||||
$('#tree_image'+id_father+'_'+type+'_'+div_id).attr('src','extensions/tree/expanded.png');
|
||||
break;
|
||||
case 3:
|
||||
$('#tree_image'+id_father+'_'+type+'_'+div_id).attr('src','extensions/tree/last_expanded_.png');
|
||||
$('#tree_image'+id_father+'_'+type+'_'+div_id).attr('src','extensions/tree/last_expanded.png');
|
||||
break;
|
||||
}
|
||||
$('#tree_div'+id_father+'_'+type+'_'+div_id).attr('hiddendiv',0);
|
||||
|
|
@ -979,16 +984,16 @@ function printJS_() {
|
|||
//change image of tree [-] to [+]
|
||||
switch (pos) {
|
||||
case 0:
|
||||
$('#tree_image'+id_father+'_'+type+'_'+div_id).attr('src','extensions/tree/first_closed_.png');
|
||||
$('#tree_image'+id_father+'_'+type+'_'+div_id).attr('src','extensions/tree/first_closed.png');
|
||||
break;
|
||||
case 1:
|
||||
$('#tree_image'+id_father+'_'+type+'_'+div_id).attr('src','extensions/tree/one_closed_.png');
|
||||
$('#tree_image'+id_father+'_'+type+'_'+div_id).attr('src','extensions/tree/one_closed.png');
|
||||
break;
|
||||
case 2:
|
||||
$('#tree_image'+id_father+'_'+type+'_'+div_id).attr('src','extensions/tree/closed_.png');
|
||||
$('#tree_image'+id_father+'_'+type+'_'+div_id).attr('src','extensions/tree/closed.png');
|
||||
break;
|
||||
case 3:
|
||||
$('#tree_image'+id_father+'_'+type+'_'+div_id).attr('src','extensions/tree/last_closed_.png');
|
||||
$('#tree_image'+id_father+'_'+type+'_'+div_id).attr('src','extensions/tree/last_closed.png');
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
|
@ -996,16 +1001,16 @@ function printJS_() {
|
|||
//change image of tree [+] to [-]
|
||||
switch (pos) {
|
||||
case 0:
|
||||
$('#tree_image'+id_father+'_'+type+'_'+div_id).attr('src','extensions/tree/first_expanded_.png');
|
||||
$('#tree_image'+id_father+'_'+type+'_'+div_id).attr('src','extensions/tree/first_expanded.png');
|
||||
break;
|
||||
case 1:
|
||||
$('#tree_image'+id_father+'_'+type+'_'+div_id).attr('src','extensions/tree/one_expanded_.png');
|
||||
$('#tree_image'+id_father+'_'+type+'_'+div_id).attr('src','extensions/tree/one_expanded.png');
|
||||
break;
|
||||
case 2:
|
||||
$('#tree_image'+id_father+'_'+type+'_'+div_id).attr('src','extensions/tree/expanded_.png');
|
||||
$('#tree_image'+id_father+'_'+type+'_'+div_id).attr('src','extensions/tree/expanded.png');
|
||||
break;
|
||||
case 3:
|
||||
$('#tree_image'+id_father+'_'+type+'_'+div_id).attr('src','extensions/tree/last_expanded_.png');
|
||||
$('#tree_image'+id_father+'_'+type+'_'+div_id).attr('src','extensions/tree/last_expanded.png');
|
||||
break;
|
||||
}
|
||||
|
||||
|
|
|
|||
Binary file not shown.
|
After Width: | Height: | Size: 216 B |
Binary file not shown.
|
After Width: | Height: | Size: 196 B |
Binary file not shown.
|
After Width: | Height: | Size: 191 B |
Binary file not shown.
|
After Width: | Height: | Size: 193 B |
Binary file not shown.
|
After Width: | Height: | Size: 189 B |
Binary file not shown.
|
After Width: | Height: | Size: 193 B |
Binary file not shown.
|
After Width: | Height: | Size: 189 B |
Binary file not shown.
|
After Width: | Height: | Size: 172 B |
Binary file not shown.
|
After Width: | Height: | Size: 221 B |
Binary file not shown.
|
After Width: | Height: | Size: 211 B |
Binary file not shown.
|
After Width: | Height: | Size: 190 B |
Binary file not shown.
|
After Width: | Height: | Size: 185 B |
Loading…
Reference in New Issue