Updated style and logic

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

diff --git a/html/themes/default/style.css b/html/themes/default/style.css
index 240c0d61ca50c05e679abd630d9f316375da61ec..f3659248c092b8c93608c78324b97206287c1af7 100644 (file)
--- a/html/themes/default/style.css
+++ b/html/themes/default/style.css
@@ -969,7 +969,7 @@ h2.step2_container_title {
 /* Container for name and status */
 div.step2_entry_container { 
        padding:3px;
-       width:100%; 
+       width:99%; 
        cursor:default;
 }
 
@@ -977,7 +977,7 @@ div.step2_entry_container {
 div.step2_entry_container_info { 
        padding:3px;
        border: 1px dashed #AAAAAA;
-       width:100%;
+       width:99%;
        cursor:default;
 }
 

diff --git a/setup/class_setupStep_Migrate.inc b/setup/class_setupStep_Migrate.inc
index aef89c338f5494ca0eb89914ac514342d45db95c..3e02cea038eaab8f6558b80bcd7efbaed1284c78 100644 (file)
--- a/setup/class_setupStep_Migrate.inc
+++ b/setup/class_setupStep_Migrate.inc
@@ -555,6 +555,8 @@ class Step_Migrate extends setup_step
    */  
   function migrate_gosaAccounts($only_ldif = FALSE)
   {
+    $this->show_details= $only_ldif;
+
     /* Get collected configuration settings */
     $cv = $this->parent->captured_values;
 
@@ -682,6 +684,8 @@ class Step_Migrate extends setup_step
   /* Start deparmtment migration */  
   function migrate_organizationalUnits($only_ldif = FALSE)
   {
+    $this->show_details= $only_ldif;
+
     /* Get collected configuration settings */
     $cv = $this->parent->captured_values;
 
@@ -1205,6 +1209,7 @@ class Step_Migrate extends setup_step
 
     /* Open migration dialog */
     if(isset($_POST['users_visible_migrate'])){
+      $this->show_details= FALSE;
       $this->users_migration_dialog = TRUE;
       $this->dialog =TRUE;
     }
@@ -1232,6 +1237,7 @@ class Step_Migrate extends setup_step
       $smarty = get_smarty();
       $smarty->assign("users_to_migrate",$this->users_to_migrate);
       $smarty->assign("method","migrate_users");
+      $smarty->assign("user_details", $this->show_details);
       return($smarty->fetch(get_template_path("setup_migrate.tpl",TRUE,dirname(__FILE__))));
     }
 
@@ -1242,7 +1248,6 @@ class Step_Migrate extends setup_step
 
     /* Refresh list of deparments */
     if(isset($_POST['deps_visible_migrate_refresh'])){
-      $this->show_details= false;
       $this->check_organizationalUnits();
     }
 
@@ -1261,13 +1266,13 @@ class Step_Migrate extends setup_step
     /* Start migration */
     if(isset($_POST['deps_visible_migrate_migrate'])){
       if($this->migrate_organizationalUnits()){
+        $this->show_details= FALSE;
         $this->check_organizationalUnits();
       }
     }
 
     /* Start migration */
     if(isset($_POST['deps_visible_migrate_whatsdone'])){
-      $this->show_details= TRUE;
       $this->migrate_organizationalUnits(TRUE);
     }
 

diff --git a/setup/setup_migrate.tpl b/setup/setup_migrate.tpl
index fb6dc4c99d567f1a7beb4ff684ff08cb72da33bb..99d7815895202203f9fb86c93bbb38ef91b2d794 100644 (file)
--- a/setup/setup_migrate.tpl
+++ b/setup/setup_migrate.tpl
@@ -317,11 +317,8 @@ dn: {$deps_to_migrate.$key.dn}
        
                        <h2>User migration</h2>
 
-                       {t}The listed users below are currenlty invisble in the GOsa user interface. If you want to migrate a set of users, 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}
-                                       
-
-                       <br><br>
+                       <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}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}
 
                                {if $users_to_migrate.$key.checked}
@@ -357,14 +354,18 @@ dn: {$users_to_migrate.$key.dn}
                        {/foreach}
                        <br>
 
-                       <input type='submit' name='users_visible_migrate_refresh' value='{t}Reload list{/t}'>
-                       <input type='submit' name='users_visible_migrate_migrate' value='{t}Migrate{/t}'>
-                       <input type='submit' name='users_visible_migrate_whatsdone' value='{t}What will be done here{/t}'>
+                       {if $user_details}
+                       <input type='submit' name='users_visible_migrate_refresh' value='{t}Hide changes{/t}'>
+                       {else}
+                       <input type='submit' name='users_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='users_visible_migrate_close' value='{t}Close{/t}'>
+                       <div style='width:99%; text-align:right; padding-top:5px;'>
+                               <input type='submit' name='users_visible_migrate_migrate' value='{t}Migrate{/t}'>
+                               &nbsp;
+                               <input type='submit' name='users_visible_migrate_close' value='{t}Cancel{/t}'>
                        </div>
        {/if}
     </div>