From: cajus Date: Mon, 7 May 2007 14:46:43 +0000 (+0000) Subject: Layout and translation fixes X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=f1725c51c8294875a9a5593c642d50955d43aab1;p=gosa.git Layout and translation fixes git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@6283 594d385d-05f5-0310-b6e9-bd551577e9d8 --- diff --git a/setup/class_setupStep_Migrate.inc b/setup/class_setupStep_Migrate.inc index b8e860868..0c936fa79 100644 --- a/setup/class_setupStep_Migrate.inc +++ b/setup/class_setupStep_Migrate.inc @@ -211,7 +211,7 @@ class Step_Migrate extends setup_step $this->checks['uidNumber_usage']['STATUS'] = FALSE; $this->checks['uidNumber_usage']['STATUS_MSG']= ""._("Warning").""; $this->checks['uidNumber_usage']['ERROR_MSG'] = - sprintf(_("Found %s duplicated uidNumber values."),count($this->check_uidNumbers)); + sprintf(_("Found %s duplicate values for attribute 'uidNumber'."),count($this->check_uidNumbers)); return(false); }else{ $this->checks['uidNumber_usage']['STATUS'] = TRUE; @@ -260,7 +260,7 @@ class Step_Migrate extends setup_step $this->checks['gidNumber_usage']['STATUS'] = FALSE; $this->checks['gidNumber_usage']['STATUS_MSG']= ""._("Warning").""; $this->checks['gidNumber_usage']['ERROR_MSG'] = - sprintf(_("Found %s duplicate gidNumber."),count($this->check_gidNumbers)); + sprintf(_("Found %s duplicate values for attribute 'gidNumber'."),count($this->check_gidNumbers)); return(false); }else{ $this->checks['gidNumber_usage']['STATUS'] = TRUE; @@ -362,10 +362,10 @@ class Step_Migrate extends setup_step if(count($this->outside_groups)){ $this->checks['outside_groups']['STATUS'] = FALSE; - $this->checks['outside_groups']['STATUS_MSG']= _("Failed"); + $this->checks['outside_groups']['STATUS_MSG']= ""._("Warning").""; $this->checks['outside_groups']['ERROR_MSG'] = - sprintf(_("Found %s groups outside the selected group ou '%s'."),count($this->outside_groups),$group_ou); - $this->checks['outside_groups']['ERROR_MSG'].= ""; + sprintf(_("Found %s groups outside the configured tree '%s'."),count($this->outside_groups),$group_ou); + $this->checks['outside_groups']['ERROR_MSG'].= " "; return(false); }else{ $this->checks['outside_groups']['STATUS'] = TRUE; @@ -410,7 +410,7 @@ class Step_Migrate extends setup_step $this->checks['outside_users']['STATUS'] = FALSE; $this->checks['outside_users']['STATUS_MSG']= ""._("Warning").""; $this->checks['outside_users']['ERROR_MSG'] = - sprintf(_("Found %s user(s) outside the selected user ou '%s'."),count($this->outside_users),$people_ou); + sprintf(_("Found %s user(s) outside the configured tree '%s'."),count($this->outside_users),$people_ou); $this->checks['outside_users']['ERROR_MSG'].= ""; return(false); }else{ @@ -993,8 +993,6 @@ class Step_Migrate extends setup_step function migrate_outside_users($perform = FALSE) { - $this->show_details= $perform; - /* Establish ldap connection */ $cv = $this->parent->captured_values; $ldap = new LDAP($cv['admin'], @@ -1029,7 +1027,7 @@ class Step_Migrate extends setup_step $refs .= "
\t".$ref_dn; } if(!empty($refs)){ - $this->outside_users[$b_dn]['ldif'] .= "

"._("Updating following references too").":".$refs; + $this->outside_users[$b_dn]['ldif'] .= "

"._("The following references will be updated").":".$refs; } }else{ @@ -1088,9 +1086,14 @@ class Step_Migrate extends setup_step } if(isset($_POST['outside_groups_dialog_whats_done'])){ + $this->show_details= TRUE; $this->migrate_outside_groups(FALSE); } + if(isset($_POST['outside_groups_dialog_refresh'])){ + $this->show_details= FALSE; + } + if(isset($_POST['outside_groups_dialog_perform'])){ $this->migrate_outside_groups(TRUE); $this->search_outside_groups(); @@ -1106,6 +1109,7 @@ class Step_Migrate extends setup_step $smarty->assign("ous",$this->get_all_group_ous()); $smarty->assign("method","outside_groups"); $smarty->assign("outside_groups",$this->outside_groups); + $smarty->assign("group_details", $this->show_details); return($smarty->fetch(get_template_path("setup_migrate.tpl",TRUE,dirname(__FILE__)))); } @@ -1119,6 +1123,7 @@ class Step_Migrate extends setup_step } if(isset($_POST['outside_users_dialog_whats_done'])){ + $this->show_details= TRUE; $this->migrate_outside_users(FALSE); } @@ -1127,6 +1132,10 @@ class Step_Migrate extends setup_step $this->search_outside_users(); } + if (isset($_POST['outside_users_dialog_refresh'])){ + $this->show_details= FALSE; + } + if(isset($_POST['outside_users_dialog'])){ $this->outside_users_dialog = TRUE; $this->dialog = TRUE; @@ -1138,7 +1147,6 @@ class Step_Migrate extends setup_step $smarty->assign("method","outside_users"); $smarty->assign("outside_users",$this->outside_users); $smarty->assign("user_details", $this->show_details); -var_dump($this->show_details); return($smarty->fetch(get_template_path("setup_migrate.tpl",TRUE,dirname(__FILE__)))); } diff --git a/setup/setup_migrate.tpl b/setup/setup_migrate.tpl index c34243609..21bf665fe 100644 --- a/setup/setup_migrate.tpl +++ b/setup/setup_migrate.tpl @@ -81,13 +81,20 @@ {elseif $method == "outside_groups"} -

{t}Move groups into valid group departments{/t}

- - {t}This dialog allows you to move the displayed groups into a valid group department{/t} -
- {t}Be careful with this tool, there may be references pointing to this group that can't be migrated.{/t} -
-
+

{t}Move groups into configured group tree{/t}

+ +

+ {t}This dialog allows moving a couple of groups to the configured group tree. Doing this may straighten your LDAP service.{/t} +

+

+ {t}Be careful with this option! There may be references pointing to these groups. The GOsa setup can't migrate references, so you may want to cancel the migration in this case in this case.{/t} +

+

+ {t}Move selected groups into this group tree{/t}: + +

{foreach from=$outside_groups item=val key=key} {if $outside_groups.$key.selected} @@ -97,7 +104,7 @@ {/if}  {$outside_groups.$key.dn} - {if $outside_groups.$key.ldif != ""} + {if $outside_groups.$key.ldif != "" && $group_details} 
@@ -110,19 +117,18 @@
 			{/foreach}
 
 			

-			{t}Move selected group into the following GOsa people department{/t} : 
-			
-			

-			
-			
+                        {if $group_details}
+                        
+                        {else}
+                        
+                        {/if}
 			

-				
 
 			
 
	
-			

-				
+			

+				
+				 
+				
 			

 		
 		{elseif $method == "outside_users"}
@@ -135,7 +141,7 @@
 			{t}Be careful with this option! There may be references pointing to these users. The GOsa setup can't migrate references, so you may want to cancel the migration in this case in this case.{/t}
 			
	
 			

-			{t}Move selected user into the following GOsa people department{/t}: 
+			{t}Move selected users into this people tree{/t}: 
 			
@@ -148,7 +154,7 @@
 				{/if}
 
 				 {$outside_users.$key.dn}
-				{if $outside_users.$key.ldif != ""}
+				{if $outside_users.$key.ldif != "" && $user_details}
                       

 

 
@@ -168,7 +174,7 @@
 
 			
 
	
 			

-				
+				
 				 
 				
 			

@@ -253,9 +259,9 @@
 
 			

 				{if $users_cnt != 0 || $groups_cnt != 0}
-				
+				
 				{else}
-					
+					
 				{/if}
 				 
 				
@@ -311,7 +317,7 @@ dn: {$deps_to_migrate.$key.dn}
 			
 
	
 
 			

-				
+				
 				 
 				
 			

@@ -365,7 +371,7 @@ dn: {$users_to_migrate.$key.dn}
 			
 
	
 
 			

-				
+