[Kolab-devel] server/kolab/kolab/admin/kolab authors.php,1.6,1.7 erfrakon.php,1.8,1.9 head.php,1.7,1.8 index.php,1.15,1.16 intevation.php,1.7,1.8 kdab.php,1.5,1.6 kde.php,1.7,1.8 by martin at doto.intevation.de

Sat Jun 14 15:20:03 CEST 2003

Update of /kolabrepository/server/kolab/kolab/admin/kolab
In directory doto:/tmp/cvs-serv19905

Modified Files:
	authors.php erfrakon.php head.php index.php intevation.php 
	kdab.php kde.php 
Log Message:
Martin K.: Merge of Konsec CCS stuff with our changes


Index: authors.php
===================================================================
RCS file: /kolabrepository/server/kolab/kolab/admin/kolab/authors.php,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7

--- authors.php	11 Jun 2003 10:26:16 -0000	1.6
+++ authors.php	14 Jun 2003 13:20:01 -0000	1.7
@@ -9,9 +9,7 @@
   This("kolab/authors.php");
   Head();
 ?>
-
-<table border=0 width="100%" cellspacing=8 cellpadding=8>
-<tr><td>
+<div class="contentsimple">
 <p>
   The prinicipal authors of the kolab server software are in alphabetical order:
 </p>
@@ -20,9 +18,6 @@
   <a href="mailto:achim.frank at erfrakon.de?subject=Kolab Server 1.0">Achim Frank</a><br>
   <a href="mailto:martin.konold at erfrakon.de?subject=Kolab Server 1.0">Martin Konold</a><br>
 </p>
-</td></tr>
-</table>
-
-</FONT>
+</div>
 
 <?  Foot();  ?>

Index: erfrakon.php
===================================================================
RCS file: /kolabrepository/server/kolab/kolab/admin/kolab/erfrakon.php,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- erfrakon.php	11 Jun 2003 16:19:45 -0000	1.8
+++ erfrakon.php	14 Jun 2003 13:20:01 -0000	1.9
@@ -9,17 +9,17 @@
   This("kolab/erfrakon.php");
   Head();
 ?>
-<table border=0 width="100%" cellspacing=8 cellpadding=8>
-<tr><td>
+<div class="contentsimple">
 <p>
 The Kolab server was designed and developed by <a href="http://www.erfrakon.com">erfrakon</a> contracted by the <a href="http://www.bsi.bund.de">BSI</a> (Bundesamt für Sicherheit in der Informationstechnik), Bonn - Germany. 
 </p>
-<a href="http://www.erfrakon.com/" border=0><IMG
-SRC="../pics/erfrakon.png" ALT="Logo erfrakon Partnergesellschaft"  
-    height=33 align= "middle" longdesc="www.erfrakon.com" border="0"></a> 
-
+<IMG SRC="../pics/erfrakon.png" ALT="erfrakon" align="middle" longdesc="http://www.erfrakon.com" usemap="#maperfrakon">
+<map name="maperfrakon">
+ <area shape="rect" coords="0,0,300,30" href="http://www.erfrakon.com">
+</map> 
+  
 <p>
-<a href="http://www.erfrakon.com">Erfrakon</a> is a consulting company dedicated to opensource software and Linux. The main tasks of erfrakon within the kolab project are design and architecure of the kolab groupware solution and the creation of the kolab server.
+<a href="http://www.erfrakon.com">erfrakon</a> is a consulting company dedicated to opensource software and Linux. The main tasks of erfrakon within the Kolab project are design and architecure of the Kolab groupware solution and the creation of the Kolab server.
 </p>
 <p>
 The following people worked on Kolab for erfrakon:</p>
@@ -28,8 +28,7 @@
 <a href="mailto:achim.frank at erfrakon.de?subject=Kolab Server 1.0">Achim Frank</a><br>
 <a href="mailto:martin.konold at erfrakon.de?subject=Kolab Server 1.0">Martin Konold</a><br>
 </p>
-</td></tr></table>
-</FONT>
+</div>
 
 <?  Foot();  ?>
 

Index: head.php
===================================================================
RCS file: /kolabrepository/server/kolab/kolab/admin/kolab/head.php,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- head.php	11 Jun 2003 10:26:16 -0000	1.7
+++ head.php	14 Jun 2003 13:20:01 -0000	1.8
@@ -9,11 +9,10 @@
   $_pid = 20;
   Function idxExtend() {
 	idxSpace(5);
-//	idxSubLink("kolab/authors.php","Authors","Authors");
         idxSubLink("kolab/erfrakon.php","Erfrakon","Erfrakon","Erfrakon");
         idxSubLink("kolab/intevation.php","Intevation","Intevation");
-        idxSubLink("kolab/kdab.php","Klarälvdalens","Klarälvdalens");
-	idxSubLink("kolab/kde.php","KDE","KDE","KDE");
+	idxSubLink("kolab/kdab.php","Klarälvdalens","Klarälvdalens");
+        idxSubLink("kolab/kde.php","KDE","KDE","KDE");
 	idxSpace(2);
     }
 
@@ -22,6 +21,5 @@
     global $title;
     idxPrefix("../");
     Mainhead("- About Kolab".$title);
-    print("<IMG SRC=\"../pics/kolab_logo.gif\">");
   }
 ?>

Index: index.php
===================================================================
RCS file: /kolabrepository/server/kolab/kolab/admin/kolab/index.php,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- index.php	11 Jun 2003 10:26:16 -0000	1.15
+++ index.php	14 Jun 2003 13:20:01 -0000	1.16
@@ -9,9 +9,7 @@
   This("kolab/");
   Head();
 ?>
-
-<table border=0 width="100%" cellspacing=8 cellpadding=8>
-<tr><td>
+<div class="contentsimple">
 <p>
  This is the Kolab Server <b>Version 1.0</b>. The Kolab Server is Free Software developed 
  within the <a href="http://kroupware.kde.org/">Kroupware Project</a>
@@ -23,13 +21,16 @@
 <ul>
  <li><a href="http://www.apache.org/">Apache</a></li>
  <li><a href="http://asg.web.cmu.edu/cyrus/imapd/">Cyrus</a></li>
- <li><a href="http://www.kde.org/">K Desktop Environment (KDE)</a></li>
  <li><a href="http://www.openldap.org/">OpenLDAP</a></li>
  <li><a href="http://www.perl.org/">Perl</a></li>
  <li><a href="http://www.php.net/">PHP</a></li>
+ <li><a href="http://www.kde.org/">K Desktop Environment (KDE)</a></li>
+ <li><a href="http://www.openldap.org/">OpenLDAP</a></li>
+ <li><a href="http://www.perl.org/">Perl</a></li>
+ <li><a href="http://www.php.org/">PHP</a></li>
  <li><a href="http://www.postfix.org/">Postfix</a></li>
  <li><a href="http://www.proftpd.org/">Proftpd</a></li>
-</u>
+</ul>
 </p>
 
 <p>
@@ -66,14 +67,14 @@
  <li><a href="mailto:michel at klaralvdalens-datakonsult.se?subject=Kolab Client 1.0">Michel Boyer de la Giroday</a></li>
  <li><a href="mailto:steffen at klaralvdalens-datakonsult.se?subject=Kolab Client 1.0">Steffen Hansen</a></li>
  <li><a href="mailto:martin.konold at erfrakon.de?subject=Kolab Server 1.0">Martin Konold</a></li>
- <li><a href="mailto:mutz at kde.org?subject=Kolab Server 1.0">Marc Mutz</a><</li>
+ <li><a href="mailto:mutz at kde.org?subject=Kolab Server 1.0">Marc Mutz</a></li>
  <li><a href="mailto:bernhard at intevation.de?subject=Kolab Server 1.0">Bernhard Reiter</a></li>
  <li><a href="mailto:lutz at klaralvdalens-datakonsult.se?subject=Kolab Client 1.0">Lutz Rogowski</a></li>
  <li><a href="mailto:bo at klaralvdalens-datakonsult.se?subject=Kolab Client 1.0">Bo Thorsen</a></li>
- <li><a href="mailto:khz at klaralvdalens-datakonsult.se?subject=Kolab Client 1.0">Karl-Heinz Zimmer</a><li>
+ <li><a href="mailto:khz at klaralvdalens-datakonsult.se?subject=Kolab Client 1.0">Karl-Heinz Zimmer</a></li>
 </ul>
 </p>
-</td></tr></table>
-</FONT>
+
+</div>
 
 <?  Foot();  ?>

Index: intevation.php
===================================================================
RCS file: /kolabrepository/server/kolab/kolab/admin/kolab/intevation.php,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- intevation.php	11 Jun 2003 16:19:45 -0000	1.7
+++ intevation.php	14 Jun 2003 13:20:01 -0000	1.8
@@ -9,19 +9,20 @@
   This("kolab/intevation.php");
   Head();
 ?>
-
-<table border=0 width="100%" cellspacing=8 cellpadding=8>
-<tr><td>
+<div class="contentsimple">
 <p>
 The Intevation GmbH coordinated the Kroupware-Project. In addition to project
 management Intevation GmbH was heavily involved in quality assurance.
 </p>
 
-<a href="http://intevation.net/" border=0><IMG SRC="../pics/intevation_logo.png" ALT="Logo Intevation GmbH" height="91" align="middle" longdesc="www.intevation.net" border="0"></a>
+<a href="http://intevation.net/" border=0><IMG 
+SRC="../pics/intevation_logo.png" ALT="Logo Intevation GmbH" height="91" 
+align ="middle" longdesc="www.intevation.net" border="0"></a>
 
 <p>
 Intevation GmbH is a IT-company exclusively focusing on Free Software.
-Its business units are strategic consulting, project management and geographic information systems.
+Its business units are strategic consulting, project management and geographic
+information systems.
 </p>
 
 
@@ -39,10 +40,9 @@
 <a href="mailto:Marc.Mutz at intevation.de"
 ><tt><Marc.Mutz at intevation.de></tt></a>
 <br>
-</td></tr>
-</table>
+
 
 </p>
-</FONT>
+</div>
 
 <?  Foot();  ?>

Index: kdab.php
===================================================================
RCS file: /kolabrepository/server/kolab/kolab/admin/kolab/kdab.php,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- kdab.php	11 Jun 2003 16:19:45 -0000	1.5
+++ kdab.php	14 Jun 2003 13:20:01 -0000	1.6
@@ -10,14 +10,22 @@
   Head();
 ?>
 
-<table border=0 width="100%" cellspacing=8 cellpadding=8>
-<tr><td>
+================
+-<IMG SRC="../pics/kdab.png" ALT="KDAB" height="80" align="middle"
+longdesc="http://www.klaralvdalens-datakonsult.se">
++<a href="http://www.klaralvdalens-datakonsult.se/"><IMG SRC="../pics/kdab.png"
+ALT="KDAB" height="80" align="middle"
++longdesc="http://www.klaralvdalens-datakonsult.se" border="0"></a>
+============
+
+<div class="contentsimple">
 <p>
 The Kolab KDE client was designed and developed by <a href="http://www.klaralvdalens-datakonsult.se">Klarälvdalens Datakonsult AB</a> contracted by the <a href="http://www.bsi.bund.de">BSI</a> (Bundesamt für Sicherheit in der Informationstechnik), Bonn - Germany. 
 </p>
-<a href="http://www.klaralvdalens-datakonsult.se/"><IMG SRC="../pics/kdab.png" ALT="KDAB" height="80" align="middle" 
-longdesc="http://www.klaralvdalens-datakonsult.se" border="0"></a>
-  
+<a href="http://www.klaralvdalens-datakonsult.se/"><IMG SRC="../pics/kdab.png"
+        ALT="KDAB" height="80" align="middle"
+        longdesc="http://www.klaralvdalens-datakonsult.se" border="0">
+</a>  
 <p>
 Klarälvdalens Datakonsult AB is a consulting company dedicated to opensource software, Linux, and the Qt library. The main tasks of KDAB within the kolab project are design and implementation of the kolab KDE client.
 </p>
@@ -32,10 +40,7 @@
 <a href="mailto:khz at klaralvdalens-datakonsult.se?subject=Kolab Client 1.0">Karl-Heinz Zimmer</a><br>
 <a href="mailto:lutz at klaralvdalens-datakonsult.se?subject=Kolab Client 1.0">Lutz Rogowski</a><br>
 </p>
-</td></tr>
-</table>
-</FONT>
-
+</div>
 <?  Foot();  ?>
 
 

Index: kde.php
===================================================================
RCS file: /kolabrepository/server/kolab/kolab/admin/kolab/kde.php,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- kde.php	11 Jun 2003 10:26:16 -0000	1.7
+++ kde.php	14 Jun 2003 13:20:01 -0000	1.8
@@ -9,11 +9,9 @@
   This("kolab/kde.php");
   Head();
 ?>
-
-<table border=0 width="100%" cellspacing=8 cellpadding=8>
-<tr><td>
-<p>
-<a href="http://www.kde.org"><b>KDE</b></a> is a powerful Open Source graphical desktop environment for Unix
+<div class="contentsimple">
+<P>
+<a href="http://www.kde.org">KDE</a> is a powerful Open Source graphical desktop environment for Unix
 workstations.  It combines ease of use, contemporary functionality, and
 outstanding graphical design with the technological superiority of the
 Unix operating system.
@@ -31,10 +29,7 @@
 workstations.  KDE has developed a high quality development framework for
 Unix, which allows for the rapid and efficient creation of applications.
 </p>
-</td></tr>
-</table>
-</FONT>
-
+</div>
 <?  Foot();  ?>
 
 



