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

2013-08-01 Sergio Martin <sergio.martin@artica.es> 

* include/functions_filemanager.php
	images/upload_file.png
	images/edit.png
	images/mimetypes/unknown.png
	images/mimetypes/image.png
	images/mimetypes/zip.png
	images/mimetypes/directory.png
	images/mimetypes/text.png
	images/create_directory.png
	images/create_file.png: Change icons on filemanager
	adding some usability improvements

	* index.php: Fix out of bounds of the footer in the
	policy modules view for bug #2320

	* godmode/massive/massive_operations.php: Fix double
	advertment alert

	* include/help/en/help_profile.php
	include/help/es/help_profile.php: Make changes on the
	ACLs table to put it with the same permissions of the 
	wiki



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8617 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
zarzuelo 2013-08-01 14:56:50 +00:00
parent 560fd9dea5
commit 70ab9d7b8a
15 changed files with 47 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
pandora_console/ChangeLog
View File

@ -1,3 +1,28 @@
2013-08-01 Sergio Martin <sergio.martin@artica.es>
* include/functions_filemanager.php
images/upload_file.png
images/edit.png
images/mimetypes/unknown.png
images/mimetypes/image.png
images/mimetypes/zip.png
images/mimetypes/directory.png
images/mimetypes/text.png
images/create_directory.png
images/create_file.png: Change icons on filemanager
adding some usability improvements
* index.php: Fix out of bounds of the footer in the
policy modules view for bug #2320
* godmode/massive/massive_operations.php: Fix double
advertment alert
* include/help/en/help_profile.php
include/help/es/help_profile.php: Make changes on the
ACLs table to put it with the same permissions of the
wiki
2013-08-01 Hirofumi Kosaka <kosaka@rworks.jp>
* include/functions_api.php: Added new API function

9
pandora_console/godmode/massive/massive_operations.php
View File

@ -178,15 +178,6 @@ echo '</div>';
return false;
});
$('#form_edit').submit( function() {
confirm_status =
confirm("<?php echo __('Are you sure?'); ?>");
if (confirm_status)
$("#loading").css("display", "");
else
return false;
});
$('[id^=form]').submit( function() {
confirm_status =
confirm("<?php echo __('Are you sure?'); ?>");

BIN
pandora_console/images/create_directory.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.4 KiB

BIN
pandora_console/images/create_file.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.4 KiB

BIN
pandora_console/images/edit.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 715 B

After

Width:  |  Height:  |  Size: 1.5 KiB

BIN
pandora_console/images/mimetypes/directory.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 632 B

After

Width:  |  Height:  |  Size: 1.4 KiB

BIN
pandora_console/images/mimetypes/image.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 586 B

After

Width:  |  Height:  |  Size: 1.8 KiB

BIN
pandora_console/images/mimetypes/text.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 719 B

After

Width:  |  Height:  |  Size: 1.3 KiB

BIN
pandora_console/images/mimetypes/unknown.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 568 B

After

Width:  |  Height:  |  Size: 1.4 KiB

BIN
pandora_console/images/mimetypes/zip.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 546 B

After

Width:  |  Height:  |  Size: 1.5 KiB

BIN
pandora_console/images/upload_file.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.4 KiB

18
pandora_console/include/functions_filemanager.php
View File

@ -587,19 +587,19 @@ function filemanager_file_explorer($real_directory, $relative_directory, $url, $
switch ($fileinfo['mime']) {
case MIME_DIR:
$data[0] = html_print_image ('images/mimetypes/directory.png', true);
$data[0] = html_print_image ('images/mimetypes/directory.png', true, array('title' => __('Directory')));
break;
case MIME_IMAGE:
$data[0] = html_print_image ('images/mimetypes/image.png', true);
$data[0] = html_print_image ('images/mimetypes/image.png', true, array('title' => __('Image')));
break;
case MIME_ZIP:
$data[0] = html_print_image ('images/mimetypes/zip.png', true);
$data[0] = html_print_image ('images/mimetypes/zip.png', true, array('title' => __('Compressed file')));
break;
case MIME_TEXT:
$data[0] = html_print_image ('images/mimetypes/text.png', true);
$data[0] = html_print_image ('images/mimetypes/text.png', true, array('title' => __('Text file')));
break;
default:
$data[0] = html_print_image ('images/mimetypes/unknown.png', true);
$data[0] = html_print_image ('images/mimetypes/unknown.png', true, array('title' => __('Unknown')));
break;
}
@ -649,7 +649,7 @@ function filemanager_file_explorer($real_directory, $relative_directory, $url, $
if (($editor) && (!$readOnly)) {
if ($fileinfo['mime'] == MIME_TEXT) {
$data[4] .= "<a style='vertical-align: top;' href='$url&edit_file=1&location_file=" . $fileinfo['realpath'] . "&hash=" . md5($fileinfo['realpath'] . $config['dbpass']) . "' style='float: left;'>" . html_print_image('images/edit.png', true, array("style" => 'margin-top: 2px;')) . "</a>";
$data[4] .= "<a style='vertical-align: top;' href='$url&edit_file=1&location_file=" . $fileinfo['realpath'] . "&hash=" . md5($fileinfo['realpath'] . $config['dbpass']) . "' style='float: left;'>" . html_print_image('images/edit.png', true, array("style" => 'margin-top: 2px;', 'title' => __('Edit file'))) . "</a>";
}
}
}
@ -668,13 +668,13 @@ function filemanager_file_explorer($real_directory, $relative_directory, $url, $
if (is_writable ($real_directory)) {
echo "<div style='text-align: right; width: " . $table->width . ";'>";
echo "<a href='javascript:show_form_create_folder();' style='margin-right: 3px; margin-bottom: 5px;'>";
echo html_print_image('images/mimetypes/directory.png', true, array("title" => __('Create directory')));
echo html_print_image('images/create_directory.png', true, array("title" => __('Create directory')));
echo "</a>";
echo "<a href='javascript: show_create_text_file();' style='margin-right: 3px; margin-bottom: 5px;'>";
echo html_print_image('images/mimetypes/text.png', true, array("title" => __('Create text')));
echo html_print_image('images/create_file.png', true, array("title" => __('Create text')));
echo "</a>";
echo "<a href='javascript: show_upload_file();'>";
echo html_print_image('images/mimetypes/unknown.png', true, array("title" => __('Upload file/s')));
echo html_print_image('images/upload_file.png', true, array("title" => __('Upload file/s')));
echo "</a>";
echo "</div>";
}

9
pandora_console/include/help/en/help_profile.php
View File

@ -21,7 +21,7 @@
<tr><td>Create report<td>RW
<tr><td>Create user custom-defined graph<td>RW
<tr><td>View report, visual map and/or custom graph<td>RR
<tr><td>Apply report template<td>RW
<tr><td>Apply report template<td>RR
<tr><td>Create report template<td>RM
<tr><td>Create incident<td>IW
<tr><td>Read incident<td>IR
@ -30,9 +30,12 @@
<tr><td>Delete incident of another user<td>IM
<tr><td>View event<td>ER
<tr><td>Validate/Comment event<td>EW
<tr><td>Delete event<td>EW
<tr><td>Delete event<td>EM
<tr><td>Execute response<td>EW
<tr><td>Create incident from event (Response)<td>EW&IW
<tr><td>Manage response<td>PM
<tr><td>Manage filters<td>EW
<tr><td>Customize event columns<td>PM
<tr><td>Change owner/Re-open event<td>EM
<tr><td>View user<td>AR
<tr><td>SNMP Console view<td>AR
@ -53,7 +56,7 @@
<tr><td>Create agent<td>AW
<tr><td>Duplicate remote configurations<td>AW
<tr><td>Downtime management<td>AW
<tr><td>Alert management<td>AM
<tr><td>Alert management<td>LW
<tr><td>User management<td>UM
<tr><td>SNMP Console management (alerts and MIB load)<td>PM
<tr><td>Profile management<td>PM

9
pandora_console/include/help/es/help_profile.php
View File

@ -23,7 +23,7 @@
<tr><td>Crear un informe <td>RW
<tr><td>Crear una grafica combinada <td>RW
<tr><td>Ver informe, mapa, grafica, etc <td>RR
<tr><td>Aplicar una plantilla de informe<td>RW
<tr><td>Aplicar una plantilla de informe<td>RR
<tr><td>Crear una plantilla de informe<td>RM
<tr><td>Crear incidente <td>IW
<tr><td>Leer incidente <td>IR
@ -32,9 +32,12 @@
<tr><td>Borrar incidente que no es tuyo <td>IM
<tr><td>Ver evento <td>ER
<tr><td>Validar/Comentar evento <td>EW
<tr><td>Borrar evento <td>EW
<tr><td>Borrar evento <td>EM
<tr><td>Ejecutar respuestas<td>EW
<tr><td>Crear incidencia a traves del evento (Respuesta) <td>EW&IW
<tr><td>Gestionar respuestas<td>PM
<tr><td>Gestionar filtros<td>EW
<tr><td>Personalizar columnas de eventos<td>PM
<tr><td>Cambiar propietario/Re-abrir evento <td>EM
<tr><td>Ver usuarios <td>AR
<tr><td>Ver Consola SNMP <td>AR
@ -55,7 +58,7 @@
<tr><td>Crear agente <td>AW
<tr><td>Duplicar configuración remota<td>AW
<tr><td>Gestión de paradas de servicio<td>AW
<tr><td>Gestión de alertas <td>AM
<tr><td>Gestión de alertas <td>LW
<tr><td>Gestión de usuarios <td>UM
<tr><td>Gestión de consola SNMP<td>PM
<tr><td>Gestión de perfiles<td>PM

1
pandora_console/index.php
View File

@ -550,6 +550,7 @@ else {
if ($config["pure"] == 0) {
echo '</div>'; //container div
echo '<div style="clear:both"></div>';
echo '<div id="foot">';
require ("general/footer.php");
echo '</div>';