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-13185-ligera-modificacion-en-el-header' into 'develop' 

Ent 13185 ligera modificacion en el header

See merge request artica/pandorafms!7090
This commit is contained in:
Jose Martin 2024-04-11 07:16:51 +00:00
parent 596a50d155 cc1832a866
commit dcb4e00cbd
9 changed files with 369 additions and 192 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
pandora_console/general/header.php
View File

@ -140,7 +140,6 @@ echo sprintf('<div id="header_table" class="header_table_%s">', $menuTypeClass);
}
}
$search_bar .= '<div id="result_order" class="result_order"></div>';
$search_bar .= '<input id="keywords" name="keywords"';
if (!isset($config['search_keywords'])) {
$search_bar .= "value='".__('Enter keywords to search')."'";
@ -408,6 +407,27 @@ echo sprintf('<div id="header_table" class="header_table_%s">', $menuTypeClass);
$modal_box .= '<a href="https://discord.com/invite/xVt2ruSxmr" target="_blank">'.__('Join discord community').'</a>';
$modal_box .= '</div>';
// Move help modal (header) fix z-index.
$modal_box .= '
<script>
$(document).ready(function() {
let helpModalIcon = $("#modal-help-content > img");
let helpModal = $("#modal_help");
if (helpModalIcon.length > 0) {
let distanceRight =
$(window).width() - (helpModalIcon.offset().left + helpModalIcon.width());
helpModal.css("z-index", "3");
helpModal.css("position", "fixed");
helpModal.css("top", "16px");
helpModal.css("right", `${Math.floor(distanceRight) + 34}px`);
helpModal.appendTo(document.body);
}
});
</script>
';
if ($config['activate_feedback'] === '1') {
$modal_help = html_print_div(
[
@ -883,7 +903,8 @@ echo sprintf('<div id="header_table" class="header_table_%s">', $menuTypeClass);
enterprise: <?php echo (int) enterprise_installed(); ?>,
},
success: function (data) {
$('#result_order').html(data);
$('#result_order').html(data);
resizeSearchHeader()
},
error: function (data) {
console.error("Fatal error in AJAX call to interpreter order", data)
@ -1208,4 +1229,8 @@ echo sprintf('<div id="header_table" class="header_table_%s">', $menuTypeClass);
});
});
/* ]]> */
$(window).resize(function () {
resizeSearchHeader()
});
</script>

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

@ -404,7 +404,7 @@ class OrderInterpreter extends Wizard
if ($iterator <= 9 && $this->canShowItem($enterprise, $this->pages_menu[$key]['url'])) {
echo '<li class="list_found" name="'.$iterator.'" id="'.$iterator.'">';
echo '
<span class="invert_filter"> Go to </span> &nbsp;
<span class=""> Go to </span> &nbsp;
<img src="'.$this->pages_menu[$key]['icon'].'">';
echo '&nbsp;
<a href="'.$this->pages_menu[$key]['url'].'">

6
pandora_console/include/functions_ui.php
View File

@ -4646,10 +4646,12 @@ function ui_toggle(
$imageRotate = $rotateB;
$style .= 'height:0;position:absolute;';
$original = $img_b;
$data_close = 'true';
} else {
$imageRotate = $rotateA;
$style .= 'height:auto;position:relative;';
$original = $img_a;
$data_close = 'false';
}
$header_class = '';
@ -4668,7 +4670,7 @@ function ui_toggle(
// Link to toggle.
$output = '<div class="'.$main_class.'" id="'.$id.'" '.$toggl_attr.'>';
$output .= '<div class="'.$header_class.'" '.(($disableToggle === false) ? 'style="cursor: pointer;" ' : '').' id="tgl_ctrl_'.$uniqid.'">';
$output .= '<div class="'.$header_class.'" '.(($disableToggle === false) ? 'style="cursor: pointer;" ' : '').' id="tgl_ctrl_'.$uniqid.'" data-close="'.$data_close.'">';
if ($reverseImg === false) {
if ($switch === true) {
if (empty($switch_name) === true) {
@ -4783,6 +4785,7 @@ function ui_toggle(
$output .= " $('#tgl_div_".$uniqid."').css('position', '".$position_div."');\n";
$output .= " $('#image_".$uniqid."').attr('style', 'rotate: ".$rotateA."');\n";
$output .= " $('#checkbox-".$switch_name."').prop('checked', true);\n";
$output .= " $('#tgl_ctrl_".$uniqid."').attr('data-close', 'false');\n";
$output .= $class_table;
$output .= " }\n";
$output .= " else {\n";
@ -4791,6 +4794,7 @@ function ui_toggle(
$output .= " $('#tgl_div_".$uniqid."').css('position', 'absolute');\n";
$output .= " $('#image_".$uniqid."').attr('style', 'rotate: ".$rotateB."');\n";
$output .= " $('#checkbox-".$switch_name."').prop('checked', false);\n";
$output .= " $('#tgl_ctrl_".$uniqid."').attr('data-close', 'true');\n";
$output .= " }\n";
$output .= " });\n";
$output .= " }\n";

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

@ -2736,3 +2736,8 @@ function menuTabsShowHide() {
}
}
}
function resizeSearchHeader() {
$(".show_result_interpreter").width($("#keywords").outerWidth() - 12);
$(".show_result_interpreter").css("left", $("#keywords").position().left + 2);
}

10
pandora_console/include/styles/menu.css
View File

@ -478,7 +478,6 @@ ul li {
top: 0;
left: 0;
background-color: #ffffff;
border-right: 1px solid #eee;
}
.button_collapse {
@ -545,6 +544,13 @@ ul li {
width: 35px;
}
#button_collapse {
width: 32px;
height: 32px;
background-color: #f6f7fb;
border-radius: 50%;
}
@media screen and (max-height: 750px) {
.operation {
padding-top: 10px;
@ -586,7 +592,7 @@ ul li {
#menu_tabs {
height: 49px;
border-bottom: 1px solid #c1ccdc;
border-bottom: 1px solid #f6f7fb;
}
.div_border_line {

42
pandora_console/include/styles/order_interpreter.css
View File

@ -2,16 +2,18 @@ div.show_result_interpreter {
background-color: #fff;
color: #000;
border: 1px solid #e2e2e2;
border-bottom-left-radius: 10px;
border-bottom-right-radius: 10px;
border-top: 0;
border-bottom-left-radius: 18px;
border-bottom-right-radius: 18px;
padding-left: 10px;
padding-top: 5px;
padding-bottom: 5px;
box-shadow: 0px 0px 15px -4px #dadada;
position: absolute;
z-index: 1;
position: fixed;
z-index: 3;
width: 300px;
top: 45px;
top: 48px;
left: 50%;
}
.more_results {
@ -21,27 +23,37 @@ div.show_result_interpreter {
}
.results-found {
background-image: url("../../images/input_zoom_gray.png");
background-position: center right 10px;
background-image: url("../../images/details.svg");
background-position: center left 20px;
background-repeat: no-repeat;
background-size: 17px;
background-color: #f2f6f7;
background-color: #f6f7fb;
padding: 0px;
margin: 0;
width: 300px;
height: 30px;
width: 150px;
height: 36px;
margin-left: 2px;
padding-left: 15px;
padding-right: 40px;
padding-right: 15px;
padding-left: 45px;
color: #777;
font-size: 8.5pt;
border-top-left-radius: 10px;
border-top-right-radius: 10px;
border-top-left-radius: 18px;
border-top-right-radius: 18px;
border-bottom-left-radius: 0px;
border-bottom-right-radius: 0px;
border-color: transparent;
}
.list_found {
padding-top: 5px;
padding: 5px;
display: flex;
flex-direction: row;
flex-wrap: nowrap;
align-items: center;
}
.list_found img {
padding: 0 5px;
}
.active {

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

@ -29,6 +29,7 @@
:root {
--primary-color: #14524f;
--primary-color-hover: #318280;
--secondary-color: #ffffff;
--text-color: #333;
@ -1609,7 +1610,6 @@ div#head {
height: 60px;
padding-top: 0px;
margin: 0 auto;
border-bottom: 1px solid #eee;
min-width: 882px;
background-color: #fff;
color: #000;
@ -2007,21 +2007,43 @@ div.title_line {
#menu_tab_frame_view,
#menu_tab_frame_view_bc {
position: sticky;
top: 61px;
top: 60px;
z-index: 2;
display: flex;
align-items: flex-end;
justify-content: space-between;
border-bottom: 1px solid #eee;
width: -webkit-fill-available;
width: -moz-available;
padding-right: 0px;
height: 50px;
box-sizing: border-box;
background-color: #fff;
background-color: #f6f7fb;
margin: -25px -25px 25px -25px;
}
#menu_full::before {
content: "";
width: 16px;
height: 16px;
background-color: var(--secondary-color);
position: absolute;
top: 60px;
right: -16px;
z-index: 0;
}
#menu_full::after {
content: "";
width: 16px;
height: 16px;
background-color: #f6f7fb;
position: absolute;
top: 60px;
right: -16px;
z-index: 0;
border-top-left-radius: 16px;
}
/* Breadcrum */
#menu_tab_frame_view_bc {
min-height: 55px;
@ -2830,10 +2852,31 @@ div#pandora_logo_header {
flex-direction: column;
}
#head,
#header {
text-wrap: nowrap;
}
.header_center {
display: flex;
justify-content: center;
align-items: center;
width: 100%;
}
#header_searchbar {
width: 100%;
padding: 0 100px;
}
@media screen and (max-width: 1300px) {
#header_searchbar {
padding: 0 30px;
}
}
#header_searchbar #keywords {
width: 100%;
}
.header_right {
@ -3616,17 +3659,17 @@ div.tip > img {
*/
input.search_input {
background-image: url("../../images/details.svg");
background-position: center right 10px;
background-position: center left 20px;
background-repeat: no-repeat;
background-size: 17px;
background-color: #f2f6f7;
background-color: #f6f7fb;
padding: 0px;
margin: 0;
width: 150px;
height: 30px;
height: 36px;
margin-left: 2px;
padding-left: 15px;
padding-right: 40px;
padding-right: 15px;
padding-left: 45px;
color: #777;
font-size: 8.5pt;
border-top-left-radius: 50px;
@ -4098,15 +4141,22 @@ div.div_groups_status {
min-height: 53px;
}
#menu_tab li:hover:not(.menu-dots-li) {
box-shadow: inset 0px 4px var(--primary-color);
}
#menu_tab li.nomn_high,
#menu_tab li.nomn_high span {
color: #fff;
box-shadow: inset 0px 4px var(--primary-color);
background-color: #fff;
}
#menu_tab li.nomn_high::before,
#menu_tab li:hover:not(.menu-dots-li)::before {
content: "";
display: block;
position: absolute;
bottom: 0px;
width: 40px;
height: 5px;
margin-left: -5px;
background-color: var(--primary-color-hover);
border-radius: 5px;
}
#menu_tab li.nomn img,
@ -10534,6 +10584,11 @@ select:focus {
border: 2px solid #8a96a6;
}
#keywords.results-found {
border: 1px solid var(--border-color);
border-bottom: 0px;
}
:focus {
outline: #8a96a6;
}
@ -11627,12 +11682,56 @@ pre.external_tools_output {
z-index: 1;
width: -webkit-fill-available;
width: -moz-available;
margin: -25px -25px 25px -25px;
margin-bottom: 25px;
}
.white_table_graph.fixed_filter_bar {
border-radius: 0px;
background-color: #f6f7fb;
border: 0;
top: 133px;
}
.white_table_graph.fixed_filter_bar::before {
content: "";
width: calc(100% + 2px);
height: 25px;
background-color: #f6f7fb;
position: absolute;
top: -25px;
margin: 0 -1px;
}
.white_table_graph.fixed_filter_bar > div:nth-child(1) {
background-color: var(--secondary-color);
border: 1px solid #e5e9ed;
border-bottom: 0px;
border-radius: 0;
top: 110px;
border-top-left-radius: 8px;
border-top-right-radius: 8px;
}
.white_table_graph.fixed_filter_bar > div:nth-child(1)[data-close="true"] {
border-radius: 8px;
border: 1px solid #e5e9ed;
}
.white_table_graph.fixed_filter_bar > div:nth-child(2) {
background-color: var(--secondary-color);
/* border: 1px solid #e5e9ed; */
border-top: 0px;
border-radius: 0;
border-bottom-left-radius: 8px;
border-bottom-right-radius: 8px;
}
.white_table_graph.fixed_filter_bar > div:nth-child(2) > div {
background-color: unset;
border: 1px solid #e5e9ed;
border-top: 0px;
border-radius: 0;
border-bottom-left-radius: 8px;
border-bottom-right-radius: 8px;
}
/*

331
pandora_console/include/styles/pandora_black.css
View File

File diff suppressed because it is too large Load Diff

3
pandora_console/index.php
View File

@ -1565,6 +1565,9 @@ while (ob_get_length() > 0) {
ob_end_flush();
}
// Results search header.
echo '<div id="result_order" class="result_order"></div>';
db_print_database_debug();
echo '</html>';