Branch '2.3-stable' - 3 commits - data/templates www/admin
Christoph Wickert
wickert at kolabsys.com
Wed Apr 20 14:43:54 CEST 2011
data/templates/welcome-admin.tpl | 14 +++++++-------
data/templates/welcome-domain-maintainer.tpl | 22 ++++++++++++++++++++++
data/templates/welcome-maintainer.tpl | 14 +++++++-------
data/templates/welcome-user.tpl | 6 +++---
www/admin/custom.css | 7 +++++++
www/admin/index.php | 3 +++
www/admin/user/user.php | 4 ++--
7 files changed, 51 insertions(+), 19 deletions(-)
New commits:
commit d849f1b3fff9dbe4e7217cb928483dc3aa5532fd
Author: Christoph Wickert <cwickert at fedoraproject.org>
Date: Wed Apr 20 14:43:48 2011 +0200
Fix permissions
diff --git a/data/templates/welcome-user.tpl b/data/templates/welcome-user.tpl
old mode 100755
new mode 100644
diff --git a/www/admin/custom.css b/www/admin/custom.css
old mode 100755
new mode 100644
diff --git a/www/admin/index.php b/www/admin/index.php
old mode 100755
new mode 100644
commit 2124f52d0de5d9596c7efdc45732c1ff8cc96138
Author: Bogomil Shopov <shopov at kolabsys.com>
Date: Wed Apr 20 14:57:54 2011 +0300
New welcome screen fixes. https://bugzilla.kolabsys.com/show_bug.cgi?id=87
diff --git a/data/templates/welcome-admin.tpl b/data/templates/welcome-admin.tpl
old mode 100644
new mode 100755
index fd8e441..7a88759
--- a/data/templates/welcome-admin.tpl
+++ b/data/templates/welcome-admin.tpl
@@ -10,22 +10,22 @@
<table cellspacing="10" cellpadding="10">
<tr>
<td>
-<a href="/admin/user/"><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/pics/system-users.png" border="0" alt="Manage Users" /><br /><b>{tr msg="Manage Users"}</b></a>
</td>
<td>
-<a href="/admin/addressbook/"><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/pics/office-address-book.png" border="0" alt="Addressbook" /><br /><b>{tr msg="Addressbook"}</b></a>
</td>
<td>
-<a href="/admin/sharedfolder/"><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/pics/preferences-system-network-sharing.png" border="0" alt="Shared Folders" /><br /><b>{tr msg="Shared Folders"}</b></a>
</td>
<td>
-<a href="/admin/administrator/"><img src="/admin/pics/resource-group.png" border="0" alt="Administrator" /><br /><b>{tr msg="Administrator"}</b></a>
+<a href="/admin/administrator/" class="welcomelinks"><img src="/admin/pics/resource-group.png" border="0" alt="Administrator" /><br /><b>{tr msg="Administrator"}</b></a>
</td>
<td>
-<a href="/admin/settings/"><img src="/admin/pics/preferences-system.png" border="0" alt="Settings" /><br /><b>{tr msg="Settings"}</b></a>
+<a href="/admin/settings/" class="welcomelinks"><img src="/admin/pics/preferences-system.png" border="0" alt="Settings" /><br /><b>{tr msg="Settings"}</b></a>
</td>
<td>
-<a href="/admin/kolab/"><img src="/admin/pics/dialog-information.png" border="0" alt="About Kolab" /><br /><b>{tr msg="About"}</b></a>
+<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>
</div>
\ No newline at end of file
diff --git a/data/templates/welcome-domain-maintainer.tpl b/data/templates/welcome-domain-maintainer.tpl
new file mode 100644
index 0000000..9de2f87
--- /dev/null
+++ b/data/templates/welcome-domain-maintainer.tpl
@@ -0,0 +1,22 @@
+{* Smarty Template *}
+{*
+ Local variables:
+ buffer-file-coding-system: utf-8
+ End:
+*}
+<div class="contenttext">
+<h1>{tr msg="Welcome to the Kolab Groupware Server Maintenance"}</h1>
+
+<table cellspacing="10" cellpadding="10">
+<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>
+</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>
+</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>
+</div>
\ No newline at end of file
diff --git a/data/templates/welcome-maintainer.tpl b/data/templates/welcome-maintainer.tpl
old mode 100644
new mode 100755
index ef5f190..ecffab7
--- a/data/templates/welcome-maintainer.tpl
+++ b/data/templates/welcome-maintainer.tpl
@@ -10,22 +10,22 @@
<table cellspacing="10" cellpadding="10">
<tr>
<td>
-<a href="/admin/user/"><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/pics/system-users.png" border="0" alt="Manage Users" /><br /><b>{tr msg="Manage Users"}</b></a>
</td>
<td>
-<a href="/admin/addressbook/"><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/pics/office-address-book.png" border="0" alt="Addressbook" /><br /><b>{tr msg="Addressbook"}</b></a>
</td>
<td>
-<a href="/admin/sharedfolder/"><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/pics/preferences-system-network-sharing.png" border="0" alt="Shared Folders" /><br /><b>{tr msg="Shared Folders"}</b></a>
</td>
<td>
-<a href="/admin/administrator/"><img src="/admin/pics/resource-group.png" border="0" alt="Administrator" /><br /><b>{tr msg="Administrator"}</b></a>
+<a href="/admin/administrator/" class="welcomelinks"><img src="/admin/pics/resource-group.png" border="0" alt="Administrator" /><br /><b>{tr msg="Administrator"}</b></a>
</td>
<td>
-<a href="/admin/settings/"><img src="/admin/pics/preferences-system.png" border="0" alt="Settings" /><br /><b>{tr msg="Settings"}</b></a>
+<a href="/admin/settings/" class="welcomelinks"><img src="/admin/pics/preferences-system.png" border="0" alt="Settings" /><br /><b>{tr msg="Settings"}</b></a>
</td>
<td>
-<a href="/admin/kolab/"><img src="/admin/pics/dialog-information.png" border="0" alt="About Kolab" /><br /><b>{tr msg="About"}</b></a>
+<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>
</div>
\ No newline at end of file
diff --git a/data/templates/welcome-user.tpl b/data/templates/welcome-user.tpl
old mode 100644
new mode 100755
index 968f378..6bd553d
--- a/data/templates/welcome-user.tpl
+++ b/data/templates/welcome-user.tpl
@@ -10,10 +10,10 @@
<table cellspacing="10" cellpadding="10">
<tr>
<td>
-<a href="/admin/user/user.php?action=modify"><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/pics/preferences-system.png" border="0" alt="My settings" /><br /><b>{tr msg="My settings"}</b></a>
</td>
<td>
-<a href="/admin/kolab/"><img src="/admin/pics/dialog-information.png" border="0" alt="About Kolab" /><br /><b>{tr msg="About"}</b></a>
+<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>
</div>
\ No newline at end of file
diff --git a/www/admin/custom.css b/www/admin/custom.css
old mode 100644
new mode 100755
index c529cca..1fdc164
--- a/www/admin/custom.css
+++ b/www/admin/custom.css
@@ -181,3 +181,10 @@ border: 1px dashed;
background-color: #c6ced8;
}
+
+.welcomelinks{
+ color: #5d5656;
+ text-decoration: none;
+ font-size:12px;
+ text-align: center;
+}
diff --git a/www/admin/index.php b/www/admin/index.php
old mode 100644
new mode 100755
index 265a221..d4e5d9a
--- a/www/admin/index.php
+++ b/www/admin/index.php
@@ -57,6 +57,9 @@ if ($auth->group() == 'user') {
if ($auth->group() == 'maintainer') {
$maincontent = 'welcome-maintainer.tpl';
}
+if ($auth->group() == 'domain-maintainer') {
+ $maincontent = 'welcome-domain-maintainer.tpl';
+}
/**** Insert into template and output ***/
commit 4acbda2fb20feced57d780d4479313508ee99340
Author: Bogomil Shopov <shopov at kolabsys.com>
Date: Wed Apr 20 11:51:53 2011 +0300
Fixing the UID problem in user.php.
diff --git a/www/admin/user/user.php b/www/admin/user/user.php
index 7d757f2..215e792 100644
--- a/www/admin/user/user.php
+++ b/www/admin/user/user.php
@@ -706,7 +706,7 @@ switch( $action ) {
if ( !$errors ) {
// Try to rename the object
- if (!ldap_rename($ldap->connection, $dn, "cn=" . $ldap->dn_escape($ldap_object['cn']), $domain_dn, true)) {
+ if (!ldap_rename($ldap->connection, $dn, $new_uid, $domain_dn, true)) {
array_push($errors, sprintf(_("LDAP Error: could not rename %s to %s: %s"), $dn,
$newdn, ldap_error($ldap->connection)));
}
@@ -715,7 +715,7 @@ switch( $action ) {
if (!ldap_modify($ldap->connection, $newdn, $ldap_object)) {
// While this should not happen, in case it does, we need to revert the
// renaming
- array_push($errors, sprintf(_("LDAP Error: could not modify %s to %s: %s"), $newdn,
+ array_push($errors, sprintf(_("LDAP Error: could not modify %s: %s"), $newdn,
ldap_error($ldap->connection)));
$old_dn = substr($dn, 0, strlen($dn) - strlen($domain_dn) - 1);
ldap_rename($ldap->connection, $newdn, $old_dn, $domain_dn, true);
More information about the commits
mailing list