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 b469f6b58ba3dbd88f8bc3f01a8756b85d3270e3..7cbc940076f465e252d9bde1876267f978f4fcb1 100644 (file)
--- 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 de65ee190afe13189d11ccc121b7252dbce6ea21..99fd4d7c1f0b8d94b51f6bfdc96079f165b3b4aa 100644 (file)
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 de65ee190afe13189d11ccc121b7252dbce6ea21..99fd4d7c1f0b8d94b51f6bfdc96079f165b3b4aa 100644 (file)
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 de65ee190afe13189d11ccc121b7252dbce6ea21..e0021413b72bcc3786e1fa3c16be41281e6da806 100644 (file)
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 543710fb7b9b2a3ea9a115031cec06748ba82d8e..8d72794dd0f14442b856ab4aca6b23edcb8c5d4f 100755 (executable)
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 543710fb7b9b2a3ea9a115031cec06748ba82d8e..d788511db2448612a0ad07a6ec454cefabcd09b8 100755 (executable)
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 543710fb7b9b2a3ea9a115031cec06748ba82d8e..d788511db2448612a0ad07a6ec454cefabcd09b8 100755 (executable)
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 3240b29d5c73c3c783d9352d4cf0aefff0c5f4b8..00e237f27bd864bb462dc807c2a0d9a9ef89fbf4 100755 (executable)
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 3240b29d5c73c3c783d9352d4cf0aefff0c5f4b8..00e237f27bd864bb462dc807c2a0d9a9ef89fbf4 100755 (executable)
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 3240b29d5c73c3c783d9352d4cf0aefff0c5f4b8..a9224a2cf821819b77fe6de9c6320999adb336db 100755 (executable)
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 6046c328be20a5a16fbceeccce2e9cc721ba221d..6fc2ac68e8f821d34216ac0f6aff16f24d48dfbc 100755 (executable)
--- a/plugins/admin/systems/ServiceAddDialog.tpl
+++ b/plugins/admin/systems/ServiceAddDialog.tpl
@@ -1,32 +1,27 @@
-<div style="font-size: 18px;">
-       <div style="font-size: 18px;">
-               {t}Add a new service to this server.{/t}.
-       </div>
+<div style="height:5px">&nbsp;</div>
+<div style="font-size:18px;">
+       {t}Adding a new service to the current server{/t}
 </div>
 <br>
-<p class="seperator"><b>
-{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} </b>
+<p class="seperator">
+{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}
 <br>
 <br>
 </p>
 {if $Services} 
-
-<br>
-
-<b>{t}Please choose a service listed below.{/t}</b>
-<br>
 <br>
-<br>{t}Available services{/t} &nbsp;
+<br>{t}Service to add{/t} &nbsp;
        <select name="ServiceName" >
                {html_options options=$Services }
        </select>
 {else}
        <br>
-       {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}
        <br>
 {/if}
 <br>
 <br>
+<br>
 <p class="seperator">
 <p>
 <div style="width:100%; text-align:right;">

diff --git a/plugins/admin/systems/class_divListSystemService.inc b/plugins/admin/systems/class_divListSystemService.inc
index 8fdac79e853314487296f8546eac9e50f3fc5668..722c2d418c9a4e240f02dc2e7be24e35287915ea 100644 (file)
--- a/plugins/admin/systems/class_divListSystemService.inc
+++ b/plugins/admin/systems/class_divListSystemService.inc
@@ -49,6 +49,7 @@ class divListSystemService extends MultiSelectWindow
     $listhead = "<div style='background:#F0F0F9;padding:5px;'>".
     " <input class='center' type='image' align='middle' src='images/select_new_server.png' class='center' 
         name='addNewService' alt='"._("Add service")."' title='"._("Add new service")."'>&nbsp;".
+    " <img class='center' src='images/list_seperator.png' align='middle' alt='' height='16' width='1'>&nbsp;".
     " <input class='center' type='image' align='middle' src='images/status_start_all.png' class='center'
         name='startServices' alt='"._("Start all")."' title='"._("Start all services")."'>&nbsp;".
     " <input class='center' type='image' align='middle' src='images/status_stop_all.png'  class='center'   

diff --git a/plugins/admin/systems/class_goFaxServer.inc b/plugins/admin/systems/class_goFaxServer.inc
index 3fca69e1d06e1133920fd73e1ffe115baf58e8ad..066711c7753fb239859eb18485d38096997f6c22 100644 (file)
--- a/plugins/admin/systems/class_goFaxServer.inc
+++ b/plugins/admin/systems/class_goFaxServer.inc
@@ -25,7 +25,7 @@ class goFaxServer extends plugin{
   function goFaxServer($config,$dn)
   {
     plugin::plugin($config,$dn);
-    $this->DisplayName = _("FAX database");
+    $this->DisplayName = _("FAX service");
   }
 
 

diff --git a/plugins/admin/systems/class_goFonServer.inc b/plugins/admin/systems/class_goFonServer.inc
index 221b5c714501c86500954e48f2450fd2fcf333a2..750940fe651f62acc62ff9f545e1f8ce1d4e3204 100644 (file)
--- 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 c532e3523803e9e097b302cd8ba939ce67bc0664..36bc52c5cd171cb6d9278ac5ebd4a70984d0c4cb 100644 (file)
--- 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 ebf9fbb4c8860e959c5dbb66d543facaeafa6293..a10c7150523839eb6196bf84dc950df2cc3a5719 100644 (file)
--- 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 eaed327bcc2da330542126ab7104023bbbbf1714..54456872894f67ad808143ef59d8a2eca8a10ec1 100644 (file)
--- 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 eb29ad2c9c9f5dbc07f4ddf21722aeacc357b19e..21f5866a24b5a37ace2c74af7c2af66d0606e569 100644 (file)
--- 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 49a2eb2c6ce224776518b58116c1b934f3cbac55..6a596d97ec8f31328b8e53f3e01fc78311d627b4 100644 (file)
--- 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 694f6e6943b0fef8456b358da14530863d599ee8..264d56b62a7feea43aac97dd9f93304a7567f3ea 100644 (file)
--- 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 f960acdc9343111dfe5e95ad1f6a419438ac22d1..b3156643f231edb92ac337106e007778fc30f4ba 100644 (file)
--- 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 66fafcbe24d223990e6c2b7610fecef6f5fbd410..5cffb0f0e180f94fb36c830df7d588cb41bd7b72 100644 (file)
--- 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 6211415aad069637caa0274f954c9b54c4a127d7..1c21ca4fc9aecb72c84706901b3528b98c822b5e 100644 (file)
--- a/plugins/admin/systems/goFaxServer.tpl
+++ b/plugins/admin/systems/goFaxServer.tpl
@@ -1,4 +1,4 @@
-<b>{t}Kerberos kadmin access{/t}</b> 
+<h2><img class="center" alt="" align="middle" src="images/rightarrow.png" /> {t}FAX database information{/t}</h2>
  <table summary="">
     <tr>
      <td>{t}FAX DB user{/t}</td>

diff --git a/plugins/admin/systems/goFonServer.tpl b/plugins/admin/systems/goFonServer.tpl
index a937131de8c1b1f5501770c68a97231b1e51fad0..f303abb8a4b6f551c6957365fa92079f817d7d31 100644 (file)
--- a/plugins/admin/systems/goFonServer.tpl
+++ b/plugins/admin/systems/goFonServer.tpl
@@ -1,3 +1,4 @@
+<h2><img class="center" alt="" align="middle" src="images/rightarrow.png" /> {t}VoIP database information{/t}</h2>
   <table summary="">
     <tr>
      <td>{t}Asterisk DB user{/t}</td>

diff --git a/plugins/admin/systems/goGlpiServer.tpl b/plugins/admin/systems/goGlpiServer.tpl
index 5b3bc33f7bfae558f5adb905bb22bb55d01bd4dd..2cdec6554dec6b8c20012a62fd7006b6e8630695 100644 (file)
--- a/plugins/admin/systems/goGlpiServer.tpl
+++ b/plugins/admin/systems/goGlpiServer.tpl
@@ -1,5 +1,4 @@
-<b>{t}Glpi database{/t}</b>
-
+<h2><img class="center" alt="" align="middle" src="images/rightarrow.png" /> {t}GLPI database information{/t}</h2>
   <table summary="">
     <tr>
      <td>{t}Logging DB user{/t}</td>

diff --git a/plugins/admin/systems/goImapServer.tpl b/plugins/admin/systems/goImapServer.tpl
index 41b6331ab73ae63b605c25b7f237a81c82f55213..ca78a7b2e82f6b4276f5d6f76ea4d26d85cdd3ac 100644 (file)
--- a/plugins/admin/systems/goImapServer.tpl
+++ b/plugins/admin/systems/goImapServer.tpl
@@ -1,5 +1,4 @@
-<b>{t}Generic{/t}</b>
-<br>
+<h2><img class="center" alt="" align="middle" src="images/rightarrow.png" /> {t}Generic{/t}</h2>
 <table width="100%">
        <tr>
                <td style='width:50%;'>

diff --git a/plugins/admin/systems/goKrbServer.tpl b/plugins/admin/systems/goKrbServer.tpl
index a829140fecec6743315669fe1d0290e55b04d410..8227b54b917a6e78967cb107798105e6f384941f 100644 (file)
--- a/plugins/admin/systems/goKrbServer.tpl
+++ b/plugins/admin/systems/goKrbServer.tpl
@@ -1,4 +1,4 @@
-<b>{t}Kerberos kadmin access{/t}</b> 
+<h2><img class="center" alt="" align="middle" src="images/rightarrow.png" /> {t}Kerberos kadmin access{/t}</h2>
   <table summary="">
     <tr>
      <td>{t}Kerberos Realm{/t}</td>

diff --git a/plugins/admin/systems/goLdapServer.tpl b/plugins/admin/systems/goLdapServer.tpl
index b2c984303d6692db4af3a703fef40165f581e15e..112ddd6c24d01c07b48efd7eadac09c5106ef46e 100644 (file)
--- a/plugins/admin/systems/goLdapServer.tpl
+++ b/plugins/admin/systems/goLdapServer.tpl
@@ -1,6 +1,5 @@
-<b>{t}LDAP Service{/t}</b> 
-
-<input type="text" style="width:70%" value="{$goLdapBase}" {$goLdapBaseACL} name="goLdapBase" id="goLdapBaseId">
+<h2><img class="center" alt="" align="middle" src="images/rightarrow.png" /> {t}LDAP service{/t}</h2>
+{t}Base{/t} <input type="text" size="80" value="{$goLdapBase}" {$goLdapBaseACL} name="goLdapBase" id="goLdapBaseId">
 
 <p class='seperator'>&nbsp;</p>
 <p>

diff --git a/plugins/admin/systems/goLogDBServer.tpl b/plugins/admin/systems/goLogDBServer.tpl
index 88346956e095ca1f0598d7eda54bf894394a4ab5..9bf18aa9b5785968eb92a5ffd0b2dbefa96fc984 100644 (file)
--- a/plugins/admin/systems/goLogDBServer.tpl
+++ b/plugins/admin/systems/goLogDBServer.tpl
@@ -1,4 +1,4 @@
-<b>{t}Logging database{/t}</b> 
+<h2><img class="center" alt="" align="middle" src="images/rightarrow.png" /> {t}Logging database information{/t}</h2>
 <table summary="">
     <tr>
      <td>{t}Logging DB user{/t}</td>

diff --git a/plugins/admin/systems/goMailServer.tpl b/plugins/admin/systems/goMailServer.tpl
index cedb73e1c8cba18a8a20167cb56b9c872f52aa42..00d39b6aef2e95b39c350f34847967b0cbff3fb2 100644 (file)
--- a/plugins/admin/systems/goMailServer.tpl
+++ b/plugins/admin/systems/goMailServer.tpl
@@ -1,8 +1,7 @@
-<img src='images/mail.png'><b>{t}Generic{/t}</b>
-<br><br>
+<h2><img class="center" alt="" align="middle" src="images/rightarrow.png" /> {t}Generic{/t}</h2>
 <table  style="width:100%;">
        <tr>
-               <td width="50%">
+               <td width="50%" style="vertical-align:top">
                        <table >
                                <tr>
                                        <td>{t}Visible full qualified hostname{/t}

diff --git a/plugins/admin/systems/goShareServer.tpl b/plugins/admin/systems/goShareServer.tpl
index 592379333f31e25e0c7a39d1fba47c5d8344f492..1699407db8cde59b1a4e9982cc3fee2c8f792a5f 100644 (file)
--- a/plugins/admin/systems/goShareServer.tpl
+++ b/plugins/admin/systems/goShareServer.tpl
@@ -1,4 +1,4 @@
-<b>{t}Shares{/t}</b>
+<h2><img class="center" alt="" align="middle" src="images/rightarrow.png" /> {t}Shares{/t}</h2>
    <table summary="" style="width:100%">
     <tr>
      <td>

diff --git a/plugins/admin/systems/goTerminalServer.tpl b/plugins/admin/systems/goTerminalServer.tpl
index a0b88fb5596489c71346a7bd7b9ef4079742369a..ebe86e94971bd2b19138a2a38bd18416258e4c44 100644 (file)
--- a/plugins/admin/systems/goTerminalServer.tpl
+++ b/plugins/admin/systems/goTerminalServer.tpl
@@ -1,5 +1,4 @@
-<b>{t}Terminal Service{/t}</b>
-
+<h2><img class="center" alt="" align="middle" src="images/rightarrow.png" /> {t}Terminal service{/t}</h2>
 <table summary="">
     <tr>
      <td colspan=2>