X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=setup%2Fsetup_ldap.tpl;h=a279bbde29c600435fa510d81d99137f3b67df35;hb=68503ecbb4d310b61ef8f1f32003fc739bacb237;hp=474e8924fc48a1793142800bc01bdab250deb6dc;hpb=ed442811d407918c35ea5efc5509501e58d81fb9;p=gosa.git

diff --git a/setup/setup_ldap.tpl b/setup/setup_ldap.tpl
index 474e8924f..a279bbde2 100644
--- a/setup/setup_ldap.tpl
+++ b/setup/setup_ldap.tpl
@@ -1,82 +1,80 @@
-
-<h2>{t}ldap connection{/t}</h2>
-
-<div style='width:100%;'>
-{t}Please enter the server URI to allow the GOsa setup to connect your LDAP server (Example: ldap://your.server:389).{/t}
-<br>
-{t}Use the 'Test' button to try to connect with the given values. The status will be shown on the bottom of the page.{/t}
-<br>
-
-</div>
-<div class='default' style='margin:12px; '>
-<div style=';float:left;width:100%;'>
+<div class='default' style="width:100%; margin-right:20px;">
 
 	{if $resolve_user}
 
-	<div style='float:left; width:100%;margin-bottom:20px;border: solid 1px #CCC;'>
+	<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'>
-		<input type='submit' value='{t}Use selected user{/t}' name='use_selected_user'>
+		<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'>
-		<select name='admin_to_use' size=6 style="width:100%;background-color:#DDD;">				
-			{html_options options=$resolved_users selected=$admin}
-		</select>
+		</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 description{/t}
+			{t}Location name{/t}
 		</div>
 		<div class='step4_value'>
-			<input type='text' name='location' maxlength='80' size='25' value='{$location}' style='width:100%;'>
-		</div>
-		<div class='step4_status'>
-			
+			<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 url{/t}</div>
+			<div style='vertical-align:middle;height:100%;'>{t}Connection URL{/t}</div>
 		</div>
 		<div class='step4_value'>
-			<input type='text' name='connection' maxlength='80' size='25' value='{$connection}' style='width:100%;'>
-		</div>
-		<div class='step4_status'>
-			<input type='submit' value='{t}Test{/t}' style='width:100%;'>
+			<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' style='width:100%;'>		
+				<select name='base'>		
 					{html_options values=$namingContexts output=$namingContexts selected=$base}
 				</select>
 			{else}
-				<input type='text' name='base' maxlength='80' size='40' value='{$base}' style='width:100%;'>
+				<input type='text' name='base' maxlength='80' size='40' value='{$base}'>
 			{/if}
-		</div>
-		<div class='step4_status'>
+			<input type='image' class='center' src='images/list_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' maxlength='160' size='40' value='{$admin}' style='width:100%;'>
-		</div>
-		<div class='step4_status'>
-			{if $resolve_user}
-				<input type='submit' name='resolve_user' value='{t}Cancel{/t}' style='width:100%;' >
-			{else}
-				<input type='submit' name='resolve_user' value='{t}Select user{/t}' style='width:100%;' >
-			{/if}
+			<input type='text' name='admin' maxlength='160' size='40' value='{$admin}'>
+			<input type='image' class='center' src='images/folder.png' title='{t}Select user{/t}' name='resolve_user' alt='{t}Select user{/t}'>
 		</div>
 	</div>
 
@@ -86,44 +84,44 @@
 			{t}Admin password{/t}
 		</div>
 		<div class='step4_value'>
-			<input type='password' name='password' maxlength='20' size='20' value='{$password}' style='width:100%;'>
-		</div>
-		<div class='step4_status'>
+			<input type='password' name='password' maxlength='20' size='20' value='{$password}'>
 		</div>
 	</div>
-	<div class='step4_container'>
+
+	<p style="margin-top:20px">
+	<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 class='step4_status'>
-			<input type='submit' value='{t}Try connect{/t}' style='width:100%;'>
-		</div>
-	</div>
-    <div class='step4_container'>
-        <div class='step4_name'>
-            {t}Use tls connection{/t}
-        </div>
-        <div class='step4_value'>
-            <select name="tls" size="1" title="">
-			{html_options options=$bool selected=$tls}
-            </select>
-        </div>
-        <div class='step4_status'>
-            {t}Infos in FAQ{/t}&nbsp;
-            <img class='center' alt='!' src='images/info_small.png' title='{t}Please read the FAQ for more informations{/t}'>
-        </div>
-    </div>
+	    </div>
 	{/if}
+
+	{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}Status{/t}
+            {t}Information{/t}
         </div>
         <div class='step4_value' style='height:45px;'>
 			{$connection_status}
         </div>
-        <div class='step4_status' style='height:45px;'>
-        </div>
     </div>
+	{/if}
+
 </div>
-</div>
+<!-- Place cursor -->
+<script language="JavaScript" type="text/javascript">
+  <!-- // First input field on page
+  document.mainform.location.focus();
+  -->
+</script>
+