Typo + laout fixing

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

diff --git a/setup/class_setupStep_Migrate.inc b/setup/class_setupStep_Migrate.inc
index 6e3da57206e23c4d684c122a6b123b9e1ea276ee..9a5fc8ca4df5ec7a5299b8da7ecb3d2c4b1456d3 100644 (file)
--- a/setup/class_setupStep_Migrate.inc
+++ b/setup/class_setupStep_Migrate.inc
@@ -134,7 +134,7 @@ class Step_Migrate extends setup_step
     $this->checks['users_visible']['ERROR_MSG'] = "";
     $this->check_gosaAccounts();
 
-    $this->checks['acls']['TITLE']     = _("Checking for administrational account");
+    $this->checks['acls']['TITLE']     = _("Checking for super administrator");
     $this->checks['acls']['STATUS']    = FALSE;
     $this->checks['acls']['STATUS_MSG']= "";
     $this->checks['acls']['ERROR_MSG'] = "";
@@ -187,7 +187,7 @@ class Step_Migrate extends setup_step
     $res = $ldap->search("uidNumber=*",array("dn","uidNumber"));
     if(!$res){
       $this->checks['uidNumber_usage']['STATUS']    = FALSE;
-      $this->checks['uidNumber_usage']['STATUS_MSG']= _("Ldap query failed.");
+      $this->checks['uidNumber_usage']['STATUS_MSG']= _("LDAP query failed");
       $this->checks['uidNumber_usage']['ERROR_MSG'] = _("Possibly the 'root object' is missing.");
       return(false);
     }
@@ -236,7 +236,7 @@ class Step_Migrate extends setup_step
     $res = $ldap->search("gidNumber=*",array("dn","gidNumber"));
     if(!$res){
       $this->checks['gidNumber_usage']['STATUS']    = FALSE;
-      $this->checks['gidNumber_usage']['STATUS_MSG']= _("Ldap query failed.");
+      $this->checks['gidNumber_usage']['STATUS_MSG']= _("LDAP query failed");
       $this->checks['gidNumber_usage']['ERROR_MSG'] = _("Possibly the 'root object' is missing.");
       return(false);
     }
@@ -298,7 +298,7 @@ class Step_Migrate extends setup_step
     $res = $ldap->search("(&(objectClass=".$oc.")(uid=*$))",array("dn","sambaSID"));
     if(!$res){
       $this->checks['outside_winstations']['STATUS']    = FALSE;
-      $this->checks['outside_winstations']['STATUS_MSG']= _("Ldap query failed.");
+      $this->checks['outside_winstations']['STATUS_MSG']= _("LDAP query failed");
       $this->checks['outside_winstations']['ERROR_MSG'] = _("Possibly the 'root object' is missing.");
       return(false);
     }
@@ -344,7 +344,7 @@ class Step_Migrate extends setup_step
     $res = $ldap->search("(objectClass=posixGroup)",array("dn"));
     if(!$res){
       $this->checks['outside_groups']['STATUS']    = FALSE;
-      $this->checks['outside_groups']['STATUS_MSG']= _("Ldap query failed.");
+      $this->checks['outside_groups']['STATUS_MSG']= _("LDAP query failed");
       $this->checks['outside_groups']['ERROR_MSG'] = _("Possibly the 'root object' is missing.");
       return(false);
     }
@@ -390,7 +390,7 @@ class Step_Migrate extends setup_step
     $res = $ldap->search("(&(objectClass=gosaAccount)(!(uid=*$)))",array("dn"));
     if(!$res){
       $this->checks['outside_users']['STATUS']    = FALSE;
-      $this->checks['outside_users']['STATUS_MSG']= _("Ldap query failed.");
+      $this->checks['outside_users']['STATUS_MSG']= _("LDAP query failed");
       $this->checks['outside_users']['ERROR_MSG'] = _("Possibly the 'root object' is missing.");
       return(false);
     }
@@ -450,7 +450,7 @@ class Step_Migrate extends setup_step
     $res = $ldap->cat($cv['base']);  
     if(!$res){
       $this->checks['permissions']['STATUS']    = FALSE;
-      $this->checks['permissions']['STATUS_MSG']= _("Ldap query failed.");
+      $this->checks['permissions']['STATUS_MSG']= _("LDAP query failed");
       $this->checks['permissions']['ERROR_MSG'] = _("Possibly the 'root object' is missing.");
       return(false);
     }
@@ -534,7 +534,7 @@ class Step_Migrate extends setup_step
     /* No invisible */
     if(!$res){
       $this->checks['users_visible']['STATUS']    = FALSE;
-      $this->checks['users_visible']['STATUS_MSG']= _("Ldap query failed.");
+      $this->checks['users_visible']['STATUS_MSG']= _("LDAP query failed");
       $this->checks['users_visible']['ERROR_MSG'] = _("Possibly the 'root object' is missing.");
     }elseif(count($this->users_to_migrate) == 0){
       $this->checks['users_visible']['STATUS']    = TRUE;
@@ -662,7 +662,7 @@ class Step_Migrate extends setup_step
      */
     if(!$res){
       $this->checks['deps_visible']['STATUS']    = FALSE;
-      $this->checks['deps_visible']['STATUS_MSG']= _("Ldap query failed.");
+      $this->checks['deps_visible']['STATUS_MSG']= _("LDAP query failed");
       $this->checks['deps_visible']['ERROR_MSG'] = _("Possibly the 'root object' is missing.");
     }elseif(count($this->deps_to_migrate) == 0 ){
       $this->checks['deps_visible']['STATUS']    = TRUE;
@@ -749,7 +749,7 @@ class Step_Migrate extends setup_step
                            "(objectClass=inetOrgPerson)(objectClass=organizationalPerson)))");
     if(!$res){
       $this->checks['acls']['STATUS']    = FALSE;
-      $this->checks['acls']['STATUS_MSG']= _("Ldap query failed.");
+      $this->checks['acls']['STATUS_MSG']= _("LDAP query failed");
       $this->checks['acls']['ERROR_MSG'] = _("Possibly the 'root object' is missing.");
     }elseif($ldap->count()){
       $this->checks['acls']['STATUS']    = TRUE;
@@ -758,7 +758,8 @@ class Step_Migrate extends setup_step
     }else{
       $this->checks['acls']['STATUS']    = FALSE;
       $this->checks['acls']['STATUS_MSG']= _("Failed");
-      $this->checks['acls']['ERROR_MSG'].= "<input type='submit' name='create_acls' value='"._("Create adminitrational account")."'>";
+      $this->checks['acls']['ERROR_MSG']= _("There is no GOsa administrator account inside your LDAP.")."&nbsp;";
+      $this->checks['acls']['ERROR_MSG'].= "<input type='submit' name='create_acls' value='"._("Create")."'>";
     }
     return($ldap->count()>=1);
   }
@@ -1393,7 +1394,7 @@ class Step_Migrate extends setup_step
       if($just_check){
         $this->checks['root']['STATUS']    = FALSE;
         $this->checks['root']['STATUS_MSG']= _("Failed");
-        $this->checks['root']['ERROR_MSG'] =  "The ldap root object is missing, but it is required to use GOsa.&nbsp;";
+        $this->checks['root']['ERROR_MSG'] =  _("The LDAP root object is missing. It is required to use your LDAP service.").'&nbsp;';
         $this->checks['root']['ERROR_MSG'].=  "<input type='submit' name='retry_root_create' value='"._("Try to create root object")."'>";
         return(FALSE);
       }else{
@@ -1653,7 +1654,7 @@ class Step_Migrate extends setup_step
 
     /* Display warning if copy failed */
     if(!$res){
-      print_red(_("Failed to copy '%s' to '%s'. Ldap says '%s'."),$source,$destination,$ldap->get_error());
+      print_red(_("Failed to copy '%s' to '%s'. LDAP says '%s'."),$source,$destination,$ldap->get_error());
     }else{
       $res = $ldap->rmDir($source);
       show_ldap_error($ldap->get_error(),_("Something went wrong while copying dns."));

diff --git a/setup/setup_migrate.tpl b/setup/setup_migrate.tpl
index 5f6fde3bb4f3ab184ebe51f7deff1682d948d5c6..7ae6c6f386cae217893461f6c7f24cd92a4a3509 100644 (file)
--- a/setup/setup_migrate.tpl
+++ b/setup/setup_migrate.tpl
@@ -15,7 +15,7 @@
                                 <!-- Normal entry everything is fine -->
                                 <div class='step2_entry_container'>
                         {/if}
-                               <div class='step2_entry_name'>{$checks.$key.TITLE}</div>
+                               <div class='step2_entry_name'><b>{$checks.$key.TITLE}</b></div>
                                <div class='step2_entry_status'>
                                {if $checks.$key.STATUS}
                                        <div class='step2_successful'>{$checks.$key.STATUS_MSG}</div>
@@ -174,8 +174,6 @@
 
                {elseif $method == "create_acls"}
 
-               <h2>{t}Acl setup{/t}</h2>
-       
                {if $acl_create_selected != "" && $what_will_be_done_now!=""}
                        <div>
 <pre>
@@ -185,10 +183,11 @@
                        <input type='submit' name='create_acls_create_confirmed' value='{t}Next{/t}'>
                        <input type='submit' name='create_acls_create_abort' value='{t}Abort{/t}'>
                {else}
-               <b>{t}Create a new user with adminstrational acls{/t}</b><br>
+                       <h2>{t}Create a new GOsa administrator account{/t}</h2>
        
-                       {t}To automatically add a new administrative user to your ldap database use the formular below.{/t}<br>
-                       <p style='padding-left:10px;'>
+                       <p>
+                       {t}This dialog will automatically add a new super administrator to your LDAP tree.{/t}
+                       </p>
                        <table>
                                <tr>
                                        <td>
@@ -216,22 +215,18 @@
                                </tr>
                                </tr>
                                        <td>
-                                               {t}Retype password{/t}:&nbsp;
+                                               {t}Password (again){/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>
-                       {t}To grant administrative permissions to a user or a group, select an element and use button below.{/t}
-                       <p style='padding-left:10px;'>
+                       <h2>{t}Assign super administrator permissions to an existing user or group{/t}</h2>
+                       <p>{t}To grant administrative permissions to a user or a group, select an object and choose 'Assign'.{/t}</p>
                        <select name='acl_create_type' onChange='document.mainform.submit();' >
                                {if $type == "user"}
                                <option value='group'>{t}Group{/t}</option>
@@ -248,17 +243,20 @@
                                        {html_options options=$groups selected=$acl_create_selected}
                                {/if}
                        </select>
-
-                               <input type='submit' name='create_acls_create' value='{t}Add administrational acls to this object{/t}'>
-                       </p>
                        {/if}
                {/if}
 
 
                        <p class='seperator'>&nbsp;</p> 
 
-                       <div style='width:100%; text-align:right; padding:5px;'>
-                               <input type='submit' name='create_acls_cancel' value='{t}Close{/t}'>
+                       <div style='width:99%; text-align:right; padding:5px;'>
+                               {if $users_cnt != 0 || $groups_cnt != 0}
+                               <input type='submit' name='create_acls_create' value='{t}Assign{/t}'>
+                               {else}
+                               <input type='submit' name='create_admin_user' value='{t}Create{/t}'>    
+                               {/if}
+                               &nbsp;
+                               <input type='submit' name='create_acls_cancel' value='{t}Cancel{/t}'>
                        </div>