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:
Jose Gonzalez 2023-02-22 12:16:14 +01:00
parent fd0c181820 e7d6afd636
commit 370ee54d9f
12 changed files with 87 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
pandora_console/godmode/reporting/reporting_builder.item_editor.php
View File

@ -1100,7 +1100,7 @@ $class = 'databox filters';
false, false,
false, false,
'', '',
'fullwidth' ''
); );
} else { } else {
html_print_input_text( html_print_input_text(
@ -1113,7 +1113,7 @@ $class = 'databox filters';
false, false,
false, false,
'', '',
'fullwidth' ''
); );
} }
?> ?>
@ -1160,7 +1160,7 @@ $class = 'databox filters';
<td class="bolder"><?php echo __('Description'); ?></td> <td class="bolder"><?php echo __('Description'); ?></td>
<td > <td >
<?php <?php
echo html_print_textarea('description', 3, 25, $description); echo html_print_textarea('description', 2, 80, $description, 'style="padding-right: 0px !important;"');
?> ?>
</td> </td>
</tr> </tr>
@ -1276,13 +1276,13 @@ $class = 'databox filters';
'label', 'label',
$label, $label,
'', '',
50, 80,
255, 255,
true, true,
false, false,
false, false,
'', '',
'fullwidth' ''
); );
?> ?>
</td> </td>
@ -3920,21 +3920,25 @@ print_SLA_list('100%', $action, $idItem);
print_General_list('100%', $action, $idItem, $type); print_General_list('100%', $action, $idItem, $type);
echo '<div class="action-buttons w100p" >'; echo '<div class="action-buttons w100p" >';
if ($action == 'new') { if ($action == 'new') {
html_print_submit_button( $actionButtons = html_print_submit_button(
__('Create item'), __('Create item'),
'create_item', 'create_item',
false, false,
'class="sub wand"' ['icon' => 'next'],
true
); );
} else { } else {
html_print_submit_button( $actionButtons = html_print_submit_button(
__('Update item'), __('Update item'),
'edit_item', 'edit_item',
false, false,
'class="sub upd"' ['icon' => 'next'],
true
); );
} }
html_print_action_buttons($actionButtons, ['type' => 'form_action']);
echo '</div>'; echo '</div>';
echo '</form>'; echo '</form>';
@ -3980,7 +3984,7 @@ function print_SLA_list($width, $action, $idItem=null)
$idItem $idItem
); );
?> ?>
<table class="databox data" id="sla_list" border="0" cellpadding="4" cellspacing="4" width="100%"> <table class="info_table" id="sla_list" border="0" cellpadding="4" cellspacing="4" width="100%">
<thead> <thead>
<tr> <tr>
<th class="header sla_list_agent_col" scope="col"> <th class="header sla_list_agent_col" scope="col">
@ -4496,7 +4500,7 @@ function print_General_list($width, $action, $idItem=null, $type='general')
include_once $config['homedir'].'/include/functions_html.php'; include_once $config['homedir'].'/include/functions_html.php';
?> ?>
<table class="databox data" id="general_list" border="0" cellpadding="4" cellspacing="4" width="100%"> <table class="info_table" id="general_list" border="0" cellpadding="4" cellspacing="4" width="100%">
<thead> <thead>
<tr> <tr>
<?php <?php
@ -7398,4 +7402,8 @@ function dialog_message(message_id) {
}); });
} }
$(document).ready(function () {
$('[id^=period], #combo_graph_options, #combo_sla_sort_options').next().css('z-index', 0);
});
</script> </script>

6
pandora_console/godmode/reporting/reporting_builder.list_items.php
View File

@ -204,7 +204,7 @@ $urlFilter = '&agent_filter='.$agentFilter.'&module_filter='.$moduleFilter.'&typ
if (!defined('METACONSOLE')) { if (!defined('METACONSOLE')) {
$table = new stdClass(); $table = new stdClass();
$table->width = '100%'; $table->width = '100%';
$table->class = 'databox filters'; $table->class = 'databox filters mrgn_btn_0';
$table->data[0][0] = __('Agents'); $table->data[0][0] = __('Agents');
$table->data[0][0] .= html_print_select($agents, 'agent_filter', $agentFilter, '', __('All'), 0, true); $table->data[0][0] .= html_print_select($agents, 'agent_filter', $agentFilter, '', __('All'), 0, true);
$table->data[0][1] = __('Modules'); $table->data[0][1] = __('Modules');
@ -349,7 +349,7 @@ $table->style[0] = 'text-align: right;';
if ($items) { if ($items) {
$table->width = '98%'; $table->width = '100%';
if (defined('METACONSOLE')) { if (defined('METACONSOLE')) {
$table->width = '100%'; $table->width = '100%';
$table->class = 'databox data'; $table->class = 'databox data';
@ -687,7 +687,7 @@ if (defined('METACONSOLE')) {
echo "<div class='pdd_b_20px right; w100p'>"; echo "<div class='pdd_b_20px right; w100p'>";
html_print_input_hidden('ids_items_to_delete', ''); html_print_input_hidden('ids_items_to_delete', '');
html_print_submit_button(__('Delete'), 'delete_btn', false, 'class="sub delete right mrgn_btn_15px"'); html_print_submit_button(__('Delete'), 'delete_btn', false, 'class="sub delete right mrgn_btn_15px mrgn_right_20px"');
echo '</div>'; echo '</div>';
echo '</form>'; echo '</form>';
} }

29
pandora_console/godmode/reporting/reporting_builder.main.php
View File

@ -41,22 +41,22 @@ $groups = users_get_groups();
switch ($action) { switch ($action) {
default: default:
case 'new': case 'new':
$actionButtonHtml = html_print_submit_button( $actionButtons = html_print_submit_button(
__('Save'), __('Save'),
'add', 'add',
false, false,
'class="sub wand"', [ 'icon' => 'next' ],
true true
); );
$hiddenFieldAction = 'save'; $hiddenFieldAction = 'save';
break; break;
case 'update': case 'update':
case 'edit': case 'edit':
$actionButtonHtml = html_print_submit_button( $actionButtons = html_print_submit_button(
__('Update'), __('Update'),
'edit', 'edit',
false, false,
'class="sub upd"', [ 'icon' => 'next' ],
true true
); );
$hiddenFieldAction = 'update'; $hiddenFieldAction = 'update';
@ -191,22 +191,9 @@ if ($enterpriseEnable) {
} }
$table->data['interactive_report'][0] = __('Non interactive report'); $table->data['interactive_report'][0] = __('Non interactive report');
$table->data['interactive_report'][1] = __('Yes'); $table->data['interactive_report'][1] .= html_print_checkbox_switch(
$table->data['interactive_report'][1] .= '&nbsp;&nbsp;&nbsp;';
$table->data['interactive_report'][1] .= html_print_radio_button(
'non_interactive', 'non_interactive',
1, 1,
'',
$non_interactive_check,
true
);
$table->data['interactive_report'][1] .= '&nbsp;&nbsp;';
$table->data['interactive_report'][1] .= __('No');
$table->data['interactive_report'][1] .= '&nbsp;&nbsp;&nbsp;';
$table->data['interactive_report'][1] .= html_print_radio_button(
'non_interactive',
0,
'',
$non_interactive_check, $non_interactive_check,
true true
); );
@ -215,8 +202,8 @@ if ($enterpriseEnable) {
$table->data['description'][0] = __('Description'); $table->data['description'][0] = __('Description');
$table->data['description'][1] = html_print_textarea( $table->data['description'][1] = html_print_textarea(
'description', 'description',
5, 2,
15, 80,
$description, $description,
'', '',
true true
@ -244,7 +231,7 @@ echo '<form class="" method="post">';
html_print_table($table); html_print_table($table);
echo '<div class="action-buttons" style="width: '.$table->width.'">'; echo '<div class="action-buttons" style="width: '.$table->width.'">';
echo $actionButtonHtml; html_print_action_buttons($actionButtons, ['type' => 'form_action']);
html_print_input_hidden('action', $hiddenFieldAction); html_print_input_hidden('action', $hiddenFieldAction);
html_print_input_hidden('id_report', $idReport); html_print_input_hidden('id_report', $idReport);
echo '</div></form>'; echo '</div></form>';

8
pandora_console/include/functions_html.php
View File

@ -2150,7 +2150,7 @@ function html_print_extended_select_for_time(
'class' => $uniq_name.'_toggler '.$class.' invert_filter', 'class' => $uniq_name.'_toggler '.$class.' invert_filter',
'alt' => __('Custom'), 'alt' => __('Custom'),
'title' => __('Custom'), 'title' => __('Custom'),
'style' => 'width: 18px; margin-bottom: -5px; margin-left: 10px'.$style_icon, 'style' => 'width: 18px; margin-bottom: -5px; margin-left: 10px; padding-top: 10px;'.$style_icon,
], ],
false, false,
false, false,
@ -2162,7 +2162,7 @@ function html_print_extended_select_for_time(
echo '</div>'; echo '</div>';
echo '<div id="'.$uniq_name.'_manual" class="w100p inline_line">'; echo '<div id="'.$uniq_name.'_manual" class="w100p inline_flex">';
html_print_input_text($uniq_name.'_text', $selected, '', $size, 255, false, $readonly, false, '', $class); html_print_input_text($uniq_name.'_text', $selected, '', $size, 255, false, $readonly, false, '', $class);
html_print_input_hidden($name, $selected, false, $uniq_name); html_print_input_hidden($name, $selected, false, $uniq_name);
@ -2178,7 +2178,7 @@ function html_print_extended_select_for_time(
false, false,
$class, $class,
$readonly, $readonly,
'padding: 0px 5px; height: 42px; margin: -6px 0 0 6px; width: 140px;'.$select_style, ' margin-left: 5px; width: 140px;'.$select_style,
false, false,
false, false,
false, false,
@ -2196,7 +2196,7 @@ function html_print_extended_select_for_time(
'class' => $uniq_name.'_toggler invert_filter', 'class' => $uniq_name.'_toggler invert_filter',
'alt' => __('List'), 'alt' => __('List'),
'title' => __('List'), 'title' => __('List'),
'style' => 'width: 18px;margin-bottom: -5px;'.$style_icon, 'style' => 'width: 18px;margin-bottom: -5px; padding-top: 10px;'.$style_icon,
] ]
).'</a>'; ).'</a>';
echo '</div>'; echo '</div>';

2
pandora_console/include/functions_reports.php
View File

@ -1059,7 +1059,7 @@ function get_table_custom_macros_report($data)
$table = new StdClass(); $table = new StdClass();
$table->data = []; $table->data = [];
$table->width = '100%'; $table->width = '100%';
$table->class = 'databox data fullwidth'; $table->class = 'info_table';
$table->id = 'table-macros-definition'; $table->id = 'table-macros-definition';
$table->rowclass = []; $table->rowclass = [];

9
pandora_console/include/functions_ui.php
View File

@ -5841,6 +5841,15 @@ function ui_print_agent_autocomplete_input($parameters)
.attr("style", "background-image: url(\'"+image+"\'); background-repeat: no-repeat; background-position: 97% center; background-size: 20px; '.$inputStyles.'"); .attr("style", "background-image: url(\'"+image+"\'); background-repeat: no-repeat; background-position: 97% center; background-size: 20px; '.$inputStyles.'");
} }
$(document).ready(function () {
$("#'.$input_id.'").focusout(function (e) {
setTimeout(() => {
let iconImage = "'.$icon_image.'";
$("#'.$input_id.'").attr("style", "background-image: url(\'"+iconImage+"\'); background-repeat: no-repeat; background-position: 97% center; background-size: 20px; '.$inputStyles.'");
}, 100);
});
});
function set_functions_change_autocomplete_'.$input_name.'() { function set_functions_change_autocomplete_'.$input_name.'() {
var cache_'.$input_name.' = {}; var cache_'.$input_name.' = {};

8
pandora_console/include/javascript/pandora.js
View File

@ -894,7 +894,7 @@ function post_process_select_events(name) {
function period_select_init(name, allow_zero) { function period_select_init(name, allow_zero) {
// Manual mode is hidden by default // Manual mode is hidden by default
$("#" + name + "_manual").css("display", "none"); $("#" + name + "_manual").css("display", "none");
$("#" + name + "_default").css("display", "inline"); $("#" + name + "_default").css("display", "flex");
// If the text input is empty, we put on it 5 minutes by default // If the text input is empty, we put on it 5 minutes by default
if ($("#text-" + name + "_text").val() == "") { if ($("#text-" + name + "_text").val() == "") {
$("#text-" + name + "_text").val(300); $("#text-" + name + "_text").val(300);
@ -907,7 +907,7 @@ function period_select_init(name, allow_zero) {
} }
} else if ($("#text-" + name + "_text").val() == 0 && allow_zero == 1) { } else if ($("#text-" + name + "_text").val() == 0 && allow_zero == 1) {
$("#" + name + "_units option:last").prop("selected", false); $("#" + name + "_units option:last").prop("selected", false);
$("#" + name + "_manual").css("display", "inline"); $("#" + name + "_manual").css("display", "flex");
$("#" + name + "_default").css("display", "none"); $("#" + name + "_default").css("display", "none");
} }
} }
@ -996,13 +996,13 @@ function selectFirst(name) {
*/ */
function toggleBoth(name) { function toggleBoth(name) {
if ($("#" + name + "_default").css("display") == "none") { if ($("#" + name + "_default").css("display") == "none") {
$("#" + name + "_default").css("display", "inline"); $("#" + name + "_default").css("display", "flex");
} else { } else {
$("#" + name + "_default").css("display", "none"); $("#" + name + "_default").css("display", "none");
} }
if ($("#" + name + "_manual").css("display") == "none") { if ($("#" + name + "_manual").css("display") == "none") {
$("#" + name + "_manual").css("display", "inline"); $("#" + name + "_manual").css("display", "flex");
} else { } else {
$("#" + name + "_manual").css("display", "none"); $("#" + name + "_manual").css("display", "none");
} }

1
pandora_console/include/javascript/pandora_dashboards.js
View File

@ -412,7 +412,6 @@ function initialiceLayout(data) {
widgetId: widgetId widgetId: widgetId
}, },
width: size.width, width: size.width,
maxHeight: size.height,
minHeight: size.height minHeight: size.height
}, },
onsubmit: { onsubmit: {

18
pandora_console/include/styles/js/jquery-ui_custom.css
View File

@ -144,6 +144,7 @@
.ui_tpicker_second, .ui_tpicker_second,
.ui-slider-handle { .ui-slider-handle {
border: 1px solid #aaaaaa; border: 1px solid #aaaaaa;
background-color: #dadada !important;
} }
.ui-timepicker-div dd { .ui-timepicker-div dd {
margin: 0px 15px 0px 15px; margin: 0px 15px 0px 15px;
@ -219,6 +220,23 @@ a.ui-button:active,
border-bottom: 4px solid #82b92e; border-bottom: 4px solid #82b92e;
} }
.ui-priority-secondary:hover {
content: "";
position: absolute;
bottom: -5px;
width: 100%;
border-bottom: 5px solid #82b92e;
}
.ui-priority-primary:hover {
content: "";
position: absolute;
right: 5px;
bottom: -5px;
width: 100%;
border-bottom: 5px solid #82b92e;
}
.ui-state-active, .ui-state-active,
.ui-widget-content .ui-state-active, .ui-widget-content .ui-state-active,
.ui-widget-header .ui-state-active { .ui-widget-header .ui-state-active {

19
pandora_console/include/styles/pandora.css
View File

@ -6511,7 +6511,7 @@ form#modal_form_feedback label {
font-size: 10pt; font-size: 10pt;
} }
form#modal_form_feedback input[type="email"] { /*form#modal_form_feedback input[type="email"] {
background-color: transparent; background-color: transparent;
border: none; border: none;
border-radius: 0; border-radius: 0;
@ -6519,7 +6519,7 @@ form#modal_form_feedback input[type="email"] {
padding: 0px 0px 2px 0px; padding: 0px 0px 2px 0px;
box-sizing: border-box; box-sizing: border-box;
margin-bottom: 4px; margin-bottom: 4px;
} }*/
form#modal_form_feedback ul.wizard li { form#modal_form_feedback ul.wizard li {
padding-bottom: 10px; padding-bottom: 10px;
@ -10599,7 +10599,6 @@ tr.bring_next_field {
vertical-align: middle; vertical-align: middle;
text-align: left; text-align: left;
min-width: 150px !important; min-width: 150px !important;
z-index: 60;
} }
.select2-container .select2-selection--single, .select2-container .select2-selection--single,
@ -11277,3 +11276,17 @@ form#satellite_conf_edit > fieldset.full-column {
background-size: 24px; background-size: 24px;
background-image: url("../../images/enable.svg"); background-image: url("../../images/enable.svg");
} }
.orientation-report {
margin-right: 10px;
}
#textarea_header_tbl,
#textarea_firstpage_tbl,
#textarea_footer_tbl {
width: 80% !important;
}
div[role="dialog"] {
z-index: 1115;
}

6
pandora_console/include/styles/select2.min.css vendored
View File

@ -71,7 +71,7 @@
position: absolute; position: absolute;
left: -100000px; left: -100000px;
width: 100%; width: 100%;
z-index: 999; z-index: 1115;
} }
.select2-results { .select2-results {
display: block; display: block;
@ -265,8 +265,8 @@
cursor: default; cursor: default;
float: left; float: left;
margin-right: 3px; margin-right: 3px;
margin-top: 2px; margin-top: 2px;
height: 17px; height: 17px;
padding: 0 5px; padding: 0 5px;
} }
.select2-container--default .select2-container--default

4
pandora_console/views/dashboard/list.php
View File

@ -217,7 +217,7 @@ if ($writeDashboards === 1) {
$text = __('Create a new dashboard'); $text = __('Create a new dashboard');
// Button for display modal options dashboard. // Button for display modal options dashboard.
$output = '<a href="#" class="float-right" onclick=\''; $output = '<div class="action-buttons" onclick=\'';
$output .= 'show_option_dialog('.json_encode( $output .= 'show_option_dialog('.json_encode(
[ [
'title' => $text, 'title' => $text,
@ -236,7 +236,7 @@ if ($writeDashboards === 1) {
'class="sub next"', 'class="sub next"',
true true
); );
$output .= '</a>'; $output .= '</div>';
echo $output; echo $output;