2 commits - ucs/conffiles ucs/debian ucs/kolab_ucs_logo.png ucs/kolab-webclient-join-script.sh

Christoph Wickert wickert at kolabsys.com
Thu Jan 29 16:05:48 CET 2015


 dev/null                                                               |binary
 ucs/conffiles/etc/roundcubemail/config.inc.php                         |    1 -
 ucs/conffiles/var/www/ucs-overview/de.html.d/50kolab-webclient-de.html |    5 -----
 ucs/conffiles/var/www/ucs-overview/en.html.d/50kolab-webclient-en.html |    5 -----
 ucs/debian/kolab-webclient.dirs                                        |    8 --------
 ucs/debian/kolab-webclient.install                                     |    3 ---
 ucs/kolab-webclient-join-script.sh                                     |    8 ++++++++
 7 files changed, 8 insertions(+), 22 deletions(-)

New commits:
commit bf223837bab8de26e4b879425b95c23c03331bc6
Author: Christoph Wickert <cwickert at fedoraproject.org>
Date:   Thu Jan 29 16:05:41 2015 +0100

    Use new mechanism to register the webclient on the UCS overview page (#4352)

diff --git a/ucs/conffiles/var/www/ucs-overview/de.html.d/50kolab-webclient-de.html b/ucs/conffiles/var/www/ucs-overview/de.html.d/50kolab-webclient-de.html
deleted file mode 100644
index c4287e8..0000000
--- a/ucs/conffiles/var/www/ucs-overview/de.html.d/50kolab-webclient-de.html
+++ /dev/null
@@ -1,5 +0,0 @@
-<tr>
-<td class="overview"><a href="../roundcubemail"><img src="../roundcubemail/skins/larry/images/favicon.ico" alt="" border="0" /></a></td>
-<td class="overview"><a href="../roundcubemail">Kolab Webclient</a></td>
-<td class="overview">Kolab Webclient</td>
-</tr>
diff --git a/ucs/conffiles/var/www/ucs-overview/en.html.d/50kolab-webclient-en.html b/ucs/conffiles/var/www/ucs-overview/en.html.d/50kolab-webclient-en.html
deleted file mode 100644
index c4287e8..0000000
--- a/ucs/conffiles/var/www/ucs-overview/en.html.d/50kolab-webclient-en.html
+++ /dev/null
@@ -1,5 +0,0 @@
-<tr>
-<td class="overview"><a href="../roundcubemail"><img src="../roundcubemail/skins/larry/images/favicon.ico" alt="" border="0" /></a></td>
-<td class="overview"><a href="../roundcubemail">Kolab Webclient</a></td>
-<td class="overview">Kolab Webclient</td>
-</tr>
diff --git a/ucs/kolab-webclient-join-script.sh b/ucs/kolab-webclient-join-script.sh
index 8bf68e3..6c07823 100755
--- a/ucs/kolab-webclient-join-script.sh
+++ b/ucs/kolab-webclient-join-script.sh
@@ -149,6 +149,14 @@ if [ ${apache_reload} -eq 1 ]; then
     invoke-rc.d apache2 reload
 fi
 
+# Register the webclient on UCS landing page
+ucr set \
+    ucs/web/overview/entries/service/kolab-webclient/link?"/webmail" \
+    ucs/web/overview/entries/service/kolab-webclient/label?"Kolab Webclient" \
+    ucs/web/overview/entries/service/kolab-webclient/label/de?"Kolab Webklient" \
+    ucs/web/overview/entries/service/kolab-webclient/description?"Manage mail, contacts, appointments, tasks and notes with the Kolab Enterprise Webclient" \
+    ucs/web/overview/entries/service/kolab-webclient/description/de?"Nachrichten, Kontakte, Termine, Aufgaben und Notizen mit dem Kolab Enterprise Webclient verwalten" \
+
 # add service to my host object
 ucs_addServiceToLocalhost Kolab-Webclient"" "$@"
 


commit d4621193deb22a063749325b34ca2ce69a29a98c
Author: Christoph Wickert <wickert at kolabsys.com>
Date:   Fri Jan 16 11:10:21 2015 +0100

    Remove kolab_ucs_logo.png, we use upstream's branding now.

diff --git a/ucs/conffiles/etc/roundcubemail/config.inc.php b/ucs/conffiles/etc/roundcubemail/config.inc.php
index 9955818..14e55f5 100644
--- a/ucs/conffiles/etc/roundcubemail/config.inc.php
+++ b/ucs/conffiles/etc/roundcubemail/config.inc.php
@@ -59,7 +59,6 @@ else:
 
     // Kolab specific defaults
     $config['product_name'] = 'Kolab Groupware';
-    $config['skin_logo'] = 'skins/kolab/images/kolab_logo_white.png';
     $config['quota_zero_as_unlimited'] = false;
     $config['login_lc'] = 2;
     $config['auto_create_user'] = true;
diff --git a/ucs/debian/kolab-webclient.dirs b/ucs/debian/kolab-webclient.dirs
index efb7ef2..6a6ea5d 100644
--- a/ucs/debian/kolab-webclient.dirs
+++ b/ucs/debian/kolab-webclient.dirs
@@ -1,10 +1,2 @@
 usr/lib/univention-server
 usr/lib/univention-server/server_password_change.d
-usr/share/roundcubemail
-usr/share/roundcubemail/skins
-usr/share/roundcubemail/skins/classic
-usr/share/roundcubemail/skins/classic/images
-usr/share/roundcubemail/skins/kolab
-usr/share/roundcubemail/skins/kolab/images
-usr/share/roundcubemail/skins/larry
-usr/share/roundcubemail/skins/larry/images
diff --git a/ucs/debian/kolab-webclient.install b/ucs/debian/kolab-webclient.install
index 8c3b2c9..cb23cbf 100644
--- a/ucs/debian/kolab-webclient.install
+++ b/ucs/debian/kolab-webclient.install
@@ -1,5 +1,2 @@
 85kolab-webclient.inst usr/lib/univention-install/
-kolab_ucs_logo.png usr/share/roundcubemail/skins/classic/images/
-kolab_ucs_logo.png usr/share/roundcubemail/skins/kolab/images/
-kolab_ucs_logo.png usr/share/roundcubemail/skins/larry/images/
 kolab-webclient usr/lib/univention-server/server_password_change.d/
diff --git a/ucs/kolab_ucs_logo.png b/ucs/kolab_ucs_logo.png
deleted file mode 100644
index 4146d0e..0000000
Binary files a/ucs/kolab_ucs_logo.png and /dev/null differ




More information about the commits mailing list