X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=gosa-core%2Fsetup%2Fsetup_ldap.tpl;h=be95099e4ecc9694b1141d99792ea2661210a257;hb=702045b639b71abd431610d88a149b0d11b50e64;hp=8e082d6383b0373b95db50f73b9fbd501b99be8e;hpb=e8edd1d69f2fd74a0b1f81885f4afa3576f9d31f;p=gosa.git

diff --git a/gosa-core/setup/setup_ldap.tpl b/gosa-core/setup/setup_ldap.tpl
index 8e082d638..be95099e4 100644
--- a/gosa-core/setup/setup_ldap.tpl
+++ b/gosa-core/setup/setup_ldap.tpl
@@ -1,132 +1,117 @@
-<div class='default' style="width:100%; margin-right:20px;">
+ <p>
+  {t}The main data source used in GOsa is LDAP. In order to access the information stored there, please enter the required information.{/t}
+ </p>
+
+  <hr>
 
 	{if $resolve_user}
 
-	<div style='float:left; width:99%; margin-bottom:20px;'>
-		<p>
 		<b>{t}Please choose the LDAP user to be used by GOsa{/t}</b>
-		</p>
 		<select name='admin_to_use' size=20 style="width:100%; margin-bottom:10px;">				
 			{html_options options=$resolved_users selected=$admin}
 		</select>
+
 		<input type='text' value='{$resolve_filter}' name='resolve_filter'>
-		<input type='submit' value='{t}Search{/t}' name='resolve_search'>
-		<p class='seperator' style='margin-bottom:10px;'>&nbsp;</p>
-		<div style='text-align:right'>
-		<input type='submit' value='{t}Apply{/t}' name='use_selected_user'>
-		<input type='submit' value='{t}Cancel{/t}' name='resolve_user'>
+		<button type='submit' name='resolve_search'>{t}Search{/t}</button>
+		
+        <hr>
+        <div class="plugin-actions">
+            <button type='submit' name='use_selected_user'>{t}Apply{/t}</button>
+            <button type='submit' name='resolve_user'>{t}Cancel{/t}</button>
 		</div>
 	</div>		
 	
 	<div style="clear:both;"></div>
 
 	{else}
-	<p>
-	<b>{t}LDAP connection{/t}</b>
-	</p>
-	<div class='step4_container'>
-		<div class='step4_name'>
-			{t}Location name{/t}
-		</div>
-		<div class='step4_value'>
-			<input type='text' name='location' maxlength='80' size='40' value='{$location}'>
-		</div>
-	</div>
-	<div class='step4_container'>
-		<div class='step4_name'>
-			<div style='vertical-align:middle;height:100%;'>{t}Connection URI{/t}</div>
-		</div>
-		<div class='step4_value'>
-			<input type='text' name='connection' maxlength='80' size='40' value='{$connection}'>
-		</div>
-	</div>
-        <div class='step4_container'>
-          <div class='step4_name'>
-            {t}TLS connection{/t}
-          </div>
-          <div class='step4_value'>
-            <select name="tls" size="1" title="">
-			{html_options options=$bool selected=$tls}
-            </select>
-          </div>
-        </div>
-	<div class='step4_container'>
-		<div class='step4_name'> 
-			{t}Base{/t}
-		</div>
-		<div class='step4_value'>
-			{if $namingContextsCount >= 1}
-				<select name='base'>		
-					{html_options values=$namingContexts output=$namingContexts selected=$base}
-				</select>
-			{else}
-				<input type='text' name='base' maxlength='80' size='40' value='{$base}'>
-			{/if}
-			<input type='image' class='center' src='images/lists/reload.png' title='{t}Reload{/t}' name='reload' alt='{t}Reload{/t}'>
-		</div>
-	</div>
-	<p style="margin-top:20px">
-	<b>{t}Authentication{/t}</b>
-	</p>
-	<div class='step4_container'>
-		<div class='step4_name'> 
-			{t}Admin DN{/t}
-		</div>
-		<div class='step4_value'>
-			<input type='text' name='admin_given' maxlength='160' size='40' value='{$admin_given}'>
-			{if $append_base_to_admin_dn},{$base_to_append}{/if}
-			<input type='image' class='center' src='images/lists/folder.png' title='{t}Select user{/t}' name='resolve_user' alt='{t}Select user{/t}'>
-		</div>
-	</div>
-
-	<div class='step4_container'>
-		<div class='step4_name'> 
-		</div>
-		<div class='step4_value'>
-			<input onClick='document.mainform.submit();' {if $append_base_to_admin_dn} checked {/if} type='checkbox' name='append_base_to_admin_dn' value='1'>&nbsp;{t}Automatically append LDAP base to admin DN{/t}
-		</div>
-	</div>
 
+	<b>{t}LDAP connection{/t}</b>
+    <table style='width:100%' summary='{t}LDAP connection{/t}'>
+        <tr>
+            <td style='width:200px;'>{t}Location name{/t}</td>
+            <td><input type='text' name='location' maxlength='80' size='40' value='{$location}'></td>    
+        </tr>
+        <tr>
+            <td>{t}Connection URI{/t}</td>
+			<td><input type='text' name='connection' maxlength='80' size='40' value='{$connection}'></td>
+        </tr>
+        <tr>
+            <td>{t}TLS connection{/t}</td>
+            <td>
+                <select name="tls" size="1" title="">
+                    {html_options options=$bool selected=$tls}
+                </select>
+            </td>
+        </tr>
+        <tr>
+            <td>{t}Base{/t}</td>
+            <td>
+                {if $namingContextsCount >= 1}
+                    <select name='base' size=1>
+                        {html_options values=$namingContexts output=$namingContexts selected=$base}
+                    </select>
+                {else}
+                    <input type='text' name='base' maxlength='80' size='40' value='{$base}'>
+                {/if}
+            <input type='image' class='center' src='images/lists/reload.png' 
+                title='{t}Reload{/t}' name='reload' alt='{t}Reload{/t}'>
+            </td>
+        </tr>
+    </table>
 
-	<div class='step4_container'>
-		<div class='step4_name'>
-			{t}Admin password{/t}
-		</div>
-		<div class='step4_value'>
-			<input type='password' name='password' maxlength='20' size='20' value='{$password}'>
-		</div>
-	</div>
+    <hr> 
+	<b>{t}Authentication{/t}</b>
+    <table style='width:100%' summary='{t}Authentication{/t}'>
+        <tr>
+            <td style='width:200px;'>{t}Administrator DN{/t}</td>
+            <td>
+                <input type='text' name='admin_given' maxlength='160' size='40' value='{$admin_given}'>
+			    {if $append_base_to_admin_dn},{$base_to_append}{/if}
+			    <input type='image' class='center' src='images/lists/folder.png' 
+                    title='{t}Select user{/t}' name='resolve_user' alt='{t}Select user{/t}'>
+            </td>
+        </tr>
+        <tr>
+            <td>
+            </td>    
+            <td>
+                <input onClick='document.mainform.submit();' 
+                    {if $append_base_to_admin_dn} checked {/if} 
+                    type='checkbox' name='append_base_to_admin_dn' value='1'>&nbsp;
+                {t}Automatically append LDAP base to administrator DN{/t}
+            </td>
+        </tr>
+        <tr>
+            <td>{t}Administrator password{/t}</td>
+            <td><input type='password' name='password' value='{$password}'></td>
+        </tr>
+    </table>
 
-	<p style="margin-top:20px">
+    <hr> 
 	<b>{t}Schema based settings{/t}</b>
-	</p>
-	    <div class='step4_container'>
-		<div class='step4_name'>
-		    {t}Use rfc2307bis compliant groups{/t}
-		</div>
-		<div class='step4_value'>
-		    <select name="rfc2307bis" size="1" title="">
-		    {html_options options=$bool selected=$rfc2307bis}
-		    </select>
-		</div>
-	    </div>
-	{/if}
+    <table style='width:100%' summary='{t}Schema based settings{/t}'>
+        <tr>
+            <td style='width:200px;'>{t}Use RFC 2307bis compliant groups{/t}</td>
+            <td>
+                <select name="rfc2307bis" size="1" title="">
+                   {html_options options=$bool selected=$rfc2307bis}
+                </select>
+            </td>
+        </tr>
+    </table>
 
-	{if ! $resolve_user}
-	<p style="margin-top:20px">
-	<b>{t}Current status{/t}</b>
-	</p>
-    <div class='step4_container' style='height:45px;'>
-        <div class='step4_name' style='height:45px;'>
-            {t}Information{/t}
-        </div>
-        <div class='step4_value' style='height:45px;'>
-			{$connection_status}
-        </div>
-    </div>
+	{if !$resolve_user}
+    <hr> 
+        <b>{t}Current status{/t}</b>
+        <table style='width:100%' summary='{t}Current status{/t}'>
+            <tr>
+                <td style='width:200px;'>{t}Information{/t}</td>
+                <td>{$connection_status}</td>
+            </tr>
+        </table>
 	{/if}
+{/if}
 
-</div>
 <!-- Place cursor -->
 <script language="JavaScript" type="text/javascript">
   <!-- // First input field on page