From e81ac9e0637c4533aeb144511b8f68ec8a99e257 Mon Sep 17 00:00:00 2001
From: redmatrix <git@macgirvin.com>
Date: Fri, 3 Jun 2016 16:04:54 -0700
Subject: turn emoji ability into a feature so that either a member or the site
 admin can disable it. Default is enabled.

---
 view/tpl/conv_item.tpl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'view')

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>
-- 
cgit v1.2.3


From a7e5e3d5740e499fdf44874d9d361cf344dfd290 Mon Sep 17 00:00:00 2001
From: redmatrix <git@macgirvin.com>
Date: Fri, 3 Jun 2016 18:13:21 -0700
Subject: allow any (current) emoji to be displayed on any site, and provide a
 default list of reactions that can be over-ridden via configuration if a site
 doesn't like our choices or perhaps the ordering of our choices.

---
 view/tpl/conv_item.tpl | 18 ++++--------------
 1 file changed, 4 insertions(+), 14 deletions(-)

(limited to 'view')

diff --git a/view/tpl/conv_item.tpl b/view/tpl/conv_item.tpl
index 662eeaf97..817a03028 100755
--- a/view/tpl/conv_item.tpl
+++ b/view/tpl/conv_item.tpl
@@ -79,25 +79,15 @@
 				{{/if}}
 				<div class="wall-item-tools">
 					<div class="wall-item-tools-right pull-right">
-						{{if $item.toplevel && $item.emojis}}
+						{{if $item.toplevel && $item.emojis && $item.reactions}}
 						<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>
 							</button>
 							<ul class="dropdown-menu dropdown-menu-left" role="menu" aria-labelledby="wall-item-react-{{$item.id}}">
-								<li role="presentation"><a role="menuitem" href="#" onclick="jotReact({{$item.id}},'1f60a'); return false;"><img class="dropdown-menu-img-sm" src="/images/emoji/1f60a.png" alt="1f60a" /></a></li>
-								<li role="presentation"><a role="menuitem" href="#" onclick="jotReact({{$item.id}},'1f44f'); return false;"><img class="dropdown-menu-img-sm" src="/images/emoji/1f44f.png" alt="1f44f" /></a></li>
-								<li role="presentation"><a role="menuitem" href="#" onclick="jotReact({{$item.id}},'1f37e'); return false;"><img class="dropdown-menu-img-sm" src="/images/emoji/1f37e.png" alt="1f37e" /></a></li>
-								<li role="presentation"><a role="menuitem" href="#" onclick="jotReact({{$item.id}},'1f48b'); return false;"><img class="dropdown-menu-img-sm" src="/images/emoji/1f48b.png" alt="1f48b" /></a></li>
-								<li role="presentation"><a role="menuitem" href="#" onclick="jotReact({{$item.id}},'1f61e'); return false;"><img class="dropdown-menu-img-sm" src="/images/emoji/1f61e.png" alt="1f61e" /></a></li>
-								<li role="presentation"><a role="menuitem" href="#" onclick="jotReact({{$item.id}},'2665'); return false;"><img class="dropdown-menu-img-sm" src="/images/emoji/2665.png" alt="2665" /></a></li>
-								<li role="presentation"><a role="menuitem" href="#" onclick="jotReact({{$item.id}},'1f622'); return false;"><img class="dropdown-menu-img-sm" src="/images/emoji/1f622.png" alt="1f622" /></a></li>
-								<li role="presentation"><a role="menuitem" href="#" onclick="jotReact({{$item.id}},'1f62e'); return false;"><img class="dropdown-menu-img-sm" src="/images/emoji/1f62e.png" alt="1f62e" /></a></li>
-								<li role="presentation"><a role="menuitem" href="#" onclick="jotReact({{$item.id}},'1f634'); return false;"><img class="dropdown-menu-img-sm" src="/images/emoji/1f634.png" alt="1f634" /></a></li>
-								<li role="presentation"><a role="menuitem" href="#" onclick="jotReact({{$item.id}},'1f61c'); return false;"><img class="dropdown-menu-img-sm" src="/images/emoji/1f61c.png" alt="1f61c" /></a></li>
-								<li role="presentation"><a role="menuitem" href="#" onclick="jotReact({{$item.id}},'1f607'); return false;"><img class="dropdown-menu-img-sm" src="/images/emoji/1f607.png" alt="1f607" /></a></li>
-								<li role="presentation"><a role="menuitem" href="#" onclick="jotReact({{$item.id}},'1f608'); return false;"><img class="dropdown-menu-img-sm" src="/images/emoji/1f608.png" alt="1f608" /></a></li>
-
+							{{foreach $item.reactions as $react}}
+								<li role="presentation"><a role="menuitem" href="#" onclick="jotReact({{$item.id}},'{{$react}}'); return false;"><img class="dropdown-menu-img-sm" src="/images/emoji/{{$react}}.png" alt="{{$react}}" /></a></li>
+							{{/foreach}}
 							</ul>
 						</div>
 						{{/if}}
-- 
cgit v1.2.3


From dd6718c2cdf2cadaf7478b848eb892dcda1dc7e9 Mon Sep 17 00:00:00 2001
From: redmatrix <git@macgirvin.com>
Date: Sat, 4 Jun 2016 18:10:42 -0700
Subject: provide a hover class for smiley emojis which renders them slightly
 larger on compatible devices when you single them out for inspection

---
 view/css/conversation.css | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'view')

diff --git a/view/css/conversation.css b/view/css/conversation.css
index 328f9df02..b6e316121 100644
--- a/view/css/conversation.css
+++ b/view/css/conversation.css
@@ -312,3 +312,8 @@ code.inline-code {
 .overline {
 	text-decoration: overline;
 }
+
+img.smiley.emoji:hover {
+	width: 32px;
+	height: 32px;
+}
\ No newline at end of file
-- 
cgit v1.2.3