35 files changed, 94 insertions, 81 deletions

diff --git a/data/templates/activesync.tpl b/data/templates/activesync.tpl
index f5d5141..862e700 100644
--- a/data/templates/activesync.tpl
+++ b/data/templates/activesync.tpl
@@ -29,13 +29,13 @@
         <table width="100%" cellpadding="8" cellspacing="8"><tr valign="top"><td style="border-top-style:dotted;border-right-style:dotted;border-bottom-style:dotted;border-left-style:dotted;border-width:1px;">
         {foreach from=$folders key=myId item=fol}
         <table border="0" width="100%">
-        <tr bgcolor="#c8d2df"><td colspan="5"> <img src="/admin/pics/{$myId}.png" style="vertical-align:middle;"> <span style="font-weight:bolder;">{tr msg=$pnames[$myId]} </span></td></tr>
+        <tr bgcolor="#c8d2df"><td colspan="5"> <img src="/admin/images/{$myId}.png" style="vertical-align:middle;"> <span style="font-weight:bolder;">{tr msg=$pnames[$myId]} </span></td></tr>
         <tr>
         <td width="20">&nbsp;</td>
-        <td width="5"><img src="/admin/pics/sync.png" align="center" style="margin-left:5px;"></td>
+        <td width="5"><img src="/admin/images/sync.png" align="center" style="margin-left:5px;"></td>
         
         {if $myId eq 'EVENT' or $myId eq 'TASKS'}
-	        <td width="5"><img src="/admin/pics/alarm.png" align="center" style="margin-left:5px;"></td>
+	        <td width="5"><img src="/admin/images/alarm.png" align="center" style="margin-left:5px;"></td>
 	       {else} 
 	       <td width="25"></td>
         {/if}
@@ -47,7 +47,7 @@
  
          <td width="20">&nbsp;</td>
         {kolabsync serial=$devices[device].name folder=$fols.realname}
-       <td width="25"><img src="/admin/pics/f.png" style="vertical-align:middle;padding:4px;"></td>
+       <td width="25"><img src="/admin/images/f.png" style="vertical-align:middle;padding:4px;"></td>
         <td>{$fols.name}</td>
        </tr>
   
diff --git a/data/templates/codefusion.tpl b/data/templates/codefusion.tpl
index 1513511..a747825 100755
--- a/data/templates/codefusion.tpl
+++ b/data/templates/codefusion.tpl
@@ -7,7 +7,7 @@
 <div class="contentsimple">
 
 <a href="http://www.codefusion.co.za/">
- <img src="../pics/codefusion.png" alt="Code Fusion" style="border:0" />
+ <img src="../images/codefusion.png" alt="Code Fusion" style="border:0" />
 </a>
   
 <p>
diff --git a/data/templates/erfrakon.tpl b/data/templates/erfrakon.tpl
index 3f3a432..054bb98 100755
--- a/data/templates/erfrakon.tpl
+++ b/data/templates/erfrakon.tpl
@@ -11,7 +11,7 @@
 </p>
 <div class="align_center">
  <a href="http://www.erfrakon.de">
-  <img src="../pics/erfrakon.png" alt="erfrakon" longdesc="http://www.erfrakon.de" usemap="#maperfrakon" style="border:0px;" />
+  <img src="../images/erfrakon.png" alt="erfrakon" longdesc="http://www.erfrakon.de" usemap="#maperfrakon" style="border:0px;" />
  </a>
 </div>
 <p>
diff --git a/data/templates/intevation.tpl b/data/templates/intevation.tpl
index 7e0cefc..53797e3 100755
--- a/data/templates/intevation.tpl
+++ b/data/templates/intevation.tpl
@@ -6,7 +6,7 @@
 
 <div class="align_center">
  <a href="http://intevation.net/">
-  <img src="../pics/intevation_logo.png" alt="Logo Intevation GmbH" height="91" longdesc="www.intevation.net" style="border:0px;" />
+  <img src="../images/intevation_logo.png" alt="Logo Intevation GmbH" height="91" longdesc="www.intevation.net" style="border:0px;" />
  </a>
 </div>
 
diff --git a/data/templates/kdab.tpl b/data/templates/kdab.tpl
index 2fd745c..5bfdba0 100755
--- a/data/templates/kdab.tpl
+++ b/data/templates/kdab.tpl
@@ -1,7 +1,7 @@
 {* Smarty Template *}
 <div class="align_center">
  <a href="http://www.klaralvdalens-datakonsult.se/">
-  <img src="../pics/kdab.png" alt="KDAB" longdesc="http://www.klaralvdalens-datakonsult.se" style="border:0px;" />
+  <img src="../images/kdab.png" alt="KDAB" longdesc="http://www.klaralvdalens-datakonsult.se" style="border:0px;" />
  </a>
 </div>
 <div class="contentsimple">
diff --git a/data/templates/kde.tpl b/data/templates/kde.tpl
index 94deaff..262d33d 100755
--- a/data/templates/kde.tpl
+++ b/data/templates/kde.tpl
@@ -4,7 +4,7 @@
 {tr msg="<a href=\"http://www.kde.org\">KDE</a> is a powerful <a href=\"http://www.gnu.org/philosophy/free-sw.html\">Free Software</a> graphical desktop environment for Linux and Unix workstations. It combines ease of use, contemporary functionality, and outstanding graphical design with the technological superiority of the Unix operating system."}
 </p>
 <div class="align_center">
-<img src="../pics/kde.png" alt="KDE" longdesc="http://www.kde.org" />
+<img src="../images/kde.png" alt="KDE" longdesc="http://www.kde.org" />
 </div>
 <p>
 {tr msg="<b>KDE</b> is an Internet project that is truly open in every sense. Development takes place on the Internet and is discussed on our <a href=\"http://www.kde.org/mailinglists.html\">mailing lists</a>, USENET news groups, and IRC channels to which we invite and welcome everyone."}
diff --git a/data/templates/kolabsystems.tpl b/data/templates/kolabsystems.tpl
index 027ef52..d142d43 100644
--- a/data/templates/kolabsystems.tpl
+++ b/data/templates/kolabsystems.tpl
@@ -1,7 +1,7 @@
 {* Smarty Template *}
 <div class="align_center">
  <a href="http://kolabsys.com/">
-  <img src="/admin/pics/kolabsystems_logo.png" alt="Kolab Systems AG" longdesc="http://kolabsys.com" style="border:0px;" />
+  <img src="/admin/images/kolabsystems_logo.png" alt="Kolab Systems AG" longdesc="http://kolabsys.com" style="border:0px;" />
  </a>
 </div>
 <div class="contentsimple">
diff --git a/data/templates/welcome-admin.tpl b/data/templates/welcome-admin.tpl
index 7a88759..88ab3c6 100755
--- a/data/templates/welcome-admin.tpl
+++ b/data/templates/welcome-admin.tpl
@@ -10,22 +10,22 @@
 <table cellspacing="10" cellpadding="10">
 <tr>
 <td>
-<a href="/admin/user/" class="welcomelinks"><img src="/admin/pics/system-users.png" border="0" alt="Manage Users" /><br /><b>{tr msg="Manage Users"}</b></a>
+<a href="/admin/user/" class="welcomelinks"><img src="/admin/images/system-users.png" border="0" alt="Manage Users" /><br /><b>{tr msg="Manage Users"}</b></a>
 </td>
 <td>
-<a href="/admin/addressbook/" class="welcomelinks"><img src="/admin/pics/office-address-book.png" border="0" alt="Addressbook" /><br /><b>{tr msg="Addressbook"}</b></a>
+<a href="/admin/addressbook/" class="welcomelinks"><img src="/admin/images/office-address-book.png" border="0" alt="Addressbook" /><br /><b>{tr msg="Addressbook"}</b></a>
 </td>
 <td>
-<a href="/admin/sharedfolder/" class="welcomelinks"><img src="/admin/pics/preferences-system-network-sharing.png" border="0" alt="Shared Folders" /><br /><b>{tr msg="Shared Folders"}</b></a>
+<a href="/admin/sharedfolder/" class="welcomelinks"><img src="/admin/images/preferences-system-network-sharing.png" border="0" alt="Shared Folders" /><br /><b>{tr msg="Shared Folders"}</b></a>
 </td>
 <td>
-<a href="/admin/administrator/" class="welcomelinks"><img src="/admin/pics/resource-group.png" border="0" alt="Administrator" /><br /><b>{tr msg="Administrator"}</b></a>
+<a href="/admin/administrator/" class="welcomelinks"><img src="/admin/images/resource-group.png" border="0" alt="Administrator" /><br /><b>{tr msg="Administrator"}</b></a>
 </td>
 <td>
-<a href="/admin/settings/" class="welcomelinks"><img src="/admin/pics/preferences-system.png" border="0" alt="Settings" /><br /><b>{tr msg="Settings"}</b></a>
+<a href="/admin/settings/" class="welcomelinks"><img src="/admin/images/preferences-system.png" border="0" alt="Settings" /><br /><b>{tr msg="Settings"}</b></a>
 </td>
 <td>
-<a href="/admin/kolab/" class="welcomelinks"><img src="/admin/pics/dialog-information.png" border="0" alt="About Kolab" /><br /><b>{tr msg="About"}</b></a>
+<a href="/admin/kolab/" class="welcomelinks"><img src="/admin/images/dialog-information.png" border="0" alt="About Kolab" /><br /><b>{tr msg="About"}</b></a>
 </td>
 </tr></table>
 </div>
\ No newline at end of file
diff --git a/data/templates/welcome-domain-maintainer.tpl b/data/templates/welcome-domain-maintainer.tpl
index 9de2f87..3d7e979 100644
--- a/data/templates/welcome-domain-maintainer.tpl
+++ b/data/templates/welcome-domain-maintainer.tpl
@@ -10,13 +10,13 @@
 <table cellspacing="10" cellpadding="10">
 <tr>
 <td>
-<a href="/admin/user/" class="welcomelinks"><img src="/admin/pics/system-users.png" border="0" alt="Manage Users" /><br /><b>{tr msg="Manage Users"}</b></a>
+<a href="/admin/user/" class="welcomelinks"><img src="/admin/images/system-users.png" border="0" alt="Manage Users" /><br /><b>{tr msg="Manage Users"}</b></a>
 </td>
 <td>
-<a href="/admin/sharedfolder/" class="welcomelinks"><img src="/admin/pics/preferences-system-network-sharing.png" border="0" alt="Shared Folders" /><br /><b>{tr msg="Shared Folders"}</b></a>
+<a href="/admin/sharedfolder/" class="welcomelinks"><img src="/admin/images/preferences-system-network-sharing.png" border="0" alt="Shared Folders" /><br /><b>{tr msg="Shared Folders"}</b></a>
 </td>
 <td>
-<a href="/admin/kolab/" class="welcomelinks"><img src="/admin/pics/dialog-information.png" border="0" alt="About Kolab" /><br /><b>{tr msg="About"}</b></a>
+<a href="/admin/kolab/" class="welcomelinks"><img src="/admin/images/dialog-information.png" border="0" alt="About Kolab" /><br /><b>{tr msg="About"}</b></a>
 </td>
 </tr></table>
 </div>
\ No newline at end of file
diff --git a/data/templates/welcome-maintainer.tpl b/data/templates/welcome-maintainer.tpl
index ecffab7..ba8640e 100755
--- a/data/templates/welcome-maintainer.tpl
+++ b/data/templates/welcome-maintainer.tpl
@@ -10,22 +10,22 @@
 <table cellspacing="10" cellpadding="10">
 <tr>
 <td>
-<a href="/admin/user/" class="welcomelinks"><img src="/admin/pics/system-users.png" border="0" alt="Manage Users" /><br /><b>{tr msg="Manage Users"}</b></a>
+<a href="/admin/user/" class="welcomelinks"><img src="/admin/images/system-users.png" border="0" alt="Manage Users" /><br /><b>{tr msg="Manage Users"}</b></a>
 </td>
 <td>
-<a href="/admin/addressbook/" class="welcomelinks"><img src="/admin/pics/office-address-book.png" border="0" alt="Addressbook" /><br /><b>{tr msg="Addressbook"}</b></a>
+<a href="/admin/addressbook/" class="welcomelinks"><img src="/admin/images/office-address-book.png" border="0" alt="Addressbook" /><br /><b>{tr msg="Addressbook"}</b></a>
 </td>
 <td>
-<a href="/admin/sharedfolder/" class="welcomelinks"><img src="/admin/pics/preferences-system-network-sharing.png" border="0" alt="Shared Folders" /><br /><b>{tr msg="Shared Folders"}</b></a>
+<a href="/admin/sharedfolder/" class="welcomelinks"><img src="/admin/images/preferences-system-network-sharing.png" border="0" alt="Shared Folders" /><br /><b>{tr msg="Shared Folders"}</b></a>
 </td>
 <td>
-<a href="/admin/administrator/" class="welcomelinks"><img src="/admin/pics/resource-group.png" border="0" alt="Administrator" /><br /><b>{tr msg="Administrator"}</b></a>
+<a href="/admin/administrator/" class="welcomelinks"><img src="/admin/images/resource-group.png" border="0" alt="Administrator" /><br /><b>{tr msg="Administrator"}</b></a>
 </td>
 <td>
-<a href="/admin/settings/" class="welcomelinks"><img src="/admin/pics/preferences-system.png" border="0" alt="Settings" /><br /><b>{tr msg="Settings"}</b></a>
+<a href="/admin/settings/" class="welcomelinks"><img src="/admin/images/preferences-system.png" border="0" alt="Settings" /><br /><b>{tr msg="Settings"}</b></a>
 </td>
 <td>
-<a href="/admin/kolab/" class="welcomelinks"><img src="/admin/pics/dialog-information.png" border="0" alt="About Kolab" /><br /><b>{tr msg="About"}</b></a>
+<a href="/admin/kolab/" class="welcomelinks"><img src="/admin/images/dialog-information.png" border="0" alt="About Kolab" /><br /><b>{tr msg="About"}</b></a>
 </td>
 </tr></table>
 </div>
\ No newline at end of file
diff --git a/data/templates/welcome-user.tpl b/data/templates/welcome-user.tpl
index bc8a994..48a74b9 100644
--- a/data/templates/welcome-user.tpl
+++ b/data/templates/welcome-user.tpl
@@ -10,13 +10,13 @@
 <table cellspacing="10" cellpadding="10">
 <tr>
 <td>
-<a href="/admin/user/user.php?action=modify" class="welcomelinks"><img src="/admin/pics/preferences-system.png" border="0" alt="My settings" /><br /><b>{tr msg="My settings"}</b></a>
+<a href="/admin/user/user.php?action=modify" class="welcomelinks"><img src="/admin/images/preferences-system.png" border="0" alt="My settings" /><br /><b>{tr msg="My settings"}</b></a>
 </td>
 <td>
-<a href="/admin/user/activesync.php" class="welcomelinks"><img src="/admin/pics/phone.png" border="0" alt="ActiveSync" /><br /><b>{tr msg="ActiveSync"}</b></a>
+<a href="/admin/user/activesync.php" class="welcomelinks"><img src="/admin/images/phone.png" border="0" alt="ActiveSync" /><br /><b>{tr msg="ActiveSync"}</b></a>
 </td>
 <td>
-<a href="/admin/kolab/" class="welcomelinks"><img src="/admin/pics/dialog-information.png" border="0" alt="About Kolab" /><br /><b>{tr msg="About"}</b></a>
+<a href="/admin/kolab/" class="welcomelinks"><img src="/admin/images/dialog-information.png" border="0" alt="About Kolab" /><br /><b>{tr msg="About"}</b></a>
 </td>
 </tr></table>
 </div>
\ No newline at end of file
diff --git a/package.xml b/package.xml
index 5cce4da..04502e4 100644
--- a/package.xml
+++ b/package.xml
@@ -26,8 +26,8 @@
  <date>2011-04-20</date>
  <time>00:44:50</time>
  <version>
-  <release>2.3.0.2</release>
-  <api>2.3.0</api>
+  <release>2.3.1</release>
+  <api>2.3.1</api>
  </version>
  <stability>
   <release>alpha</release>
@@ -176,25 +176,47 @@
       <file name="index.php" role="www" />
      </dir> <!-- /www/admin/domainmaintainer -->
      <dir name="images">
+      <file name="alarm.png" role="www" />
       <file name="body.jpg" role="www" />
       <file name="bottom.png" role="www" />
+      <file name="codefusion.png" role="www" />
+      <file name="CONTACT.png" role="www" />
+      <file name="dialog-information.png" role="www" />
+      <file name="erfrakon.png" role="www" />
+      <file name="EVENT.png" role="www" />
       <file name="eye_pencil.png" role="www" />
+      <file name="f.png" role="www" />
       <file name="footer.png" role="www" />
       <file name="icon_grey_logout.png" role="www" />
       <file name="identica.png" role="www" />
+      <file name="intevation_logo.png" role="www" />
       <file name="irc.png" role="www" />
+      <file name="kdab.png" role="www" />
+      <file name="kde.png" role="www" />
       <file name="klogo.png" role="www" />
       <file name="kolab.png" role="www" />
+      <file name="kolab_logo.png" role="www" />
+      <file name="kolabsystems_logo.png" role="www" />
       <file name="line.png" role="www" />
       <file name="listitem.png" role="www" />
       <file name="logo.png" role="www" />
+      <file name="MAIL.png" role="www" />
       <file name="menu.jpg" role="www" />
+      <file name="mootools.v1.11.js" role="www" />
+      <file name="NOTES.png" role="www" />
+      <file name="office-address-book.png" role="www" />
+      <file name="phone.png" role="www" />
+      <file name="preferences-system-network-sharing.png" role="www" />
+      <file name="preferences-system.png" role="www" />
+      <file name="resource-group.png" role="www" />
       <file name="root.jpg" role="www" />
+      <file name="sliding-tabs.js" role="www" />
+      <file name="sync.png" role="www" />
+      <file name="system-users.png" role="www" />
+      <file name="TASKS.png" role="www" />
       <file name="twitter.png" role="www" />
       <file name="ul-icon.png" role="www" />
       <file name="user-icon-1-20x20.gif" role="www" />
-      <file name="mootools.v1.11.js" role="www" />
-      <file name="sliding-tabs.js" role="www" />
      </dir> <!-- /www/admin/images -->
      <dir name="kolab">
       <file name="codefusion.php" role="www" />
@@ -211,30 +233,6 @@
       <file name="index.php" role="www" />
       <file name="maintainer.php" role="www" />
      </dir> <!-- /www/admin/maintainer -->
-     <dir name="pics">
-      <file name="codefusion.png" role="www" />
-      <file name="dialog-information.png" role="www" />
-      <file name="erfrakon.png" role="www" />
-      <file name="intevation_logo.png" role="www" />
-      <file name="kdab.png" role="www" />
-      <file name="kde.png" role="www" />
-      <file name="kolab_logo.png" role="www" />
-      <file name="kolabsystems_logo.png" role="www" />
-      <file name="office-address-book.png" role="www" />
-      <file name="phone.png" role="www" />
-      <file name="preferences-system-network-sharing.png" role="www" />
-      <file name="preferences-system.png" role="www" />
-      <file name="resource-group.png" role="www" />
-      <file name="system-users.png" role="www" />
-      <file name="alarm.png" role="www" />
-      <file name="CONTACT.png" role="www" />
-      <file name="EVENT.png" role="www" />
-      <file name="f.png" role="www" />
-      <file name="MAIL.png" role="www" />
-      <file name="NOTES.png" role="www" />
-      <file name="sync.png" role="www" />
-      <file name="TASKS.png" role="www" />
-     </dir> <!-- /www/admin/pics -->
      <dir name="settings">
       <file name="index.php" role="www" />
      </dir> <!-- /www/admin/settings -->
@@ -375,58 +373,58 @@
    <install as="admin/distributionlist/list.php" name="www/admin/distributionlist/list.php" />
    <install as="admin/domainmaintainer/domainmaintainer.php" name="www/admin/domainmaintainer/domainmaintainer.php" />
    <install as="admin/domainmaintainer/index.php" name="www/admin/domainmaintainer/index.php" />
+   <install as="admin/images/alarm.png" name="www/admin/images/alarm.png" />
    <install as="admin/images/body.jpg" name="www/admin/images/body.jpg" />
    <install as="admin/images/bottom.png" name="www/admin/images/bottom.png" />
+   <install as="admin/images/codefusion.png" name="www/admin/images/codefusion.png" />
+   <install as="admin/images/CONTACT.png" name="www/admin/images/CONTACT.png" />
+   <install as="admin/images/dialog-information.png" name="www/admin/images/dialog-information.png" />
+   <install as="admin/images/erfrakon.png" name="www/admin/images/erfrakon.png" />
+   <install as="admin/images/EVENT.png" name="www/admin/images/EVENT.png" />
    <install as="admin/images/eye_pencil.png" name="www/admin/images/eye_pencil.png" />
+   <install as="admin/images/f.png" name="www/admin/images/f.png" />
    <install as="admin/images/footer.png" name="www/admin/images/footer.png" />
    <install as="admin/images/icon_grey_logout.png" name="www/admin/images/icon_grey_logout.png" />
    <install as="admin/images/identica.png" name="www/admin/images/identica.png" />
+   <install as="admin/images/intevation_logo.png" name="www/admin/images/intevation_logo.png" />
    <install as="admin/images/irc.png" name="www/admin/images/irc.png" />
+   <install as="admin/images/kdab.png" name="www/admin/images/kdab.png" />
+   <install as="admin/images/kde.png" name="www/admin/images/kde.png" />
    <install as="admin/images/klogo.png" name="www/admin/images/klogo.png" />
    <install as="admin/images/kolab.png" name="www/admin/images/kolab.png" />
+   <install as="admin/images/kolab_logo.png" name="www/admin/images/kolab_logo.png" />
+   <install as="admin/images/kolabsystems_logo.png" name="www/admin/images/kolabsystems_logo.png" />
    <install as="admin/images/line.png" name="www/admin/images/line.png" />
    <install as="admin/images/listitem.png" name="www/admin/images/listitem.png" />
    <install as="admin/images/logo.png" name="www/admin/images/logo.png" />
+   <install as="admin/images/MAIL.png" name="www/admin/images/MAIL.png" />
    <install as="admin/images/menu.jpg" name="www/admin/images/menu.jpg" />
+   <install as="admin/images/mootools.v1.11.js" name="www/admin/images/mootools.v1.11.js" />
+   <install as="admin/images/NOTES.png" name="www/admin/images/NOTES.png" />
+   <install as="admin/images/office-address-book.png" name="www/admin/images/office-address-book.png" />
+   <install as="admin/images/phone.png" name="www/admin/images/phone.png" />
+   <install as="admin/images/preferences-system-network-sharing.png" name="www/admin/images/preferences-system-network-sharing.png" />
+   <install as="admin/images/preferences-system.png" name="www/admin/images/preferences-system.png" />
+   <install as="admin/images/resource-group.png" name="www/admin/images/resource-group.png" />
    <install as="admin/images/root.jpg" name="www/admin/images/root.jpg" />
+   <install as="admin/images/sliding-tabs.js" name="www/admin/images/sliding-tabs.js" />
+   <install as="admin/images/sync.png" name="www/admin/images/sync.png" />
+   <install as="admin/images/system-users.png" name="www/admin/images/system-users.png" />
+   <install as="admin/images/TASKS.png" name="www/admin/images/TASKS.png" />
    <install as="admin/images/twitter.png" name="www/admin/images/twitter.png" />
    <install as="admin/images/ul-icon.png" name="www/admin/images/ul-icon.png" />
    <install as="admin/images/user-icon-1-20x20.gif" name="www/admin/images/user-icon-1-20x20.gif" />
-   <install as="admin/images/mootools.v1.11.js" name="www/admin/images/mootools.v1.11.js" />
-   <install as="admin/images/sliding-tabs.js" name="www/admin/images/sliding-tabs.js" />
    <install as="admin/kolab/codefusion.php" name="www/admin/kolab/codefusion.php" />
    <install as="admin/kolab/erfrakon.php" name="www/admin/kolab/erfrakon.php" />
    <install as="admin/kolab/index.php" name="www/admin/kolab/index.php" />
    <install as="admin/kolab/intevation.php" name="www/admin/kolab/intevation.php" />
    <install as="admin/kolab/kdab.php" name="www/admin/kolab/kdab.php" />
    <install as="admin/kolab/kde.php" name="www/admin/kolab/kde.php" />
-   <install as="admin/pics/alarm.png" name="www/admin/pics/alarm.png" />
-   <install as="admin/pics/CONTACT.png" name="www/admin/pics/CONTACT.png" />
-   <install as="admin/pics/EVENT.png" name="www/admin/pics/EVENT.png" />
-   <install as="admin/pics/f.png" name="www/admin/pics/f.png" />
-   <install as="admin/pics/MAIL.png" name="www/admin/pics/MAIL.png" />
-   <install as="admin/pics/NOTES.png" name="www/admin/pics/NOTES.png" />
-   <install as="admin/pics/sync.png" name="www/admin/pics/sync.png" />
-   <install as="admin/pics/TASKS.png" name="www/admin/pics/TASKS.png" />
    <install as="admin/kolab/kolabsystems.php" name="www/admin/kolab/kolabsystems.php" />
    <install as="admin/kolab/technology.php" name="www/admin/kolab/technology.php" />
    <install as="admin/kolab/versions.php" name="www/admin/kolab/versions.php" />
    <install as="admin/maintainer/index.php" name="www/admin/maintainer/index.php" />
    <install as="admin/maintainer/maintainer.php" name="www/admin/maintainer/maintainer.php" />
-   <install as="admin/pics/codefusion.png" name="www/admin/pics/codefusion.png" />
-   <install as="admin/pics/dialog-information.png" name="www/admin/pics/dialog-information.png" />
-   <install as="admin/pics/erfrakon.png" name="www/admin/pics/erfrakon.png" />
-   <install as="admin/pics/intevation_logo.png" name="www/admin/pics/intevation_logo.png" />
-   <install as="admin/pics/kdab.png" name="www/admin/pics/kdab.png" />
-   <install as="admin/pics/kde.png" name="www/admin/pics/kde.png" />
-   <install as="admin/pics/kolab_logo.png" name="www/admin/pics/kolab_logo.png" />
-   <install as="admin/pics/kolabsystems_logo.png" name="www/admin/pics/kolabsystems_logo.png" />
-   <install as="admin/pics/office-address-book.png" name="www/admin/pics/office-address-book.png" />
-   <install as="admin/pics/phone.png" name="www/admin/pics/phone.png" />
-   <install as="admin/pics/preferences-system-network-sharing.png" name="www/admin/pics/preferences-system-network-sharing.png" />
-   <install as="admin/pics/preferences-system.png" name="www/admin/pics/preferences-system.png" />
-   <install as="admin/pics/resource-group.png" name="www/admin/pics/resource-group.png" />
-   <install as="admin/pics/system-users.png" name="www/admin/pics/system-users.png" />
    <install as="admin/settings/index.php" name="www/admin/settings/index.php" />
    <install as="admin/sharedfolder/index.php" name="www/admin/sharedfolder/index.php" />
    <install as="admin/sharedfolder/sf.php" name="www/admin/sharedfolder/sf.php" />
@@ -499,5 +497,20 @@
 * Fix new welcome pages
    </notes>
   </release>
+  <release>
+   <version>
+    <release>2.3.1</release>
+    <api>2.3.0</api>
+   </version>
+   <stability>
+    <release>beta</release>
+    <api>beta</api>
+   </stability>
+   <date>2011-04-28</date>
+   <license uri="http://www.gnu.org/copyleft/lesser.html">LGPL</license>
+   <notes>
+* Move all graphics from www/admin/pics to www/admin/images
+   </notes>
+  </release>
  </changelog>
 </package>
diff --git a/www/admin/pics/CONTACT.png b/www/admin/images/CONTACT.png
index 916f6ab..916f6ab 100644
--- a/www/admin/pics/CONTACT.png
+++ b/www/admin/images/CONTACT.png
diff --git a/www/admin/pics/EVENT.png b/www/admin/images/EVENT.png
index 2e02fc9..2e02fc9 100644
--- a/www/admin/pics/EVENT.png
+++ b/www/admin/images/EVENT.png
diff --git a/www/admin/pics/MAIL.png b/www/admin/images/MAIL.png
index bc77592..bc77592 100644
--- a/www/admin/pics/MAIL.png
+++ b/www/admin/images/MAIL.png
diff --git a/www/admin/pics/NOTES.png b/www/admin/images/NOTES.png
index 7dca846..7dca846 100644
--- a/www/admin/pics/NOTES.png
+++ b/www/admin/images/NOTES.png
diff --git a/www/admin/pics/TASKS.png b/www/admin/images/TASKS.png
index d3d600d..d3d600d 100644
--- a/www/admin/pics/TASKS.png
+++ b/www/admin/images/TASKS.png
diff --git a/www/admin/pics/alarm.png b/www/admin/images/alarm.png
index 0703e7a..0703e7a 100644
--- a/www/admin/pics/alarm.png
+++ b/www/admin/images/alarm.png
diff --git a/www/admin/pics/codefusion.png b/www/admin/images/codefusion.png
index be04ff1..be04ff1 100644
--- a/www/admin/pics/codefusion.png
+++ b/www/admin/images/codefusion.png
diff --git a/www/admin/pics/dialog-information.png b/www/admin/images/dialog-information.png
index c65f616..c65f616 100644
--- a/www/admin/pics/dialog-information.png
+++ b/www/admin/images/dialog-information.png
diff --git a/www/admin/pics/erfrakon.png b/www/admin/images/erfrakon.png
index 3b2d5d6..3b2d5d6 100644
--- a/www/admin/pics/erfrakon.png
+++ b/www/admin/images/erfrakon.png
diff --git a/www/admin/pics/f.png b/www/admin/images/f.png
index 7572bac..7572bac 100644
--- a/www/admin/pics/f.png
+++ b/www/admin/images/f.png
diff --git a/www/admin/pics/intevation_logo.png b/www/admin/images/intevation_logo.png
index deb54e4..deb54e4 100644
--- a/www/admin/pics/intevation_logo.png
+++ b/www/admin/images/intevation_logo.png
diff --git a/www/admin/pics/kdab.png b/www/admin/images/kdab.png
index 66af0ed..66af0ed 100644
--- a/www/admin/pics/kdab.png
+++ b/www/admin/images/kdab.png
diff --git a/www/admin/pics/kde.png b/www/admin/images/kde.png
index 3efaaf8..3efaaf8 100644
--- a/www/admin/pics/kde.png
+++ b/www/admin/images/kde.png
diff --git a/www/admin/pics/kolab_logo.png b/www/admin/images/kolab_logo.png
index 27b7d12..27b7d12 100644
--- a/www/admin/pics/kolab_logo.png
+++ b/www/admin/images/kolab_logo.png
diff --git a/www/admin/pics/kolabsystems_logo.png b/www/admin/images/kolabsystems_logo.png
index 90620d3..90620d3 100644
--- a/www/admin/pics/kolabsystems_logo.png
+++ b/www/admin/images/kolabsystems_logo.png
diff --git a/www/admin/pics/office-address-book.png b/www/admin/images/office-address-book.png
index 3b00f62..3b00f62 100644
--- a/www/admin/pics/office-address-book.png
+++ b/www/admin/images/office-address-book.png
diff --git a/www/admin/pics/phone.png b/www/admin/images/phone.png
index 8f81416..8f81416 100644
--- a/www/admin/pics/phone.png
+++ b/www/admin/images/phone.png
diff --git a/www/admin/pics/preferences-system-network-sharing.png b/www/admin/images/preferences-system-network-sharing.png
index b6faf42..b6faf42 100644
--- a/www/admin/pics/preferences-system-network-sharing.png
+++ b/www/admin/images/preferences-system-network-sharing.png
diff --git a/www/admin/pics/preferences-system.png b/www/admin/images/preferences-system.png
index 9ea5cec..9ea5cec 100644
--- a/www/admin/pics/preferences-system.png
+++ b/www/admin/images/preferences-system.png
diff --git a/www/admin/pics/resource-group.png b/www/admin/images/resource-group.png
index 84cfa89..84cfa89 100644
--- a/www/admin/pics/resource-group.png
+++ b/www/admin/images/resource-group.png
diff --git a/www/admin/pics/sync.png b/www/admin/images/sync.png
index 389f036..389f036 100644
--- a/www/admin/pics/sync.png
+++ b/www/admin/images/sync.png
diff --git a/www/admin/pics/system-users.png b/www/admin/images/system-users.png
index e2bd558..e2bd558 100644
--- a/www/admin/pics/system-users.png
+++ b/www/admin/images/system-users.png
diff --git a/www/admin/style.css b/www/admin/style.css
index 5e69dd2..1edcb40 100644
--- a/www/admin/style.css
+++ b/www/admin/style.css
@@ -31,7 +31,7 @@ a:hover { color: #113399; }
 }
 #toplogo {
   display:block;
-  background-image: url(pics/kolab_logo.png);
+  background-image: url(images/kolab_logo.png);
   background-color: #B0BCD0;
   width: 245px;
   height: 70px;