From 6d5addb6fbc53f442f9c33a76c608b4adb640214 Mon Sep 17 00:00:00 2001 From: zarzuelo Date: Thu, 10 Oct 2013 09:20:21 +0000 Subject: [PATCH] 2013-10-10 Sergio Martin * include/styles/pandora.css godmode/groups/configure_group.php godmode/alerts/alert_templates.php godmode/modules/manage_network_components.php godmode/tag/tag.php godmode/tag/edit_tag.php godmode/category/edit_category.php: Fixed many aesthetic issues git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8882 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f --- pandora_console/ChangeLog | 11 +++++++++++ pandora_console/godmode/alerts/alert_templates.php | 2 +- pandora_console/godmode/category/edit_category.php | 4 ++++ pandora_console/godmode/groups/configure_group.php | 2 +- .../godmode/modules/manage_network_components.php | 2 +- pandora_console/godmode/tag/edit_tag.php | 6 +++++- pandora_console/godmode/tag/tag.php | 6 ++---- pandora_console/include/styles/pandora.css | 2 +- 8 files changed, 26 insertions(+), 9 deletions(-) diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog index 2c3cca3227..00f8ceed87 100644 --- a/pandora_console/ChangeLog +++ b/pandora_console/ChangeLog @@ -1,3 +1,14 @@ +2013-10-10 Sergio Martin + + * include/styles/pandora.css + godmode/groups/configure_group.php + godmode/alerts/alert_templates.php + godmode/modules/manage_network_components.php + godmode/tag/tag.php + godmode/tag/edit_tag.php + godmode/category/edit_category.php: Fixed many aesthetic + issues + 2013-10-09 Ramon Novoa * pandoradb_data.sql, diff --git a/pandora_console/godmode/alerts/alert_templates.php b/pandora_console/godmode/alerts/alert_templates.php index 8f3095b6bf..5801e427d0 100644 --- a/pandora_console/godmode/alerts/alert_templates.php +++ b/pandora_console/godmode/alerts/alert_templates.php @@ -281,7 +281,7 @@ $table->head[4] = __('Op.'); $table->style = array (); $table->style[0] = 'font-weight: bold'; $table->size = array (); -$table->size[4] = '65px'; +$table->size[4] = '85px'; $table->align = array (); $table->align[1] = 'center'; $table->align[4] = 'center'; diff --git a/pandora_console/godmode/category/edit_category.php b/pandora_console/godmode/category/edit_category.php index 4a1841a0dc..d65a0fc88f 100755 --- a/pandora_console/godmode/category/edit_category.php +++ b/pandora_console/godmode/category/edit_category.php @@ -107,6 +107,8 @@ else { $name_category = ""; } +enterprise_hook('open_meta_frame'); + // Create/Update category form echo '
'; @@ -143,4 +145,6 @@ echo ""; echo ''; echo '
'; +enterprise_hook('close_meta_frame'); + ?> diff --git a/pandora_console/godmode/groups/configure_group.php b/pandora_console/godmode/groups/configure_group.php index 27bb0c3de8..3616f1b3bb 100644 --- a/pandora_console/godmode/groups/configure_group.php +++ b/pandora_console/godmode/groups/configure_group.php @@ -148,7 +148,7 @@ $table->data[8][0] = __('Other') . ui_print_help_tip (__("Information accessible $table->data[8][1] = html_print_textarea ('other', 4, 40, $other, "style='min-height: 0px;'", true); $isFunctionSkins = enterprise_include_once ('include/functions_skins.php'); -if ($isFunctionSkins !== ENTERPRISE_NOT_HOOK) { +if ($isFunctionSkins !== ENTERPRISE_NOT_HOOK && !defined('METACONSOLE')) { $table->data[9][0] = __('Skin'); $table->data[9][1] = skins_print_select($config["id_user"], 'skin', $skin, '', __('None'), 0, true); } diff --git a/pandora_console/godmode/modules/manage_network_components.php b/pandora_console/godmode/modules/manage_network_components.php index 1dec7876fe..8348f09f1c 100644 --- a/pandora_console/godmode/modules/manage_network_components.php +++ b/pandora_console/godmode/modules/manage_network_components.php @@ -493,7 +493,7 @@ $table->head[6] = __('Action') . html_print_checkbox('all_delete', 0, false, true, false, 'check_all_checkboxes();'); $table->size = array (); $table->size[1] = '75px'; -$table->size[6] = '60px'; +$table->size[6] = '80px'; $table->align[6] = 'center'; $table->data = array (); diff --git a/pandora_console/godmode/tag/edit_tag.php b/pandora_console/godmode/tag/edit_tag.php index fa2b9cdd9d..26f26c414f 100644 --- a/pandora_console/godmode/tag/edit_tag.php +++ b/pandora_console/godmode/tag/edit_tag.php @@ -142,10 +142,12 @@ else { $phone_tag = ""; } +enterprise_hook('open_meta_frame'); + // Create/Update tag form echo '
'; -echo '
'; +echo '
'; echo ""; echo ""; @@ -213,4 +215,6 @@ echo "
"; echo '
'; echo ''; +enterprise_hook('close_meta_frame'); + ?> diff --git a/pandora_console/godmode/tag/tag.php b/pandora_console/godmode/tag/tag.php index 5cda0af950..75968fae97 100644 --- a/pandora_console/godmode/tag/tag.php +++ b/pandora_console/godmode/tag/tag.php @@ -153,11 +153,9 @@ if (!empty($result)) { $table->head = array (); $table->align = array (); $table->style = array (); - $table->style[0] = 'font-weight: bold; text-align:center'; - $table->style[1] = 'text-align:center'; - $table->style[2] = 'text-align:center'; + $table->style[0] = 'font-weight: bold;'; $table->style[3] = 'text-align:center'; - $table->style[5] = 'text-align:center'; + $table->style[6] = 'text-align:center'; $table->head[0] = __('Tag name'); $table->head[1] = __('Description'); $table->head[2] = __('Detail information'); diff --git a/pandora_console/include/styles/pandora.css b/pandora_console/include/styles/pandora.css index 26e52cc502..b17db72023 100644 --- a/pandora_console/include/styles/pandora.css +++ b/pandora_console/include/styles/pandora.css @@ -239,7 +239,7 @@ div#main_help div.databox h3, div#main_help div.databox h2 { font-family: sans-serif, verdana; } -div#main_help a.footer { +div#main_help a.footer, div#main_help span { color: #999; }