tyler.durden/pandorafms
1
0
Fork 0
mirror of https://github.com/pandorafms/pandorafms.git synced 2025-07-29 00:34:46 +02:00
Code Issues Packages Projects Releases Wiki Activity

2013-02-19 Miguel de Dios <miguel.dedios@artica.es>

Browse Source 
* godmode/alerts/configure_alert_command.php,
	godmode/reporting/reporting_builder.item_editor.php,
	godmode/reporting/reporting_builder.list_items.php,
	godmode/agentes/agent_template.php,
	godmode/snmpconsole/snmp_alert.php, index.php,
	operation/search_users.php,
	operation/integria_incidents/incident.php,
	operation/reporting/reporting_xml.php,
	operation/agentes/exportdata.csv.php: cleaned source code style.
	
	* general/login_help_dialog.php, general/login_page.php: fixed the
	set to hidden window of info.
	
	Fixes: #3604645




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@7680 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
mdtrooper 2013-02-19 11:27:57 +00:00
parent 48769df95a
commit 95f56eb2e5
13 changed files with 59 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
pandora_console/ChangeLog
View File

@ -1,3 +1,20 @@
2013-02-19 Miguel de Dios <miguel.dedios@artica.es>
* godmode/alerts/configure_alert_command.php,
godmode/reporting/reporting_builder.item_editor.php,
godmode/reporting/reporting_builder.list_items.php,
godmode/agentes/agent_template.php,
godmode/snmpconsole/snmp_alert.php, index.php,
operation/search_users.php,
operation/integria_incidents/incident.php,
operation/reporting/reporting_xml.php,
operation/agentes/exportdata.csv.php: cleaned source code style.
* general/login_help_dialog.php, general/login_page.php: fixed the
set to hidden window of info.
Fixes: #3604645
2013-02-19 Sergio Martin <sergio.martin@artica.es> 2013-02-19 Sergio Martin <sergio.martin@artica.es>
* include/javascript/pandora_modules.js: Fixed str_warning and * include/javascript/pandora_modules.js: Fixed str_warning and

10
pandora_console/general/login_help_dialog.php
View File

@ -35,10 +35,12 @@ if (is_ajax()) {
} }
// Prints help dialog information // Prints help dialog information
echo '<div id="login_help_dialog" title="' . __('Welcome to Pandora FMS') . '" style="">'; echo '<div id="login_help_dialog" title="' .
__('Welcome to Pandora FMS') . '" style="">';
echo '<div style="position:absolute; top:30px; left: 10px; text-align: left; right:0%; height:70px; width:560px; margin: 0 auto; border: 1px solid #FFF; line-height: 19px;">'; echo '<div style="position:absolute; top:30px; left: 10px; text-align: left; right:0%; height:70px; width:560px; margin: 0 auto; border: 1px solid #FFF; line-height: 19px;">';
echo '<span style="font-size: 15px;">' . __('If this is your first time with Pandora FMS, we propose you a few links to learn more about Pandora FMS. Monitoring could be overwhelm, but take your time to learn how to use the power of Pandora!') . '</span>'; echo '<span style="font-size: 15px;">' .
__('If this is your first time with Pandora FMS, we propose you a few links to learn more about Pandora FMS. Monitoring could be overwhelm, but take your time to learn how to use the power of Pandora!') . '</span>';
echo '</div>'; echo '</div>';
echo '<div style="position:absolute; top:110px; text-align: center; left:0%; right:0%; height:210px; width:580px; margin: 0 auto; border: 1px solid #FFF">'; echo '<div style="position:absolute; top:110px; text-align: center; left:0%; right:0%; height:210px; width:580px; margin: 0 auto; border: 1px solid #FFF">';
@ -117,10 +119,10 @@ $(document).ready (function () {
$("#login_help_dialog" ).dialog('close'); $("#login_help_dialog" ).dialog('close');
var skip_login_help = $("#checkbox-skip_login_help").attr('checked'); var skip_login_help = $("#checkbox-skip_login_help").is(':checked');
// Update config['skip_login_help_dialog'] to don't display more this message // Update config['skip_login_help_dialog'] to don't display more this message
if (skip_login_help == 'checked') { if (skip_login_help) {
jQuery.get ("ajax.php", jQuery.get ("ajax.php",
{"page": "general/login_help_dialog", {"page": "general/login_help_dialog",
"skip_login_help": 1}, "skip_login_help": 1},

10
pandora_console/godmode/alerts/configure_alert_command.php
View File

@ -81,16 +81,16 @@ $table->colspan[2][1] = 3;
$table->data[2][0] = __('Description'); $table->data[2][0] = __('Description');
$table->data[2][1] = html_print_textarea ('description', 10, 30, $description, '', true); $table->data[2][1] = html_print_textarea ('description', 10, 30, $description, '', true);
for($i=1;$i<=10;$i++) { for ($i=1; $i<=10; $i++) {
$table->data['field'.$i][0] = sprintf(__('Field %s description'), $i); $table->data['field'.$i][0] = sprintf(__('Field %s description'), $i);
// Only show help on first row // Only show help on first row
if($i == 1) { if ($i == 1) {
$table->data['field'.$i][0] .= ui_print_help_icon ('alert_fields_description', true, ui_get_full_url(false, false, false, false)); $table->data['field'.$i][0] .= ui_print_help_icon ('alert_fields_description', true, ui_get_full_url(false, false, false, false));
} }
if(!empty($fields_descriptions)) { if (!empty($fields_descriptions)) {
$field_description = $fields_descriptions[$i-1]; $field_description = $fields_descriptions[$i-1];
} }
else { else {
@ -101,11 +101,11 @@ for($i=1;$i<=10;$i++) {
$table->data['field'.$i][2] = sprintf(__('Field %s values'), $i); $table->data['field'.$i][2] = sprintf(__('Field %s values'), $i);
// Only show help on first row // Only show help on first row
if($i == 1) { if ($i == 1) {
$table->data['field'.$i][2] .= ui_print_help_icon ('alert_fields_values', true, ui_get_full_url(false, false, false, false)); $table->data['field'.$i][2] .= ui_print_help_icon ('alert_fields_values', true, ui_get_full_url(false, false, false, false));
} }
if(!empty($fields_values)) { if (!empty($fields_values)) {
$field_values = $fields_values[$i-1]; $field_values = $fields_values[$i-1];
} }
else { else {

3
pandora_console/index.php
View File

@ -396,7 +396,8 @@ if ($old_global_counter_chat != $now_global_counter_chat) {
if (get_parameter ('login', 0) == 1) { if (get_parameter ('login', 0) == 1) {
// If it's configured to not skip this // If it's configured to not skip this
if (!isset($config['skip_login_help_dialog']) or $config['skip_login_help_dialog'] == 0) { if (!isset($config['skip_login_help_dialog']) ||
$config['skip_login_help_dialog'] == 0) {
include_once("general/login_help_dialog.php"); include_once("general/login_help_dialog.php");

4
pandora_console/operation/search_users.php
View File

@ -168,7 +168,7 @@ if ($searchUsers) {
} }
if (!$users) { if (!$users) {
echo "<br><div class='nf'>" . __("Zero results found") . "</div>\n"; echo "<br><div class='nf'>" . __("Zero results found") . "</div>\n";
} }
else { else {
$table->cellpadding = 4; $table->cellpadding = 4;
@ -201,7 +201,7 @@ else {
foreach ($users as $user) { foreach ($users as $user) {
$userIDCell = "<a href='?sec=gusuarios&sec2=godmode/users/configure_user&id=" . $userIDCell = "<a href='?sec=gusuarios&sec2=godmode/users/configure_user&id=" .
$user['id_user'] . "'>" . $user['id_user'] . "</a>"; $user['id_user'] . "'>" . $user['id_user'] . "</a>";
if ($user["is_admin"]) { if ($user["is_admin"]) {
$profileCell = html_print_image ("images/user_suit.png", true, $profileCell = html_print_image ("images/user_suit.png", true,