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-03-02 17:25:00 +01:00
parent 7a11ce4145 348ba63ef8
commit 18076d27cc
6 changed files with 160 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pandora_console/include/class/NetworkMap.class.php
View File

@ -3657,7 +3657,7 @@ class NetworkMap
$output .= '" charset="utf-8"></script>';
$output .= '<div id="simple_map" data-id="'.$this->idMap.'" ';
$output .= 'class="border_1px_dd" style="';
$output .= 'class="border_1px_dd" style="background-color: #fff; ';
if ($this->fullSize) {
$output .= ' width:100%';

14
pandora_console/include/functions_html.php
View File

@ -2476,7 +2476,8 @@ function html_print_input_text_extended(
$password=false,
$function='',
$autocomplete='off',
$disabled=false
$disabled=false,
$hide_div_eye=false,
) {
global $config;
static $idcounter = 0;
@ -2551,7 +2552,7 @@ function html_print_input_text_extended(
}
// Only for password inputs.
if (($attribute === 'class') && ($password === true)) {
if (($attribute === 'class') && ($password === true) && ($hide_div_eye === false)) {
$attr_value .= ' show-hide-pass-background';
$hasClass = true;
}
@ -2563,7 +2564,7 @@ function html_print_input_text_extended(
$attributes = [];
}
if (($hasClass === false) && ($password === true)) {
if (($hasClass === false) && ($password === true) && ($hide_div_eye === false)) {
$output .= 'class="show-hide-pass-background" ';
}
@ -2615,7 +2616,7 @@ function html_print_input_text_extended(
$output .= $function.'/>';
if ($password === true) {
if ($password === true && $hide_div_eye === false) {
$output .= html_print_div(
[
'id' => 'show-hide-'.$id,
@ -2800,7 +2801,8 @@ function html_print_input_password(
$disabled=false,
$required=false,
$class='',
$autocomplete='off'
$autocomplete='off',
$hide_div_eye=false,
) {
if ($maxlength == 0) {
$maxlength = 255;
@ -2831,7 +2833,7 @@ function html_print_input_password(
}
}
return '<div class="relative container-div-input-password">'.html_print_input_text_extended($name, $value, 'password-'.$name, $alt, $size, $maxlength, $disabled, '', $attr, $return, true, '', $autocomplete).'</div>';
return '<div class="relative container-div-input-password">'.html_print_input_text_extended($name, $value, 'password-'.$name, $alt, $size, $maxlength, $disabled, '', $attr, $return, true, '', $autocomplete, false, $hide_div_eye).'</div>';
}

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

@ -312,15 +312,17 @@ table pre {
white-space: pre-wrap;
}
tr:first-child > th {
/* tr:first-child > th {
background-color: #373737;
}
} */
th {
color: #fff;
background-color: #666;
/* color: #fff; */
/* background-color: #666; */
color: #000;
font-size: 7.5pt;
letter-spacing: 0.3pt;
border-bottom: 1px solid #e2e2e2;
}
pre .color_333 {
@ -2021,8 +2023,11 @@ table.databox {
.databox > tbody > tr > th,
.databox > thead > tr > th a {
padding: 9px 7px;
font-weight: normal;
color: #fff;
/* font-weight: normal; */
font-weight: bold;
font-size: 9pt;
line-height: 16pt;
/* color: #fff; */
text-align: center;
}
@ -10004,6 +10009,10 @@ select:disabled,
color: #8a96a6;
}
/* input[type="password"] {
background-color: #f6f7fb;
} */
input:not([type="image"]):focus,
textarea:focus,
select:focus {

32
pandora_console/include/styles/tables.css
View File

@ -735,6 +735,12 @@ tr.datos2 > td.datos2 > div > div > label {
margin-bottom: 10px;
}
.label-ipam-calculator {
font-size: 13px;
line-height: 20px;
font-weight: bold;
}
#text-vrf_name {
width: 100%;
}
@ -758,3 +764,29 @@ table.filter-table-adv td div.inline-radio-button input[type="radio"] {
padding-left: 12px;
margin-right: 10px;
}
.select2-w100p > span.select2 {
width: 100% !important;
}
form#create_site > ul {
display: flex;
flex-wrap: wrap;
}
.select-ips-ipam > select {
min-height: 19.8em !important;
}
div.margin-top-50p {
margin-top: 50% !important;
}
.line-height-normal {
line-height: normal;
}
div[id^="auto-os-"] > img {
width: 20px;
height: 20px;
}

15
pandora_console/include/styles/wizard.css
View File

@ -195,3 +195,18 @@ ul.wizard li.mrgn_0px {
ul.wizard li.pdd_0px {
padding: 0;
}
li#textarea-create-site > textarea {
width: 100%;
}
form#create_site > ul.wizard > li > label {
font-size: 13px;
line-height: 16px;
font-weight: bold;
margin-bottom: 10px;
}
select[multiple] {
min-height: 20em;
}

131
pandora_console/operation/reporting/graph_viewer.php
View File

@ -312,31 +312,43 @@ if ($view_graph) {
}
$period_label = human_time_description_raw($period);
echo '<form method="POST" action="index.php?sec=reporting&sec2=operation/reporting/graph_viewer&view_graph=1&id=$id_graph">';
echo "<table class='databox filters w100p' cellpadding='4' cellspacing='4'>";
echo '<tr>';
$searchForm = '<form method="POST" action="index.php?sec=reporting&sec2=operation/reporting/graph_viewer&view_graph=1&id='.$id_graph.'">';
$searchForm .= "<table class='filter-table-adv w100p' cellpadding='4' cellspacing='4'>";
$searchForm .= '<tr>';
echo '<td>';
echo '<b>'.__('Date').'</b>';
echo '</td>';
echo '<td>';
echo html_print_input_text('date', $date, '', 12, 10, true).' ';
echo '</td>';
echo '<td>';
echo html_print_input_text('time', $time, '', 7, 7, true).' ';
echo '</td>';
echo "<td class='datos'>";
echo '<b>'.__('Time range').'</b>';
echo '</td>';
echo "<td class='datos'>";
echo html_print_extended_select_for_time('period', $period, '', '', '0', 10, true);
echo '</td>';
echo "<td class='datos'>";
$searchForm .= '<td class="w30p">';
$searchForm .= html_print_label_input_block(
__('Date'),
html_print_input_text(
'date',
$date,
'',
'',
10,
true
)
);
$searchForm .= '</td><td class="datos w30p">';
$searchForm .= html_print_label_input_block(
__('Time'),
html_print_input_text(
'time',
$time,
'',
'',
7,
true
)
);
$searchForm .= '</td>';
$searchForm .= "<td class='datos w30p'>";
$searchForm .= html_print_label_input_block(
__('Time range'),
html_print_extended_select_for_time('period', $period, '', '', '0', 10, true, 'width:100%')
);
$searchForm .= '</td>';
$searchForm .= '</tr><tr>';
$searchForm .= "<td class='datos w30p'>";
$stackeds = [];
$stackeds[0] = __('Graph defined');
$stackeds[CUSTOM_GRAPH_AREA] = __('Area');
@ -348,32 +360,67 @@ if ($view_graph) {
$stackeds[CUSTOM_GRAPH_HBARS] = __('Horizontal Bars');
$stackeds[CUSTOM_GRAPH_VBARS] = __('Vertical Bars');
$stackeds[CUSTOM_GRAPH_PIE] = __('Pie');
html_print_select($stackeds, 'stacked', $stacked, '', '', -1, false, false);
echo '</td>';
$searchForm .= html_print_label_input_block(__('Type'), html_print_select($stackeds, 'stacked', $stacked, '', '', -1, true, false, true, '', false, 'width:100%'));
$searchForm .= '</td>';
$searchForm .= "<td class='datos w30p'>";
$searchForm .= html_print_label_input_block(
__('Equalize maxiddmum thresholds').ui_print_help_tip(
__('If an option is selected, all graphs will have the highest value from all modules included in the graph as a maximum threshold'),
true
),
html_print_checkbox(
'threshold',
CUSTOM_GRAPH_BULLET_CHART_THRESHOLD,
$check,
true,
false,
'',
false
)
);
$searchForm .= '</div>';
$searchForm .= '</td>';
echo "<td class='datos'>";
echo "<div class='float-left' id='thresholdDiv' name='thresholdDiv'>&nbsp;&nbsp;<b>".__('Equalize maxiddmum thresholds').'</b>'.ui_print_help_tip(__('If an option is selected, all graphs will have the highest value from all modules included in the graph as a maximum threshold'), true);
html_print_checkbox('threshold', CUSTOM_GRAPH_BULLET_CHART_THRESHOLD, $check, false, false, '', false);
echo '</div>';
echo '</td>';
echo "<td class='datos'>";
$searchForm .= "<td class='datos w30p'>";
$zooms = [];
$zooms[0] = __('Graph defined');
$zooms[1] = __('Zoom x1');
$zooms[2] = __('Zoom x2');
$zooms[3] = __('Zoom x3');
html_print_select($zooms, 'zoom', $zoom, '', '', 0);
echo '</td>';
$searchForm .= html_print_label_input_block(__('Zoom'), html_print_select($zooms, 'zoom', $zoom, '', '', 0, true, false, true, '', false, 'width:100%'));
$searchForm .= '</td>';
echo "<td class='datos'>";
echo "<input id='submit-refresh' type=submit value='".__('Refresh')."' class='sub upd'>";
echo '</td>';
$searchForm .= '</tr>';
$searchForm .= '</table>';
$searchForm .= html_print_div(
[
'class' => 'action-buttons',
'content' => html_print_submit_button(
__('Filter'),
'submit-refresh',
false,
[
'mode' => 'mini',
'icon' => 'search',
],
true
),
],
true
);
$searchForm .= '</form>';
echo '</tr>';
echo '</table>';
echo '</form>';
ui_toggle(
$searchForm,
'<span class="subsection_header_title">'.__('Filters').'</span>',
'filter_form',
'',
true,
false,
'',
'white-box-content',
'box-flat white_table_graph fixed_filter_bar'
);
if ($graph_return) {
echo "<table id='graph-container' class='databox filters' cellpadding='0' cellspacing='0' style='height:100%;width:100%;overflow:hidden;'>";