diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog index 69cc8b1d51..7d3ce1a54f 100644 --- a/pandora_console/ChangeLog +++ b/pandora_console/ChangeLog @@ -1,3 +1,28 @@ +2013-08-01 Sergio Martin + + * 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 * include/functions_api.php: Added new API function diff --git a/pandora_console/godmode/massive/massive_operations.php b/pandora_console/godmode/massive/massive_operations.php index 2c5f32fc36..48e1a3dde3 100644 --- a/pandora_console/godmode/massive/massive_operations.php +++ b/pandora_console/godmode/massive/massive_operations.php @@ -178,15 +178,6 @@ echo ''; return false; }); - $('#form_edit').submit( function() { - confirm_status = - confirm(""); - if (confirm_status) - $("#loading").css("display", ""); - else - return false; - }); - $('[id^=form]').submit( function() { confirm_status = confirm(""); diff --git a/pandora_console/images/create_directory.png b/pandora_console/images/create_directory.png new file mode 100644 index 0000000000..d344228290 Binary files /dev/null and b/pandora_console/images/create_directory.png differ diff --git a/pandora_console/images/create_file.png b/pandora_console/images/create_file.png new file mode 100644 index 0000000000..2ec5e2a25a Binary files /dev/null and b/pandora_console/images/create_file.png differ diff --git a/pandora_console/images/edit.png b/pandora_console/images/edit.png index 4ac94c486d..60a1ddcc54 100644 Binary files a/pandora_console/images/edit.png and b/pandora_console/images/edit.png differ diff --git a/pandora_console/images/mimetypes/directory.png b/pandora_console/images/mimetypes/directory.png index f1ed9abe03..f00ea8488c 100644 Binary files a/pandora_console/images/mimetypes/directory.png and b/pandora_console/images/mimetypes/directory.png differ diff --git a/pandora_console/images/mimetypes/image.png b/pandora_console/images/mimetypes/image.png index 032e177618..6d916ab7a1 100644 Binary files a/pandora_console/images/mimetypes/image.png and b/pandora_console/images/mimetypes/image.png differ diff --git a/pandora_console/images/mimetypes/text.png b/pandora_console/images/mimetypes/text.png index 8bc294fa6a..1d9792bf0c 100755 Binary files a/pandora_console/images/mimetypes/text.png and b/pandora_console/images/mimetypes/text.png differ diff --git a/pandora_console/images/mimetypes/unknown.png b/pandora_console/images/mimetypes/unknown.png index f64dd01170..6ab35068e8 100644 Binary files a/pandora_console/images/mimetypes/unknown.png and b/pandora_console/images/mimetypes/unknown.png differ diff --git a/pandora_console/images/mimetypes/zip.png b/pandora_console/images/mimetypes/zip.png index 5c93c4fe7d..26ee51401a 100644 Binary files a/pandora_console/images/mimetypes/zip.png and b/pandora_console/images/mimetypes/zip.png differ diff --git a/pandora_console/images/upload_file.png b/pandora_console/images/upload_file.png new file mode 100644 index 0000000000..859839fc8e Binary files /dev/null and b/pandora_console/images/upload_file.png differ diff --git a/pandora_console/include/functions_filemanager.php b/pandora_console/include/functions_filemanager.php index 3b30e32191..913f7a51bb 100644 --- a/pandora_console/include/functions_filemanager.php +++ b/pandora_console/include/functions_filemanager.php @@ -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] .= "" . html_print_image('images/edit.png', true, array("style" => 'margin-top: 2px;')) . ""; + $data[4] .= "" . html_print_image('images/edit.png', true, array("style" => 'margin-top: 2px;', 'title' => __('Edit file'))) . ""; } } } @@ -668,13 +668,13 @@ function filemanager_file_explorer($real_directory, $relative_directory, $url, $ if (is_writable ($real_directory)) { echo "
"; echo ""; - 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 ""; echo ""; - 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 ""; echo ""; - 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 ""; echo "
"; } diff --git a/pandora_console/include/help/en/help_profile.php b/pandora_console/include/help/en/help_profile.php index 023fd9604f..93dad11cea 100644 --- a/pandora_console/include/help/en/help_profile.php +++ b/pandora_console/include/help/en/help_profile.php @@ -21,7 +21,7 @@ Create reportRW Create user custom-defined graphRW View report, visual map and/or custom graphRR -Apply report templateRW +Apply report templateRR Create report templateRM Create incidentIW Read incidentIR @@ -30,9 +30,12 @@ Delete incident of another userIM View eventER Validate/Comment eventEW -Delete eventEW +Delete eventEM Execute responseEW Create incident from event (Response)EW&IW +Manage responsePM +Manage filtersEW +Customize event columnsPM Change owner/Re-open eventEM View userAR SNMP Console viewAR @@ -53,7 +56,7 @@ Create agentAW Duplicate remote configurationsAW Downtime managementAW -Alert managementAM +Alert managementLW User managementUM SNMP Console management (alerts and MIB load)PM Profile managementPM diff --git a/pandora_console/include/help/es/help_profile.php b/pandora_console/include/help/es/help_profile.php index dc2ebd9825..cead0cdfad 100644 --- a/pandora_console/include/help/es/help_profile.php +++ b/pandora_console/include/help/es/help_profile.php @@ -23,7 +23,7 @@ Crear un informe RW Crear una grafica combinada RW Ver informe, mapa, grafica, etc RR -Aplicar una plantilla de informeRW +Aplicar una plantilla de informeRR Crear una plantilla de informeRM Crear incidente IW Leer incidente IR @@ -32,9 +32,12 @@ Borrar incidente que no es tuyo IM Ver evento ER Validar/Comentar evento EW -Borrar evento EW +Borrar evento EM Ejecutar respuestasEW Crear incidencia a traves del evento (Respuesta) EW&IW +Gestionar respuestasPM +Gestionar filtrosEW +Personalizar columnas de eventosPM Cambiar propietario/Re-abrir evento EM Ver usuarios AR Ver Consola SNMP AR @@ -55,7 +58,7 @@ Crear agente AW Duplicar configuración remotaAW Gestión de paradas de servicioAW -Gestión de alertas AM +Gestión de alertas LW Gestión de usuarios UM Gestión de consola SNMPPM Gestión de perfilesPM diff --git a/pandora_console/index.php b/pandora_console/index.php index 6f0f12f590..e94d8ab904 100644 --- a/pandora_console/index.php +++ b/pandora_console/index.php @@ -550,6 +550,7 @@ else { if ($config["pure"] == 0) { echo ''; //container div + echo '
'; echo '';