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

Merge branch 'ent-8144-no-se-muestra-completo-el-nombre-de-dashboard-consola-visual-favorito-en-el-menu' into 'develop' 

Ent 8144 no se muestra completo el nombre de dashboard consola visual favorito en el menu

See merge request artica/pandorafms!4505
This commit is contained in:
Daniel Rodriguez 2021-11-22 15:54:05 +00:00
parent 3efcc8d30f e1f38aed0d
commit 688ec5f7f9
4 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
pandora_console/include/constants.php
View File

@ -173,6 +173,7 @@ define('COL_GRAPH13', '#E83128');
// Styles.
// Size of text in characters for truncate.
define('GENERIC_SIZE_TEXT', 50);
define('MENU_SIZE_TEXT', 20);

4
pandora_console/include/functions_menu.php
View File

@ -376,11 +376,11 @@ function menu_print_menu(&$menu)
if (isset($sub2['title'])) {
$sub_title = $sub2['title'];
} else {
$sub_title = '';
$sub_title = $sub2['text'];
}
$submenu2_list .= '<li class="'.$class.'" >';
$submenu2_list .= '<a href="'.$link.'"><div class="'.$sub_tree_class.'" title="'.$sub2['text'].'" >'.$sub2['text'].'</div></a></li>';
$submenu2_list .= '<a href="'.$link.'"><div class="'.$sub_tree_class.'" title="'.$sub_title.'" >'.$sub2['text'].'</div></a></li>';
$sub_title = '';
}

8
pandora_console/operation/menu.php
View File

@ -220,7 +220,7 @@ if (check_acl($config['id_user'], 0, 'VR') || check_acl($config['id_user'], 0, '
$name = io_safe_output($layout['name']);
$sub2['operation/visual_console/render_view&amp;id='.$layout['id']]['text'] = mb_substr($name, 0, 19);
$sub2['operation/visual_console/render_view&amp;id='.$layout['id']]['text'] = ui_print_truncate_text($name, MENU_SIZE_TEXT, false, true, false);
$sub2['operation/visual_console/render_view&amp;id='.$layout['id']]['id'] = mb_substr($name, 0, 19);
$sub2['operation/visual_console/render_view&amp;id='.$layout['id']]['title'] = $name;
if (!empty($config['vc_refr'])) {
@ -235,7 +235,7 @@ if (check_acl($config['id_user'], 0, 'VR') || check_acl($config['id_user'], 0, '
if ($break_max_console) {
$sub2['godmode/reporting/visual_console_favorite']['text'] = __('Show more').' >';
$sub2['godmode/reporting/visual_console_favorite']['id'] = 'visual_favourite_console';
$sub2['godmode/reporting/visual_console_favorite']['title'] = 'show_more';
$sub2['godmode/reporting/visual_console_favorite']['title'] = __('Show more');
$sub2['godmode/reporting/visual_console_favorite']['refr'] = 0;
}
@ -281,7 +281,7 @@ if (check_acl($config['id_user'], 0, 'MR') || check_acl($config['id_user'], 0, '
continue;
}
$sub2['operation/gis_maps/render_view&amp;map_id='.$gisMap['id_tgis_map']]['text'] = mb_substr(io_safe_output($gisMap['map_name']), 0, 15);
$sub2['operation/gis_maps/render_view&amp;map_id='.$gisMap['id_tgis_map']]['text'] = ui_print_truncate_text(io_safe_output($gisMap['map_name']), MENU_SIZE_TEXT, false, true, false);
$sub2['operation/gis_maps/render_view&amp;map_id='.$gisMap['id_tgis_map']]['id'] = mb_substr(io_safe_output($gisMap['map_name']), 0, 15);
$sub2['operation/gis_maps/render_view&amp;map_id='.$gisMap['id_tgis_map']]['title'] = io_safe_output($gisMap['map_name']);
$sub2['operation/gis_maps/render_view&amp;map_id='.$gisMap['id_tgis_map']]['refr'] = 0;
@ -345,7 +345,7 @@ if (check_acl($config['id_user'], 0, 'RR') || check_acl($config['id_user'], 0, '
$name = io_safe_output($dashboard['name']);
$sub2['operation/dashboard/dashboard&dashboardId='.$dashboard['id']] = [
'text' => mb_substr($name, 0, 19),
'text' => ui_print_truncate_text($name, MENU_SIZE_TEXT, false, true, false),
'title' => $name,
];
}

9
pandora_console/views/dashboard/formDashboard.php
View File

@ -76,10 +76,11 @@ $inputs = [
[
'label' => __('Name'),
'arguments' => [
'type' => 'text',
'name' => 'name',
'value' => $arrayDashboard['name'],
'size' => '',
'type' => 'text',
'name' => 'name',
'value' => $arrayDashboard['name'],
'size' => '',
'maxlength' => 35,
],
],
[