* Removed snapshot_ldap_base - where is it for?

* fixed layout

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

diff --git a/contrib/gosa.conf b/contrib/gosa.conf
index b4de9cee84a929d7f22ce01082fe3c9f74b2130a..b3618e93308c3259b8e5133cb959ac17ba9f1c65 100644 (file)
--- a/contrib/gosa.conf
+++ b/contrib/gosa.conf
@@ -383,9 +383,6 @@
 {if $cv.generic_settings.snapshot_base != ""}
                        snapshot_base="{$cv.generic_settings.snapshot_base}"
 {/if}
-{if $cv.generic_settings.snapshot_ldap_base != ""}
-                       snapshot_ldap_base="{$cv.generic_settings.snapshot_ldap_base}"
-{/if}
 {if $cv.generic_settings.snapshot_user != ""}
                        snapshot_user="{$cv.generic_settings.snapshot_user}"
 {/if}

diff --git a/setup/class_setupStep_Config2.inc b/setup/class_setupStep_Config2.inc
index 4f4a9065da90662c715853215319ca26fc59b60b..78d6094567a199d6093f78612d7cdac1417374c1 100644 (file)
--- a/setup/class_setupStep_Config2.inc
+++ b/setup/class_setupStep_Config2.inc
@@ -38,7 +38,6 @@ class Step_Config2 extends setup_step
                                   "wws_ou_active" => FALSE,
                                   "snapshot_active"     => FALSE,
                                   "snapshot_base"       => "ou=snapshots,%base%",
-                                  "snapshot_ldap_base"  => "%base%",
                                   "snapshot_user"       => "cn=ldapadmin,%base%",
                                   "snapshot_password"   => "",
                                   "snapshot_server"     => "%connection%");
@@ -72,7 +71,7 @@ class Step_Config2 extends setup_step
   {
     /* Update snapshot values, with already collected values */
     foreach($this->generic_settings as $key => $value){
-      foreach(array("snapshot_ldap_base","snapshot_base","snapshot_user","snapshot_server") as $attr){
+      foreach(array("snapshot_base","snapshot_user","snapshot_server") as $attr){
         foreach($this->parent->captured_values as $replace_name => $replace_value){
           if(is_string($replace_value))  {
             $this->generic_settings[$attr] = preg_replace("/%".$replace_name."%/",$replace_value,$this->generic_settings[$attr]);
@@ -141,9 +140,6 @@ class Step_Config2 extends setup_step
         if(isset($_POST['snapshot_server'])){
           $this->generic_settings['snapshot_server'] = $_POST['snapshot_server'];
         }
-        if(isset($_POST['snapshot_ldap_base'])){
-          $this->generic_settings['snapshot_ldap_base'] = $_POST['snapshot_ldap_base'];
-        }
       }else{
         $this->generic_settings['snapshot_active'] = FALSE;
       }

diff --git a/setup/setup_config1.tpl b/setup/setup_config1.tpl
index 4a658a4630bcc5b2485bc851b05bd5b3aba981a5..17bd18c6bf38d6af657fb89926220b553916adca 100644 (file)
--- a/setup/setup_config1.tpl
+++ b/setup/setup_config1.tpl
@@ -60,10 +60,10 @@
             {if $id_settings.idgen_active == FALSE}
                 <input type='checkbox' value='1' name='idgen_active'
                     onClick='changeState("idgen");'>
-                <input style='width:90%' id='idgen' name='idgen' type='text' value='{$id_settings.idgen}' disabled>
+                <input size='20' id='idgen' name='idgen' type='text' value='{$id_settings.idgen}' disabled>
             {else}
                 <input type='checkbox' value='1' name='idgen_active' checked>
-                <input style='width:90%' id='idgen' name='idgen' type='text' value='{$id_settings.idgen}'  >
+                <input size='20' id='idgen' name='idgen' type='text' value='{$id_settings.idgen}'  >
             {/if}
         </div>
     </div>
@@ -76,10 +76,10 @@
             {if $id_settings.minid_active == FALSE}
                 <input type='checkbox' value='1' name='minid_active'
                     onClick='changeState("minid");'>
-                <input style='width:90%' id='minid' name='minid' type='text' value='{$id_settings.minid}' disabled>
+                <input size='10' id='minid' name='minid' type='text' value='{$id_settings.minid}' disabled>
             {else}
                 <input type='checkbox' value='1' name='minid_active' checked>
-                <input style='width:90%' id='minid' name='minid' type='text' value='{$id_settings.minid}'  >
+                <input size='10' id='minid' name='minid' type='text' value='{$id_settings.minid}'  >
             {/if}
         </div>
     </div>
@@ -90,18 +90,22 @@
         </div>
         <div class='step4_value'>
             <input type='text' name='uidbase' maxlength='20' size='10' value='{$uidbase}'>
-           <br>
+        </div>
+     </div>
+    <div class='step4_container' style="margin-bottom:5px;">
+        <div class='step4_name'>
+                {t}Hook for number base{/t}
+       </div>
+        <div class='step4_value'>
             {if $base_hook_active == FALSE}
                 <input type='checkbox' value='1' name='base_hook_active'
                     onClick='changeState("base_hook");'>
-                {t}Use hook{/t}
                 <input id='base_hook' name='base_hook' size=40 type='text' value='{$base_hook}'      disabled>
             {else}
                 <input type='checkbox' value='1' name='base_hook_active' checked>
-                {t}Use hook{/t}
                 <input id='base_hook' name='base_hook' size=40 type='text' value='{$base_hook}'  >
             {/if}
-        </div>
+     </div>
         </div>
     </div>
 
@@ -116,8 +120,6 @@
                 {html_options options=$crypt_methods selected=$encryption}
             </select>
         </div>
-        <div class='step4_status'>
-        </div>
     </div>
 
     <div class='step4_container' style='height:4em;'>
@@ -151,7 +153,7 @@
         </div>
     </div>
 
-          <div class='step4_container'>
+    <div class='step4_container'>
         <div class='step4_name'>
                 {t}Password change hook{/t}
         </div>
@@ -159,14 +161,14 @@
             {if $pwd_rules.externalpwdhook_active == FALSE}
                 <input type='checkbox' value='1' name='externalpwdhook_active'
                     onClick='changeState("externalpwdhook");'>
-                <input id='externalpwdhook' name='externalpwdhook' type='text' value='{$pwd_rules.externalpwdhook}' disabled>
+                <input size=40 id='externalpwdhook' name='externalpwdhook' type='text' value='{$pwd_rules.externalpwdhook}' disabled>
             {else}
                 <input type='checkbox' value='1' name='externalpwdhook_active' checked>
                 <input size=40 id='externalpwdhook' name='externalpwdhook' type='text' value='{$pwd_rules.externalpwdhook}'  >
             {/if}
         </div>
     </div>
-                 <div class='step4_container'>
+    <div class='step4_container'>
         <div class='step4_name'>
             {t}Use account expiration{/t}
         </div>

diff --git a/setup/setup_config2.tpl b/setup/setup_config2.tpl
index 2e07a049cfb62ab8f1b06267898d26f5d2fc91a7..49a3e01a3dd162588ce7ca7549d50531004bd265 100644 (file)
--- a/setup/setup_config2.tpl
+++ b/setup/setup_config2.tpl
@@ -137,56 +137,121 @@
     </div>
 
 
-
-
-
-
-       <div class='step4_container' style='height:12em;'>
-       <p><b>{t}Snapshots / Undo{/t}</b></p>
-        <div class='step4_name'  style='height:12em;width:60%;background-color:red;'>
+        <p><b>{t}Snapshots / Undo{/t}</b></p>
             {if $generic_settings.snapshot_active == FALSE}
+        <div class='step4_container'>
+         <div class='step4_name'>
                 <input type='checkbox' value='1' name='snapshot_active'
-                    onClick='  
-                                                               changeState("snapshot_base");
-                                                               changeState("snapshot_ldap_base");
-                                                               changeState("snapshot_server");                                                 
-                                                               changeState("snapshot_user");                                                   
-                                                               changeState("snapshot_password");'>{t}Enable{/t}<br>
-               {t}Snapshot base{/t}&nbsp;
-               <input style='width:220' id='snapshot_base' name='snapshot_base' 
-                                       type='text' value='{$generic_settings.snapshot_base}' disabled><br>
-                   {t}Ldap base{/t}&nbsp;
-                               <input style='width:220' id='snapshot_ldap_base' name='snapshot_ldap_base' 
-                                       type='text' value='{$generic_settings.snapshot_ldap_base}' disabled><br>
-                   {t}Server{/t}&nbsp;
-                               <input style='width:220' id='snapshot_server' name='snapshot_server' 
-                                       type='text' value='{$generic_settings.snapshot_server}' disabled><br>
-                       {t}User{/t}&nbsp;
-                               <input style='width:220' id='snapshot_user' name='snapshot_user' 
-                                       type='text' value='{$generic_settings.snapshot_user}' disabled><br>
-                       {t}Password{/t}&nbsp;
-                               <input style='width:220' id='snapshot_password' name='snapshot_password' 
-                                       type='password' value='{$generic_settings.snapshot_password}' disabled>
+                    onClick='
+                                                                changeState("snapshot_base");
+                                                                changeState("snapshot_ldap_base");
+                                                                changeState("snapshot_server");
+                                                                changeState("snapshot_user");
+                                                                changeState("snapshot_password");'>{t}Enable snapshots{/t}
+         </div>
+        </div>
+        <div style='margin-left:10px;'>
+        <div class='step4_container'>
+         <div class='step4_name'>
+                {t}Snapshot base{/t}
+         </div>
+         <div class='step4_value'>
+                <input style='width:220' id='snapshot_base' name='snapshot_base'
+                                        type='text' value='{$generic_settings.snapshot_base}' disabled>
+         </div>
+        </div>
+        <div class='step4_container'>
+         <div class='step4_name'>
+                    {t}LDAP base{/t}
+         </div>
+         <div class='step4_value'>
+                                <input style='width:220' id='snapshot_ldap_base' name='snapshot_ldap_base'
+                                        type='text' value='{$generic_settings.snapshot_ldap_base}' disabled>
+        </div>
+        </div>
+        <div class='step4_container'>
+         <div class='step4_name'>
+                    {t}Server{/t}
+         </div>
+         <div class='step4_value'>
+                                <input style='width:220' id='snapshot_server' name='snapshot_server'
+                                        type='text' value='{$generic_settings.snapshot_server}' disabled>
+        </div>
+        </div>
+        <div class='step4_container'>
+         <div class='step4_name'>
+                        {t}User{/t}
+         </div>
+         <div class='step4_value'>
+                                <input style='width:220' id='snapshot_user' name='snapshot_user'
+                                        type='text' value='{$generic_settings.snapshot_user}' disabled>
+        </div>
+        </div>
+        <div class='step4_container'>
+         <div class='step4_name'>
+                        {t}Password{/t}
+         </div>
+         <div class='step4_value'>
+                                <input style='width:220' id='snapshot_password' name='snapshot_password'
+                                        type='password' value='{$generic_settings.snapshot_password}' disabled>
+        </div>
+        </div>
+        </div>
+
             {else}
-                <input type='checkbox' value='1' name='snapshot_active' checked>{t}Enable{/t}<br>
-                   {t}Snapshot base{/t}&nbsp;
-                               <input style='width:220' id='snapshot_base' name='snapshot_base' 
-                                       type='text' value='{$generic_settings.snapshot_base}'><br>
-                   {t}Ldap base{/t}&nbsp;
-                               <input style='width:220' id='snapshot_ldap_base' name='snapshot_ldap_base' 
-                                       type='text' value='{$generic_settings.snapshot_ldap_base}'><br>
-                       {t}Server{/t}&nbsp;
-                               <input style='width:220' id='snapshot_server' name='snapshot_server' 
-                                       type='text' value='{$generic_settings.snapshot_server}'><br>
-                   {t}User{/t}&nbsp;
-                               <input style='width:220' id='snapshot_user' name='snapshot_user' 
-                                       type='text' value='{$generic_settings.snapshot_user}'><br>
-                       {t}Password{/t}&nbsp;
-                               <input style='width:220;' id='snapshot_password' name='snapshot_password' 
-                                       type='password' value='{$generic_settings.snapshot_password}'>
-            {/if}
+        <div class='step4_container'>
+         <div class='step4_name'>
+                <input type='checkbox' value='1' name='snapshot_active' checked>{t}Enable snapshots{/t}
         </div>
-    </div>
+        </div>
+        <div style='margin-left:10px;'>
+        <div class='step4_container'>
+         <div class='step4_name'>
+                    {t}Snapshot base{/t}
+        </div>
+         <div class='step4_value'>
+           <input style='width:220' id='snapshot_base' name='snapshot_base'
+                                        type='text' value='{$generic_settings.snapshot_base}'>
+        </div>
+        </div>
+        <div class='step4_container'>
+         <div class='step4_name'>
+                    {t}Ldap base{/t}
+        </div>
+         <div class='step4_value'>
+                                <input style='width:220' id='snapshot_ldap_base' name='snapshot_ldap_base'
+                                        type='text' value='{$generic_settings.snapshot_ldap_base}'>
+        </div>
+        </div>
+        <div class='step4_container'>
+         <div class='step4_name'>
+                        {t}Server{/t}
+        </div>
+         <div class='step4_value'>
+                                <input style='width:220' id='snapshot_server' name='snapshot_server'
+                                        type='text' value='{$generic_settings.snapshot_server}'>
+        </div>
+        </div>
+        <div class='step4_container'>
+         <div class='step4_name'>
+                    {t}User{/t}
+        </div>
+         <div class='step4_value'>
+                                <input style='width:220' id='snapshot_user' name='snapshot_user'
+                                        type='text' value='{$generic_settings.snapshot_user}'>
+        </div>
+        </div>
+        <div class='step4_container'>
+         <div class='step4_name'>
+                        {t}Password{/t}
+        </div>
+         <div class='step4_value'>
+                                <input style='width:220;' id='snapshot_password' name='snapshot_password'
+                                        type='password' value='{$generic_settings.snapshot_password}'>
+        </div>
+        </div>
+        </div>
+            {/if}
 </div>
 
 <input type='hidden' value='1' name='step6_posted'>