emanuel: doc/www/src roadmap.html.m4,1.14,1.15

[cvs at kolab.org]

Author: emanuel

Update of /kolabrepository/doc/www/src
In directory doto:/tmp/cvs-serv7457

Modified Files:
	roadmap.html.m4 
Log Message:
Reorganize roadmap page.


Index: roadmap.html.m4
===================================================================
RCS file: /kolabrepository/doc/www/src/roadmap.html.m4,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- roadmap.html.m4	22 May 2008 09:43:49 -0000	1.14
+++ roadmap.html.m4	11 Jun 2008 15:16:03 -0000	1.15
@@ -16,46 +16,84 @@
 
 <p>
 
-<h2>KDE Kolab Client Enterprise35 </h2>
+<h2>KDE Kolab Clients</h2>
 
-This series is in beta quality and contains a large number of improvements 
+<div class="logo-left">
+    <a href="http://www.kontact.org">
+     <img alt="Kontact" src="images/logo-kontact.png">
+    </a> 
+</div>
+<div class="logo-text-right">
+
+<!--KDE Kontact for Linux-->
+<h3>Kontact for GNU/Linux</h3>
+<h4>Enterprise35</h4>
+This series is in <b>beta quality</b> and contains a large number of improvements 
 over Proko2. Currently intermediate releases happen very few weeks for 
 testing. Packagers are already picking this up.
 <p>
 Stabilization to enterprise production quality is planned for Q2 2008.
 
-<h2>KDE Kolab Client Enterprise4 </h2>
-
-This is the next generation in development. The client will be based
+<h4>Enterprise4</h4>
+This is the next generation in <b>development</b>. The client will be based
 on KDE4 technology, but without Akonadi. We expect it to be in beta Q3 2008
 and production ready end of 2008.
 
-<h2>KDE Kolab Client Proko2 stable series</h2>
-
-This series is very stable and in in maintenance mode.
+<h4>Proko2</h4>
+This series is very <b>stable</b> and in in maintenance mode.
 Only very important updates will happen occasionally - governed
 by the urgency of the changes for enterprise users.
+</div>
 
-<h2>Kolab Server 2.2 series</h2>
 
+<!--Kontact for Windows-->
+<div class="logo-left">
+    <a href="http://www.kontact.org">
+    <img alt="Kontact" src="images/logo-kontact-oxygen.png">
+    </a>
+</div>
+<div class="logo-text-right">
+<h3>Kontact for Windows (enterprise4 | alpha)</h3>
+This version is in development. We expect it to be in beta Q3 2008
+and production ready end of 2008. 
+</div>
+
+<!--Kontact for MacOSX-->
+<div class="logo-left">
+    <a href="http://www.kontact.org">
+    <img alt="Kontact" src="images/logo-kontact-oxygen.png">
+    </a>
+</div>
+<div class="logo-text-right">
+<h3>Kontact for Mac OS X (enterprise4 | alpha)</h3>
+This version is in development. We expect it to be in beta Q3 2008
+and production ready end of 2008. 
+</div>
+
+
+<!--Kolab Server-->
+<h2 style="clear: left; padding-top: 55px;">Kolab Server 2.2</h2>
+<div class="logo-left"></div>
+<div class="logo-text-right">    
+<h3>Kolab Server 2.2 series</h3>
 At time of writing we are issuing release candidates for this series,
-with some people already running it in production. Current is 2.2-rc2.
+with some people already running it in production. Current is 2.2-rc3.
 
 Major improvements over Server 2.1:
-<ul><li>
-Update to a new OpenPKG version.</li>
+<ul>
+<li>Update to a new OpenPKG version.</li>
 <li>Integration of new upstream versions (with many of the kolab patches 
-integrated).</li><li>
-Re-engineerd Horde-based web client as modular add-on package for the Kolab 
-Server/OpenPKG version.</li><li>
-More complete support for 64 bit architectures.</li>
-<li>Implementation of new concept for extended freebusy list which is good for the teamleader overview usecase.
+integrated).</li>
+<li>Re-engineerd Horde-based web client as modular add-on package for the Kolab 
+Server/OpenPKG version.</li>
+<li>More complete support for 64 bit architectures.</li>
+<li>Implementation of new concept for extended freebusy list which is
+good for the teamleader overview usecase.</li>
 </ul>
+Planned is 2.2 final release in June 2008.
 
-Planned is 2.2-rc3 end of May and 2.2 final release in June 2008.
-
-<h2>Kolab Server 2.1 release series</h2>
-
+<h3>Kolab Server 2.1 release series</h3>
 Current is 2.1.0 Final. No further releases planned. 
+</div>
 
 m4_include(footer.html.m4)