* 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 8e9edbc63c363bb46d0304af8d4b6508571485e4..c87bca3a11b41f2a4f7632b1f73c4749c3983cb0 100644 (file)
--- 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 (file)
index d5ac437..0000000
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 (file)
index 0000000..d5ac437
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 c688f56be5df500a6014a6e89a185926f6b1bb9b..00f0a4b97b785a86be4ca89e1a498112859666f4 100644 (file)
--- 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 3a19c945907879088f0a7bf235d581b89b6c0fdd..f9dddcc165e6a2132006f2f2ab9191ba753bec73 100644 (file)
--- 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 2d8a82dcb02676445767ee597aa00f13b3848b0c..8a6c69698b8dd9f1f54c47c7ee64800984dfd08f 100644 (file)
--- 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? */