From 1a6c422de0b52c5dced2dde015029c389849dfbe Mon Sep 17 00:00:00 2001 From: hickert Date: Wed, 24 Mar 2010 15:01:14 +0000 Subject: [PATCH] Updated Application stuff git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@17128 594d385d-05f5-0310-b6e9-bd551577e9d8 --- .../goto/admin/groups/apps/app_list.tpl | 43 +++++++------------ .../groups/apps/class_groupApplication.inc | 14 +++--- 2 files changed, 20 insertions(+), 37 deletions(-) diff --git a/gosa-plugins/goto/admin/groups/apps/app_list.tpl b/gosa-plugins/goto/admin/groups/apps/app_list.tpl index 97fcf43d6..c5ac59d1d 100644 --- a/gosa-plugins/goto/admin/groups/apps/app_list.tpl +++ b/gosa-plugins/goto/admin/groups/apps/app_list.tpl @@ -1,4 +1,4 @@ - +
{if $enableReleaseManagement}
@@ -31,7 +31,7 @@ padding:5px; "> - +
{foreach from=$entries item=item key=key} {if $item.TYPE == "OPEN"} @@ -39,7 +39,7 @@ {elseif $item.TYPE == "SEPERATOR"} @@ -104,18 +100,13 @@ {else} {/if} - {elseif $item.TYPE == "ENTRY"} @@ -135,14 +126,10 @@ {$item.NAME} {$item.INFO} {/if} diff --git a/gosa-plugins/goto/admin/groups/apps/class_groupApplication.inc b/gosa-plugins/goto/admin/groups/apps/class_groupApplication.inc index a711a7df4..457fc85f4 100644 --- a/gosa-plugins/goto/admin/groups/apps/class_groupApplication.inc +++ b/gosa-plugins/goto/admin/groups/apps/class_groupApplication.inc @@ -447,7 +447,7 @@ class appgroup extends plugin $base_back = preg_replace("/^[^,]+,/","",$this->curbase); if((strlen($base_back)>= strlen($this->config->current['BASE']))&&($this->curbase!=$this->config->current['BASE'])){ $div->AddEntry(array( - array("string"=>sprintf($linkopen,base64_encode($base_back),".. ["._("back")."]"), + array("string"=>sprintf($linkopen,postEncode($base_back),".. ["._("back")."]"), "attach"=>"style='border:0px;'") )); } @@ -455,8 +455,8 @@ class appgroup extends plugin /* Append departments for current base */ foreach($departments as $key => $app){ $div->AddEntry(array( - array("string"=>""._("department")." ".sprintf($linkopen, - base64_encode($key),$app), + array("string"=>image('images/lists/folder.png')." ". + sprintf($linkopen,postEncode($key),$app), "attach"=>"style='border:0px;'") )); } @@ -478,7 +478,7 @@ class appgroup extends plugin } $div->AddEntry(array( array("string"=>sprintf("",$key). - ""._("application")." ".$name, + image('plugins/goto/images/select_application.png')." ".$name, "attach"=>"style='border:0px;'") )); } @@ -841,25 +841,21 @@ class appgroup extends plugin if(preg_match("/del_/",$name)){ $id = preg_replace("/^del_/","",$name); - $id = preg_replace("/_(x|y)$/","",$id); $this->_remove_entry_id($id); break; } if(preg_match("/app_entry_edit/",$name)){ $id = preg_replace("/^app_entry_edit/","",$name); - $id = preg_replace("/_(x|y)$/","",$id); $this->_edit_entry_edit($id); break; } if(preg_match("/up_/",$name)){ $id = preg_replace("/^up_/","",$name); - $id = preg_replace("/_(x|y)$/","",$id); $this->_move_entry($id,"up"); break; } if(preg_match("/down_/",$name)){ $id = preg_replace("/^down_/","",$name); - $id = preg_replace("/_(x|y)$/","",$id); $this->_move_entry($id,"down"); break; } @@ -874,7 +870,7 @@ class appgroup extends plugin $this->_check_missing_release($this->FAIrelease); } if(isset($_GET['act']) && $_GET['act'] == 'depopen'){ - $this->curbase = base64_decode($_GET['depid']); + $this->curbase = postDecode($_GET['depid']); } if(isset($_POST['add_to_folder']) && isset($_POST['folder'])){ $folder = $_POST['folder']; -- 2.30.2
- +
{elseif $item.TYPE == "CLOSE"}
@@ -87,14 +87,10 @@ {$item.NAME} 
- {image title="{t}Move up{/t}"} - name='up_{$item.UNIQID}' src='images/move_object_up.png'> - {image title="{t}Move down{/t}"} - name='down_{$item.UNIQID}' src='images/move_object_down.png'> - {image title="{t}Remove{/t}"} - name='del_{$item.UNIQID}' src='images/lists/trash.png'> - {image title="{t}Edit{/t}"} - name='app_entry_edit{$item.UNIQID}' src='images/lists/edit.png'> + {image title="{t}Move up{/t}" action="up_{$item.UNIQID}" path='images/lists/sort-up.png'} + {image title="{t}Move down{/t}" action="down_{$item.UNIQID}" path='images/lists/sort-down.png'} + {image title="{t}Edit{/t}" action="app_entry_edit{$item.UNIQID}" path='images/lists/edit.png'} + {image title="{t}Remove{/t}" action="del_{$item.UNIQID}" path='images/lists/trash.png'}
+
- {image title="{t}Move up{/t}"} - name='up_{$item.UNIQID}' src='images/move_object_up.png'> - {image title="{t}Move down{/t}"} - name='down_{$item.UNIQID}' src='images/move_object_down.png'> - {image title="{t}Remove{/t}"} - name='del_{$item.UNIQID}' src='images/lists/trash.png'> - {image path="images/empty.png"} - + {image title="{t}Move up{/t}" action="up_{$item.UNIQID}" path='images/lists/sort-up.png'} + {image title="{t}Move down{/t}" action="down_{$item.UNIQID}" path='images/lists/sort-down.png'} + {image title="{t}Remove{/t}" action="del_{$item.UNIQID}" path='images/lists/trash.png'}
- {image title="{t}Move up{/t}"} - name='up_{$item.UNIQID}' src='images/move_object_up.png'> - {image title="{t}Move down{/t}"} - name='down_{$item.UNIQID}' src='images/move_object_down.png'> - {image title="{t}Remove{/t}"} - name='del_{$item.UNIQID}' src='images/lists/trash.png'> - {image title="{t}Edit{/t}"} - name='app_entry_edit{$item.UNIQID}' src='images/lists/edit.png'> + {image title="{t}Move up{/t}" action="up_{$item.UNIQID}" path='images/lists/sort-up.png'} + {image title="{t}Move down{/t}" action="down_{$item.UNIQID}" path='images/lists/sort-down.png'} + {image title="{t}Edit{/t}" action="app_entry_edit{$item.UNIQID}" path='images/lists/edit.png'} + {image title="{t}Remove{/t}" action="del_{$item.UNIQID}" path='images/lists/trash.png'}