Merge branch 'ent-9662-Restyling-fuentes-colores-botones' of brutus.artica.es:artica/pandorafms into ent-9662-Restyling-fuentes-colores-botones

pandora_console/general/login_page.php

@@ -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>';
     } 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">'.__('Support').'</li>';
+        echo '<li id="li_margin_support"><a href="https://support.pandorafms.com" target="_blank">'.__('Support').'</a></li>';
     }
 } 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"><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>';
@@ -333,7 +333,7 @@ switch ($login_screen) {
 
         echo '<div class="login_nick">';
         echo '<div>';
-            html_print_image('/images/icono_autenticacion.png', false);
+
         echo '</div>';
         html_print_input_text_extended('auth_code', '', 'auth_code', '', '', '', false, '', 'class="login login_password" placeholder="'.__('Authentication code').'"', false, true);
         echo '</div>';
@@ -369,17 +369,18 @@ if ($config['enterprise_installed']) {
             echo '<a href="javascript:centralized_mode_reset_dialog();">'.__('Forgot your password?');
             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="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 class="content_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 '</div>';
+                        echo '<br>';
                         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>';
@@ -491,25 +492,28 @@ if (empty($process_error_message) && isset($mail)) {
                     echo '<h1>'.__('INFO').'</h1>';
                     echo '<p>'.__('An email has been sent to your email address').'</p>';
                 echo '</div>';
+                echo '<br>';
                 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>';
 } 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="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 class="content_message_alert">';
                 echo '<div class="text_message_alert">';
                     echo '<h1>'.__('ERROR').'</h1>';
                     echo '<p>'.$process_error_message.'</p>';
+                    echo '<br>';
                 echo '</div>';
+                echo '<br>';
                 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>';
@@ -528,8 +532,9 @@ if (isset($correct_reset_pass_process)) {
                     echo '<h1>'.__('SUCCESS').'</h1>';
                     echo '<p>'.$correct_reset_pass_process.'</p>';
                 echo '</div>';
+                echo '<br>';
                 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>';
@@ -556,8 +561,9 @@ if (isset($login_failed)) {
         echo '</div>';
     }
 
+    echo '<br>';
                 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>';
@@ -580,8 +586,9 @@ if ($login_screen == 'logout') {
     }
 
                 echo '</div>';
+                echo '<br>';
                 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>';
@@ -599,8 +606,9 @@ if ($login_screen === 'disabled_access_node') {
                     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 '</div>';
+                echo '<br>';
                 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>';
@@ -707,8 +715,9 @@ if ($login_screen == 'error_authconfig' || $login_screen == 'error_emptyconfig'
                     echo '<h1>'.$title.'</h1>';
                     echo '<p> '.$message.'</h1>';
                 echo '</div>';
+                echo '<br>';
                 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>';
@@ -778,19 +787,23 @@ html_print_div(['id' => 'forced_title_layer', 'class' => 'forced_title_layer', '
                         resizable: true,
                         draggable: true,
                         modal: true,
-                        height: 220,
                         width: 528,
                         clickOutside: true,
                         overlay: {
                             opacity: 0.5,
                             background: "black"
+                        },
+                        open: function (event, ui) {
+                            $(".ui-widget-overlay").click(function () {
+                                $('#login_logout').dialog('close');
+                            });
                         }
                     });
                 });
 
                 $("#button-hide-login-logout").click (function () {
-                    document.location = "<?php echo ui_get_full_url('index.php'); ?>";
+                    $( "#login_logout" ).dialog( "close" );
-                });        
+                });
             });
         break;
 
@@ -801,7 +814,6 @@ html_print_div(['id' => 'forced_title_layer', 'class' => 'forced_title_layer', '
                         resizable: true,
                         draggable: true,
                         modal: true,
-                        height: 220,
                         width: 528,
                         clickOutside: true,
                         overlay: {
@@ -825,7 +837,6 @@ html_print_div(['id' => 'forced_title_layer', 'class' => 'forced_title_layer', '
                         resizable: true,
                         draggable: true,
                         modal: true,
-                        height: 400,
                         width: 700,
                         overlay: {
                             opacity: 0.5,
@@ -843,7 +854,6 @@ html_print_div(['id' => 'forced_title_layer', 'class' => 'forced_title_layer', '
                         resizable: true,
                         draggable: true,
                         modal: true,
-                        height: 220,
                         width: 528,
                         overlay: {
                             opacity: 0.5,
@@ -868,7 +878,6 @@ html_print_div(['id' => 'forced_title_layer', 'class' => 'forced_title_layer', '
                 resizable: true,
                 draggable: true,
                 modal: true,
-                height: 220,
                 width: 528,
                 clickOutside: true,
                 overlay: {
@@ -889,7 +898,6 @@ html_print_div(['id' => 'forced_title_layer', 'class' => 'forced_title_layer', '
                 resizable: true,
                 draggable: true,
                 modal: true,
-                height: 220,
                 width: 528,
                 clickOutside: true,
                 overlay: {
@@ -909,7 +917,6 @@ html_print_div(['id' => 'forced_title_layer', 'class' => 'forced_title_layer', '
             resizable: true,
             draggable: true,
             modal: true,
-            height: 220,
             width: 528,
             overlay: {
                 opacity: 0.5,

pandora_console/general/mysqlerr.php

@@ -1,167 +1,77 @@
-<html>
+<?php
-<head>
+echo '<script src="'.ui_get_full_url('include/javascript/jquery.current.js', false, false, false).'" type="text/javascript"></script>';
-    
-<style>
 
-#alert_messages_na{
+$message = '';
-    -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;
 
+if ($config['history_db_connection'] === false) {
+    $message = __('Failure to connect to historical database, please check the configuration or contact system administrator if you need assistance.');
+} else {
+    $message = __('Failure to connect to Database server, please check the configuration file config.php or contact system administrator if you need assistance.');
 }
 
-.modalheade{
+$custom_conf_enabled = false;
-    text-align:center;
+foreach ($config as $key => $value) {
-    width:100%;
+    if (preg_match('/._alt/i', $key)) {
-    height:37px;
+        $custom_conf_enabled = true;
-    left:0px;
+        break;
-    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
-            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.');
-            } else {
-                echo __('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;
-    foreach ($config as $key => $value) {
-        if (preg_match('/._alt/i', $key)) {
-            $custom_conf_enabled = true;
-            break;
-        }
     }
+}
 
-    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>
-
+$(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>

pandora_console/include/class/OrderInterpreter.class.php

@@ -294,7 +294,7 @@ class OrderInterpreter extends Wizard
             [
                 'name' => __('Task List'),
                 'icon' => ui_get_full_url(
-                    'images/menu/discovery.menu.png'
+                    'images/menu/discovery.svg'
                 ),
                 'url'  => ui_get_full_url(
                     'index.php?sec=discovery&sec2=godmode/servers/discovery&wiz=tasklist'
@@ -338,7 +338,7 @@ class OrderInterpreter extends Wizard
             [
                 'name' => __('Warp Update'),
                 'icon' => ui_get_full_url(
-                    'images/menu/um_messages.svg'
+                    'images/menu/warp_update.svg'
                 ),
                 'url'  => ui_get_full_url(
                     'index.php?sec=messages&sec2=godmode/update_manager/update_manager&tab=setup'

pandora_console/include/styles/login.css

@@ -241,9 +241,6 @@ div.login_pass {
   cursor: pointer;
 }
 
-#show-hide-pass img {
-}
-
 div.login_nick input:-webkit-autofill,
 div.login_nick input:-webkit-autofill:hover,
 div.login_nick input:-webkit-autofill:focus,
@@ -350,7 +347,7 @@ span.span1 {
 }
 
 span.span2 {
-  font-size: 26px;
+  font-size: 20px;
   letter-spacing: -0.26px;
   font-weight: 350;
   color: #c1ccdc;
@@ -378,7 +375,7 @@ div.img_banner_login img {
 }
 
 .reset_password a {
-  color: #14524f;
+  color: #ffffff;
   font-size: 9pt;
   font-weight: bold;
 }
@@ -392,7 +389,7 @@ div.img_banner_login img {
     line-height: 49pt;
   }
   span.span2 {
-    font-size: 26px;
+    font-size: 20px;
     letter-spacing: -0.26px;
     font-weight: 350;
     color: #c1ccdc;
@@ -730,3 +727,27 @@ div.login_pass input:-webkit-autofill:focus,
 div.login_pass input:-webkit-autofill:active {
   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;
+}