![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 1adecd3)
raw | patch | inline | side by side (parent: 1adecd3)
| author | cajus <cajus@594d385d-05f5-0310-b6e9-bd551577e9d8> | |
| Wed, 18 Apr 2007 15:13:38 +0000 (15:13 +0000) | ||
| committer | cajus <cajus@594d385d-05f5-0310-b6e9-bd551577e9d8> | |
| Wed, 18 Apr 2007 15:13:38 +0000 (15:13 +0000) |
git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@6099 594d385d-05f5-0310-b6e9-bd551577e9d8
| html/themes/default/style.css | patch | blob | history | |
| setup/class_setupStep_Ldap.inc | patch | blob | history | |
| setup/setup_ldap.tpl | patch | blob | history |
index 848364cd596fd89f8bfabc22ac01e9b56b016f99..4066ac0d7794ba43976e829a388327885a4c2855 100644 (file)
*/
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
index ff5b2a78803c97a2be5a2e126753f9d05c05fe89..416d8cd334a1ccf8bcedbea417a93da5a2dc6784 100644 (file)
var $tls = FALSE;
var $attributes = array("connection","location","admin","password","base","tls");
+ var $header_image= "images/proxy.png";
function Step_Ldap()
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.");
}
$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);
}
}
+ 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 474e8924fc48a1793142800bc01bdab250deb6dc..da438f1816155ccdb7db34721f8d2194f32273ce 100644 (file)
--- a/setup/setup_ldap.tpl
+++ b/setup/setup_ldap.tpl
-
-<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;'> </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>
{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>
{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'>
- </div>
- </div>
- <div class='step4_container'>
- <div class='step4_name'>
- </div>
- <div class='step4_value'>
- </div>
- <div class='step4_status'>
- <input type='submit' value='{t}Try connect{/t}' style='width:100%;'>
+ <input type='password' name='password' maxlength='20' size='20' value='{$password}'>
</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}
- <img class='center' alt='!' src='images/info_small.png' title='{t}Please read the FAQ for more informations{/t}'>
- </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>
+
+<div style="clear:both"></div>