From eae8995869fc21a27d55c2f087c46b5f3024925c Mon Sep 17 00:00:00 2001 From: raulmateos Date: Fri, 21 May 2010 11:37:09 +0000 Subject: [PATCH] 2010-05-21 Raul Mateos * several php files: Updated "add" or "create" icons. git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@2783 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f --- pandora_console/ChangeLog | 4 ++++ .../godmode/alerts/configure_alert_action.php | 2 +- .../godmode/alerts/configure_alert_command.php | 2 +- pandora_console/godmode/extensions.php | 7 ++++--- .../godmode/gis_maps/configure_gis_map.php | 12 ++++++------ .../godmode/modules/manage_nc_groups_form.php | 6 ++---- .../godmode/modules/manage_network_components.php | 6 +++--- .../modules/manage_network_components_form.php | 2 +- .../reporting/reporting_builder.item_editor.php | 4 ++-- .../godmode/reporting/reporting_builder.main.php | 4 ++-- pandora_console/godmode/setup/links.php | 9 +++++++-- pandora_console/godmode/setup/news.php | 11 ++++++++--- pandora_console/godmode/snmpconsole/snmp_alert.php | 2 +- pandora_console/operation/extensions.php | 4 +++- 14 files changed, 45 insertions(+), 30 deletions(-) diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog index d69b2dd597..4922e46299 100644 --- a/pandora_console/ChangeLog +++ b/pandora_console/ChangeLog @@ -1,3 +1,7 @@ +2010-05-21 Raúl Mateos + + * several php files: Updated "add" or "create" icons. + 2010-05-21 Miguel de Dios * operation/agentes/estado_generalagente.php: added the style for disabled diff --git a/pandora_console/godmode/alerts/configure_alert_action.php b/pandora_console/godmode/alerts/configure_alert_action.php index 0762e1d654..8d58b43353 100644 --- a/pandora_console/godmode/alerts/configure_alert_action.php +++ b/pandora_console/godmode/alerts/configure_alert_action.php @@ -88,7 +88,7 @@ if ($id) { print_submit_button (__('Update'), 'create', false, 'class="sub upd"'); } else { print_input_hidden ('create_action', 1); - print_submit_button (__('Create'), 'create', false, 'class="sub next"'); + print_submit_button (__('Create'), 'create', false, 'class="sub wand"'); } echo ''; echo ''; diff --git a/pandora_console/godmode/alerts/configure_alert_command.php b/pandora_console/godmode/alerts/configure_alert_command.php index 70876290ac..6d65cd738f 100644 --- a/pandora_console/godmode/alerts/configure_alert_command.php +++ b/pandora_console/godmode/alerts/configure_alert_command.php @@ -66,7 +66,7 @@ if ($id) { print_submit_button (__('Update'), 'create', false, 'class="sub upd"'); } else { print_input_hidden ('create_command', 1); - print_submit_button (__('Create'), 'create', false, 'class="sub next"'); + print_submit_button (__('Create'), 'create', false, 'class="sub wand"'); } echo ''; echo ''; diff --git a/pandora_console/godmode/extensions.php b/pandora_console/godmode/extensions.php index f914adedf6..0c9e989e88 100644 --- a/pandora_console/godmode/extensions.php +++ b/pandora_console/godmode/extensions.php @@ -2,7 +2,7 @@ // Pandora FMS - http://pandorafms.com // ================================================== -// Copyright (c) 2005-2009 Artica Soluciones Tecnologicas +// Copyright (c) 2005-2010 Artica Soluciones Tecnologicas // Please see http://pandorafms.org for full contribution list // This program is free software; you can redistribute it and/or @@ -29,7 +29,7 @@ if (sizeof ($config['extensions']) == 0) { } // Header -print_page_header (__('Extensions'). " » ". __('Defined extensions'), "images/extensions.png", false, "", true, "" ); +print_page_header (__('Extensions'). " » ". __('Defined extensions'), "images/extensions.png", false, "", true, "" ); $delete = get_parameter ("delete", ""); $name = get_parameter ("name", ""); @@ -42,10 +42,11 @@ if ($delete != ""){ } -$table->width = '95%'; +$table->width = '500px'; $table->head = array (); $table->head[0] = __('Name'); $table->head[1] = __('Delete'); +$table->align[1] = "center"; $table->data = array (); foreach ($config['extensions'] as $extension) { diff --git a/pandora_console/godmode/gis_maps/configure_gis_map.php b/pandora_console/godmode/gis_maps/configure_gis_map.php index 40c772f41c..2124f90cb7 100644 --- a/pandora_console/godmode/gis_maps/configure_gis_map.php +++ b/pandora_console/godmode/gis_maps/configure_gis_map.php @@ -362,7 +362,7 @@ $table->valign[0] = 'top'; $table->valign[1] = 'top'; $table->data[0][0] = "

List of layers

". print_help_tip (__('It is possible to edit, delete and reorder the layers.'), true); -$table->data[0][1] = '
' . print_button(__('New layer'), 'new_layer', false, 'newLayer();', 'class="sub new"', true) . '
'; +$table->data[0][1] = '
' . print_button(__('New layer'), 'new_layer', false, 'newLayer();', 'class="sub add"', true) . '
'; $table->data[1][0] = '' . addLayerList($layer_list) . @@ -388,7 +388,7 @@ $table->data[1][1] = '
' . print_input_text_extended ('id_agent', __('Select'), 'text_id_agent', '', 30, 100, false, '', array('style' => 'background: url(images/lightning.png) no-repeat right;'), true) . ' ' . __("Type at least two characters to search") . ' ' . - print_button(__('Add agent'), 'add_agent', true, 'addAgentLayer();', 'class="sub"', true) .' + print_button(__('Add agent'), 'add_agent', true, 'addAgentLayer();', 'class="sub add"', true) .'
@@ -400,7 +400,7 @@ $table->data[1][1] = '
@@ -416,14 +416,14 @@ switch ($action) { case 'edit_map': case 'update_saved': if (!empty($invalidFields)) { - print_submit_button(_('Save map'), 'save_button', false, 'class="sub save"'); + print_submit_button(_('Save map'), 'save_button', false, 'class="sub wand"'); } else { - print_submit_button(_('Update map'), 'update_button', false, 'class="sub update"'); + print_submit_button(_('Update map'), 'update_button', false, 'class="sub upd"'); } break; case 'new_map': - print_submit_button(_('Save map'), 'save_button', false, 'class="sub save"'); + print_submit_button(_('Save map'), 'save_button', false, 'class="sub wand"'); break; } echo ''; diff --git a/pandora_console/godmode/modules/manage_nc_groups_form.php b/pandora_console/godmode/modules/manage_nc_groups_form.php index 0e1f7ff072..17370b4892 100644 --- a/pandora_console/godmode/modules/manage_nc_groups_form.php +++ b/pandora_console/godmode/modules/manage_nc_groups_form.php @@ -2,7 +2,7 @@ // Pandora FMS - http://pandorafms.com // ================================================== -// Copyright (c) 2005-2009 Artica Soluciones Tecnologicas +// Copyright (c) 2005-2010 Artica Soluciones Tecnologicas // Please see http://pandorafms.org for full contribution list // This program is free software; you can redistribute it and/or @@ -38,8 +38,6 @@ if ($id) { $parent = ''; } -echo '

'.__('Module management').' » '. __('Component group management').'

'; - $table->width = '50%'; $table->style = array (); $table->style[0] = 'font-weight: bold'; @@ -61,7 +59,7 @@ if ($id) { print_submit_button (__('Update'), 'crt', false, 'class="sub upd"'); } else { print_input_hidden ('create', 1); - print_submit_button (__('Create'), 'crt', false, 'class="sub next"'); + print_submit_button (__('Create'), 'crt', false, 'class="sub wand"'); } echo ''; echo ''; diff --git a/pandora_console/godmode/modules/manage_network_components.php b/pandora_console/godmode/modules/manage_network_components.php index 4747fd50e6..e7a49cd82c 100644 --- a/pandora_console/godmode/modules/manage_network_components.php +++ b/pandora_console/godmode/modules/manage_network_components.php @@ -60,7 +60,7 @@ $id = (int) get_parameter ('id'); $snmp_version = (string) get_parameter('snmp_version'); $snmp3_auth_user = (string) get_parameter('snmp3_auth_user'); $snmp3_auth_pass = (string) get_parameter('snmp3_auth_pass'); -$snmp3_auth_method = (string) get_parameter('snmp3_auth_method'); +$snmp3_auth_method = (string) get_parameter('snmp3_auth_method'); $snmp3_privacy_method = (string) get_parameter('snmp3_privacy_method'); $snmp3_privacy_pass = (string) get_parameter('snmp3_privacy_pass'); $snmp3_security_level = (string) get_parameter('snmp3_security_level'); @@ -318,10 +318,10 @@ foreach ($components as $component) { $data[4] = get_network_component_group_name ($component['id_group']); $data[5] = $component['max']." / ".$component['min']; - $data[6] = '' . print_image('images/copy.png', true, array('alt' => __('Duplicate'), 'title' => __('Duplicate'))) . ''; - $data[6] .= '' . print_image('images/cross.png', true, array('alt' => __('Delete'), 'title' => __('Delete'))) . ''; diff --git a/pandora_console/godmode/modules/manage_network_components_form.php b/pandora_console/godmode/modules/manage_network_components_form.php index f2d43823b2..6b3cc141e4 100644 --- a/pandora_console/godmode/modules/manage_network_components_form.php +++ b/pandora_console/godmode/modules/manage_network_components_form.php @@ -150,7 +150,7 @@ if ($id) { print_submit_button (__('Update'), 'upd', false, 'class="sub upd"'); } else { print_input_hidden ('create_component', 1); - print_submit_button (__('Create'), 'crt', false, 'class="sub next"'); + print_submit_button (__('Create'), 'crt', false, 'class="sub wand"'); } echo ''; echo ''; diff --git a/pandora_console/godmode/reporting/reporting_builder.item_editor.php b/pandora_console/godmode/reporting/reporting_builder.item_editor.php index b0dd9db53e..20bbed821c 100644 --- a/pandora_console/godmode/reporting/reporting_builder.item_editor.php +++ b/pandora_console/godmode/reporting/reporting_builder.item_editor.php @@ -318,7 +318,7 @@ print_input_hidden('id_item', $idItem); print_SLA_list('90%', $action, $idItem); echo '
'; if ($action == 'new') { - print_submit_button(__('Create item'), 'create_item', false, 'class="sub next"'); + print_submit_button(__('Create item'), 'create_item', false, 'class="sub wand"'); } else { print_submit_button(__('Edit item'), 'edit_item', false, 'class="sub upd"'); @@ -690,4 +690,4 @@ function chooseType() { // break; } } - \ No newline at end of file + diff --git a/pandora_console/godmode/reporting/reporting_builder.main.php b/pandora_console/godmode/reporting/reporting_builder.main.php index 443630d4af..58aa79a1c0 100644 --- a/pandora_console/godmode/reporting/reporting_builder.main.php +++ b/pandora_console/godmode/reporting/reporting_builder.main.php @@ -27,7 +27,7 @@ $groups = get_user_groups (); switch ($action) { case 'new': - $actionButtonHtml = print_submit_button(__('Add'), 'add', false, 'class="sub next"', true); + $actionButtonHtml = print_submit_button(__('Add'), 'add', false, 'class="sub wand"', true); $hiddenFieldAction = 'save'; break; case 'update': @@ -65,4 +65,4 @@ echo $actionButtonHtml; print_input_hidden('action', $hiddenFieldAction); print_input_hidden('id_report', $idReport); echo '
'; -?> \ No newline at end of file +?> diff --git a/pandora_console/godmode/setup/links.php b/pandora_console/godmode/setup/links.php index 7086c73d4e..d687a76977 100644 --- a/pandora_console/godmode/setup/links.php +++ b/pandora_console/godmode/setup/links.php @@ -99,8 +99,13 @@ if ((isset($_GET["form_add"])) or (isset($_GET["form_edit"]))){ echo ''; echo "
' . - print_button(__('Save Layer'), 'save_layer', false, 'saveLayer();', 'class="sub"', true) . ' + print_button(__('Save Layer'), 'save_layer', false, 'saveLayer();', 'class="sub wand"', true) . ' ' . print_input_hidden('layer_edit_id_form', '', true) . '
"; echo ""; - echo "
- "; + echo "
"; + if (isset($_GET["form_add"])) { + echo ""; + } + else { + echo ""; + } echo '
'; } else { // Main list view for Links editor diff --git a/pandora_console/godmode/setup/news.php b/pandora_console/godmode/setup/news.php index 8fdf78be5a..07ff905ec2 100644 --- a/pandora_console/godmode/setup/news.php +++ b/pandora_console/godmode/setup/news.php @@ -2,7 +2,7 @@ // Pandora FMS - http://pandorafms.com // ================================================== -// Copyright (c) 2005-2009 Artica Soluciones Tecnologicas +// Copyright (c) 2005-2010 Artica Soluciones Tecnologicas // Please see http://pandorafms.org for full contribution list // This program is free software; you can redistribute it and/or @@ -113,8 +113,13 @@ if ((isset ($_GET["form_add"])) || (isset ($_GET["form_edit"]))) { echo ''; echo ""; echo ""; - echo "
- "; + echo "
"; + if (isset($_GET["form_add"])) { + echo ""; + } + else { + echo ""; + } echo '
'; } else { diff --git a/pandora_console/godmode/snmpconsole/snmp_alert.php b/pandora_console/godmode/snmpconsole/snmp_alert.php index 1ab9afa0d4..d52280a496 100644 --- a/pandora_console/godmode/snmpconsole/snmp_alert.php +++ b/pandora_console/godmode/snmpconsole/snmp_alert.php @@ -233,7 +233,7 @@ if (isset ($_GET["update_alert"])) { if ($id_as > 0) { print_submit_button (__('Update'), "submit", false, 'class="sub upd"', false); } else { - print_submit_button (__('Create'), "submit", false, 'class="sub next"', false); + print_submit_button (__('Create'), "submit", false, 'class="sub wand"', false); } // End table diff --git a/pandora_console/operation/extensions.php b/pandora_console/operation/extensions.php index e86ea81aa0..e37bc6d88e 100644 --- a/pandora_console/operation/extensions.php +++ b/pandora_console/operation/extensions.php @@ -40,11 +40,13 @@ if ($delete != ""){ rename ($source, $config["homedir"]."/extensions/ext_backup/$name.php"); } -$table->width = '95%'; + +$table->width = '500px'; $table->head = array (); $table->head[0] = __('Name'); if (give_acl ($config['id_user'], 0, "PM")){ $table->head[1] = __('Delete'); + $table->align[1] = "center"; } $table->data = array ();