* Moved tree icon

* Copied mail icon since it is used for the group container

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

diff --git a/gosa-core/html/images/lists/search-subtree.png b/gosa-core/html/images/lists/search-subtree.png
new file mode 100644 (file)
index 0000000..477387c
Binary files /dev/null and b/gosa-core/html/images/lists/search-subtree.png differ

diff --git a/gosa-core/html/images/tree.png b/gosa-core/html/images/tree.png
deleted file mode 100644 (file)
index 477387c..0000000
Binary files a/gosa-core/html/images/tree.png and /dev/null differ

diff --git a/gosa-core/html/plugins/groups/images/mail.png b/gosa-core/html/plugins/groups/images/mail.png
new file mode 100644 (file)
index 0000000..92d602c
Binary files /dev/null and b/gosa-core/html/plugins/groups/images/mail.png differ

diff --git a/gosa-core/include/class_MultiSelectWindow.inc b/gosa-core/include/class_MultiSelectWindow.inc
index adcb53ef3792ed2b0729d8642928ffdc28c60d70..45891d6254ad37921c16166f3abb5adb99432650 100644 (file)
--- a/gosa-core/include/class_MultiSelectWindow.inc
+++ b/gosa-core/include/class_MultiSelectWindow.inc
@@ -452,12 +452,12 @@ class MultiSelectWindow{
                $smarty->assign("DivList"                       , $divlist->DrawList()."\n\n\n\n\n".$this->footer."\n\n\n\n\n");
 
                if($this->is_headpage){
-                       $smarty->assign("tree_image",           get_template_path('images/tree.png'));
+                       $smarty->assign("tree_image",           get_template_path('images/lists/search-subtree.png'));
                        $smarty->assign("infoimage",            get_template_path('images/info.png'));
                        $smarty->assign("launchimage",          get_template_path('images/launch.png'));
                        $smarty->assign("apply",                        apply_filter());
                }else{
-                       $smarty->assign("tree_image",           get_template_path('images/tree.png'));
+                       $smarty->assign("tree_image",           get_template_path('images/lists/search-subtree.png'));
                        $smarty->assign("infoimage",            get_template_path('images/info_small.png'));
                        $smarty->assign("launchimage",          get_template_path('images/rocket.png'));
                        $smarty->assign("apply",                        apply_filter());

diff --git a/gosa-core/plugins/admin/groups/class_divListGroup.inc b/gosa-core/plugins/admin/groups/class_divListGroup.inc
index b557de966d0457b8c3d49a8020018c26bf43184f..4c4fa2c906ae27bc849a9e3d7566a8a3c0aa72a3 100644 (file)
--- a/gosa-core/plugins/admin/groups/class_divListGroup.inc
+++ b/gosa-core/plugins/admin/groups/class_divListGroup.inc
@@ -259,7 +259,7 @@ class divListGroup extends MultiSelectWindow
     /* Assign extension images */
     $posiximg = "<input type='image' class='center' src='plugins/groups/images/groups.png'
                  name='group_group_edit_%KEY%' alt='P'  title='"._("Posix")  ."'>";
-    $mailimg  = "<input type='image' class='center' src='images/mailto.png'
+    $mailimg  = "<input type='image' class='center' src='plugins/groups/images/mail.png'
                  name='mailgroup_group_edit_%KEY%' alt='M'  title='"._("Mail")   ."'>";
     $sambaimg = "<input type='image'  class='center' src='plugins/groups/images/samba.png'
                  name='group_group_edit_%KEY%' alt='S'  title='"._("Samba")  ."'>";

diff --git a/gosa-core/plugins/admin/groups/class_groupGeneric.inc b/gosa-core/plugins/admin/groups/class_groupGeneric.inc
index b9e30839aae30a76fb083c7912e9ff78fabe9d63..319edc791904b3853e9b7179b16d4acdaa4da1a2 100644 (file)
--- a/gosa-core/plugins/admin/groups/class_groupGeneric.inc
+++ b/gosa-core/plugins/admin/groups/class_groupGeneric.inc
@@ -371,7 +371,7 @@ class group extends plugin
       asort($wslist);
       $smarty->assign("search_image", get_template_path('images/lists/search.png'));
       $smarty->assign("launchimage", get_template_path('images/lists/action.png'));
-      $smarty->assign("tree_image", get_template_path('images/tree.png'));
+      $smarty->assign("tree_image", get_template_path('images/lists/search-subtree.png'));
       $smarty->assign("deplist", $this->config->idepartments);
       $smarty->assign("alphabet", generate_alphabet());
       foreach( array("depselect", "regex") as $type){
@@ -434,7 +434,7 @@ class group extends plugin
       /* Show dialog */
       $smarty->assign("search_image", get_template_path('images/lists/search.png'));
       $smarty->assign("launchimage", get_template_path('images/lists/action.png'));
-      $smarty->assign("tree_image", get_template_path('images/tree.png'));
+      $smarty->assign("tree_image", get_template_path('images/lists/search-subtree.png'));
 
       $smarty->assign("deplist", $this->get_allowed_bases("users/user"));
       $smarty->assign("alphabet", generate_alphabet());
@@ -550,7 +550,7 @@ class group extends plugin
     $smarty->assign("alphabet", generate_alphabet(10));
     $smarty->assign("search_image", get_template_path('images/lists/search.png'));
     $smarty->assign("launchimage", get_template_path('images/lists/action.png'));
-    $smarty->assign("tree_image", get_template_path('images/tree.png'));
+    $smarty->assign("tree_image", get_template_path('images/lists/search-subtree.png'));
     $smarty->assign("deplist", $this->config->idepartments);
 
     /* Multiple edit handling */

diff --git a/gosa-core/plugins/admin/ogroups/class_ogroup.inc b/gosa-core/plugins/admin/ogroups/class_ogroup.inc
index 39f744d7300d511ffa09d48b4780bdd714a987a9..d155789c4dce48f090dedb80700568c3619a1d2e 100644 (file)
--- a/gosa-core/plugins/admin/ogroups/class_ogroup.inc
+++ b/gosa-core/plugins/admin/ogroups/class_ogroup.inc
@@ -280,7 +280,7 @@ class ogroup extends plugin
       /* Show dialog */
       $smarty->assign("search_image", get_template_path('images/lists/search.png'));
       $smarty->assign("launchimage", get_template_path('images/lists/action.png'));
-      $smarty->assign("tree_image", get_template_path('images/tree.png'));
+      $smarty->assign("tree_image", get_template_path('images/lists/search-subtree.png'));
       $smarty->assign("deplist", $this->config->idepartments);
       $smarty->assign("alphabet", generate_alphabet());
       foreach( array("dselect", "regex", "subtrees") as $type){

diff --git a/gosa-core/plugins/personal/posix/class_posixAccount.inc b/gosa-core/plugins/personal/posix/class_posixAccount.inc
index 799629ad444f2ea7edda35740e7e645c93c90c3f..0b846e3ec6b4d583838900bfaf6e749ca8e29e51 100644 (file)
--- a/gosa-core/plugins/personal/posix/class_posixAccount.inc
+++ b/gosa-core/plugins/personal/posix/class_posixAccount.inc
@@ -402,7 +402,7 @@ class posixAccount extends plugin
       asort($wslist);
       $smarty->assign("search_image", get_template_path('images/lists/search.png'));
       $smarty->assign("launchimage", get_template_path('images/lists/action.png'));
-      $smarty->assign("tree_image", get_template_path('images/tree.png'));
+      $smarty->assign("tree_image", get_template_path('images/lists/search-subtree.png'));
       $smarty->assign("deplist", $this->config->idepartments);
       $smarty->assign("alphabet", generate_alphabet());
       foreach( array("depselect", "regex") as $type){
@@ -440,7 +440,7 @@ class posixAccount extends plugin
       $smarty->assign("groups", $glist);
       $smarty->assign("search_image", get_template_path('images/lists/search.png'));
       $smarty->assign("launchimage", get_template_path('images/lists/action.png'));
-      $smarty->assign("tree_image", get_template_path('images/tree.png'));
+      $smarty->assign("tree_image", get_template_path('images/lists/search-subtree.png'));
       $smarty->assign("deplist", $this->config->idepartments);
       $smarty->assign("alphabet", generate_alphabet());
       $smarty->assign("depselect", session::get('CurrentMainBase'));

diff --git a/gosa-plugins/addressbook/addons/addressbook/class_addressbook.inc b/gosa-plugins/addressbook/addons/addressbook/class_addressbook.inc
index 0506dbf7cb4ac04ec8f2c18ef05c55ceb432f745..e60b48f788bffdcc52cab7d3123e07bcb843bde7 100644 (file)
--- a/gosa-plugins/addressbook/addons/addressbook/class_addressbook.inc
+++ b/gosa-plugins/addressbook/addons/addressbook/class_addressbook.inc
@@ -492,7 +492,7 @@ class addressbook extends plugin
     $smarty->assign("organizational", $phonefilter['organizational']);
     $smarty->assign("search_image", get_template_path('images/lists/search.png'));
     $smarty->assign("obj_image", get_template_path('images/list_ogroup.png'));
-    $smarty->assign("tree_image", get_template_path('images/tree.png'));
+    $smarty->assign("tree_image", get_template_path('images/lists/search-subtree.png'));
     $smarty->assign("infoimage", get_template_path('images/info.png'));
     $smarty->assign("actionimage", get_template_path('images/action.png'));
     $smarty->assign("launchimage", get_template_path('images/launch.png'));

diff --git a/gosa-plugins/glpi/admin/systems/services/glpi/class_glpiAttachmentPool.inc b/gosa-plugins/glpi/admin/systems/services/glpi/class_glpiAttachmentPool.inc
index 53f8960c8301bb2362109124fa0af1defbe120b0..c937bc636b2f6aaaab55c5385c9c945b38eee333 100644 (file)
--- a/gosa-plugins/glpi/admin/systems/services/glpi/class_glpiAttachmentPool.inc
+++ b/gosa-plugins/glpi/admin/systems/services/glpi/class_glpiAttachmentPool.inc
@@ -262,7 +262,7 @@ class glpiAttachmentPool extends plugin
     $smarty->assign("attachmenthead",   $listhead);
     $smarty->assign("search_image",     get_template_path('images/lists/search.png'));
     $smarty->assign("searchu_image",    get_template_path('images/lists/search-user.png'));
-    $smarty->assign("tree_image",       get_template_path('images/tree.png'));
+    $smarty->assign("tree_image",       get_template_path('images/lists/search-subtree.png'));
     $smarty->assign("infoimage",        get_template_path('images/info_small.png'));
     $smarty->assign("launchimage",      get_template_path('images/lists/action.png'));
     $smarty->assign("apply",            apply_filter());

diff --git a/gosa-plugins/glpi/admin/systems/services/glpi/class_glpiDeviceManagement.inc b/gosa-plugins/glpi/admin/systems/services/glpi/class_glpiDeviceManagement.inc
index 326f0244151527da15500308afcc15bce3953d9f..0d2c14cc6d8f6944b10439d79ea12b016e75b855 100644 (file)
--- a/gosa-plugins/glpi/admin/systems/services/glpi/class_glpiDeviceManagement.inc
+++ b/gosa-plugins/glpi/admin/systems/services/glpi/class_glpiDeviceManagement.inc
@@ -250,7 +250,7 @@ class glpiDeviceManagement extends plugin
     $smarty->assign("devices", $divlist->DrawList());
     $smarty->assign("search_image", get_template_path('images/lists/search.png'));
     $smarty->assign("searchu_image", get_template_path('images/lists/search-user.png'));
-    $smarty->assign("tree_image", get_template_path('images/tree.png'));
+    $smarty->assign("tree_image", get_template_path('images/lists/search-subtree.png'));
     $smarty->assign("infoimage", get_template_path('images/info_small.png'));
     $smarty->assign("launchimage", get_template_path('images/lists/action.png'));
     $smarty->assign("apply", apply_filter());

diff --git a/gosa-plugins/glpi/admin/systems/services/glpi/class_glpiPrinterCartridges.inc b/gosa-plugins/glpi/admin/systems/services/glpi/class_glpiPrinterCartridges.inc
index ca39266891f484fa8bae5e53866e6e7b1b834ca0..103d3c41a849aea11b8a47107703e4bd0e701d51 100644 (file)
--- a/gosa-plugins/glpi/admin/systems/services/glpi/class_glpiPrinterCartridges.inc
+++ b/gosa-plugins/glpi/admin/systems/services/glpi/class_glpiPrinterCartridges.inc
@@ -212,7 +212,7 @@ class glpiPrinterCartridges extends plugin
     $smarty->assign("devices", $divlist->DrawList());
     $smarty->assign("search_image", get_template_path('images/lists/search.png'));
     $smarty->assign("searchu_image", get_template_path('images/lists/search-user.png'));
-    $smarty->assign("tree_image", get_template_path('images/tree.png'));
+    $smarty->assign("tree_image", get_template_path('images/lists/search-subtree.png'));
     $smarty->assign("infoimage", get_template_path('images/info_small.png'));
     $smarty->assign("launchimage", get_template_path('images/lists/action.png'));
     $smarty->assign("apply", apply_filter());

diff --git a/gosa-plugins/glpi/admin/systems/services/glpi/class_glpiSelectUser.inc b/gosa-plugins/glpi/admin/systems/services/glpi/class_glpiSelectUser.inc
index 654624cb892a2f38d646d913e444053be88878c5..a36d5a46342a03891bd379b1319f1f90a2a400b3 100644 (file)
--- a/gosa-plugins/glpi/admin/systems/services/glpi/class_glpiSelectUser.inc
+++ b/gosa-plugins/glpi/admin/systems/services/glpi/class_glpiSelectUser.inc
@@ -187,7 +187,7 @@ class glpiSelectUser extends plugin
     $smarty->assign("users", $divlist->DrawList());
     $smarty->assign("search_image", get_template_path('images/lists/search.png'));
     $smarty->assign("searchu_image", get_template_path('images/lists/search-user.png'));
-    $smarty->assign("tree_image", get_template_path('images/tree.png'));
+    $smarty->assign("tree_image", get_template_path('images/lists/search-subtree.png'));
     $smarty->assign("infoimage", get_template_path('images/info_small.png'));
     $smarty->assign("launchimage", get_template_path('images/lists/action.png'));
     $smarty->assign("apply", apply_filter());

diff --git a/gosa-plugins/gofax/gofax/faxaccount/class_gofaxAccount.inc b/gosa-plugins/gofax/gofax/faxaccount/class_gofaxAccount.inc
index 6974ae6f4202e0a80c51037220d1ccb76915a256..3731093505078d927947006603047ff4e8f1e356 100644 (file)
--- a/gosa-plugins/gofax/gofax/faxaccount/class_gofaxAccount.inc
+++ b/gosa-plugins/gofax/gofax/faxaccount/class_gofaxAccount.inc
@@ -381,7 +381,7 @@ class gofaxAccount extends plugin
       /* Show dialog */
       $smarty->assign("search_image", get_template_path('images/lists/search.png'));
       $smarty->assign("usearch_image", get_template_path('images/lists/search-user.png'));
-      $smarty->assign("tree_image", get_template_path('images/tree.png'));
+      $smarty->assign("tree_image", get_template_path('images/lists/search-subtree.png'));
       $smarty->assign("infoimage", get_template_path('images/info.png'));
       $smarty->assign("launchimage", get_template_path('images/lists/action.png'));
       $smarty->assign("departments", $this->config->idepartments);

diff --git a/gosa-plugins/goto/admin/systems/goto/class_selectUserToPrinterDialog.inc b/gosa-plugins/goto/admin/systems/goto/class_selectUserToPrinterDialog.inc
index b5d564e209beda022cf4cbe830709f0f816288cb..c2bc48f114241f759a6e455e2646761d189afab9 100644 (file)
--- a/gosa-plugins/goto/admin/systems/goto/class_selectUserToPrinterDialog.inc
+++ b/gosa-plugins/goto/admin/systems/goto/class_selectUserToPrinterDialog.inc
@@ -121,7 +121,7 @@ class selectUserToPrinterDialog extends plugin
     $smarty->assign("apply"               , apply_filter());
     $smarty->assign("alphabet"            , generate_alphabet());
     $smarty->assign("search_image"        , get_template_path('images/lists/search.png'));
-    $smarty->assign("tree_image"          , get_template_path('images/tree.png'));
+    $smarty->assign("tree_image"          , get_template_path('images/lists/search-subtree.png'));
     $smarty->assign("infoimage"           , get_template_path('images/info.png'));
     $smarty->assign("launchimage"         , get_template_path('images/lists/action.png'));
     $smarty->assign("deplist"             , $deps);

diff --git a/gosa-plugins/goto/admin/systems/ppd/class_printerPPDSelectionDialog.inc b/gosa-plugins/goto/admin/systems/ppd/class_printerPPDSelectionDialog.inc
index 868ae10bae6d8298868da324aeb153646b8a8c19..1f68f3e96bc7ba6aa30f487eff450161d515314a 100644 (file)
--- a/gosa-plugins/goto/admin/systems/ppd/class_printerPPDSelectionDialog.inc
+++ b/gosa-plugins/goto/admin/systems/ppd/class_printerPPDSelectionDialog.inc
@@ -167,7 +167,7 @@ class printerPPDSelectionDialog extends plugin
     $smarty->assign("List",         $div -> DrawList());
     $smarty->assign("search_image", get_template_path('images/lists/search.png'));
     $smarty->assign("launchimage",  get_template_path('images/lists/action.png'));
-    $smarty->assign("tree_image",   get_template_path('images/tree.png'));
+    $smarty->assign("tree_image",   get_template_path('images/lists/search-subtree.png'));
     $smarty->assign("alphabet",     generate_alphabet());
     $smarty->assign("apply",        apply_filter());
     $smarty->assign("regex",        $regex);

diff --git a/gosa-plugins/goto/personal/environment/class_hotplugDialog.inc b/gosa-plugins/goto/personal/environment/class_hotplugDialog.inc
index c5dde60035856034734cc1361feca49a6a2b5763..32be0aaab46a72643b05c5fc01b44d89f6e2af61 100644 (file)
--- a/gosa-plugins/goto/personal/environment/class_hotplugDialog.inc
+++ b/gosa-plugins/goto/personal/environment/class_hotplugDialog.inc
@@ -45,7 +45,7 @@ class hotplugDialog extends plugin
     $smarty->assign("apply", apply_filter());
     $smarty->assign("alphabet", generate_alphabet());
     $smarty->assign("search_image", get_template_path('images/lists/search.png'));
-    $smarty->assign("tree_image", get_template_path('images/tree.png'));
+    $smarty->assign("tree_image", get_template_path('images/lists/search-subtree.png'));
     $smarty->assign("launchimage", get_template_path('images/lists/action.png'));
     $smarty->assign("deplist", $this->config->idepartments);
 

diff --git a/gosa-plugins/goto/personal/environment/class_selectPrinterDialog.inc b/gosa-plugins/goto/personal/environment/class_selectPrinterDialog.inc
index 78e937b9e13cf0aadd21f456e9dcecdcd6879632..b2a9b22c783ed13d48707612aed3c262ac0422d6 100644 (file)
--- a/gosa-plugins/goto/personal/environment/class_selectPrinterDialog.inc
+++ b/gosa-plugins/goto/personal/environment/class_selectPrinterDialog.inc
@@ -90,7 +90,7 @@ class selectPrinterDialog extends plugin
     $smarty->assign("alphabet", generate_alphabet());
     $smarty->assign("subtrees", $this->subtreesearch?"checked":"");
     $smarty->assign("search_image", get_template_path('images/lists/search.png'));
-    $smarty->assign("tree_image", get_template_path('images/tree.png'));
+    $smarty->assign("tree_image", get_template_path('images/lists/search-subtree.png'));
     $smarty->assign("infoimage", get_template_path('images/info.png'));
     $smarty->assign("launchimage", get_template_path('images/lists/action.png'));
     $smarty->assign("deplist", $this->config->idepartments);

diff --git a/gosa-plugins/mail/admin/groups/mail/class_groupMail.inc b/gosa-plugins/mail/admin/groups/mail/class_groupMail.inc
index 811c39ba38e539504f2204844ec76b812d598d16..5e54a53ca94e2f9324a718d8c15ab16315584254 100644 (file)
--- a/gosa-plugins/mail/admin/groups/mail/class_groupMail.inc
+++ b/gosa-plugins/mail/admin/groups/mail/class_groupMail.inc
@@ -546,7 +546,7 @@ class mailgroup extends plugin
       /* Show dialog */
       $smarty->assign("search_image", get_template_path('images/lists/search.png'));
       $smarty->assign("usearch_image", get_template_path('images/lists/search-user.png'));
-      $smarty->assign("tree_image", get_template_path('images/tree.png'));
+      $smarty->assign("tree_image", get_template_path('images/lists/search-subtree.png'));
       $smarty->assign("infoimage", get_template_path('images/info.png'));
       $smarty->assign("launchimage", get_template_path('images/lists/action.png'));
       $smarty->assign("mailusers", $mailusers);

diff --git a/gosa-plugins/mail/personal/mail/class_mailAccount.inc b/gosa-plugins/mail/personal/mail/class_mailAccount.inc
index 877860439705e8d1552e49f2b7adc2c69be995d9..aecfc14a1977f6e4f5f77046159d4c2515924d64 100644 (file)
--- a/gosa-plugins/mail/personal/mail/class_mailAccount.inc
+++ b/gosa-plugins/mail/personal/mail/class_mailAccount.inc
@@ -509,7 +509,7 @@ class mailAccount extends plugin
       /* Show dialog */
       $smarty->assign("search_image", get_template_path('images/lists/search.png'));
       $smarty->assign("usearch_image", get_template_path('images/lists/search-user.png'));
-      $smarty->assign("tree_image", get_template_path('images/tree.png'));
+      $smarty->assign("tree_image", get_template_path('images/lists/search-subtree.png'));
       $smarty->assign("infoimage", get_template_path('images/info.png'));
       $smarty->assign("launchimage", get_template_path('images/lists/action.png'));
       $smarty->assign("mailusers", $mailusers);

diff --git a/gosa-plugins/samba/personal/samba/class_sambaAccount.inc b/gosa-plugins/samba/personal/samba/class_sambaAccount.inc
index 25ce0962914719ea6a0ad9be49fe986a35a4a9a2..a5fec4f2cac75a5388cc6a82a2cd96e20ca834ab 100644 (file)
--- a/gosa-plugins/samba/personal/samba/class_sambaAccount.inc
+++ b/gosa-plugins/samba/personal/samba/class_sambaAccount.inc
@@ -416,7 +416,7 @@ class sambaAccount extends plugin
 
       $smarty->assign("search_image", get_template_path('images/lists/search.png'));
       $smarty->assign("launchimage", get_template_path('images/lists/action.png'));
-      $smarty->assign("tree_image", get_template_path('images/tree.png'));
+      $smarty->assign("tree_image", get_template_path('images/lists/search-subtree.png'));
       $smarty->assign("deplist", $this->config->idepartments);
       $smarty->assign("alphabet", generate_alphabet());
       foreach( array("depselect", "regex") as $type){

diff --git a/gosa-plugins/sudo/admin/sudo/class_sudoGeneric.inc b/gosa-plugins/sudo/admin/sudo/class_sudoGeneric.inc
index 9ebab22331bfcc9dbb007942564bcb223a1b7822..f29b615551a5424e9993caaf65f330f0d9a9c702 100644 (file)
--- a/gosa-plugins/sudo/admin/sudo/class_sudoGeneric.inc
+++ b/gosa-plugins/sudo/admin/sudo/class_sudoGeneric.inc
@@ -638,7 +638,7 @@ class sudo extends plugin
     }
     $smarty->assign("search_image", get_template_path('images/lists/search.png'));
     $smarty->assign("launchimage",  get_template_path('images/lists/action.png'));
-    $smarty->assign("tree_image",   get_template_path('images/tree.png'));
+    $smarty->assign("tree_image",   get_template_path('images/lists/search-subtree.png'));
     $smarty->assign("deplist",      $this->config->idepartments);
     $smarty->assign("alphabet",     generate_alphabet());
     $smarty->assign("hint",         print_sizelimit_warning());