Layout fixes

[gosa.git] / contrib / gosa.conf

diff --git a/contrib/gosa.conf b/contrib/gosa.conf
index e543c72ea64d3a392b05983f3b58601f59f37427..3e911d393e6f999a1ec22c5935e242cb2aff9c2a 100644 (file)
--- a/contrib/gosa.conf
+++ b/contrib/gosa.conf
@@ -7,7 +7,9 @@
                        <plugin acl="default" class="posixAccount" icon="posix.png"
                                path="plugins/personal/posix" />
                        <plugin acl="default" class="environment" icon="env.png"
-                               kioskpath="/var/spool/kiosk"
+{if $cv.optional.kioskpath_active}
+                               kioskpath="{$cv.optional.kioskpath}"
+{/if}
                                path="plugins/personal/environment" />
                        <plugin acl="default" class="mailAccount" icon="email.png"
                                path="plugins/personal/mail" />
@@ -58,6 +60,8 @@
                                path="plugins/gofon/macro" />
                        <plugin acl="conference" class="phoneConferenceManagment" icon="conference.png"
                                path="plugins/gofon/conference" />
+            <plugin acl="acl" class="acl" icon="acl.png"
+                path="plugins/admin/acl" />
                </section>
 
                <section name="Addons">
@@ -75,6 +79,10 @@
                                path="plugins/addons/ldapmanager" />
                        <plugin acl="notifications" class="msgplug" icon="notifications.png"
                                 path="plugins/addons/notifications" />
+<!--
+                       <plugin acl="gotomasses" class="gotomasses" icon="system.png"
+                                path="plugins/addons/gotomasses" />
+-->
                </section>
        </menu>
 
@@ -153,9 +161,11 @@
 
        <serverservice>
         <tab class="goMailServer" />
-               %%VERGESESN KOLAB TAB %%
+{if $cv.mail == "kolab"}
+               <tab class="servkolab" />
+{/if}
         <tab class="goNtpServer" />
-       <tab class="servrepository" />
+               <tab class="servrepository" />
         <tab class="goImapServer" />
         <tab class="goKrbServer" />
         <tab class="goFaxServer" />
@@ -186,22 +196,23 @@
     </ogrouptabs>
 
     <connectivity>
-               %%VERGESESN KOLAB TAB %%
-       <tab class="proxyAccount" />
-       <tab class="pureftpdAccount" />
-       <tab class="webdavAccount" />
-       <tab class="phpgwAccount" />
-       <tab class="intranetAccount" />
-       <tab class="opengwAccount"
+{if $cv.mail == "kolab"}
+               <tab class='kolabAccount' /> 
+{/if}
+               <tab class="proxyAccount" />
+               <tab class="pureftpdAccount" />
+               <tab class="webdavAccount" />
+               <tab class="phpgwAccount" />
+               <tab class="intranetAccount" />
+               <tab class="opengwAccount"
              username="OGo"
              password=""
              database="OGo"
              datahost="localhost" />
-
 <!--   
-       <tab class="pptpAccount" /> 
-       <tab class="phpscheduleitAccount" /> 
-       <tab class="glpiAccount" /> 
+               <tab class="pptpAccount" /> 
+               <tab class="phpscheduleitAccount" /> 
+               <tab class="glpiAccount" /> 
 -->
        </connectivity>
 
@@ -262,10 +273,10 @@
 {else}
                schema_check="false"
 {/if}
-{if $cv.optional.enableCopyPaste}
-               enableCopyPaste="true" 
+{if $cv.generic_settings.enableCopyPaste}
+               enableCopyPaste="true"
 {else}
-               enableCopyPaste="false" 
+               enableCopyPaste="false"
 {/if}
 {if $cv.optional.forceglobals}
                forceglobals="true"
@@ -285,13 +296,24 @@
 {if $cv.optional.ppd_path_active}
                ppd_path="{$cv.optional.ppd_path}"
 {/if}
-{if $cv.optional.kde_applications_menu_active}
-               kde_applications_menu="{$cv.optional.kde_applications_menu}"
-{/if}
 {if $cv.optional.max_ldap_query_time_active}   
                max_ldap_query_time="{$cv.optional.max_ldap_query_time}"
 {/if}
-               lang="{$cv.lang}"
+{if $cv.optional.noprimarygroup}
+               noprimarygroup="true"
+{/if}
+{if $cv.optional.mailQueueScriptPath_active}
+               mailQueueScriptPath="{$cv.optional.mailQueueScriptPath}"
+{/if}
+{if $cv.optional.auto_network_hook_active}
+               auto_network_hook="{$cv.optional.auto_network_hook} "
+{/if}
+{if $cv.optional.strict_units}
+               strict_units="true"
+{else}
+               strict_units="false"
+{/if}
+               lang="{$cv.lang_selected}"
                theme="{$cv.theme}"
                session_lifetime="{$cv.optional.session_lifetime}"
                compile="{$cv.optional.compile}"
@@ -307,19 +329,40 @@
                        groups="{$cv.groupou}"
                        gidbase="{$cv.uidbase}"
                        uidbase="{$cv.uidbase}"
+{if $cv.krbsasl}
+                       krbsasl="true"
+{else}
+                       krbsasl="false"
+{/if}
+{if $cv.rfc2307bis}
+                       rfc2307bis="true"
+{else}
+                       rfc2307bis="false"
+{/if}
+{if $cv.include_personal_title}
+                       include_personal_title="true"
+{else}
+                       include_personal_title="false"
+{/if}
+{if $cv.optional.notifydir_active }
+                       notifydir="{$cv.optional.notifydir}"
+{/if}
+{if $cv.base_hook_active}
+                       base_hook="{$cv.base_hook}"
+{/if}
 {if $cv.generic_settings.wws_ou_active}
                        winstations="{$cv.generic_settings.wws_ou}"
 {/if}
-{if $cv.generic_settings.idgen_active}
-                       idgen="{$cv.generic_settings.idgen}"
+{if $cv.id_settings.idgen_active}
+                       idgen="{$cv.id_settings.idgen}"
 {/if}
 {if $cv.strict}
                        strict="yes"
 {else}
                        strict="no"
 {/if}
-{if $cv.generic_settings.minid_active}
-                       minid="{$cv.generic_settings.minid}"
+{if $cv.id_settings.minid_active}
+                       minid="{$cv.id_settings.minid}"
 {/if}
 {if $cv.mail != "disabled"}
                        mailMethod="{$cv.mail}"
@@ -337,6 +380,8 @@
 {/if}
 {if $cv.governmentmode}
                        governmentmode="true"
+{else}
+                       governmentmode="false"
 {/if}
 {if $cv.sambaidmapping}
                        sambaidmapping="true"