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

2012-04-16 Juan Manuel Ramon <juanmanuel.ramon@artica.es> 

* include/styles/dialog.css
	 include/styles/pandora.css
	 operation/system_alert.php
	 include/functions_config.php
	 general/login_page.php: Modified style in UM license advises, also
	 modified style in system alerts dialog. 

	* include/functions_ui.php: Modified function ui_print_message to 
	allow force the style.
	
	* include/styles/pandora_legacy.css: New css style with Pandora old
	style "legacy". New style has 100% page width.

	* images/spinner.gif
	 images/spinner.png: Added new spinners with transparency.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@5982 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
juanmanuelr 2012-04-16 11:24:47 +00:00
parent 7968412133
commit f582477c0d
9 changed files with 1545 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
pandora_console/ChangeLog
View File

@ -1,3 +1,21 @@
2012-04-16 Juan Manuel Ramon <juanmanuel.ramon@artica.es>
* include/styles/dialog.css
include/styles/pandora.css
operation/system_alert.php
include/functions_config.php
general/login_page.php: Modified style in UM license advises, also
modified style in system alerts dialog.
* include/functions_ui.php: Modified function ui_print_message to
allow force the style.
* include/styles/pandora_legacy.css: New css style with Pandora old
style "legacy". New style has 100% page width.
* images/spinner.gif
images/spinner.png: Added new spinners with transparency.
2012-04-16 Juan Manuel Ramon <juanmanuel.ramon@artica.es>
* extensions/update_license_info.php: Added view to show UM license

BIN
pandora_console/images/spinner.gif
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 673 B

After

Width:  |  Height:  |  Size: 1.7 KiB

BIN
pandora_console/images/spinner.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 266 B

After

Width:  |  Height:  |  Size: 730 B

20
pandora_console/include/functions_config.php
View File

@ -633,14 +633,14 @@ function config_check (){
$config["alert_cnt"]++;
$_SESSION["alert_msg"] .= ui_print_error_message(
array('message' => __('Default password for "Admin" user has not been changed.').'</h3>'.'<p>'.__('Please change the default password because is a common vulnerability reported.'),
'no_close' => true), '', true);
'no_close' => true, 'force_style' => 'color: #000000 !important'), '', true);
}
if (!is_writable ("attachment")){
$config["alert_cnt"]++;
$_SESSION["alert_msg"] .= ui_print_error_message(
array('message' => __('Attachment directory is not writable by HTTP Server').'</h3>'.'<p>'.__('Please check that the web server has write rights on the {HOMEDIR}/attachment directory'),
'no_close' => true), '', true);
'no_close' => true, 'force_style' => 'color: #000000 !important'), '', true);
}
// Get remote file dir.
@ -651,7 +651,7 @@ function config_check (){
$config["alert_cnt"]++;
$_SESSION["alert_msg"] .= ui_print_error_message(
array('message' => __('Remote configuration directory is not writtable for the console').' - $remote_config',
'no_close' => true), '', true);
'no_close' => true, 'force_style' => 'color: #000000 !important'), '', true);
}
$remote_config_conf = $remote_config . "/conf";
@ -659,7 +659,7 @@ function config_check (){
$config["alert_cnt"]++;
$_SESSION["alert_msg"] .= ui_print_error_message(
array('message' => __('Remote configuration directory is not writtable for the console').' - $remote_config',
'no_close' => true), '', true);
'no_close' => true, 'force_style' => 'color: #000000 !important'), '', true);
}
$remote_config_col = $remote_config . "/collections";
@ -667,7 +667,7 @@ function config_check (){
$config["alert_cnt"]++;
$_SESSION["alert_msg"] .= ui_print_error_message(
array('message' => __('Remote configuration directory is not writtable for the console').' - $remote_config',
'no_close' => true), '', true);
'no_close' => true, 'force_style' => 'color: #000000 !important'), '', true);
}
}
@ -680,7 +680,7 @@ function config_check (){
$_SESSION["alert_msg"] .= ui_print_error_message(
array('title' => __('Too much files in your tempora/attachment directory'),
'message' => __("There are too much files in attachment directory. This is not fatal, but you should consider cleaning up your attachment directory manually"). " ( $filecount ". __("files") . " )",
'no_close' => true), '', true);
'no_close' => true, 'force_style' => 'color: #000000 !important'), '', true);
}
// Check database maintance
@ -698,7 +698,7 @@ function config_check (){
$_SESSION["alert_msg"] .= ui_print_error_message(
array('title' => __("Database maintance problem"),
'message' => __('Your database is not well maintained. Seems that it have more than 48hr without a proper maintance. Please review Pandora FMS documentation about how to execute this maintance process (pandora_db.pl) and enable it as soon as possible'),
'no_close' => true), '', true);
'no_close' => true, 'force_style' => 'color: #000000 !important'), '', true);
}
$fontpath = db_get_value_filter('value', 'tconfig', array('token' => 'fontpath'));
@ -707,7 +707,7 @@ function config_check (){
$_SESSION["alert_msg"] .= ui_print_error_message(
array('title' => __("Default font doesnt exist"),
'message' => __('Your defined font doesnt exist or is not defined. Please check font parameters in your config'),
'no_close' => true), '', true);
'no_close' => true, 'force_style' => 'color: #000000 !important'), '', true);
}
global $develop_bypass;
@ -717,7 +717,7 @@ function config_check (){
$_SESSION["alert_msg"] .= ui_print_error_message(
array('title' => __("Developer mode is enabled"),
'message' => __('Your Pandora FMS has the "develop_bypass" mode enabled. This is a developer mode and should be disabled in a production system. This value is written in the main index.php file'),
'no_close' => true), '', true);
'no_close' => true, 'force_style' => 'color: #000000 !important'), '', true);
}
//pandora_update_manager_login();
@ -727,7 +727,7 @@ function config_check (){
$_SESSION["alert_msg"] .= ui_print_info_message(
array('title' => __("New update of Pandora Console"),
'message' => __('There is a new update please go to menu operation and into extensions go to Update Manager for more details.'),
'no_close' => true), '', true);
'no_close' => true, 'force_style' => 'color: #000000 !important'), '', true);
}
}
}

7
pandora_console/include/functions_ui.php
View File

@ -135,7 +135,7 @@ function printSmallFont ($string, $return = true) {
/**
* Prints a generic message between tags.
*
* @param mixed The string message or array ('title', 'message', 'icon', 'no_close') to be displayed
* @param mixed The string message or array ('title', 'message', 'icon', 'no_close', 'force_style') to be displayed
* @param string the class to user
* @param string Any other attributes to be set for the tag.
* @param bool Whether to output the string or return it
@ -151,6 +151,7 @@ function ui_print_message ($message, $class = '', $attributes = '', $return = fa
$text_message = '';
$icon_image = '';
$no_close_bool = false;
$force_style = '';
if (is_array($message)) {
if (!empty($message['title']))
$text_title = $message['title'];
@ -160,6 +161,8 @@ function ui_print_message ($message, $class = '', $attributes = '', $return = fa
$icon_image = $message['icon'];
if (!empty($message['no_close']))
$no_close_bool = $message['no_close'];
if (!empty($message['force_style']))
$force_style = $message['force_style'];
}
else {
$text_message = $message;
@ -198,7 +201,7 @@ function ui_print_message ($message, $class = '', $attributes = '', $return = fa
$id = 'info_box_' . uniqid();
$output = '<table cellspacing="0" cellpadding="0" id="' . $id . '" ' . $attributes . '
class="info_box ' . $class . '" >
class="info_box ' . $class . '" style="' . $force_style . '">
<tr>
<td class="icon">' . html_print_image($icon_image, true) . '</td>
<td class="title"><b>' . $text_title . '</b></td>

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

@ -2,7 +2,7 @@
/* This file skins dialog */
.ui-dialog {
background: #D3D3D3 !important;
background: none repeat scroll 0 0 #D3D3D3 !important;
border: 1px solid #DDDDDD !important;
color: #333333 !important;
padding: 0.2em !important;
@ -17,6 +17,7 @@
box-shadow: 0px 5px 5px #010E1B !important;
}
.ui-dialog .ui-dialog-titlebar {
background: url(../../images/ui_title.png) repeat-x scroll !important;
#height: 15px !important;
@ -57,7 +58,7 @@
background: url(images/dialog-titlebar-close.png) no-repeat !important;
position: absolute !important;
top: 2px;
right: 17px !important;
right: 5px !important;
cursor: default !important;
}
@ -73,7 +74,6 @@
color: #000000 !important;
}
.ui-dialog .ui-dialog-titlebar-close:hover span {
display: none !important;
}
@ -100,7 +100,7 @@
#height: 80% !important;
#width: 98% !important;
margin: 0 auto !important;
background: #EEEEEE !important;
background: #FFFFFF !important;
position: relative !important;
}
@ -214,7 +214,7 @@
.ui-dialog .ui-button-dialog {
background: #F6F6F6;
border: 1px solid #CCCCCC;
color: #696969;
color: #696969 !important;
font-weight: bold;
outline: medium none;
cursor: pointer;

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

@ -32,7 +32,7 @@ body {
text-align: center;
background-color: #555555;
background-image: url(../../images/greyback.gif);
margin: 0 auto;
}
#login_body {
@ -163,6 +163,7 @@ div#login {
border-top: solid 1px #000;
border-bottom: solid 2px #000;
border-right: solid 2px #000;
font-size: 12px !important;
}
div#login_in, #login_f {
margin: 0 auto 0 140px;
@ -172,10 +173,12 @@ div#error_login {
#margin: 0 auto;
#margin-top: -10px;
text-align: center;
margin-top: 30px;
margin-top: 10px;
margin-left: 5px;
width: 73%;
float: left;
width: 70%;
float: right;
text-align: left;
top: 100px;
}
div#error_login_icon {
@ -220,10 +223,10 @@ div#container {
margin: 0 auto;
width: 960px;
text-align: left;
border-left: solid 2px #000;
border-right: solid 2px #000;
border-top: solid 2px #000;
margin-top: 5px;
#border-left: solid 2px #000;
#border-right: solid 2px #000;
#border-top: solid 2px #000;
#margin-top: 5px;
background: #fff;
}
div#page {
@ -1308,7 +1311,7 @@ div.warn {
/* Pandora width style theme */
div#container {
width: 95%;
width: 100%;
}
div#page {
width: auto;
@ -1482,6 +1485,9 @@ div.cellBig {
padding: 5px;
border: 1px solid #A8A8A8;
width: 85% !important;
-moz-box-shadow: 0px 2px 2px #010E1B !important;
-webkit-box-shadow: 0px 2px 2px #010E1B !important;
box-shadow: 0px 2px 2px #010E1B !important;
}
.info_box .title * {

1491
pandora_console/include/styles/pandora_legacy.css Normal file
View File

File diff suppressed because it is too large Load Diff

2
pandora_console/operation/system_alert.php
View File

@ -2,7 +2,7 @@
// TODO: Poner esto resizable y dragable: http://jqueryui.com/demos/dialog
echo "<div style='margin-top: 30px; width: 550px; margin-left: 50px'>";
echo "<div style='margin-top: 10px; width: 100%; height: 250px; overflow: auto; margin-left: 0px; text-align: left;'>";
echo $_SESSION["alert_msg"];
echo "</div>";