From c673b4f1f99344f932fd0c6ae5af19063d2cea56 Mon Sep 17 00:00:00 2001 From: Marcel Werk Date: Mon, 29 Sep 2014 16:11:47 +0200 Subject: [PATCH] Improved recent activity filter button --- .../templates/dashboardBoxRecentActivity.tpl | 14 ++++++++++---- wcfsetup/install/files/js/WCF.User.js | 2 +- wcfsetup/install/files/style/user.less | 12 ++++++++++++ wcfsetup/install/lang/de.xml | 5 ++--- wcfsetup/install/lang/en.xml | 5 ++--- 5 files changed, 27 insertions(+), 11 deletions(-) diff --git a/com.woltlab.wcf/templates/dashboardBoxRecentActivity.tpl b/com.woltlab.wcf/templates/dashboardBoxRecentActivity.tpl index f41cf59460..80f22b1cee 100644 --- a/com.woltlab.wcf/templates/dashboardBoxRecentActivity.tpl +++ b/com.woltlab.wcf/templates/dashboardBoxRecentActivity.tpl @@ -1,8 +1,14 @@ -
+

{lang}wcf.user.recentActivity{/lang}

- {if $filteredByFollowedUsers}

{lang}wcf.user.recentActivity.filteredByFollowedUsers{/lang}

{/if} - {* TODO: styling *} - {if $canFilterByFollowedUsers}{lang}wcf.user.recentActivity.scope.{if $filteredByFollowedUsers}all{else}followedUsers{/if}{/lang}{/if} + + {if $canFilterByFollowedUsers} + + {/if}
diff --git a/wcfsetup/install/files/js/WCF.User.js b/wcfsetup/install/files/js/WCF.User.js index 7dad12a7b2..a711b5d675 100644 --- a/wcfsetup/install/files/js/WCF.User.js +++ b/wcfsetup/install/files/js/WCF.User.js @@ -1639,7 +1639,7 @@ WCF.User.RecentActivityLoader = Class.extend({ } if (WCF.User.userID) { - $('.jsRecentActivitySwitchContext').click($.proxy(this._switchContext, this)); + $('.jsRecentActivitySwitchContext .button').click($.proxy(this._switchContext, this)); } }, diff --git a/wcfsetup/install/files/style/user.less b/wcfsetup/install/files/style/user.less index 81b1344dc2..87d65bf613 100644 --- a/wcfsetup/install/files/style/user.less +++ b/wcfsetup/install/files/style/user.less @@ -319,4 +319,16 @@ } } } +} + +.dashboardBoxRecentActivityHeadline { + overflow: visible; + position: relative; + min-height: 30px; + + > nav.buttonGroupNavigation { + position: absolute; + right: 4px; + top: 2px; + } } \ No newline at end of file diff --git a/wcfsetup/install/lang/de.xml b/wcfsetup/install/lang/de.xml index e6768be1b2..b1f9934eb3 100644 --- a/wcfsetup/install/lang/de.xml +++ b/wcfsetup/install/lang/de.xml @@ -2920,15 +2920,14 @@ Sollten Sie sich nicht auf der Website: {@PAGE_TITLE|language} angemeldet haben, - - - + + diff --git a/wcfsetup/install/lang/en.xml b/wcfsetup/install/lang/en.xml index f32429558d..0e191df710 100644 --- a/wcfsetup/install/lang/en.xml +++ b/wcfsetup/install/lang/en.xml @@ -2810,15 +2810,14 @@ You can safely ignore this email if you did not register with the website: {@PAG - - - + + -- 2.20.1