From b028266be1e79bcdae97a2a14f6b2df4695b10a7 Mon Sep 17 00:00:00 2001 From: Christoph Wickert Date: Sat, 30 Apr 2011 18:25:49 +0200 Subject: Consolidate all graphics in www/admin/images --- data/templates/activesync.tpl | 8 +- data/templates/codefusion.tpl | 2 +- data/templates/erfrakon.tpl | 2 +- data/templates/intevation.tpl | 2 +- data/templates/kdab.tpl | 2 +- data/templates/kde.tpl | 2 +- data/templates/kolabsystems.tpl | 2 +- data/templates/welcome-admin.tpl | 12 +-- data/templates/welcome-domain-maintainer.tpl | 6 +- data/templates/welcome-maintainer.tpl | 12 +-- data/templates/welcome-user.tpl | 6 +- package.xml | 117 ++++++++++++--------- www/admin/images/CONTACT.png | Bin 0 -> 1597 bytes www/admin/images/EVENT.png | Bin 0 -> 1486 bytes www/admin/images/MAIL.png | Bin 0 -> 1451 bytes www/admin/images/NOTES.png | Bin 0 -> 1735 bytes www/admin/images/TASKS.png | Bin 0 -> 1995 bytes www/admin/images/alarm.png | Bin 0 -> 630 bytes www/admin/images/codefusion.png | Bin 0 -> 18319 bytes www/admin/images/dialog-information.png | Bin 0 -> 4255 bytes www/admin/images/erfrakon.png | Bin 0 -> 2951 bytes www/admin/images/f.png | Bin 0 -> 394 bytes www/admin/images/intevation_logo.png | Bin 0 -> 7182 bytes www/admin/images/kdab.png | Bin 0 -> 25519 bytes www/admin/images/kde.png | Bin 0 -> 18660 bytes www/admin/images/kolab_logo.png | Bin 0 -> 4902 bytes www/admin/images/kolabsystems_logo.png | Bin 0 -> 12281 bytes www/admin/images/office-address-book.png | Bin 0 -> 6651 bytes www/admin/images/phone.png | Bin 0 -> 3656 bytes .../images/preferences-system-network-sharing.png | Bin 0 -> 4995 bytes www/admin/images/preferences-system.png | Bin 0 -> 6296 bytes www/admin/images/resource-group.png | Bin 0 -> 5049 bytes www/admin/images/sync.png | Bin 0 -> 837 bytes www/admin/images/system-users.png | Bin 0 -> 4641 bytes www/admin/pics/CONTACT.png | Bin 1597 -> 0 bytes www/admin/pics/EVENT.png | Bin 1486 -> 0 bytes www/admin/pics/MAIL.png | Bin 1451 -> 0 bytes www/admin/pics/NOTES.png | Bin 1735 -> 0 bytes www/admin/pics/TASKS.png | Bin 1995 -> 0 bytes www/admin/pics/alarm.png | Bin 630 -> 0 bytes www/admin/pics/codefusion.png | Bin 18319 -> 0 bytes www/admin/pics/dialog-information.png | Bin 4255 -> 0 bytes www/admin/pics/erfrakon.png | Bin 2951 -> 0 bytes www/admin/pics/f.png | Bin 394 -> 0 bytes www/admin/pics/intevation_logo.png | Bin 7182 -> 0 bytes www/admin/pics/kdab.png | Bin 25519 -> 0 bytes www/admin/pics/kde.png | Bin 18660 -> 0 bytes www/admin/pics/kolab_logo.png | Bin 4902 -> 0 bytes www/admin/pics/kolabsystems_logo.png | Bin 12281 -> 0 bytes www/admin/pics/office-address-book.png | Bin 6651 -> 0 bytes www/admin/pics/phone.png | Bin 3656 -> 0 bytes .../pics/preferences-system-network-sharing.png | Bin 4995 -> 0 bytes www/admin/pics/preferences-system.png | Bin 6296 -> 0 bytes www/admin/pics/resource-group.png | Bin 5049 -> 0 bytes www/admin/pics/sync.png | Bin 837 -> 0 bytes www/admin/pics/system-users.png | Bin 4641 -> 0 bytes www/admin/style.css | 2 +- 57 files changed, 94 insertions(+), 81 deletions(-) create mode 100644 www/admin/images/CONTACT.png create mode 100644 www/admin/images/EVENT.png create mode 100644 www/admin/images/MAIL.png create mode 100644 www/admin/images/NOTES.png create mode 100644 www/admin/images/TASKS.png create mode 100644 www/admin/images/alarm.png create mode 100644 www/admin/images/codefusion.png create mode 100644 www/admin/images/dialog-information.png create mode 100644 www/admin/images/erfrakon.png create mode 100644 www/admin/images/f.png create mode 100644 www/admin/images/intevation_logo.png create mode 100644 www/admin/images/kdab.png create mode 100644 www/admin/images/kde.png create mode 100644 www/admin/images/kolab_logo.png create mode 100644 www/admin/images/kolabsystems_logo.png create mode 100644 www/admin/images/office-address-book.png create mode 100644 www/admin/images/phone.png create mode 100644 www/admin/images/preferences-system-network-sharing.png create mode 100644 www/admin/images/preferences-system.png create mode 100644 www/admin/images/resource-group.png create mode 100644 www/admin/images/sync.png create mode 100644 www/admin/images/system-users.png delete mode 100644 www/admin/pics/CONTACT.png delete mode 100644 www/admin/pics/EVENT.png delete mode 100644 www/admin/pics/MAIL.png delete mode 100644 www/admin/pics/NOTES.png delete mode 100644 www/admin/pics/TASKS.png delete mode 100644 www/admin/pics/alarm.png delete mode 100644 www/admin/pics/codefusion.png delete mode 100644 www/admin/pics/dialog-information.png delete mode 100644 www/admin/pics/erfrakon.png delete mode 100644 www/admin/pics/f.png delete mode 100644 www/admin/pics/intevation_logo.png delete mode 100644 www/admin/pics/kdab.png delete mode 100644 www/admin/pics/kde.png delete mode 100644 www/admin/pics/kolab_logo.png delete mode 100644 www/admin/pics/kolabsystems_logo.png delete mode 100644 www/admin/pics/office-address-book.png delete mode 100644 www/admin/pics/phone.png delete mode 100644 www/admin/pics/preferences-system-network-sharing.png delete mode 100644 www/admin/pics/preferences-system.png delete mode 100644 www/admin/pics/resource-group.png delete mode 100644 www/admin/pics/sync.png delete mode 100644 www/admin/pics/system-users.png 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 @@
{foreach from=$folders key=myId item=fol} - + - + {if $myId eq 'EVENT' or $myId eq 'TASKS'} - + {else} {/if} @@ -47,7 +47,7 @@ {kolabsync serial=$devices[device].name folder=$fols.realname} - + 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 @@
- Code Fusion + Code Fusion

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 @@

- erfrakon + erfrakon

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 @@

- Logo Intevation GmbH + Logo Intevation GmbH
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 *}
- KDAB + KDAB
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="KDE is a powerful Free Software 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."}

-KDE +KDE

{tr msg="KDE is an Internet project that is truly open in every sense. Development takes place on the Internet and is discussed on our mailing lists, 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 *}

- Kolab Systems AG + Kolab Systems AG
diff --git a/data/templates/welcome-admin.tpl b/data/templates/welcome-admin.tpl index 7a88759..88ab3c6 100755 --- a/data/templates/welcome-admin.tpl +++ b/data/templates/welcome-admin.tpl @@ -10,22 +10,22 @@
{tr msg=$pnames[$myId]}
{tr msg=$pnames[$myId]}
   {$fols.name}
-Manage Users
{tr msg="Manage Users"} +Manage Users
{tr msg="Manage Users"} 		-Addressbook
{tr msg="Addressbook"} +Addressbook
{tr msg="Addressbook"} 		-Shared Folders
{tr msg="Shared Folders"} +Shared Folders
{tr msg="Shared Folders"} 		-Administrator
{tr msg="Administrator"} +Administrator
{tr msg="Administrator"} 		-Settings
{tr msg="Settings"} +Settings
{tr msg="Settings"} 		-About Kolab
{tr msg="About"} +About Kolab
{tr msg="About"}
\ No newline at end of file diff --git a/data/templates/welcome-domain-maintainer.tpl b/data/templates/welcome-domain-maintainer.tpl index 9de2f87..3d7e979 100644 --- a/data/templates/welcome-domain-maintainer.tpl +++ b/data/templates/welcome-domain-maintainer.tpl @@ -10,13 +10,13 @@
-Manage Users
{tr msg="Manage Users"} +Manage Users
{tr msg="Manage Users"} 		-Shared Folders
{tr msg="Shared Folders"} +Shared Folders
{tr msg="Shared Folders"} 		-About Kolab
{tr msg="About"} +About Kolab
{tr msg="About"}
\ No newline at end of file diff --git a/data/templates/welcome-maintainer.tpl b/data/templates/welcome-maintainer.tpl index ecffab7..ba8640e 100755 --- a/data/templates/welcome-maintainer.tpl +++ b/data/templates/welcome-maintainer.tpl @@ -10,22 +10,22 @@
-Manage Users
{tr msg="Manage Users"} +Manage Users
{tr msg="Manage Users"} 		-Addressbook
{tr msg="Addressbook"} +Addressbook
{tr msg="Addressbook"} 		-Shared Folders
{tr msg="Shared Folders"} +Shared Folders
{tr msg="Shared Folders"} 		-Administrator
{tr msg="Administrator"} +Administrator
{tr msg="Administrator"} 		-Settings
{tr msg="Settings"} +Settings
{tr msg="Settings"} 		-About Kolab
{tr msg="About"} +About Kolab
{tr msg="About"}
\ No newline at end of file diff --git a/data/templates/welcome-user.tpl b/data/templates/welcome-user.tpl index bc8a994..48a74b9 100644 --- a/data/templates/welcome-user.tpl +++ b/data/templates/welcome-user.tpl @@ -10,13 +10,13 @@
-My settings
{tr msg="My settings"} +My settings
{tr msg="My settings"} 		-ActiveSync
{tr msg="ActiveSync"} +ActiveSync
{tr msg="ActiveSync"} 		-About Kolab
{tr msg="About"} +About Kolab
{tr msg="About"}
\ No newline at end of file diff --git a/package.xml b/package.xml index 5cce4da..04502e4 100644 --- a/package.xml +++ b/package.xml @@ -26,8 +26,8 @@ 2011-04-20 - 2.3.0.2 - 2.3.0 + 2.3.1 + 2.3.1 alpha @@ -176,25 +176,47 @@ + + + + + + + + + + + + + + + + + + + + + + + + - - @@ -211,30 +233,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - @@ -375,58 +373,58 @@ + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - @@ -499,5 +497,20 @@ * Fix new welcome pages + + + 2.3.1 + 2.3.0 + + + beta + beta + + 2011-04-28 + LGPL + +* Move all graphics from www/admin/pics to www/admin/images + + diff --git a/www/admin/images/CONTACT.png b/www/admin/images/CONTACT.png new file mode 100644 index 0000000..916f6ab Binary files /dev/null and b/www/admin/images/CONTACT.png differ diff --git a/www/admin/images/EVENT.png b/www/admin/images/EVENT.png new file mode 100644 index 0000000..2e02fc9 Binary files /dev/null and b/www/admin/images/EVENT.png differ diff --git a/www/admin/images/MAIL.png b/www/admin/images/MAIL.png new file mode 100644 index 0000000..bc77592 Binary files /dev/null and b/www/admin/images/MAIL.png differ diff --git a/www/admin/images/NOTES.png b/www/admin/images/NOTES.png new file mode 100644 index 0000000..7dca846 Binary files /dev/null and b/www/admin/images/NOTES.png differ diff --git a/www/admin/images/TASKS.png b/www/admin/images/TASKS.png new file mode 100644 index 0000000..d3d600d Binary files /dev/null and b/www/admin/images/TASKS.png differ diff --git a/www/admin/images/alarm.png b/www/admin/images/alarm.png new file mode 100644 index 0000000..0703e7a Binary files /dev/null and b/www/admin/images/alarm.png differ diff --git a/www/admin/images/codefusion.png b/www/admin/images/codefusion.png new file mode 100644 index 0000000..be04ff1 Binary files /dev/null and b/www/admin/images/codefusion.png differ diff --git a/www/admin/images/dialog-information.png b/www/admin/images/dialog-information.png new file mode 100644 index 0000000..c65f616 Binary files /dev/null and b/www/admin/images/dialog-information.png differ diff --git a/www/admin/images/erfrakon.png b/www/admin/images/erfrakon.png new file mode 100644 index 0000000..3b2d5d6 Binary files /dev/null and b/www/admin/images/erfrakon.png differ diff --git a/www/admin/images/f.png b/www/admin/images/f.png new file mode 100644 index 0000000..7572bac Binary files /dev/null and b/www/admin/images/f.png differ diff --git a/www/admin/images/intevation_logo.png b/www/admin/images/intevation_logo.png new file mode 100644 index 0000000..deb54e4 Binary files /dev/null and b/www/admin/images/intevation_logo.png differ diff --git a/www/admin/images/kdab.png b/www/admin/images/kdab.png new file mode 100644 index 0000000..66af0ed Binary files /dev/null and b/www/admin/images/kdab.png differ diff --git a/www/admin/images/kde.png b/www/admin/images/kde.png new file mode 100644 index 0000000..3efaaf8 Binary files /dev/null and b/www/admin/images/kde.png differ diff --git a/www/admin/images/kolab_logo.png b/www/admin/images/kolab_logo.png new file mode 100644 index 0000000..27b7d12 Binary files /dev/null and b/www/admin/images/kolab_logo.png differ diff --git a/www/admin/images/kolabsystems_logo.png b/www/admin/images/kolabsystems_logo.png new file mode 100644 index 0000000..90620d3 Binary files /dev/null and b/www/admin/images/kolabsystems_logo.png differ diff --git a/www/admin/images/office-address-book.png b/www/admin/images/office-address-book.png new file mode 100644 index 0000000..3b00f62 Binary files /dev/null and b/www/admin/images/office-address-book.png differ diff --git a/www/admin/images/phone.png b/www/admin/images/phone.png new file mode 100644 index 0000000..8f81416 Binary files /dev/null and b/www/admin/images/phone.png differ diff --git a/www/admin/images/preferences-system-network-sharing.png b/www/admin/images/preferences-system-network-sharing.png new file mode 100644 index 0000000..b6faf42 Binary files /dev/null and b/www/admin/images/preferences-system-network-sharing.png differ diff --git a/www/admin/images/preferences-system.png b/www/admin/images/preferences-system.png new file mode 100644 index 0000000..9ea5cec Binary files /dev/null and b/www/admin/images/preferences-system.png differ diff --git a/www/admin/images/resource-group.png b/www/admin/images/resource-group.png new file mode 100644 index 0000000..84cfa89 Binary files /dev/null and b/www/admin/images/resource-group.png differ diff --git a/www/admin/images/sync.png b/www/admin/images/sync.png new file mode 100644 index 0000000..389f036 Binary files /dev/null and b/www/admin/images/sync.png differ diff --git a/www/admin/images/system-users.png b/www/admin/images/system-users.png new file mode 100644 index 0000000..e2bd558 Binary files /dev/null and b/www/admin/images/system-users.png differ diff --git a/www/admin/pics/CONTACT.png b/www/admin/pics/CONTACT.png deleted file mode 100644 index 916f6ab..0000000 Binary files a/www/admin/pics/CONTACT.png and /dev/null differ diff --git a/www/admin/pics/EVENT.png b/www/admin/pics/EVENT.png deleted file mode 100644 index 2e02fc9..0000000 Binary files a/www/admin/pics/EVENT.png and /dev/null differ diff --git a/www/admin/pics/MAIL.png b/www/admin/pics/MAIL.png deleted file mode 100644 index bc77592..0000000 Binary files a/www/admin/pics/MAIL.png and /dev/null differ diff --git a/www/admin/pics/NOTES.png b/www/admin/pics/NOTES.png deleted file mode 100644 index 7dca846..0000000 Binary files a/www/admin/pics/NOTES.png and /dev/null differ diff --git a/www/admin/pics/TASKS.png b/www/admin/pics/TASKS.png deleted file mode 100644 index d3d600d..0000000 Binary files a/www/admin/pics/TASKS.png and /dev/null differ diff --git a/www/admin/pics/alarm.png b/www/admin/pics/alarm.png deleted file mode 100644 index 0703e7a..0000000 Binary files a/www/admin/pics/alarm.png and /dev/null differ diff --git a/www/admin/pics/codefusion.png b/www/admin/pics/codefusion.png deleted file mode 100644 index be04ff1..0000000 Binary files a/www/admin/pics/codefusion.png and /dev/null differ diff --git a/www/admin/pics/dialog-information.png b/www/admin/pics/dialog-information.png deleted file mode 100644 index c65f616..0000000 Binary files a/www/admin/pics/dialog-information.png and /dev/null differ diff --git a/www/admin/pics/erfrakon.png b/www/admin/pics/erfrakon.png deleted file mode 100644 index 3b2d5d6..0000000 Binary files a/www/admin/pics/erfrakon.png and /dev/null differ diff --git a/www/admin/pics/f.png b/www/admin/pics/f.png deleted file mode 100644 index 7572bac..0000000 Binary files a/www/admin/pics/f.png and /dev/null differ diff --git a/www/admin/pics/intevation_logo.png b/www/admin/pics/intevation_logo.png deleted file mode 100644 index deb54e4..0000000 Binary files a/www/admin/pics/intevation_logo.png and /dev/null differ diff --git a/www/admin/pics/kdab.png b/www/admin/pics/kdab.png deleted file mode 100644 index 66af0ed..0000000 Binary files a/www/admin/pics/kdab.png and /dev/null differ diff --git a/www/admin/pics/kde.png b/www/admin/pics/kde.png deleted file mode 100644 index 3efaaf8..0000000 Binary files a/www/admin/pics/kde.png and /dev/null differ diff --git a/www/admin/pics/kolab_logo.png b/www/admin/pics/kolab_logo.png deleted file mode 100644 index 27b7d12..0000000 Binary files a/www/admin/pics/kolab_logo.png and /dev/null differ diff --git a/www/admin/pics/kolabsystems_logo.png b/www/admin/pics/kolabsystems_logo.png deleted file mode 100644 index 90620d3..0000000 Binary files a/www/admin/pics/kolabsystems_logo.png and /dev/null differ diff --git a/www/admin/pics/office-address-book.png b/www/admin/pics/office-address-book.png deleted file mode 100644 index 3b00f62..0000000 Binary files a/www/admin/pics/office-address-book.png and /dev/null differ diff --git a/www/admin/pics/phone.png b/www/admin/pics/phone.png deleted file mode 100644 index 8f81416..0000000 Binary files a/www/admin/pics/phone.png and /dev/null differ diff --git a/www/admin/pics/preferences-system-network-sharing.png b/www/admin/pics/preferences-system-network-sharing.png deleted file mode 100644 index b6faf42..0000000 Binary files a/www/admin/pics/preferences-system-network-sharing.png and /dev/null differ diff --git a/www/admin/pics/preferences-system.png b/www/admin/pics/preferences-system.png deleted file mode 100644 index 9ea5cec..0000000 Binary files a/www/admin/pics/preferences-system.png and /dev/null differ diff --git a/www/admin/pics/resource-group.png b/www/admin/pics/resource-group.png deleted file mode 100644 index 84cfa89..0000000 Binary files a/www/admin/pics/resource-group.png and /dev/null differ diff --git a/www/admin/pics/sync.png b/www/admin/pics/sync.png deleted file mode 100644 index 389f036..0000000 Binary files a/www/admin/pics/sync.png and /dev/null differ diff --git a/www/admin/pics/system-users.png b/www/admin/pics/system-users.png deleted file mode 100644 index e2bd558..0000000 Binary files a/www/admin/pics/system-users.png and /dev/null differ diff --git a/www/admin/style.css b/www/admin/style.css index 5e69dd2..1edcb40 100644 --- a/www/admin/style.css +++ b/www/admin/style.css @@ -31,7 +31,7 @@ a:hover { color: #113399; } } #toplogo { display:block; - background-image: url(pics/kolab_logo.png); + background-image: url(images/kolab_logo.png); background-color: #B0BCD0; width: 245px; height: 70px; -- cgit v0.12