Updated infoPage

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

diff --git a/gosa-core/ihtml/themes/default/infoPage.tpl b/gosa-core/ihtml/themes/default/infoPage.tpl
index 780e3d958c608b66f5426f84c69ed15610b68478..b88159c62526a1117dd98192f20784eb377269f4 100644 (file)
--- a/gosa-core/ihtml/themes/default/infoPage.tpl
+++ b/gosa-core/ihtml/themes/default/infoPage.tpl
@@ -33,7 +33,7 @@
 
                 </table>
             </td>
-            {if $jpegPhoto != ""}
+            {if $jpegPhoto}
                 <td>
                     <img  src="getbin.php?rand={$rand}" alt='' style='max-width:147px; max-height: 200px; vertical-align: middle;' >
                 </td>

diff --git a/gosa-core/include/class_pluglist.inc b/gosa-core/include/class_pluglist.inc
index d088d4aae76f7354e139f3adb602cccc8e8cae12..4cc4bc21b369e26364a6fbd0aaf03c9ebc77075d 100644 (file)
--- a/gosa-core/include/class_pluglist.inc
+++ b/gosa-core/include/class_pluglist.inc
@@ -296,8 +296,13 @@ class pluglist
             $this->menu .=  
                 "\n      <script language='javascript' type='text/javascript'>".
                 "\n        function openPlugin(id, plugin){".
+                "\n          if(plugin){ ".
+                "\n             plugin = '&pluginTab=' +  plugin".
+                "\n          }else{".
+                "\n             plugin = '';".
+                "\n          }".
                 "\n          return question(\""._("You are currently editing a database entry. Do you want to discard the changes?")."\",".
-                "\n            \"main.php?plug=\" + id + \"&reset=1&pluginTab=\" + plugin);".
+                "\n            \"main.php?plug=\" + id + \"&reset=1\" + plugin);".
                 "\n        }".
                 "\n      </script>\n"; 
         }

diff --git a/gosa-core/plugins/generic/infoPage/class_infoPage.inc b/gosa-core/plugins/generic/infoPage/class_infoPage.inc
index 86ddf3d6cef0661c51f2beb68988c666afabf7c2..eb6519bed676a6bc2a3b378098ff572c333a534c 100644 (file)
--- a/gosa-core/plugins/generic/infoPage/class_infoPage.inc
+++ b/gosa-core/plugins/generic/infoPage/class_infoPage.inc
@@ -28,11 +28,16 @@ class infoPage extends plugin
             $plugin = $pluginData['CLASS'];
             $plInfo = call_user_func(array($plugin,'plInfo'));
 
+            list($index, $title, $desc, $icon) = $plist->getPlugData($plugin);
+
+            $str.= "\n        <div class='icon-menu-item' style='width: 20%;' onclick='openPlugin(\"{$myAccountID}\",\"{$plugin}\")'>";
+            $str.= "\n          ".image($icon);
+            $str.= "\n          <div class='dsc'>";
+            $str.= "\n            <h1>{$title}</h1>";
+            $str.= "\n            <p>{$desc}</p>";
+            $str.= "\n          </div>";
+            $str.= "\n        </div>";
 
-            $str .= "<div style='width:20%;height:40px; background-color: grey; float: left'
-                        onClick='openPlugin(\"{$myAccountID}\", \"{$plugin}\");'>";
-            $str .= $plugin;
-            $str .= "</div>";
         }
         return($str);
     }