From: Marcel Werk <burntime@woltlab.com>
Date: Sat, 6 Dec 2014 02:18:15 +0000 (+0100)
Subject: Made activity point overlay accessible on members list
X-Git-Tag: 2.1.0_Beta_1~88
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=7edf562b46555f5da607114768c2c341704620a3;p=GitHub%2FWoltLab%2FWCF.git

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 ab7d4b250e..c474d61a6f 100644
--- 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 b9777ce013..ecbdf1666a 100644
--- 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 ce60510605..5235ad10e2 100644
--- 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 833dfeb20b..e26cac5a71 100644
--- 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 032411f84f..8d9e2b2d36 100644
--- 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}