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

9662-Fix login meta

Browse Source
This commit is contained in:
Pablo Aragon 2023-02-20 09:54:48 +01:00
parent 46a4ee9af2
commit 4ee6cf7e28
4 changed files with 121 additions and 183 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
pandora_console/general/login_page.php
View File

@ -171,11 +171,11 @@ if (isset($config['custom_support_url'])) {
echo '<li id="li_margin_support"><a href="'.ui_get_full_external_url($config['custom_support_url']).'" target="_blank">'.__('Support').'</li>'; echo '<li id="li_margin_support"><a href="'.ui_get_full_external_url($config['custom_support_url']).'" target="_blank">'.__('Support').'</li>';
} else { } else {
echo '<li id="li_margin_support_img"><a href="https://pandorafms.com/monitoring-services/support/" target="_blank"><img src="'.$support_logo.'" alt="support"></a></li>'; echo '<li id="li_margin_support_img"><a href="https://pandorafms.com/monitoring-services/support/" target="_blank"><img src="'.$support_logo.'" alt="support"></a></li>';
echo '<li id="li_margin_support">'.__('Support').'</li>'; echo '<li id="li_margin_support"><a href="https://support.pandorafms.com" target="_blank">'.__('Support').'</a></li>';
} }
} else if (!$custom_conf_enabled) { } else if (!$custom_conf_enabled) {
echo '<li id="li_margin_support_img"><a href="https://support.pandorafms.com" target="_blank"><img src="'.$support_logo.'" alt="support"></a></li>'; echo '<li id="li_margin_support_img"><a href="https://support.pandorafms.com" target="_blank"><img src="'.$support_logo.'" alt="support"></a></li>';
echo '<li id="li_margin_support"><a href="https://support.pandorafms.com" target="_blank">'.__('Docs').'</li>'; echo '<li id="li_margin_support"><a href="https://support.pandorafms.com" target="_blank">'.__('Support').'</a></li>';
} }
echo '</ul></div>'; echo '</ul></div>';
@ -370,17 +370,18 @@ if ($config['enterprise_installed']) {
echo '<a href="javascript:centralized_mode_reset_dialog();">'.__('Forgot your password?'); echo '<a href="javascript:centralized_mode_reset_dialog();">'.__('Forgot your password?');
echo '</a>'; echo '</a>';
echo '<div id="centralized_mode_reset_dialog" title="'.__('Password reset').'" style="display:none">'; echo '<div id="centralized_mode_reset_dialog" title="'.__('Centralized mode').'" style="display:none">';
echo '<div class="content_alert">'; echo '<div class="content_alert">';
echo '<div class="icon_message_alert">'; echo '<div class="icon_message_alert">';
echo html_print_image('images/icono_stop.png', true, ['alt' => __('Password reset'), 'border' => 0]); echo html_print_image('images/icono_stop.png', true, ['alt' => __('Centralized mode'), 'border' => 0]);
echo '</div>'; echo '</div>';
echo '<div class="content_message_alert">'; echo '<div class="content_message_alert">';
echo '<div class="text_message_alert">'; echo '<div class="text_message_alert">';
echo '<p>'.__('This node is configured with centralized mode. Go to metaconsole to reset the password').'</p>'; echo '<p>'.__('This node is configured with centralized mode. Go to metaconsole to reset the password').'</p>';
echo '</div>'; echo '</div>';
echo '<br>';
echo '<div class="button_message_alert">'; echo '<div class="button_message_alert">';
html_print_submit_button('Ok', 'centralized_mode_reset_button', false); html_print_submit_button('Ok', 'centralized_mode_reset_button', false, ['class' => 'mini float-right']);
echo '</div>'; echo '</div>';
echo '</div>'; echo '</div>';
echo '</div>'; echo '</div>';
@ -492,25 +493,28 @@ if (empty($process_error_message) && isset($mail)) {
echo '<h1>'.__('INFO').'</h1>'; echo '<h1>'.__('INFO').'</h1>';
echo '<p>'.__('An email has been sent to your email address').'</p>'; echo '<p>'.__('An email has been sent to your email address').'</p>';
echo '</div>'; echo '</div>';
echo '<br>';
echo '<div class="button_message_alert">'; echo '<div class="button_message_alert">';
html_print_submit_button('Ok', 'reset_correct_button', false); html_print_submit_button('Ok', 'reset_correct_button', false, ['class' => 'mini float-right']);
echo '</div>'; echo '</div>';
echo '</div>'; echo '</div>';
echo '</div>'; echo '</div>';
echo '</div>'; echo '</div>';
} else if (isset($process_error_message) && !empty($process_error_message)) { } else if (isset($process_error_message) && !empty($process_error_message)) {
echo '<div id="reset_correct" title="'.__('Password reset').'">'; echo '<div id="reset_correct" title="'.__('Error').'">';
echo '<div class="content_alert">'; echo '<div class="content_alert">';
echo '<div class="icon_message_alert">'; echo '<div class="icon_message_alert">';
echo html_print_image('images/icono_stop.png', true, ['alt' => __('Password reset'), 'border' => 0]); echo html_print_image('images/icono_stop.png', true, ['alt' => __('Forbidden'), 'border' => 0]);
echo '</div>'; echo '</div>';
echo '<div class="content_message_alert">'; echo '<div class="content_message_alert">';
echo '<div class="text_message_alert">'; echo '<div class="text_message_alert">';
echo '<h1>'.__('ERROR').'</h1>'; echo '<h1>'.__('ERROR').'</h1>';
echo '<p>'.$process_error_message.'</p>'; echo '<p>'.$process_error_message.'</p>';
echo '<br>';
echo '</div>'; echo '</div>';
echo '<br>';
echo '<div class="button_message_alert">'; echo '<div class="button_message_alert">';
html_print_submit_button('Ok', 'reset_correct_button', false); html_print_submit_button('Ok', 'reset_correct_button', false, ['class' => 'mini float-right']);
echo '</div>'; echo '</div>';
echo '</div>'; echo '</div>';
echo '</div>'; echo '</div>';
@ -529,8 +533,9 @@ if (isset($correct_reset_pass_process)) {
echo '<h1>'.__('SUCCESS').'</h1>'; echo '<h1>'.__('SUCCESS').'</h1>';
echo '<p>'.$correct_reset_pass_process.'</p>'; echo '<p>'.$correct_reset_pass_process.'</p>';
echo '</div>'; echo '</div>';
echo '<br>';
echo '<div class="button_message_alert">'; echo '<div class="button_message_alert">';
html_print_submit_button('Ok', 'final_process_correct_button', false); html_print_submit_button('Ok', 'final_process_correct_button', false, ['class' => 'mini float-right']);
echo '</div>'; echo '</div>';
echo '</div>'; echo '</div>';
echo '</div>'; echo '</div>';
@ -557,8 +562,9 @@ if (isset($login_failed)) {
echo '</div>'; echo '</div>';
} }
echo '<br>';
echo '<div class="button_message_alert">'; echo '<div class="button_message_alert">';
html_print_submit_button('Ok', 'hide-login-error', false, ['class' => ' mini']); html_print_submit_button('Ok', 'hide-login-error', false, ['class' => ' mini float-right']);
echo '</div>'; echo '</div>';
echo '</div>'; echo '</div>';
echo '</div>'; echo '</div>';
@ -581,8 +587,9 @@ if ($login_screen == 'logout') {
} }
echo '</div>'; echo '</div>';
echo '<br>';
echo '<div class="button_message_alert">'; echo '<div class="button_message_alert">';
html_print_submit_button('Ok', 'hide-login-logout', false, ['class' => ' mini']); html_print_submit_button('Ok', 'hide-login-logout', false, ['class' => ' mini float-right']);
echo '</div>'; echo '</div>';
echo '</div>'; echo '</div>';
echo '</div>'; echo '</div>';
@ -600,8 +607,9 @@ if ($login_screen === 'disabled_access_node') {
echo '<h1>'.__('Centralized user in metaconsole').'</h1>'; echo '<h1>'.__('Centralized user in metaconsole').'</h1>';
echo '<p>'.__('This user does not have access on node, please enable node access on this user from metaconsole.').'</p>'; echo '<p>'.__('This user does not have access on node, please enable node access on this user from metaconsole.').'</p>';
echo '</div>'; echo '</div>';
echo '<br>';
echo '<div class="button_message_alert">'; echo '<div class="button_message_alert">';
html_print_submit_button('Ok', 'hide-login-logout', false); html_print_submit_button('Ok', 'hide-login-logout', false, ['class' => 'mini float-right']);
echo '</div>'; echo '</div>';
echo '</div>'; echo '</div>';
echo '</div>'; echo '</div>';
@ -708,8 +716,9 @@ if ($login_screen == 'error_authconfig' || $login_screen == 'error_emptyconfig'
echo '<h1>'.$title.'</h1>'; echo '<h1>'.$title.'</h1>';
echo '<p> '.$message.'</h1>'; echo '<p> '.$message.'</h1>';
echo '</div>'; echo '</div>';
echo '<br>';
echo '<div class="button_message_alert">'; echo '<div class="button_message_alert">';
html_print_submit_button('Ok', 'hide-login-error', false); html_print_submit_button('Ok', 'hide-login-error', false, ['class' => 'mini float-right']);
echo '</div>'; echo '</div>';
echo '</div>'; echo '</div>';
echo '</div>'; echo '</div>';
@ -779,18 +788,22 @@ html_print_div(['id' => 'forced_title_layer', 'class' => 'forced_title_layer', '
resizable: true, resizable: true,
draggable: true, draggable: true,
modal: true, modal: true,
height: 220,
width: 528, width: 528,
clickOutside: true, clickOutside: true,
overlay: { overlay: {
opacity: 0.5, opacity: 0.5,
background: "black" background: "black"
},
open: function (event, ui) {
$(".ui-widget-overlay").click(function () {
$('#login_logout').dialog('close');
});
} }
}); });
}); });
$("#button-hide-login-logout").click (function () { $("#button-hide-login-logout").click (function () {
document.location = "<?php echo ui_get_full_url('index.php'); ?>"; $( "#login_logout" ).dialog( "close" );
}); });
}); });
break; break;
@ -802,7 +815,6 @@ html_print_div(['id' => 'forced_title_layer', 'class' => 'forced_title_layer', '
resizable: true, resizable: true,
draggable: true, draggable: true,
modal: true, modal: true,
height: 220,
width: 528, width: 528,
clickOutside: true, clickOutside: true,
overlay: { overlay: {
@ -826,7 +838,6 @@ html_print_div(['id' => 'forced_title_layer', 'class' => 'forced_title_layer', '
resizable: true, resizable: true,
draggable: true, draggable: true,
modal: true, modal: true,
height: 400,
width: 700, width: 700,
overlay: { overlay: {
opacity: 0.5, opacity: 0.5,
@ -844,7 +855,6 @@ html_print_div(['id' => 'forced_title_layer', 'class' => 'forced_title_layer', '
resizable: true, resizable: true,
draggable: true, draggable: true,
modal: true, modal: true,
height: 220,
width: 528, width: 528,
overlay: { overlay: {
opacity: 0.5, opacity: 0.5,
@ -869,7 +879,6 @@ html_print_div(['id' => 'forced_title_layer', 'class' => 'forced_title_layer', '
resizable: true, resizable: true,
draggable: true, draggable: true,
modal: true, modal: true,
height: 220,
width: 528, width: 528,
clickOutside: true, clickOutside: true,
overlay: { overlay: {
@ -890,7 +899,6 @@ html_print_div(['id' => 'forced_title_layer', 'class' => 'forced_title_layer', '
resizable: true, resizable: true,
draggable: true, draggable: true,
modal: true, modal: true,
height: 220,
width: 528, width: 528,
clickOutside: true, clickOutside: true,
overlay: { overlay: {
@ -910,7 +918,6 @@ html_print_div(['id' => 'forced_title_layer', 'class' => 'forced_title_layer', '
resizable: true, resizable: true,
draggable: true, draggable: true,
modal: true, modal: true,
height: 220,
width: 528, width: 528,
overlay: { overlay: {
opacity: 0.5, opacity: 0.5,

192
pandora_console/general/mysqlerr.php
View File

@ -1,126 +1,14 @@
<html>
<head>
<style>
#alert_messages_na{
-moz-border-bottom-right-radius: 5px;
-webkit-border-bottom-left-radius: 5px;
border-bottom-right-radius: 5px;
border-bottom-left-radius: 5px;
z-index:2;
position:fixed;
width:700px;
background:white;
left:50%;
top:20%;
margin-left:-350px;
}
.modalheade{
text-align:center;
width:100%;
height:37px;
left:0px;
background-color:#82b92e;
}
.modalheadertex{
color:white;
position:relative;
font-size:13pt;
top:8px;
}
.modalconten{
color:black;
background:white;
}
.modalcontentim{
float:left;
margin-left:30px;
margin-top:30px;
margin-bottom:30px;
}
.modalcontenttex{
float:left;
text-align:justify;
color:black;
font-size: 9.5pt;
line-height:13pt;
margin-top:40px;
width:430px;
margin-left:30px;
}
.modalwikibutto{
cursor:pointer;
text-align:center;
margin-right:45px;
float:right;
-moz-border-radius: 3px;
-webkit-border-radius: 3px;
margin-bottom:30px;
border-radius: 3px;
width:170px;
height:30px;
border: 1px solid #82b92e;
margin-top:8%;
background-color:#82b92e;
}
.modalwikibuttontex{
color:#ffffff;
font-size:10pt;
position:relative;
top:6px;
}
#opacity{
background:black;opacity:0.1;left:0px;top:0px;width:100%;height:100%;
background:black;
opacity:0.1;
left:0px;
top:0px;
width:100%;
height:100%;
position: fixed;
z-index: 1;
}
img.modalclose {
text-align: right;
float: right;
padding-right: 11px;
padding-top: 11px;
vertical-align: middle;
cursor:pointer;
}
</style>
</head>
<body>
<div id="alert_messages_na">
<div class='modalheade'>
<span class='modalheadertex'>
<?php echo __('Database error'); ?>
</span>
<img class='modalclose' src='<?php echo $config['homeurl']; ?>/images/icono_cerrar.png'>
</div>
<div class='modalconten'>
<img class='modalcontentim' src='<?php echo $config['homeurl']; ?>/images/mysqlerr.png'>
<div class='modalcontenttex'>
<?php <?php
echo '<script src="'.ui_get_full_url('include/javascript/jquery.current.js', false, false, false).'" type="text/javascript"></script>';
$message = '';
if ($config['history_db_connection'] === false) { if ($config['history_db_connection'] === false) {
echo __('Failure to connect to historical database, please check the configuration or contact system administrator if you need assistance.'); $message = __('Failure to connect to historical database, please check the configuration or contact system administrator if you need assistance.');
} else { } else {
echo __('Failure to connect to Database server, please check the configuration file config.php or contact system administrator if you need assistance.'); $message = __('Failure to connect to Database server, please check the configuration file config.php or contact system administrator if you need assistance.');
} }
?>
</div>
</div>
<?php
$custom_conf_enabled = false; $custom_conf_enabled = false;
foreach ($config as $key => $value) { foreach ($config as $key => $value) {
if (preg_match('/._alt/i', $key)) { if (preg_match('/._alt/i', $key)) {
@ -129,39 +17,61 @@ img.modalclose {
} }
} }
if (!$custom_conf_enabled || isset($config['custom_docs_url_alt'])) { if (empty($custom_conf_enabled) === true || isset($config['custom_docs_url_alt']) === true) {
if (isset($config['custom_docs_url_alt'])) { if (isset($config['custom_docs_url_alt']) === true) {
$docs_url = $config['custom_docs_url_alt']; $docs_url = $config['custom_docs_url_alt'];
} else { } else {
$docs_url = 'https://pandorafms.com/manual/en/documentation/02_installation/04_configuration'; $docs_url = 'https://pandorafms.com/manual/en/documentation/02_installation/04_configuration';
} }
echo '
<a href="'.ui_get_full_external_url($docs_url).'" target="_blank">
<div class="modalwikibutto">
<span class="modalwikibuttontex">'.__('Documentation').'
</span>
</div>
</a>
';
} }
echo '<div id="mysqlerr" title="'.__('Error').'">';
echo '<div class="content_alert">';
echo '<div class="icon_message_alert">';
echo html_print_image('images/mysqlerr.png', true, ['alt' => __('Mysql error'), 'border' => 0]);
echo '</div>';
echo '<div class="content_message_alert">';
echo '<div class="text_message_alert">';
echo '<h1>'.__('Database error').'</h1>';
echo '<p>'.$message.'</p>';
echo '<br>';
echo '</div>';
echo '<div class="button_message_alert">';
html_print_submit_button(
__('Documentation'),
'mysqlerr_button',
false,
['class' => 'mini float-right']
);
echo '</div>';
echo '</div>';
echo '</div>';
echo '</div>';
?> ?>
</a>
</div>
<div id="opacity"></div>
</body>
</html>
<script> <script>
$(function() {
$(".modalclose").click(function(){ $("#mysqlerr").dialog({
$('div#alert_messages_na').toggle(); resizable: true,
$('div#opacity').toggle(); draggable: true,
modal: true,
width: 700,
clickOutside: true,
overlay: {
opacity: 0.5,
background: "black"
}
});
}); });
$("#mysqlerr").hide();
$("#button-mysqlerr_button").click (function () {
window.open('<?php echo ui_get_full_external_url($docs_url); ?>', '_blank');
});
$(document).ready(function () {
$("#mysqlerr").show();
});
</script> </script>

BIN
pandora_console/images/icono_support.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 750 B

After

Width:  |  Height:  |  Size: 254 B

33
pandora_console/include/styles/login.css
View File

@ -242,9 +242,6 @@ div.login_pass {
cursor: pointer; cursor: pointer;
} }
#show-hide-pass img {
}
div.login_nick input:-webkit-autofill, div.login_nick input:-webkit-autofill,
div.login_nick input:-webkit-autofill:hover, div.login_nick input:-webkit-autofill:hover,
div.login_nick input:-webkit-autofill:focus, div.login_nick input:-webkit-autofill:focus,
@ -351,7 +348,7 @@ span.span1 {
} }
span.span2 { span.span2 {
font-size: 26px; font-size: 20px;
letter-spacing: -0.26px; letter-spacing: -0.26px;
font-weight: 350; font-weight: 350;
color: #c1ccdc; color: #c1ccdc;
@ -379,7 +376,7 @@ div.img_banner_login img {
} }
.reset_password a { .reset_password a {
color: #14524f; color: #ffffff;
font-size: 9pt; font-size: 9pt;
font-weight: bold; font-weight: bold;
} }
@ -393,7 +390,7 @@ div.img_banner_login img {
line-height: 49pt; line-height: 49pt;
} }
span.span2 { span.span2 {
font-size: 26px; font-size: 20px;
letter-spacing: -0.26px; letter-spacing: -0.26px;
font-weight: 350; font-weight: 350;
color: #c1ccdc; color: #c1ccdc;
@ -731,3 +728,27 @@ div.login_pass input:-webkit-autofill:focus,
div.login_pass input:-webkit-autofill:active { div.login_pass input:-webkit-autofill:active {
background-image: url("../../images/eye-closed-input.png"); background-image: url("../../images/eye-closed-input.png");
} }
button.submitButton {
display: flex;
justify-content: center;
flex-direction: row;
min-width: 110px;
height: 42px;
font-size: 14px;
font-family: "Pandora-Regular";
align-items: center;
line-height: 24px;
box-shadow: 0px 3px 6px #c7c7c7;
color: #fff;
border: 2px solid #14524f;
border-radius: 8px;
padding: 0 10px;
cursor: pointer;
z-index: 100;
font-weight: bold;
}
.content_alert {
margin: 0 !important;
}