tyler.durden
/
pandorafms
mirror of https://github.com/pandorafms/pandorafms.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fixed errors in helps pandora and visual styles

This commit is contained in:
daniel 2017-03-21 11:44:46 +01:00
parent b64afb7d6f
commit 8365afbe76
4 changed files with 73 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
pandora_console/general/login_page.php
View File

@ -61,7 +61,7 @@ if (!empty($config['login_background'])) {
$background_url = "../../images/backgrounds/" . $config['login_background'];
$login_body_style = "style=\"background-image: url('$background_url');\"";
}
echo '<div id="login_body" ' . $login_body_style . '></div>';
echo '<div id="login_body" ' . $login_body_style . '>';
echo '<div id="header_login">';
echo '<div id="icon_custom_pandora">';
if (defined ('PANDORA_ENTERPRISE')) {
@ -107,7 +107,7 @@ echo '<div class="login_page">';
}
else {
if (!isset ($config["custom_logo_login"]) || $config["custom_logo_login"] == 0){
html_print_image ("images/custom_logo_login/login_logo.png", false, array ("class" => "login_logo", "alt" => "logo", "border" => 0, "title" => $logo_title), false, true);
html_print_image ("images/custom_logo_login/pandora_logo.png", false, array ("class" => "login_logo", "alt" => "logo", "border" => 0, "title" => $logo_title), false, true);
}
else{
html_print_image ("images/custom_logo_login/".$config['custom_logo_login'], false, array ("class" => "login_logo", "alt" => "logo", "border" => 0, "title" => $logo_title), false, true);
@ -249,17 +249,8 @@ echo '<div class="login_page">';
echo '</div>';
echo '</div>';
echo '</div>';
if (defined ('METACONSOLE')) {
echo '<div id="ver_num">';
}
else {
echo '<div id="ver_num">';
}
echo $pandora_version.(($develop_bypass == 1) ? ' '.__('Build').' '.$build_version : '') . '</div>';
echo '<div id="ver_num">'.$pandora_version.(($develop_bypass == 1) ? ' '.__('Build').' '.$build_version : '') . '</div>';
echo '</div>';
if (isset ($login_failed)) {
echo '<div id="login_failed" title="' . __('Login failed') . '">';

58
pandora_console/general/pandora_help.php
View File

@ -19,7 +19,7 @@ require_once ("../include/config.php");
require_once ("../include/functions.php");
require_once ("../include/functions_html.php");
?>
<html style="height:100%; margin-top: 25px; margin-left: 15px; margin-right: 15px;"><head><title>
<html style="height:100%; margin-top: 25px; margin-left: 15px; margin-right: 15px; background-color: #333;"><head><title>
<?php
echo __('Pandora FMS help system');
?>
@ -27,7 +27,7 @@ require_once ("../include/functions_html.php");
<meta http-equiv="content-type" content="text/html; charset=utf-8">
</head>
<?php echo '<link rel="stylesheet" href="../include/styles/'.$config['style'].'.css" type="text/css">'; ?>
<body style="background-color: #555555; height: 100%; ">
<body style="height: 100%; ">
<?php
$id = get_parameter ('id');
@ -62,17 +62,25 @@ foreach ($files as $file) {
if (! $id || ! file_exists ($help_file)) {
echo '<div id="main_help">';
echo '<span style="float:left; margin: 20px 20px 0px 20px; padding: 0px">';
echo html_print_image('images/pandora_tinylogo.png', true, array("border" => '0'));
echo "</span>";
echo '<p style="text-align: right"><strong style="float: right; padding-top: 12px; padding-right: 8px;">'. html_print_image('images/interrogant.png', true, array('title' => __('Pandora FMS help system'))) . '</strong></p>';
echo '<div style="clear:both;"></div>';
if (is_metaconsole()) {
}
else{
echo html_print_image('images/pandora_tinylogo.png', true, array("border" => '0'));
}
echo '</div>';
echo '<div style="font-family: verdana, arial; font-size: 11px; text-align:left">';
echo '<div style="font-size: 12px; margin-left: 20px; margin-right:20px; " class="databox">';
echo '<h1>';
echo __('Help system error');
echo "</h1><HR><br>";
echo "<div style='text-align: center;'>";
if (is_metaconsole()) {
echo '<img src="'.$config["homeurl"].'images/pandora_logo.png">';
}
else{
echo html_print_image("images/pandora_logo.png", false, array("border" => '0')) . '<br>';
}
echo html_print_image("images/pandora_logo.png", array("border" => '0')) . '<br>';
echo "</div>";
echo '<div class="msg">'.__('Pandora FMS help system has been called with a help reference that currently don\'t exist. There is no help content to show.').'</div></div></div>';
@ -83,31 +91,33 @@ if (! $id || ! file_exists ($help_file)) {
}
/* Show help */
echo '<div id="main_help">';
echo '<span style="float:left; margin: 20px 20px 0px 20px; padding: 0px">';
if (empty($config['enterprise_installed'])) {
echo html_print_image('images/pandora_tinylogo_open.png', true, array("border" => '0'));
}
else {
echo html_print_image('images/pandora_tinylogo.png', true, array("border" => '0'));
}
echo "</span>";
echo '<p style="text-align: right"><strong style="float: right; padding-top: 12px; padding-right: 8px;">'. html_print_image('images/interrogant.png', true, array('title' => __('Pandora FMS help system'))) . '</strong></p>';
echo '<div style="clear:both;"></div>';
echo '<div style="font-family: verdana, arial; font-size: 11px; text-align:left">';
echo '<div style="font-size: 12px; margin-left: 20px; margin-right:20px;" class="databox">';
echo '<div id="main_help_new">';
if (empty($config['enterprise_installed'])) {
echo html_print_image('images/pandora_tinylogo_open.png', true, array("border" => '0'));
}
else {
if (is_metaconsole()) {
echo '<img src="'.$config["homeurl"].'images/pandora_tinylogo.png">';
}
else{
echo html_print_image('images/pandora_tinylogo.png', true, array("border" => '0'));
}
}
echo '</div>';
echo '<div id="main_help_new_content">';
ob_start();
require_once ($help_file);
$help = ob_get_contents();
ob_end_clean();
// Add a line after H1 tags
$help = str_replace('</H1>', '</H1><HR>', $help);
$help = str_replace('</h1>', '</h1><hr>', $help);
$help = str_replace('</H1>', '</H1>', $help);
$help = str_replace('</h1>', '</h1>', $help);
echo $help;
echo '<br /><br /></div>';
echo '<div style="text-align: center; padding: 15px; font-family: verdana, arial; font-size: 11px;">';
echo '</div>';
echo '<div id="footer_help">';
include ('footer.php');
echo '</div>';
?>
</body>
</html>

BIN
pandora_console/images/pandora_tinylogo_open.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 4.4 KiB

After

Width:  |  Height:  |  Size: 4.2 KiB

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

@ -248,13 +248,6 @@ div#main {
}
div#main_help {
width: 100%;
padding-left: 0px;
padding-top: 0px;
background-color: #ffffff;
margin-top: 0px;
margin-left: 0px;
margin-right: 0px;
border-radius: 10px;
}
div#main_help div.databox, .license_databox {
background: F3F3F3;
@ -3993,7 +3986,7 @@ span.span1{
span.span2{
font-size: 3vw;
font-family: 'lato-boldest';
font-family: 'lato-bolder';
color: white;
}
@ -4119,3 +4112,37 @@ div.button_message_alert_form input{
background-color: #82b92e !important;
}
/*
styles help pandora
*/
div#main_help_new {
text-align: center;
padding: 20px;
border-bottom: 1px solid #c2c2c2;
}
div#main_help_new_content {
padding-left: 30px;
padding-right: 30px;
padding-bottom: 20px;
padding-top: 10px;
background: white;
height: 100%;
}
div#main_help_new_content h1 {
font-family: 'lato-boldest';
font-size: 14pt;
}
div#main_help_new_content p {
font-family: 'lato-bolder';
font-size: 12pt;
}
div#footer_help{
background: #333;
text-align: center;
padding: 10px;
}