diff options
author | Christoph Wickert <wickert@kolabsys.com> | 2011-06-01 10:33:25 (GMT) |
---|---|---|
committer | Christoph Wickert <wickert@kolabsys.com> | 2011-06-01 10:33:25 (GMT) |
commit | 1a581744905422b7abe87338e9a1e6a329709647 (patch) | |
tree | d3e73f66b737a63be2a91067b6eab3f1e1f316fa /data | |
parent | f1079963b6b1bd71eda4e21f88c41419c1f619ca (diff) | |
parent | c4ee8ec13b1186debd14591711b599921e016b8c (diff) | |
download | kolab-webadmin-1a581744905422b7abe87338e9a1e6a329709647.tar.gz |
Merge with master for release
Diffstat (limited to 'data')
-rw-r--r-- | data/templates/activesync.tpl | 8 | ||||
-rwxr-xr-x | data/templates/codefusion.tpl | 2 | ||||
-rwxr-xr-x | data/templates/erfrakon.tpl | 2 | ||||
-rwxr-xr-x | data/templates/intevation.tpl | 2 | ||||
-rwxr-xr-x | data/templates/kdab.tpl | 2 | ||||
-rwxr-xr-x | data/templates/kde.tpl | 2 | ||||
-rw-r--r-- | data/templates/kolabsystems.tpl | 2 | ||||
-rwxr-xr-x | data/templates/page.tpl | 2 | ||||
-rw-r--r-- | data/templates/technology.tpl | 2 | ||||
-rwxr-xr-x | data/templates/welcome-admin.tpl | 25 | ||||
-rw-r--r-- | data/templates/welcome-domain-maintainer.tpl | 18 | ||||
-rwxr-xr-x | data/templates/welcome-maintainer.tpl | 19 | ||||
-rw-r--r-- | data/templates/welcome-user.tpl | 11 |
13 files changed, 63 insertions, 34 deletions
diff --git a/data/templates/activesync.tpl b/data/templates/activesync.tpl index f5d5141..862e700 100644 --- a/data/templates/activesync.tpl +++ b/data/templates/activesync.tpl @@ -29,13 +29,13 @@ <table width="100%" cellpadding="8" cellspacing="8"><tr valign="top"><td style="border-top-style:dotted;border-right-style:dotted;border-bottom-style:dotted;border-left-style:dotted;border-width:1px;"> {foreach from=$folders key=myId item=fol} <table border="0" width="100%"> - <tr bgcolor="#c8d2df"><td colspan="5"> <img src="/admin/pics/{$myId}.png" style="vertical-align:middle;"> <span style="font-weight:bolder;">{tr msg=$pnames[$myId]} </span></td></tr> + <tr bgcolor="#c8d2df"><td colspan="5"> <img src="/admin/images/{$myId}.png" style="vertical-align:middle;"> <span style="font-weight:bolder;">{tr msg=$pnames[$myId]} </span></td></tr> <tr> <td width="20"> </td> - <td width="5"><img src="/admin/pics/sync.png" align="center" style="margin-left:5px;"></td> + <td width="5"><img src="/admin/images/sync.png" align="center" style="margin-left:5px;"></td> {if $myId eq 'EVENT' or $myId eq 'TASKS'} - <td width="5"><img src="/admin/pics/alarm.png" align="center" style="margin-left:5px;"></td> + <td width="5"><img src="/admin/images/alarm.png" align="center" style="margin-left:5px;"></td> {else} <td width="25"></td> {/if} @@ -47,7 +47,7 @@ <td width="20"> </td> {kolabsync serial=$devices[device].name folder=$fols.realname} - <td width="25"><img src="/admin/pics/f.png" style="vertical-align:middle;padding:4px;"></td> + <td width="25"><img src="/admin/images/f.png" style="vertical-align:middle;padding:4px;"></td> <td>{$fols.name}</td> </tr> diff --git a/data/templates/codefusion.tpl b/data/templates/codefusion.tpl index 1513511..a747825 100755 --- a/data/templates/codefusion.tpl +++ b/data/templates/codefusion.tpl @@ -7,7 +7,7 @@ <div class="contentsimple"> <a href="http://www.codefusion.co.za/"> - <img src="../pics/codefusion.png" alt="Code Fusion" style="border:0" /> + <img src="../images/codefusion.png" alt="Code Fusion" style="border:0" /> </a> <p> diff --git a/data/templates/erfrakon.tpl b/data/templates/erfrakon.tpl index 3f3a432..054bb98 100755 --- a/data/templates/erfrakon.tpl +++ b/data/templates/erfrakon.tpl @@ -11,7 +11,7 @@ </p> <div class="align_center"> <a href="http://www.erfrakon.de"> - <img src="../pics/erfrakon.png" alt="erfrakon" longdesc="http://www.erfrakon.de" usemap="#maperfrakon" style="border:0px;" /> + <img src="../images/erfrakon.png" alt="erfrakon" longdesc="http://www.erfrakon.de" usemap="#maperfrakon" style="border:0px;" /> </a> </div> <p> diff --git a/data/templates/intevation.tpl b/data/templates/intevation.tpl index 7e0cefc..53797e3 100755 --- a/data/templates/intevation.tpl +++ b/data/templates/intevation.tpl @@ -6,7 +6,7 @@ <div class="align_center"> <a href="http://intevation.net/"> - <img src="../pics/intevation_logo.png" alt="Logo Intevation GmbH" height="91" longdesc="www.intevation.net" style="border:0px;" /> + <img src="../images/intevation_logo.png" alt="Logo Intevation GmbH" height="91" longdesc="www.intevation.net" style="border:0px;" /> </a> </div> diff --git a/data/templates/kdab.tpl b/data/templates/kdab.tpl index 2fd745c..5bfdba0 100755 --- a/data/templates/kdab.tpl +++ b/data/templates/kdab.tpl @@ -1,7 +1,7 @@ {* Smarty Template *} <div class="align_center"> <a href="http://www.klaralvdalens-datakonsult.se/"> - <img src="../pics/kdab.png" alt="KDAB" longdesc="http://www.klaralvdalens-datakonsult.se" style="border:0px;" /> + <img src="../images/kdab.png" alt="KDAB" longdesc="http://www.klaralvdalens-datakonsult.se" style="border:0px;" /> </a> </div> <div class="contentsimple"> diff --git a/data/templates/kde.tpl b/data/templates/kde.tpl index 94deaff..262d33d 100755 --- a/data/templates/kde.tpl +++ b/data/templates/kde.tpl @@ -4,7 +4,7 @@ {tr msg="<a href=\"http://www.kde.org\">KDE</a> is a powerful <a href=\"http://www.gnu.org/philosophy/free-sw.html\">Free Software</a> graphical desktop environment for Linux and Unix workstations. It combines ease of use, contemporary functionality, and outstanding graphical design with the technological superiority of the Unix operating system."} </p> <div class="align_center"> -<img src="../pics/kde.png" alt="KDE" longdesc="http://www.kde.org" /> +<img src="../images/kde.png" alt="KDE" longdesc="http://www.kde.org" /> </div> <p> {tr msg="<b>KDE</b> is an Internet project that is truly open in every sense. Development takes place on the Internet and is discussed on our <a href=\"http://www.kde.org/mailinglists.html\">mailing lists</a>, USENET news groups, and IRC channels to which we invite and welcome everyone."} diff --git a/data/templates/kolabsystems.tpl b/data/templates/kolabsystems.tpl index 027ef52..d142d43 100644 --- a/data/templates/kolabsystems.tpl +++ b/data/templates/kolabsystems.tpl @@ -1,7 +1,7 @@ {* 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;" /> + <img src="/admin/images/kolabsystems_logo.png" alt="Kolab Systems AG" longdesc="http://kolabsys.com" style="border:0px;" /> </a> </div> <div class="contentsimple"> 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/technology.tpl b/data/templates/technology.tpl index 1dbc611..4c2b600 100644 --- a/data/templates/technology.tpl +++ b/data/templates/technology.tpl @@ -90,7 +90,6 @@ <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> @@ -111,7 +110,6 @@ <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@lists.kolabsys.com\">server-team@lists.kolabsys.com</a> so we can add you to this list."} diff --git a/data/templates/welcome-admin.tpl b/data/templates/welcome-admin.tpl index 7a88759..bcb7856 100755 --- a/data/templates/welcome-admin.tpl +++ b/data/templates/welcome-admin.tpl @@ -7,25 +7,34 @@ <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/pics/system-users.png" border="0" alt="Manage Users" /><br /><b>{tr msg="Manage Users"}</b></a> +<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> </td> <td> -<a href="/admin/addressbook/" class="welcomelinks"><img src="/admin/pics/office-address-book.png" border="0" alt="Addressbook" /><br /><b>{tr msg="Addressbook"}</b></a> +<a href="/admin/addressbook/" class="welcomelinks"><img src="/admin/images/office-address-book.png" border="0" alt="Addressbook" /><br /><b>{tr msg="Addressbook"}</b></a> </td> <td> -<a href="/admin/sharedfolder/" class="welcomelinks"><img src="/admin/pics/preferences-system-network-sharing.png" border="0" alt="Shared Folders" /><br /><b>{tr msg="Shared Folders"}</b></a> +<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/pics/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/pics/preferences-system.png" border="0" alt="Settings" /><br /><b>{tr msg="Settings"}</b></a> +<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/kolab/" class="welcomelinks"><img src="/admin/pics/dialog-information.png" border="0" alt="About Kolab" /><br /><b>{tr msg="About"}</b></a> +<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> +<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> -</div>
\ No newline at end of file +</div> diff --git a/data/templates/welcome-domain-maintainer.tpl b/data/templates/welcome-domain-maintainer.tpl index 9de2f87..1dc4550 100644 --- a/data/templates/welcome-domain-maintainer.tpl +++ b/data/templates/welcome-domain-maintainer.tpl @@ -17,6 +17,22 @@ </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> +<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> +</td> +<td> +<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> -</div>
\ No newline at end of file +</div> diff --git a/data/templates/welcome-maintainer.tpl b/data/templates/welcome-maintainer.tpl index ecffab7..36e27ac 100755 --- a/data/templates/welcome-maintainer.tpl +++ b/data/templates/welcome-maintainer.tpl @@ -7,25 +7,28 @@ <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/pics/system-users.png" border="0" alt="Manage Users" /><br /><b>{tr msg="Manage Users"}</b></a> +<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> </td> <td> -<a href="/admin/addressbook/" class="welcomelinks"><img src="/admin/pics/office-address-book.png" border="0" alt="Addressbook" /><br /><b>{tr msg="Addressbook"}</b></a> +<a href="/admin/addressbook/" class="welcomelinks"><img src="/admin/images/office-address-book.png" border="0" alt="Addressbook" /><br /><b>{tr msg="Addressbook"}</b></a> </td> <td> -<a href="/admin/sharedfolder/" class="welcomelinks"><img src="/admin/pics/preferences-system-network-sharing.png" border="0" alt="Shared Folders" /><br /><b>{tr msg="Shared Folders"}</b></a> +<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/pics/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/pics/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/kolab/" class="welcomelinks"><img src="/admin/pics/dialog-information.png" border="0" alt="About Kolab" /><br /><b>{tr msg="About"}</b></a> +<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> </td> </tr></table> -</div>
\ No newline at end of file +</div> diff --git a/data/templates/welcome-user.tpl b/data/templates/welcome-user.tpl index 6bd553d..a57f91b 100644 --- a/data/templates/welcome-user.tpl +++ b/data/templates/welcome-user.tpl @@ -7,13 +7,16 @@ <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/pics/preferences-system.png" border="0" alt="My settings" /><br /><b>{tr msg="My settings"}</b></a> +<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> </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> +<a href="/admin/user/activesync.php" class="welcomelinks"><img src="/admin/images/phone.png" border="0" alt="ActiveSync" /><br /><b>{tr msg="ActiveSync"}</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> -</div>
\ No newline at end of file +</div> |