addedprogressbar to M plugins/personal/mail/generic.tpl

M    plugins/personal/mail/class_mailAccount.inc
M    plugins/admin/groups/mail.tpl
M    plugins/admin/systems/class_terminalInfo.inc
M    include/functions.inc

git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@694 594d385d-05f5-0310-b6e9-bd551577e9d8

diff --git a/include/functions.inc b/include/functions.inc
index 4571a66431733870867c0344f57368a89303e65d..495fd457403fbe185c74e15f0e3a9a31ddc10ddc 100644 (file)
--- a/include/functions.inc
+++ b/include/functions.inc
@@ -1746,7 +1746,7 @@ function progressbar($percentage,$width=100,$height=15,$showvalue=false)
                               background-color:#".$color2.$color2.$color."; \">";
 
 
-    if($height >10){
+    if(($height >10)&&($showvalue)){
       $str.=                 "<font style=\"font-size:".($height-2)."px;color:#FF5555;align:middle;padding-left:".((int)(($width*0.4)))."px;\">
                                <b>".$percentage."%</b>
                              </font>";

diff --git a/plugins/admin/groups/mail.tpl b/plugins/admin/groups/mail.tpl
index fd6ac760228ab2e7ca94afc8e40b645cfd0432c7..9fd577bc0392d2218fb0eadf0a992bf8ff82f701 100644 (file)
--- a/plugins/admin/groups/mail.tpl
+++ b/plugins/admin/groups/mail.tpl
@@ -27,7 +27,7 @@
      <td>
       <br>
       {if $quotadefined eq "true"}
-      <img alt="" src="progress.php?x=100&amp;y=16&amp;p={$quotausage}" align="middle">
+      {$quotausage}
       {else}
       {t}not defined{/t}
       {/if}

diff --git a/plugins/admin/systems/class_terminalInfo.inc b/plugins/admin/systems/class_terminalInfo.inc
index 7316c3fb06494b84a2365b69e8989ce5d1965884..ab32135f8dd27370177f1964d2db3a6672087ca0 100644 (file)
--- a/plugins/admin/systems/class_terminalInfo.inc
+++ b/plugins/admin/systems/class_terminalInfo.inc
@@ -162,7 +162,7 @@ class terminfo extends plugin
           $device= preg_replace('/^STRING: */', '', $device);
           $usage= @snmpget($host, $community, "UCD-SNMP-MIB::dskPercent.$n");
           $usage= preg_replace('/^INTEGER: */', '', $usage);
-          $partitions.= "<tr><td><b>$device</b></td><td><img alt=\"\" src=\"progress.php?x=100&amp;y=16&amp;p=$usage\" align=\"middle\"></td></tr>\n";
+          $partitions.= "<tr><td><b>$device</b></td><td>".progressbar($usage,100;16,true)."</td></tr>\n";
         }
         $smarty->assign("partitions", $partitions);
       } else {

diff --git a/plugins/personal/mail/class_mailAccount.inc b/plugins/personal/mail/class_mailAccount.inc
index 97b025d253e6029df874dec43761bbbcf85c7f1a..cdf374a8fef433b0ffdbdaf8e0bcd5247fa0b46e 100644 (file)
--- a/plugins/personal/mail/class_mailAccount.inc
+++ b/plugins/personal/mail/class_mailAccount.inc
@@ -435,7 +435,7 @@ class mailAccount extends plugin
     }
 
     if (is_numeric($this->gosaMailQuota) && $this->gosaMailQuota != 0){
-      $smarty->assign("quotausage", $this->quotaUsage * 100 / $this->gosaMailQuota);
+      $smarty->assign("quotausage", progressbar(($this->quotaUsage * 100)/ $this->gosaMailQuota,100,15,true));
       $smarty->assign("quotadefined", "true");
     } else {
       $smarty->assign("quotadefined", "false");

diff --git a/plugins/personal/mail/generic.tpl b/plugins/personal/mail/generic.tpl
index 8fff52d821abe1f87fa98837a35e175cd626d20a..7f882541596c91cbcdef5fb149ffab4c2391f750 100644 (file)
--- a/plugins/personal/mail/generic.tpl
+++ b/plugins/personal/mail/generic.tpl
@@ -24,7 +24,7 @@
      <td>
       <br>
       {if $quotadefined eq "true"}
-      <img alt="" src="progress.php?x=100&amp;y=16&amp;p={$quotausage}" align="middle">
+       {$quotausage}
       {else}
       {t}not defined{/t}
       {/if}