From ac8119523e9dfc57ad6c872a507971071f33643d Mon Sep 17 00:00:00 2001 From: Matthias Schmidt Date: Wed, 11 Mar 2015 18:11:03 +0100 Subject: [PATCH] Add showMore class for containerList items This class generalizes (and will replace) recentActivitiesMore. --- wcfsetup/install/files/js/WCF.User.js | 9 ++++++--- wcfsetup/install/files/style/layout.less | 13 +++++++++++++ wcfsetup/install/files/style/user.less | 1 + 3 files changed, 20 insertions(+), 3 deletions(-) diff --git a/wcfsetup/install/files/js/WCF.User.js b/wcfsetup/install/files/js/WCF.User.js index 8dfea5b754..72046114ea 100644 --- a/wcfsetup/install/files/js/WCF.User.js +++ b/wcfsetup/install/files/js/WCF.User.js @@ -1874,11 +1874,13 @@ WCF.User.RecentActivityLoader = Class.extend({ }); if (this._container.children('li').length) { - this._loadButton = $('
  • ').appendTo(this._container); + // todo: remove recentActivitiesMore in 2.2 + this._loadButton = $('
  • ').appendTo(this._container); this._loadButton = this._loadButton.children('button').click($.proxy(this._click, this)); } else { - $('
  • ' + WCF.Language.get('wcf.user.recentActivity.noMoreEntries') + '
  • ').appendTo(this._container); + // todo: remove recentActivitiesMore in 2.2 + $('
  • ' + WCF.Language.get('wcf.user.recentActivity.noMoreEntries') + '
  • ').appendTo(this._container); } if (WCF.User.userID) { @@ -2021,7 +2023,8 @@ WCF.User.LikeLoader = Class.extend({ success: $.proxy(this._success, this) }); - var $container = $('
  • ' + WCF.Language.get('wcf.like.likes.noMoreEntries') + '
  • ').appendTo(this._container); + // todo: remove recentActivitiesMore in 2.2 + var $container = $('
  • ' + WCF.Language.get('wcf.like.likes.noMoreEntries') + '
  • ').appendTo(this._container); this._loadButton = $container.children('button').click($.proxy(this._click, this)); this._noMoreEntries = $container.children('small').hide(); diff --git a/wcfsetup/install/files/style/layout.less b/wcfsetup/install/files/style/layout.less index 59d900612e..bdf66607ac 100644 --- a/wcfsetup/install/files/style/layout.less +++ b/wcfsetup/install/files/style/layout.less @@ -982,6 +982,19 @@ html[dir="rtl"] { } } + &.showMore { + text-align: center; + + > button { + padding-left: 30px; + padding-right: 30px; + } + + > small { + color: @wcfDimmedColor; + } + } + > div > div { position: relative; diff --git a/wcfsetup/install/files/style/user.less b/wcfsetup/install/files/style/user.less index db3cd43a0a..0c751663d2 100644 --- a/wcfsetup/install/files/style/user.less +++ b/wcfsetup/install/files/style/user.less @@ -127,6 +127,7 @@ /* recent activities */ .recentActivityList { > li { + /* todo: remove with 2.2 */ &.recentActivitiesMore { text-align: center; -- 2.20.1