tyler.durden
/
pandorafms
mirror of https://github.com/pandorafms/pandorafms.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'pandora_5.1' of https://github.com/pandorafms/pandorafms into pandora_5.1

This commit is contained in:
Ramon Novoa 2015-03-18 16:22:12 +01:00
parent d4f8af2a56 e5c1982548
commit 1401245971
3 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pandora_console/include/functions_ui.php
View File

@ -513,7 +513,7 @@ function ui_print_group_icon ($id_group, $return = false, $path = "groups_small"
} }
else { else {
if (empty ($icon)) if (empty ($icon))
$output .= '<span title="'. groups_get_name($id_group, true).'">&nbsp;-&nbsp</span>'; $output .= '<span title="'. groups_get_name($id_group, true).'">&nbsp;&nbsp;</span>';
else { else {
$output .= html_print_image("images/" . $path . "/" . $icon . ".png", $output .= html_print_image("images/" . $path . "/" . $icon . ".png",
true, array("style" => $style, "class" => "bot", "alt" => groups_get_name($id_group, true), "title" => groups_get_name ($id_group, true))); true, array("style" => $style, "class" => "bot", "alt" => groups_get_name($id_group, true), "title" => groups_get_name ($id_group, true)));

3
pandora_console/operation/agentes/estado_generalagente.php
View File

@ -81,7 +81,10 @@ else {
$agent_name = $agent_name; $agent_name = $agent_name;
} }
if (!$config["show_group_name"])
$data[0] = ui_print_group_icon ($agent["id_grupo"], true); $data[0] = ui_print_group_icon ($agent["id_grupo"], true);
else
$data[0] = "";
$table_agent->cellstyle[count($table_agent->data)][0] = $table_agent->cellstyle[count($table_agent->data)][0] =
'width: 16px; text-align:center; padding: 0px;'; 'width: 16px; text-align:center; padding: 0px;';

5
pandora_console/operation/users/user_edit.php
View File

@ -392,6 +392,11 @@ if ($result === false) {
foreach ($result as $profile) { foreach ($result as $profile) {
$data[0] = '<b>'.profile_get_name ($profile["id_perfil"]).'</b>'; $data[0] = '<b>'.profile_get_name ($profile["id_perfil"]).'</b>';
if ($config["show_group_name"])
$data[1] = ui_print_group_icon ($profile["id_grupo"], true) .
'<a href="index.php?sec=estado&sec2=operation/agentes/estado_agente&refr=60&group_id=' . $profile['id_grupo'] . '">' .
'&nbsp;' . '</a>';
else
$data[1] = ui_print_group_icon ($profile["id_grupo"], true) . $data[1] = ui_print_group_icon ($profile["id_grupo"], true) .
'<a href="index.php?sec=estado&sec2=operation/agentes/estado_agente&refr=60&group_id=' . $profile['id_grupo'] . '">' . '<a href="index.php?sec=estado&sec2=operation/agentes/estado_agente&refr=60&group_id=' . $profile['id_grupo'] . '">' .
'&nbsp;' . ui_print_truncate_text(groups_get_name ($profile['id_grupo'], True), GENERIC_SIZE_TEXT) . '&nbsp;' . ui_print_truncate_text(groups_get_name ($profile['id_grupo'], True), GENERIC_SIZE_TEXT) .