Updated layout

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

diff --git a/setup/class_setupStep_Migrate.inc b/setup/class_setupStep_Migrate.inc
index 9a5fc8ca4df5ec7a5299b8da7ecb3d2c4b1456d3..7ca78fedd43ddf467bfce42ea802924a3a550406 100644 (file)
--- a/setup/class_setupStep_Migrate.inc
+++ b/setup/class_setupStep_Migrate.inc
@@ -59,6 +59,7 @@ class Step_Migrate extends setup_step
   /* Department migration attributes */
   var $dep_migration_dialog = FALSE;
   var $deps_to_migrate      = array();
+  var $show_details         = FALSE;
 
   /* Department migration attributes */
   var $users_migration_dialog= FALSE;
@@ -116,7 +117,7 @@ class Step_Migrate extends setup_step
     $this->checks['root']['ERROR_MSG'] = "";
     $this->checkBase();
 
-    $this->checks['permissions']['TITLE']     = _("Checking permissions on ldap database");
+    $this->checks['permissions']['TITLE']     = _("Checking permissions on LDAP database");
     $this->checks['permissions']['STATUS']    = FALSE;
     $this->checks['permissions']['STATUS_MSG']= "";
     $this->checks['permissions']['ERROR_MSG'] = "";
@@ -669,9 +670,9 @@ class Step_Migrate extends setup_step
       $this->checks['deps_visible']['STATUS_MSG']= _("Ok");
       $this->checks['deps_visible']['ERROR_MSG'] = "";
     }else{
-      $this->checks['deps_visible']['STATUS']    = FALSE;
-      $this->checks['deps_visible']['STATUS_MSG']= "";//sprintf(_("%s entries found"),count($this->deps_to_migrate));
-      $this->checks['deps_visible']['ERROR_MSG'] = sprintf(_("Found %s departments that will not be visible in GOsa."),count($this->deps_to_migrate));
+      $this->checks['deps_visible']['STATUS']    = TRUE;
+      $this->checks['deps_visible']['STATUS_MSG']= '<font style="color:#FFA500">'._("Warning").'</font>';
+      $this->checks['deps_visible']['ERROR_MSG'] = sprintf(_("Found %s department(s) that will not be visible in GOsa."),count($this->deps_to_migrate));
       $this->checks['deps_visible']['ERROR_MSG'] .= "<input type='submit' name='deps_visible_migrate' value='"._("Migrate")."'>";
     }
   }
@@ -1241,6 +1242,7 @@ class Step_Migrate extends setup_step
 
     /* Refresh list of deparments */
     if(isset($_POST['deps_visible_migrate_refresh'])){
+      $this->show_details= false;
       $this->check_organizationalUnits();
     }
 
@@ -1265,6 +1267,7 @@ class Step_Migrate extends setup_step
 
     /* Start migration */
     if(isset($_POST['deps_visible_migrate_whatsdone'])){
+      $this->show_details= TRUE;
       $this->migrate_organizationalUnits(TRUE);
     }
 
@@ -1273,6 +1276,7 @@ class Step_Migrate extends setup_step
       $smarty = get_smarty();
       $smarty->assign("deps_to_migrate",$this->deps_to_migrate);
       $smarty->assign("method","migrate_deps");
+      $smarty->assign("deps_details", $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 7ae6c6f386cae217893461f6c7f24cd92a4a3509..fb6dc4c99d567f1a7beb4ff684ff08cb72da33bb 100644 (file)
--- a/setup/setup_migrate.tpl
+++ b/setup/setup_migrate.tpl
@@ -264,11 +264,9 @@
        
                        <h2>Department migration</h2>
 
-                       {t}The listed deparmtents below are currenlty invisble in the GOsa user interface. If you want to migrate a set of departments, just select them and use the migrate button below.{/t}<br>
-                       {t}If you want to know what will be done when migrating the selected entries, just use the 'What will be done here' button and you will see a list of changes.{/t}
+                       <p>{t}The listed deparmtents are currenlty invisble in the GOsa user interface. If you want to change this for a couple of entries, 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>
                                        
-
-                       <br><br>
                        {foreach from=$deps_to_migrate item=val key=key}
 
                                {if $deps_to_migrate.$key.checked}
@@ -297,21 +295,23 @@ dn: {$deps_to_migrate.$key.dn}
                                        <input type='checkbox' name='migrate_{$key}'>
                                        {$deps_to_migrate.$key.dn}
                                {/if}
-
-                               <br>
                                
 
                        {/foreach}
-                       <br>
 
-                       <input type='submit' name='deps_visible_migrate_refresh' value='{t}Reload list{/t}'>
-                       <input type='submit' name='deps_visible_migrate_migrate' value='{t}Migrate{/t}'>
-                       <input type='submit' name='deps_visible_migrate_whatsdone' value='{t}What will be done here{/t}'>
+                       <br>
+                       {if $deps_details}
+                       <input type='submit' name='deps_visible_migrate_refresh' value='{t}Hide changes{/t}'>
+                       {else}
+                       <input type='submit' name='deps_visible_migrate_whatsdone' value='{t}Show changes{/t}'>
+                       {/if}
 
                        <p class='seperator'>&nbsp;</p> 
 
-                       <div style='width:100%; text-align:right; padding:5px;'>
-                               <input type='submit' name='deps_visible_migrate_close' value='{t}Close{/t}'>
+                       <div style='width:99%; text-align:right; padding:5px;'>
+                               <input type='submit' name='deps_visible_migrate_migrate' value='{t}Migrate{/t}'>
+                               &nbsp;
+                               <input type='submit' name='deps_visible_migrate_close' value='{t}Cancel{/t}'>
                        </div>
                {elseif $method == "migrate_users"}
        
@@ -366,27 +366,6 @@ dn: {$users_to_migrate.$key.dn}
                        <div style='width:100%; text-align:right; padding:5px;'>
                                <input type='submit' name='users_visible_migrate_close' value='{t}Close{/t}'>
                        </div>
-               {else}
-
-       * Create a test department with some objects to check for correct permissions
-       <br>
-       * Look for ACL's. If none is there, choose one user to be the super administrator
-       <br>
-       * Look for organizationalUnits and let add GOsa departments for selected ones
-       <br>
-       * Look for person / organizationalPerson and add GOsa account
-       <br>
-       * Allow to move selected users to people ou's - take care for groupOfNames
-       <br>
-       * Allow to move selected groups to group ou's - take care for groupOfNames
-       <br>
-       * Allow to move selected winstations to winstation ou's - take care for groupOfNames
-       <br>
-       * Check for double uidNumbers/gidNumbers
-       <br>
-       * Check for mail accounts and add gosaMailAccount - optionally create these accounts on the IMAP server
-
-       
        {/if}
     </div>
 </div>