Updated Group/Application

-Background is white now.
-Rows have alternating colors
-Rows have a hover color
-Folders are displayed with fold path in drop down boxes.
-Releasnames are now all in black

git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@8942 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 044c21df903c5364639cd53bfa33b544822827f9..8e50aebf470764f0b605d2e11cff9e47d5201b5f 100644 (file)
--- a/gosa-plugins/goto/admin/groups/apps/app_list.tpl
+++ b/gosa-plugins/goto/admin/groups/apps/app_list.tpl
@@ -5,11 +5,7 @@
                        {t}Release{/t}
                        <select name="FAIrelease" onChange="document.mainform.submit();">
                        {foreach from=$releases item=item key=key}
-                               {if $item.found}
                                <option value="{$key}" {if $key == $FAIrelease} selected {/if}>{$item.name} </option>
-                               {else}
-                               <option style="color: #999999;" value="{$key}" {if $key == $FAIrelease} selected {/if}>{$item.name} </option>
-                               {/if}
                        {/foreach}
                        </select>
                </td>
@@ -20,7 +16,8 @@
                <div style="height:290px; overflow:auto; 
                                        border-top: solid 2px #999999;
                                        border-left: solid 2px #999999;
-                                       padding:5px; background-color: #EEEEEE;">
+                                       padding:5px; 
+                                       ">
                        
 <table style='width:100%' cellpadding=0 cellspacing=0>
 {foreach from=$entries item=item key=key}
@@ -40,21 +37,29 @@
                        <td colspan=3 style="background-color: #BBBBBB;height:1px"></td>
                </tr>
        {elseif $item.TYPE == "RELEASE"}
-               <tr>
-                       <td style='width:20px; padding-top:5px;padding-bottom:5px;'>
+               { if $i++ % 2 == 0}
+                       <tr class="rowxp0">
+               {else}
+                       <tr class="rowxp1">
+               {/if}
+                       <td style='width:20px; padding-top:5px;padding-bottom:5px;background-color: transparent;'>
                                <img src='images/fai_small.png' alt='{t}Release{/t}'>
                        </td>
-                       <td>
+                       <td style='background-color: transparent;'>
                                {$item.NAME}
                        </td>
-                       <td style='width:100px;text-align:right'>
+                       <td style='width:100px;text-align:right;background-color: transparent;'>
                        </td>
                </tr>
        {elseif $item.TYPE == "FOLDER"}
-               <tr>
-                       <td style='width:22px; padding-top:5px;padding-bottom:5px;'>
+               { if $i++ % 2 == 0}
+                       <tr class="rowxp1">
+               {else}
+                       <tr class="rowxp0">
+               {/if}
+                       <td width="22" style='width:22px; padding-top:3px;padding-bottom:3px; overflow:hidden;'>
                                {if $item.ICON != ""}
-                                       <div style="height:20px;width:20px; overflow:hidden">
+                                       <div style="height:20px;width:20px; overflow:hidden;">
                                        <img class="center" src='?plug={$plug_id}&amp;send={$item.UNIQID}' alt='{t}Folder{/t}'>
                                        </div>
                                {else}
@@ -63,10 +68,10 @@
                                        </div>
                                {/if}
                        </td>
-                       <td>
-                               <b>{$item.NAME}</b>
+                       <td style='background-color: transparent;'>
+                               <b>{$item.NAME}&nbsp; </b> 
                        </td>
-                       <td style='width:100px;text-align:right'>
+                       <td style='width:100px;text-align:right; background-color: transparent;'>
                                <input title="{t}Move up{/t}"   class="center" type='image' 
                                        name='up_{$item.UNIQID}' src='images/move_object_up.png'>
                                <input title="{t}Move down{/t}" class="center" type='image' 
@@ -78,16 +83,21 @@
                        </td>
                </tr>
        {elseif $item.TYPE == "ENTRY"}
-               <tr>
-                       <td style='width:22px; padding-top:5px;padding-bottom:5px;'>
+
+               { if $i++ % 2 == 0}
+                       <tr class="rowxp0">
+               {else}
+                       <tr class="rowxp1">
+               {/if}
+                       <td style='background-color: transparent;width:22px; padding-top:5px;padding-bottom:5px;'>
                                <div style="width:20px; overflow:hidden; text-align:center;">
                                        <img src='images/select_application.png' alt='{t}Entry{/t}' class="center">
                                </div>
                        </td>
-                       <td>
+                       <td style="background-color: transparent;">
                                {$item.NAME} {$item.INFO}
                        </td>
-                       <td style='width:100px;text-align:right'>
+                       <td style='width:100px;text-align:right;background-color: transparent;'>
                                <input title="{t}Move up{/t}"   class="center" type='image' 
                                        name='up_{$item.UNIQID}' src='images/move_object_up.png'>
                                <input title="{t}Move down{/t}" class="center" type='image' 
@@ -103,6 +113,7 @@
 </table>
                </div>
                        <input type="text" name="menu_folder_name" value="">
+                       {t}add to{/t}
                        <select name="menu_folder">
                        {foreach from=$folders item=item key=key}
                                <option value="{$key}">{$item}</option>
@@ -111,7 +122,7 @@
                        <input type="submit" name="add_menu_to_folder" value="{t}Add{/t}" title="{t}Add selected applications to this folder.{/t}">
                </td>
                <td style="vertical-align:top">
-                       {$app_list}
+                       {$app_list}     
                        <select name="folder">
                        {foreach from=$folders item=item key=key}
                                <option value="{$key}">{$item}</option>

diff --git a/gosa-plugins/goto/admin/groups/apps/class_groupApplication.inc b/gosa-plugins/goto/admin/groups/apps/class_groupApplication.inc
index 1185c5a84d45aa12e73d836a4598c1be328aec8b..c2e57e4e3b529f9da70eab578f3212457e62e0a0 100644 (file)
--- a/gosa-plugins/goto/admin/groups/apps/class_groupApplication.inc
+++ b/gosa-plugins/goto/admin/groups/apps/class_groupApplication.inc
@@ -377,6 +377,7 @@ class appgroup extends plugin
     $smarty->assign("enableReleaseManagement",$this->enableReleaseManagement);
     $smarty->assign("FAIrelease",$this->FAIrelease);
     $smarty->assign("app_list",$div->DrawList());
+    $smarty->assign("i",0);
     $smarty->assign("releases",$this->Releases);
     $smarty->assign("folders" , $this->_get_folder_names());
     $entries = $this->_get_entries_for_release($this->FAIrelease);
@@ -392,10 +393,21 @@ class appgroup extends plugin
   function _get_folder_names()
   {
     $data = $this->_get_entries_for_release($this->FAIrelease);
+    $all    = $this->_get_all_entries();
     $ret = array("BASE" => ".");
     foreach($data as $entry){
+
       if($entry['TYPE'] == "FOLDER"){
-        $ret[$entry['UNIQID']] = $entry['NAME'];
+        $str = $entry['NAME'];
+        $parent = $entry['PARENT'];
+        $i = 10;
+        while(isset($all[$parent]) && $i){  
+          $i --;
+          $parent_o = $all[$parent];
+          $str      = $parent_o['NAME']."/".$str;
+          $parent   = $all[$parent_o['UNIQID']]['PARENT'];
+        }        
+        $ret[$entry['UNIQID']] = $str;
       }
     }
     return($ret);