Updated layout

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

diff --git a/setup/class_setupStep_Config3.inc b/setup/class_setupStep_Config3.inc
index c5d37d95a1a887327643ef4e41e197df3a4b073b..680fdebd79d2f67699b855b4d37758fff4253005 100644 (file)
--- a/setup/class_setupStep_Config3.inc
+++ b/setup/class_setupStep_Config3.inc
@@ -22,7 +22,7 @@
 
 class Step_Config3 extends setup_step
 {
-  var $header_image= "images/ldap.png";
+  var $header_image= "images/ldapserver.png";
   var $optional = array(
               "strict_units" => false,
               "forceglobals" => true,

diff --git a/setup/setup_config1.tpl b/setup/setup_config1.tpl
index 5154da1a2597f81907c48c7b965bbdc557e3b590..e26c89cd3127d8940817636f0d6878b091f560c5 100644 (file)
--- a/setup/setup_config1.tpl
+++ b/setup/setup_config1.tpl
@@ -54,7 +54,7 @@
 
        <div class='step4_container'>
         <div class='step4_name'>
-            {t}Personal title in user dn{/t}
+            {t}Include personal title in user DN{/t}
         </div>
         <div class='step4_value'>
             <select name="include_personal_title" size="1" title="">

diff --git a/setup/setup_config3.tpl b/setup/setup_config3.tpl
index c068fa987ef220549972bf1fff8cf4f27e201d0f..ad1092858905f6e8575409f45987d95d1416858b 100644 (file)
--- a/setup/setup_config3.tpl
+++ b/setup/setup_config3.tpl
@@ -14,10 +14,6 @@
                {html_options options=$bool selected=$optional.noprimarygroup}
             </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 class='step4_container'>
@@ -30,10 +26,6 @@
                {html_options options=$bool selected=$optional.forceglobals}
             </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 class='step4_container'>
@@ -46,10 +38,6 @@
                {html_options options=$bool selected=$optional.forcessl}
             </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 class='step4_container'>
@@ -62,10 +50,6 @@
                {html_options options=$bool selected=$optional.warnssl}
             </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 class='step4_container'>
@@ -78,10 +62,6 @@
                {html_options options=$bool selected=$optional.strict_units}
             </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 class='step4_container'>
@@ -98,10 +78,6 @@
                 <input style='width:90%' id='ppd_path' name='ppd_path' type='text' value='{$optional.ppd_path}'  >
             {/if}
         </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 class='step4_container'>
@@ -120,10 +96,6 @@
                                        value='{$optional.auto_network_hook}'  >
             {/if}
         </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 class='step4_container'>
@@ -142,10 +114,6 @@
                                        value='{$optional.mailQueueScriptPath}'  >
             {/if}
         </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 class='step4_container'>
@@ -164,10 +132,6 @@
                                        type='text' value='{$optional.notifydir}'  >
             {/if}
         </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 class='step4_container'>
@@ -186,10 +150,6 @@
                                        type='text' value='{$optional.kioskpath}'  >
             {/if}
         </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 class='step4_container'>
@@ -200,10 +160,6 @@
                        <input style='width:90%' id='compile' name='compile' 
                                type='text' value='{$optional.compile}'>
         </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 class='step4_container' style='height:5em;'>
@@ -221,10 +177,6 @@
                                type='radio' name='smbhash' value='perl -MCrypt::SmbHash -e "print join(q[:], ntlmgen \$ARGV[0]), $/;"'>&nbsp;
                                perl -MCrypt::SmbHash ...
         </div>
-        <div class='step4_status' style='height:5em;'>
-            {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 class='step4_container'>
@@ -235,10 +187,6 @@
                        <input style='width:90%' id='session_lifetime' name='session_lifetime' 
                                type='text' value='{$optional.session_lifetime}'>
         </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 class='step4_container'>
@@ -257,10 +205,6 @@
                                        type='text' value='{$optional.max_ldap_query_time}'  >
             {/if}
         </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 class='step4_container'>
@@ -278,10 +222,6 @@
                                {/if}
                        </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>