1
0
Fork 0

rest of the consensus porting work and integration into friendica

Credits to Mike Macgirvin for the code
This commit is contained in:
rabuzarus 2015-06-03 20:57:30 +02:00 committed by rabuzarus
commit f5c7006f30
10 changed files with 285 additions and 149 deletions

View file

@ -1347,11 +1347,15 @@ section.minimal {
width: 100%;
margin-bottom: 0.3em;
}
.wall-item-container .wall-item-actions-social {
.wall-item-container .wall-item-actions-social,
.wall-item-container .wall-item-actions-isevent,
.wall-item-container .wall-item-actions-canvote {
float: left;
margin-bottom: 1px;
}
.wall-item-container .wall-item-actions-social a {
.wall-item-container .wall-item-actions-social a,
.wall-item-container .wall-item-actions-isevent a,
.wall-item-container .wall-item-actions-canvote a{
float: left;
margin-right: 1em;
cursor: pointer;
@ -1863,6 +1867,11 @@ section.minimal {
margin-left: 15px;
cursor: pointer;
}
#profile-voting-wrapper {
float: left;
margin-left: 15px;
cursor: pointer;
}
#profile-smiley-wrapper {
float: left;
margin-left: 15px;

View file

@ -118,7 +118,26 @@
<a role="button" id="filer-{{$item.id}}" onclick="itemFiler({{$item.id}}); return false;" class="filer-item filer-icon" title="{{$item.filer}}"><i class="icon-folder-close icon-large"><span class="sr-only">{{$item.filer}}</span></i></a>
{{/if}}
</div>
<div class="wall-item-location">{{$item.location}} {{$item.postopts}}</div>
{{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;"><i class="icon-ok icon-large"></i></a>
<a href="#" id="attendno-{{$item.id}}" title="{{$item.attend.1}}" onclick="dolike({{$item.id}},'attendno'); return false;"><i class="icon-remove icon-large"></i></a>
<a href="#" id="attendmaybe-{{$item.id}}" title="{{$item.attend.2}}" onclick="dolike({{$item.id}},'attendmaybe'); return false;"><i class="icon-question icon-large"></i></a>
</div>
{{/if}}
{{if $item.canvote}}<!--Consensus isn't implemented at this time. It's just for testing. -->
<div class="clear"></div>
<div class="wall-item-actions-canvote">
<a href="#" id="attendyes-{{$item.id}}" title="{{$item.conlabels.0}}" onclick="dolike({{$item.id}},'agree'); return false;"><i class="icon-ok icon-large"></i></a>
<a href="#" id="attendno-{{$item.id}}" title="{{$item.conlabels.1}}" onclick="dolike({{$item.id}},'disagree'); return false;"><i class="icon-remove icon-large"></i></a>
<a href="#" id="attendmaybe-{{$item.id}}" title="{{$item.conlabels.2}}" onclick="dolike({{$item.id}},'abstain'); return false;"><i class="icon-question icon-large"></i></a>
</div>
{{/if}}
<div class="wall-item-actions-tools">
{{if $item.drop.pagedrop}}
@ -137,8 +156,12 @@
<div class="wall-item-bottom">
<div class="wall-item-links">
</div>
<div class="wall-item-like" id="wall-item-like-{{$item.id}}">{{$item.like}}</div>
<div class="wall-item-dislike" id="wall-item-dislike-{{$item.id}}">{{$item.dislike}}</div>
{{if $item.responses}}
{{foreach $item.responses as $verb=>$response}}
<div class="wall-item-{{$verb}}" id="wall-item-{{$verb}}-{{$item.id}}">{{$response.output}}</div>
{{/foreach}}
{{/if}}
</div>
{{if $item.threaded}}{{if $item.comment}}