summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristoph Wickert <cwickert@fedoraproject.org>2011-04-28 18:22:55 (GMT)
committerChristoph Wickert <cwickert@fedoraproject.org>2011-04-28 18:22:55 (GMT)
commit2bad9ba00b52d5ea7c711442c97e3c30082bfdeb (patch)
tree0cb8af28e06f5027ae8c089233827f8f18ca66fe
parent023da30e5092f407d872ba187f6dc683685b7f75 (diff)
downloadkolab-webadmin-2bad9ba00b52d5ea7c711442c97e3c30082bfdeb.tar.gz
Apply small update from Georg (adds a picture for the ActiveSync config to the user's welcome page)2.3.1
-rwxr-xr-xdata/templates/page.tpl2
-rw-r--r--data/templates/welcome-user.tpl3
-rw-r--r--package.xml2
-rw-r--r--www/admin/pics/phone.pngbin0 -> 3656 bytes
4 files changed, 6 insertions, 1 deletions
diff --git a/data/templates/page.tpl b/data/templates/page.tpl
index e6d178d..d3c3b57 100755
--- a/data/templates/page.tpl
+++ b/data/templates/page.tpl
@@ -106,6 +106,6 @@ function changeLanguage(combobox) {ldelim}
</div><!-- .container -->
</div><!-- #root -->
<div id="footer">
-This is the Community Edition of the <b>Kolab Server</b>. It comes with absolutely <b>no warranties</b> and is typically run entirely self supported. You can find help & information on the community <a href="http://kolab.org">web site</a> & <a href="http://wiki.kolab.org">wiki</a>. Professional support is available from <a href="http://kolabsys.com">Kolab Systems</a>.
+This is the Community Edition of the <b>Kolab Server</b>. <br />It comes with absolutely <b>no warranties</b> and is typically run entirely self supported. You can find help & information on the community <a href="http://kolab.org">web site</a> & <a href="http://wiki.kolab.org">wiki</a>. <br />Professional support is available from <a href="http://kolabsys.com">Kolab Systems</a>.
</body>
</html> \ No newline at end of file
diff --git a/data/templates/welcome-user.tpl b/data/templates/welcome-user.tpl
index 6bd553d..bc8a994 100644
--- a/data/templates/welcome-user.tpl
+++ b/data/templates/welcome-user.tpl
@@ -13,6 +13,9 @@
<a href="/admin/user/user.php?action=modify" class="welcomelinks"><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/user/activesync.php" class="welcomelinks"><img src="/admin/pics/phone.png" border="0" alt="ActiveSync" /><br /><b>{tr msg="ActiveSync"}</b></a>
+</td>
+<td>
<a href="/admin/kolab/" class="welcomelinks"><img src="/admin/pics/dialog-information.png" border="0" alt="About Kolab" /><br /><b>{tr msg="About"}</b></a>
</td>
</tr></table>
diff --git a/package.xml b/package.xml
index c92b4a8..5cce4da 100644
--- a/package.xml
+++ b/package.xml
@@ -221,6 +221,7 @@
<file name="kolab_logo.png" role="www" />
<file name="kolabsystems_logo.png" role="www" />
<file name="office-address-book.png" role="www" />
+ <file name="phone.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" />
@@ -421,6 +422,7 @@
<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/phone.png" name="www/admin/pics/phone.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" />
diff --git a/www/admin/pics/phone.png b/www/admin/pics/phone.png
new file mode 100644
index 0000000..8f81416
--- /dev/null
+++ b/www/admin/pics/phone.png
Binary files differ