tyler.durden/pandorafms
1
0
Fork 0
mirror of https://github.com/pandorafms/pandorafms.git synced 2025-07-31 01:35:36 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'ent-9662-second-round' of brutus.artica.es:artica/pandorafms into ent-9662-second-round

Browse Source
This commit is contained in:
Jonathan 2023-03-29 13:35:03 +02:00
commit 962562f12f
6 changed files with 32 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pandora_console/general/noaccess.php
View File

@ -15,7 +15,7 @@
<style> <style>
#alert_messages_na { #alert_messages_na {
z-index: 2; z-index: 2;
position: absolute; position: fixed;
left: 50%; left: 50%;
top: 50%; top: 50%;
transform: translate(-50%, -50%); transform: translate(-50%, -50%);
@ -160,9 +160,9 @@
?> ?>
</div> </div>
<div class='modalokbutto cerrar'> <button type="submit" class="cerrar submitButton" name="" id="" value="OK">
<span class='modalokbuttontex'>OK</span> <span id="" style="" class="font_11">OK</span>
</div> </button>
</div> </div>
</div> </div>
<div id="opacidad"></div> <div id="opacidad"></div>
@ -173,6 +173,4 @@
$(".cerrar").click(function() { $(".cerrar").click(function() {
window.location = "<?php echo $config['homeurl']; ?>"; window.location = "<?php echo $config['homeurl']; ?>";
}); });
$('div#page').css('background-color', '#d3d3d3');
</script> </script>

9
pandora_console/include/class/HTML.class.php
View File

@ -753,9 +753,18 @@ class HTML
) { ) {
$output .= '<li id="'.$input['id'].'" class="'.$class.'">'; $output .= '<li id="'.$input['id'].'" class="'.$class.'">';
$output .= '<label>'.$input['label'].'</label>'; $output .= '<label>'.$input['label'].'</label>';
if (isset($input['extra-container']) === true && $input['extra-container'] === true) {
$output .= '<div class="flex extra-container-input">';
}
$output .= self::printInput($input['arguments']); $output .= self::printInput($input['arguments']);
// Allow dynamic content. // Allow dynamic content.
$output .= $input['extra']; $output .= $input['extra'];
if (isset($input['extra-container']) === true && $input['extra-container'] === true) {
$output .= '</div>';
}
$output .= '</li>'; $output .= '</li>';
} else { } else {
$output .= self::printInput($input['arguments']); $output .= self::printInput($input['arguments']);

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

@ -934,6 +934,12 @@ select:-internal-list-box {
display: flex; display: flex;
} }
.flex-row-important {
display: flex !important;
flex-direction: row !important;
justify-content: flex-start !important;
}
.padding-2 { .padding-2 {
padding: 2em; padding: 2em;
} }
@ -11619,10 +11625,8 @@ div[role="dialog"] {
.row-title-font > td > div > div > b { .row-title-font > td > div > div > b {
font-size: 13px; font-size: 13px;
line-height: 16px; line-height: 16px;
color: #161628;
text-align: left; text-align: left;
margin-bottom: 10px; margin-bottom: 10px;
/* font-weight: bold; */
} }
.font-title-font { .font-title-font {
@ -11819,3 +11823,8 @@ span.help_icon_15px > img {
transform: rotate(360deg); transform: rotate(360deg);
} }
} }
li.input-interval .extra-container-input .select2 {
width: 50% !important;
margin-right: 10px;
}

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

@ -1297,10 +1297,12 @@ a.pandora_pagination:hover {
filter: brightness(0) contrast(50%) !important; filter: brightness(0) contrast(50%) !important;
} }
/*
input:not(div.login_pass > input):not(div.login_nick > input[type="image"]) { input:not(div.login_pass > input):not(div.login_nick > input[type="image"]) {
background-color: transparent !important; background-color: transparent !important;
color: inherit !important; color: inherit !important;
} }
*/
.databox_color { .databox_color {
background-color: transparent !important; background-color: transparent !important;

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

@ -837,3 +837,8 @@ table#simple.floating_form tr[id^="simple-macro_field"] {
table#simple.floating_form tr[id^="simple-macro_field"] > td > input { table#simple.floating_form tr[id^="simple-macro_field"] > td > input {
width: 50%; width: 50%;
} }
td.FF-thresholds-pdd {
padding: 0px !important;
padding-left: 13px !important;
}

15
pandora_console/operation/agentes/ver_agente.php
View File

@ -1442,22 +1442,9 @@ $alerttab['active'] = ($tab === 'alert');
// Inventory. // Inventory.
$inventoryCount = db_get_num_rows('SELECT id_agent_module_inventory FROM tagent_module_inventory WHERE id_agente = '.$agent['id_agente']); $inventoryCount = db_get_num_rows('SELECT id_agent_module_inventory FROM tagent_module_inventory WHERE id_agente = '.$agent['id_agente']);
$inventorytab['text'] = '<a href="index.php?sec=estado&sec2=operation/agentes/ver_agente&tab=inventory&id_agente='.$id_agente.'">'.html_print_image(
'images/hardware-software-component@svg.svg',
true,
[
'class' => 'main_menu_icon invert_filter',
'title' => __('Inventory'),
]
).'</a>';
if ($tab == 'inventory') {
$inventorytab['active'] = true;
} else {
$inventorytab['active'] = false;
}
$inventorytab = enterprise_hook('inventory_tab'); $inventorytab = enterprise_hook('inventory_tab');
if ($inventorytab === ENTERPRISE_NOT_HOOK || $inventoryCount === 0) { if ($inventorytab === ENTERPRISE_NOT_HOOK || $inventoryCount === 0) {
$inventorytab = ''; $inventorytab = '';
} }