From: cajus Date: Wed, 7 Jun 2006 19:14:10 +0000 (+0000) Subject: Quick review for new service handling X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=3945a3710985642238f01b45bb6900c9ad3d3f6f;p=gosa.git Quick review for new service handling - new images - typo fixing - layout fixing git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@3677 594d385d-05f5-0310-b6e9-bd551577e9d8 --- diff --git a/contrib/openldap/goserver.schema b/contrib/openldap/goserver.schema index b469f6b58..7cbc94007 100644 --- a/contrib/openldap/goserver.schema +++ b/contrib/openldap/goserver.schema @@ -168,6 +168,178 @@ attributetype ( 1.3.6.1.4.1.10098.1.1.9.32 NAME 'goGlpiDatabase' EQUALITY caseExactIA5Match SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 SINGLE-VALUE) + +attributetype ( 1.3.6.1.4.1.10098.1.1.9.33 NAME 'goTerminalServerStatus' + DESC 'Server status container - on / off / fail' + EQUALITY caseExactIA5Match + SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 + SINGLE-VALUE) + +attributetype ( 1.3.6.1.4.1.10098.1.1.9.34 NAME 'goNfsServerStatus' + DESC 'Server status container - on / off / fail' + EQUALITY caseExactIA5Match + SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 + SINGLE-VALUE) + +attributetype ( 1.3.6.1.4.1.10098.1.1.9.35 NAME 'goNtpServerStatus' + DESC 'Server status container - on / off / fail' + EQUALITY caseExactIA5Match + SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 + SINGLE-VALUE) + +attributetype ( 1.3.6.1.4.1.10098.1.1.9.36 NAME 'goSyslogServerStatus' + DESC 'Server status container - on / off / fail' + EQUALITY caseExactIA5Match + SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 + SINGLE-VALUE) + +attributetype ( 1.3.6.1.4.1.10098.1.1.9.37 NAME 'goLdapServerStatus' + DESC 'Server status container - on / off / fail' + EQUALITY caseExactIA5Match + SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 + SINGLE-VALUE) + +attributetype ( 1.3.6.1.4.1.10098.1.1.9.38 NAME 'goImapServerStatus' + DESC 'Server status container - on / off / fail' + EQUALITY caseExactIA5Match + SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 + SINGLE-VALUE) + +attributetype ( 1.3.6.1.4.1.10098.1.1.9.39 NAME 'goKrbServerStatus' + DESC 'Server status container - on / off / fail' + EQUALITY caseExactIA5Match + SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 + SINGLE-VALUE) + +attributetype ( 1.3.6.1.4.1.10098.1.1.9.40 NAME 'goFaxServerStatus' + DESC 'Server status container - on / off / fail' + EQUALITY caseExactIA5Match + SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 + SINGLE-VALUE) + +attributetype ( 1.3.6.1.4.1.10098.1.1.9.41 NAME 'goLogDBServerStatus' + DESC 'Server status container - on / off / fail' + EQUALITY caseExactIA5Match + SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 + SINGLE-VALUE) + +attributetype ( 1.3.6.1.4.1.10098.1.1.9.42 NAME 'goFonServerStatus' + DESC 'Server status container - on / off / fail' + EQUALITY caseExactIA5Match + SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 + SINGLE-VALUE) + +attributetype ( 1.3.6.1.4.1.10098.1.1.9.43 NAME 'goShareServerStatus' + DESC 'Server status container - on / off / fail' + EQUALITY caseExactIA5Match + SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 + SINGLE-VALUE) + +attributetype ( 1.3.6.1.4.1.10098.1.1.9.44 NAME 'goMailServerStatus' + DESC 'Server status container - on / off / fail' + EQUALITY caseExactIA5Match + SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 + SINGLE-VALUE) + +attributetype ( 1.3.6.1.4.1.10098.1.1.9.45 NAME 'goGlpiServerStatus' + DESC 'Server status container - on / off / fail' + EQUALITY caseExactIA5Match + SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 + SINGLE-VALUE) + +attributetype ( 1.3.6.1.4.1.10098.1.1.9.46 NAME 'postfixHeaderSizeLimit' + DESC 'Keep postfix header-size-limit variable' + EQUALITY caseExactIA5Match + SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 + SINGLE-VALUE) + +attributetype ( 1.3.6.1.4.1.10098.1.1.9.47 NAME 'postfixMailboxSizeLimit' + DESC 'Keep postfix mailbox-size-limit variable' + EQUALITY caseExactIA5Match + SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 + SINGLE-VALUE) + +attributetype ( 1.3.6.1.4.1.10098.1.1.9.48 NAME 'postfixMessageSizeLimit' + DESC 'Keep postfix message-size-limit variable' + EQUALITY caseExactIA5Match + SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 + SINGLE-VALUE) + +attributetype ( 1.3.6.1.4.1.10098.1.1.9.49 NAME 'postfixMyDestinations' + DESC 'Keep postfix mydestinations variable' + EQUALITY caseExactIA5Match + SYNTAX 1.3.6.1.4.1.1466.115.121.1.26) + +attributetype ( 1.3.6.1.4.1.10098.1.1.9.50 NAME 'postfixMyDomain' + DESC 'Keep postfix mydomain variable' + EQUALITY caseExactIA5Match + SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 + SINGLE-VALUE) + +attributetype ( 1.3.6.1.4.1.10098.1.1.9.51 NAME 'postfixMyHostname' + DESC 'Keep postfix myhostname variable' + EQUALITY caseExactIA5Match + SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 + SINGLE-VALUE) + +attributetype ( 1.3.6.1.4.1.10098.1.1.9.52 NAME 'postfixMyNetworks' + DESC 'Keep postfix mynetworks variable' + EQUALITY caseExactIA5Match + SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 + SINGLE-VALUE) + +attributetype ( 1.3.6.1.4.1.10098.1.1.9.53 NAME 'postfixRelayhost' + DESC 'Keep postfix relayhost variable' + EQUALITY caseExactIA5Match + SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 + SINGLE-VALUE) + +attributetype ( 1.3.6.1.4.1.10098.1.1.9.54 NAME 'postfixTransportTable' + DESC 'Keep postfix transport tables' + EQUALITY caseExactIA5Match + SYNTAX 1.3.6.1.4.1.1466.115.121.1.26) + +attributetype ( 1.3.6.1.4.1.10098.1.1.9.55 NAME 'postfixSenderRestrictions' + DESC 'Keep postfix sender restrictions' + EQUALITY caseExactIA5Match + SYNTAX 1.3.6.1.4.1.1466.115.121.1.26) + +attributetype ( 1.3.6.1.4.1.10098.1.1.9.56 NAME 'postfixRecipientRestrictions' + DESC 'Keep postfix transport tables' + EQUALITY caseExactIA5Match + SYNTAX 1.3.6.1.4.1.1466.115.121.1.26) + +attributetype ( 1.3.6.1.4.1.10098.1.1.9.57 NAME 'cyrusImap' + DESC 'Start IMAP service? true/false' + EQUALITY caseExactIA5Match + SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 + SINGLE-VALUE) + +attributetype ( 1.3.6.1.4.1.10098.1.1.9.58 NAME 'cyrusImapSSL' + DESC 'Start IMAP SSL service? true/false' + EQUALITY caseExactIA5Match + SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 + SINGLE-VALUE) + +attributetype ( 1.3.6.1.4.1.10098.1.1.9.59 NAME 'cyrusPop3' + DESC 'Start POP3 service? true/false' + EQUALITY caseExactIA5Match + SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 + SINGLE-VALUE) + +attributetype ( 1.3.6.1.4.1.10098.1.1.9.60 NAME 'cyrusPop3SSL' + DESC 'Start POP3 SSL service? true/false' + EQUALITY caseExactIA5Match + SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 + SINGLE-VALUE) + +attributetype ( 1.3.6.1.4.1.10098.1.1.9.61 NAME 'goCupsServerStatus' + DESC 'Server status container - on / off / fail' + EQUALITY caseExactIA5Match + SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 + SINGLE-VALUE) + + ## ## Objectclasses ## @@ -176,55 +348,56 @@ attributetype ( 1.3.6.1.4.1.10098.1.1.9.32 NAME 'goGlpiDatabase' objectclass (1.3.6.1.4.1.10098.1.2.1.16 NAME 'goTerminalServer' SUP top AUXILIARY DESC 'Terminal server description (v2.4)' MUST ( cn $ goXdmcpIsEnabled $ goFontPath ) - MAY ( description )) + MAY ( description $ goTerminalServerStatus )) # NFS Server description objectclass (1.3.6.1.4.1.10098.1.2.1.19 NAME 'goNfsServer' SUP top AUXILIARY DESC 'NFS server description (v2.4)' MUST ( cn ) - MAY ( goExportEntry $ description )) + MAY ( goExportEntry $ description $ goNfsServerStatus )) # Time Server description objectclass (1.3.6.1.4.1.10098.1.2.1.20 NAME 'goNtpServer' SUP top AUXILIARY DESC 'Time server description (v2.4)' MUST ( cn ) - MAY ( goTimeSource $ description )) + MAY ( goTimeSource $ description $ goNtpServerStatus )) # Syslog Server description objectclass (1.3.6.1.4.1.10098.1.2.1.21 NAME 'goSyslogServer' SUP top AUXILIARY DESC 'Syslog server description (v2.4)' MUST ( cn ) - MAY ( goSyslogSection $ description )) + MAY ( goSyslogSection $ description $ goSyslogServerStatus )) # LDAP Server description objectclass (1.3.6.1.4.1.10098.1.2.1.22 NAME 'goLdapServer' SUP top AUXILIARY DESC 'LDAP server description (v2.4)' MUST ( cn ) - MAY ( goLdapBase $ description )) + MAY ( goLdapBase $ description $ goLdapServerStatus )) # CUPS Server description objectclass (1.3.6.1.4.1.10098.1.2.1.23 NAME 'goCupsServer' SUP top AUXILIARY DESC 'CUPS server description (v2.4)' MUST ( cn ) - MAY ( description )) + MAY ( description $ goCupsServerStatus )) # IMAP Server description objectclass (1.3.6.1.4.1.10098.1.2.1.24 NAME 'goImapServer' SUP top AUXILIARY DESC 'IMAP server description (v2.4)' MUST ( cn $ goImapName $ goImapConnect $ goImapAdmin $ goImapPassword ) - MAY ( goImapSieveServer $ goImapSievePort $ description )) + MAY ( goImapSieveServer $ goImapSievePort $ description $ goImapServerStatus $ + cyrusImap $ cyrusImapSSL $ cyrusPop3 $ cyrusPop3SSL )) # Kerberos Server description objectclass (1.3.6.1.4.1.10098.1.2.1.25 NAME 'goKrbServer' SUP top AUXILIARY DESC 'Kerberos server description (v2.4)' MUST ( cn $ goKrbRealm $ goKrbAdmin $ goKrbPassword ) - MAY ( description )) + MAY ( description $ goKrbServerStatus )) # Fax Server description objectclass (1.3.6.1.4.1.10098.1.2.1.26 NAME 'goFaxServer' SUP top AUXILIARY DESC 'Fax server description (v2.4)' MUST ( cn $ goFaxAdmin $ goFaxPassword ) - MAY ( description )) + MAY ( description $ goFaxServerStatus )) # Common server class objectclass (1.3.6.1.4.1.10098.1.2.1.27 NAME 'goServer' SUP top AUXILIARY @@ -235,28 +408,32 @@ objectclass (1.3.6.1.4.1.10098.1.2.1.27 NAME 'goServer' SUP top AUXILIARY # LogDB Server description objectclass (1.3.6.1.4.1.10098.1.2.1.28 NAME 'goLogDBServer' SUP top AUXILIARY DESC 'Log DB server description (v2.4)' - MUST ( cn $ goLogAdmin $ goLogPassword )) + MUST ( cn $ goLogAdmin $ goLogPassword $ goLogDBServerStatus )) # Fon Server description objectclass (1.3.6.1.4.1.10098.1.2.1.29 NAME 'goFonServer' SUP top AUXILIARY DESC 'Fon server description (v2.4)' MUST ( cn $ goFonAdmin $ goFonPassword $ goFonAreaCode $ goFonCountryCode ) - MAY ( description )) + MAY ( description $ goFonServerStatus )) # Share Server description objectclass (1.3.6.1.4.1.10098.1.2.1.33 NAME 'goShareServer' SUP top AUXILIARY DESC 'Share server description (v2.4)' MUST ( cn ) - MAY ( description $ goExportEntry )) + MAY ( description $ goExportEntry $ goShareServerStatus )) # Mail Server description objectclass (1.3.6.1.4.1.10098.1.2.1.36 NAME 'goMailServer' SUP top AUXILIARY DESC 'Mail server definition (v2.4)' MUST ( cn ) - MAY ( description ) ) + MAY ( description $ goMailServerStatus $ postfixHeaderSizeLimit $ + postfixMailboxSizeLimit $ postfixMessageSizeLimit $ + postfixMydestinations $ postfixMydomain $ postfixMyhostname $ + postfixMynetworks $ postfixRelayhost $ postfixTransportTable $ + postfixSenderRestrictions $ postfixRecipientRestrictions ) ) # Glpi Server description objectclass (1.3.6.1.4.1.10098.1.2.1.37 NAME 'goGlpiServer' SUP top AUXILIARY DESC 'Glpi server definition (v2.4)' MUST ( cn $ goGlpiAdmin $ goGlpiDatabase) - MAY ( description $ goGlpiPassword) ) + MAY ( description $ goGlpiPassword $ goGlpiServerStatus ) ) diff --git a/html/images/status_restart.png b/html/images/status_restart.png index de65ee190..99fd4d7c1 100644 Binary files a/html/images/status_restart.png and b/html/images/status_restart.png differ diff --git a/html/images/status_restart_all.png b/html/images/status_restart_all.png index de65ee190..99fd4d7c1 100644 Binary files a/html/images/status_restart_all.png and b/html/images/status_restart_all.png differ diff --git a/html/images/status_restarting.png b/html/images/status_restarting.png index de65ee190..e0021413b 100644 Binary files a/html/images/status_restarting.png and b/html/images/status_restarting.png differ diff --git a/html/images/status_running.png b/html/images/status_running.png index 543710fb7..8d72794dd 100755 Binary files a/html/images/status_running.png and b/html/images/status_running.png differ diff --git a/html/images/status_start.png b/html/images/status_start.png index 543710fb7..d788511db 100755 Binary files a/html/images/status_start.png and b/html/images/status_start.png differ diff --git a/html/images/status_start_all.png b/html/images/status_start_all.png index 543710fb7..d788511db 100755 Binary files a/html/images/status_start_all.png and b/html/images/status_start_all.png differ diff --git a/html/images/status_stop.png b/html/images/status_stop.png index 3240b29d5..00e237f27 100755 Binary files a/html/images/status_stop.png and b/html/images/status_stop.png differ diff --git a/html/images/status_stop_all.png b/html/images/status_stop_all.png index 3240b29d5..00e237f27 100755 Binary files a/html/images/status_stop_all.png and b/html/images/status_stop_all.png differ diff --git a/html/images/status_stopped.png b/html/images/status_stopped.png index 3240b29d5..a9224a2cf 100755 Binary files a/html/images/status_stopped.png and b/html/images/status_stopped.png differ diff --git a/plugins/admin/systems/ServiceAddDialog.tpl b/plugins/admin/systems/ServiceAddDialog.tpl index 6046c328b..6fc2ac68e 100755 --- a/plugins/admin/systems/ServiceAddDialog.tpl +++ b/plugins/admin/systems/ServiceAddDialog.tpl @@ -1,32 +1,27 @@ -
-
- {t}Add a new service to this server.{/t}. -
+
 
+
+ {t}Adding a new service to the current server{/t}

-

-{t}This dialog allows you to add new services to the currenty edited server object. In the box below you can see all available services, services you have already in use are not shown.{/t} +

+{t}This dialog allows you to add new services to the currenty edited server object. The box below shows all available but not already used services.{/t}

{if $Services} - -
- -{t}Please choose a service listed below.{/t} -

-
{t}Available services{/t}   +
{t}Service to add{/t}   {else}
- {t}There are no more services available, if you think that there is a service missing. Please check your gosa configuration file.{/t} + {t}All available services are already in use.{/t}
{/if}

+

diff --git a/plugins/admin/systems/class_divListSystemService.inc b/plugins/admin/systems/class_divListSystemService.inc index 8fdac79e8..722c2d418 100644 --- a/plugins/admin/systems/class_divListSystemService.inc +++ b/plugins/admin/systems/class_divListSystemService.inc @@ -49,6 +49,7 @@ class divListSystemService extends MultiSelectWindow $listhead = "
". "  ". + "  ". "  ". " DisplayName = _("FAX database"); + $this->DisplayName = _("FAX service"); } diff --git a/plugins/admin/systems/class_goFonServer.inc b/plugins/admin/systems/class_goFonServer.inc index 221b5c714..750940fe6 100644 --- a/plugins/admin/systems/class_goFonServer.inc +++ b/plugins/admin/systems/class_goFonServer.inc @@ -28,7 +28,7 @@ class goFonServer extends plugin{ function goFonServer($config,$dn) { plugin::plugin($config,$dn); - $this->DisplayName = _("Asterisk management"); + $this->DisplayName = _("VoIP service"); } diff --git a/plugins/admin/systems/class_goGlpiServer.inc b/plugins/admin/systems/class_goGlpiServer.inc index c532e3523..36bc52c5c 100644 --- a/plugins/admin/systems/class_goGlpiServer.inc +++ b/plugins/admin/systems/class_goGlpiServer.inc @@ -27,7 +27,7 @@ class goGlpiServer extends plugin{ function goGlpiServer($config,$dn) { plugin::plugin($config,$dn); - $this->DisplayName = _("Glpi database"); + $this->DisplayName = _("Inventory database"); } diff --git a/plugins/admin/systems/class_goImapServer.inc b/plugins/admin/systems/class_goImapServer.inc index ebf9fbb4c..a10c71505 100644 --- a/plugins/admin/systems/class_goImapServer.inc +++ b/plugins/admin/systems/class_goImapServer.inc @@ -46,7 +46,7 @@ class goImapServer extends plugin{ { plugin::plugin($config,$dn); - $this->DisplayName = _("Cyrus service"); + $this->DisplayName = _("IMAP/POP3 service"); $this->Actions = array( SERVICE_STOPPED=>SERVICE_STOPPED, SERVICE_STARTED => SERVICE_STARTED, diff --git a/plugins/admin/systems/class_goKrbServer.inc b/plugins/admin/systems/class_goKrbServer.inc index eaed327bc..544568728 100644 --- a/plugins/admin/systems/class_goKrbServer.inc +++ b/plugins/admin/systems/class_goKrbServer.inc @@ -26,7 +26,7 @@ class goKrbServer extends plugin{ function goKrbServer($config,$dn) { plugin::plugin($config,$dn); - $this->DisplayName = _("Kerberos kadmin access informations"); + $this->DisplayName = _("Kerberos service"); } diff --git a/plugins/admin/systems/class_goLdapServer.inc b/plugins/admin/systems/class_goLdapServer.inc index eb29ad2c9..21f5866a2 100644 --- a/plugins/admin/systems/class_goLdapServer.inc +++ b/plugins/admin/systems/class_goLdapServer.inc @@ -24,7 +24,7 @@ class goLdapServer extends plugin{ function goLdapServer($config,$dn) { plugin::plugin($config,$dn); - $this->DisplayName = _("LDAP Service"); + $this->DisplayName = _("LDAP service"); } diff --git a/plugins/admin/systems/class_goMailServer.inc b/plugins/admin/systems/class_goMailServer.inc index 49a2eb2c6..6a596d97e 100644 --- a/plugins/admin/systems/class_goMailServer.inc +++ b/plugins/admin/systems/class_goMailServer.inc @@ -42,7 +42,7 @@ class goMailServer extends plugin{ function goMailServer($config,$dn) { plugin::plugin($config,$dn); - $this->DisplayName = _("Postfix service"); + $this->DisplayName = _("Mail service (SMTP)"); $this->Actions = array( SERVICE_STOPPED=>SERVICE_STOPPED, SERVICE_STARTED => SERVICE_STARTED, diff --git a/plugins/admin/systems/class_goNtpServer.inc b/plugins/admin/systems/class_goNtpServer.inc index 694f6e694..264d56b62 100644 --- a/plugins/admin/systems/class_goNtpServer.inc +++ b/plugins/admin/systems/class_goNtpServer.inc @@ -24,7 +24,7 @@ class goNtpServer extends plugin{ function goNtpServer($config,$dn) { plugin::plugin($config,$dn); - $this->DisplayName = _("NTP Service"); + $this->DisplayName = _("Time service"); /* Load arrays */ $tmp = array(); diff --git a/plugins/admin/systems/class_goShareServer.inc b/plugins/admin/systems/class_goShareServer.inc index f960acdc9..b3156643f 100644 --- a/plugins/admin/systems/class_goShareServer.inc +++ b/plugins/admin/systems/class_goShareServer.inc @@ -28,7 +28,7 @@ class goShareServer extends plugin{ { plugin::plugin($config,$dn); - $this->DisplayName = _("Shares"); + $this->DisplayName = _("File service"); $tmp =array(); if(isset($this->attrs['goExportEntry'])){ diff --git a/plugins/admin/systems/class_goSyslogServer.inc b/plugins/admin/systems/class_goSyslogServer.inc index 66fafcbe2..5cffb0f0e 100644 --- a/plugins/admin/systems/class_goSyslogServer.inc +++ b/plugins/admin/systems/class_goSyslogServer.inc @@ -23,7 +23,7 @@ class goSyslogServer extends plugin{ function goSyslogServer($config,$dn) { plugin::plugin($config,$dn); - $this->DisplayName = _("Syslog service"); + $this->DisplayName = _("Logging service"); } diff --git a/plugins/admin/systems/goFaxServer.tpl b/plugins/admin/systems/goFaxServer.tpl index 6211415aa..1c21ca4fc 100644 --- a/plugins/admin/systems/goFaxServer.tpl +++ b/plugins/admin/systems/goFaxServer.tpl @@ -1,4 +1,4 @@ -{t}Kerberos kadmin access{/t} +

{t}FAX database information{/t}

diff --git a/plugins/admin/systems/goFonServer.tpl b/plugins/admin/systems/goFonServer.tpl index a937131de..f303abb8a 100644 --- a/plugins/admin/systems/goFonServer.tpl +++ b/plugins/admin/systems/goFonServer.tpl @@ -1,3 +1,4 @@ +

{t}VoIP database information{/t}

{t}FAX DB user{/t}
diff --git a/plugins/admin/systems/goGlpiServer.tpl b/plugins/admin/systems/goGlpiServer.tpl index 5b3bc33f7..2cdec6554 100644 --- a/plugins/admin/systems/goGlpiServer.tpl +++ b/plugins/admin/systems/goGlpiServer.tpl @@ -1,5 +1,4 @@ -{t}Glpi database{/t} - +

{t}GLPI database information{/t}

{t}Asterisk DB user{/t}
diff --git a/plugins/admin/systems/goImapServer.tpl b/plugins/admin/systems/goImapServer.tpl index 41b6331ab..ca78a7b2e 100644 --- a/plugins/admin/systems/goImapServer.tpl +++ b/plugins/admin/systems/goImapServer.tpl @@ -1,5 +1,4 @@ -{t}Generic{/t} -
+

{t}Generic{/t}

{t}Logging DB user{/t}
diff --git a/plugins/admin/systems/goKrbServer.tpl b/plugins/admin/systems/goKrbServer.tpl index a829140fe..8227b54b9 100644 --- a/plugins/admin/systems/goKrbServer.tpl +++ b/plugins/admin/systems/goKrbServer.tpl @@ -1,4 +1,4 @@ -{t}Kerberos kadmin access{/t} +

{t}Kerberos kadmin access{/t}

diff --git a/plugins/admin/systems/goLdapServer.tpl b/plugins/admin/systems/goLdapServer.tpl index b2c984303..112ddd6c2 100644 --- a/plugins/admin/systems/goLdapServer.tpl +++ b/plugins/admin/systems/goLdapServer.tpl @@ -1,6 +1,5 @@ -{t}LDAP Service{/t} - - +

{t}LDAP service{/t}

+{t}Base{/t}

 

diff --git a/plugins/admin/systems/goLogDBServer.tpl b/plugins/admin/systems/goLogDBServer.tpl index 88346956e..9bf18aa9b 100644 --- a/plugins/admin/systems/goLogDBServer.tpl +++ b/plugins/admin/systems/goLogDBServer.tpl @@ -1,4 +1,4 @@ -{t}Logging database{/t} +

{t}Logging database information{/t}

{t}Kerberos Realm{/t}
diff --git a/plugins/admin/systems/goMailServer.tpl b/plugins/admin/systems/goMailServer.tpl index cedb73e1c..00d39b6ae 100644 --- a/plugins/admin/systems/goMailServer.tpl +++ b/plugins/admin/systems/goMailServer.tpl @@ -1,8 +1,7 @@ -{t}Generic{/t} -

+

{t}Generic{/t}

{t}Logging DB user{/t}
-
+
{t}Visible full qualified hostname{/t} diff --git a/plugins/admin/systems/goShareServer.tpl b/plugins/admin/systems/goShareServer.tpl index 592379333..1699407db 100644 --- a/plugins/admin/systems/goShareServer.tpl +++ b/plugins/admin/systems/goShareServer.tpl @@ -1,4 +1,4 @@ -{t}Shares{/t} +

{t}Shares{/t}

diff --git a/plugins/admin/systems/goTerminalServer.tpl b/plugins/admin/systems/goTerminalServer.tpl index a0b88fb55..ebe86e949 100644 --- a/plugins/admin/systems/goTerminalServer.tpl +++ b/plugins/admin/systems/goTerminalServer.tpl @@ -1,5 +1,4 @@ -{t}Terminal Service{/t} - +

{t}Terminal service{/t}