harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

turn emoji ability into a feature so that either a member or the site admin can disable it. Default is enabled.

Browse Source
This commit is contained in:
redmatrix 2016-06-03 16:04:54 -07:00
parent 624f4641e2
commit e81ac9e063
3 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Zotlabs/Lib/ThreadItem.php
View File

@ -347,6 +347,7 @@ class ThreadItem {
'has_tags' => $has_tags, 'has_tags' => $has_tags,
// Item toolbar buttons // Item toolbar buttons
'emojis' => (($this->is_toplevel() && $this->is_commentable() && feature_enabled($conv->get_profile_owner(),'emojis')) ? '1' : ''),
'like' => $like, 'like' => $like,
'dislike' => ((feature_enabled($conv->get_profile_owner(),'dislike')) ? $dislike : ''), 'dislike' => ((feature_enabled($conv->get_profile_owner(),'dislike')) ? $dislike : ''),
'share' => $share, 'share' => $share,

1
include/features.php
View File

@ -94,6 +94,7 @@ function get_features($filtered = true) {
t('Post/Comment Tools'), t('Post/Comment Tools'),
array('commtag', t('Community Tagging'), t('Ability to tag existing posts'),false,get_config('feature_lock','commtag')), array('commtag', t('Community Tagging'), t('Ability to tag existing posts'),false,get_config('feature_lock','commtag')),
array('categories', t('Post Categories'), t('Add categories to your posts'),false,get_config('feature_lock','categories')), array('categories', t('Post Categories'), t('Add categories to your posts'),false,get_config('feature_lock','categories')),
array('emojis', t('Emoji Reactions'), t('Add emoji reaction ability to posts'),true,get_config('feature_lock','emojis')),
array('filing', t('Saved Folders'), t('Ability to file posts under folders'),false,get_config('feature_lock','filing')), array('filing', t('Saved Folders'), t('Ability to file posts under folders'),false,get_config('feature_lock','filing')),
array('dislike', t('Dislike Posts'), t('Ability to dislike posts/comments'),false,get_config('feature_lock','dislike')), array('dislike', t('Dislike Posts'), t('Ability to dislike posts/comments'),false,get_config('feature_lock','dislike')),
array('star_posts', t('Star Posts'), t('Ability to mark special posts with a star indicator'),false,get_config('feature_lock','star_posts')), array('star_posts', t('Star Posts'), t('Ability to mark special posts with a star indicator'),false,get_config('feature_lock','star_posts')),

2
view/tpl/conv_item.tpl
View File

@ -79,7 +79,7 @@
{{/if}} {{/if}}
<div class="wall-item-tools"> <div class="wall-item-tools">
<div class="wall-item-tools-right pull-right"> <div class="wall-item-tools-right pull-right">
{{if $item.toplevel && $item.like}} {{if $item.toplevel && $item.emojis}}
<div class="btn-group dropdown"> <div class="btn-group dropdown">
<button type="button" class="btn btn-default btn-sm dropdown-toggle" data-toggle="dropdown" id="wall-item-react-{{$item.id}}"> <button type="button" class="btn btn-default btn-sm dropdown-toggle" data-toggle="dropdown" id="wall-item-react-{{$item.id}}">
<i class="fa fa-smile-o"></i> <i class="fa fa-smile-o"></i>