emanuel: doc/www/src download.html.m4,1.11,1.12

[cvs at kolab.org]

Author: emanuel

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

Modified Files:
	download.html.m4 
Log Message:
Reorganize download page. Removed old + added new logo.


Index: download.html.m4
===================================================================
RCS file: /kolabrepository/doc/www/src/download.html.m4,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- download.html.m4	25 Aug 2006 09:00:04 -0000	1.11
+++ download.html.m4	11 Jun 2008 15:10:19 -0000	1.12
@@ -7,40 +7,29 @@
 <a href="./mirrors.html"
 >List of Kolab download servers</a>
 
-<p>
-<a href="#kolab2">Kolab-2</a><br>
-  <a href="#kolab2server">Kolab Server 2.0</a><br>
-    <a href="#packages">Packages</a><br>
-  <a href="#kolab2kdeclient" >KDE Client for Kolab Server 2.0</a><br>
-
-<p>
-<a href="#kolab1">Kolab-1</a><br>
-  <a href="#kolab1server">Kolab Server 1.0</a><br>
-  <a href="#kolab1kdeclient" >KDE Client for Kolab Server 1.0</a><br>
 
 
 <a name="kolab2">
-<h2>Kolab-2</h2>
-</a>
-
-<a name="kolab2server">
-<h3>Kolab Server 2.0</h3>
+<h2>Kolab 2</h2>
 </a>
 
-<a href="http://www.openpkg.org/"><img border="0" alt="OpenPKG"
-  src="images/openpkg-logo.png" align="right"></a>
-
+<!--Kolab Server -->
+<div class="logo-left">
+    <a href="http://www.openpkg.org/">
+    	<img border="0" alt="OpenPKG" src="images/logo-openpkg.png" align="right">
+    </a>
+</div>
+<div class="logo-text-right">
+<a name="kolab2server"><h3>Kolab Server 2.x</h3></a>
+<p>
 The main distribution form of Kolab Server are source-RPM packages
 for the <a href="http://www.openpkg.org">OpenPKG</a> system.
 This way, Kolab Server can more easily installed an various
 operating systems without the need of preparing specific
 packages with all the numerous small differences.
 
-
-<a name="packages">
-<h4>Packages</h4>
-</a>
-
+<a name="packages"><h4>Packages</h4></a>
+<p>
 You will find 4 main sections beneath the directory "server"
 on our <a href="./mirrors.html">download servers</a>:
 
@@ -49,10 +38,10 @@
 <li>beta: Almost feature-complete and mostly working versions as
     well as all release candidates.
 <li>development: snapshots of ongoing developments.
+<li>security updates
 </ul>
-
 In each section you will find <b>directories for each release</b>,
-e.g. "server/beta/kolab-server-2.0-beta-3/".
+e.g. "server/beta/kolab-server-2.2-beta-3/".
 
 <p>
 There you will always find a file "<b>release-notes.txt</b>" which
@@ -60,7 +49,7 @@
 release.
 
 <p>
-Next there always will be a directory "<b>sources</b>.
+Next there always will be a directory "<b>sources</b>".
 It contains all source-RPM packages as needed for
 the OpenPKG environment. Also you will always find a
 "<b>1st.README</b>" which contains quick install
@@ -69,37 +58,40 @@
 <p>
 For some operating systems you might find additional
 directories containing <b>pre-compiled packages</b> (e.g.
-(server/beta/kolab-server-2.0-beta-1/ix86-debian3.0").
+"server/beta/kolab-server-2.0-beta-1/ix86-debian3.0").
 Using them usually considerably reduces installation time.
 
 <p>
 These packages are collateral results of the following commercial activities:
-
-<p>
+<br>
 Uptodate, tested and supported packages for specific distributions
 can be order from the
 <a href="http://www.Kolab-Konsortium.com/">Kolab Konsortium</a>.
+</div>
 
-<a name="kolab2kdeclient">
-<h3>KDE Client for Kolab Server 2.0</h3>
-</a>
 
-Check 
-<a href="./about-kolab-clients.html#kdeclient2"
->the status of KDE Kolab client</a> to decide, what you need.
-<p>
-You may either
-<a href="http://www.kde.org/">take one of the official
-KDE developments</a> or <b>take the most up-to-date version
-of the Kolab Project:</b>
+<!--KDE Kontact-->
+<div class="logo-left">
+    <a href="http://www.kontact.org">
+        <img border="0" alt="Kontact" src="images/logo-kontact.png">
+    </a> 
+</div>
+<div class="logo-text-right">
+<a name="kolab2kdeclient"><h3>KDE Client for Kolab Server 2.x</h3></a>
+Check <a href="./about-kolab-clients.html#kdeclient2">the status of KDE Kolab client</a> 
+to decide, what you need.
 
 <p>
-The Kolab Projects maintains the branch "proko2" in the
+You may either take one of the <a href="http://www.kde.org/">official KDE developments</a> 
+or <b>take the most up-to-date version of the Kolab Project:</b>
+
+<ul>
+<li><p>The Kolab Projects maintains the branch "proko2" in the
 KDE SVN which is based on KDE 3.3. <a href="http://kolab.org/cgi-bin/viewcvs-kolab.cgi/doc/kde-client/svn-instructions/">See here for the
 instructions how to check out from SVN</a>.
 
-<p>
-From time to time, releases and packages are made available of this branch.
+<li>
+<p>From time to time, releases and packages are made available of this branch.
 See the "kde-client" section on the 
 <a href="./mirrors.html">download servers</a>.
 The 
@@ -107,32 +99,35 @@
 >ReleaseNote History</a> shows when specific problems were fixed and features
 added.
 
-
-These are collateral results of the following commercial activities:
-
 <p>
+These are collateral results of the following commercial activities:<br>
 Uptodate, tested and supported packages for specific distributions
 can be ordered from the
 <a href="http://www.Kolab-Konsortium.com/">Kolab Konsortium</a>.
+</div>
+
 
 
 <a name="kolab1">
-<h2>Kolab-1</h2>
+<h2>Kolabi 1</h2>
 </a>
 
-<a name="kolab1server">
-<h3>Kolab Server 1.0</h3>
-</a>
 
+<ul>
+<li>
+<b>Kolab Server 1.0</b><br>
+<p>
 Please refer to the corresponding
 <a href="http://kroupware.kolab.org/howto-kolab.html"
-  >Kolab 1 Installation page of the Kroupware Project web-site</a>.
-
-<a name="kolab1kdeclient">
-<h3>KDE Client for Kolab Server 1.0</h3>
-</a>
+  >Kolab1 Installation page of the Kroupware Project web-site</a>.
 
+<li><b>KDE Client for Kolab Server 1.0</b><br>
+<p>
 Please refer to the corresponding
 <a href="http://kroupware.kolab.org/howto-kolab-kde-client.html"
   >KDE Kolab1 Client page of the Kroupware Project web-site</a>.
+
+</ul>
+
+
 m4_include(footer.html.m4)