From: cajus <cajus@594d385d-05f5-0310-b6e9-bd551577e9d8>
Date: Tue, 15 Apr 2008 13:29:15 +0000 (+0000)
Subject: * Added automatic icon handling
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=fbc01d144fcd034be66c23f6da76a7b48e6872b0;p=gosa.git

* Added automatic icon handling
* Moved first plugin icons


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

diff --git a/gosa-core/contrib/gosa.conf b/gosa-core/contrib/gosa.conf
index 8e9edbc63..c87bca3a1 100644
--- a/gosa-core/contrib/gosa.conf
+++ b/gosa-core/contrib/gosa.conf
@@ -40,8 +40,7 @@
 		</section>
 		
 		<section name="Administration">
-			<plugin acl="department" class="departmentManagement" icon="department.png"
-				path="plugins/admin/departments" />
+			<plugin acl="department" class="departmentManagement" path="plugins/admin/departments" />
 			<plugin acl="users" class="userManagement" icon="user.png"
 				path="plugins/admin/users" />
 			<plugin acl="groups" class="groupManagement" icon="group.png"
diff --git a/gosa-core/html/images/department.png b/gosa-core/html/images/department.png
deleted file mode 100644
index d5ac437c9..000000000
Binary files a/gosa-core/html/images/department.png and /dev/null differ
diff --git a/gosa-core/html/plugins/departments/images/plugin.png b/gosa-core/html/plugins/departments/images/plugin.png
new file mode 100644
index 000000000..d5ac437c9
Binary files /dev/null and b/gosa-core/html/plugins/departments/images/plugin.png differ
diff --git a/gosa-core/plugins/admin/acl/class_divListACL.inc b/gosa-core/plugins/admin/acl/class_divListACL.inc
index c688f56be..00f0a4b97 100644
--- a/gosa-core/plugins/admin/acl/class_divListACL.inc
+++ b/gosa-core/plugins/admin/acl/class_divListACL.inc
@@ -256,7 +256,7 @@ class divListACL extends MultiSelectWindow
 
         /* Acl handling */
         $editlink       = "<a href='?plug=".$_GET['plug']."&amp;id=%s&amp;act=list_edit_entry'>%s</a>";
-        $list_left_icon = "<img src='plugins/acl/images/acl.png' alt='"._("ACL")."'>";
+        $list_left_icon = "<img src='plugins/acl/plugins/acl/images/plugin.png' alt='"._("ACL")."'>";
         $cn = htmlentities(utf8_decode($acl_entry['dn'])); 
 
         /* Add actions depending on acls */
diff --git a/gosa-core/plugins/admin/acl/main.inc b/gosa-core/plugins/admin/acl/main.inc
index 3a19c9459..f9dddcc16 100644
--- a/gosa-core/plugins/admin/acl/main.inc
+++ b/gosa-core/plugins/admin/acl/main.inc
@@ -42,9 +42,9 @@ if (!session::is_set('macl') || (isset($_GET['reset']) && $_GET['reset'] == 1)){
 
 	/* Page header*/
 	if (session::is_set('objectinfo')){
-		$display= print_header(get_template_path('images/acl.png'), _("ACL management"), "<img alt=\"\" align=\"middle\" src=\"".get_template_path('images/lists/locked.png')."\"> ".@LDAP::fix(session::get('objectinfo')));
+		$display= print_header(get_template_path('plugins/acl/images/plugin.png'), _("ACL management"), "<img alt=\"\" align=\"middle\" src=\"".get_template_path('images/lists/locked.png')."\"> ".@LDAP::fix(session::get('objectinfo')));
 	} else {
-		$display= print_header(get_template_path('images/acl.png'), _("ACL management"));
+		$display= print_header(get_template_path('plugins/acl/images/plugin.png'), _("ACL management"));
 	}
 
 	/* Reset requested? */
diff --git a/gosa-core/plugins/admin/departments/main.inc b/gosa-core/plugins/admin/departments/main.inc
index 2d8a82dcb..8a6c69698 100644
--- a/gosa-core/plugins/admin/departments/main.inc
+++ b/gosa-core/plugins/admin/departments/main.inc
@@ -40,9 +40,9 @@ if ($remove_lock){
 
 	/* Page header*/
 	if (session::is_set('objectinfo')){
-		$display= print_header(get_template_path('images/department.png'), _("Department management"), "<img alt=\"\" align=\"middle\" src=\"".get_template_path('images/lists/locked.png')."\"> ".@LDAP::fix(session::get('objectinfo')));
+		$display= print_header(get_template_path('plugins/departments/images/plugin.png'), _("Department management"), "<img alt=\"\" align=\"middle\" src=\"".get_template_path('images/lists/locked.png')."\"> ".@LDAP::fix(session::get('objectinfo')));
 	} else {
-		$display= print_header(get_template_path('images/department.png'), _("Department management"));
+		$display= print_header(get_template_path('plugins/departments/images/plugin.png'), _("Department management"));
 	}
 
 	/* Reset requested? */