### Eclipse Workspace Patch 1.0 #P expresso_branch_22 Index: expressoAdmin1_2/templates/default/groups_form.tpl =================================================================== --- expressoAdmin1_2/templates/default/groups_form.tpl (revision 3769) +++ expressoAdmin1_2/templates/default/groups_form.tpl (working copy) @@ -1,26 +1,34 @@ + + + + +
+
+ + + + + + + +
+ + + + + + +
{lang_general_information}{lang_aplication_permission}{lang_block_personal_data_edit}
+
+ - - +
- {rows} - - - - - - - - - - - - - - +
+
- - -
{lang_search_organization}:
@@ -29,7 +37,6 @@ {lang_group_organization}:

{lang_group_name}: Ex: grupo-celepar-rh
-
{lang_email}:

@@ -54,7 +61,6 @@
{lang_do_not_show_this_group}?
- {lang_group_users} ({user_count}):
@@ -74,49 +80,66 @@ {lang_organizations}:
- +
{lang_show_users_from_all_sub-organizations}.

- + {lang_search_user}:

- +  
{lang_users}:
+ + +
+ - - - - -
- {lang_applications}: -
- + +
+ {apps}
+ + +
+ - + +
- {lang_block_personal_data_edit}: -
- + +
+ {personal_data_fields}
+ +
-
- - -
+ + + +
+ + + +
+ + + + +
\ No newline at end of file Index: expressoAdmin1_2/inc/class.uigroups.inc.php =================================================================== --- expressoAdmin1_2/inc/class.uigroups.inc.php (revision 3769) +++ expressoAdmin1_2/inc/class.uigroups.inc.php (working copy) @@ -44,6 +44,7 @@ $GLOBALS['phpgw']->js->validate_file('jscode','connector','expressoAdmin1_2');#diretorio, arquivo.js, aplicacao $GLOBALS['phpgw']->js->validate_file('jscode','expressoadmin','expressoAdmin1_2'); $GLOBALS['phpgw']->js->validate_file('jscode','groups','expressoAdmin1_2'); + $GLOBALS['phpgw']->js->validate_file('jscode','tabs','expressoAdmin1_2'); } function list_groups() @@ -375,7 +376,41 @@ function css() { - $appCSS = ''; + $appCSS = + 'th.activetab + { + color:#000000; + background-color:#D3DCE3; + border-top-width : 1px; + border-top-style : solid; + border-top-color : Black; + border-left-width : 1px; + border-left-style : solid; + border-left-color : Black; + border-right-width : 1px; + border-right-style : solid; + border-right-color : Black; + font-size: 12px; + font-family: Tahoma, Arial, Helvetica, sans-serif; + } + + th.inactivetab + { + color:#000000; + background-color:#E8F0F0; + border-bottom-width : 1px; + border-bottom-style : solid; + border-bottom-color : Black; + font-size: 12px; + font-family: Tahoma, Arial, Helvetica, sans-serif; + } + + .td_left {border-left:1px solid Gray; border-top:1px solid Gray; border-bottom:1px solid Gray;} + .td_right {border-right:1px solid Gray; border-top:1px solid Gray; border-bottom:1px solid Gray;} + + div.activetab{ display:inline; } + div.inactivetab{ display:none; }'; + return $appCSS; }