From: Marcel Werk Date: Mon, 20 May 2013 22:23:22 +0000 (+0200) Subject: Merged com.woltlab.wcf.like into WCF X-Git-Tag: 2.0.0_Beta_1~126 X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=00b6f9566682480ad92c0f81d64ee913410b6f1b;p=GitHub%2FWoltLab%2FWCF.git Merged com.woltlab.wcf.like into WCF --- diff --git a/com.woltlab.wcf/dashboardBox.xml b/com.woltlab.wcf/dashboardBox.xml index 226ab83a9c..e7ce58956a 100644 --- a/com.woltlab.wcf/dashboardBox.xml +++ b/com.woltlab.wcf/dashboardBox.xml @@ -35,5 +35,10 @@ sidebar + + + + sidebar + diff --git a/com.woltlab.wcf/objectType.xml b/com.woltlab.wcf/objectType.xml index 2e628f4653..dca396a5f8 100644 --- a/com.woltlab.wcf/objectType.xml +++ b/com.woltlab.wcf/objectType.xml @@ -139,5 +139,14 @@ wcf\system\moderation\queue\ModerationQueueReportManager + + + + com.woltlab.wcf.like.activityPointEvent.receivedLikes + com.woltlab.wcf.user.activityPointEvent + 1 + wcf\system\user\activity\point\ReceivedLikesUserActivityPointObjectProcessor + + \ No newline at end of file diff --git a/com.woltlab.wcf/objectTypeDefinition.xml b/com.woltlab.wcf/objectTypeDefinition.xml index 57f677e7fd..94cd667e7f 100644 --- a/com.woltlab.wcf/objectTypeDefinition.xml +++ b/com.woltlab.wcf/objectTypeDefinition.xml @@ -89,5 +89,10 @@ com.woltlab.wcf.moderation.report wcf\system\moderation\queue\report\IModerationQueueReportHandler + + + com.woltlab.wcf.like.likeableObject + wcf\data\like\ILikeObjectTypeProvider + diff --git a/com.woltlab.wcf/option.xml b/com.woltlab.wcf/option.xml index 0a96fccc48..cf426faa96 100644 --- a/com.woltlab.wcf/option.xml +++ b/com.woltlab.wcf/option.xml @@ -165,6 +165,9 @@ message.general + + message.general + message @@ -278,6 +281,12 @@ 1 + + + + + + + + diff --git a/com.woltlab.wcf/template/dashboardBoxMostLikedMembers.tpl b/com.woltlab.wcf/template/dashboardBoxMostLikedMembers.tpl new file mode 100644 index 0000000000..20b55ba98a --- /dev/null +++ b/com.woltlab.wcf/template/dashboardBoxMostLikedMembers.tpl @@ -0,0 +1,12 @@ + diff --git a/com.woltlab.wcf/template/headInclude.tpl b/com.woltlab.wcf/template/headInclude.tpl index 4f8eaa537c..199f089104 100644 --- a/com.woltlab.wcf/template/headInclude.tpl +++ b/com.woltlab.wcf/template/headInclude.tpl @@ -45,6 +45,7 @@ + {event name='javascriptInclude'} @@ -116,6 +117,14 @@ 'wcf.global.thousandsSeparator': '{capture assign=thousandsSeparator}{lang}wcf.global.thousandsSeparator{/lang}{/capture}{@$thousandsSeparator|encodeJS}', 'wcf.page.sitemap': '{lang}wcf.page.sitemap{/lang}', 'wcf.style.changeStyle': '{lang}wcf.style.changeStyle{/lang}' + {if MODULE_LIKE} + ,'wcf.like.button.like': '{lang}wcf.like.button.like{/lang}', + 'wcf.like.button.dislike': '{lang}wcf.like.button.dislike{/lang}', + 'wcf.like.tooltip': '{lang}wcf.like.jsTooltip{/lang}', + 'wcf.like.summary': '{lang}wcf.like.summary{/lang}', + 'wcf.like.details': '{lang}wcf.like.details{/lang}' + {/if} + {event name='javascriptLanguageImport'} }); diff --git a/com.woltlab.wcf/template/membersList.tpl b/com.woltlab.wcf/template/membersList.tpl index 4f947c4ddb..91cd06673e 100644 --- a/com.woltlab.wcf/template/membersList.tpl +++ b/com.woltlab.wcf/template/membersList.tpl @@ -76,6 +76,7 @@ + {event name='sortField'}