X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=gosa-core%2Fsetup%2Fsetup_config2.tpl;h=ab48a95311d57a5803b1b419e07c6f4768780d8e;hb=e488772123d2b0ee56ebd92c95880576f27aea62;hp=b6d806b310c3d217ba95285573a14609bf10c2cd;hpb=84591bd5864772173e5d8c0d98f137b85e754f3e;p=gosa.git

diff --git a/gosa-core/setup/setup_config2.tpl b/gosa-core/setup/setup_config2.tpl
index b6d806b31..ab48a9531 100644
--- a/gosa-core/setup/setup_config2.tpl
+++ b/gosa-core/setup/setup_config2.tpl
@@ -71,7 +71,7 @@
             {t}Timezone{/t}
         </div>
         <div class='step4_value'>
-            <select name='timezone' title='{t}Please choose your preferred timezone here{/t}' style="width:100%">
+            <select name='timezone' title='{t}Please choose your preferred timezone here{/t}' style="width:100%" size=1>
  		{foreach from=$timezones.TIMEZONES item=val key=key}
             {if $key == $timezone}
                 {if isset($timezones.DST_ZONES.$key)}
@@ -107,65 +107,6 @@
         </div>
     </div>
 
-	<div class='step4_container'>
-        <div class='step4_name'>
-            {t}Enable DNS extension{/t}
-        </div>
-        <div class='step4_value'>
-
-            <select name="enableDNS" size="1" title="">
-                {html_options options=$bool selected=$generic_settings.enableDNS}
-            </select>
-        </div>
-    </div>
-
-	<div class='step4_container'>
-        <div class='step4_name'>
-            {t}Enable DHCP extension{/t}
-        </div>
-        <div class='step4_value'>
-
-            <select name="enableDHCP" size="1" title="">
-                {html_options options=$bool selected=$generic_settings.enableDHCP}
-            </select>
-        </div>
-    </div>
-
-	<div class='step4_container'>
-        <div class='step4_name'>
-            {t}Enable mime type management{/t}
-        </div>
-        <div class='step4_value'>
-
-            <select name="enableMimeType" size="1" title="">
-                {html_options options=$bool selected=$enableMimeType}
-            </select>
-        </div>
-    </div>
-
-	<div class='step4_container'>
-        <div class='step4_name'>
-            {t}Enable FAI release management{/t}
-        </div>
-        <div class='step4_value'>
-
-            <select name="enableFAI_management" size="1" title="">
-                {html_options options=$bool selected=$enableFAI_management}
-            </select>
-        </div>
-    </div>
-
-	<div class='step4_container'>
-        <div class='step4_name'>
-            {t}Enable user netatalk plugin{/t}
-        </div>
-        <div class='step4_value'>
-            <select name="use_netatalk" size="1" title="">
-                {html_options options=$bool selected=$use_netatalk}
-            </select>
-        </div>
-    </div>
-
     <div class='step4_container'>
         <div class='step4_name'>
             {t}Government mode{/t}
@@ -179,13 +120,14 @@
 
     <div class='step4_container'>
         <div class='step4_name'>
-            {t}Logging options{/t}
+            {t}GOsa logging{/t}
         </div>
         <div class='step4_value'>
-			<input type='checkbox' name='logging_syslog' value='1' 
-				{if $logging_syslog} checked {/if} class='center'>{t}Syslog{/t} 
-			<input type='checkbox' name='logging_mysql' value='1' 
-				{if $logging_mysql} checked {/if} class='center'>{t}MySQL{/t}
+          {if $logging} 
+            <input checked type='checkbox' name='logging' value='1' class='center'>
+          {else}
+            <input type='checkbox' name='logging' value='1' class='center'>
+          {/if}
         </div>
     </div>