data/templates package.xml www/admin

Bogomil Shopov shopov at kolabsys.com
Tue May 3 21:02:06 CEST 2011 

 data/templates/welcome-admin.tpl             |   11 ++++++++++-
 data/templates/welcome-domain-maintainer.tpl |    8 +++++++-
 data/templates/welcome-maintainer.tpl        |    9 ++++++---
 data/templates/welcome-user.tpl              |    2 +-
 package.xml                                  |    6 ++++++
 www/admin/images/book.png                    |binary
 www/admin/images/book2.png                   |binary
 www/admin/images/list.png                    |binary
 www/admin/index.php                          |    4 ++++
 9 files changed, 34 insertions(+), 6 deletions(-)

New commits:
commit 72727c6009e05cd4a9ff96eab0497a500cc6a1fa
Author: Bogomil Shopov <shopov at kolabsys.com>
Date:   Tue May 3 22:01:09 2011 +0300

    Fixing welcomepage errors (https://bugzilla.kolabsys.com/show_bug.cgi?id=93). Adding images and fixing some wrong URL's.

diff --git a/data/templates/welcome-admin.tpl b/data/templates/welcome-admin.tpl
index 88ab3c6..99af818 100755
--- a/data/templates/welcome-admin.tpl
+++ b/data/templates/welcome-admin.tpl
@@ -7,7 +7,7 @@
 <div class="contenttext">
 <h1>{tr msg="Welcome to the Kolab Groupware Server Administration"}</h1>
 
-<table cellspacing="10" cellpadding="10">
+<table cellspacing="10" cellpadding="10" style="background:#d0e2e6">
 <tr>
 <td>
 <a href="/admin/user/" class="welcomelinks"><img src="/admin/images/system-users.png" border="0" alt="Manage Users" /><br /><b>{tr msg="Manage Users"}</b></a>
@@ -19,9 +19,18 @@
 <a href="/admin/sharedfolder/" class="welcomelinks"><img src="/admin/images/preferences-system-network-sharing.png" border="0" alt="Shared Folders" /><br /><b>{tr msg="Shared Folders"}</b></a>
 </td>
 <td>
+<a href="/admin/distributionlist/" class="welcomelinks"><img src="/admin/images/list.png" border="0" alt="Distribution Lists" /><br /><b>{tr msg="Distribution Lists"}</b></a>
+</td>
+<td>
 <a href="/admin/administrator/" class="welcomelinks"><img src="/admin/images/resource-group.png" border="0" alt="Administrator" /><br /><b>{tr msg="Administrator"}</b></a>
 </td>
 <td>
+<a href="/admin/maintainer/" class="welcomelinks"><img src="/admin/images/book.png" border="0" alt="Manage Maintainers" /><br /><b>{tr msg="Maintainers"}</b></a>
+</td>
+<td>
+<a href="/admin/domainmaintainer/" class="welcomelinks"><img src="/admin/images/book2.png" border="0" alt="Domain Maintainers" /><br /><b>{tr msg="Domain Maintainers"}</b></a>
+</td>
+<td>
 <a href="/admin/settings/" class="welcomelinks"><img src="/admin/images/preferences-system.png" border="0" alt="Settings" /><br /><b>{tr msg="Settings"}</b></a>
 </td>
 <td>
diff --git a/data/templates/welcome-domain-maintainer.tpl b/data/templates/welcome-domain-maintainer.tpl
index 3d7e979..282e7ec 100644
--- a/data/templates/welcome-domain-maintainer.tpl
+++ b/data/templates/welcome-domain-maintainer.tpl
@@ -7,7 +7,7 @@
 <div class="contenttext">
 <h1>{tr msg="Welcome to the Kolab Groupware Server Maintenance"}</h1>
 
-<table cellspacing="10" cellpadding="10">
+<table cellspacing="10" cellpadding="10" style="background:#d0e2e6">
 <tr>
 <td>
 <a href="/admin/user/" class="welcomelinks"><img src="/admin/images/system-users.png" border="0" alt="Manage Users" /><br /><b>{tr msg="Manage Users"}</b></a>
@@ -16,6 +16,12 @@
 <a href="/admin/sharedfolder/" class="welcomelinks"><img src="/admin/images/preferences-system-network-sharing.png" border="0" alt="Shared Folders" /><br /><b>{tr msg="Shared Folders"}</b></a>
 </td>
 <td>
+<a href="/admin/distributionlist/" class="welcomelinks"><img src="/admin/images/list.png" border="0" alt="Distribution Lists" /><br /><b>{tr msg="Distribution Lists"}</b></a>
+</td>
+<td>
+<a href="{$dmurl}" class="welcomelinks"><img src="/admin/images/book2.png" border="0" alt="Domain Maintainers" /><br /><b>{tr msg="Domain Maintainers"}</b></a>
+</td>
+<td>
 <a href="/admin/kolab/" class="welcomelinks"><img src="/admin/images/dialog-information.png" border="0" alt="About Kolab" /><br /><b>{tr msg="About"}</b></a>
 </td>
 </tr></table>
diff --git a/data/templates/welcome-maintainer.tpl b/data/templates/welcome-maintainer.tpl
index ba8640e..c920efb 100755
--- a/data/templates/welcome-maintainer.tpl
+++ b/data/templates/welcome-maintainer.tpl
@@ -7,7 +7,7 @@
 <div class="contenttext">
 <h1>{tr msg="Welcome to the Kolab Groupware Server Maintenance"}</h1>
 
-<table cellspacing="10" cellpadding="10">
+<table cellspacing="10" cellpadding="10" style="background:#d0e2e6">
 <tr>
 <td>
 <a href="/admin/user/" class="welcomelinks"><img src="/admin/images/system-users.png" border="0" alt="Manage Users" /><br /><b>{tr msg="Manage Users"}</b></a>
@@ -19,10 +19,13 @@
 <a href="/admin/sharedfolder/" class="welcomelinks"><img src="/admin/images/preferences-system-network-sharing.png" border="0" alt="Shared Folders" /><br /><b>{tr msg="Shared Folders"}</b></a>
 </td>
 <td>
-<a href="/admin/administrator/" class="welcomelinks"><img src="/admin/images/resource-group.png" border="0" alt="Administrator" /><br /><b>{tr msg="Administrator"}</b></a>
+<a href="/admin/distributionlist/" class="welcomelinks"><img src="/admin/images/list.png" border="0" alt="Distribution Lists" /><br /><b>{tr msg="Distribution Lists"}</b></a>
 </td>
 <td>
-<a href="/admin/settings/" class="welcomelinks"><img src="/admin/images/preferences-system.png" border="0" alt="Settings" /><br /><b>{tr msg="Settings"}</b></a>
+<a href="{$murl}" class="welcomelinks"><img src="/admin/images/book.png" border="0" alt="Manage Maintainers" /><br /><b>{tr msg="Maintainers"}</b></a>
+</td>
+<td>
+<a href="/admin/domainmaintainer/" class="welcomelinks"><img src="/admin/images/book2.png" border="0" alt="Domain Maintainers" /><br /><b>{tr msg="Domain Maintainers"}</b></a>
 </td>
 <td>
 <a href="/admin/kolab/" class="welcomelinks"><img src="/admin/images/dialog-information.png" border="0" alt="About Kolab" /><br /><b>{tr msg="About"}</b></a>
diff --git a/data/templates/welcome-user.tpl b/data/templates/welcome-user.tpl
index 48a74b9..7f09576 100644
--- a/data/templates/welcome-user.tpl
+++ b/data/templates/welcome-user.tpl
@@ -7,7 +7,7 @@
 <div class="contenttext">
 <h1>{tr msg="Welcome to the Kolab Groupware Server"}</h1>
 
-<table cellspacing="10" cellpadding="10">
+<table cellspacing="10" cellpadding="10" style="background:#d0e2e6">
 <tr>
 <td>
 <a href="/admin/user/user.php?action=modify" class="welcomelinks"><img src="/admin/images/preferences-system.png" border="0" alt="My settings" /><br /><b>{tr msg="My settings"}</b></a>
diff --git a/package.xml b/package.xml
index 04502e4..030dbf4 100644
--- a/package.xml
+++ b/package.xml
@@ -217,6 +217,9 @@
       <file name="twitter.png" role="www" />
       <file name="ul-icon.png" role="www" />
       <file name="user-icon-1-20x20.gif" role="www" />
+      <file name="book.png" role="www" />
+      <file name="book2.png" role="www" />
+      <file name="list.png" role="www" />
      </dir> <!-- /www/admin/images -->
      <dir name="kolab">
       <file name="codefusion.php" role="www" />
@@ -414,6 +417,9 @@
    <install as="admin/images/twitter.png" name="www/admin/images/twitter.png" />
    <install as="admin/images/ul-icon.png" name="www/admin/images/ul-icon.png" />
    <install as="admin/images/user-icon-1-20x20.gif" name="www/admin/images/user-icon-1-20x20.gif" />
+   <install as="admin/images/book2.png" name="www/admin/images/book2.png" />
+   <install as="admin/images/book.png" name="www/admin/images/book.png" />
+   <install as="admin/images/list.png" name="www/admin/images/list.png" />
    <install as="admin/kolab/codefusion.php" name="www/admin/kolab/codefusion.php" />
    <install as="admin/kolab/erfrakon.php" name="www/admin/kolab/erfrakon.php" />
    <install as="admin/kolab/index.php" name="www/admin/kolab/index.php" />
diff --git a/www/admin/images/book.png b/www/admin/images/book.png
new file mode 100644
index 0000000..8a35c34
Binary files /dev/null and b/www/admin/images/book.png differ
diff --git a/www/admin/images/book2.png b/www/admin/images/book2.png
new file mode 100644
index 0000000..ac460f5
Binary files /dev/null and b/www/admin/images/book2.png differ
diff --git a/www/admin/images/list.png b/www/admin/images/list.png
new file mode 100644
index 0000000..2936528
Binary files /dev/null and b/www/admin/images/list.png differ
diff --git a/www/admin/index.php b/www/admin/index.php
index d4e5d9a..6611264 100644
--- a/www/admin/index.php
+++ b/www/admin/index.php
@@ -70,6 +70,10 @@ $smarty->assign( 'group', $auth->group() );
 $smarty->assign( 'page_title', 'Kolab' );
 $smarty->assign( 'menuitems', $menuitems );
 $smarty->assign( 'submenuitems', array() );
+
+//assign values fo different welcome pages, based on menu.php settings
+$smarty->assign( 'dmurl',$menuitems['domain-maintainer']['url']);
+$smarty->assign( 'murl',$menuitems['maintainer']['url']);
 $smarty->assign( 'maincontent', $maincontent );
 $smarty->display('page.tpl');

More information about the commits mailing list