From 28466ad057c5f54b7244c908693d5367050c50d6 Mon Sep 17 00:00:00 2001 From: zarzuelo Date: Fri, 20 Sep 2013 09:52:58 +0000 Subject: [PATCH] 2013-09-20 Sergio Martin * operation/agentes/estado_monitores.php godmode/agentes/module_manager.php: Fixing translation of adopted modules and reestructure translations calls to do the translations more efecctively for bug #2375 * general/login_help_dialog.php: Fix size of the login help dialog git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8788 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f --- pandora_console/ChangeLog | 10 ++++++++++ pandora_console/general/login_help_dialog.php | 4 ++-- pandora_console/godmode/agentes/module_manager.php | 6 +++--- pandora_console/operation/agentes/estado_monitores.php | 6 +++--- 4 files changed, 18 insertions(+), 8 deletions(-) diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog index dc30809fd9..193bace332 100644 --- a/pandora_console/ChangeLog +++ b/pandora_console/ChangeLog @@ -1,3 +1,13 @@ +2013-09-20 Sergio Martin + + * operation/agentes/estado_monitores.php + godmode/agentes/module_manager.php: Fixing translation + of adopted modules and reestructure translations calls + to do the translations more efecctively for bug #2375 + + * general/login_help_dialog.php: Fix size + of the login help dialog + 2013-09-19 Sergio Martin * include/functions_groups.php diff --git a/pandora_console/general/login_help_dialog.php b/pandora_console/general/login_help_dialog.php index 8fbd133818..1ffc8c3224 100644 --- a/pandora_console/general/login_help_dialog.php +++ b/pandora_console/general/login_help_dialog.php @@ -106,8 +106,8 @@ $(document).ready (function () { resizable: true, draggable: true, modal: true, - height: 420, - width: 600, + height: 450, + width: 630, overlay: { opacity: 0.5, background: "black" diff --git a/pandora_console/godmode/agentes/module_manager.php b/pandora_console/godmode/agentes/module_manager.php index 1c3654b468..21722a8e75 100644 --- a/pandora_console/godmode/agentes/module_manager.php +++ b/pandora_console/godmode/agentes/module_manager.php @@ -592,7 +592,7 @@ foreach ($modules as $module) { if ($linked) { if ($adopt) { $img = 'images/policies_brick.png'; - $title = __('(Adopt) ') . $policyInfo['name_policy']; + $title = '(' . __('Adopted') . ') ' . $policyInfo['name_policy']; } else { $img = 'images/policies.png'; @@ -602,11 +602,11 @@ foreach ($modules as $module) { else { if ($adopt) { $img = 'images/policies_not_brick.png'; - $title = __('(Adopt) (Unlinked) ') . $policyInfo['name_policy']; + $title = '(' . __('Unlinked') . ') (' . __('Adopted') . ') ' . $policyInfo['name_policy']; } else { $img = 'images/unlinkpolicy.png'; - $title = __('(Unlinked) ') . $policyInfo['name_policy']; + $title = '(' . __('Unlinked') . ') ' . $policyInfo['name_policy']; } } diff --git a/pandora_console/operation/agentes/estado_monitores.php b/pandora_console/operation/agentes/estado_monitores.php index 54f578512f..1f34b4bba8 100644 --- a/pandora_console/operation/agentes/estado_monitores.php +++ b/pandora_console/operation/agentes/estado_monitores.php @@ -366,7 +366,7 @@ foreach ($modules as $module) { if ($linked) { if ($adopt) { $img = 'images/policies_brick.png'; - $title = __('(Adopt) ') . $name_policy; + $title = '(' . __('Adopted') . ') ' . $name_policy; } else { $img = 'images/policies.png'; @@ -376,11 +376,11 @@ foreach ($modules as $module) { else { if ($adopt) { $img = 'images/policies_not_brick.png'; - $title = __('(Unlinked) (Adopt) ') . $name_policy; + $title = '(' . __('Unlinked') . ') (' . __('Adopted') . ') ' . $name_policy; } else { $img = 'images/unlinkpolicy.png'; - $title = __('(Unlinked) ') . $name_policy; + $title = '(' . __('Unlinked') . ') ' . $name_policy; } }