diff options
| author | Mario Vavti <mario@mariovavti.com> | 2016-06-05 20:04:12 +0200 |
|---|---|---|
| committer | Mario Vavti <mario@mariovavti.com> | 2016-06-05 20:04:12 +0200 |
| commit | cfbd2fc85c6e428f87c5e8d529c98e3e89202f2a (patch) | |
| tree | 603e88df90c10ba5cc87d5bea90cb530459b70d0 /view | |
| parent | 8d6c2b5d4a799d87df1cd9f6f258890045ce6c62 (diff) | |
| parent | dd6718c2cdf2cadaf7478b848eb892dcda1dc7e9 (diff) | |
| download | volse-hubzilla-cfbd2fc85c6e428f87c5e8d529c98e3e89202f2a.tar.gz volse-hubzilla-cfbd2fc85c6e428f87c5e8d529c98e3e89202f2a.tar.bz2 volse-hubzilla-cfbd2fc85c6e428f87c5e8d529c98e3e89202f2a.zip | |
Merge branch 'dev' into sabre32
Diffstat (limited to 'view')
| -rw-r--r-- | view/css/conversation.css | 5 | ||||
| -rwxr-xr-x | view/tpl/conv_item.tpl | 18 |
2 files changed, 9 insertions, 14 deletions
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 diff --git a/view/tpl/conv_item.tpl b/view/tpl/conv_item.tpl index 997c27259..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.like}} + {{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}} |