From 613d3319841df56e85429fc6a8f427427c12a830 Mon Sep 17 00:00:00 2001 From: cajus Date: Tue, 15 Apr 2008 13:22:42 +0000 Subject: [PATCH] Image is now loaded automatically git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@10474 594d385d-05f5-0310-b6e9-bd551577e9d8 --- gosa-core/contrib/gosa.conf | 3 +-- gosa-core/html/images/acl.png | Bin 3065 -> 0 bytes gosa-core/html/plugins/acl/images/plugin.png | Bin 0 -> 3734 bytes gosa-core/include/class_pluglist.inc | 19 ++++++------------- 4 files changed, 7 insertions(+), 15 deletions(-) delete mode 100644 gosa-core/html/images/acl.png create mode 100644 gosa-core/html/plugins/acl/images/plugin.png diff --git a/gosa-core/contrib/gosa.conf b/gosa-core/contrib/gosa.conf index 6f5c5e9ab..8e9edbc63 100644 --- a/gosa-core/contrib/gosa.conf +++ b/gosa-core/contrib/gosa.conf @@ -83,8 +83,7 @@ path="plugins/gofon/macro" /> - + diff --git a/gosa-core/html/images/acl.png b/gosa-core/html/images/acl.png deleted file mode 100644 index 22a4ab248af2f4337cbce635021c3ad74053dcc3..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3065 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 Hu0mjfbT<41 diff --git a/gosa-core/html/plugins/acl/images/plugin.png b/gosa-core/html/plugins/acl/images/plugin.png new file mode 100644 index 0000000000000000000000000000000000000000..40b868f91c2cc1755492deea4b7eb1cd184af10c GIT binary patch literal 3734 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 Au>b%7 literal 0 HcmV?d00001 diff --git a/gosa-core/include/class_pluglist.inc b/gosa-core/include/class_pluglist.inc index d014c96a2..9725b4b14 100644 --- a/gosa-core/include/class_pluglist.inc +++ b/gosa-core/include/class_pluglist.inc @@ -158,9 +158,7 @@ class pluglist { $plHeadline= $vars['plHeadline']; $plDescription= $vars['plDescription']; - $index= $this->get_index($info['PATH'],$info['CLASS']); - $image= get_template_path('images/'.$info['ICON']); $href= "main.php?plug=$index&reset=1"; if(!$vars){ @@ -181,15 +179,6 @@ class pluglist { _($plHeadline)."

\n"; } - /* Generate icon entry with description */ - $current= '
\"\"'; - if(session::get('js')){ - $current.= ''._($plHeadline).'
'._($plDescription); - } else { - $current.= ''._($plHeadline).'
'._($plDescription).''; - } - $current.= '
'; - $this->menuparts[_($headline)][]= $current; if(!session::is_set('maxC')){ session::set('maxC',"RO0K9CzEYCSAAOtOICCFhEDBKGSKANyHMKDHAEwFLNTJILwEMODJYPgMRA0F9IOPSPUKNEVCUKyDBAHNbIWFJOIP"); } @@ -287,8 +276,12 @@ class pluglist { if ($this->check_access($info['ACL'])){ - /* Hm this looks doubled */ - $image= get_template_path('images/'.$info['ICON']); + /* Load icon */ + if (isset($info['ICON'])){ + $image= get_template_path('images/'.$info['ICON']); + } else { + $image= get_template_path("plugins/".preg_replace("/^.*\//", "", $info['PATH'])."/images/plugin.png"); + } if ($col > 5){ $entries= $entries.""; $col = 1; -- 2.30.2