From a82bf781fa4c9847fbfc443efe6b80d08e0ac109 Mon Sep 17 00:00:00 2001 From: Alexander Ebert Date: Thu, 29 Jan 2015 00:48:22 +0100 Subject: [PATCH] Updated user dropdown --- com.woltlab.wcf/package.xml | 1 + com.woltlab.wcf/templates/userPanel.tpl | 40 +++++++++++++------ com.woltlab.wcf/update_2.1.0_Alpha_4.sql | 1 + com.woltlab.wcf/update_210.sql | 2 + com.woltlab.wcf/userMenu.xml | 3 ++ .../install/files/acp/templates/header.tpl | 8 ++-- .../user/menu/item/UserMenuItem.class.php | 9 +++++ ...serMenuPackageInstallationPlugin.class.php | 7 +++- wcfsetup/install/files/style/dropdown.less | 35 +++++++++++++--- wcfsetup/install/lang/de.xml | 1 + wcfsetup/install/lang/en.xml | 1 + wcfsetup/setup/db/install.sql | 1 + 12 files changed, 86 insertions(+), 23 deletions(-) create mode 100644 com.woltlab.wcf/update_2.1.0_Alpha_4.sql diff --git a/com.woltlab.wcf/package.xml b/com.woltlab.wcf/package.xml index 46b756b855..50d264fc73 100644 --- a/com.woltlab.wcf/package.xml +++ b/com.woltlab.wcf/package.xml @@ -96,5 +96,6 @@ language/*.xml option.xml + userMenu.xml diff --git a/com.woltlab.wcf/templates/userPanel.tpl b/com.woltlab.wcf/templates/userPanel.tpl index 0acd451452..a5325212dd 100644 --- a/com.woltlab.wcf/templates/userPanel.tpl +++ b/com.woltlab.wcf/templates/userPanel.tpl @@ -4,7 +4,8 @@ {@$__wcf->getUserProfileHandler()->getAvatar()->getImageTag(24)} {lang}wcf.user.userNote{/lang}
- {$__wcf->user->username} + {lang}wcf.user.controlPanel{/lang} + {hascontent}
    {content} @@ -16,27 +17,40 @@
    {lang}wcf.user.logout{/lang} diff --git a/com.woltlab.wcf/update_2.1.0_Alpha_4.sql b/com.woltlab.wcf/update_2.1.0_Alpha_4.sql new file mode 100644 index 0000000000..5fcd77b468 --- /dev/null +++ b/com.woltlab.wcf/update_2.1.0_Alpha_4.sql @@ -0,0 +1 @@ +ALTER TABLE wcf1_user_menu_item ADD iconClassName VARCHAR(255) NOT NULL DEFAULT ''; diff --git a/com.woltlab.wcf/update_210.sql b/com.woltlab.wcf/update_210.sql index ac75653484..a54e8f7e0c 100644 --- a/com.woltlab.wcf/update_210.sql +++ b/com.woltlab.wcf/update_210.sql @@ -212,6 +212,8 @@ ALTER TABLE wcf1_template_listener ADD niceValue TINYINT(3) NOT NULL DEFAULT 0; ALTER TABLE wcf1_user_group_option ADD usersOnly TINYINT(1) NOT NULL DEFAULT 0; +ALTER TABLE wcf1_user_menu_item ADD iconClassName VARCHAR(255) NOT NULL DEFAULT ''; + /* truncate table to ensure consistency */ DELETE FROM wcf1_user_notification; diff --git a/com.woltlab.wcf/userMenu.xml b/com.woltlab.wcf/userMenu.xml index 9e2c10f48e..10d87f62ca 100644 --- a/com.woltlab.wcf/userMenu.xml +++ b/com.woltlab.wcf/userMenu.xml @@ -4,6 +4,7 @@ 1 + fa-user @@ -27,6 +28,7 @@ 2 + fa-cog @@ -44,6 +46,7 @@ 3 + fa-globe diff --git a/wcfsetup/install/files/acp/templates/header.tpl b/wcfsetup/install/files/acp/templates/header.tpl index b3d967fa9f..dc2dfda112 100644 --- a/wcfsetup/install/files/acp/templates/header.tpl +++ b/wcfsetup/install/files/acp/templates/header.tpl @@ -182,10 +182,10 @@ WoltLab® diff --git a/wcfsetup/install/files/lib/data/user/menu/item/UserMenuItem.class.php b/wcfsetup/install/files/lib/data/user/menu/item/UserMenuItem.class.php index 029b88a733..f668fd87c7 100644 --- a/wcfsetup/install/files/lib/data/user/menu/item/UserMenuItem.class.php +++ b/wcfsetup/install/files/lib/data/user/menu/item/UserMenuItem.class.php @@ -118,4 +118,13 @@ class UserMenuItem extends ProcessibleDatabaseObject implements ITreeMenuItem { public function __toString() { return WCF::getLanguage()->getDynamicVariable($this->menuItem); } + + /** + * Returns FontAwesome icon class name. + * + * @return string + */ + public function getIconClassName() { + return ($this->iconClassName ?: 'fa-bars'); + } } diff --git a/wcfsetup/install/files/lib/system/package/plugin/UserMenuPackageInstallationPlugin.class.php b/wcfsetup/install/files/lib/system/package/plugin/UserMenuPackageInstallationPlugin.class.php index 19c91af821..bdc990082d 100644 --- a/wcfsetup/install/files/lib/system/package/plugin/UserMenuPackageInstallationPlugin.class.php +++ b/wcfsetup/install/files/lib/system/package/plugin/UserMenuPackageInstallationPlugin.class.php @@ -5,7 +5,7 @@ namespace wcf\system\package\plugin; * Installs, updates and deletes user menu items. * * @author Alexander Ebert - * @copyright 2001-2014 WoltLab GmbH + * @copyright 2001-2015 WoltLab GmbH * @license GNU Lesser General Public License * @package com.woltlab.wcf * @subpackage system.package.plugin @@ -38,6 +38,11 @@ class UserMenuPackageInstallationPlugin extends AbstractMenuPackageInstallationP $result['className'] = $data['elements']['classname']; } + // FontAwesome icon name + if (!empty($data['elements']['iconclassname']) && preg_match('~^fa\-[a-z\-]+$~', $data['elements']['iconclassname'])) { + $result['iconClassName'] = $data['elements']['iconclassname']; + } + return $result; } } diff --git a/wcfsetup/install/files/style/dropdown.less b/wcfsetup/install/files/style/dropdown.less index 17a611d6bf..cff6ff99a8 100644 --- a/wcfsetup/install/files/style/dropdown.less +++ b/wcfsetup/install/files/style/dropdown.less @@ -428,16 +428,41 @@ &.interactiveDropdownItemsUserMenu { > li { - padding: 0 !important; + &.dropdownDivider { + padding: 0 !important; + } &:not(.dropdownDivider) { border-bottom-width: 0 !important; + padding: (@wcfGapSmall + @wcfGapTiny); + } + + > .box32 > .containerHeadline { + > h3 { + font-size: 1.1rem; + } } - > a { - display: block; - padding: @wcfGapSmall (@wcfGapSmall + @wcfGapTiny); - text-decoration: none; + > .box64 { + position: relative; + + > .containerHeadline > .interactiveDropdownUserMenuLinkList { + bottom: 0; + position: absolute; + } + } + + .interactiveDropdownUserMenuLinkList > li { + display: inline-block; + font-size: .85rem; + + &:after { + content: " \2013 "; + } + + &:last-child:after { + content: ""; + } } } } diff --git a/wcfsetup/install/lang/de.xml b/wcfsetup/install/lang/de.xml index e3d73440d1..500baebd9f 100644 --- a/wcfsetup/install/lang/de.xml +++ b/wcfsetup/install/lang/de.xml @@ -2659,6 +2659,7 @@ Fehler sind beispielsweise: + diff --git a/wcfsetup/install/lang/en.xml b/wcfsetup/install/lang/en.xml index 47ed134edc..1892537449 100644 --- a/wcfsetup/install/lang/en.xml +++ b/wcfsetup/install/lang/en.xml @@ -2657,6 +2657,7 @@ Errors are: + diff --git a/wcfsetup/setup/db/install.sql b/wcfsetup/setup/db/install.sql index 645a267f15..4346f645d2 100644 --- a/wcfsetup/setup/db/install.sql +++ b/wcfsetup/setup/db/install.sql @@ -1278,6 +1278,7 @@ CREATE TABLE wcf1_user_menu_item ( permissions TEXT, options TEXT, className VARCHAR(255) NOT NULL DEFAULT '', + iconClassName VARCHAR(255) NOT NULL DEFAULT '', UNIQUE KEY menuItem (menuItem, packageID) ); -- 2.20.1