X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=gosa-core%2Fsetup%2Fsetup_migrate.tpl;h=4563879188148eb1cbbda5c69aa5fb443a6d9a3e;hb=43073ac4d0e6b18428c163774622e15629b4ffb5;hp=cbb7eec446b7cc3d42019f93b80c48b594f08fce;hpb=7d077eef53c40bb965f6ec5da01534383dbef256;p=gosa.git

diff --git a/gosa-core/setup/setup_migrate.tpl b/gosa-core/setup/setup_migrate.tpl
index cbb7eec44..456387918 100644
--- a/gosa-core/setup/setup_migrate.tpl
+++ b/gosa-core/setup/setup_migrate.tpl
@@ -32,6 +32,34 @@
 		<br>
 		<input type='submit' name='reload' value='{t}Check again{/t}'>
 
+		{elseif $method == "rootOC_migrate_dialog"}
+
+			<h2>{t}Add required object classes to the LDAP base{/t}</h2>
+
+			<b>{t}Current{/t}</b>
+			<div class="step2_entry_container_info">
+				<div style='padding-left:20px;'>
+					<pre>{$details.current}</pre>
+				</div>
+			</div>
+			<br>
+			<b>{t}After migration{/t}</b>
+			<div class="step2_entry_container_info">
+				<div style='padding-left:20px;'>
+					<pre>{$details.target}</pre>
+				</div>
+			</div>
+
+			<br>
+			<input type='submit' name='rootOC_migrate_start' value='{t}Migrate{/t}'>
+			</p>
+				
+
+			<p class='seperator'>&nbsp;</p>	
+			<div style='width:100%; text-align:right; padding:5px;'>
+				<input type='submit' name='rootOC_dialog_cancel' value='{t}Close{/t}'>
+			</div>
+
 		{elseif $method == "outside_winstations"}
 
 			<h2>{t}Move windows workstations into a valid windows workstation department{/t}</h2>
@@ -187,6 +215,52 @@
 			</div>
 		
 
+		{elseif $method == "migrate_acls"}
+			<h2>{t}Migrate GOsa 2.5 administrative accounts{/t}</h2>
+            <p>
+            {t}This dialog allows the migration of GOsa 2.5 admin accounts into GOsa 2.6 useable accounts.{/t}
+            </p>
+			<table>	
+				<tr>	
+					<td></td>
+					<td></td>
+				</tr>
+			{foreach from=$migrateable_users item=item key=key}
+				<tr>
+					<td><input type='checkbox' name='migrate_admin_{$key}' value='{$key}' {if $item.checked} checked {/if}></td>
+					<td>{$item.dn}</td>
+				</tr>
+			{/foreach}
+			</table>
+
+			{if !$details}
+				<input type='submit' name='migrate_acls_show_changes' value='{t}Show changes{/t}'>
+				<input type='hidden' name='details' value='0'>
+			{else}
+				<input type='hidden' name='details' value='1'>
+
+				<br>
+				<div class="step2_entry_container_info">
+				{t}Current{/t}
+				<div style='padding-left:20px;'>
+					<pre>{$migrate_acl_base_entry}</pre>
+				</div>
+				{t}After migration{/t}
+				<div style='padding-left:20px;'>
+					<pre>{$migrate_acl_base_entry}{foreach from=$migrateable_users item=item key=key}{if $item.checked}<b>{$item.details}</b>{/if}{/foreach}</pre>
+				</div>
+				</div>
+				<br>
+				<input type='submit' name='migrate_acls_hide_changes' value='{t}Hide changes{/t}'>
+			{/if}
+
+			<input type='submit' value="{t}Reload{/t}">
+			<p class='seperator'>&nbsp;</p>	
+			<div style='width:99%; text-align:right; padding:5px;'>
+				<input type='submit' name='migrate_admin_user' value='{t}Apply{/t}'>	
+				<input type='submit' name='migrate_acls_cancel' value='{t}Cancel{/t}'>
+			</div>
+
 		{elseif $method == "create_acls"}
 
 		{if $acl_create_selected != "" && $what_will_be_done_now!=""}
@@ -311,7 +385,7 @@ dn: {$deps_to_migrate.$key.dn}
 	
 			<h2>User migration</h2>
 
-			<p>{t}The listed users are currenlty invisble in the GOsa user interface. If you want to change this for a couple of users, just select them and use the 'Migrate' button below.{/t}</p>
+			<p>{t}The listed users are currently invisible in the GOsa user interface. If you want to change this for a couple of users, just select them and use the 'Migrate' button below.{/t}</p>
 			<p>{t}If you want to know what will be done when migrating the selected entries, use the 'Show changes' button to see the LDIF.{/t}</p>
 			{foreach from=$users_to_migrate item=val key=key}
 
@@ -365,9 +439,9 @@ dn: {$users_to_migrate.$key.dn}
 	{elseif $method == "devices"}
 
 
-			<h2>User devices</h2>
+			<h2>Devices</h2>
 
-			<p>{t}The listed devices are currenlty invisble in the GOsa interface. If you want to change this for a couple of devices, just select them and use the 'Migrate' button below.{/t}</p>
+			<p>{t}The listed devices are currently invisible in the GOsa interface. If you want to change this for a couple of devices, just select them and use the 'Migrate' button below.{/t}</p>
 			<p>{t}If you want to know what will be done when migrating the selected entries, use the 'Show changes' button to see the LDIF.{/t}</p>
 		{foreach from=$devices item=item key=key}
            	<input type='checkbox' name='migrate_{$key}' id='migrate_{$key}' {if $item.DETAILS} checked {/if}>
@@ -411,7 +485,7 @@ dn: {$users_to_migrate.$key.dn}
 
 			<h2>Services</h2>
 
-			<p>{t}The listed services are currenlty invisble in the GOsa interface. If you want to change this for a couple of devices, just select them and use the 'Migrate' button below.{/t}</p>
+			<p>{t}The listed services are currently invalid for the GOsa version you are going to install. If you want to update a couple of service, just select them and use the 'Migrate' button below.{/t}</p>
 			<p>{t}If you want to know what will be done when migrating the selected entries, use the 'Show changes' button to see the LDIF.{/t}</p>
 		{foreach from=$services item=item key=key}
            	<input type='checkbox' name='migrate_{$key}' id='migrate_{$key}' {if $item.DETAILS} checked {/if}>
@@ -455,7 +529,7 @@ dn: {$users_to_migrate.$key.dn}
 
 			<h2>Application menus</h2>
 
-			<p>{t}The listed menus are currenlty invisble in the GOsa interface. If you want to change this for a couple of devices, just select them and use the 'Migrate' button below.{/t}</p>
+			<p>{t}The listed menus are currently invisible in the GOsa interface. If you want to change this for a couple of devices, just select them and use the 'Migrate' button below.{/t}</p>
 			<p>{t}If you want to know what will be done when migrating the selected entries, use the 'Show changes' button to see the LDIF.{/t}</p>
 		{foreach from=$menus item=item key=key}
            	<input type='checkbox' name='migrate_{$key}' id='migrate_{$key}' {if $item.DETAILS} checked {/if}>