2 commits - ucs/debian ucs/kolab-ucs-logo.svg ucs/kolab-webclient-join-script.sh

Christoph Wickert wickert at kolabsys.com
Wed Feb 4 15:22:27 CET 2015


 ucs/debian/kolab-webclient.dirs                       |    4 +
 ucs/debian/kolab-webclient.install                    |    1 
 ucs/debian/kolab-webclient.univention-config-registry |   15 ----
 ucs/kolab-ucs-logo.svg                                |   62 ++++++++++++++++++
 ucs/kolab-webclient-join-script.sh                    |    9 +-
 5 files changed, 72 insertions(+), 19 deletions(-)

New commits:
commit 4a402e4bdb95748473fd775c52e92c6ad7735980
Author: Christoph Wickert <wickert at kolabsys.com>
Date:   Wed Feb 4 15:22:05 2015 +0100

    Tweak text on the UCS overview page and add an icon (#4352)

diff --git a/ucs/debian/kolab-webclient.dirs b/ucs/debian/kolab-webclient.dirs
index 6a6ea5d..622cde9 100644
--- a/ucs/debian/kolab-webclient.dirs
+++ b/ucs/debian/kolab-webclient.dirs
@@ -1,2 +1,6 @@
 usr/lib/univention-server
 usr/lib/univention-server/server_password_change.d
+usr/share/roundcubemail
+usr/share/roundcubemail/skins
+usr/share/roundcubemail/skins/enterprise
+usr/share/roundcubemail/skins/enterprise/images
diff --git a/ucs/debian/kolab-webclient.install b/ucs/debian/kolab-webclient.install
index cb23cbf..8547b7e 100644
--- a/ucs/debian/kolab-webclient.install
+++ b/ucs/debian/kolab-webclient.install
@@ -1,2 +1,3 @@
 85kolab-webclient.inst usr/lib/univention-install/
+kolab-ucs-logo.svg usr/share/roundcubemail/skins/enterprise/images/
 kolab-webclient usr/lib/univention-server/server_password_change.d/
diff --git a/ucs/kolab-ucs-logo.svg b/ucs/kolab-ucs-logo.svg
new file mode 100644
index 0000000..6db7410
--- /dev/null
+++ b/ucs/kolab-ucs-logo.svg
@@ -0,0 +1,62 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="65"
+   height="65"
+   id="svg3030"
+   version="1.1"
+   inkscape:version="0.48.5 r10040"
+   sodipodi:docname="Neues Dokument 2">
+  <defs
+     id="defs3032" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="8"
+     inkscape:cx="-5.6037296"
+     inkscape:cy="24"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     inkscape:grid-bbox="true"
+     inkscape:document-units="px"
+     inkscape:window-width="1920"
+     inkscape:window-height="1029"
+     inkscape:window-x="0"
+     inkscape:window-y="29"
+     inkscape:window-maximized="1" />
+  <metadata
+     id="metadata3035">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     id="layer1"
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     transform="translate(0,17)">
+    <path
+       style="fill:#face00"
+       inkscape:connector-curvature="0"
+       d="m 32.305123,-13.909028 c -16.795149,0 -29.9510204,13.1687791 -29.9510204,29.980407 0,13.925049 9.3716364,25.771455 22.8448734,28.958124 l 0.974062,0.220945 c 0.08895,0.01869 0.175704,0.03848 0.262458,0.06045 0.119699,0.02858 0.2383,0.05826 0.360194,0.07914 l 0.322857,0.02638 v -0.0022 l 0.296502,0.05276 c 0.477696,0.08574 0.900485,-0.225342 0.981748,-0.692515 l 0.05711,-0.325372 c 0.08236,-0.477066 -0.21414,-0.90027 -0.690738,-0.983811 L 26.774831,43.2927 26.624384,43.2861 C 13.521218,40.664459 4.3823909,29.492982 4.3823909,16.07028 c 0,-15.6717264 12.2652691,-27.94903 27.9227321,-27.94903 7.52674,0 14.570292,2.889877 19.833738,8.1387015 5.26784,5.2521225 8.170258,12.2882955 8.170258,19.8103285 0,13.461175 -9.229975,24.66343 -22.441852,27.244423 l -0.86205,0.150595 c -0.229514,0.03957 -0.424985,0.163785 -0.554567,0.346258 -0.127385,0.182472 -0.176803,0.410012 -0.136171,0.638653 l 0.05711,0.323173 c 0.07138,0.416608 0.410709,0.706805 0.826909,0.706805 0.05052,0 0.10
 3226,-0.0044 0.155938,-0.01319 l 0.295403,-0.05276 v 0.0011 L 39.548546,44.99653 C 52.988835,41.758168 62.33741,29.924954 62.33741,16.071355 c 0,-8.067251 -3.112165,-15.6145668 -8.764357,-21.2503205 -5.645604,-5.6291595 -13.1987,-8.7300875 -21.267927,-8.7300875"
+       id="path36" />
+  </g>
+</svg>
diff --git a/ucs/kolab-webclient-join-script.sh b/ucs/kolab-webclient-join-script.sh
index 536c684..8f924f8 100755
--- a/ucs/kolab-webclient-join-script.sh
+++ b/ucs/kolab-webclient-join-script.sh
@@ -138,11 +138,12 @@ fi
 
 # Register the webclient on UCS landing page
 ucr set \
+    ucs/web/overview/entries/service/kolab-webclient/icon?"/webmail/skins/enterprise/images/kolab-ucs-logo.svg" \
     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 Webklient verwalten" \
+    ucs/web/overview/entries/service/kolab-webclient/label?"Kolab Enterprise Webclient" \
+    ucs/web/overview/entries/service/kolab-webclient/label/de?"Kolab Enterprise Webklient" \
+    ucs/web/overview/entries/service/kolab-webclient/description?"Manage mail, contacts, appointments, tasks, and notes" \
+    ucs/web/overview/entries/service/kolab-webclient/description/de?"Nachrichten, Kontakte, Termine, Aufgaben und Notizen verwalten"
 
 # add service to my host object
 ucs_addServiceToLocalhost Kolab-Webclient"" "$@"


commit 01960b69c5cc1b1525ecc92156db8e9cec954b6b
Author: Christoph Wickert <wickert at kolabsys.com>
Date:   Wed Feb 4 15:20:41 2015 +0100

    Remove obslete files from kolab-webclient.univention-config-registry (#4352)

diff --git a/ucs/debian/kolab-webclient.univention-config-registry b/ucs/debian/kolab-webclient.univention-config-registry
index 9b3955f..fd4471d 100644
--- a/ucs/debian/kolab-webclient.univention-config-registry
+++ b/ucs/debian/kolab-webclient.univention-config-registry
@@ -111,18 +111,3 @@ File: etc/roundcubemail/managesieve.inc.php
 User: root
 Group: www-data
 Mode: 0640
-
-Type: multifile
-Multifile: var/www/ucs-overview/de.html
-
-Type: subfile
-Multifile: var/www/ucs-overview/de.html
-Subfile: var/www/ucs-overview/de.html.d/50kolab-webclient-de.html
-
-Type: multifile
-Multifile: var/www/ucs-overview/en.html
-
-Type: subfile
-Multifile: var/www/ucs-overview/en.html
-Subfile: var/www/ucs-overview/en.html.d/50kolab-webclient-en.html
-




More information about the commits mailing list