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

2010-03-17 Junichi Satoh <junichi@rworks.jp> 

* operation/messages/message.php : Changed strings.
	"From" to "Message from", "To" to "Message to"

	* godmode/reporting/reporting_builder.php : Changed strings.
	"Down" to "Move down", "Up" to "Move up"

	* godmode/alerts/alert_list.php: Changed sentence with some strings.
	"From XX to YY matches of the alert" to "Number of alerts match	
	from XX to YY"



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@2510 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
jsatoh 2010-03-17 06:36:16 +00:00
parent 6829b48d1d
commit 45f459e224
4 changed files with 19 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
pandora_console/ChangeLog
View File

@ -1,3 +1,15 @@
2010-03-17 Junichi Satoh <junichi@rworks.jp>
* operation/messages/message.php : Changed strings.
"From" to "Message from", "To" to "Message to"
* godmode/reporting/reporting_builder.php : Changed strings.
"Down" to "Move down", "Up" to "Move up"
* godmode/alerts/alert_list.php: Changed sentence with some strings.
"From XX to YY matches of the alert" to "Number of alerts match
from XX to YY"
2010-03-15 Junichi Satoh <junichi@rworks.jp>
* godmode/alerts/alert_list.php : Added help link, "alert-matches".

6
pandora_console/godmode/alerts/alert_list.php
View File

@ -571,11 +571,10 @@ $table->data[2][1] = print_select($actions,'action_select','','','','',true);
$table->data[2][1] .= ' <span id="action_loading" class="invisible">';
$table->data[2][1] .= '<img src="images/spinner.png" /></span>';
$table->data[2][1] .= ' <span id="advanced_action" class="advanced_actions invisible">';
$table->data[2][1] .= __('From').' ';
$table->data[2][1] .= __('Number of alerts match from').' ';
$table->data[2][1] .= print_input_text ('fires_min', '', '', 4, 10, true);
$table->data[2][1] .= ' '.__('to').' ';
$table->data[2][1] .= print_input_text ('fires_max', '', '', 4, 10, true);
$table->data[2][1] .= ' '.__('matches of the alert');
$table->data[2][1] .= print_help_icon ("alert-matches", true);
$table->data[2][1] .= '</span>';
$table->data[2][1] .= '</div>';
@ -597,11 +596,10 @@ print_select ($actions, 'action', '', '', __('None'), 0);
echo '<br />';
echo '<span><a href="#" class="show_advanced_actions">'.__('Advanced options').' &raquo; </a></span>';
echo '<span class="advanced_actions invisible">';
echo __('From').' ';
echo __('Number of alerts match from').' ';
print_input_text ('fires_min', -1, '', 4, 10);
echo ' '.__('to').' ';
print_input_text ('fires_max', -1, '', 4, 10);
echo ' '.__('matches of the alert');
echo print_help_icon ("alert-matches", true);
echo '</span>';
echo '<div class="right">';

4
pandora_console/godmode/reporting/reporting_builder.php
View File

@ -451,7 +451,7 @@ if ($edit_sla_report_content) {
$data[0] .= print_input_hidden ('content_up', 1, true);
$data[0] .= print_input_hidden ('id_report_content', $report_content['id_rc'], true);
$data[0] .= print_input_image ('up', 'images/up.png', 1, '',
true, array ('title' => __('Up')));
true, array ('title' => __('Move up')));
$data[0] .= '</form>';
}
if ($last_id != $report_content['id_rc']) {
@ -461,7 +461,7 @@ if ($edit_sla_report_content) {
$data[0] .= print_input_hidden ('content_down', 1, true);
$data[0] .= print_input_hidden ('id_report_content', $report_content['id_rc'], true);
$data[0] .= print_input_image ('down', 'images/down.png', 1, '',
true, array ('title' => __('Down')));
true, array ('title' => __('Move down')));
$data[0] .= '</form>';
}

6
pandora_console/operation/messages/message.php
View File

@ -70,10 +70,10 @@ if (isset ($_GET["new_msg"])) { //create message
echo '<form method="POST" action="index.php?sec=messages&amp;sec2=operation/messages/message&amp;send_message=1">
<table width="85%" class="databox_color" cellpadding="4" cellspacing="4">
<tr>
<td class="datos">'.__('From').':</td>
<td class="datos">'.__('Message from').':</td>
<td class="datos"><b>'.print_username ($config["id_user"], true).'</b></td>
</tr><tr>
<td class="datos2">'.__('To').':</td>
<td class="datos2">'.__('Message to').':</td>
<td class="datos2">';
$users = get_users_info (); //Get a list of all users
@ -112,7 +112,7 @@ if (isset ($_GET["new_msg"])) { //create message
echo '<form method="post" action="index.php?sec=messages&amp;sec2=operation/messages/message&amp;new_msg=1">
<table class="databox_color" width="650" cellpadding="4" cellspacing="4">
<tr><td class="datos">'.__('From').':</td>
<tr><td class="datos">'.__('Message from').':</td>
<td class="datos"><b>'.print_username ($message["sender"], true).' '.__('at').' '.print_timestamp ($message["timestamp"], true, array ("prominent" => "timestamp")).'</b></td></tr>';
// Subject