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

2012-03-27 Juan Manuel Ramon <juanmanuel.ramon@artica.es> 

* images/bottom_logo_enterprise.png
	 images/bottom_logo.png
	 images/login_bottom.png
	 images/login_background.png
	 images/pandora_login.png
	 images/login_botton.png
	 images/ui_title.png
	 images/ui_dialog_background.png
	 images/pandora_login_enterprise.png
	 images/splash_logout.png: Added images for new login screen.
	 
	* images/splash_pandora.png
	 include/styles/images/dialog-titlebar-close.png
	 include/styles/images/dialog-titlebar-close-hover.png: Modified 
	 images for login screen.

	* include/styles/dialog.css
	 include/styles/pandora.css: Modified css files for login screen.
	 
	* general/login_page.php
	 general/logoff.php: Login and logout screens modified.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@5839 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
juanmanuelr 2012-03-27 17:00:55 +00:00
parent db95e776cf
commit 640f1dbd2d
8 changed files with 364 additions and 206 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
pandora_console/ChangeLog
View File

@ -1,3 +1,27 @@
2012-03-27 Juan Manuel Ramon <juanmanuel.ramon@artica.es>
* images/bottom_logo_enterprise.png
images/bottom_logo.png
images/login_bottom.png
images/login_background.png
images/pandora_login.png
images/login_botton.png
images/ui_title.png
images/ui_dialog_background.png
images/pandora_login_enterprise.png
images/splash_logout.png: Added images for new login screen.
* images/splash_pandora.png
include/styles/images/dialog-titlebar-close.png
include/styles/images/dialog-titlebar-close-hover.png: Modified
images for login screen.
* include/styles/dialog.css
include/styles/pandora.css: Modified css files for login screen.
* general/login_page.php
general/logoff.php: Login and logout screens modified.
2012-03-27 Sergio Martin <sergio.martin@artica.es> 2012-03-27 Sergio Martin <sergio.martin@artica.es>
* include/functions_reporting.php: Fixed duplicy agents in the * include/functions_reporting.php: Fixed duplicy agents in the

121
pandora_console/general/login_page.php
View File

@ -21,6 +21,7 @@ if (!empty ($page) && !empty ($sec)) {
$url .= '&amp;'.safe_url_extraclean($key).'='.safe_url_extraclean($value); $url .= '&amp;'.safe_url_extraclean($key).'='.safe_url_extraclean($value);
} }
} }
echo '<img src="images/login_background.png" id="login_body">';
echo '<div class="databox_login" id="login">'; echo '<div class="databox_login" id="login">';
@ -29,24 +30,7 @@ echo '<div class="databox_login" id="login">';
//echo '<br /><br /><br />'; //echo '<br /><br /><br />';
echo ' echo '
<div id="login_in"> <div id="login_in">
<form method="post" action="index.php'.$url.'"> <form method="post" action="index.php'.$url.'">';
<table cellpadding="4" cellspacing="1" width="420">';
if (isset ($login_failed)) {
// echo '<tr><td colspan="3">';
echo '<div id="error_login">';
echo '<h3 class="error">'.__('Login failed').': '.$config["auth_error"].'</h3>';
echo '</div>';
// echo '</td></tr>';
}
echo '<tr><td rowspan="3" align="left">';
if (!empty ($page) && !empty ($sec)) {
foreach ($_POST as $key => $value) {
html_print_input_hidden ($key, $value);
}
}
//TODO: Put branding in variables (external file) or database //TODO: Put branding in variables (external file) or database
/* CUSTOM BRANDING STARTS HERE */ /* CUSTOM BRANDING STARTS HERE */
@ -54,40 +38,78 @@ if (!empty ($page) && !empty ($sec)) {
// Replace the following with your own URL and logo. // Replace the following with your own URL and logo.
// A mashup of the Pandora FMS logo and your companies highly preferred // A mashup of the Pandora FMS logo and your companies highly preferred
echo '&nbsp;&nbsp;<a href="http://pandorafms.org" title="Go to pandorafms.org...">'; echo '&nbsp;&nbsp;<a href="http://pandorafms.org" title="Go to pandorafms.org...">';
html_print_image ("images/pandora_logo.png", false, array ("alt" => "logo", "border" => 0)); if (defined ('PANDORA_ENTERPRISE')){
echo '</a><br />'; html_print_image ("images/pandora_login_enterprise.png", false, array ("alt" => "logo", "border" => 0));
}
else {
html_print_image ("images/pandora_login.png", false, array ("alt" => "logo", "border" => 0));
}
echo '</a>';
// This prints the current pandora console version. // This prints the current pandora console version.
// For stable/live function it might be wise to comment it out // For stable/live function it might be wise to comment it out
echo '&nbsp;&nbsp;&nbsp;' . $pandora_version.(($develop_bypass == 1) ? ' '.__('Build').' '.$build_version : '');
/* CUSTOM BRANDING ENDS HERE */ /* CUSTOM BRANDING ENDS HERE */
echo '</td><td class="f9b">
'.__('Login').':<br />'.html_print_input_text_extended ("nick", '', "nick", '', '', '' , false, '', 'class="login"', true).' echo '<div style="text-align: center; height: 5px !important;">&nbsp;</div>';
</td></tr>
<tr><td class="f9b"> if (!empty ($page) && !empty ($sec)) {
<br> foreach ($_POST as $key => $value) {
'.__('Password').':<br />'.html_print_input_text_extended ("pass", '', "pass", '', '', '' ,false, '', 'class="login"', true, true).' html_print_input_hidden ($key, $value);
</td></tr> }
<tr><td align="center"> }
<br>
'.html_print_submit_button ("Login",'',false,'class="sub next"',true).' echo '<br />'.html_print_input_text_extended ("nick", '', "nick", '', '', '' , false, '', 'class="login"', true).
</td></tr> '<br>
</table> <br />'.html_print_input_text_extended ("pass", '', "pass", '', '', '' ,false, '', 'class="login"', true, true).
</form> '<br>';
echo '<div style="float: right; margin-top: -70px; margin-right: 25px">';
html_print_input_image ("Login", "images/login_botton.png", 'Login');
echo '</div>';
echo '</form>
</div> </div>
<div id="ip">'.__('Your IP').': <b class="f10">'.$config["remote_addr"].'</b></div>
</div>'; </div>';
echo '<div id="bottom_logo">';
if (defined('PANDORA_ENTERPRISE'))
echo html_print_image('images/bottom_logo_enterprise.png', true, array ("alt" => "logo", "border" => 0));
else
echo html_print_image('images/bottom_logo.png', true, array ("alt" => "logo", "border" => 0));
echo '</div>';
echo '<div id="ver_num">' . $pandora_version.(($develop_bypass == 1) ? ' '.__('Build').' '.$build_version : '') . '</div>';
if (isset ($login_failed)) {
echo '<div id="login_failed" title="Login Failed" style="">';
echo '<div style="position:absolute; top:20%; text-align: center; left:0%; right:0%; width:600px;">';
echo '<div id="error_login">';
echo '<h3 class="error">'.__('Login failed').': '.$config["auth_error"].'</h3>';
echo '</div>';
echo '<div style="position: absolute; top:60px; right:40%;">';
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" style="width:100px;"');
echo '</div>';
echo '</div>';
echo '</div>';
}
//html_debug_print('http://' . $_SERVER['SERVER_NAME'] . $config['homeurl'] . '/advise_navigator.php');
ui_require_css_file ('dialog'); ui_require_css_file ('dialog');
ui_require_jquery_file ('ui.core'); ui_require_jquery_file ('ui.core');
ui_require_jquery_file ('ui.dialog'); ui_require_jquery_file ('ui.dialog');
ui_require_jquery_file ('ui.draggable');
?> ?>
<?php
if (!isset ($login_failed)) {
?>
<!--[if IE]> <!--[if IE]>
<div id="dialog" title="Pandora FMS Web browser advise" style="-ms-filter: 'progid:DXImageTransform.Microsoft.Alpha(Opacity=50)'; filter: alpha(opacity=50); background:url(images/advise_navigator_background.png) no-repeat center bottom"> <div id="dialog" title="Pandora FMS Web browser advise" style="-ms-filter: 'progid:DXImageTransform.Microsoft.Alpha(Opacity=50)'; filter: alpha(opacity=50); background:url(images/advise_navigator_background.png) no-repeat center bottom">
@ -110,6 +132,9 @@ ui_require_jquery_file ('ui.dialog');
</div> </div>
</div> </div>
<![endif]--> <![endif]-->
<?php
}
?>
<script type="text/javascript" language="javascript"> <script type="text/javascript" language="javascript">
@ -120,6 +145,7 @@ $(document).ready (function () {
$( "#dialog" ).dialog({ $( "#dialog" ).dialog({
resizable: true, resizable: true,
draggable: true, draggable: true,
modal: true,
height: 300, height: 300,
width: 600, width: 600,
overlay: { overlay: {
@ -133,8 +159,29 @@ $(document).ready (function () {
$("#submit-hide-advise").click (function () { $("#submit-hide-advise").click (function () {
$("#dialog" ).dialog('close') $("#dialog" ).dialog('close')
}); });
$(function() {
$( "#login_failed" ).dialog({
resizable: true,
draggable: true,
modal: true,
height: 180,
width: 600,
overlay: {
opacity: 0.5,
background: "black"
},
bgiframe: jQuery.browser.msie
});
});
$("#submit-hide-login-error").click (function () {
$("#login_failed" ).dialog('close')
});
}); });
document.getElementById('nick').focus(); document.getElementById('nick').focus();
/* ]]> */ /* ]]> */
</script> </script>

17
pandora_console/general/logoff.php
View File

@ -15,7 +15,8 @@
// GNU General Public License for more details. // GNU General Public License for more details.
?> ?>
<div class="databox_login" id="login"> <img src="images/login_background.png" id="login_body">
<div class="databox_logout" id="login">
<br> <br>
<h1 id="log"><?php echo __('Logged out'); ?></h1> <h1 id="log"><?php echo __('Logged out'); ?></h1>
<br> <br>
@ -24,8 +25,15 @@
<tr><td align="left"> <tr><td align="left">
<?php <?php
echo '<a href="index.php">'; echo '<a href="index.php">';
html_print_image ("images/pandora_logo.png", false, array ("alt" => "logo", "border" => 0)); if (defined ('PANDORA_ENTERPRISE')){
echo '</a> '.$pandora_version; html_print_image ("images/pandora_login_enterprise.png", false, array ("alt" => "logo", "border" => 0));
}
else {
html_print_image ("images/pandora_login.png", false, array ("alt" => "logo", "border" => 0));
}
//html_print_image ("images/pandora_login.png", false, array ("alt" => "logo", "border" => 0));
//echo '</a> '.$pandora_version;
?> ?>
</td><td valign="bottom"> </td><td valign="bottom">
<?php echo __('Your session is over. Please close your browser window to close this Pandora session.').'<br /><br />'; ?> <?php echo __('Your session is over. Please close your browser window to close this Pandora session.').'<br /><br />'; ?>
@ -33,5 +41,6 @@
</table> </table>
</div> </div>
<br> <br>
<div id="ip"><?php echo 'IP: <b class="f10">'.$_SERVER['REMOTE_ADDR'].'</b>'; ?></div>
</div> </div>
<div id="ver_num"><?php echo $pandora_version.(($develop_bypass == 1) ? ' '.__('Build').' '.$build_version : '') ?></div>

BIN
pandora_console/images/splash_pandora.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 60 KiB

After

Width:  |  Height:  |  Size: 22 KiB

263
pandora_console/include/styles/dialog.css
View File

@ -1,73 +1,79 @@
/* This file skins dialog */ /* This file skins dialog */
.ui-dialog { .ui-dialog {
background-color: #ffffff; background: #EEEEEE !important;
border: 1px solid #DDDDDD !important;
color: #333333 !important;
padding: 0.2em !important;
overflow: hidden !important;
-moz-border-radius: 10px; -moz-border-radius: 4px !important;
-webkit-border-radius: 10px; -webkit-border-radius: 4px !important;
border-radius: 10px; border-radius: 4px !important;
-moz-box-shadow: 0px 7px 7px #010E1B; -moz-box-shadow: 0px 5px 5px #010E1B !important;
-webkit-box-shadow: 0px 7px 7px #010E1B; -webkit-box-shadow: 0px 5px 5px #010E1B !important;
box-shadow: 0px 7px 7px #010E1B; box-shadow: 0px 5px 5px #010E1B !important;
} }
.ui-dialog .ui-dialog-titlebar { .ui-dialog .ui-dialog-titlebar {
background: #9BC969 url(images/dialog-title.gif) repeat-x; background: url(../../images/ui_title.png) repeat-x scroll !important;
height: 28px; height: 28px !important;
_height: 29px; _height: 29px !important;
width: 97%; margin: 2px auto 0 auto !important;
margin: 7px auto 0 auto; font-weight: bold !important;
border: 1px solid #3d6630 !important;
color: #FFFFFF !important;
-moz-border-radius: 14px; -moz-border-radius: 4px;
-webkit-border-radius: 14px; -webkit-border-radius: 4px;
border-radius: 14px; border-radius: 4px;
}
.ui-dialog.ui-draggable .ui-dialog-titlebar {
cursor: move;
}
.ui-dialog .ui-dialog-titlebar-close {
width: 16px;
height: 16px;
background: url(images/dialog-titlebar-close.png) no-repeat;
position:absolute;
top: 6px;
/*top: 10px;*/
right: 17px;
cursor: default;
}
.ui-dialog .ui-dialog-titlebar-close span {
display: none;
}
.ui-dialog .ui-dialog-titlebar-close-hover {
background: url(images/dialog-titlebar-close-hover.png) no-repeat;
}
.ui-dialog .ui-dialog-titlebar-close-hover {
color: #000000;
} }
.ui-dialog .ui-dialog-title { .ui-dialog .ui-dialog-title {
margin-left: 5px; margin-left: 5px !important;
color: white; color: white !important;
font-weight: bold; font-weight: bold !important;
position: relative; position: relative !important;
top: 7px; top: 7px !important;
left: 4px; left: 4px !important;
}
.ui-dialog.ui-draggable .ui-dialog-titlebar {
cursor: move !important;
}
.ui-dialog .ui-dialog-titlebar-close {
width: 16px !important;
height: 16px !important;
background: url(images/dialog-titlebar-close.png) no-repeat !important;
position: absolute !important;
top: 6px;
right: 17px !important;
cursor: default !important;
}
.ui-dialog .ui-dialog-titlebar-close span {
display: none !important;
}
.ui-dialog .ui-dialog-titlebar-close-hover {
background: url(images/dialog-titlebar-close-hover.png) no-repeat !important;
}
.ui-dialog .ui-dialog-titlebar-close-hover {
color: #000000 !important;
} }
.ui-dialog .ui-dialog-content { .ui-dialog .ui-dialog-content {
margin: 1.2em; margin: 1.2em !important;
padding: 0.5em 1em !important;
overflow: auto !important;
} }
.ui-dialog-content { .ui-dialog-content {
overflow: auto; overflow: auto !important;
} }
.ui-dialog .ui-dialog-buttonpane { .ui-dialog .ui-dialog-buttonpane {
@ -93,74 +99,99 @@
} }
/* Dialog handle styles */ /* Dialog handle styles */
.ui-dialog .ui-resizable-n { #.ui-dialog .ui-resizable-n {
cursor: n-resize; # cursor: n-resize;
height: 6px; # height: 6px;
width: 100%; # width: 100%;
top: 0px; # top: 0px;
left: 0px; # left: 0px;
background: transparent url(images/dialog-n.gif) repeat scroll center top; # background: transparent url(images/dialog-n.gif) repeat scroll center top;
#}
#.ui-dialog .ui-resizable-s {
# cursor: s-resize;
# height: 8px;
# width: 100%;
# bottom: 0px;
# left: 0px;
# background: transparent url(images/dialog-s.gif) repeat scroll center top;
#}
#.ui-dialog .ui-resizable-e {
# cursor: e-resize;
# width: 7px;
# right: 0px;
# top: 0px;
# height: 100%;
# background: transparent url(images/dialog-e.gif) repeat scroll right center;
#}
#.ui-dialog .ui-resizable-w {
# cursor: w-resize;
# width: 7px;
# left: 0px;
# top: 0px;
# height: 100%;
# background: transparent url(images/dialog-w.gif) repeat scroll right center;
#}
#.ui-dialog .ui-resizable-se {
# cursor: se-resize;
# width: 9px;
# height: 9px;
# right: 0px;
# bottom: 0px;
# background: transparent url(images/dialog-se.gif);
#}
#.ui-dialog .ui-resizable-sw {
# cursor: sw-resize;
# width: 9px;
# height: 9px;
# left: 0px;
# bottom: 0px;
# background: transparent url(images/dialog-sw.gif);
#}
#.ui-dialog .ui-resizable-nw {
# cursor: nw-resize;
# width: 9px;
# height: 29px;
# left: 0px;
# top: 0px;
# background: transparent url(images/dialog-nw.gif);
#}
#.ui-dialog .ui-resizable-ne {
# cursor: ne-resize;
# width: 9px;
# height: 29px;
# right: 0px;
# top: 0px;
# background: transparent url(images/dialog-ne.gif);
#}
.ui-dialog .ui-button-dialog {
cursor: pointer;
margin: 0.5em 0.4em 0.5em 0;
} }
.ui-dialog .ui-resizable-s { .ui-dialog .ui-button-dialog {
cursor: s-resize; background: #F6F6F6;
height: 8px; border: 1px solid #CCCCCC;
width: 100%; color: #1C94C4;
bottom: 0px; font-weight: bold;
left: 0px; outline: medium none;
background: transparent url(images/dialog-s.gif) repeat scroll center top; cursor: pointer;
margin: 0.5em 0.4em 0.5em 0;
border-radius: 4px 4px 4px 4px;
} }
.ui-dialog .ui-resizable-e { .ui-dialog .ui-button-dialog:hover {
cursor: e-resize; background: #FDF5CE;
width: 7px; border: 1px solid #FBCB09;
right: 0px; color: #C77405;
top: 0px; font-weight: bold;
height: 100%; outline: medium none;
background: transparent url(images/dialog-e.gif) repeat scroll right center;
} }
.ui-dialog .ui-resizable-w {
cursor: w-resize;
width: 7px;
left: 0px;
top: 0px;
height: 100%;
background: transparent url(images/dialog-w.gif) repeat scroll right center;
}
.ui-dialog .ui-resizable-se {
cursor: se-resize;
width: 9px;
height: 9px;
right: 0px;
bottom: 0px;
background: transparent url(images/dialog-se.gif);
}
.ui-dialog .ui-resizable-sw {
cursor: sw-resize;
width: 9px;
height: 9px;
left: 0px;
bottom: 0px;
background: transparent url(images/dialog-sw.gif);
}
.ui-dialog .ui-resizable-nw {
cursor: nw-resize;
width: 9px;
height: 29px;
left: 0px;
top: 0px;
background: transparent url(images/dialog-nw.gif);
}
.ui-dialog .ui-resizable-ne {
cursor: ne-resize;
width: 9px;
height: 29px;
right: 0px;
top: 0px;
background: transparent url(images/dialog-ne.gif);
}

BIN
pandora_console/include/styles/images/dialog-titlebar-close-hover.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.8 KiB

After

Width:  |  Height:  |  Size: 2.8 KiB

BIN
pandora_console/include/styles/images/dialog-titlebar-close.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.8 KiB

After

Width:  |  Height:  |  Size: 2.8 KiB

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

@ -35,6 +35,29 @@ body {
} }
#login_body {
/* Set rules to fill background */
min-height: 100%;
min-width: 1024px;
/* Set up proportionate scaling */
width: 100%;
height: auto;
/* Set up positioning */
position: fixed;
top: 0;
left: 0;
z-index: -999;
}
@media screen and (max-width: 1024px) { /* Specific to this particular image */
#login_body {
left: 50%;
margin-left: -512px; /* 50% */
}
}
body.pure { body.pure {
background-color: #fff; background-color: #fff;
} }
@ -133,23 +156,23 @@ h1#log_f {
} }
div#login { div#login {
margin: 0 auto; margin: 0 auto;
margin-top: 200px; #margin-top: 200px;
width: 460px; padding-top: 63px;
width: 657px;
border-left: solid 1px #000; border-left: solid 1px #000;
border-top: solid 1px #000; border-top: solid 1px #000;
border-bottom: solid 2px #000; border-bottom: solid 2px #000;
border-right: solid 2px #000; border-right: solid 2px #000;
} }
div#login_in, #login_f { div#login_in, #login_f {
padding-top: 40px; margin: 0 auto 0 140px;
/*padding-top: 20px;*/
margin: 0 auto;
width: 400px; width: 400px;
} }
div#error_login { div#error_login {
margin-top:-35px; margin: 0 auto;
/*margin-top:0px;*/ margin-top: -10px;
/*margin-left:120px;*/ text-align: center;
margin-left: 20px;
} }
div#login_f { div#login_f {
margin-top: 10px; margin-top: 10px;
@ -214,8 +237,6 @@ div#main_help {
width: 100%; width: 100%;
padding-left: 0px; padding-left: 0px;
padding-top: 0px; padding-top: 0px;
/* padding-bottom: 20px;
margin-bottom: 25px; */
background-color: #fefefe; background-color: #fefefe;
background-image: url(../../images/backgrounds/background4.jpg); background-image: url(../../images/backgrounds/background4.jpg);
margin-top: 0px; margin-top: 0px;
@ -248,11 +269,23 @@ div#foot {
#ver { #ver {
margin-bottom: 25px; margin-bottom: 25px;
} }
#ip {
margin-top: 20px; #bottom_logo {
/*margin-top: 3px;*/ bottom: 0;
margin-bottom: 5px; height: 70px;
margin-left: 280px; margin: 0 auto 0 44%;
overflow: hidden;
position: fixed;
}
#ver_num {
bottom: 0;
height: 20px;
right: 0;
padding-right: 20px;
overflow: hidden;
position: fixed;
color: #696969
} }
label { label {
display: block; display: block;
@ -274,11 +307,20 @@ input.datos_readonly {
background-color: #050505; background-color: #050505;
} }
input.login { input.login {
border-color: #aaa; border: 0px none;
background-color: #f5f5f5; background-color: #ebebeb;
margin: 2px 0 8px; margin: 0px 0 8px 20px;
width: 90px; width: 135px;
height: 18px;
} }
/* FF hack for login inputs */
@-moz-document url-prefix() {
input.login{
margin: -2px 0 8px 20px !important;
}
}
input.sub { input.sub {
font-weight: bold; font-weight: bold;
border-bottom-color: #708090; border-bottom-color: #708090;
@ -788,15 +830,20 @@ span.rmess, span.nrmess {
} }
/* Style for login form */ /* Style for login form */
.databox_login { .databox_login {
margin-top: 100px !important; #margin-top: 100px !important;
width: 550px !important; width: 657x !important;
height: 290px; height: 400px;
margin-bottom: 5px;
margin-top: 5px;
margin-left: 0px;
border: none !important; border: none !important;
background-color: #fafafa; background-color: #fafafa;
background: url(../../images/splash_pandora.png); background: url(../../images/splash_pandora.png) no-repeat;
}
/* Style for login form */
.databox_logout {
width: 657x !important;
height: 400px;
border: none !important;
background-color: #fafafa;
background: url(../../images/splash_logout.png) no-repeat;
} }
.databox_color { .databox_color {
background-color: #fafafa; background-color: #fafafa;