mirror of
https://github.com/pandorafms/pandorafms.git
synced 2025-07-29 16:55:05 +02:00
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:
commit
1d566b4d18
@ -938,7 +938,7 @@ if ($step == 2) {
|
||||
false,
|
||||
(!$is_management_allowed | $disabled),
|
||||
"removeTinyMCE('textarea_field".$i."')",
|
||||
'',
|
||||
'style="height: 15px !important;"',
|
||||
true
|
||||
);
|
||||
// Advanced.
|
||||
@ -951,7 +951,7 @@ if ($step == 2) {
|
||||
true,
|
||||
(!$is_management_allowed | $disabled),
|
||||
"addTinyMCE('textarea_field".$i."')",
|
||||
'',
|
||||
'style="height: 15px !important;"',
|
||||
true
|
||||
);
|
||||
$table->data['field'.$i][1] .= '</small></b></div>';
|
||||
@ -962,7 +962,7 @@ if ($step == 2) {
|
||||
1,
|
||||
1,
|
||||
isset($fields[$i]) ? $fields[$i] : '',
|
||||
'class="fields" min-height-40px',
|
||||
'class="fields w100p" style="min-height: 100px !important;"',
|
||||
true,
|
||||
'',
|
||||
(!$is_management_allowed | $disabled)
|
||||
@ -979,7 +979,7 @@ if ($step == 2) {
|
||||
false,
|
||||
(!$is_management_allowed | $disabled),
|
||||
"removeTinyMCE('textarea_field".$i."_recovery')",
|
||||
'',
|
||||
'style="height: 15px !important;"',
|
||||
true
|
||||
);
|
||||
// Advanced.
|
||||
@ -992,7 +992,7 @@ if ($step == 2) {
|
||||
true,
|
||||
(!$is_management_allowed | $disabled),
|
||||
"addTinyMCE('textarea_field".$i."_recovery')",
|
||||
'',
|
||||
'style="height: 15px !important;"',
|
||||
true
|
||||
);
|
||||
$table->data['field'.$i][2] .= '</small></b></div>';
|
||||
@ -1003,7 +1003,7 @@ if ($step == 2) {
|
||||
1,
|
||||
1,
|
||||
isset($fields_recovery[$i]) ? $fields_recovery[$i] : '',
|
||||
'class="fields min-height-40px"',
|
||||
'class="fields w100p" style="min-height: 100px !important;"',
|
||||
true,
|
||||
'',
|
||||
(!$is_management_allowed | $disabled)
|
||||
@ -1167,32 +1167,37 @@ if ($id) {
|
||||
if (!$disabled) {
|
||||
if ($is_management_allowed === true) {
|
||||
if ($step >= LAST_STEP) {
|
||||
html_print_submit_button(
|
||||
$actionButtons = html_print_submit_button(
|
||||
__('Finish'),
|
||||
'finish',
|
||||
false,
|
||||
'class="sub upd"'
|
||||
'class="submitButton"',
|
||||
true
|
||||
);
|
||||
} else {
|
||||
html_print_input_hidden('step', ($step + 1));
|
||||
if ($step == 2) {
|
||||
// Javascript onsubmit to avoid min = 0 and max = 0.
|
||||
html_print_submit_button(
|
||||
$actionButtons = html_print_submit_button(
|
||||
__('Next'),
|
||||
'next',
|
||||
false,
|
||||
'class="sub next" onclick="return check_fields_step2();"'
|
||||
'class="submitButton" onclick="return check_fields_step2();"',
|
||||
true
|
||||
);
|
||||
} else {
|
||||
html_print_submit_button(
|
||||
$actionButtons = html_print_submit_button(
|
||||
__('Next'),
|
||||
'next',
|
||||
false,
|
||||
'class="sub next"'
|
||||
'class="submitButton"',
|
||||
true
|
||||
);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
html_print_action_buttons($actionButtons, ['type' => 'form_action']);
|
||||
}
|
||||
|
||||
echo '</div>';
|
||||
|
@ -84,6 +84,7 @@ if ($event_response_id > 0) {
|
||||
$table = new stdClass();
|
||||
$table->styleTable = 'margin: 10px 10px 0';
|
||||
$table->class = 'databox filters';
|
||||
$table->colspan[4][1] = 3;
|
||||
|
||||
if (is_metaconsole()) {
|
||||
$table->head[0] = __('Edit event responses');
|
||||
@ -183,7 +184,7 @@ $data[1] = html_print_textarea(
|
||||
3,
|
||||
1,
|
||||
$event_response['target'],
|
||||
'class="mh_initial"',
|
||||
'class="mh_initial w100p"',
|
||||
true
|
||||
);
|
||||
|
||||
|
@ -3559,7 +3559,7 @@ function ui_print_datatable(array $parameters)
|
||||
$filter .= $parameters['form']['html'];
|
||||
}
|
||||
|
||||
$filter .= '<ul class="datatable_filter content">';
|
||||
$filter .= '<ul class="datatable_filter content filter_table">';
|
||||
|
||||
foreach ($parameters['form']['inputs'] as $input) {
|
||||
$filter .= html_print_input(($input + ['return' => true]), 'li');
|
||||
|
@ -1,13 +1,13 @@
|
||||
/* CSS file for table dialog in the table plugin */
|
||||
|
||||
.panel_wrapper div.current {
|
||||
height: 245px;
|
||||
height: 245px;
|
||||
}
|
||||
|
||||
.advfield {
|
||||
width: 200px;
|
||||
width: 200px;
|
||||
}
|
||||
|
||||
#class {
|
||||
width: 150px;
|
||||
width: 150px;
|
||||
}
|
||||
|
1503
pandora_console/include/javascript/tree/TreeControllerMeta.js
Normal file
1503
pandora_console/include/javascript/tree/TreeControllerMeta.js
Normal file
File diff suppressed because it is too large
Load Diff
@ -134,7 +134,12 @@ class TreeViewWidget extends Widget
|
||||
) {
|
||||
global $config;
|
||||
|
||||
ui_require_css_file('tree');
|
||||
if (is_metaconsole() === true) {
|
||||
ui_require_css_file('tree_meta');
|
||||
} else {
|
||||
ui_require_css_file('tree');
|
||||
}
|
||||
|
||||
ui_require_css_file('fixed-bottom-box');
|
||||
|
||||
// WARNING: Do not edit. This chunk must be in the constructor.
|
||||
@ -544,7 +549,12 @@ class TreeViewWidget extends Widget
|
||||
$height = $size['height'];
|
||||
|
||||
// Css Files.
|
||||
\ui_require_css_file('tree', 'include/styles/', true);
|
||||
if (is_metaconsole() === true) {
|
||||
\ui_require_css_file('tree_meta', 'include/styles/', true);
|
||||
} else {
|
||||
\ui_require_css_file('tree', 'include/styles/', true);
|
||||
}
|
||||
|
||||
if ($config['style'] == 'pandora_black' && !is_metaconsole()) {
|
||||
\ui_require_css_file('pandora_black', 'include/styles/', true);
|
||||
}
|
||||
@ -556,11 +566,19 @@ class TreeViewWidget extends Widget
|
||||
'include/javascript/i18n/'
|
||||
);
|
||||
|
||||
\ui_require_javascript_file(
|
||||
'TreeController',
|
||||
'include/javascript/tree/',
|
||||
true
|
||||
);
|
||||
if (is_metaconsole() === true) {
|
||||
\ui_require_javascript_file(
|
||||
'TreeControllerMeta',
|
||||
'include/javascript/tree/',
|
||||
true
|
||||
);
|
||||
} else {
|
||||
\ui_require_javascript_file(
|
||||
'TreeController',
|
||||
'include/javascript/tree/',
|
||||
true
|
||||
);
|
||||
}
|
||||
|
||||
\ui_require_javascript_file(
|
||||
'fixed-bottom-box',
|
||||
|
@ -483,3 +483,8 @@ div.multi-response-buttons {
|
||||
flex-direction: row-reverse;
|
||||
justify-content: flex-start;
|
||||
}
|
||||
|
||||
td:has(div#server_to_exec_label),
|
||||
td:has(div#server_to_exec_value) {
|
||||
padding: 0px;
|
||||
}
|
||||
|
@ -180,7 +180,7 @@ ul.wizard {
|
||||
display: flex;
|
||||
}
|
||||
|
||||
.no-class.action-buttons.mw120px.textright.sorting_disabled,
|
||||
.textright.sorting_disabled,
|
||||
.textright {
|
||||
text-align: right;
|
||||
padding-right: 2em;
|
||||
@ -306,56 +306,8 @@ div.arrow_box:before {
|
||||
/*
|
||||
* Breadcrum
|
||||
*/
|
||||
|
||||
#menu_tab_frame_view_bc {
|
||||
display: flex;
|
||||
justify-content: space-between;
|
||||
border-bottom: 2px solid #82b92e;
|
||||
max-height: 70px;
|
||||
min-height: 55px;
|
||||
width: 100%;
|
||||
padding-right: 0px;
|
||||
margin-left: 0px;
|
||||
margin-bottom: 20px;
|
||||
height: 55px;
|
||||
box-sizing: border-box;
|
||||
background-color: #fafafa;
|
||||
border-top-right-radius: 7px;
|
||||
border-top-left-radius: 7px;
|
||||
box-shadow: 0px 0px 2px rgba(0, 0, 0, 0.1);
|
||||
}
|
||||
|
||||
#menu_tab_frame_view_bc .breadcrumbs_container {
|
||||
align-self: flex-start;
|
||||
}
|
||||
|
||||
.breadcrumbs_container {
|
||||
padding-top: 4px;
|
||||
text-indent: 0.25em;
|
||||
padding-left: 2.5em;
|
||||
}
|
||||
|
||||
.breadcrumb_link {
|
||||
color: #848484;
|
||||
font-size: 10pt;
|
||||
text-decoration: none;
|
||||
}
|
||||
|
||||
span.breadcrumb_link {
|
||||
color: #d0d0d0;
|
||||
font-size: 12pt;
|
||||
}
|
||||
|
||||
.breadcrumb_link.selected {
|
||||
color: #95b750;
|
||||
}
|
||||
|
||||
.breadcrumb_link.selected:hover {
|
||||
color: #95b750;
|
||||
}
|
||||
|
||||
.breadcrumb_link:hover {
|
||||
color: #95b750;
|
||||
#menu_tab_frame_view > #menu_tab_left {
|
||||
margin-left: 20px;
|
||||
}
|
||||
|
||||
/*
|
||||
@ -398,26 +350,8 @@ label {
|
||||
width: 100%;
|
||||
}
|
||||
|
||||
li > input[type="text"],
|
||||
li > input[type="email"],
|
||||
li > input[type="password"],
|
||||
li > input[type="email"],
|
||||
.discovery_text_input > input[type="password"],
|
||||
.discovery_text_input > input[type="text"],
|
||||
#interval_manual > input[type="text"] {
|
||||
background-color: transparent;
|
||||
border: none;
|
||||
border-radius: 0;
|
||||
border-bottom: 1px solid #ccc;
|
||||
padding: 0px 0px 2px 0px;
|
||||
box-sizing: border-box;
|
||||
margin-bottom: 4px;
|
||||
}
|
||||
|
||||
#interval_manual > input[type="text"] {
|
||||
width: 50px;
|
||||
margin-left: 10px;
|
||||
margin-right: 10px;
|
||||
li .select2 {
|
||||
max-width: 400px !important;
|
||||
}
|
||||
|
||||
.discovery_list_input {
|
||||
@ -518,3 +452,122 @@ div.ui-tooltip.ui-corner-all.ui-widget-shadow.ui-widget.ui-widget-content.uitool
|
||||
bottom: -20px;
|
||||
top: auto;
|
||||
}
|
||||
|
||||
form > .white_box {
|
||||
padding: 20px;
|
||||
margin: 20px;
|
||||
}
|
||||
|
||||
.white_box {
|
||||
margin: 20px;
|
||||
}
|
||||
|
||||
button[type="submit"] {
|
||||
margin-left: 20px;
|
||||
}
|
||||
|
||||
li > input[type="text"] {
|
||||
max-width: 428px;
|
||||
}
|
||||
|
||||
div.edit_discovery_input > div {
|
||||
margin-bottom: 8px !important;
|
||||
}
|
||||
|
||||
div.discovery_text_input > input {
|
||||
width: 100% !important;
|
||||
}
|
||||
|
||||
li > .select2,
|
||||
li > .selection,
|
||||
li > .select2-selection {
|
||||
min-width: 428px !important;
|
||||
}
|
||||
|
||||
.edit_discovery_info {
|
||||
margin: 0px !important;
|
||||
padding: 0px !important;
|
||||
}
|
||||
|
||||
.box-flat {
|
||||
margin: 20px;
|
||||
}
|
||||
|
||||
.mrgn_20px {
|
||||
margin: 20px !important;
|
||||
}
|
||||
|
||||
.omnishell_results_wrapper {
|
||||
max-width: 100% !important;
|
||||
}
|
||||
|
||||
.no-text-imp {
|
||||
padding: 0px !important;
|
||||
margin: 0px !important;
|
||||
}
|
||||
|
||||
.candeleted {
|
||||
margin: 0px 10px !important;
|
||||
}
|
||||
|
||||
.dataTables_length,
|
||||
.dt-buttons {
|
||||
margin-left: 20px;
|
||||
}
|
||||
|
||||
table {
|
||||
max-width: calc(100% - 40px) !important;
|
||||
}
|
||||
|
||||
/* Filter */
|
||||
li > .action-buttons {
|
||||
padding: 0px;
|
||||
}
|
||||
|
||||
ul.wizard > li,
|
||||
ul.datatable_filter > li {
|
||||
display: grid;
|
||||
}
|
||||
|
||||
ul.wizard > li > label,
|
||||
ul.datatable_filter > li > label {
|
||||
margin-bottom: 8px !important;
|
||||
}
|
||||
|
||||
ul.datatable_filter > li:has(div.action-buttons) {
|
||||
margin-bottom: 0;
|
||||
}
|
||||
|
||||
ul.datatable_filter > li > div.action-buttons > button {
|
||||
margin-bottom: 0px !important;
|
||||
}
|
||||
|
||||
#backgroundMaskId {
|
||||
bottom: 0px !important;
|
||||
height: auto !important;
|
||||
}
|
||||
|
||||
.action_buttons_right_content {
|
||||
padding-left: 20px;
|
||||
}
|
||||
|
||||
#image-1,
|
||||
#image-2 {
|
||||
padding-left: 0px !important;
|
||||
}
|
||||
|
||||
.flex-column {
|
||||
margin-bottom: 10px !important;
|
||||
}
|
||||
|
||||
.dataTables_length {
|
||||
margin-bottom: 50px !important;
|
||||
}
|
||||
|
||||
.item_status_tree_view {
|
||||
position: initial;
|
||||
}
|
||||
|
||||
.ui-dialog.ui-corner-all.ui-widget.ui-widget-content {
|
||||
z-index: 10000 !important;
|
||||
}
|
||||
|
@ -466,7 +466,7 @@ a.pandora_pagination.current:hover {
|
||||
}
|
||||
|
||||
.table_action_buttons a:hover {
|
||||
background-color: #fff;
|
||||
background-color: transparent;
|
||||
border-radius: 4px;
|
||||
}
|
||||
|
||||
|
195
pandora_console/include/styles/tree_meta.css
Normal file
195
pandora_console/include/styles/tree_meta.css
Normal file
@ -0,0 +1,195 @@
|
||||
.tree-root {
|
||||
margin-top: 0px;
|
||||
margin-bottom: 0px;
|
||||
}
|
||||
|
||||
.tree-group {
|
||||
margin-left: 24px;
|
||||
padding-top: 1px;
|
||||
}
|
||||
|
||||
.tree-node {
|
||||
white-space: nowrap;
|
||||
|
||||
background-image: url(../../images/tree/branch.png);
|
||||
background-position: 0px 0px;
|
||||
background-repeat: repeat-y;
|
||||
|
||||
min-height: 26px;
|
||||
}
|
||||
|
||||
div.tree-node {
|
||||
background: 0 0;
|
||||
}
|
||||
|
||||
div.tree-node span {
|
||||
font-size: 1.2em;
|
||||
}
|
||||
|
||||
.tree-node:last-child {
|
||||
background: 0 0;
|
||||
}
|
||||
.node-content {
|
||||
height: 26px;
|
||||
font-size: 1.2em;
|
||||
display: flex;
|
||||
flex-direction: row;
|
||||
flex-wrap: wrap;
|
||||
align-items: center;
|
||||
}
|
||||
|
||||
.node-content > img {
|
||||
position: relative;
|
||||
top: -2px;
|
||||
}
|
||||
|
||||
.node-content:hover {
|
||||
background-color: #fff;
|
||||
|
||||
-moz-border-radius: 3px;
|
||||
-webkit-border-radius: 3px;
|
||||
border-radius: 3px;
|
||||
}
|
||||
|
||||
.leaf-icon {
|
||||
width: 18px;
|
||||
height: 20px;
|
||||
}
|
||||
|
||||
.node-content,
|
||||
.leaf-icon {
|
||||
display: inline-block;
|
||||
}
|
||||
|
||||
.node-content > img,
|
||||
.node-content > div {
|
||||
display: inline;
|
||||
}
|
||||
|
||||
.tree-node.leaf-open > .leaf-icon {
|
||||
background-image: url(../../images/tree/last_expanded.png);
|
||||
cursor: pointer;
|
||||
}
|
||||
|
||||
.tree-node.tree-first.leaf-open > .leaf-icon {
|
||||
background-image: url(../../images/tree/first_expanded.png);
|
||||
cursor: pointer;
|
||||
}
|
||||
|
||||
.tree-node.leaf-closed > .leaf-icon {
|
||||
background-image: url(../../images/tree/last_closed.png);
|
||||
cursor: pointer;
|
||||
}
|
||||
|
||||
.tree-node.tree-first.leaf-closed > .leaf-icon {
|
||||
background-image: url(../../images/tree/first_closed.png);
|
||||
cursor: pointer;
|
||||
}
|
||||
|
||||
.tree-node.leaf-loading > .leaf-icon {
|
||||
background-image: url(../../images/tree/last_expanded.png);
|
||||
}
|
||||
|
||||
.tree-node.leaf-empty > .leaf-icon {
|
||||
background-image: url(../../images/tree/last_leaf.png);
|
||||
}
|
||||
|
||||
.tree-node.tree-first.leaf-empty > .leaf-icon {
|
||||
background-image: url(../../images/tree/first_leaf.png);
|
||||
}
|
||||
|
||||
.tree-node.leaf-error > .leaf-icon {
|
||||
background-image: url(../../images/tree/last_leaf.png);
|
||||
}
|
||||
|
||||
.tree-node > .leaf-icon {
|
||||
background-position: 0px 0px;
|
||||
background-repeat: no-repeat;
|
||||
}
|
||||
|
||||
.tree-node > .node-content > img {
|
||||
max-height: 20px;
|
||||
/*max-width: 20px;*/
|
||||
}
|
||||
|
||||
.tree-node > .node-content > img.module-data,
|
||||
.tree-node > .node-content > img.module-graph {
|
||||
cursor: pointer;
|
||||
padding-right: 3px;
|
||||
}
|
||||
|
||||
.tree-node > .node-content > .agent-status.status_balls,
|
||||
.tree-node > .node-content > .status_small_balls {
|
||||
width: 0.6em;
|
||||
height: 1.5em;
|
||||
margin-bottom: -0.4em;
|
||||
border-radius: 0;
|
||||
}
|
||||
.tree-node > .node-content > .module-status.status_small_balls {
|
||||
width: 0.4em;
|
||||
}
|
||||
|
||||
.tree-node > .node-content > .module-name {
|
||||
margin: 0 0 0 1em;
|
||||
width: 250px;
|
||||
display: inline-block;
|
||||
}
|
||||
|
||||
.tree-node > .node-content > .module-value {
|
||||
width: 120px;
|
||||
display: inline-block;
|
||||
text-align: right;
|
||||
margin: 0 1em;
|
||||
}
|
||||
|
||||
.tree-node > .node-content > img.module-server-type,
|
||||
.tree-node > .node-content > img.agent-status,
|
||||
.tree-node > .node-content > img.agent-alerts-fired,
|
||||
.tree-node > .node-content > img.agent-quiet,
|
||||
.tree-node > .node-content > img.module-status,
|
||||
.tree-node > .node-content > img.module-alerts {
|
||||
padding-right: 3px;
|
||||
}
|
||||
|
||||
.tree-node > .node-content > .tree-node-counters,
|
||||
.tree-node > .node-content > .tree-node-counters > .tree-node-counter {
|
||||
display: inline;
|
||||
}
|
||||
|
||||
.tree-node > .node-content > .tree-node-counters {
|
||||
font-size: 1.2em;
|
||||
}
|
||||
|
||||
.tree-node > .node-content > img {
|
||||
vertical-align: middle;
|
||||
}
|
||||
|
||||
.tree-node > .node-content > .tree-node-counters > .tree-node-counter {
|
||||
font-weight: bold;
|
||||
font-size: 0.9em;
|
||||
cursor: default;
|
||||
}
|
||||
|
||||
div#tree-controller-recipient {
|
||||
text-align: left;
|
||||
width: 98%;
|
||||
margin-top: 10px;
|
||||
}
|
||||
|
||||
.tree-controller-recipient {
|
||||
text-align: left;
|
||||
width: 98%;
|
||||
margin-top: 10px;
|
||||
}
|
||||
|
||||
.tree-node > .node-content > div + div:not(.tree-node-counters) {
|
||||
margin-left: 3px;
|
||||
}
|
||||
|
||||
.tree-node .disabled {
|
||||
filter: opacity(0.3);
|
||||
}
|
||||
|
||||
.ipam-network {
|
||||
font-size: 9pt;
|
||||
}
|
@ -27,7 +27,12 @@
|
||||
*/
|
||||
|
||||
// Begin.
|
||||
ui_require_css_file('tree');
|
||||
if (is_metaconsole() === true) {
|
||||
ui_require_css_file('tree_meta');
|
||||
} else {
|
||||
ui_require_css_file('tree');
|
||||
}
|
||||
|
||||
ui_require_css_file('fixed-bottom-box');
|
||||
|
||||
global $config;
|
||||
@ -309,7 +314,12 @@ html_print_input_hidden('tag-id', $tag_id);
|
||||
ui_include_time_picker();
|
||||
ui_require_jquery_file('ui.datepicker-'.get_user_language(), 'include/javascript/i18n/');
|
||||
|
||||
ui_require_javascript_file('TreeController', 'include/javascript/tree/');
|
||||
if (is_metaconsole() === true) {
|
||||
ui_require_javascript_file('TreeControllerMeta', 'include/javascript/tree/');
|
||||
} else {
|
||||
ui_require_javascript_file('TreeController', 'include/javascript/tree/');
|
||||
}
|
||||
|
||||
ui_print_spinner(__('Loading'));
|
||||
/*
|
||||
html_print_image(
|
||||
|
Loading…
x
Reference in New Issue
Block a user