Made activity point overlay accessible on members list

diff --git a/com.woltlab.wcf/templates/headIncludeJavaScript.tpl b/com.woltlab.wcf/templates/headIncludeJavaScript.tpl
index ab7d4b250e6f7dfee81cbbe21af5c307e2a786dc..c474d61a6febfa6d0d1ba1b473cdc44cfb81697e 100644 (file)
--- a/com.woltlab.wcf/templates/headIncludeJavaScript.tpl
+++ b/com.woltlab.wcf/templates/headIncludeJavaScript.tpl
@@ -111,7 +111,8 @@
                'wcf.global.thousandsSeparator': '{capture assign=thousandsSeparator}{lang}wcf.global.thousandsSeparator{/lang}{/capture}{@$thousandsSeparator|encodeJS}',
                'wcf.page.pagePosition': '{lang __literal=true}wcf.page.pagePosition{/lang}',
                'wcf.page.sitemap': '{lang}wcf.page.sitemap{/lang}',
-               'wcf.style.changeStyle': '{lang}wcf.style.changeStyle{/lang}'
+               'wcf.style.changeStyle': '{lang}wcf.style.changeStyle{/lang}',
+               'wcf.user.activityPoint': '{lang}wcf.user.activityPoint{/lang}'
                {if MODULE_LIKE}
                        ,'wcf.like.button.like': '{lang}wcf.like.button.like{/lang}',
                        'wcf.like.button.dislike': '{lang}wcf.like.button.dislike{/lang}',
@@ -174,6 +175,7 @@
                WCF.Date.Picker.init();
                new WCF.User.ProfilePreview();
                new WCF.Notice.Dismiss();
+               WCF.User.Profile.ActivityPointList.init();
                
                {event name='javascriptInit'}
                

diff --git a/com.woltlab.wcf/templates/messageSidebar.tpl b/com.woltlab.wcf/templates/messageSidebar.tpl
index b9777ce01314e1482ffebb96023202b6c6c68490..ecbdf1666a2e07a03640d3a0a05320470317789a 100644 (file)
--- a/com.woltlab.wcf/templates/messageSidebar.tpl
+++ b/com.woltlab.wcf/templates/messageSidebar.tpl
@@ -1,15 +1,4 @@
 {if !$__messageSidebarJavascript|isset}
-       <script data-relocate="true">
-               //<![CDATA[
-               $(function() {
-                       WCF.Language.addObject({
-                               'wcf.user.activityPoint': '{lang}wcf.user.activityPoint{/lang}'
-                       });
-                       
-                       WCF.User.Profile.ActivityPointList.init();
-               });
-               //]]>
-       </script>
        {assign var=__messageSidebarJavascript value=true}
 {/if}
 

diff --git a/com.woltlab.wcf/templates/user.tpl b/com.woltlab.wcf/templates/user.tpl
index ce60510605f4d50f410c30076894c9c5353ea841..5235ad10e20951b4a03283c419c90bfed86a78d0 100644 (file)
--- a/com.woltlab.wcf/templates/user.tpl
+++ b/com.woltlab.wcf/templates/user.tpl
@@ -39,14 +39,6 @@
                                new WCF.User.Profile.Editor({@$user->userID}, {if $editOnInit}true{else}false{/if});
                        {/if}
                        
-                       {if $user->activityPoints}
-                               WCF.Language.addObject({
-                                       'wcf.user.activityPoint': '{lang}wcf.user.activityPoint{/lang}'
-                               });
-                               
-                               WCF.User.Profile.ActivityPointList.init();
-                       {/if}
-                       
                        {if $followingCount > 10}
                                var $followingList = null;
                                $('#followingAll').click(function() {

diff --git a/com.woltlab.wcf/templates/userInformationStatistics.tpl b/com.woltlab.wcf/templates/userInformationStatistics.tpl
index 833dfeb20b4258b687e6ead5af556c485ba37dca..e26cac5a719c7a7a62626f0d365015b67ce7cdd5 100644 (file)
--- a/com.woltlab.wcf/templates/userInformationStatistics.tpl
+++ b/com.woltlab.wcf/templates/userInformationStatistics.tpl
@@ -7,7 +7,7 @@
        {/if}
        
        {if $user->activityPoints}
-               <dt>{lang}wcf.user.activityPoint{/lang}</dt>
+               <dt><a href="#" class="activityPointsDisplay jsTooltip" title="{lang}wcf.user.activityPoint.showActivityPoints{/lang}" data-user-id="{@$user->userID}">{lang}wcf.user.activityPoint{/lang}</a></dt>
                <dd>{#$user->activityPoints}</dd>
        {/if}
 </dl>
\ No newline at end of file

diff --git a/com.woltlab.wcf/templates/userSidebar.tpl b/com.woltlab.wcf/templates/userSidebar.tpl
index 032411f84f3843bb9ac9ed189150274c3ebfb69c..8d9e2b2d364526d4658e72979ac4ef0f92215be9 100644 (file)
--- a/com.woltlab.wcf/templates/userSidebar.tpl
+++ b/com.woltlab.wcf/templates/userSidebar.tpl
@@ -24,7 +24,7 @@
                                {/if}
                                
                                {if $user->activityPoints}
-                                       <dt>{if $user->activityPoints}<a href="#" class="activityPointsDisplay jsTooltip" title="{lang}wcf.user.activityPoint.showActivityPoints{/lang}" data-user-id="{@$user->userID}">{lang}wcf.user.activityPoint{/lang}</a>{else}{lang}wcf.user.activityPoint{/lang}{/if}</dt>
+                                       <dt><a href="#" class="activityPointsDisplay jsTooltip" title="{lang}wcf.user.activityPoint.showActivityPoints{/lang}" data-user-id="{@$user->userID}">{lang}wcf.user.activityPoint{/lang}</a></dt>
                                        <dd>{#$user->activityPoints}</dd>
                                {/if}