Add showMore class for containerList items

This class generalizes (and will replace) recentActivitiesMore.

diff --git a/wcfsetup/install/files/js/WCF.User.js b/wcfsetup/install/files/js/WCF.User.js
index 8dfea5b75452b90afd2781bf4cb32f08e205e4c9..72046114ea16fec7ac6008808f44353e9d79fb61 100644 (file)
--- 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 = $('<li class="recentActivitiesMore"><button class="small">' + WCF.Language.get('wcf.user.recentActivity.more') + '</button></li>').appendTo(this._container);
+                       // todo: remove recentActivitiesMore in 2.2
+                       this._loadButton = $('<li class="recentActivitiesMore showMore"><button class="small">' + WCF.Language.get('wcf.user.recentActivity.more') + '</button></li>').appendTo(this._container);
                        this._loadButton = this._loadButton.children('button').click($.proxy(this._click, this));
                }
                else {
-                       $('<li class="recentActivitiesMore"><small>' + WCF.Language.get('wcf.user.recentActivity.noMoreEntries') + '</small></li>').appendTo(this._container);
+                       // todo: remove recentActivitiesMore in 2.2
+                       $('<li class="recentActivitiesMore showMore"><small>' + WCF.Language.get('wcf.user.recentActivity.noMoreEntries') + '</small></li>').appendTo(this._container);
                }
                
                if (WCF.User.userID) {
@@ -2021,7 +2023,8 @@ WCF.User.LikeLoader = Class.extend({
                        success: $.proxy(this._success, this)
                });
                
-               var $container = $('<li class="likeListMore recentActivitiesMore"><button class="small">' + WCF.Language.get('wcf.like.likes.more') + '</button><small>' + WCF.Language.get('wcf.like.likes.noMoreEntries') + '</small></li>').appendTo(this._container);
+               // todo: remove recentActivitiesMore in 2.2
+               var $container = $('<li class="likeListMore recentActivitiesMore showMore"><button class="small">' + WCF.Language.get('wcf.like.likes.more') + '</button><small>' + WCF.Language.get('wcf.like.likes.noMoreEntries') + '</small></li>').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 59d900612e7b209ffdcd8f37b0dc52fc38a5ce12..bdf66607ac1a34495f6517ea1ef4e8a0a0bbf292 100644 (file)
--- 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 db3cd43a0a8611dc5b956afe1ac7a3f9ed2397b3..0c751663d21b06420ee3df2407e26a47f9525ac3 100644 (file)
--- 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;