diff options
| author | redmatrix <git@macgirvin.com> | 2016-06-03 16:04:54 -0700 |
|---|---|---|
| committer | redmatrix <git@macgirvin.com> | 2016-06-03 16:04:54 -0700 |
| commit | e81ac9e0637c4533aeb144511b8f68ec8a99e257 (patch) | |
| tree | a2be7feb55245d56e83b9b89f4c93e94d8ebd6c7 | |
| parent | 624f4641e2a8af91f519ac47ba1c72138734b17c (diff) | |
| download | volse-hubzilla-e81ac9e0637c4533aeb144511b8f68ec8a99e257.tar.gz volse-hubzilla-e81ac9e0637c4533aeb144511b8f68ec8a99e257.tar.bz2 volse-hubzilla-e81ac9e0637c4533aeb144511b8f68ec8a99e257.zip | |
turn emoji ability into a feature so that either a member or the site admin can disable it. Default is enabled.
| -rw-r--r-- | Zotlabs/Lib/ThreadItem.php | 1 | ||||
| -rw-r--r-- | include/features.php | 1 | ||||
| -rwxr-xr-x | view/tpl/conv_item.tpl | 2 |
3 files changed, 3 insertions, 1 deletions
diff --git a/Zotlabs/Lib/ThreadItem.php b/Zotlabs/Lib/ThreadItem.php index 0ba0c0a13..65f00b867 100644 --- a/Zotlabs/Lib/ThreadItem.php +++ b/Zotlabs/Lib/ThreadItem.php @@ -347,6 +347,7 @@ class ThreadItem { 'has_tags' => $has_tags, // Item toolbar buttons + 'emojis' => (($this->is_toplevel() && $this->is_commentable() && feature_enabled($conv->get_profile_owner(),'emojis')) ? '1' : ''), 'like' => $like, 'dislike' => ((feature_enabled($conv->get_profile_owner(),'dislike')) ? $dislike : ''), 'share' => $share, diff --git a/include/features.php b/include/features.php index 38700f9f5..6d38bcfb4 100644 --- a/include/features.php +++ b/include/features.php @@ -94,6 +94,7 @@ function get_features($filtered = true) { t('Post/Comment Tools'), 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('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('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')), diff --git a/view/tpl/conv_item.tpl b/view/tpl/conv_item.tpl index 997c27259..662eeaf97 100755 --- a/view/tpl/conv_item.tpl +++ b/view/tpl/conv_item.tpl @@ -79,7 +79,7 @@ {{/if}} <div class="wall-item-tools"> <div class="wall-item-tools-right pull-right"> - {{if $item.toplevel && $item.like}} + {{if $item.toplevel && $item.emojis}} <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}}"> <i class="fa fa-smile-o"></i> |