Added application Categories

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

diff --git a/plugins/admin/applications/class_applicationGeneric.inc b/plugins/admin/applications/class_applicationGeneric.inc
index 35df4fe33b3f302c893b02e8d27dd9df91494e32..d71c874312a5c4328da87d3b062f409dce65d51a 100644 (file)
--- a/plugins/admin/applications/class_applicationGeneric.inc
+++ b/plugins/admin/applications/class_applicationGeneric.inc
@@ -14,6 +14,7 @@ class application extends plugin
   var $gosaApplicationName= "";
   var $gosaApplicationFlags= "";
   var $gosaApplicationIcon= "";
+  var $gosaApplicationCategory= "";
   var $gotoLogonScript ="";
   var $iconData;
 
@@ -23,7 +24,7 @@ class application extends plugin
 
   /* attribute list for save action */
   var $attributes= array("cn", "description", "gosaApplicationExecute", "gosaApplicationName",
-                       "gosaApplicationFlags","gotoLogonScript");
+                       "gosaApplicationFlags","gotoLogonScript", "gosaApplicationCategory");
   var $objectclasses= array("top", "gosaApplication");
 
   function application ($config, $dn= NULL)
@@ -136,7 +137,8 @@ class application extends plugin
        $smarty->assign("rand", rand(0, 10000));
 
        /* Variables */
-       foreach(array("description", "gosaApplicationExecute", "gosaApplicationName") as $val){
+       foreach(array("description", "gosaApplicationExecute", "gosaApplicationName",
+                     "gosaApplicationCategory") as $val){
                $smarty->assign($val, $this->$val);
                $smarty->assign($val."ACL", chkacl($this->acl, $val));
        }

diff --git a/plugins/admin/applications/generic.tpl b/plugins/admin/applications/generic.tpl
index 4c9bca773db10ba0eebb6a99b90edc914d78f2dd..92f8cbaa50fcc600d26b9f58134aaa748d4c78d8 100644 (file)
--- a/plugins/admin/applications/generic.tpl
+++ b/plugins/admin/applications/generic.tpl
@@ -7,17 +7,16 @@
       <td><LABEL for="cn">{t}Application name{/t}{$must}</LABEL></td>
       <td><input id="cn" name="cn" size=25 maxlength=60 value="{$cn}" title="{t}Application name{/t}"></td>
     </tr>
-
     <tr>
-     <td><LABEL for="gosaApplicationExecute">{t}Execute{/t}{$must}</LABEL></td>
+     <td><LABEL for="gosaApplicationName">{t}Display name{/t}</LABEL></td>
      <td>
-        <input id="gosaApplicationExecute" name="gosaApplicationExecute" size=35 maxlength=60 {$gosaApplicationExecuteACL} value="{$gosaApplicationExecute}" title="{t}Path and/or binary name of application{/t}">
+        <input id="gosaApplicationName" name="gosaApplicationName" size=35 maxlength=60 {$gosaApplicationNameACL} value="{$gosaApplicationName}" title="{t}Application name to be displayed (i.e. below icons){/t}">
      </td>
     </tr>
     <tr>
-     <td><LABEL for="gosaApplicationName">{t}Display name{/t}</LABEL></td>
+     <td><LABEL for="gosaApplicationExecute">{t}Execute{/t}{$must}</LABEL></td>
      <td>
-        <input id="gosaApplicationName" name="gosaApplicationName" size=35 maxlength=60 {$gosaApplicationNameACL} value="{$gosaApplicationName}" title="{t}Application name to be displayed (i.e. below icons){/t}">
+        <input id="gosaApplicationExecute" name="gosaApplicationExecute" size=35 maxlength=60 {$gosaApplicationExecuteACL} value="{$gosaApplicationExecute}" title="{t}Path and/or binary name of application{/t}">
      </td>
     </tr>
     <tr>
@@ -43,12 +42,28 @@
    &nbsp;
   </td>
   <td style="vertical-align:top;">
+   <table>
+    <tr>
+     <td><LABEL for="gosaApplicationCategory">{t}Category{/t}</LABEL></td>
+     <td>
+      <input id="gosaApplicationCategory" name="gosaApplicationCategory" size=35 maxlength=60 {$gosaApplicationCategoryACL} value="{$gosaApplicationCategory}">
+     </td>
+    </tr>
+    <tr><td colspan=2><div style="height:15px;"></div></td></tr>
+    <tr>
+    <td>
     <LABEL for="picture_file">{t}Icon{/t}</LABEL>
     <br>
     <img alt="" src="getbin.php?rand={$rand}" border=1 style="width:48px; height:48; background-color:white; vertical-align:bottom;">
+    </td>
+    <td style="vertical-align:top">
+    &nbsp;<br>
     <input type="hidden" name="MAX_FILE_SIZE" value="100000">
     <input name="picture_file" type="file" size="20" maxlength="255" accept="image/*.png" id="picture_file">
     <input type="submit" name="update" value="{t}Update{/t}" title="{t}Reload picture from LDAP{/t}">
+    </td>
+    </tr>
+   </table>
   </td>
  </tr>
 </table>