data/templates lib/KolabAdmin package.xml www/admin
Christoph Wickert
wickert at kolabsys.com
Tue Apr 19 17:51:36 CEST 2011
data/templates/kolab.tpl | 104 ++++----------
data/templates/kolabsystems.tpl | 33 ++++
data/templates/technology.tpl | 132 ++++++++++++++++++
data/templates/versions.tpl | 6
data/templates/welcome-admin.tpl | 31 ++++
data/templates/welcome-maintainer.tpl | 31 ++++
data/templates/welcome-user.tpl | 19 ++
data/templates/welcome.tpl | 3
lib/KolabAdmin/include/menu.php | 14 -
package.xml | 28 +++
www/admin/index.php | 8 +
www/admin/kolab/kolabsystems.php | 44 ++++++
www/admin/kolab/technology.php | 43 +++++
www/admin/pics/dialog-information.png |binary
www/admin/pics/kolabsystems_logo.png |binary
www/admin/pics/office-address-book.png |binary
www/admin/pics/preferences-system-network-sharing.png |binary
www/admin/pics/preferences-system.png |binary
www/admin/pics/resource-group.png |binary
www/admin/pics/system-users.png |binary
20 files changed, 411 insertions(+), 85 deletions(-)
New commits:
commit 54909d849269a588409718a463c302903dd74c66
Author: Christoph Wickert <cwickert at fedoraproject.org>
Date: Tue Apr 19 17:51:17 2011 +0200
Update About section from Georg
diff --git a/data/templates/kolab.tpl b/data/templates/kolab.tpl
old mode 100755
new mode 100644
index d43db6c..9ae895d
--- a/data/templates/kolab.tpl
+++ b/data/templates/kolab.tpl
@@ -5,96 +5,58 @@
End:
*}
<div class="contenttext">
-<h1>{tr msg="Kolab2 Groupware Server"}</h1>
+<h1>{tr msg="Kolab Groupware Solution"}</h1>
<p>
-{tr msg="This is the Kolab2 Server. It is Free Software developed by the <a href=\"http://www.kolab.org/\">Kolab Project</a>, with the intention of bringing groupware functionality to Unix/KDE users as well as Windows desktops."}
+{tr msg="This is the server of the Kolab Groupware Solution, a <a href=\"http://fsfe.org/about/basics/freesoftware\">Free Software</a> Personal Information Management (PIM) solution developed by the <a href=\"http://www.kolab.org/\">Kolab Community</a>. Any installation of the Kolab Groupware Solution would normally include one or more of these servers, in combination with a variety of clients for its users. If you are interested in the technology, you can read more about it <a href=\"/admin/kolab/technology.php\">here</a>."}
</p>
-<div>
-{tr msg="Kolab builds upon many other Free Software projects, namely:"}
-<ul>
- <li><a href="http://www.ijs.si/software/amavisd/">amavisd-new</a> {tr msg="(Mail Scanner)"}</li>
- <li><a href="http://www.apache.org/">Apache</a> {tr msg="(HTTP Server)"}</li>
- <li><a href="http://www.clamav.net/">ClamAV</a> {tr msg="(Virus Scanner)"}</li>
- <li><a href="http://asg.web.cmu.edu/cyrus/imapd/">Cyrus</a> {tr msg="(IMAP Server)"}</li>
- <li><a href="http://www.openldap.org/">OpenLDAP</a> {tr msg="(LDAP Server)"}</li>
- <li><a href="http://www.postfix.org/">Postfix</a> {tr msg="(MTA)"}</li>
- <li><a href="http://spamassassin.apache.org/">SpamAssasin</a> {tr msg="(SPAM Filter)"}</li>
+<h2>{tr msg="Why Kolab?"}</h2>
+
+<p>{tr msg="There is a wide variety of reasons why Kolab should be your choice. Several of them have been put together for different target groups in the"} <a href="http://files.kolabsys.com/Public/Handouts/">{tr msg="Handouts for the Kolab Groupware Solution by Kolab Systems"}</a>. {tr msg="To summarize just some points, Kolab is your solution, if"}</p>
-</ul>
-{tr msg="The following projects are used in binding the above together, in order to create the Kolab Server:"}
<ul>
- <li><a href="http://www.perl.org/">Perl</a></li>
- <li><a href="http://www.php.net/">PHP</a></li>
- <li><a href="http://smarty.php.net/">Smarty Template Engine</a></li>
+ <li>{tr msg="you want a solution that seamlessly integrates into your existing environment;"}</li>
+ <li>{tr msg="you want full control over your data, with all the convenience of the cloud;"}</li>
+ <li>{tr msg="you have elevated security needs for your data;"}</li>
+ <li>{tr msg="you have a very large installation, or want to reduce your hardware footprint;"}</li>
+ <li>{tr msg="you have to operate in diverse environments and installations;"}</li>
+ <li>{tr msg="strategic issues are important to you, e.g. you need sovereignty of the software you deploy;"}</li>
+ <li>{tr msg="your users should be fully productive whether they are on- or offline;"}</li>
+ <li>{tr msg="you want the flexibility to create solutions for your specialised needs;"}</li>
+ <li>{tr msg="you want Free Software/Open Source, but also want the professional support without having to resort to proprietary lock-in."}</li>
</ul>
-{tr msg="The following projects are used as a base for the Kolab Clients:"}
+
+<h2>{tr msg="More Information"}</h2>
<ul>
- <li><a href="http://www.kde.org/">K Desktop Environment (KDE)</a></li>
- <li><a href="http://www.horde.org/">The Horde Project</a></li>
+ <li><a href="http://www.kolab.org">{tr msg="Kolab Community Web Site"}</a></li>
+ <li><a href="http://wiki.kolab.org">{tr msg="Kolab Community Wiki"}</a></li>
+ <li><a href="http://blogs.fsfe.org/greve/?p=431">{tr msg="Article: "} 'The Kolab Story' by Georg Greve</a></li>
+ <li><a href="http://files.kolabsys.com/Public/Handouts/">{tr msg="Handouts for the Kolab Groupware Solution by Kolab Systems"}</a></li>
</ul>
-</div>
-
-<p>
-{tr msg="The Kolab project owes a great deal of thanks to the people of the <a href=\"http://www.openpkg.org/\">OpenPKG</a> project. OpenPKG allows Kolab to run on many diverse platforms in a reliable and predictable manner, by providing a common, easy-to-install, cross-platform base on which to build the server."}
-</p>
-
-<p>
-{tr msg="To use all Kolab2 features you need an interoperable client. The KDE Kolab Client was the first such client to be developed and is still considered the reference platform for others to follow. The KDE groupware component Kontact can act as Kolab2 Client. Many thanks to the <a href=\"http://www.kde.org\">KDE Project</a> for providing such a powerful base on which to build this client solution."}
-</p>
-
-<p>
-{tr msg="Users of Outlook on Microsoft Windows are able to use a proprietary plug-in to inter-operate with the Kolab server. For Kolab2 the preferred plug-in is the <a href=\"http://www.toltec.co.za/\">Toltec Plug-in</a> by Radley Network Technologies CC. Radley has worked closely with the Kolab community to help develop the Kolab2 storage format."}
-</p>
-<p>
-{tr msg="A list of additional Outlook plug-ins that provide interoperability with the Kolab server is <a href=\"http://www.kolab.org/kolab-plugins.html\">maintained on the Kolab website</a>."}
-</p>
+<h2>{tr msg="Warranties & Commercial Support"}</h2>
<p>
-{tr msg="There is also a <a href=\"http://www.kolab.org/webclient.html\">web-based client</a> in development which provides full groupware functionality to mobile users through a web interface. It allows users to access their email, calendars, tasks, etc. from anywhere in the world, by simply connecting through a standard web browser. The web client would not have been possible without the excellent <a href=\"http://www.horde.org/\">Horde project</a> on which to build."}
+{tr msg="This is the <b>Community Edition</b> of the Kolab Groupware Server. It is provided by Kolab Systems as fully <a href=\"http://fsfe.org/about/basics/freesoftware\">Free Software</a> and you can use it to the fullest extent and any purpose. There are no license costs or other obligations other than those set forth in the respective Free Software licenses of the various components. <b>There are no warranties or guarantees of any kind, nor is there any guaranteed support. You are running this software entirely at your own risk.</b>"}
</p>
<p>
-{tr msg="As Kolab is a Free Software project, anyone can help to extend the functionality of the software. An active community has developed around the software with many people throughout the world contributing. The project was originally started in 2002 by a joint-venture of three companies: <a href=\"http://www.erfrakon.com/\">erfrakon</a> (design, architecture and server); <a href=\"http://www.intevation.de\">Intevation</a> (project management) and <a href=\"http://www.klaralvdalens-datakonsult.se/\">Klarälvdalens Datakonsult</a> (client)."}
-</p>
+{tr msg="There is a wide variety of commercial support options and warranties available by <a href=\"/admin/kolab/kolabsystems.php\">Kolab Systems AG</a> and its network of partners, the Kolab Enterprise Community. This support comes with access to the additionally quality assured and hardened <b>Certified Kolab</b> edition, which like the community edition is fully available as Free Software, so has all the advantages of the Community Edition and is free of hidden lock-in."}</p>
-<p>
-{tr msg="<a href=\"http://www.codefusion.co.za/\">Code Fusion cc</a> joined the project soon after the original Kolab1 server was released. Its developers are primarily responsible for an updated engine (which forms the base of the Kolab2 server), the web client, as well as contributing to development of the Kolab2 storage format."}
+<p>{tr msg="Kolab Systems AG will provide limited support for the Community Edition on a case-by-case basis, but with no guaranteed response times, as availability permits, and at rates that may be adjusted due to the work load at the time of the request. <b>It is strongly recommended that for mission-critical professional deployments of the Kolab Groupware Solution you at least choose one of the partially self-supported On Demand support models.</b>"}
</p>
-<div>
- {tr msg="Other contributors:"}<br/>
-<ul>
-<li> <a href="http://www.konsec.com">Konsec GmbH</a> {tr msg="CSSified the Kolab1 web admin GUI"}</li>
-</ul>
-</div>
+<p>{tr msg="<center><table cellspacing=\"2\" cellpadding=\"2\" border=\"1\">
+<tr><td></td><td><b>This edition</b></td><td><em>With SLA by Kolab Systems</em></b></td></tr>
+<tr><td>Support channels</td><td><b>Wiki & public mailing lists only</b></td><td><em>Kolab Systems Ticketing</em></td></tr>
+<tr><td>Guaranteed response times</td><td><b>NO</b></td><td><em>YES</em></td></tr>
+<tr><td>Access to Certified Kolab</td><td><b>NO</b></td><td><em>YES</em></td></tr>
+<tr><td>Warranties</td><td><b>NO</b></td><td><em>YES</em></td></tr>
+<tr><td>Access to custom versions</td><td><b>NO</b></td><td><em>YES</em></td></tr>
+</table></center>"}</p>
-<p>
-{tr msg="The principal authors of the Kolab client and server software are (in alphabetical order):"}
-</p>
+<p>{tr msg="Kolab Systems provides an overview of all available <a href=\"http://kolabsys.com/index.php/solutions/101\">Service Level Agreements (SLA)</a>. To upgrade your installation to Certified Kolab, please contact"} <a href="getkolab at kolabsys.com">getkolab at kolabsys.com</a> {tr msg="or visit our"} <a href="http://kolabsys.com/index.php/component/form/Get%20Kolab?form_id=2">{tr msg="web page"}</a>.</p>
-<div>
-<ul>
- <li>Stuart Bingë</li>
- <li>Stephan Buys</li>
- <li>Matthias Kalle Dalheimer</li>
- <li>Tassilo Erlewein</li>
- <li>David Faure</li>
- <li>Achim Frank</li>
- <li>Michel Boyer de la Giroday</li>
- <li>Steffen Hansen</li>
- <li>Bernhard Herzog</li>
- <li>Martin Konold</li>
- <li>Marc Mutz</li>
- <li>Bernhard Reiter</li>
- <li>Lutz Rogowski</li>
- <li>Bo Thorsen</li>
- <li>Jan-Oliver Wagner</li>
- <li>Karl-Heinz Zimmer</li>
- <li>Romain Pokrzywka</li>
-</ul>
-</div>
<hr>
<small>
diff --git a/data/templates/kolabsystems.tpl b/data/templates/kolabsystems.tpl
new file mode 100644
index 0000000..027ef52
--- /dev/null
+++ b/data/templates/kolabsystems.tpl
@@ -0,0 +1,33 @@
+{* 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;" />
+ </a>
+</div>
+<div class="contentsimple">
+<p>
+{tr msg="Founded in Zürich in 2010, "}<a href="http://kolabsys.com">Kolab Systems AG</a> {tr msg="is the global leader in Kolab Technology. Together with its partners in the Kolab Enterprise Community, Kolab Systems provides quality assurance, integration, support, training, certification of individuals and third-party products, as well as ongoing development for the Kolab Groupware Solution. The strong partnering model and a highly competent enterprise community provides users of the Kolab Groupware Solution with the right level of professional consulting, support and warranties to enable productivity and collaboration."}
+</p>
+
+<h2>{tr msg="Looking for professional support for your Kolab Groupware Solution?"}</h2>
+
+<p>{tr msg="Kolab Systems provides a wide range of "} <a href="http://kolabsys.com/index.php/solutions/101">Service Level Agreements (SLA)</a> {tr msg= "which range from fully self-supported installations to maintained installations with reaction times as low as 1 hour. These are provided exclusively on Kolab Systems' Certified Kolab edition. To upgrade your installation to Certified Kolab, please contact"} <a href="getkolab at kolabsys.com">getkolab at kolabsys.com</a> {tr msg="or visit our"} <a href="http://kolabsys.com/index.php/component/form/Get%20Kolab?form_id=2">{tr msg="web page"}</a>.
+</p>
+
+<h2>{tr msg="Our Development Partners"}</h2>
+
+<p>{tr msg="In continuously improvingall parts of the Kolab Groupware Solution, Kolab Systems is working closely with development partners, such as (in alphabetical order):"}</p>
+
+<ul>
+<li><a href="http://www.pardus.de">P at rdus</a></li>
+<li><a href="/admin/kolab/intevation.php">Intevation</a></li>
+<li><a href="/admin/kolab/kdab.php">KDAB</a></li>
+<li><a href="http://www.libertech.fr/default.htm">Libertech</a></li>
+<li>...and all the community contributors.
+</ul>
+
+<p><b>{tr msg="Thank you for being part of this awesome community!"}</b></p>
+
+<p>{tr msg="If <b>you</b> want to join the community, please go to "} <a href="http://kolab.org">kolab.org</a> {tr msg="and"} <a href="http://wiki.kolab.org">wiki.kolab.org</a>.
+
+</div>
diff --git a/data/templates/technology.tpl b/data/templates/technology.tpl
new file mode 100644
index 0000000..1dbc611
--- /dev/null
+++ b/data/templates/technology.tpl
@@ -0,0 +1,132 @@
+{* Smarty Template *}
+{*
+ Local variables:
+ buffer-file-coding-system: utf-8
+ End:
+*}
+<div class="contenttext">
+<h1>{tr msg="Kolab Groupware Solution - Technologies"}</h1>
+<p>
+{tr msg="This is the server of the Kolab Groupware Solution. It is <a href=\"http://fsfe.org/about/basics/freesoftware\">Free Software</a> developed by the <a href=\"http://www.kolab.org/\">Kolab Community</a>, which works in collaboration with and as part of many other communities and projects to bring you this software."}
+</p>
+
+<div>
+{tr msg="For this server, Free Software communities and projects that the Kolab Community is a part of and builds upon include:"}
+<ul>
+ <li><a href="http://www.ijs.si/software/amavisd/">amavisd-new</a> {tr msg="(Mail Scanner)"}</li>
+ <li><a href="http://www.apache.org/">Apache</a> {tr msg="(HTTP Server)"}</li>
+ <li><a href="http://www.clamav.net/">ClamAV</a> {tr msg="(Virus Scanner)"}</li>
+ <li><a href="http://asg.web.cmu.edu/cyrus/imapd/">Cyrus</a> {tr msg="(IMAP Server & Database)"}</li>
+ <li><a href="http://www.openldap.org/">OpenLDAP</a> {tr msg="(LDAP Server)"}</li>
+ <li><a href="http://www.postfix.org/">Postfix</a> {tr msg="(MTA)"}</li>
+ <li><a href="http://spamassassin.apache.org/">SpamAssassin</a> {tr msg="(SPAM Filter)"}</li>
+ <li><a href="">Z-Push</a> {tr msg="(ActiveSync Support)"}</li>
+ <li><a href="http://www.horde.org/">The Horde Project</a> {tr msg="(Web client)"}</li>
+ <li><a href="http://www.perl.org/">Perl</a> {tr msg="(Server side scripting & glue)"}</li>
+ <li><a href="http://www.php.net/">PHP</a> {tr msg="(Server side scripting & glue)"}</li>
+ <li><a href="http://smarty.php.net/">Smarty Template Engine</a> {tr msg="(This interface)"}</li>
+</ul>
+{tr msg="For the clients, Free Software communities and projects that the Kolab Community is a part of and builds upon include:"}
+<ul>
+ <li><a href="http://www.kde.org/">K Desktop Environment (KDE)</a></li>
+ <li><a href="http://www.mozilla.org/">Mozilla (Thunderbird & Lightning)</a></li>
+ <li><a href="http://www.gnome.org/">GNOME (Evolution)</a></li>
+</ul>
+</div>
+
+<h2>{tr msg="History & Credits"}</h2>
+
+<p>{tr msg="In 2010, <a href=\"http://www.intevation.de\">Intevation</a>, <a href=\"http://www.kdab.com/\">KDAB</a>, <a href=\"http://uk.linkedin.com/in/pauljadams\">Dr. Paul Adams</a> and <a href=\"http://ch.linkedin.com/in/georggreve\">Georg Greve</a> worked together to re-launch the professional support of the Kolab Groupware Solution into the <a href=\"http://kolabsys.com\">Kolab Systems AG</a>, which took the place of the Kolab-Konsortium."}</p>
+
+<p>{tr msg="Kolab Systems together with its partner network, the Kolab Enterprise Community, has since been the primary facilitator of the Kolab Community, including for the provision of infrastructure, and the focal point for further development of the Kolab Groupware Solution, e.g. for inclusion of ActiveSync support in version 2.3 of the server, or for native packaging on the various platforms."}</p>
+
+<p>{tr msg="If you want to join the community, please visit <a href=\"http://wiki.kolab.org\">http://wiki.kolab.org</a> and <a href=\"http://kolab.org\">http://kolab.org</a>."}
+
+<h3>{tr msg="History before 2010"}</h3>
+
+<p>
+{tr msg="The Kolab project owes a great deal of thanks to the people of the <a href=\"http://www.openpkg.org/\">OpenPKG</a> project. OpenPKG allows Kolab to run on many diverse platforms in a reliable and predictable manner, by providing a common, easy-to-install, cross-platform base on which to build the server."}
+</p>
+
+<p>
+{tr msg="To use all Kolab2 features you need an interoperable client. The KDE Kolab Client was the first such client to be developed and is still considered the reference platform for others to follow. The KDE groupware component Kontact can act as Kolab2 Client. Many thanks to the <a href=\"http://www.kde.org\">KDE Project</a> for providing such a powerful base on which to build this client solution."}
+</p>
+
+<p>
+{tr msg="Users of Outlook on Microsoft Windows are able to use a proprietary plug-in to inter-operate with the Kolab server. For Kolab2 the preferred plug-in is the <a href=\"http://www.toltec.co.za/\">Toltec Plug-in</a> by Radley Network Technologies CC. Radley has worked closely with the Kolab community to help develop the Kolab2 storage format."}
+</p>
+
+<p>
+{tr msg="A list of additional Outlook plug-ins that provide interoperability with the Kolab server is <a href=\"http://www.kolab.org/kolab-plugins.html\">maintained on the Kolab website</a>."}
+</p>
+
+<p>
+{tr msg="There is also a <a href=\"http://www.kolab.org/webclient.html\">web-based client</a> in development which provides full groupware functionality to mobile users through a web interface. It allows users to access their email, calendars, tasks, etc. from anywhere in the world, by simply connecting through a standard web browser. The web client would not have been possible without the excellent <a href=\"http://www.horde.org/\">Horde project</a> on which to build."}
+</p>
+
+<p>
+{tr msg="As Kolab is a Free Software project, anyone can help to extend the functionality of the software. An active community has developed around the software with many people throughout the world contributing. The project was originally started in 2002 by a joint-venture of three companies: <a href=\"http://www.erfrakon.com/\">erfrakon</a> (design, architecture and server); <a href=\"http://www.intevation.de\">Intevation</a> (project management) and <a href=\"http://www.klaralvdalens-datakonsult.se/\">Klarälvdalens Datakonsult</a> (client)."}
+</p>
+
+<p>
+{tr msg="<a href=\"http://www.codefusion.co.za/\">Code Fusion cc</a> joined the project soon after the original Kolab1 server was released. Its developers are primarily responsible for an updated engine (which forms the base of the Kolab2 server), the web client, as well as contributing to development of the Kolab2 storage format."}
+</p>
+
+<div>
+ {tr msg="Other contributors:"}<br/>
+<ul>
+<li> <a href="http://www.konsec.com">Konsec GmbH</a> {tr msg="CSSified the Kolab1 web admin GUI"}</li>
+</ul>
+</div>
+
+<h2>{tr msg="Kudos"}</h2>
+
+<p>
+{tr msg="Principal contributors of the Kolab Groupware Solution are (in alphabetical order):"}
+</p>
+
+<div>
+<ul>
+ <li>Alain Abbas</li>
+ <li>Till Adam</li>
+ <li>Dr. Paul Adams</li>
+ <li>Thomas Arendsen-Hein</li>
+ <li>Stuart Bingë</li>
+ <li>Stephan Buys</li>
+ <li>Matthias Kalle Dalheimer</li>
+ <li>Tassilo Erlewein</li>
+ <li>David Faure</li>
+ <li>Achim Frank</li>
+ <li>Michel Boyer de la Giroday</li>
+ <li>Georg Greve</li>
+ <li>Steffen Hansen</li>
+ <li>Bernhard Herzog</li>
+ <li>Martin Konold</li>
+ <li>Marc Mutz</li>
+ <li>Jeroen van Meeuwen</li>
+ <li>Bernhard Reiter</li>
+ <li>Lutz Rogowski</li>
+ <li>Bogomil Shopov</li>
+ <li>Bo Thorsen</li>
+ <li>Jan-Oliver Wagner</li>
+ <li>Gunnar Wrobel</li>
+ <li>Christoph Wickert</li>
+ <li>Sascha Wilde</li>
+ <li>Karl-Heinz Zimmer</li>
+ <li>Romain Pokrzywka</li>
+ <li>{tr msg="...and anyone we forgot. Please let us know at <a href=\"mail:server-team at lists.kolabsys.com\">server-team at lists.kolabsys.com</a> so we can add you to this list."}
+</ul>
+</div>
+
+<hr>
+<small>
+ <p>
+ This product includes PHP, freely available from
+ http://www.php.net/
+ </p><p>
+ This product includes software developed by the OpenSSL Project
+ for use in the OpenSSL Toolkit (http://www.openssl.org/)
+ </p>
+</small>
+
+</div>
diff --git a/data/templates/versions.tpl b/data/templates/versions.tpl
index aa1385f..f1f4ab5 100755
--- a/data/templates/versions.tpl
+++ b/data/templates/versions.tpl
@@ -5,9 +5,9 @@
End:
*}
<div class="contenttext">
-<h1>{tr msg="Kolab2 Groupware Server Version"}</h1>
-<pre>{$kolabversion}</pre>
-<h1>{tr msg="Kolab2 Groupware Server Component Versions"}</h1>
+<h1>{tr msg="Kolab Groupware Server Version"}</h1>
+<pre>{$kolabversion} Community Edition</pre>
+<h1>{tr msg="Kolab Groupware Server Component Versions"}</h1>
<pre>{$kolabversions}</pre>
<h1>{tr msg="PEAR/Horde Versions"}</h1>
<pre>{$pearhordeversions}</pre>
diff --git a/data/templates/welcome-admin.tpl b/data/templates/welcome-admin.tpl
new file mode 100644
index 0000000..fd8e441
--- /dev/null
+++ b/data/templates/welcome-admin.tpl
@@ -0,0 +1,31 @@
+{* Smarty Template *}
+{*
+ Local variables:
+ buffer-file-coding-system: utf-8
+ End:
+*}
+<div class="contenttext">
+<h1>{tr msg="Welcome to the Kolab Groupware Server Administration"}</h1>
+
+<table cellspacing="10" cellpadding="10">
+<tr>
+<td>
+<a href="/admin/user/"><img src="/admin/pics/system-users.png" border="0" alt="Manage Users" /><br /><b>{tr msg="Manage Users"}</b></a>
+</td>
+<td>
+<a href="/admin/addressbook/"><img src="/admin/pics/office-address-book.png" border="0" alt="Addressbook" /><br /><b>{tr msg="Addressbook"}</b></a>
+</td>
+<td>
+<a href="/admin/sharedfolder/"><img src="/admin/pics/preferences-system-network-sharing.png" border="0" alt="Shared Folders" /><br /><b>{tr msg="Shared Folders"}</b></a>
+</td>
+<td>
+<a href="/admin/administrator/"><img src="/admin/pics/resource-group.png" border="0" alt="Administrator" /><br /><b>{tr msg="Administrator"}</b></a>
+</td>
+<td>
+<a href="/admin/settings/"><img src="/admin/pics/preferences-system.png" border="0" alt="Settings" /><br /><b>{tr msg="Settings"}</b></a>
+</td>
+<td>
+<a href="/admin/kolab/"><img src="/admin/pics/dialog-information.png" border="0" alt="About Kolab" /><br /><b>{tr msg="About"}</b></a>
+</td>
+
+</div>
\ No newline at end of file
diff --git a/data/templates/welcome-maintainer.tpl b/data/templates/welcome-maintainer.tpl
new file mode 100644
index 0000000..ef5f190
--- /dev/null
+++ b/data/templates/welcome-maintainer.tpl
@@ -0,0 +1,31 @@
+{* Smarty Template *}
+{*
+ Local variables:
+ buffer-file-coding-system: utf-8
+ End:
+*}
+<div class="contenttext">
+<h1>{tr msg="Welcome to the Kolab Groupware Server Maintenance"}</h1>
+
+<table cellspacing="10" cellpadding="10">
+<tr>
+<td>
+<a href="/admin/user/"><img src="/admin/pics/system-users.png" border="0" alt="Manage Users" /><br /><b>{tr msg="Manage Users"}</b></a>
+</td>
+<td>
+<a href="/admin/addressbook/"><img src="/admin/pics/office-address-book.png" border="0" alt="Addressbook" /><br /><b>{tr msg="Addressbook"}</b></a>
+</td>
+<td>
+<a href="/admin/sharedfolder/"><img src="/admin/pics/preferences-system-network-sharing.png" border="0" alt="Shared Folders" /><br /><b>{tr msg="Shared Folders"}</b></a>
+</td>
+<td>
+<a href="/admin/administrator/"><img src="/admin/pics/resource-group.png" border="0" alt="Administrator" /><br /><b>{tr msg="Administrator"}</b></a>
+</td>
+<td>
+<a href="/admin/settings/"><img src="/admin/pics/preferences-system.png" border="0" alt="Settings" /><br /><b>{tr msg="Settings"}</b></a>
+</td>
+<td>
+<a href="/admin/kolab/"><img src="/admin/pics/dialog-information.png" border="0" alt="About Kolab" /><br /><b>{tr msg="About"}</b></a>
+</td>
+
+</div>
\ No newline at end of file
diff --git a/data/templates/welcome-user.tpl b/data/templates/welcome-user.tpl
new file mode 100644
index 0000000..968f378
--- /dev/null
+++ b/data/templates/welcome-user.tpl
@@ -0,0 +1,19 @@
+{* Smarty Template *}
+{*
+ Local variables:
+ buffer-file-coding-system: utf-8
+ End:
+*}
+<div class="contenttext">
+<h1>{tr msg="Welcome to the Kolab Groupware Server"}</h1>
+
+<table cellspacing="10" cellpadding="10">
+<tr>
+<td>
+<a href="/admin/user/user.php?action=modify"><img src="/admin/pics/preferences-system.png" border="0" alt="My settings" /><br /><b>{tr msg="My settings"}</b></a>
+</td>
+<td>
+<a href="/admin/kolab/"><img src="/admin/pics/dialog-information.png" border="0" alt="About Kolab" /><br /><b>{tr msg="About"}</b></a>
+</td>
+
+</div>
\ No newline at end of file
diff --git a/data/templates/welcome.tpl b/data/templates/welcome.tpl
index 4b8fb5a..5d74724 100755
--- a/data/templates/welcome.tpl
+++ b/data/templates/welcome.tpl
@@ -5,5 +5,6 @@
End:
*}
<div class="contenttext">
-<h1>{tr msg="Welcome to the Kolab administration interface"}</h1>
+<h1>{tr msg="Welcome to the Kolab Groupware Server Administration"}</h1>
+
</div>
diff --git a/lib/KolabAdmin/include/menu.php b/lib/KolabAdmin/include/menu.php
index aa0ef6c..ccabb2f 100755
--- a/lib/KolabAdmin/include/menu.php
+++ b/lib/KolabAdmin/include/menu.php
@@ -115,16 +115,10 @@ $menuitems['about'] = array( 'name' => _('About Kolab'),
'url' => $topdir.'/kolab/',
'title' => _('About Kolab'),
'submenu' => array(
- array( 'name' => _('Erfrakon'),
- 'url' => 'erfrakon.php' ),
- array( 'name' => _('Intevation'),
- 'url' => 'intevation.php' ),
- array( 'name' => _('Klarälvdalens Datakonsult'),
- 'url' => 'kdab.php' ),
- array( 'name' => _('Code Fusion'),
- 'url' => 'codefusion.php' ),
- array( 'name' => _('KDE'),
- 'url' => 'kde.php' )
+ array( 'name' => _('Kolab Systems'),
+ 'url' => 'kolabsystems.php' ),
+ array( 'name' => _('Technology'),
+ 'url' => 'technology.php' ),
));
if( $auth->group() == 'admin' || $auth->group() == 'maintainer' || $auth->group() == 'domain-maintainer') {
$menuitems['about']['submenu'][] = array( 'name' => _('Versions'),
diff --git a/package.xml b/package.xml
index ed951f4..9194b44 100644
--- a/package.xml
+++ b/package.xml
@@ -75,6 +75,7 @@
<file name="kdab.tpl" role="data" />
<file name="kde.tpl" role="data" />
<file name="kolab.tpl" role="data" />
+ <file name="kolabsystems.tpl" role="data" />
<file name="login.tpl" role="data" />
<file name="maintainerdeleted.tpl" role="data" />
<file name="maintainerlistall.tpl" role="data" />
@@ -83,12 +84,16 @@
<file name="sfdeleted.tpl" role="data" />
<file name="sflistall.tpl" role="data" />
<file name="systemaliasnagscreen.tpl" role="data" />
+ <file name="technology.tpl" role="data" />
<file name="userdeleted.tpl" role="data" />
<file name="userlistall.tpl" role="data" />
<file name="userlisterror.tpl" role="data" />
<file name="vacation.tpl" role="data" />
<file name="versions.tpl" role="data" />
<file name="welcome.tpl" role="data" />
+ <file name="welcome-admin.tpl" role="data" />
+ <file name="welcome-maintainer.tpl" role="data" />
+ <file name="welcome-user.tpl" role="data" />
</dir> <!-- /data/templates -->
</dir> <!-- /data -->
<dir name="lib">
@@ -161,6 +166,8 @@
<file name="intevation.php" role="www" />
<file name="kdab.php" role="www" />
<file name="kde.php" role="www" />
+ <file name="kolabsystems.php" role="www" />
+ <file name="technology.php" role="www" />
<file name="versions.php" role="www" />
</dir> <!-- /www/admin/kolab -->
<dir name="maintainer">
@@ -169,11 +176,18 @@
</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="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" />
</dir> <!-- /www/admin/pics -->
<dir name="settings">
<file name="index.php" role="www" />
@@ -244,6 +258,7 @@
<install as="templates/kdab.tpl" name="data/templates/kdab.tpl" />
<install as="templates/kde.tpl" name="data/templates/kde.tpl" />
<install as="templates/kolab.tpl" name="data/templates/kolab.tpl" />
+ <install as="templates/kolabsystems.tpl" name="data/templates/kolabsystems.tpl" />
<install as="templates/login.tpl" name="data/templates/login.tpl" />
<install as="templates/maintainerdeleted.tpl" name="data/templates/maintainerdeleted.tpl" />
<install as="templates/maintainerlistall.tpl" name="data/templates/maintainerlistall.tpl" />
@@ -252,12 +267,16 @@
<install as="templates/sfdeleted.tpl" name="data/templates/sfdeleted.tpl" />
<install as="templates/sflistall.tpl" name="data/templates/sflistall.tpl" />
<install as="templates/systemaliasnagscreen.tpl" name="data/templates/systemaliasnagscreen.tpl" />
+ <install as="templates/technology.tpl" name="data/templates/technology.tpl" />
<install as="templates/userdeleted.tpl" name="data/templates/userdeleted.tpl" />
<install as="templates/userlistall.tpl" name="data/templates/userlistall.tpl" />
<install as="templates/userlisterror.tpl" name="data/templates/userlisterror.tpl" />
<install as="templates/vacation.tpl" name="data/templates/vacation.tpl" />
<install as="templates/versions.tpl" name="data/templates/versions.tpl" />
<install as="templates/welcome.tpl" name="data/templates/welcome.tpl" />
+ <install as="templates/welcome-admin.tpl" name="data/templates/welcome-admin.tpl" />
+ <install as="templates/welcome-maintainer.tpl" name="data/templates/welcome-maintainer.tpl" />
+ <install as="templates/welcome-user.tpl" name="data/templates/welcome-user.tpl" />
<install as="KolabAdmin/Ldap.php" name="lib/KolabAdmin/Ldap.php" />
<install as="KolabAdmin/Sieve.php" name="lib/KolabAdmin/Sieve.php" />
<install as="KolabAdmin/include/auth.class.php" name="lib/KolabAdmin/include/auth.class.php" />
@@ -303,15 +322,24 @@
<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/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/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" />
diff --git a/www/admin/index.php b/www/admin/index.php
index b1235d4..265a221 100644
--- a/www/admin/index.php
+++ b/www/admin/index.php
@@ -37,6 +37,7 @@ function exists_group( $group ) {
/**** Check for system aliases ****/
$maincontent = 'welcome.tpl';
if( $auth->group() == 'admin' ) {
+ $maincontent = 'welcome-admin.tpl';
$domains = $ldap->domains();
foreach( $domains as $domain ) {
if( (!exists_group( 'hostmaster@'.$domain ) ||
@@ -50,6 +51,13 @@ if( $auth->group() == 'admin' ) {
}
}
}
+if ($auth->group() == 'user') {
+ $maincontent = 'welcome-user.tpl';
+}
+if ($auth->group() == 'maintainer') {
+ $maincontent = 'welcome-maintainer.tpl';
+}
+
/**** Insert into template and output ***/
$smarty = new MySmarty();
diff --git a/www/admin/kolab/kolabsystems.php b/www/admin/kolab/kolabsystems.php
new file mode 100644
index 0000000..8451066
--- /dev/null
+++ b/www/admin/kolab/kolabsystems.php
@@ -0,0 +1,44 @@
+<?php
+/*
+ (c) 2011 Kolab Systems AG
+ (c) 2004 Klarlvdalens Datakonsult AB
+ (c) 2003 Tassilo Erlewein <tassilo.erlewein at erfrakon.de>
+ (c) 2003 Martin Konold <martin.konold at erfrakon.de>
+ This program is Free Software under the GNU General Public License (>=v2).
+ Read the file COPYING that comes with this packages for details.
+*/
+
+require_once('admin/include/mysmarty.php');
+require_once('admin/include/headers.php');
+require_once('admin/include/locale.php');
+require_once('admin/include/authenticate.php');
+
+/**** Authentication etc. ***/
+$sidx = 'about';
+
+require_once('admin/include/menu.php');
+
+
+/**** Submenu for current page ***/
+$menuitems[$sidx]['selected'] = 'selected';
+
+/**** Insert into template and output ***/
+$smarty =& new MySmarty();
+$smarty->assign( 'topdir', $topdir );
+$smarty->assign( 'uid', $auth->uid() );
+$smarty->assign( 'group', $auth->group() );
+$smarty->assign( 'page_title', $menuitems[$sidx]['title'] );
+$smarty->assign( 'menuitems', $menuitems );
+$smarty->assign( 'submenuitems', $menuitems[$sidx]['submenu'] );
+$smarty->assign( 'maincontent', 'kolabsystems.tpl' );
+$smarty->display('page.tpl');
+
+/*
+ Local variables:
+ mode: php
+ indent-tabs-mode: t
+ tab-width: 4
+ buffer-file-coding-system: utf-8
+ End:
+*/
+ ?>
diff --git a/www/admin/kolab/technology.php b/www/admin/kolab/technology.php
new file mode 100644
index 0000000..f5d8a3b
--- /dev/null
+++ b/www/admin/kolab/technology.php
@@ -0,0 +1,43 @@
+<?php
+/*
+ (c) 2004 Klarälvdalens Datakonsult AB
+ (c) 2003 Tassilo Erlewein <tassilo.erlewein at erfrakon.de>
+ (c) 2003 Martin Konold <martin.konold at erfrakon.de>
+ This program is Free Software under the GNU General Public License (>=v2).
+ Read the file COPYING that comes with this packages for details.
+*/
+
+require_once('admin/include/mysmarty.php');
+require_once('admin/include/headers.php');
+require_once('admin/include/locale.php');
+require_once('admin/include/authenticate.php');
+
+/**** Authentication etc. ***/
+$sidx = 'about';
+
+require_once('admin/include/menu.php');
+
+
+/**** Submenu for current page ***/
+$menuitems[$sidx]['selected'] = 'selected';
+
+/**** Insert into template and output ***/
+$smarty = new MySmarty();
+$smarty->assign( 'topdir', $topdir );
+$smarty->assign( 'uid', $auth->uid() );
+$smarty->assign( 'group', $auth->group() );
+$smarty->assign( 'page_title', $menuitems[$sidx]['title'] );
+$smarty->assign( 'menuitems', $menuitems );
+$smarty->assign( 'submenuitems', $menuitems[$sidx]['submenu'] );
+$smarty->assign( 'maincontent', 'technology.tpl' );
+$smarty->display('page.tpl');
+
+/*
+ Local variables:
+ mode: php
+ indent-tabs-mode: t
+ tab-width: 4
+ coding: utf-8
+ End:
+*/
+ ?>
diff --git a/www/admin/pics/dialog-information.png b/www/admin/pics/dialog-information.png
new file mode 100644
index 0000000..c65f616
Binary files /dev/null and b/www/admin/pics/dialog-information.png differ
diff --git a/www/admin/pics/kolabsystems_logo.png b/www/admin/pics/kolabsystems_logo.png
new file mode 100644
index 0000000..90620d3
Binary files /dev/null and b/www/admin/pics/kolabsystems_logo.png differ
diff --git a/www/admin/pics/office-address-book.png b/www/admin/pics/office-address-book.png
new file mode 100644
index 0000000..3b00f62
Binary files /dev/null and b/www/admin/pics/office-address-book.png differ
diff --git a/www/admin/pics/preferences-system-network-sharing.png b/www/admin/pics/preferences-system-network-sharing.png
new file mode 100644
index 0000000..b6faf42
Binary files /dev/null and b/www/admin/pics/preferences-system-network-sharing.png differ
diff --git a/www/admin/pics/preferences-system.png b/www/admin/pics/preferences-system.png
new file mode 100644
index 0000000..9ea5cec
Binary files /dev/null and b/www/admin/pics/preferences-system.png differ
diff --git a/www/admin/pics/resource-group.png b/www/admin/pics/resource-group.png
new file mode 100644
index 0000000..84cfa89
Binary files /dev/null and b/www/admin/pics/resource-group.png differ
diff --git a/www/admin/pics/system-users.png b/www/admin/pics/system-users.png
new file mode 100644
index 0000000..e2bd558
Binary files /dev/null and b/www/admin/pics/system-users.png differ
More information about the commits
mailing list