diff --git a/lam/graphics/kolab.png b/lam/graphics/kolab.png index 31b6f339..1b68a024 100644 Binary files a/lam/graphics/kolab.png and b/lam/graphics/kolab.png differ diff --git a/lam/graphics/samba.png b/lam/graphics/samba.png index 3d2e6885..a861ede1 100644 Binary files a/lam/graphics/samba.png and b/lam/graphics/samba.png differ diff --git a/lam/graphics/tux.png b/lam/graphics/tux.png index db2e8b7b..c0c562ed 100644 Binary files a/lam/graphics/tux.png and b/lam/graphics/tux.png differ diff --git a/lam/graphics/uid.png b/lam/graphics/uid.png index 7be48fb8..7ffc948b 100644 Binary files a/lam/graphics/uid.png and b/lam/graphics/uid.png differ diff --git a/lam/lib/baseModule.inc b/lam/lib/baseModule.inc index a601e6f4..bec281f5 100644 --- a/lam/lib/baseModule.inc +++ b/lam/lib/baseModule.inc @@ -796,8 +796,8 @@ abstract class baseModule { /** * Returns the path to the module icon. - * The path must be releative to graphics (e.g. key.png). - * You can also set $this->meta['icon']. + * The path must be releative to graphics (e.g. key.png). You can also set $this->meta['icon']. + * The preferred size is 32x32px. * * @return unknown */ diff --git a/lam/lib/modules.inc b/lam/lib/modules.inc index 03b68e70..81820e5d 100644 --- a/lam/lib/modules.inc +++ b/lam/lib/modules.inc @@ -975,9 +975,9 @@ class accountContainer { echo "type."list\" valign=\"top\">"; // calculate button width - $buttonWidth = round(0.8 * strlen(utf8_decode(_("Main")))); + $buttonWidth = round(0.8 * strlen(utf8_decode(_("Main")))) + 2; for ($b = 1; $b < sizeof($this->order); $b++) { - $tempWidth = round(0.8 * strlen(utf8_decode($this->module[$this->order[$b]]->get_alias()))); + $tempWidth = round(0.8 * strlen(utf8_decode($this->module[$this->order[$b]]->get_alias()))) + 2; if ($buttonWidth < $tempWidth) $buttonWidth = $tempWidth; } $x=0; @@ -987,8 +987,8 @@ class accountContainer { if ($this->order[$this->current_page] == "main") $class = $this->type . "list-edit"; echo ""; echo "\n"; - echo "
\n"; - echo "\n"; + echo "subpage == 'finish') echo " disabled"; @@ -1007,14 +1007,14 @@ class accountContainer { echo "\n"; echo "\n"; echo "
order[$i]."')[0].click();\""; - echo " align=\"center\" style=\"border: 1px solid;border-bottom: 0px solid;padding:10px;\">\n"; + echo " align=\"center\" style=\"border: 1px solid;border-bottom: 0px solid;padding:5px;\">\n"; // print normal button $buttonImage = $this->module[$this->order[$i]]->getIcon(); $buttonImageStyle = ''; $buttonSpace = ''; if ($buttonImage != null) { - $buttonImageStyle = 'background-image: url(../../graphics/' . $buttonImage . ');background-position: 2px center;background-repeat: no-repeat;'; - $buttonSpace = '     '; + $buttonImageStyle = 'background-image: url(../../graphics/' . $buttonImage . ');background-position: 2px center;background-repeat: no-repeat;height:32px;'; + $buttonSpace = '       '; } $buttonStyle = $buttonImageStyle . 'background-color:transparent;width:' . $buttonWidth . 'em;border:0px solid;'; echo "order[$i]."\" type=\"submit\" value=\""; diff --git a/lam/lib/modules/ieee802device.inc b/lam/lib/modules/ieee802device.inc index c7930749..3fd4c0d2 100644 --- a/lam/lib/modules/ieee802device.inc +++ b/lam/lib/modules/ieee802device.inc @@ -42,7 +42,7 @@ class ieee802Device extends baseModule { function get_metaData() { $return = array(); // icon - $return['icon'] = 'device.png'; + $return['icon'] = 'network-wired.png'; // manages host accounts $return["account_types"] = array("host"); // alias name diff --git a/lam/lib/modules/inetLocalMailRecipient.inc b/lam/lib/modules/inetLocalMailRecipient.inc index 58b41b72..3854611e 100644 --- a/lam/lib/modules/inetLocalMailRecipient.inc +++ b/lam/lib/modules/inetLocalMailRecipient.inc @@ -42,7 +42,7 @@ class inetLocalMailRecipient extends baseModule { function get_metaData() { $return = array(); // icon - $return['icon'] = 'mailAlias.png'; + $return['icon'] = 'mailBig.png'; // manages host accounts $return["account_types"] = array("user"); // alias name diff --git a/lam/lib/modules/ldapPublicKey.inc b/lam/lib/modules/ldapPublicKey.inc index b42549e2..d6389586 100644 --- a/lam/lib/modules/ldapPublicKey.inc +++ b/lam/lib/modules/ldapPublicKey.inc @@ -43,7 +43,7 @@ class ldapPublicKey extends baseModule { function get_metaData() { $return = array(); // icon - $return['icon'] = 'key.png'; + $return['icon'] = 'keyBig.png'; // manages host accounts $return["account_types"] = array("user"); // alias name diff --git a/lam/lib/modules/nisMailAlias.inc b/lam/lib/modules/nisMailAlias.inc index 29716c5d..587cfb29 100644 --- a/lam/lib/modules/nisMailAlias.inc +++ b/lam/lib/modules/nisMailAlias.inc @@ -42,7 +42,7 @@ class nisMailAlias extends baseModule { function get_metaData() { $return = array(); // icon - $return['icon'] = 'mailAlias.png'; + $return['icon'] = 'mailBig.png'; // manages host accounts $return["account_types"] = array("mailAlias"); // base module diff --git a/lam/lib/modules/quota.inc b/lam/lib/modules/quota.inc index a4432178..0140c3ad 100644 --- a/lam/lib/modules/quota.inc +++ b/lam/lib/modules/quota.inc @@ -65,7 +65,7 @@ class quota extends baseModule { function get_metaData() { $return = array(); // icon - $return['icon'] = 'hard-drive.png'; + $return['icon'] = 'hard-driveBig.png'; // manages user and group accounts $return["account_types"] = array("user", "group"); // alias name diff --git a/lam/lib/modules/shadowAccount.inc b/lam/lib/modules/shadowAccount.inc index c4c45470..db1ae39a 100644 --- a/lam/lib/modules/shadowAccount.inc +++ b/lam/lib/modules/shadowAccount.inc @@ -64,7 +64,7 @@ class shadowAccount extends baseModule { function get_metaData() { $return = array(); // icon - $return['icon'] = 'key.png'; + $return['icon'] = 'keyBig.png'; // manages user accounts $return["account_types"] = array("user"); // alias name diff --git a/lam/templates/config/confmain.php b/lam/templates/config/confmain.php index 3298a7ce..35a90def 100644 --- a/lam/templates/config/confmain.php +++ b/lam/templates/config/confmain.php @@ -243,7 +243,7 @@ for ($i = 0; $i < sizeof($modules); $i++) { $module = new $modules[$i]('none'); $iconImage = $module->getIcon(); if ($iconImage != null) { - $icon = '' . $iconImage . ' '; + $icon = '' . $iconImage . ' '; } echo "$icon" . getModuleAlias($modules[$i], "none") . "\n"; $configTypes = parseHtml($modules[$i], $options[$modules[$i]], $old_options, true, $tabindex, $tabindexLink, 'config'); diff --git a/lam/templates/masscreate.php b/lam/templates/masscreate.php index 9d49927b..cffced08 100644 --- a/lam/templates/masscreate.php +++ b/lam/templates/masscreate.php @@ -187,7 +187,7 @@ function showMainPage($scope) { $module = new $modules[$m]($scope); $iconImage = $module->getIcon(); if ($iconImage != null) { - $icon = '' . $iconImage . ' '; + $icon = '' . $iconImage . ' '; } echo "
\n$icon" . getModuleAlias($modules[$m], $scope) . "\n"; echo "\n"; diff --git a/lam/templates/profedit/profilepage.php b/lam/templates/profedit/profilepage.php index bc625ec2..1d59d3d4 100644 --- a/lam/templates/profedit/profilepage.php +++ b/lam/templates/profedit/profilepage.php @@ -234,7 +234,7 @@ for ($m = 0; $m < sizeof($modules); $m++) { $module = new $modules[$m]($type); $iconImage = $module->getIcon(); if ($iconImage != null) { - $icon = '' . $iconImage . ' '; + $icon = '' . $iconImage . ' '; } echo "$icon" . getModuleAlias($modules[$m], $type) . "\n"; $profileTypes = parseHtml($modules[$m], $options[$modules[$m]], $old_options, true, $tabindex, $tabindexLink, $type);