From: hickert <hickert@594d385d-05f5-0310-b6e9-bd551577e9d8>
Date: Thu, 20 May 2010 14:58:17 +0000 (+0000)
Subject: Updated setup again
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=23d9e0d508e6a9a42f3b16973c0c3e2e5b9e6226;p=gosa.git

Updated setup again



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

diff --git a/gosa-core/setup/class_setupStep_Migrate.inc b/gosa-core/setup/class_setupStep_Migrate.inc
index 4b888535f..a761be093 100644
--- a/gosa-core/setup/class_setupStep_Migrate.inc
+++ b/gosa-core/setup/class_setupStep_Migrate.inc
@@ -325,8 +325,8 @@ class Step_Migrate extends setup_step
                 $this->checks['acls']['STATUS_MSG']= _("Failed");
                 $this->checks['acls']['ERROR_MSG'] = $str;
                 $this->checks['acls']['ERROR_MSG'].= _("There is no valid GOsa 2.6 administrator account inside your LDAP.")."&nbsp;";
-                $this->checks['acls']['ERROR_MSG'].= "<input type='submit' name='migrate_acls' value='"._("Migrate")."'>";
-                $this->checks['acls']['ERROR_MSG'].= "<input type='submit' name='create_acls' value='"._("Create")."'>";
+                $this->checks['acls']['ERROR_MSG'].= "<button type='submit' name='migrate_acls'>"._("Migrate")."</button>";
+                $this->checks['acls']['ERROR_MSG'].= "<button type='submit' name='create_acls'>"._("Create")."</button>";
             }elseif($GOsa_26_found){
                 $str = "";
                 if(!empty($valid_users)){
@@ -342,7 +342,7 @@ class Step_Migrate extends setup_step
                 $this->checks['acls']['STATUS']    = FALSE;
                 $this->checks['acls']['STATUS_MSG']= _("Failed");
                 $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")."'>";
+                $this->checks['acls']['ERROR_MSG'].= "<button type='submit' name='create_acls'>"._("Create")."</button>";
             }
         }
 
@@ -696,7 +696,7 @@ class Step_Migrate extends setup_step
                 $this->checks['root']['STATUS']    = FALSE;
                 $this->checks['root']['STATUS_MSG']= _("Failed");
                 $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")."'>";
+                $this->checks['root']['ERROR_MSG'].=  "<button type='submit' name='retry_root_create'>"._("Try to create root object")."</button>";
                 return(FALSE);
             }else{
 
@@ -709,7 +709,7 @@ class Step_Migrate extends setup_step
                     $this->checks['root']['STATUS']    = FALSE;
                     $this->checks['root']['STATUS_MSG']= _("Failed");
                     $this->checks['root']['ERROR_MSG'] = _("Root object couldn't be created, you should try it on your own.");
-                    $this->checks['root']['ERROR_MSG'].= "&nbsp;<input type='submit' name='retry_root_create' value='"._("Try to create root object")."'>";
+                    $this->checks['root']['ERROR_MSG'].= "&nbsp;<button type='submit' name='retry_root_create'>"._("Try to create root object")."</button>";
                     return($res);;
                 }
             }
@@ -836,8 +836,8 @@ class Step_Migrate extends setup_step
                  */
                 $this->checks['rootOC']['STATUS']    = FALSE;
                 $this->checks['rootOC']['STATUS_MSG']= _("Failed");
-                $this->checks['rootOC']['ERROR_MSG'] = "&nbsp;<input type='submit' 
-                    name='root_add_objectclasses' value='"._("Migrate")."'>";
+                $this->checks['rootOC']['ERROR_MSG'] = "&nbsp;<button type='submit' 
+                    name='root_add_objectclasses'>"._("Migrate")."</button>";
 
                 return(FALSE);
             }else{
diff --git a/gosa-core/setup/setup_migrate.tpl b/gosa-core/setup/setup_migrate.tpl
index 97c326948..9f17d8ffe 100644
--- a/gosa-core/setup/setup_migrate.tpl
+++ b/gosa-core/setup/setup_migrate.tpl
@@ -1,137 +1,75 @@
-<div>
-    <div class='default'>
-
 	{if $method == "default"}
-			<p>{t}During the LDAP inspection, we're going to check for several common pitfalls that may occur when migration to GOsa base LDAP administration. You may want to fix the problems below, in order to provide smooth services.{/t}
-			</p>
-
-			{foreach from=$checks item=val key=key}
-				<div style='width:98%; padding:4px; background-color:{cycle values="#F0F0F0, #FFF"}'>
-
-			{if $checks.$key.ERROR_MSG}
-                                <!-- Add ability to display info popup -->
-                                <div class='step2_entry_container_info'>
-                        {else}
-                                <!-- Normal entry everything is fine -->
-                                <div class='step2_entry_container'>
-                        {/if}
-				<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>
-				{else}
-					<div class='step2_failed'>{$checks.$key.STATUS_MSG}</div>
-				{/if}
-				</div>
-					{if $checks.$key.ERROR_MSG}
-						{$checks.$key.ERROR_MSG}
-					{/if}
-				</div>
-				</div>
-			{/foreach}
+		<p>{t}During the LDAP inspection, we're going to check for several common pitfalls that may occur when migration to GOsa base LDAP administration. You may want to fix the problems below, in order to provide smooth services.{/t}
+		</p>
+
+        <table style='width:100%'>
+            {foreach from=$checks item=val key=key}
+                <tr> 
+                    <td>
+                        <b>{$checks.$key.TITLE}</b>&nbsp; {$checks.$key.STATUS_MSG}
+                        <p>
+                            {if $checks.$key.ERROR_MSG}
+                                {$checks.$key.ERROR_MSG}
+                            {/if}
+                        </p>
+                    </td>
+                </tr>
+            {/foreach}
+        </table>
 		<br>
 		<button type='submit' name='reload'>{t}Check again{/t}</button>
 
-
-		{elseif $method == "rootOC_migrate_dialog"}
+	{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>
+			<pre>{$details.current}</pre>
+
 			<br>
 			<b>{t}After migration{/t}</b>
-			<div class="step2_entry_container_info">
-				<div style='padding-left:20px;'>
-					<pre>{$details.target}</pre>
-				</div>
-			</div>
+    		<pre>{$details.target}</pre>
 
 			<br>
 			<button type='submit' name='rootOC_migrate_start'>{t}Migrate{/t}</button>
-
-			</p>
-				
-
 			<hr>	
-			<div style='width:100%; text-align:right; padding:5px;'>
+			<div class="plugin-actions">
 				<button type='submit' name='rootOC_dialog_cancel'>{t}Close{/t}</button>
-
 			</div>
 
 		{elseif $method == "create_acls"}
 
-		{if $acl_create_selected != "" && $what_will_be_done_now!=""}
-			<div>
-<pre>
-{$what_will_be_done_now}
-</pre>
-			</div>		
-			<button type='submit' name='create_acls_create_confirmed'>{t}Next{/t}</button>
-
-			<button type='submit' name='create_acls_create_abort'>{t}Abort{/t}</button>
-
-		{else}
-			<h2>{t}Create a new GOsa administrator account{/t}</h2>
-	
-			<p>
-			{t}This dialog will automatically add a new super administrator to your LDAP tree.{/t}
-			</p>
-			<table>
-				<tr>
-					<td>
-						{t}Name{/t}:&nbsp;
-					</td>
-					<td>
-						<i>System administrator</i>
-					</td>
-				</tr>
-				<tr>
-					<td>
-						{t}User ID{/t}:&nbsp;
-					</td>
-					<td>
-						<input type='text' value='{$new_user_uid}' name='new_user_uid'><br>
-					</td>
-				</tr>
-				<tr>
-					<td>
-						{t}Password{/t}:&nbsp;
-					</td>
-					<td>
-						<input type='password' value='{$new_user_password}' name='new_user_password'><br>
-					</td>
-				</tr>
-				<tr>
-					<td>
-						{t}Password (again){/t}:&nbsp;
-					</td>
-					<td>
-
-						<input type='password' value='{$new_user_password2}' name='new_user_password2'><br>
-					</td>
-				</tr>
-			</table>
-	
-<!-- Place cursor -->
-<script language="JavaScript" type="text/javascript">
-  <!-- // First input field on page
-	focus_field('new_user_password');
-  -->
-</script>
-
-			<hr>	
-			<div style='width:99%; text-align:right; padding:5px;'>
-				<button type='submit' name='create_admin_user'>{t}Apply{/t}</button>	
-
-				<button type='submit' name='create_acls_cancel'>{t}Cancel{/t}</button>
-
-			</div>
-			{/if}	
-	{/if}
+    <h2>{t}Create a new GOsa administrator account{/t}</h2>
+    <p>{t}This dialog will automatically add a new super administrator to your LDAP tree.{/t}</p>
+
+    <table>
+        <tr>
+            <td>{t}Name{/t}:</td>
+            <td><i>System administrator</i></td>
+        </tr>
+        <tr>
+            <td>{t}User ID{/t}:&nbsp;</td>
+            <td><input type='text' value='{$new_user_uid}' name='new_user_uid'><br></td>
+        </tr>
+        <tr>
+            <td>{t}Password{/t}:&nbsp;</td>
+            <td><input type='password' value='{$new_user_password}' name='new_user_password'><br></td>
+        </tr>
+        <tr>    
+            <td>{t}Password (again){/t}:&nbsp;</td>
+            <td><input type='password' value='{$new_user_password2}' name='new_user_password2'></td>
+        </tr>
+    </table>
+
+    <script language="JavaScript" type="text/javascript">
+        <!-- // First input field on page
+            focus_field('new_user_password');
+        -->
+    </script>
+
+    <hr>	
+    <div class="plugin-actions">
+        <button type='submit' name='create_admin_user'>{t}Apply{/t}</button>	
+        <button type='submit' name='create_acls_cancel'>{t}Cancel{/t}</button>
     </div>
-</div>
+{/if}