From: cajus <cajus@594d385d-05f5-0310-b6e9-bd551577e9d8>
Date: Mon, 7 May 2007 13:36:41 +0000 (+0000)
Subject: Fixed filtering problems
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=876e1d73283b8328db77599da2fac401619a3f40;p=gosa.git

Fixed filtering problems


git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@6280 594d385d-05f5-0310-b6e9-bd551577e9d8
---

diff --git a/setup/class_setupStep_Migrate.inc b/setup/class_setupStep_Migrate.inc
index 37955aec0..303c24f85 100644
--- a/setup/class_setupStep_Migrate.inc
+++ b/setup/class_setupStep_Migrate.inc
@@ -408,7 +408,7 @@ class Step_Migrate extends setup_step
 
     if(count($this->outside_users)){
       $this->checks['outside_users']['STATUS']    = FALSE;
-      $this->checks['outside_users']['STATUS_MSG']= _("Failed");
+      $this->checks['outside_users']['STATUS_MSG']= "<font style='color:#F0A500'>"._("Warning")."</font>";
       $this->checks['outside_users']['ERROR_MSG'] = 
         sprintf(_("Found %s user(s) outside the selected user ou '%s'."),count($this->outside_users),$people_ou);
       $this->checks['outside_users']['ERROR_MSG'].= "<input type='submit' name='outside_users_dialog' value='"._("Migrate")."'>";
diff --git a/setup/setup_migrate.tpl b/setup/setup_migrate.tpl
index 99d781589..8bcf7ddbb 100644
--- a/setup/setup_migrate.tpl
+++ b/setup/setup_migrate.tpl
@@ -127,13 +127,13 @@
 		
 		{elseif $method == "outside_users"}
 
-			<h2>{t}Move users into valid user departments{/t}</h2>
-
-			{t}This dialog allows you to move the displayed users into a valid user department{/t}
-			<br>
-			{t}Be careful with this tool, there may be references pointing to this user that can't be migrated.{/t}
-			<br>
-			<br>	
+			<h2>{t}Move users into configured user tree{/t}</h2>
+			<p>
+			{t}This dialog allows moving a couple of users to the configured user tree.{/t}
+			</p>
+			<p style='color:red'>
+			{t}Be careful with this option! There may be references pointing to these users. The setup can't migrate references, so you may want to abort in this case.{/t}
+			</p>	
 
 			{foreach from=$outside_users item=val key=key}
 				{if $outside_users.$key.selected}
@@ -161,14 +161,15 @@
 				{html_options options=$ous}
 			</select>
 			<br>
-			<input type='submit' name='outside_users_dialog_perform' value='{t}Move selected user{/t}'>
-			<input type='submit' name='outside_users_dialog_whats_done' value='{t}What will be done here{/t}'>
+			<input type='submit' name='outside_users_dialog_whats_done' value='{t}Show changes{/t}'>
 			</p>
 				
 
 			<p class='seperator'>&nbsp;</p>	
-			<div style='width:100%; text-align:right; padding:5px;'>
-				<input type='submit' name='outside_users_dialog_cancel' value='{t}Close{/t}'>
+			<div style='width:99%; text-align:right; padding:5px;'>
+				<input type='submit' name='outside_users_dialog_perform' value='{t}Move{/t}'>
+				&nbsp;
+				<input type='submit' name='outside_users_dialog_cancel' value='{t}Cancel{/t}'>
 			</div>