Updated group application

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

diff --git a/gosa-plugins/goto/admin/groups/apps/app_list.tpl b/gosa-plugins/goto/admin/groups/apps/app_list.tpl
index c30dfb9b5d951d3f5957f1a34f9e7e1463e39868..feb319bdd9c4f51395da70c5850a5ed331619b04 100644 (file)
--- a/gosa-plugins/goto/admin/groups/apps/app_list.tpl
+++ b/gosa-plugins/goto/admin/groups/apps/app_list.tpl
@@ -53,9 +53,9 @@
                </tr>
        {elseif $item.TYPE == "FOLDER"}
                { if $i++ % 2 == 0}
-                       <tr class="rowxp1">
-               {else}
                        <tr class="rowxp0">
+               {else}
+                       <tr class="rowxp1">
                {/if}
                        <td width="22" style='width:22px; padding-top:3px;padding-bottom:3px; overflow:hidden;'>
                                {if $item.ICON != ""}

diff --git a/gosa-plugins/goto/admin/groups/apps/class_groupApplication.inc b/gosa-plugins/goto/admin/groups/apps/class_groupApplication.inc
index 4a3e50076c10cc67b1d6d4a3268a9a44af8a3053..6577bf28c6fdc48d89a918759562be754b2fca86 100644 (file)
--- a/gosa-plugins/goto/admin/groups/apps/class_groupApplication.inc
+++ b/gosa-plugins/goto/admin/groups/apps/class_groupApplication.inc
@@ -272,14 +272,11 @@ class appgroup extends plugin
 
     /* Do we represent a valid account? */
     if (!$this->is_account){
-      $display= $this->show_enable_header(_("Add application extension"),
-          _("Application extension disabled. You can enable it by clicking below."));
+      $display= $this->show_disable_header(msgPool::addFeaturesButton(_("Menu")), msgPool::featuresDisabled(_("Menu")));
       return ($display);
     }
 
-    $display =  $this->show_enable_header(_("Remove application extension"),
-          _("Application extension enabled. You can disable it by clicking below."));
-
+    $display= $this->show_disable_header(msgPool::removeFeaturesButton(_("Menu")), msgPool::featuresEnabled(_("Menu")));
 
     if(isset($_GET['send'])){
       $id = $_GET['send'];
@@ -1115,7 +1112,11 @@ class appgroup extends plugin
         continue;
       }
       if($entry['STATUS'] == "REMOVED"){
-        $Actions['Remove'][$entry['DN']] = $entry['DN'];
+        if(isset($entry['DN'])){
+          $Actions['Remove'][$entry['DN']] = $entry['DN'];
+        }else{
+          $Actions['Remove'][$cur_dn] = $cur_dn;
+        }
       }
       if($entry['STATUS'] == "EDITED"){
         $Actions['Edit'][$cur_dn] = $attrs;