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

2010-07-18 Raul Mateos <raulofpandora@gmail.com> 

* operation/incidents/incident_detail.php: Change Add button to links.
	* godmode/alerts/alert_list.list.php: Centered images.
	* godmode/alerts/configure_alert_action: Added link to create command.

git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@3021 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
raulmateos 2010-07-18 11:13:38 +00:00
parent 7135b8344b
commit fbd0b34a66
4 changed files with 40 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
pandora_console/ChangeLog
View File

@ -1,15 +1,23 @@
2010-07-18 Raúl Mateos <raulofpandora@gmail.com>
* operation/incidents/incident_detail.php: Change Add button to links.
* godmode/alerts/alert_list.list.php: Centered images.
* godmode/alerts/configure_alert_action: Added link to create command.
2010-07-16 Sergio Martin <sergio.martin@artica.es>
* pandoradb_data.sql: Fixed the default data inserting the
new colum of tgrupo "propagate"
2010-07-15 Miguel de Dios <miguel.dedios@artica.es>
2010-07-16 Miguel de Dios <miguel.dedios@artica.es>
* operation/agentes/networkmap.php: fixed the pass to parameters between
fullscreen and windowed mode.
Fixes: #3013769
2010-07-15 Miguel de Dios <miguel.dedios@artica.es>
2010-07-16 Miguel de Dios <miguel.dedios@artica.es>
* godmode/reporting/reporting_builder.php: fixed lost name of report when
delete any element of this element.

8
pandora_console/godmode/alerts/alert_list.list.php
View File

@ -169,7 +169,11 @@ if ($isFunctionPolicies !== ENTERPRISE_NOT_HOOK) {
}
$table->head[5] = __('Actions');
$table->head[6] = __('Status');
$table->head[7] = '';
$table->head[7] = __('Delete');
$table->valign[6] = 'middle';
$table->align[6] = 'center';
$table->align[7] = 'center';
$table->data = array ();
@ -304,7 +308,7 @@ foreach ($simple_alerts as $alert) {
$title = __('Alert not fired');
}
$data[6] = "<center>" . print_status_image($status, $title, true) . "</center>";
$data[6] = print_status_image($status, $title, true);
$data[7] = '<form class="delete_alert_form" method="post" style="display: inline;">';

5
pandora_console/godmode/alerts/configure_alert_action.php
View File

@ -65,6 +65,11 @@ $table->data[1][1] = print_select_groups(false, "AR", true, 'group', $group, '',
$table->data[2][0] = __('Command');
$table->data[2][1] = print_select_from_sql ('SELECT id, name FROM talert_commands',
'id_command', $id_command, '', __('None'), 0, true);
$table->data[2][1] .= ' ';
$table->data[2][1] .= print_image ('images/add.png', true);
$table->data[2][1] .= '<a href="index.php?sec=galertas&sec2=godmode/alerts/configure_alert_command">';
$table->data[2][1] .= __('Create Command');
$table->data[2][1] .= '</a>';
$table->data[3][0] = __('Field 1');
$table->data[3][1] = print_input_text ('field1', $field1, '', 35, 255, true);

29
pandora_console/operation/incidents/incident_detail.php
View File

@ -187,13 +187,13 @@ echo "<script type=\"text/javascript\">
$(document).ready(function() {
$('#file_control').hide();
$('#add_note').hide();
$('input#submit-attachment').click(function() {
$('#submit-attachment').fadeOut('fast');
$('a.attachment').click(function() {
$('a.attachment').fadeOut('fast');
$('#file_control').slideDown('slow');
return false;
});
$('input#submit-note_control').click(function() {
$('#submit-note_control').fadeOut('fast');
$('a.note_control').click(function() {
$('a.note_control').fadeOut('fast');
$('#add_note').slideDown('slow');
return false;
});
@ -306,9 +306,13 @@ if (isset ($id_inc)) {
// ********************************************************************
echo '<div>';
print_submit_button (__('Add note'), "note_control", false, 'class="sub next"');
echo '<a class="note_control" href="#">';
echo print_image ('images/add.png', true);
echo __('Add note');
echo '</a>';
echo '</div><div>';
echo '<form id="add_note" name="nota" method="POST" action="index.php?sec=incidencias&sec2=operation/incidents/incident_detail&insertar_nota=1&id='.$id_inc.'">';
echo '<form id="add_note" name="nota" method="POST" action="index.php?sec=incidencias&sec2=operation/incidents/incident_detail&insertar_nota=1&id='.$id_inc.'"><h3>'.__('Add note').'</h3>';
echo '<table cellpadding="4" cellspacing="4" class="databox" width="600px">
<tr><td class="datos2"><textarea name="nota" rows="5" cols="70" style="height: 100px;"></textarea></td>
<td valign="bottom"><input name="addnote" type="submit" class="sub wand" value="'.__('Add').'"></td></tr>
@ -339,7 +343,7 @@ if (isset ($id_inc)) {
}
if (!empty ($table->data)) {
echo "<h3>".__('Notes attached to incident').'<h3>';
echo "<h3>".__('Notes attached to incident').'</h3>';
echo '<form method="POST" action="index.php?sec=incidencias&sec2=operation/incidents/incident_detail&id='.$id_inc.'">';
print_table ($table);
echo '</form>';
@ -395,14 +399,19 @@ if (isset ($id_inc)) {
// Upload control
if ((give_acl($config["id_user"], $id_grupo, "IW")==1)) {
echo '<div>';
print_submit_button (__('Add attachment'), "attachment", false, 'class="sub next"');
echo '<a class="attachment" href="#">';
echo print_image ('images/add.png', true);
echo __('Add attachment');
echo '</a>';
echo '</div>';
echo '<div><form method="post" id="file_control" action="index.php?sec=incidencias&sec2=operation/incidents/incident_detail&id='.$id_inc.'&upload_file=1" enctype="multipart/form-data">';
echo '<div><form method="post" id="file_control" action="index.php?sec=incidencias&sec2=operation/incidents/incident_detail&id='.$id_inc.'&upload_file=1" enctype="multipart/form-data"><h3>'.__('Add attachment').'</h3>';
echo '<table cellpadding="4" cellspacing="3" class="databox" width="400">
<tr><td class="datos">'.__('Filename').'</td><td class="datos"><input type="file" name="userfile" value="userfile" class="sub" size="40" /></td></tr>
<tr><td class="datos2">'.__('Description').'</td><td class="datos2" colspan="3"><input type="text" name="file_description" size="47"></td></tr>
<tr><td rowspan="2" style="text-align: right;"> <input type="submit" name="upload" value="'.__('Upload').'" class="sub wand"></td></tr>
<tr><td colspan="2" style="text-align: right;"> <input type="submit" name="upload" value="'.__('Upload').'" class="sub wand"></td></tr>
</table></form></div>';
}
}