MrPetovan/friendica
2
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge pull request #2798 from Hypolite/issue-2792

Browse source 
Issue #2792
This commit is contained in:
Michael Vogel 2016-09-25 20:19:32 +02:00 committed by GitHub
parent fa8be545b2 c5260c0f2f
commit 29a8d2f957
23 changed files with 233 additions and 180 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
include/conversation.php
View file

@ -1056,6 +1056,9 @@ function builtin_activity_puller($item, &$conv_responses) {
else
$conv_responses[$mode][$item['thr-parent']] ++;
if((local_user()) && (local_user() == $item['uid']) && ($item['self']))
$conv_responses[$mode][$item['thr-parent'] . '-self'] = 1;
$conv_responses[$mode][$item['thr-parent'] . '-l'][] = $url;
// there can only be one activity verb per item so if we found anything, we can stop looking
@ -1435,6 +1438,7 @@ function get_responses($conv_responses,$response_verbs,$ob,$item) {
$ret[$v] = array();
$ret[$v]['count'] = ((x($conv_responses[$v],$item['uri'])) ? $conv_responses[$v][$item['uri']] : '');
$ret[$v]['list'] = ((x($conv_responses[$v],$item['uri'])) ? $conv_responses[$v][$item['uri'] . '-l'] : '');
$ret[$v]['self'] = ((x($conv_responses[$v],$item['uri'])) ? $conv_responses[$v][$item['uri'] . '-self'] : '0');
if(count($ret[$v]['list']) > MAX_LIKERS) {
$ret[$v]['list_part'] = array_slice($ret[$v]['list'], 0, MAX_LIKERS);
array_push($ret[$v]['list_part'], '<a href="#" data-toggle="modal" data-target="#' . $v . 'Modal-'

10
view/templates/wall_thread.tpl
View file

@ -64,8 +64,8 @@
<div class="wall-item-tools" id="wall-item-tools-{{$item.id}}">
{{if $item.vote}}
<div class="wall-item-like-buttons" id="wall-item-like-buttons-{{$item.id}}">
<a href="#" class="icon like" title="{{$item.vote.like.0|escape:'html'}}" onclick="dolike({{$item.id}},'like'); return false"></a>
{{if $item.vote.dislike}}<a href="#" class="icon dislike" title="{{$item.vote.dislike.0|escape:'html'}}" onclick="dolike({{$item.id}},'dislike'); return false"></a>{{/if}}
<a href="#" class="icon like{{if $item.responses.like.self}} active{{/if}}" title="{{$item.vote.like.0|escape:'html'}}" onclick="dolike({{$item.id}},'like'); return false"></a>
{{if $item.vote.dislike}}<a href="#" class="icon dislike{{if $item.responses.dislike.self}} active{{/if}}" title="{{$item.vote.dislike.0|escape:'html'}}" onclick="dolike({{$item.id}},'dislike'); return false"></a>{{/if}}
{{if $item.vote.share}}<a href="#" class="icon recycle wall-item-share-buttons" title="{{$item.vote.share.0|escape:'html'}}" onclick="jotShare({{$item.id}}); return false"></a>{{/if}}
<img id="like-rotator-{{$item.id}}" class="like-rotator" src="images/rotator.gif" alt="{{$item.wait|escape:'html'}}" title="{{$item.wait|escape:'html'}}" style="display: none;" />
</div>
@ -88,9 +88,9 @@
{{/if}}
{{if $item.isevent }}
<div class="wall-item-attend-wrapper">
<a href="#" id="attendyes-{{$item.id}}" class="icon attendyes" onclick="dolike({{$item.id}},'attendyes'); return false;" title="{{$item.attend.0|escape:'html'}}"></a>
<a href="#" id="attendno-{{$item.id}}" class="icon attendno" onclick="dolike({{$item.id}},'attendno'); return false;" title="{{$item.attend.1|escape:'html'}}"></a>
<a href="#" id="attendmaybe-{{$item.id}}" class="icon attendmaybe" onclick="dolike({{$item.id}},'attendmaybe'); return false;" title="{{$item.attend.2|escape:'html'}}"></a>
<a href="#" id="attendyes-{{$item.id}}" class="icon attendyes{{if $item.responses.attendyes.self}} active{{/if}}" onclick="dolike({{$item.id}},'attendyes'); return false;" title="{{$item.attend.0|escape:'html'}}"></a>
<a href="#" id="attendno-{{$item.id}}" class="icon attendno{{if $item.responses.attendno.self}} active{{/if}}" onclick="dolike({{$item.id}},'attendno'); return false;" title="{{$item.attend.1|escape:'html'}}"></a>
<a href="#" id="attendmaybe-{{$item.id}}" class="icon attendmaybe{{if $item.responses.attendmaybe.self}} active{{/if}}" onclick="dolike({{$item.id}},'attendmaybe'); return false;" title="{{$item.attend.2|escape:'html'}}"></a>
</div>
{{/if}}
<div class="wall-item-delete-wrapper" id="wall-item-delete-wrapper-{{$item.id}}" >

5
view/theme/duepuntozero/style.css
View file

@ -1154,6 +1154,11 @@ input#dfrn-url {
margin-right: 10px;
}
.wall-item-like-buttons > a.active,
.wall-item-attend-wrapper > a.active {
background-color: rgba(52, 101, 164, .5);
}
.editpost {
margin-left: 10px;
float: left;

7
view/theme/frio/css/style.css
View file

@ -1463,14 +1463,19 @@ blockquote.shared_content {
/* item social action buttons */
.wall-item-actions, .wall-item-actions a {
font-size: 13px;
/*color: #aeaeae;*/
color: #555;
margin-top: 15px;
margin-bottom: 0;
}
.wall-item-actions a.active {
font-weight: bold;
}
.wall-item-actions a:hover {
color: #555;
}
.wall-item-actions a.active:hover {
color: $link_color;
}
.wall-item-actions-left {
display: table-cell;
vertical-align: middle;

10
view/theme/frio/templates/search_item.tpl
View file

@ -170,7 +170,7 @@
{{* Buttons for like and dislike *}}
{{if $item.vote}}
{{if $item.vote.like}}
<a role="button" href="#" class="button-likes" id="like-{{$item.id}}" title="{{$item.vote.like.0}}" onclick="dolike({{$item.id}},'like'); return false;">{{$item.vote.like.0}}</a>
<a role="button" href="#" class="button-likes{{if $item.responses.like.self}} active{{/if}}" id="like-{{$item.id}}" title="{{$item.vote.like.0}}" onclick="dolike({{$item.id}},'like'); return false;">{{$item.vote.like.0}}</a>
{{/if}}
{{if $item.vote.like AND $item.vote.dislike}}
@ -178,7 +178,7 @@
{{/if}}
{{if $item.vote.dislike}}
<a role="button" href="#" class="button-likes" id="dislike-{{$item.id}}" title="{{$item.vote.dislike.0}}" onclick="dolike({{$item.id}},'dislike'); return false;">{{$item.vote.dislike.0}}</a>
<a role="button" href="#" class="button-likes{{if $item.responses.like.self}} active{{/if}}" id="dislike-{{$item.id}}" title="{{$item.vote.dislike.0}}" onclick="dolike({{$item.id}},'dislike'); return false;">{{$item.vote.dislike.0}}</a>
{{/if}}
{{if ($item.vote.like OR $item.vote.dislike) AND $item.comment}}
@ -207,9 +207,9 @@
{{* Event attendance buttons *}}
{{if $item.isevent}}
<div class="vote-event">
<a role="button" href="#" class="button-event" id="attendyes-{{$item.id}}" title="{{$item.attend.0}}" onclick="dolike({{$item.id}},'attendyes'); return false;"><i class="fa fa-check"><span class="sr-only">{{$item.attend.0}}</span></i></a>
<a role="button" href="#" class="button-event" id="attendno-{{$item.id}}" title="{{$item.attend.1}}" onclick="dolike({{$item.id}},'attendno'); return false;"><i class="fa fa-times"><span class="sr-only">{{$item.attend.1}}</span></i></a>
<a role="button" href="#" class="button-event" id="attendmaybe-{{$item.id}}" title="{{$item.attend.2}}" onclick="dolike({{$item.id}},'attendmaybe'); return false;"><i class="fa fa-question"><span class="sr-only">{{$item.attend.2}}</span></i></a>
<a role="button" href="#" class="button-event{{if $item.responses.attendyes.self}} active{{/if}}" id="attendyes-{{$item.id}}" title="{{$item.attend.0}}" onclick="dolike({{$item.id}},'attendyes'); return false;"><i class="fa fa-check"><span class="sr-only">{{$item.attend.0}}</span></i></a>
<a role="button" href="#" class="button-event{{if $item.responses.attendno.self}} active{{/if}}" id="attendno-{{$item.id}}" title="{{$item.attend.1}}" onclick="dolike({{$item.id}},'attendno'); return false;"><i class="fa fa-times"><span class="sr-only">{{$item.attend.1}}</span></i></a>
<a role="button" href="#" class="button-event{{if $item.responses.attendmaybe.self}} active{{/if}}" id="attendmaybe-{{$item.id}}" title="{{$item.attend.2}}" onclick="dolike({{$item.id}},'attendmaybe'); return false;"><i class="fa fa-question"><span class="sr-only">{{$item.attend.2}}</span></i></a>
</div>
{{/if}}

14
view/theme/frio/templates/wall_thread.tpl
View file

@ -59,7 +59,6 @@ as the value of $top_child_total (this is done at the end of this file)
<div class="wall-item-decor" style="display:none;">
<span class="icon s22 star {{$item.isstarred}}" id="starred-{{$item.id}}" title="{{$item.star.starred}}">{{$item.star.starred}}</span>
{{if $item.lock}}<span class="navicon lock fakelink" onclick="lockview(event,{{$item.id}});" title="{{$item.lock}}"></span><span class="fa fa-lock"></span>{{/if}}
<img id="like-rotator-{{$item.id}}" class="like-rotator" src="images/rotator.gif" alt="{{$item.wait}}" title="{{$item.wait}}" style="display: none;" />
</div>
<!-- ./TODO => Unknow block -->
@ -191,6 +190,7 @@ as the value of $top_child_total (this is done at the end of this file)
<div class="additional-info text-muted">
<div id="wall-item-ago-{{$item.id}}" class="wall-item-ago">
<small><a href="{{$item.plink.orig}}"><span class="time" title="{{$item.localtime}}" data-toggle="tooltip"><time class="dt-published" datetime="{{$item.localtime}}">{{$item.ago}}</time></span></a></small>
<img id="like-rotator-{{$item.id}}" class="like-rotator" src="images/rotator.gif" alt="{{$item.wait}}" title="{{$item.wait}}" style="display: none;" />
</div>
{{if $item.location}}
@ -285,7 +285,7 @@ as the value of $top_child_total (this is done at the end of this file)
{{* Buttons for like and dislike *}}
{{if $item.vote}}
{{if $item.vote.like}}
<a role="button" class="button-likes" id="like-{{$item.id}}" title="{{$item.vote.like.1}}" onclick="dolike({{$item.id}},'like'); return false;"><i class="fa fa-thumbs-up"></i>&nbsp;{{$item.vote.like.1}}</a>
<a role="button" class="button-likes{{if $item.responses.like.self}} active{{/if}}" id="like-{{$item.id}}" title="{{$item.vote.like.0}}" onclick="dolike({{$item.id}},'like'); return false;"><i class="fa fa-thumbs-up"></i>&nbsp;{{$item.vote.like.1}}</a>
{{/if}}
{{if $item.vote.like AND $item.vote.dislike}}
@ -293,7 +293,7 @@ as the value of $top_child_total (this is done at the end of this file)
{{/if}}
{{if $item.vote.dislike}}
<a role="button" class="button-likes" id="dislike-{{$item.id}}" title="{{$item.vote.dislike.1}}" onclick="dolike({{$item.id}},'dislike'); return false;"><i class="fa fa-thumbs-down"></i>&nbsp;{{$item.vote.dislike.1}}</a>
<a role="button" class="button-likes{{if $item.responses.dislike.self}} active{{/if}}" id="dislike-{{$item.id}}" title="{{$item.vote.dislike.0}}" onclick="dolike({{$item.id}},'dislike'); return false;"><i class="fa fa-thumbs-down"></i>&nbsp;{{$item.vote.dislike.1}}</a>
{{/if}}
{{if ($item.vote.like OR $item.vote.dislike) AND $item.comment}}
@ -312,7 +312,7 @@ as the value of $top_child_total (this is done at the end of this file)
<span role="presentation" class="separator">&nbsp;•&nbsp;</span>
{{/if}}
{{if $item.vote.share}}
<a role="button" class="button-votes" id="share-{{$item.id}}" title="{{$item.vote.share.0}}" onclick="jotShare({{$item.id}}); return false;"><i class="fa fa-retweet"></i>&nbsp;{{$item.vote.share.0}}</a>
<a role="button" class="button-votes" id="share-{{$item.id}}" title="{{$item.vote.share.0}}" onclick="jotShare({{$item.id}}); return false;"><i class="fa fa-retweet"></i>&nbsp;{{$item.vote.share.1}}</a>
{{/if}}
{{/if}}
</div>
@ -321,9 +321,9 @@ as the value of $top_child_total (this is done at the end of this file)
{{* Event attendance buttons *}}
{{if $item.isevent}}
<div class="vote-event">
<a role="button" class="button-event" id="attendyes-{{$item.id}}" title="{{$item.attend.0}}" onclick="dolike({{$item.id}},'attendyes'); return false;"><i class="fa fa-check"><span class="sr-only">{{$item.attend.0}}</span></i></a>
<a role="button" class="button-event" id="attendno-{{$item.id}}" title="{{$item.attend.1}}" onclick="dolike({{$item.id}},'attendno'); return false;"><i class="fa fa-times"><span class="sr-only">{{$item.attend.1}}</span></i></a>
<a role="button" class="button-event" id="attendmaybe-{{$item.id}}" title="{{$item.attend.2}}" onclick="dolike({{$item.id}},'attendmaybe'); return false;"><i class="fa fa-question"><span class="sr-only">{{$item.attend.2}}</span></i></a>
<a role="button" class="button-event{{if $item.responses.attendyes.self}} active{{/if}}" id="attendyes-{{$item.id}}" title="{{$item.attend.0}}" onclick="dolike({{$item.id}},'attendyes'); return false;"><i class="fa fa-check"><span class="sr-only">{{$item.attend.0}}</span></i></a>
<a role="button" class="button-event{{if $item.responses.attendno.self}} active{{/if}}" id="attendno-{{$item.id}}" title="{{$item.attend.1}}" onclick="dolike({{$item.id}},'attendno'); return false;"><i class="fa fa-times"><span class="sr-only">{{$item.attend.1}}</span></i></a>
<a role="button" class="button-event{{if $item.responses.attendmaybe.self}} active{{/if}}" id="attendmaybe-{{$item.id}}" title="{{$item.attend.2}}" onclick="dolike({{$item.id}},'attendmaybe'); return false;"><i class="fa fa-question"><span class="sr-only">{{$item.attend.2}}</span></i></a>
</div>
{{/if}}

42
view/theme/frost-mobile/style.css
View file

@ -1549,8 +1549,16 @@ input#dfrn-url {
background-repeat: repeat-x;*/
padding: 5px 5px 0px;
height: 32px;
}
.wall-item-tools a {
border-radius: 8px;
padding: 2px;
background-position: center;
}
.wall-item-tools a.active {
background-color: rgba(59, 101, 164, 0.5);
}
.wall-item-author {
/* margin-top: 10px;*/
margin-top: 0px;
@ -3896,7 +3904,7 @@ aside input[type='text'] {
.icon.like {
display: block; width: 26px; height: 28px;/*31 33*/
margin-right: 7px;
background-size: 100% 100%;
background-size: 26px 28px;
background-image: url('images/approve.png');
background-repeat: no-repeat;
opacity: 0.5;
@ -3904,7 +3912,7 @@ aside input[type='text'] {
.icon.link {
display: block; width: 22px; height: 24px;
background-size: 100% 100%;
background-size: 22px 24px;
background-image: url('images/link.png');
background-repeat: no-repeat;
@ -3913,14 +3921,14 @@ aside input[type='text'] {
/*.globe { background-position: 0px -16px;}*/
.icon.globe {
display: block; width: 28px; height: 28px;
background-size: 100% 100%;
background-size: 28px 28px;
background-image: url('images/globe.png');
background-repeat: no-repeat;
}
/*.noglobe { background-position: -16px -16px;}*/
.icon.noglobe {
display: block; width: 24px; height: 24px;
background-size: 100% 100%;
background-size: 24px 24px;
background-image: url('images/noglobe.png');
background-repeat: no-repeat;
}
@ -3931,14 +3939,14 @@ aside input[type='text'] {
.small-pencil { background-position: -96px -16px;}*/
.icon.pencil {
display: block; width: 28px; height: 28px;
background-size: 100% 100%;
background-size: 28px 28px;
background-image: url('images/pencil.png');
background-repeat: no-repeat;
opacity: 0.5;
}
.icon.small-pencil {
display: block; width: 28px; height: 28px;
background-size: 100% 100%;
background-size: 28px 28px;
background-image: url('images/pencil.png');
background-repeat: no-repeat;
opacity: 0.5;
@ -3947,7 +3955,7 @@ aside input[type='text'] {
.icon.recycle {
display: block;
width: 28px; height: 27px;/*33 32*/
background-size: 100% 100%;
background-size: 28px 27px;
background-image: url('images/recycle.png');
background-repeat: no-repeat;
opacity: 0.5;
@ -3957,7 +3965,7 @@ aside input[type='text'] {
/* display: block;*/
display: none;
width: 28px; height: 28px;
background-size: 100% 100%;
background-size: 28px 28px;
background-image: url('images/remote-link.png');
background-repeat: no-repeat;
opacity: 0.5;
@ -3969,7 +3977,7 @@ aside input[type='text'] {
.icon.lock {
display: block; width: 17px; height: 25px;
margin-top: 1px;
background-size: 100% 100%;
background-size: 17px 25px;
background-image: url('images/lock.png');
background-repeat: no-repeat;
}
@ -3977,7 +3985,7 @@ aside input[type='text'] {
.icon.unlock {
display: block; width: 17px; height: 28px;
margin-top: -2px;
background-size: 100% 100%;
background-size: 17px 28px;
background-image: url('images/unlock.png');
background-repeat: no-repeat;
}
@ -3987,7 +3995,7 @@ aside input[type='text'] {
/*.attach { background-position: -80px -32px; }*/
.icon.attach {
display: block; width: 28px; height: 28px;
background-size: 100% 100%;
background-size: 28px 28px;
background-image: url('images/paperclip.png');
background-repeat: no-repeat;
}
@ -4000,14 +4008,14 @@ aside input[type='text'] {
/*.starred { background-position: -16px -48px; }*/
.icon.starred {
display: block; width: 28px; height: 28px;
background-size: 100% 100%;
background-size: 28px 28px;
background-image: url('images/star-yellow.png');
background-repeat: no-repeat;
}
/*.unstarred { background-position: -32px -48px; }*/
.icon.unstarred {
display: block; width: 28px; height: 28px;
background-size: 100% 100%;
background-size: 28px 28px;
background-image: url('images/star.png');
background-repeat: no-repeat;
@ -4016,7 +4024,7 @@ aside input[type='text'] {
/*.tagged { background-position: -48px -48px; }*/
.icon.tagged {
display: block; width: 28px; height: 28px;
background-size: 100% 100%;
background-size: 28px 28px;
background-image: url('images/tag.png');
background-repeat: no-repeat;
opacity: 0.5;
@ -4026,7 +4034,7 @@ aside input[type='text'] {
.filer-icon {
display: block; width: 24px; height: 24px;
background-size: 100% 100%;
background-size: 24px 24px;
background-image: url('images/folder.png');
background-repeat: no-repeat;
opacity: 0.5;
@ -4034,7 +4042,7 @@ aside input[type='text'] {
.event-icon {
display: block; width: 33px; height: 33px;
background-size: 100% 100%;
background-size: 33px 33px;
background-repeat: no-repeat;
opacity: 0.5;
}

10
view/theme/frost-mobile/templates/wall_thread.tpl
View file

@ -71,9 +71,9 @@
<div class="wall-item-tools" id="wall-item-tools-{{$item.id}}">
{{if $item.vote}}
<div class="wall-item-like-buttons" id="wall-item-like-buttons-{{$item.id}}">
<a href="#" class="icon like" title="{{$item.vote.like.0}}" onclick="dolike({{$item.id}},'like'); return false"></a>
<a href="#" class="icon like{{if $item.responses.like.self}} active{{/if}}" title="{{$item.vote.like.0}}" onclick="dolike({{$item.id}},'like'); return false"></a>
{{if $item.vote.dislike}}
<a href="#" class="icon dislike" title="{{$item.vote.dislike.0}}" onclick="dolike({{$item.id}},'dislike'); return false"></a>
<a href="#" class="icon dislike{{if $item.responses.dislike.self}} active{{/if}}" title="{{$item.vote.dislike.0}}" onclick="dolike({{$item.id}},'dislike'); return false"></a>
{{/if}}
{{if $item.vote.share}}<a href="#" class="icon recycle wall-item-share-buttons" title="{{$item.vote.share.0}}" onclick="jotShare({{$item.id}}); return false"></a>{{/if}}
<img id="like-rotator-{{$item.id}}" class="like-rotator" src="images/rotator.gif" alt="{{$item.wait}}" title="{{$item.wait}}" style="display: none;" />
@ -97,9 +97,9 @@
{{/if}}
{{if $item.isevent}}
<a href="#" id="attendyes-{{$item.id}}" title="{{$item.attend.0}}" onclick="dolike({{$item.id}},'attendyes'); return false;" class="event-item event-icon event-attend-icon"></a>
<a href="#" id="attendno-{{$item.id}}" title="{{$item.attend.1}}" onclick="dolike({{$item.id}},'attendno'); return false;" class="event-item event-icon event-dontattend-icon"></a>
<a href="#" id="attendmaybe-{{$item.id}}" title="{{$item.attend.2}}" onclick="dolike({{$item.id}},'attendmaybe'); return false;" class="event-item event-icon event-maybeattend-icon"></a>
<a href="#" id="attendyes-{{$item.id}}" title="{{$item.attend.0}}" onclick="dolike({{$item.id}},'attendyes'); return false;" class="event-item event-icon event-attend-icon{{if $item.responses.attendyes.self}} active{{/if}}"></a>
<a href="#" id="attendno-{{$item.id}}" title="{{$item.attend.1}}" onclick="dolike({{$item.id}},'attendno'); return false;" class="event-item event-icon event-dontattend-icon{{if $item.responses.attendno.self}} active{{/if}}"></a>
<a href="#" id="attendmaybe-{{$item.id}}" title="{{$item.attend.2}}" onclick="dolike({{$item.id}},'attendmaybe'); return false;" class="event-item event-icon event-maybeattend-icon{{if $item.responses.attendmaybe.self}} active{{/if}}"></a>
{{/if}}
{{*<!--<div class="wall-item-delete-wrapper" id="wall-item-delete-wrapper-{{$item.id}}" >-->*}}

13
view/theme/frost/style.css
View file

@ -1385,6 +1385,17 @@ input#dfrn-url {
cursor: pointer;
}
.wall-item-tools a {
border-radius: 4px;
padding: 2px;
background-position: center;
background-size: initial !important;
}
.wall-item-tools a.active {
background-color: rgba(59, 101, 164, 0.5);
}
.wall-item-share-buttons {
margin-left: 10px;
margin-right: 10px;
@ -3886,7 +3897,7 @@ aside input[type='text'] {
.event-maybeattend-icon { background-image: url('images/event-maybeattend-16.png'); }
.event-dontattend-icon { background-image: url('images/event-dontattend-16.png'); }
.filer-icon:hover {
.event-icon:hover {
opacity: 1.0;
}

10
view/theme/frost/templates/wall_thread.tpl
View file

@ -66,9 +66,9 @@
<div class="wall-item-tools" id="wall-item-tools-{{$item.id}}">
{{if $item.vote}}
<div class="wall-item-like-buttons" id="wall-item-like-buttons-{{$item.id}}">
<a href="#" class="tool like" title="{{$item.vote.like.0}}" onclick="dolike({{$item.id}},'like'); return false"></a>
<a href="#" class="tool like{{if $item.responses.like.self}} active{{/if}}" title="{{$item.vote.like.0}}" onclick="dolike({{$item.id}},'like'); return false"></a>
{{if $item.vote.dislike}}
<a href="#" class="tool dislike" title="{{$item.vote.dislike.0}}" onclick="dolike({{$item.id}},'dislike'); return false"></a>
<a href="#" class="tool dislike{{if $item.responses.dislike.self}} active{{/if}}" title="{{$item.vote.dislike.0}}" onclick="dolike({{$item.id}},'dislike'); return false"></a>
{{/if}}
{{if $item.vote.share}}<a href="#" class="tool recycle wall-item-share-buttons" title="{{$item.vote.share.0}}" onclick="jotShare({{$item.id}}); return false"></a>{{/if}}
<img id="like-rotator-{{$item.id}}" class="like-rotator" src="images/rotator.gif" alt="{{$item.wait}}" title="{{$item.wait}}" style="display: none;" />
@ -92,9 +92,9 @@
{{/if}}
{{if $item.isevent}}
<a href="#" id="attendyes-{{$item.id}}" title="{{$item.attend.0}}" onclick="dolike({{$item.id}},'attendyes'); return false;" class="event-item event-icon event-attend-icon"></a>
<a href="#" id="attendno-{{$item.id}}" title="{{$item.attend.1}}" onclick="dolike({{$item.id}},'attendno'); return false;" class="event-item event-icon event-dontattend-icon"></a>
<a href="#" id="attendmaybe-{{$item.id}}" title="{{$item.attend.2}}" onclick="dolike({{$item.id}},'attendmaybe'); return false;" class="event-item event-icon event-maybeattend-icon"></a>
<a href="#" id="attendyes-{{$item.id}}" title="{{$item.attend.0}}" onclick="dolike({{$item.id}},'attendyes'); return false;" class="event-item event-icon event-attend-icon{{if $item.responses.attendyes.self}} active{{/if}}"></a>
<a href="#" id="attendno-{{$item.id}}" title="{{$item.attend.1}}" onclick="dolike({{$item.id}},'attendno'); return false;" class="event-item event-icon event-dontattend-icon{{if $item.responses.attendno.self}} active{{/if}}"></a>
<a href="#" id="attendmaybe-{{$item.id}}" title="{{$item.attend.2}}" onclick="dolike({{$item.id}},'attendmaybe'); return false;" class="event-item event-icon event-maybeattend-icon{{if $item.responses.attendmaybe.self}} active{{/if}}"></a>
{{/if}}

3
view/theme/quattro/dark/style.css
View file

@ -1210,6 +1210,9 @@ section {
.wall-item-container .wall-item-actions-social a {
margin-right: 3em;
}
.wall-item-container .wall-item-actions-social a.active {
font-weight: bold;
}
.wall-item-container .wall-item-actions-tools {
float: right;
width: 15%;

3
view/theme/quattro/green/style.css
View file

@ -1210,6 +1210,9 @@ section {
.wall-item-container .wall-item-actions-social a {
margin-right: 3em;
}
.wall-item-container .wall-item-actions-social a.active {
font-weight: bold;
}
.wall-item-container .wall-item-actions-tools {
float: right;
width: 15%;

3
view/theme/quattro/lilac/style.css
View file

@ -1210,6 +1210,9 @@ section {
.wall-item-container .wall-item-actions-social a {
margin-right: 3em;
}
.wall-item-container .wall-item-actions-social a.active {
font-weight: bold;
}
.wall-item-container .wall-item-actions-tools {
float: right;
width: 15%;

4
view/theme/quattro/quattro.less
View file

@ -575,7 +575,9 @@ section {
a { margin-right: 3em; }
}
.wall-item-actions-social { float: left; margin-top: 0.5em;
a { margin-right: 3em; }
a { margin-right: 3em;
.active { font-weight: bold;}
}
}
.wall-item-actions-tools { float: right; width: 15%;
a { float: right; }

4
view/theme/quattro/templates/photo_item.tpl
View file

@ -39,8 +39,8 @@
{{/if}}
{{if $vote}}
<a href="#" id="like-{{$id}}" title="{{$vote.like.0}}" onclick="dolike({{$id}},'like'); return false">{{$vote.like.1}}</a>
<a href="#" id="dislike-{{$id}}" title="{{$vote.dislike.0}}" onclick="dolike({{$id}},'dislike'); return false">{{$vote.dislike.1}}</a>
<a href="#" id="like-{{$id}}"{{if $item.responses.like.self}} class="active{{/if}}" title="{{$vote.like.0}}" onclick="dolike({{$id}},'like'); return false">{{$vote.like.1}}</a>
<a href="#" id="dislike-{{$id}}"{{if $item.responses.dislike.self}} class="active{{/if}}" title="{{$vote.dislike.0}}" onclick="dolike({{$id}},'dislike'); return false">{{$vote.dislike.1}}</a>
{{/if}}
{{if $vote.share}}

4
view/theme/quattro/templates/search_item.tpl
View file

@ -52,8 +52,8 @@
{{/if}}
{{if $item.vote}}
<a href="#" id="like-{{$item.id}}" title="{{$item.vote.like.0}}" onclick="dolike({{$item.id}},'like'); return false">{{$item.vote.like.1}}</a>
<a href="#" id="dislike-{{$item.id}}" title="{{$item.vote.dislike.0}}" onclick="dolike({{$item.id}},'dislike'); return false">{{$item.vote.dislike.1}}</a>
<a href="#" id="like-{{$item.id}}"{{if $item.responses.like.self}} class="active{{/if}}" title="{{$item.vote.like.0}}" onclick="dolike({{$item.id}},'like'); return false">{{$item.vote.like.1}}</a>
<a href="#" id="dislike-{{$item.id}}"{{if $item.responses.dislike.self}} class="active{{/if}}" title="{{$item.vote.dislike.0}}" onclick="dolike({{$item.id}},'dislike'); return false">{{$item.vote.dislike.1}}</a>
{{/if}}
{{if $item.vote.share}}

10
view/theme/quattro/templates/wall_thread.tpl
View file

@ -106,9 +106,9 @@
{{/if}}
{{if $item.vote}}
<a href="#" id="like-{{$item.id}}" title="{{$item.vote.like.0}}" onclick="dolike({{$item.id}},'like'); return false">{{$item.vote.like.1}}</a>
<a href="#" id="like-{{$item.id}}"{{if $item.responses.like.self}} class="active{{/if}}" title="{{$item.vote.like.0}}" onclick="dolike({{$item.id}},'like'); return false">{{$item.vote.like.1}}</a>
{{if $item.vote.dislike}}
<a href="#" id="dislike-{{$item.id}}" title="{{$item.vote.dislike.0}}" onclick="dolike({{$item.id}},'dislike'); return false">{{$item.vote.dislike.1}}</a>
<a href="#" id="dislike-{{$item.id}}"{{if $item.responses.dislike.self}} class="active{{/if}}" title="{{$item.vote.dislike.0}}" onclick="dolike({{$item.id}},'dislike'); return false">{{$item.vote.dislike.1}}</a>
{{/if}}
{{if $item.vote.share}}
<a href="#" id="share-{{$item.id}}" title="{{$item.vote.share.0}}" onclick="jotShare({{$item.id}}); return false">{{$item.vote.share.1}}</a>
@ -117,9 +117,9 @@
{{if $item.isevent}}
<div class="clear"></div>
<div class="wall-item-actions-isevent">
<a href="#" id="attendyes-{{$item.id}}" title="{{$item.attend.0}}" onclick="dolike({{$item.id}},'attendyes'); return false;">{{$item.attend.0}}</a>
<a href="#" id="attendno-{{$item.id}}" title="{{$item.attend.1}}" onclick="dolike({{$item.id}},'attendno'); return false;">{{$item.attend.1}}</a>
<a href="#" id="attendmaybe-{{$item.id}}" title="{{$item.attend.2}}" onclick="dolike({{$item.id}},'attendmaybe'); return false;">{{$item.attend.2}}</a>
<a href="#" id="attendyes-{{$item.id}}"{{if $item.responses.attendyes.self}} class="active{{/if}}" title="{{$item.attend.0}}" onclick="dolike({{$item.id}},'attendyes'); return false;">{{$item.attend.0}}</a>
<a href="#" id="attendno-{{$item.id}}"{{if $item.responses.attendno.self}} class="active{{/if}}" title="{{$item.attend.1}}" onclick="dolike({{$item.id}},'attendno'); return false;">{{$item.attend.1}}</a>
<a href="#" id="attendmaybe-{{$item.id}}"{{if $item.responses.attendmaybe.self}} class="active{{/if}}" title="{{$item.attend.2}}" onclick="dolike({{$item.id}},'attendmaybe'); return false;">{{$item.attend.2}}</a>
</div>
{{/if}}

4
view/theme/smoothly/style.css
View file

@ -1586,6 +1586,10 @@ ul .sidebar-group-li .icon {
margin-right: 10px;
display: inline;
}
.wall-item-like-buttons a.self {
background-color: rgba(52, 101, 164, .5);
border-radius: 6px;
}
.wall-item-links-wrapper {
width: 30px;

4
view/theme/smoothly/templates/wall_thread.tpl
View file

@ -85,9 +85,9 @@
{{if $item.vote}}
<div class="wall-item-like-buttons" id="wall-item-like-buttons-{{$item.id}}">
<a href="#" class="icon like" title="{{$item.vote.like.0}}" onclick="dolike({{$item.id}},'like'); return false"></a>
<a href="#" class="icon like{{if $item.responses.like.self}} self{{/if}}" title="{{$item.vote.like.0}}" onclick="dolike({{$item.id}},'like'); return false"></a>
{{if $item.vote.dislike}}
<a href="#" class="icon dislike" title="{{$item.vote.dislike.0}}" onclick="dolike({{$item.id}},'dislike'); return false"></a>
<a href="#" class="icon dislike{{if $item.responses.dislike.self}} self{{/if}}" title="{{$item.vote.dislike.0}}" onclick="dolike({{$item.id}},'dislike'); return false"></a>
{{/if}}
{{if $item.vote.share}}
<a href="#" class="icon recycle wall-item-share-buttons" title="{{$item.vote.share.0}}" onclick="jotShare({{$item.id}}); return false"></a> {{/if}}

5
view/theme/vier/style.css
View file

@ -1583,6 +1583,11 @@ section.minimal {
margin-right: 1em;
cursor: pointer;
}
.wall-item-container .wall-item-actions-social a.active,
.wall-item-container .wall-item-actions-isevent a.active {
color: #36C;
}
.wall-item-container .wall-item-actions-tools {
float: right;
width: 80px;

4
view/theme/vier/templates/photo_item.tpl
View file

@ -46,8 +46,8 @@
{{/if}}
{{if $vote}}
<a href="#" id="like-{{$id}}" title="{{$vote.like.0}}" onclick="dolike({{$id}},'like'); return false">{{$vote.like.1}}</a>
<a href="#" id="dislike-{{$id}}" title="{{$vote.dislike.0}}" onclick="dolike({{$id}},'dislike'); return false">{{$vote.dislike.1}}</a>
<a href="#" id="like-{{$id}}"{{if $item.responses.like.self}} class="active"{{/if}} title="{{$vote.like.0}}" onclick="dolike({{$id}},'like'); return false">{{$vote.like.1}}</a>
<a href="#" id="dislike-{{$id}}"{{if $item.responses.dislike.self}} class="active"{{/if}} title="{{$vote.dislike.0}}" onclick="dolike({{$id}},'dislike'); return false">{{$vote.dislike.1}}</a>
{{/if}}
{{if $vote.share}}

4
view/theme/vier/templates/search_item.tpl
View file

@ -60,8 +60,8 @@
{{/if}}
{{if $item.vote}}
<a href="#" id="like-{{$item.id}}" title="{{$item.vote.like.0}}" onclick="dolike({{$item.id}},'like'); return false">{{$item.vote.like.1}}</a>
<a href="#" id="dislike-{{$item.id}}" title="{{$item.vote.dislike.0}}" onclick="dolike({{$item.id}},'dislike'); return false">{{$item.vote.dislike.1}}</a>
<a href="#" id="like-{{$item.id}}"{{if $item.responses.like.self}} class="active"{{/if}} title="{{$item.vote.like.0}}" onclick="dolike({{$item.id}},'like'); return false">{{$item.vote.like.1}}</a>
<a href="#" id="dislike-{{$item.id}}"{{if $item.responses.dislike.self}} class="active"{{/if}} title="{{$item.vote.dislike.0}}" onclick="dolike({{$item.id}},'dislike'); return false">{{$item.vote.dislike.1}}</a>
{{/if}}
{{if $item.vote.share}}

10
view/theme/vier/templates/wall_thread.tpl
View file

@ -95,16 +95,16 @@
{{/if}}
{{if $item.isevent}}
<a role="button" id="attendyes-{{$item.id}}" title="{{$item.attend.0}}" onclick="dolike({{$item.id}},'attendyes'); return false;"><i class="icon-ok icon-large"><span class="sr-only">{{$item.attend.0}}</span></i></a>
<a role="button" id="attendno-{{$item.id}}" title="{{$item.attend.1}}" onclick="dolike({{$item.id}},'attendno'); return false;"><i class="icon-remove icon-large"><span class="sr-only">{{$item.attend.1}}</span></i></a>
<a role="button" id="attendmaybe-{{$item.id}}" title="{{$item.attend.2}}" onclick="dolike({{$item.id}},'attendmaybe'); return false;"><i class="icon-question icon-large"><span class="sr-only">{{$item.attend.2}}</span></i></a>
<a role="button" id="attendyes-{{$item.id}}"{{if $item.responses.attendyes.self}} class="active"{{/if}} title="{{$item.attend.0}}" onclick="dolike({{$item.id}},'attendyes'); return false;"><i class="icon-ok icon-large"><span class="sr-only">{{$item.attend.0}}</span></i></a>
<a role="button" id="attendno-{{$item.id}}"{{if $item.responses.attendno.self}} class="active"{{/if}} title="{{$item.attend.1}}" onclick="dolike({{$item.id}},'attendno'); return false;"><i class="icon-remove icon-large"><span class="sr-only">{{$item.attend.1}}</span></i></a>
<a role="button" id="attendmaybe-{{$item.id}}"{{if $item.responses.attendmaybe.self}} class="active"{{/if}} title="{{$item.attend.2}}" onclick="dolike({{$item.id}},'attendmaybe'); return false;"><i class="icon-question icon-large"><span class="sr-only">{{$item.attend.2}}</span></i></a>
{{/if}}
{{if $item.vote}}
{{if $item.vote.like}}
<a role="button" id="like-{{$item.id}}" title="{{$item.vote.like.0}}" onclick="dolike({{$item.id}},'like'); return false"><i class="icon-thumbs-up icon-large"><span class="sr-only">{{$item.vote.like.0}}</span></i></a>
<a role="button" id="like-{{$item.id}}"{{if $item.responses.like.self}} class="active"{{/if}} title="{{$item.vote.like.0}}" onclick="dolike({{$item.id}},'like'); return false"><i class="icon-thumbs-up icon-large"><span class="sr-only">{{$item.vote.like.0}}</span></i></a>
{{/if}}{{if $item.vote.dislike}}
<a role="button" id="dislike-{{$item.id}}" title="{{$item.vote.dislike.0}}" onclick="dolike({{$item.id}},'dislike'); return false"><i class="icon-thumbs-down icon-large"><span class="sr-only">{{$item.vote.dislike.0}}</span></i></a>
<a role="button" id="dislike-{{$item.id}}"{{if $item.responses.dislike.self}} class="active"{{/if}} title="{{$item.vote.dislike.0}}" onclick="dolike({{$item.id}},'dislike'); return false"><i class="icon-thumbs-down icon-large"><span class="sr-only">{{$item.vote.dislike.0}}</span></i></a>
{{/if}}
{{if $item.vote.share}}
<a role="button" id="share-{{$item.id}}" title="{{$item.vote.share.0}}" onclick="jotShare({{$item.id}}); return false"><i class="icon-retweet icon-large"><span class="sr-only">{{$item.vote.share.0}}</span></i></a>