X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=setup%2Fsetup_migrate.tpl;h=8a6beab6b1bda274963331e7f4d4a408173245e2;hb=049d5937871ef555967a0adbae9b5f3a9f987f5f;hp=30ac7d651ae020c1dbe37224df04001b8eb20778;hpb=48029b82c110fa8a93cb3476982dc19b92195a04;p=gosa.git

diff --git a/setup/setup_migrate.tpl b/setup/setup_migrate.tpl
index 30ac7d651..8a6beab6b 100644
--- a/setup/setup_migrate.tpl
+++ b/setup/setup_migrate.tpl
@@ -1,15 +1,16 @@
 <div>
 
 	<h1 style='color:red'>Style fixes necessary here ;-)</h1>
+    <div class='default'>
+
+	{if $method == "default"}
 
 	<p>	
 		Create a reload for each entry later 
 		<input type='submit' name='reload' value='{t}Reload{/t}'>
+		<p>&nbsp;</p>
 	</p>
 
-    <div class='default'>
-
-		{if $method == "default"}
 			{foreach from=$checks item=val key=key}
 				<div class='step2_entry_name'><b>{$checks.$key.TITLE}</b></div>
 				{if $checks.$key.STATUS}
@@ -19,7 +20,7 @@
 					{/if}
 					</div>
 				{else}
-					<div class='step2_failed'>{$checks.$key.STATUS_MSG}
+					<div class='step2_failed' style='float:none'>{$checks.$key.STATUS_MSG}
 					</div>
 					<div>
 					{if $checks.$key.ERROR_MSG}
@@ -27,9 +28,149 @@
 					{/if}
 					</div>
 				{/if}
-				<p>&nbsp;</p>	
+				<div>&nbsp;</div>
+			{/foreach}
+
+		{elseif $method == "outside_winstations"}
+
+			<h2>{t}Move windows workstations into a valid windows workstation department{/t}</h2>
+
+			{t}This dialog allows you to move the displayed windows workstations into a valid department{/t}
+			<br>
+			{t}Be careful with this tool, there may be references pointing to this workstations that can't be migrated.{/t}
+			<br>
+			<br>	
+
+			{foreach from=$outside_winstations item=val key=key}
+				{if $outside_winstations.$key.selected}
+					<input type='checkbox' name='select_winstation_{$key}' checked>
+				{else}
+					<input type='checkbox' name='select_winstation_{$key}'>
+				{/if}
+
+				&nbsp;{$outside_winstations.$key.dn}
+				{if $outside_winstations.$key.ldif != ""}
+                    <div class="step2_entry_container_info" id="sol_8">
+						<div style='padding-left:20px;'>
+							<pre>
+								{$outside_winstations.$key.ldif}
+							</pre>
+						</div>
+					</div>
+				{/if}
+				<br>
+			{/foreach}
+
+			<p>
+			<b>{t}Move selected windows workstations into the following GOsa department{/t} : </b>
+			<select name='move_winstation_to'>
+				{html_options options=$ous}
+			</select>
+			<br>
+			<input type='submit' name='outside_winstations_dialog_perform' value='{t}Move selected workstations{/t}'>
+			<input type='submit' name='outside_winstations_dialog_whats_done' value='{t}What will be done here{/t}'>
+			</p>
+				
+
+			<p class='seperator'>&nbsp;</p>	
+			<div style='width:100%; text-align:right; padding:5px;'>
+				<input type='submit' name='outside_winstations_dialog_cancel' value='{t}Close{/t}'>
+			</div>
+		
+
+		{elseif $method == "outside_groups"}
+
+			<h2>{t}Move groups into valid group departments{/t}</h2>
+
+			{t}This dialog allows you to move the displayed groups into a valid group department{/t}
+			<br>
+			{t}Be careful with this tool, there may be references pointing to this group that can't be migrated.{/t}
+			<br>
+			<br>	
+
+			{foreach from=$outside_groups item=val key=key}
+				{if $outside_groups.$key.selected}
+					<input type='checkbox' name='select_group_{$key}' checked>
+				{else}
+					<input type='checkbox' name='select_group_{$key}'>
+				{/if}
+
+				&nbsp;{$outside_groups.$key.dn}
+				{if $outside_groups.$key.ldif != ""}
+                      <div class="step2_entry_container_info" id="sol_8">
+<div style='padding-left:20px;'>
+<pre>
+{$outside_groups.$key.ldif}
+</pre>
+</div>
+</div>
+				{/if}
+				<br>
+			{/foreach}
+
+			<p>
+			<b>{t}Move selected group into the following GOsa people department{/t} : </b>
+			<select name='move_group_to'>
+				{html_options options=$ous}
+			</select>
+			<br>
+			<input type='submit' name='outside_groups_dialog_perform' value='{t}Move selected groups{/t}'>
+			<input type='submit' name='outside_groups_dialog_whats_done' value='{t}What will be done here{/t}'>
+			</p>
+				
+
+			<p class='seperator'>&nbsp;</p>	
+			<div style='width:100%; text-align:right; padding:5px;'>
+				<input type='submit' name='outside_groups_dialog_cancel' value='{t}Close{/t}'>
+			</div>
+		
+		{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>	
+
+			{foreach from=$outside_users item=val key=key}
+				{if $outside_users.$key.selected}
+					<input type='checkbox' name='select_user_{$key}' checked>
+				{else}
+					<input type='checkbox' name='select_user_{$key}'>
+				{/if}
+
+				&nbsp;{$outside_users.$key.dn}
+				{if $outside_users.$key.ldif != ""}
+                      <div class="step2_entry_container_info" id="sol_8">
+<div style='padding-left:20px;'>
+<pre>
+{$outside_users.$key.ldif}
+</pre>
+</div>
+</div>
+				{/if}
+				<br>
 			{/foreach}
 
+			<p>
+			<b>{t}Move selected user into the following GOsa people department{/t} : </b>
+			<select name='move_user_to'>
+				{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}'>
+			</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>
+		
+
 		{elseif $method == "create_acls"}
 
 		<h2>{t}Acl setup{/t}</h2>
@@ -45,39 +186,50 @@
 		{else}
 		<b>{t}Create a new user and a group with adminstrational acls{/t}</b><br>
 	
+			{t}To automatically add a new administrative user to your ldap database use the formular below.{/t}<br>
 			<p style='padding-left:10px;'>
-			{t}To automatically add a new administrative user and group to your ldap database use the formular below.{/t}<br>
 			<table>
 				<tr>
 					<td>
-						{t}User uid{/t}:&nbsp;
+						{t}Name{/t}:&nbsp;
 					</td>
 					<td>
-						<input type='input' value='' name='new_user_uid'><br>
+						<i>System administrator</i>
 					</td>
-				</tr>
+				<tr>
 				<tr>
 					<td>
-						{t}User password{/t}:&nbsp;
+						{t}User ID{/t}:&nbsp;
 					</td>
 					<td>
-						<input type='input' value='' name='new_user_password'><br>
+						<i>admin</i>
 					</td>
-				</tr>
 				<tr>
+				</tr>
 					<td>
-						{t}Group name{/t}:&nbsp;
+						{t}Password{/t}:&nbsp;
 					</td>
 					<td>
-						<input type='input' value='' name='new_group_cn'>
+						<input type='password' value='{$new_user_password}' name='new_user_password'><br>
 					</td>
 				</tr>
-			</table>	
+				</tr>
+					<td>
+						{t}Retype password{/t}:&nbsp;
+					</td>
+					<td>
+						<input type='password' value='{$new_user_password2}' name='new_user_password2'><br>
+					</td>
+				</tr>
+			</table>
+			<input type='submit' name='create_admin_user' value='{t}Create{/t}'>	
 			</p>
-
+			
+			{if $users_cnt != 0 || $groups_cnt != 0}
+			
 			<p>&nbsp;</p>
 			<b>{t}Append administrational acls to existing an user or a group{/t}</b><br>
-			Bla {t}To grant administrative permissions to a user or a group, select an element and use button below.{/t}
+			{t}To grant administrative permissions to a user or a group, select an element and use button below.{/t}
 			<p style='padding-left:10px;'>
 			<select name='acl_create_type' onChange='document.mainform.submit();' >
 				{if $type == "user"}
@@ -98,6 +250,7 @@
 
 				<input type='submit' name='create_acls_create' value='{t}Add administrational acls to this object{/t}'>
 			</p>
+			{/if}
 		{/if}