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-9662-Restyling-fuentes-colores-botones' of brutus.artica.es:artica/pandorafms into ent-9662-Restyling-fuentes-colores-botones

This commit is contained in:
Pablo Aragon 2023-03-07 09:52:05 +01:00
parent 6c6943c591 1d93c666ba
commit 6cb78d312f
5 changed files with 75 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
pandora_console/godmode/groups/configure_group.php
View File

@ -133,8 +133,8 @@ $table->data[0][0] = html_print_label_input_block(
html_print_input_text('name', $name, '', 35, 100, true)
);
$input_icon = html_print_select($files, 'icon', $icon, '', 'None', '', true);
$input_icon .= ' <span id="icon_preview">';
$input_icon = html_print_select($files, 'icon', $icon, '', 'None', '', true, false, true, '', false, 'width: 100%;');
$input_icon .= ' <span id="icon_preview" class="mrgn_lft_05em">';
if (empty($icon) === false) {
$input_icon .= html_print_image('images/'.$icon, true);
}
@ -143,7 +143,13 @@ $input_icon .= '</span>';
$table->data[0][1] = html_print_label_input_block(
__('Icon'),
'<div>'.$input_icon.'</div>'
html_print_div(
[
'class' => 'flex-content-left ',
'content' => $input_icon,
],
true
)
);
if ($id_group > 0) {
@ -191,14 +197,20 @@ if ($id_group > 0) {
}
if ($acl_parent === true) {
$input_parent .= ' <span id="parent_preview">';
$input_parent .= ' <span id="parent_preview" class="mrgn_lft_05em">';
$input_parent .= html_print_image('images/'.(($id_parent !== 0) ? groups_get_icon($id_parent) : 'unknown@groups.svg'), true);
$input_parent .= '</span>';
}
$table->data[1][0] = html_print_label_input_block(
__('Parent'),
'<div>'.$input_parent.'</div>'
html_print_div(
[
'class' => 'flex-content-left ',
'content' => $input_parent,
],
true
)
);
if ((bool) $config['enterprise_installed'] === true) {
@ -271,11 +283,14 @@ if ($id_group) {
}
$buttons .= html_print_button(
__('Back'),
__('Go back'),
'button_back',
false,
'',
['icon' => 'cancel'],
[
'icon' => 'back',
'mode' => 'secondary',
],
true
);

22
pandora_console/godmode/groups/group_list.php
View File

@ -14,7 +14,7 @@
* |___| |___._|__|__|_____||_____|__| |___._| |___| |__|_|__|_______|
*
* ============================================================================
* Copyright (c) 2005-2021 Artica Soluciones Tecnologicas
* Copyright (c) 2005-2023 Artica Soluciones Tecnologicas
* Please see http://pandorafms.org for full contribution list
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
@ -306,11 +306,11 @@ $url_groups = 'index.php?sec='.$sec.'&sec2=godmode/groups/group_list&tab=groups'
$buttons['tree'] = [
'active' => false,
'text' => '<a href="'.$url_tree.'">'.html_print_image(
'images/gm_massive_operations.png',
'images/snmp-trap@svg.svg',
true,
[
'title' => __('Tree Group view'),
'class' => 'invert_filter',
'class' => 'main_menu_icon invert_filter',
]
).'</a>',
];
@ -318,11 +318,11 @@ $buttons['tree'] = [
$buttons['groups'] = [
'active' => false,
'text' => '<a href="'.$url_groups.'">'.html_print_image(
'images/group.png',
'images/groups@svg.svg',
true,
[
'title' => __('Group view'),
'class' => 'invert_filter',
'class' => 'main_menu_icon invert_filter',
]
).'</a>',
];
@ -334,7 +334,7 @@ $buttons['credbox'] = [
true,
[
'title' => __('Credential Store'),
'class' => 'invert_filter',
'class' => 'main_menu_icon invert_filter',
]
).'</a>',
];
@ -945,12 +945,12 @@ if ($tab == 'tree') {
if ($is_management_allowed === true) {
$table->cellclass[$key][6] = 'table_action_buttons';
$table->data[$key][6] = '<a href="'.$url.'">'.html_print_image(
'images/config.png',
'images/edit.svg',
true,
[
'alt' => __('Edit'),
'title' => __('Edit'),
'border' => '0',
'alt' => __('Edit'),
'title' => __('Edit'),
'class' => 'main_menu_icon invert_filter',
]
).'</a>';
@ -965,7 +965,7 @@ if ($tab == 'tree') {
}
$table->data[$key][6] .= '<a href="'.$url_delete.'" onClick="if (!confirm(\' '.$confirm_message.'\')) return false;">'.html_print_image(
'images/cross.png',
'images/delete.svg',
true,
[
'alt' => __('Delete'),

26
pandora_console/godmode/tag/tag.php
View File

@ -14,7 +14,7 @@
* |___| |___._|__|__|_____||_____|__| |___._| |___| |__|_|__|_______|
*
* ============================================================================
* Copyright (c) 2005-2021 Artica Soluciones Tecnologicas
* Copyright (c) 2005-2023 Artica Soluciones Tecnologicas
* Please see http://pandorafms.org for full contribution list
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
@ -126,11 +126,11 @@ $buttons = [
'list' => [
'active' => false,
'text' => '<a href="index.php?sec='.$sec.'&sec2=godmode/tag/tag&tab=list">'.html_print_image(
'images/list.png',
'images/logs@svg.svg',
true,
[
'title' => __('List tags'),
'class' => 'invert_filter',
'class' => 'main_menu_icon invert_filter',
]
).'</a>',
],
@ -335,9 +335,9 @@ if (empty($result) === false) {
// The tooltip needs a title on the item, don't delete the title.
$data[3] = '<a class="tag_details img_help" title="'.__('Tag details').'"
href="'.ui_get_full_url(false, false, false, false).'/ajax.php?page=godmode/tag/tag&get_tag_tooltip=1&id_tag='.$tag['id_tag'].'">'.html_print_image(
'images/zoom.png',
'images/details.svg',
true,
['class' => 'invert_filter']
['class' => 'main_menu_icon invert_filter']
).'</a> ';
$modules_count = 0;
@ -375,9 +375,9 @@ if (empty($result) === false) {
$output .= '</span> ';
$output .= "<a href='javascript: show_dialog(".$tag['id_tag'].")'>";
$output .= html_print_image(
'images/rosette.png',
'images/item-icon.svg',
true,
['class' => 'invert_filter']
['class' => 'main_menu_icon invert_filter']
);
$output .= '</a></span>';
}
@ -396,9 +396,9 @@ if (empty($result) === false) {
$output .= '<span id="value_'.$tag['id_tag'].'">'.$phone_small.'</span> ';
$output .= "<a href='javascript: show_phone_dialog(".$tag['id_tag'].")'>";
$output .= html_print_image(
'images/rosette.png',
'images/item-icon.svg',
true,
['class' => 'invert_filter']
['class' => 'main_menu_icon invert_filter']
);
$output .= '</a></span>';
}
@ -409,20 +409,20 @@ if (empty($result) === false) {
$table->cellclass[][6] = 'table_action_buttons';
$data[6] = "<a href='index.php?sec=".$sec.'&sec2=godmode/tag/edit_tag&action=update&id_tag='.$tag['id_tag']."'>";
$data[6] .= html_print_image(
'images/config.png',
'images/edit.svg',
true,
[
'title' => 'Edit',
'class' => 'invert_filter',
'class' => 'main_menu_icon invert_filter',
]
);
$data[6] .= '</a>';
$data[6] .= '<a href="index.php?sec='.$sec.'&sec2=godmode/tag/tag&delete_tag='.$tag['id_tag'].'&offset='.$offset_delete.'"onclick="if (! confirm (\''.__('Are you sure?').'\')) return false">'.html_print_image(
'images/cross.png',
'images/delete.svg',
true,
[
'title' => 'Delete',
'class' => 'invert_filter',
'class' => 'main_menu_icon invert_filter',
]
).'</a>';
}

8
pandora_console/include/class/CredentialStore.class.php
View File

@ -1283,13 +1283,15 @@ class CredentialStore extends Wizard
idrow += '\')" >'+item.identifier+'</a></b>';
item.identifier = idrow;
item.options = '<a href="javascript:" onclick="show_form(\'';
item.options = '<div class="table_action_buttons">';
item.options += '<a href="javascript:" onclick="show_form(\'';
item.options += id;
item.options += '\')" ><?php echo html_print_image('images/operation.png', true, ['title' => __('Show'), 'class' => 'invert_filter']); ?></a>';
item.options += '\')" ><?php echo html_print_image('images/edit.svg', true, ['title' => __('Edit'), 'class' => 'main_menu_icon invert_filter']); ?></a>';
item.options += '<a href="javascript:" onclick="delete_key(\'';
item.options += id;
item.options += '\')" ><?php echo html_print_image('images/cross.png', true, ['title' => __('Delete'), 'class' => 'invert_filter']); ?></a>';
item.options += '\')" ><?php echo html_print_image('images/delete.svg', true, ['title' => __('Delete'), 'class' => 'main_menu_icon invert_filter']); ?></a>';
item.options += '</div>';
}
/**

43
pandora_console/include/javascript/tree/TreeController.js
View File

@ -671,31 +671,15 @@ var TreeController = {
"</div>"
);
if (typeof element.edit != "undefined") {
var url_edit =
controller.baseURL +
"index.php?sec=gagente&sec2=godmode/groups/configure_group&tab=tree&id_group=" +
element.id;
var $updateicon = $(
'<img src="' +
(controller.baseURL.length > 0 ? controller.baseURL : "") +
'images/edit.svg" class="invert_filter" style="width:18px; vertical-align: middle;"/>'
);
var $updatebtn = $('<a href = "' + url_edit + '"></a>').append(
$updateicon
);
$content.append($updatebtn);
}
if (typeof element.delete != "undefined") {
var url_delete =
controller.baseURL +
"index.php?sec=gagente&sec2=godmode/groups/group_list&tab=tree&delete_group=1&id_group=" +
element.id;
var $deleteBtn = $(
'<a><img src="' +
'<a style="float: right; margin-top: 5px;"><img src="' +
(controller.baseURL.length > 0 ? controller.baseURL : "") +
'images/delete.svg" class="invert_filter" style="width:18px; vertical-align: middle; cursor: pointer;"/></a>'
'images/delete.svg" class="main_menu_icon invert_filter" style="width:18px; padding: 0 5px;"/></a>'
);
$deleteBtn.click(function(event) {
var ok_function = function() {
@ -711,6 +695,24 @@ var TreeController = {
$content.append($deleteBtn);
}
if (typeof element.edit != "undefined") {
var url_edit =
controller.baseURL +
"index.php?sec=gagente&sec2=godmode/groups/configure_group&tab=tree&id_group=" +
element.id;
var $updateicon = $(
'<img src="' +
(controller.baseURL.length > 0 ? controller.baseURL : "") +
'images/edit.svg" class="main_menu_icon invert_filter" style="width:18px; padding: 0 5px;"/>'
);
var $updatebtn = $(
'<a style="float: right; margin-top: 5px;" href = "' +
url_edit +
'"></a>'
).append($updateicon);
$content.append($updatebtn);
}
if (typeof element.alerts != "undefined") {
$content.append(element.alerts);
}
@ -1456,7 +1458,10 @@ var TreeController = {
});
}
}
treeViewControlModuleValues();
if (typeof treeViewControlModuleValues === "function") {
treeViewControlModuleValues();
}
return $node;
}