Moved images around. Finished ogroups.

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

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

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

diff --git a/gosa-core/html/images/lists/invalid.png b/gosa-core/html/images/lists/invalid.png
new file mode 100644 (file)
index 0000000..3240b29
Binary files /dev/null and b/gosa-core/html/images/lists/invalid.png differ

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

diff --git a/gosa-core/html/plugins/ogroups/images/application.png b/gosa-core/html/plugins/ogroups/images/application.png
new file mode 100644 (file)
index 0000000..dd6de2f
Binary files /dev/null and b/gosa-core/html/plugins/ogroups/images/application.png differ

diff --git a/gosa-core/html/plugins/ogroups/images/asterisk.png b/gosa-core/html/plugins/ogroups/images/asterisk.png
new file mode 100644 (file)
index 0000000..b9bc82e
Binary files /dev/null and b/gosa-core/html/plugins/ogroups/images/asterisk.png differ

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

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

diff --git a/gosa-core/html/plugins/ogroups/images/ogroup.png b/gosa-core/html/plugins/ogroups/images/ogroup.png
new file mode 100644 (file)
index 0000000..a4acb09
Binary files /dev/null and b/gosa-core/html/plugins/ogroups/images/ogroup.png differ

diff --git a/gosa-core/html/plugins/ogroups/images/plugin.png b/gosa-core/html/plugins/ogroups/images/plugin.png
new file mode 100644 (file)
index 0000000..eb720b7
Binary files /dev/null and b/gosa-core/html/plugins/ogroups/images/plugin.png differ

diff --git a/gosa-core/html/plugins/ogroups/images/printer.png b/gosa-core/html/plugins/ogroups/images/printer.png
new file mode 100644 (file)
index 0000000..1128748
Binary files /dev/null and b/gosa-core/html/plugins/ogroups/images/printer.png differ

diff --git a/gosa-core/html/plugins/ogroups/images/server.png b/gosa-core/html/plugins/ogroups/images/server.png
new file mode 100644 (file)
index 0000000..c7c34a1
Binary files /dev/null and b/gosa-core/html/plugins/ogroups/images/server.png differ

diff --git a/gosa-core/html/plugins/ogroups/images/terminal.png b/gosa-core/html/plugins/ogroups/images/terminal.png
new file mode 100644 (file)
index 0000000..3b82c19
Binary files /dev/null and b/gosa-core/html/plugins/ogroups/images/terminal.png differ

diff --git a/gosa-core/html/plugins/ogroups/images/winstation.png b/gosa-core/html/plugins/ogroups/images/winstation.png
new file mode 100644 (file)
index 0000000..ec747e5
Binary files /dev/null and b/gosa-core/html/plugins/ogroups/images/winstation.png differ

diff --git a/gosa-core/html/plugins/ogroups/images/workstation.png b/gosa-core/html/plugins/ogroups/images/workstation.png
new file mode 100644 (file)
index 0000000..33df4ef
Binary files /dev/null and b/gosa-core/html/plugins/ogroups/images/workstation.png differ

diff --git a/gosa-core/plugins/admin/ogroups/class_divListOGroup.inc b/gosa-core/plugins/admin/ogroups/class_divListOGroup.inc
index dff6536462f78a8698a2911e5be1d091e3b9580d..230134a81899619c45ef3e6e4e10dcb8b3226d07 100644 (file)
--- a/gosa-core/plugins/admin/ogroups/class_divListOGroup.inc
+++ b/gosa-core/plugins/admin/ogroups/class_divListOGroup.inc
@@ -202,7 +202,7 @@ class divListOGroup extends MultiSelectWindow
 
     /* Append create options */
     if(preg_match("/c/",$acls)) {
-      $s.= "...|<input class='center' type='image' src='images/list_new_ogroup.png' alt=''>".
+      $s.= "...|<input class='center' type='image' src='plugins/ogroups/images/new.png' alt=''>".
         "&nbsp;"._("Object group")."|group_new|\n";
     }
 
@@ -266,7 +266,7 @@ class divListOGroup extends MultiSelectWindow
     $linkopen = "<a href='?plug=".$_GET['plug']."&amp;act=dep_open&amp;dep_id=%s'>%s</a>";
     $editlink = "<a href='?plug=".$_GET['plug']."&amp;id=%s&amp;act=edit_entry'>%s</a>";
     $userimg  = "<img class='center' src='plugins/groups/images/groups.png' alt='User'    title='%s'>";
-    $mailimg  = "<img class='center' src='images/mailto.png'             alt='M'  title='"._("Mail")   ."'>";
+    $mailimg  = "<img class='center' src='plugins/ogroups/images/mail.png'             alt='M'  title='"._("Mail")   ."'>";
     $empty    = "<img class='center' src='images/empty.png' style='width:16px;height:16px;' alt=''>";
 
     /* Dynamic action col, depending on snapshot icons */
@@ -332,7 +332,7 @@ class divListOGroup extends MultiSelectWindow
       /* Create each field */
       $field0 = array("string" => "<input type='checkbox' id='item_selected_".$key."' name='item_selected_".$key."'>" ,
                       "attach" => "style='width:20px;'");
-      $field1 = array("string" => "<img src='images/list_ogroup.png' alt='"._("Object group")."' ".$title.">", "attach" => "style='text-align:center;width: 20px;'");
+      $field1 = array("string" => "<img src='plugins/ogroups/images/ogroup.png' alt='"._("Object group")."' ".$title.">", "attach" => "style='text-align:center;width: 20px;'");
       $field2 = array("string" => sprintf($editlink,$key,$display), "attach" => "style='' ".$title);
       $field3 = array("string" => preg_replace("/%KEY/", $key, $this->parent->convert_list($val))."&nbsp;".$mail, "attach" => "style='width:136px;'");
       $field4 = array("string" => preg_replace("/%KEY%/", $key, $actions), "attach" => "style='width:".$action_col_size."px;border-right:0px;text-align:right;'");
@@ -351,7 +351,7 @@ class divListOGroup extends MultiSelectWindow
     $num_obj_str = _("Number of listed object groups");
     $num_dep_str = _("Number of listed departments");
 
-    $str = "<img class='center' src='images/select_ogroup.png'
+    $str = "<img class='center' src='plugins/ogroups/images/ogroup.png'
               title='".$num_obj_str."' alt='".$num_obj_str."'>&nbsp;".$num_objs."&nbsp;&nbsp;&nbsp;&nbsp;";
     $str.= "<img class='center' src='images/lists/folder.png'
               title='".$num_dep_str."' alt='".$num_dep_str."'>&nbsp;".$num_deps."&nbsp;&nbsp;&nbsp;&nbsp;";

diff --git a/gosa-core/plugins/admin/ogroups/class_ogroup.inc b/gosa-core/plugins/admin/ogroups/class_ogroup.inc
index d155789c4dce48f090dedb80700568c3619a1d2e..ad7bce3122952d705fb72d0b3e72aa5d124cd998 100644 (file)
--- a/gosa-core/plugins/admin/ogroups/class_ogroup.inc
+++ b/gosa-core/plugins/admin/ogroups/class_ogroup.inc
@@ -571,20 +571,20 @@ class ogroup extends plugin
   {
     $temp= "";
     $conv= array(  "U" => "select_user.png",
-        "G" => "select_groups.png",
-        "A" => "select_application.png",
-        "D" => "select_department.png",
-        "S" => "select_server.png",
-        "W" => "select_workstation.png",
-        "O" => "select_winstation.png",
-        "T" => "select_terminal.png",
-        "F" => "select_phone.png",
-        "I" => "flag.png",
-        "P" => "select_printer.png");
+        "G" => "plugins/groups/images/groups.png",
+        "A" => "plugins/ogroups/images/application.png",
+        "D" => "plugins/departments/images/department.png",
+        "S" => "plugins/ogroups/images/server.png",
+        "W" => "plugins/ogroups/images/workstation.png",
+        "O" => "plugins/ogroups/images/winstation.png",
+        "T" => "plugins/ogroups/images/terminal.png",
+        "F" => "plugins/ogroups/images/phone.png",
+        "I" => "images/lists/flag.png",
+        "P" => "plugins/ogroups/images/printer.png");
 
     foreach ($input as $key => $value){
       /* Generate output */
-      $temp.= "<option title='".addslashes( $key)."' value=\"$key\" class=\"select\" style=\"background-image:url('".get_template_path("images/".$conv[$value['type']])."');\">".$value['text']."</option>\n";
+      $temp.= "<option title='".addslashes( $key)."' value=\"$key\" class=\"select\" style=\"background-image:url('".get_template_path($conv[$value['type']])."');\">".$value['text']."</option>\n";
     }
 
     return ($temp);

diff --git a/gosa-core/plugins/admin/ogroups/class_ogroupManagement.inc b/gosa-core/plugins/admin/ogroups/class_ogroupManagement.inc
index 8a0fd3dc7698d6fc658f9989dc9d4349a61937ce..9d3a67d04faaed23eae805a4503a049321c2cee9 100644 (file)
--- a/gosa-core/plugins/admin/ogroups/class_ogroupManagement.inc
+++ b/gosa-core/plugins/admin/ogroups/class_ogroupManagement.inc
@@ -495,16 +495,16 @@ class ogroupManagement extends plugin
     $temp= "";
 
     $conv= array(   
-        "U" => array("select_user.png"        ,_("User")        , "ogroup"),
-        "G" => array("select_groups.png"      ,_("Group")       , "ogroup"),
-        "A" => array("select_application.png" ,_("Application") , "ogroup"),
-        "D" => array("select_department.png"  ,_("Department")  , "ogroup"),
-        "S" => array("select_server.png"      ,_("Server")      , "ogroup"),
-        "F" => array("select_phone.png"       ,_("Phone")       , "phonequeue"),
-        "W" => array("select_workstation.png" ,_("Workstation") , "workstartup"),
-        "O" => array("select_winstation.png"  ,_("Windows Install") , "ogroup"),
-        "T" => array("select_terminal.png"    ,_("Terminal")    , "termgroup"),
-        "P" => array("select_printer.png"     ,_("Printer")     , "ogroup"));
+        "U" => array("plugins/generic/images/head.png"        ,_("User")        , "ogroup"),
+        "G" => array("plugins/groups/images/groups.png"       ,_("Group")       , "ogroup"),
+        "A" => array("plugins/ogroups/images/application.png" ,_("Application") , "ogroup"),
+        "D" => array("plugins/departments/department.png"     ,_("Department")  , "ogroup"),
+        "S" => array("plugins/ogroups/images/server.png"      ,_("Server")      , "ogroup"),
+        "F" => array("plugins/ogroups/images/asterisk.png"    ,_("Phone")       , "phonequeue"),
+        "W" => array("plugins/ogroups/images/workstation.png" ,_("Workstation") , "workstartup"),
+        "O" => array("plugins/ogroups/images/winstation.png"  ,_("Windows Install") , "ogroup"),
+        "T" => array("plugins/ogroups/images/terminal.png"    ,_("Terminal")    , "termgroup"),
+        "P" => array("plugins/ogroups/images/printer.png"     ,_("Printer")     , "ogroup"));
 
     /* Assemble picture */
     $type= $input['gosaGroupObjects'][0];
@@ -516,7 +516,7 @@ class ogroupManagement extends plugin
       $p1['lnk']= $conv[$type[0]][2];
       $html_object_1 = "<input type='image' name='".$p1['lnk']."_group_edit_%KEY' ";
     } else {
-      $p1['pic']= "empty.png";
+      $p1['pic']= "images/empty.png";
       $p1['tit']= "";
       $p1['alt']= "";
       $p1['lnk']= "";//$conv[$type[0]][2];
@@ -530,7 +530,7 @@ class ogroupManagement extends plugin
       $p2['lnk']= $conv[$type[1]][2];
       $html_object_2 = "<input type='image' name='".$p2['lnk']."_group_edit_%KEY' ";
     } else {
-      $p2['pic']= "empty.png";
+      $p2['pic']= "images/empty.png";
       $p2['alt']= "";
       $p2['tit']= "";
       $p2['lnk']= ""; //$conv[$type[0]][2];
@@ -538,9 +538,9 @@ class ogroupManagement extends plugin
     }
     
     $temp = $html_object_1." class='center' id='iconA".preg_replace("/_/","",$p1['lnk']."_group_edit_%KEY")."' 
-      src='images/".$p1['pic']."' alt='".$p1['alt']."' title='".$p1['tit']."'>";
+      src='".$p1['pic']."' alt='".$p1['alt']."' title='".$p1['tit']."'>";
     $temp.= $html_object_2." class='center' id='iconB".preg_replace("/_/","",$p2['lnk']."_group_edit_%KEY")."' 
-      src='images/".$p2['pic']."' alt='".$p2['alt']."' title='".$p2['tit']."'>";
+      src='".$p2['pic']."' alt='".$p2['alt']."' title='".$p2['tit']."'>";
     return ($temp);
   }
 

diff --git a/gosa-core/plugins/admin/ogroups/main.inc b/gosa-core/plugins/admin/ogroups/main.inc
index c6263fd51b5a4472ecf7a800081b8e5940623036..e2b4ef989d148fa644cc9e51bed2c7c7dc54f240 100644 (file)
--- a/gosa-core/plugins/admin/ogroups/main.inc
+++ b/gosa-core/plugins/admin/ogroups/main.inc
@@ -33,7 +33,7 @@ if (!$remove_lock){
 
   /* Page header*/
   if (session::is_set('objectinfo')){
-    $display= print_header(get_template_path('images/ogroup.png'),
+    $display= print_header(get_template_path('plugins/ogroups/images/plugin.png'),
                           _("Object groups"),
                           "<img alt=\"\" align=\"middle\" src=\"".
                           get_template_path('images/lists/locked.png').