X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=setup%2Fsetup_config2.tpl;h=80c5cf6aac5666e2d4412c51e4e9e035f6ba5903;hb=a1c91fa453455373751c90ae009d0e2216077e1c;hp=bce647ec1fb008357f2cb30b192091072455b24f;hpb=6e4835c17e05ba3c8ce607936ab8c48b44d33680;p=gosa.git

diff --git a/setup/setup_config2.tpl b/setup/setup_config2.tpl
index bce647ec1..80c5cf6aa 100644
--- a/setup/setup_config2.tpl
+++ b/setup/setup_config2.tpl
@@ -72,13 +72,22 @@
         </div>
         <div class='step4_value'>
             <select name='timezone' title='{t}Please your preferred timezone here{/t}' style="width:100%">
-        {foreach from=$timezones item=val key=key}
-            {if $val.name == $timezone}
-            <option selected value="{$val.name}">{$val.name}</option>
+ 		{foreach from=$timezones.TIMEZONES item=val key=key}
+            {if $key == $timezone}
+                {if isset($timezones.DST_ZONES.$key)}
+                    <option selected value="{$key}">{$key} (DST)</option>
+                {else}
+                    <option selected value="{$key}">{$key} (GMT)</option>
+                {/if}
             {else}
-            <option value="{$val.name}">{$val.name}</option>
+                {if isset($timezones.DST_ZONES.$key)}
+                    <option value="{$key}">{$key} (DST)</option>
+                {else}
+                    <option value="{$key}">{$key} (GMT)</option>
+                {/if}
             {/if}
         {/foreach}
+
             </select>
         </div>
     </div>
@@ -98,6 +107,42 @@
         </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}