Moved images around

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

diff --git a/gosa-core/contrib/gosa.conf b/gosa-core/contrib/gosa.conf
index c87bca3a11b41f2a4f7632b1f73c4749c3983cb0..5471185f19ad0ca5837284f6643b0c3d02d0ce0b 100644 (file)
--- a/gosa-core/contrib/gosa.conf
+++ b/gosa-core/contrib/gosa.conf
@@ -3,8 +3,7 @@
        <config_version>{$get_gosa_version}</config_version>
        <menu>
                <section name="My account">
-                       <plugin acl="users/generic" class="user" icon="personal.png"
-                               path="plugins/personal/generic" />
+                       <plugin acl="users/generic" class="user" path="plugins/personal/generic" />
                        <plugin acl="users/posixAccount" class="posixAccount" icon="posix.png"
                                path="plugins/personal/posix" />
                        <plugin acl="users/environment" class="environment" icon="env.png"

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

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

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

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

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

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

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

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

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

diff --git a/gosa-core/html/images/login-head.png b/gosa-core/html/images/login-head.png
new file mode 100644 (file)
index 0000000..45e3c35
Binary files /dev/null and b/gosa-core/html/images/login-head.png differ

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

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

diff --git a/gosa-core/html/images/prio_decrease.png b/gosa-core/html/images/prio_decrease.png
index 3773874153d7501c0b59ed9b19ff05117311d230..697fc98bcd9756ca965a143db1b76a17059813bd 100644 (file)
Binary files a/gosa-core/html/images/prio_decrease.png and b/gosa-core/html/images/prio_decrease.png differ

diff --git a/gosa-core/html/images/prio_increase.png b/gosa-core/html/images/prio_increase.png
index d9d2de433a82c4c66100e4dfcd68525939feccf7..9d9856c81de38b295b9a09664d1b4259930f012a 100644 (file)
Binary files a/gosa-core/html/images/prio_increase.png and b/gosa-core/html/images/prio_increase.png differ

diff --git a/gosa-core/html/images/small-error.png b/gosa-core/html/images/small-error.png
new file mode 100644 (file)
index 0000000..830e2e6
Binary files /dev/null and b/gosa-core/html/images/small-error.png differ

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

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

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

diff --git a/gosa-core/html/index.php b/gosa-core/html/index.php
index 5c7b5fbe3b913e10b566b7e2e66459f8b2c69f09..b26380eeb389ec89152515483ba3f3c503e03b29 100644 (file)
--- a/gosa-core/html/index.php
+++ b/gosa-core/html/index.php
@@ -42,7 +42,7 @@ function displayLogin()
   }
   $smarty->assign ('date', gmdate("D, d M Y H:i:s"));
   $smarty->assign ('username', $username);
-  $smarty->assign ('personal_img', get_template_path('images/personal.png'));
+  $smarty->assign ('personal_img', get_template_path('images/login-head.png'));
   $smarty->assign ('password_img', get_template_path('images/password.png'));
   $smarty->assign ('directory_img', get_template_path('images/ldapserver.png'));
 
@@ -403,7 +403,7 @@ if (($_SERVER["REQUEST_METHOD"] == "POST" && isset($_POST['login'])) || $htacces
 /* Fill template with required values */
 $smarty->assign ('date', gmdate("D, d M Y H:i:s"));
 $smarty->assign ('username', $username);
-$smarty->assign ('personal_img', get_template_path('images/personal.png'));
+$smarty->assign ('personal_img', get_template_path('images/login-head.png'));
 $smarty->assign ('password_img', get_template_path('images/password.png'));
 $smarty->assign ('directory_img', get_template_path('images/ldapserver.png'));
 

diff --git a/gosa-core/html/main.php b/gosa-core/html/main.php
index 508cb8c105b20cf9ce48afc11fa01ecfb6104b4b..6de3e86ac447f9362a0157789e51b227112c7208 100644 (file)
--- a/gosa-core/html/main.php
+++ b/gosa-core/html/main.php
@@ -291,7 +291,7 @@ $smarty->assign ("username", $ui->username);
 $smarty->assign ("go_logo", get_template_path('images/go_logo.png'));
 $smarty->assign ("go_base", get_template_path('images/dtree.png'));
 $smarty->assign ("go_home", get_template_path('images/gohome.png'));
-$smarty->assign ("go_out", get_template_path('images/stop.png'));
+$smarty->assign ("go_out", get_template_path('images/logout.png'));
 $smarty->assign ("go_top", get_template_path('images/go_top.png'));
 $smarty->assign ("go_corner", get_template_path('images/go_corner.png'));
 $smarty->assign ("go_left", get_template_path('images/go_left.png'));

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

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

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

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

diff --git a/gosa-core/html/themes/default/style.css b/gosa-core/html/themes/default/style.css
index 2592cb8d13d7c8447c6e134223ac956b9cc0a55e..d93a985346f0a0d05f6994ccb064877b967b4fb9 100644 (file)
--- a/gosa-core/html/themes/default/style.css
+++ b/gosa-core/html/themes/default/style.css
@@ -471,7 +471,7 @@ div.tab_active {
 }
 
 div#notify {
-       background-image: url("../../images/lamp.png");
+       background-image: url("../../images/lists/on.png");
        background-repeat:no-repeat;
        background-position:1px 1px;
        padding-left:18px;

diff --git a/gosa-core/ihtml/themes/default/remove.tpl b/gosa-core/ihtml/themes/default/remove.tpl
index 2d063a1337bd9c0b78678e0846b511d4c26fd39a..d413beab7f64e4eaf925eeac12529851888dde3b 100644 (file)
--- a/gosa-core/ihtml/themes/default/remove.tpl
+++ b/gosa-core/ihtml/themes/default/remove.tpl
@@ -1,5 +1,5 @@
 <div style="font-size:18px;">
-  <img alt="" src="images/button_cancel.png" align=top>&nbsp;{t}Warning{/t}
+  <img alt="" src="images/warning.png" align=top>&nbsp;{t}Warning{/t}
 </div>
 <p>
  {$intro}

diff --git a/gosa-core/plugins/admin/acl/class_divListACL.inc b/gosa-core/plugins/admin/acl/class_divListACL.inc
index 00f0a4b97b785a86be4ca89e1a498112859666f4..0105ecc2a38d2c3e09ce8519afa671e72b931b31 100644 (file)
--- a/gosa-core/plugins/admin/acl/class_divListACL.inc
+++ b/gosa-core/plugins/admin/acl/class_divListACL.inc
@@ -151,18 +151,18 @@ class divListACL extends MultiSelectWindow
     $listhead = MultiSelectWindow::get_default_header();
     $listhead .=  
       _("Base")."&nbsp;<select name='CurrentMainBase' onChange='mainform.submit()' class='center'>$options</select>".
-      " <input class='center' type='image' src='images/list_submit.png' align='middle' 
+      " <input class='center' type='image' src='images/lists/submit.png' align='middle' 
       title='"._("Submit department")."' name='submit_department' alt='".  _("Submit")."'>&nbsp;";
 
 
     /* Create Layers menu */
     $s  = ".|"._("Actions")."|\n";
-    $s .= "..|<img src='images/list_new.png' alt='' border='0' class='center'>".
+    $s .= "..|<img src='images/lists/new.png' alt='' border='0' class='center'>".
       "&nbsp;"._("Create")."|\n";
 
     /* Append create options */
     if(preg_match("/c/",$acl)) {
-      $s.= "...|<input class='center' type='image' src='images/list_new_acl_role.png' alt=''>".
+      $s.= "...|<input class='center' type='image' src='plugins/acl/images/new-role.png' alt=''>".
         "&nbsp;"._("Role")."|new_acl_role|\n";
     }
 

diff --git a/gosa-core/plugins/admin/acl/remove.tpl b/gosa-core/plugins/admin/acl/remove.tpl
index 9d13ebe6dbd2b9b1143fec6c2e4ffeadd077b022..2e74cdcd821f7ca23a5eb3d76faddb8ec7132f8e 100644 (file)
--- a/gosa-core/plugins/admin/acl/remove.tpl
+++ b/gosa-core/plugins/admin/acl/remove.tpl
@@ -1,5 +1,5 @@
 <div style="font-size:18px;">
-<img alt="" src="images/button_cancel.png" align=top>&nbsp;{t}Warning{/t}
+<img alt="" src="images/warning.png" align=top>&nbsp;{t}Warning{/t}
 </div>
 <p>
  {$info}

diff --git a/gosa-core/plugins/admin/departments/class_divListDepartment.inc b/gosa-core/plugins/admin/departments/class_divListDepartment.inc
index b56e5b3bd03872f2030258be590aa4b97a63ff11..1e451ddd4ee8b8232da0d6ded068e7aa235519fc 100644 (file)
--- a/gosa-core/plugins/admin/departments/class_divListDepartment.inc
+++ b/gosa-core/plugins/admin/departments/class_divListDepartment.inc
@@ -142,12 +142,12 @@ class divListDepartment extends MultiSelectWindow
 
     $listhead .=  
       " "._("Base")."&nbsp;<select name='CurrentMainBase' onChange='mainform.submit()' class='center'>$options</select>".
-      " <input class='center' type='image' src='images/list_submit.png' align='middle' ".
+      " <input class='center' type='image' src='images/lists/submit.png' align='middle' ".
       "   title='"._("Submit department")."' name='submit_department' alt='"._("Submit")."'>&nbsp;";
 
     /* Create Layers menu */
     $s  = ".|"._("Actions")."|\n";
-    $s .= "..|<img src='images/list_new.png' alt='' border='0' class='center'>".
+    $s .= "..|<img src='images/lists/new.png' alt='' border='0' class='center'>".
       "&nbsp;"._("Create")."|\n";
 
     /* Append create options */

diff --git a/gosa-core/plugins/admin/departments/dep_move_confirm.tpl b/gosa-core/plugins/admin/departments/dep_move_confirm.tpl
index a18e7932c13046eca79079e73e439653fa4df097..0ca3039594cb7402013bbae1ddb747f249be9cfb 100644 (file)
--- a/gosa-core/plugins/admin/departments/dep_move_confirm.tpl
+++ b/gosa-core/plugins/admin/departments/dep_move_confirm.tpl
@@ -1,5 +1,5 @@
 <div style="font-size:18px;">
- <img alt="" src="images/button_cancel.png" align=top>&nbsp;{t}Warning{/t} - {t}You are currently moving/renaming this department.{/t}
+ <img alt="" src="images/warning.png" align=top>&nbsp;{t}Warning{/t} - {t}You are currently moving/renaming this department.{/t}
 </div>
 <p>
 {t}Modifying a departments naming attribute 'ou' or base may corrupt acls and snapshot entries for all entire objects.{/t}

diff --git a/gosa-core/plugins/admin/departments/generic.tpl b/gosa-core/plugins/admin/departments/generic.tpl
index 36921ad1e54f947e25a8d9b9aee9de7ca27bcc20..da26e94d72f68fc24eaf63e2b7d6e41ef4886b78 100644 (file)
--- a/gosa-core/plugins/admin/departments/generic.tpl
+++ b/gosa-core/plugins/admin/departments/generic.tpl
@@ -53,7 +53,7 @@
      
    </td>
    <td>
-     <h2><img class="center" alt="" align="middle" src="images/house.png"> {t}Location{/t}</h2>
+     <h2><img class="center" alt="" align="middle" src="plugins/departments/images/department.png"> {t}Location{/t}</h2>
 
      <table summary="" style="width:100%">
       <tr>

diff --git a/gosa-core/plugins/admin/departments/remove.tpl b/gosa-core/plugins/admin/departments/remove.tpl
index 36b1fa89a00beceec7787f35bf6f5291b0e4ac72..ce2f63071ebdd595ebc0c0891307c37f92261624 100644 (file)
--- a/gosa-core/plugins/admin/departments/remove.tpl
+++ b/gosa-core/plugins/admin/departments/remove.tpl
@@ -1,5 +1,5 @@
 <div style="font-size:18px;">
- <img alt="" src="images/button_cancel.png" align=top>&nbsp;{t}Warning{/t}
+ <img alt="" src="images/warning.png" align=top>&nbsp;{t}Warning{/t}
 </div>
 <p>
  {$info}

diff --git a/gosa-core/plugins/admin/groups/class_divListGroup.inc b/gosa-core/plugins/admin/groups/class_divListGroup.inc
index 0e40cd438f1dc6ac64c399d3cdf07fbd263a1c75..543509df3138dd0ddd9fa5552852fb0292a0456c 100644 (file)
--- a/gosa-core/plugins/admin/groups/class_divListGroup.inc
+++ b/gosa-core/plugins/admin/groups/class_divListGroup.inc
@@ -173,13 +173,13 @@ class divListGroup extends MultiSelectWindow
     
     /* Add department selection */
     $listhead .= _("Base")."&nbsp;<select name='CurrentMainBase' onChange='mainform.submit()' class='center'>$options</select>".
-      " <input type='image' class='center' src='images/list_submit.png' title='"._("Submit department")."' name='submit_department' alt='"._("Submit").
+      " <input type='image' class='center' src='images/lists/submit.png' title='"._("Submit department")."' name='submit_department' alt='"._("Submit").
       "'>&nbsp;";
 
 
         /* Create Layers menu */
     $s  = ".|"._("Actions")."|\n";
-    $s .= "..|<img src='images/list_new.png' alt='' border='0' class='center'>".
+    $s .= "..|<img src='images/lists/new.png' alt='' border='0' class='center'>".
       "&nbsp;"._("Create")."|\n";
 
 

diff --git a/gosa-core/plugins/admin/groups/class_groupGeneric.inc b/gosa-core/plugins/admin/groups/class_groupGeneric.inc
index a0f4fc79f180a8f4b069b62e38314dae89d2ddfc..1e78305bad9721d26a1c311b9bfc47a5a1f1a2a7 100644 (file)
--- a/gosa-core/plugins/admin/groups/class_groupGeneric.inc
+++ b/gosa-core/plugins/admin/groups/class_groupGeneric.inc
@@ -231,7 +231,7 @@ class group extends plugin
 
     /* Do we represent a valid group? */
     if (!$this->is_account && $this->parent === NULL){
-      $display= "<img alt=\"\" src=\"images/stop.png\" align=\"middle\">&nbsp;<b>".msgPool::noValidExtension()."</b>";
+      $display= "<img alt=\"\" src=\"images/small-error.png\" align=\"middle\">&nbsp;<b>".msgPool::noValidExtension()."</b>";
       return ($display);
     }
 

diff --git a/gosa-core/plugins/admin/groups/remove.tpl b/gosa-core/plugins/admin/groups/remove.tpl
index c4405a19e9427c9c7569b49b3bf3264f432dbd4d..39157da1abd0f4fc954006b02d7455419f02e1d1 100644 (file)
--- a/gosa-core/plugins/admin/groups/remove.tpl
+++ b/gosa-core/plugins/admin/groups/remove.tpl
@@ -1,5 +1,5 @@
 <div style="font-size:18px;">
-  <img alt="" src="images/button_cancel.png" align=top>&nbsp;{t}Warning{/t}
+  <img alt="" src="images/warning.png" align=top>&nbsp;{t}Warning{/t}
 </div>
 <p>
   {$info}

diff --git a/gosa-core/plugins/admin/ogroups/class_divListOGroup.inc b/gosa-core/plugins/admin/ogroups/class_divListOGroup.inc
index 3201b5c6cf8a7f214d3eaf5452e69e333962f3f0..dfd5acb4698cae392b8ab689c63cfc9ca9a58711 100644 (file)
--- a/gosa-core/plugins/admin/ogroups/class_divListOGroup.inc
+++ b/gosa-core/plugins/admin/ogroups/class_divListOGroup.inc
@@ -191,13 +191,13 @@ class divListOGroup extends MultiSelectWindow
   
     /* Add department selector */
     $listhead .= _("Base")."&nbsp;<select name='CurrentMainBase' onChange='mainform.submit()' class='center'>$options</select>".
-      " <input class='center' type='image' src='images/list_submit.png' align='middle' 
+      " <input class='center' type='image' src='images/lists/submit.png' align='middle' 
       title='"._("Submit department")."' name='submit_department' alt='"._("Submit")."'>&nbsp;";
 
 
     /* Create Layers menu */
     $s  = ".|"._("Actions")."|\n";
-    $s .= "..|<img src='images/list_new.png' alt='' border='0' class='center'>".
+    $s .= "..|<img src='images/lists/new.png' alt='' border='0' class='center'>".
       "&nbsp;"._("Create")."|\n";
 
     /* Append create options */

diff --git a/gosa-core/plugins/admin/ogroups/class_ogroup.inc b/gosa-core/plugins/admin/ogroups/class_ogroup.inc
index ea6abd6375bf24de950235b5c5a17fad3af293b7..fa0c66ca1fe2d0c8f0eb2e2a74390b0b72aed259 100644 (file)
--- a/gosa-core/plugins/admin/ogroups/class_ogroup.inc
+++ b/gosa-core/plugins/admin/ogroups/class_ogroup.inc
@@ -186,7 +186,7 @@ class ogroup extends plugin
 
     /* Do we represent a valid group? */
     if (!$this->is_account){
-      $display= "<img alt=\"\" src=\"images/stop.png\" align=\"middle\">&nbsp;<b>".
+      $display= "<img alt=\"\" src=\"images/small-error.png\" align=\"middle\">&nbsp;<b>".
         msgPool::noValidExtension("object group")."</b>";
       return ($display);
     }

diff --git a/gosa-core/plugins/admin/ogroups/remove.tpl b/gosa-core/plugins/admin/ogroups/remove.tpl
index 1f244deee0c8428a52d09e9db3bbeabf2db57cd9..2b809b9b50ea5cb7b0f8c3491eac4fad4bcb6184 100644 (file)
--- a/gosa-core/plugins/admin/ogroups/remove.tpl
+++ b/gosa-core/plugins/admin/ogroups/remove.tpl
@@ -1,5 +1,5 @@
 <div style="font-size:18px;">
-  <img alt="" src="images/button_cancel.png" align=top>&nbsp;{t}Warning{/t}
+  <img alt="" src="images/warning.png" align=top>&nbsp;{t}Warning{/t}
 </div>
 
 <p>

diff --git a/gosa-core/plugins/admin/users/class_divListUsers.inc b/gosa-core/plugins/admin/users/class_divListUsers.inc
index 15401fbebd59fdc99b2ef2d834fb62de71a60c82..5117b0b099959bcee389004ad009f71eb49454dd 100644 (file)
--- a/gosa-core/plugins/admin/users/class_divListUsers.inc
+++ b/gosa-core/plugins/admin/users/class_divListUsers.inc
@@ -160,20 +160,20 @@ class divListUsers extends MultiSelectWindow
     $listhead = MultiSelectWindow::get_default_header();
     $listhead .=
       _("Base")."&nbsp;<select name='CurrentMainBase' onChange='mainform.submit()' class='center'>$options</select>".
-      " <input class='center' type='image' src='images/list_submit.png' align='middle' 
+      " <input class='center' type='image' src='images/lists/submit.png' align='middle' 
       title='"._("Submit department")."' name='submit_department' alt='".  _("Submit")."'>&nbsp;";
 
 
     /* Create Layers menu */
     $s  = ".|"._("Actions")."|\n";
-    $s .= "..|<img src='images/list_new.png' alt='' border='0' class='center'>".
+    $s .= "..|<img src='images/lists/new.png' alt='' border='0' class='center'>".
       "&nbsp;"._("Create")."|\n";
 
     /* Append create options */
     if(preg_match("/c/",$acl)) {
       $s.= "...|<input class='center' type='image' src='images/list_new_user.png' alt=''>".
         "&nbsp;"._("User")."|user_new|\n";
-      $s.= "...|<input class='center' type='image' src='images/list_new.png' alt=''>".
+      $s.= "...|<input class='center' type='image' src='images/lists/new.png' alt=''>".
         "&nbsp;"._("Template")."|user_tplnew|\n";
     }
 
@@ -281,7 +281,7 @@ class divListUsers extends MultiSelectWindow
                     name='user_edit_%KEY%-sambaAccount' title='"._("Edit samba properties")."'>";
     $netatalkimg = "<input class='center' type='image' src='images/select_netatalk.png' alt='"._("Netatalk")."'
                     name='user_edit_%KEY%-netatalk' title='"._("Edit netatalk properties")."'>";
-    $tplcreateuserimg  = "<input type='image' class='center' src='images/list_new.png' alt='"._("Create user from template")."'
+    $tplcreateuserimg  = "<input type='image' class='center' src='images/lists/new.png' alt='"._("Create user from template")."'
                     name='userfrom_tpl_%KEY%' title='"._("Create user with this template")."'>";
 
     /********************

diff --git a/gosa-core/plugins/admin/users/remove.tpl b/gosa-core/plugins/admin/users/remove.tpl
index 3d9af5de5ae99a37ec77e5a3deabec28e1dc0eb0..8424e740118ed9109f38d56a435dc569e825da35 100644 (file)
--- a/gosa-core/plugins/admin/users/remove.tpl
+++ b/gosa-core/plugins/admin/users/remove.tpl
@@ -1,5 +1,5 @@
 <div style="font-size:18px;">
- <img alt="" src="images/button_cancel.png" align=top>&nbsp;{t}Warning{/t}
+ <img alt="" src="images/warning.png" align=top>&nbsp;{t}Warning{/t}
 </div>
 <p>
   {$info}

diff --git a/gosa-core/plugins/personal/generic/class_user.inc b/gosa-core/plugins/personal/generic/class_user.inc
index 15ab39c97d6b16a3e60901ed14d8ee106698e8d5..8d4e92706fc1c3121d2f8bc9a77ada845538018b 100644 (file)
--- a/gosa-core/plugins/personal/generic/class_user.inc
+++ b/gosa-core/plugins/personal/generic/class_user.inc
@@ -308,7 +308,7 @@ class user extends plugin
 
     /* Do we represent a valid gosaAccount? */
     if (!$this->is_account){
-      $str = "<img alt=\"\" src=\"images/stop.png\" align=\"middle\">&nbsp;<b>".
+      $str = "<img alt=\"\" src=\"images/small-error.png\" align=\"middle\">&nbsp;<b>".
         msgPool::noValidExtension("GOsa")."</b>";
       return($str);
     }

diff --git a/gosa-core/plugins/personal/generic/generic.tpl b/gosa-core/plugins/personal/generic/generic.tpl
index a0130e8f20cef539d1043ff28fef1aab80686b32..0908aa51d4d619cad1a586097815f3cadd4d7224 100644 (file)
--- a/gosa-core/plugins/personal/generic/generic.tpl
+++ b/gosa-core/plugins/personal/generic/generic.tpl
@@ -3,7 +3,7 @@
  <!-- Headline container -->
  <tr>
   <td colspan="4">
-   <h2><img alt="" align="middle" src="images/head.png" class="center"> {t}Personal information{/t}</h2>
+   <h2><img alt="" align="middle" src="plugins/generic/images/head.png" class="center"> {t}Personal information{/t}</h2>
   </td>
  </tr>
 

diff --git a/gosa-core/plugins/personal/generic/generic_picture.tpl b/gosa-core/plugins/personal/generic/generic_picture.tpl
index 3ca58773423705a4f99e44b5a4cfb0ba848144b9..de72255090d590f571a57be2568e8bd84c58962d 100644 (file)
--- a/gosa-core/plugins/personal/generic/generic_picture.tpl
+++ b/gosa-core/plugins/personal/generic/generic_picture.tpl
@@ -2,7 +2,7 @@
  <!-- Headline container -->
  <tr>
    <td colspan=2>
-     <h2><img alt="" class="center" align="middle" src="images/head.png"> {t}Personal picture{/t}</h2>
+     <h2><img alt="" class="center" align="middle" src="plugins/generic/images/head.png"> {t}Personal picture{/t}</h2>
    </td>
  </tr>
  <!-- Base container -->

diff --git a/gosa-core/plugins/personal/generic/main.inc b/gosa-core/plugins/personal/generic/main.inc
index 0b6dcdcc270521f95389725a2db94ce0f2371ff5..4f5b33c249250eb13b036ef4125cb8b3ad9f8423 100644 (file)
--- a/gosa-core/plugins/personal/generic/main.inc
+++ b/gosa-core/plugins/personal/generic/main.inc
@@ -179,7 +179,7 @@ if (!$remove_lock){
       /* Only display edit button if there is at least one attribute editable */
       if(preg_match("/w/",$ui->get_permissions($ui->dn,"users/user"))){
         if ($fn == "edit"){
-          $info.= "<img class=\"center\" alt=\"\" align=\"middle\" src=\"".get_template_path('images/lamp.png')."\"> ".
+          $info.= "<img class=\"center\" alt=\"\" align=\"middle\" src=\"".get_template_path('images/lists/on.png')."\"> ".
             msgPool::clickEditToChange();
           $display.= "<input type=submit name=\"$fn\" value=\"$str\">\n";
         }
@@ -191,7 +191,7 @@ if (!$remove_lock){
   }
 
   /* Page header*/
-  $display= print_header(get_template_path('images/personal.png'),
+  $display= print_header(get_template_path('plugins/generic/images/plugin.png'),
                          _("Generic user information"), $info).$display;
 
 }

diff --git a/gosa-core/plugins/personal/posix/class_posixAccount.inc b/gosa-core/plugins/personal/posix/class_posixAccount.inc
index 6fb52cc3e05d1a080b406ac1d6f53265d8f420c9..cf1dae04faeee11d5b3c39d361f801ce433ea5b7 100644 (file)
--- a/gosa-core/plugins/personal/posix/class_posixAccount.inc
+++ b/gosa-core/plugins/personal/posix/class_posixAccount.inc
@@ -271,7 +271,7 @@ class posixAccount extends plugin
 
       /* Do we represent a valid posixAccount? */
       if (!$this->is_account && $this->parent === NULL ){
-        $display= "<img alt=\"\" src=\"images/stop.png\" align=\"middle\">&nbsp;<b>".
+        $display= "<img alt=\"\" src=\"images/small-error.png\" align=\"middle\">&nbsp;<b>".
           msgPool::noValidExtension(_("POSIX"))."</b>";
         $display.= back_to_main();
         return ($display);

diff --git a/gosa-core/plugins/personal/posix/main.inc b/gosa-core/plugins/personal/posix/main.inc
index 5199eb73c0fb039c5fae32163e401be7ccec33b2..0ce027772a459e5ec4e9f2281afc02be9fd1ea55 100644 (file)
--- a/gosa-core/plugins/personal/posix/main.inc
+++ b/gosa-core/plugins/personal/posix/main.inc
@@ -116,7 +116,7 @@ if (!$remove_lock){
 
       /* Only display edit button if there is at least one attribute editable */
       if(preg_match("/w/",$ui->get_permissions($ui->dn,"users/posixAccount"))){
-        $info.= "<img alt=\"\" align=\"middle\" src=\"".get_template_path('images/lamp.png')."\"> ".
+        $info.= "<img alt=\"\" align=\"middle\" src=\"".get_template_path('images/lists/on.png')."\"> ".
           msgPool::clickEditToChange();
 
         $display.= "<input type=submit name=\"edit\" value=\"".msgPool::editButton()."\">\n";