diff --git a/pandora_console/fonts/Lato-Hairline.ttf b/pandora_console/fonts/Lato-Hairline.ttf new file mode 100644 index 0000000000..288be29553 Binary files /dev/null and b/pandora_console/fonts/Lato-Hairline.ttf differ diff --git a/pandora_console/fonts/Lato-Light.ttf b/pandora_console/fonts/Lato-Light.ttf new file mode 100644 index 0000000000..a958067a86 Binary files /dev/null and b/pandora_console/fonts/Lato-Light.ttf differ diff --git a/pandora_console/fonts/Lato-Regular.ttf b/pandora_console/fonts/Lato-Regular.ttf new file mode 100644 index 0000000000..04ea8efb13 Binary files /dev/null and b/pandora_console/fonts/Lato-Regular.ttf differ diff --git a/pandora_console/general/login_page.php b/pandora_console/general/login_page.php index 6b026e97d5..0635147063 100755 --- a/pandora_console/general/login_page.php +++ b/pandora_console/general/login_page.php @@ -45,9 +45,9 @@ switch ($login_screen) { $logo_link = 'index.php'; $logo_title = __('Refresh'); break; + $splash_title = __('Splash login'); } - $url = '?login=1'; //These variables come from index.php if (!empty ($page) && !empty ($sec)) { @@ -58,36 +58,36 @@ if (!empty ($page) && !empty ($sec)) { $login_body_style = ''; // Overrides the default background with the defined by the user if (!empty($config['login_background'])) { - $background_url = ui_get_full_url("images/backgrounds/") . $config['login_background']; + $background_url = "../../images/backgrounds/" . $config['login_background']; $login_body_style = "style=\"background-image: url('$background_url');\""; } echo '
'; -echo '
'; -echo ' -
-
'; + echo ''; + echo '
'; + echo '
'; + echo '
'; + if(defined ('PANDORA_ENTERPRISE')){ + if($config['custom_title1_login']){ + echo strtoupper(io_safe_output($config['custom_title1_login'])); + } + else{ + echo __('WELCOME TO PANDORA FMS'); + } + } + else{ + echo __('WELCOME TO PANDORA FMS'); + } + echo '
'; + echo '
'; + if(defined ('PANDORA_ENTERPRISE')){ + if($config['custom_title2_login']){ + echo strtoupper(io_safe_output($config['custom_title2_login'])); + } + else{ + echo __('NEXT GENERATION'); + } + } + else{ + echo __('NEXT GENERATION'); + } + echo '
'; + echo '
'; + echo '
'; + if (defined ('PANDORA_ENTERPRISE')) { + if(isset($config['custom_splash_login'])){ + html_print_image ("enterprise/images/custom_splash_login/".$config['custom_splash_login'], false, array ( "alt" => "splash", "border" => 0, "title" => $splash_title), false, true); + } + else{ + html_print_image ("enterprise/images/custom_splash_login/splash_image_default.png", false, array ("alt" => "logo", "border" => 0, "title" => $splash_title), false, true); + } + } + else{ + html_print_image ("images/splash_image_default.png", false, array ("alt" => "logo", "border" => 0, "title" => $splash_title), false, true); + } + echo '
'; + echo '
'; +echo ''; + if (defined ('METACONSOLE')) { echo '
'; @@ -225,24 +262,40 @@ echo $pandora_version.(($develop_bypass == 1) ? ' '.__('Build').' '.$build_versi if (isset ($login_failed)) { - echo '
'; - - echo '
'; - - echo '
'; - echo '' . $config["auth_error"] . ''; + echo '
'; + echo '
'; + echo '
'; + echo html_print_image('images/icono_stop.png', true, array("alt" => __('Login failed'), "border" => 0)); echo '
'; - - echo '
'; - echo html_print_image('images/error_login.png', true, array("alt" => __('Login failed'), "border" => 0)); + echo '
'; + echo '
'; + echo '

' . __('ERROR') . '

'; + echo '

' . $config["auth_error"] . '

'; + echo '
'; + echo '
'; + html_print_submit_button("Ok", 'hide-login-error', false); + echo '
'; + echo '
'; + echo '
'; + echo '
'; +} + +if ($login_screen == 'logout'){ + echo '
'; + echo '
'; + echo '
'; + echo html_print_image('images/icono_logo_pandora.png', true, array("alt" => __('Logged out'), "border" => 0)); + echo '
'; + echo '
'; + echo '
'; + echo '

'. __('Logged out') .'

'; + echo '

' . __('Your session is over. Please close your browser window to close this Pandora session.') .'

'; + echo '
'; + echo '
'; + html_print_submit_button("Ok", 'hide-login-logout', false); + echo '
'; echo '
'; - - echo '
'; - html_print_submit_button("Ok", 'hide-login-error', false, 'class="ui-button-dialog ui-widget ui-state-default ui-corner-all ui-button-text-only sub ok" style="width:100px;"'); - echo '
'; - echo '
'; - echo '
'; } @@ -252,100 +305,6 @@ ui_require_jquery_file('jquery-ui-1.10.0.custom'); ?> - - 'forced_title_layer', 'class' => 'forced_title_layer', 'hidden' => true)); @@ -353,12 +312,13 @@ html_print_div(array('id' => 'modal_alert', 'hidden' => true)); ?>