From: cajus Date: Wed, 18 Apr 2007 15:13:38 +0000 (+0000) Subject: Layout fixes X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=a17ebfb5a251baf040469e64a593b9a68e92ba02;p=gosa.git Layout fixes git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@6099 594d385d-05f5-0310-b6e9-bd551577e9d8 --- diff --git a/html/themes/default/style.css b/html/themes/default/style.css index 848364cd5..4066ac0d7 100644 --- a/html/themes/default/style.css +++ b/html/themes/default/style.css @@ -1030,51 +1030,25 @@ div.step2_warning_text{ */ li.step4_name, div.step4_name { - vertical-align: middle; float:left; - overflow: hidden; - width:25%; + width:15%; height:2.0em; - background-color: #DDDDDD; } li.step4_value, div.step4_value { float:left; width:50%; - overflow: hidden; - vertical-align: middle; height:2.0em; } -li.step4_status, div.step4_status { - vertical-align: middle; - overflow: hidden; - height:2.0em; - width:25%; - text-decoration: none; - background-color: #DDDDDD; -} - - ul.step4_container, div.step4_container { - background-color: #E7E7E7; - border: solid 1px #D7D7D7; - width:100%; height:2.0em; margin-top:2px; - overflow: hidden; margin-left:2px; margin-right:2px; - float:left; } - - - - - - /************************ * Sieve * The following styles are diff --git a/setup/class_setupStep_Ldap.inc b/setup/class_setupStep_Ldap.inc index ff5b2a788..416d8cd33 100644 --- a/setup/class_setupStep_Ldap.inc +++ b/setup/class_setupStep_Ldap.inc @@ -36,6 +36,7 @@ class Step_Ldap extends setup_step var $tls = FALSE; var $attributes = array("connection","location","admin","password","base","tls"); + var $header_image= "images/proxy.png"; function Step_Ldap() @@ -46,9 +47,9 @@ class Step_Ldap extends setup_step function update_strings() { - $this->s_title = _("Ldap settings"); - $this->s_title_long = _("Ldap connection setup"); - $this->s_info = _("This dialog allows the basic configuration of GOsa's behaviour and properties in your main configuration."); + $this->s_title = _("LDAP setup"); + $this->s_title_long = _("LDAP connection setup"); + $this->s_info = _("This dialog performs the basic configuration of the LDAP connectivity for GOsa."); } @@ -117,7 +118,7 @@ class Step_Ldap extends setup_step $ldap->search("(&(objectClass=person)(|(uid=".$filter.")(cn=".$filter.")))"); $tmp = array(); while($attrs = $ldap->fetch()){ - $tmp[$attrs['dn']]=$attrs['dn']; + $tmp[$attrs['dn']]= @LDAP::fix($attrs['dn']); natcasesort($tmp); } return($tmp); @@ -132,6 +133,9 @@ class Step_Ldap extends setup_step } } + if(isset($_POST['resolve_user_x'])){ + $this->resolve_user = !$this->resolve_user; + } if(isset($_POST['resolve_user'])){ $this->resolve_user = !$this->resolve_user; } diff --git a/setup/setup_ldap.tpl b/setup/setup_ldap.tpl index 474e8924f..da438f181 100644 --- a/setup/setup_ldap.tpl +++ b/setup/setup_ldap.tpl @@ -1,82 +1,78 @@ - -

{t}ldap connection{/t}

- -
-{t}Please enter the server URI to allow the GOsa setup to connect your LDAP server (Example: ldap://your.server:389).{/t} -
-{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} -
- -
-
-
+
{if $resolve_user} -
+
+

+ {t}Please choose the LDAP user to be used by GOsa{/t} +

+ - +

 

+
+ - +
{else} - +

+ {t}LDAP connection{/t} +

- {t}Location description{/t} + {t}Location name{/t}
- -
-
- +
-
{t}Connection url{/t}
+
{t}Connection URL{/t}
- -
-
- +
+
+
+ {t}TLS connection{/t} +
+
+ +
+
{t}Base{/t}
{if $namingContextsCount >= 1} - {html_options values=$namingContexts output=$namingContexts selected=$base} {else} - + {/if} -
-
+
- +

+ {t}Authentication{/t} +

{t}Admin DN{/t}
- -
-
- {if $resolve_user} - - {else} - - {/if} + +
@@ -86,44 +82,24 @@ {t}Admin password{/t}
- -
-
-
-
-
-
-
-
-
-
- +
-
-
- {t}Use tls connection{/t} -
-
- -
-
- {t}Infos in FAQ{/t}  - ! -
-
{/if} + + {if ! $resolve_user} +

+ {t}Current status{/t} +

- {t}Status{/t} + {t}Information{/t}
{$connection_status}
-
-
+ {/if}
-
+ +