clones/friendica
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #1955 from tobiasd/20151012-quattroattend 

attend functionality for quattro theme (part of #1953)
This commit is contained in:
fabrixxm 2015-10-12 19:03:30 +02:00
parent ce03ccc95c da8c81a12e
commit 8bf3a36737
5 changed files with 37 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
view/theme/quattro/dark/style.css
View File

@ -544,7 +544,6 @@ header {
margin: 0px;
padding: 0px;
/*width: 100%; height: 12px; */
z-index: 110;
color: #ffffff;
}
@ -877,7 +876,6 @@ aside .posted-date-selector-months {
overflow: auto;
height: auto;
/*.contact-block-div { width:60px; height: 60px; }*/
}
#contact-block .contact-block-h4 {
float: left;
@ -959,7 +957,6 @@ aside .posted-date-selector-months {
margin-bottom: 2em;
/*.action .s10 { width: 10px; overflow: hidden; padding: 0px;}
.action .s16 { width: 16px; overflow: hidden; padding: 0px;}*/
}
.widget h3 {
padding: 0px;
@ -1126,6 +1123,13 @@ section {
width: 20em;
margin-top: 0.5em;
}
.wall-item-container .wall-item-actions-events {
float: left;
margin-top: 0.5em;
}
.wall-item-container .wall-item-actions-events a {
margin-right: 3em;
}
.wall-item-container .wall-item-actions-social {
float: left;
margin-top: 0.5em;
@ -1241,7 +1245,6 @@ section {
height: 32px;
margin-left: 16px;
/*background: url(../../../images/icons/22/user.png) no-repeat center center;*/
}
.comment-edit-preview .contact-photo-menu-button {
top: 15px !important;
@ -2111,7 +2114,6 @@ ul.tabs li .active {
min-height: 22px;
padding-top: 6px;
/* a { display: block;}*/
}
#photo-caption {
display: block;

12
view/theme/quattro/green/style.css
View File

@ -544,7 +544,6 @@ header {
margin: 0px;
padding: 0px;
/*width: 100%; height: 12px; */
z-index: 110;
color: #ffffff;
}
@ -877,7 +876,6 @@ aside .posted-date-selector-months {
overflow: auto;
height: auto;
/*.contact-block-div { width:60px; height: 60px; }*/
}
#contact-block .contact-block-h4 {
float: left;
@ -959,7 +957,6 @@ aside .posted-date-selector-months {
margin-bottom: 2em;
/*.action .s10 { width: 10px; overflow: hidden; padding: 0px;}
.action .s16 { width: 16px; overflow: hidden; padding: 0px;}*/
}
.widget h3 {
padding: 0px;
@ -1126,6 +1123,13 @@ section {
width: 20em;
margin-top: 0.5em;
}
.wall-item-container .wall-item-actions-events {
float: left;
margin-top: 0.5em;
}
.wall-item-container .wall-item-actions-events a {
margin-right: 3em;
}
.wall-item-container .wall-item-actions-social {
float: left;
margin-top: 0.5em;
@ -1241,7 +1245,6 @@ section {
height: 32px;
margin-left: 16px;
/*background: url(../../../images/icons/22/user.png) no-repeat center center;*/
}
.comment-edit-preview .contact-photo-menu-button {
top: 15px !important;
@ -2111,7 +2114,6 @@ ul.tabs li .active {
min-height: 22px;
padding-top: 6px;
/* a { display: block;}*/
}
#photo-caption {
display: block;

12
view/theme/quattro/lilac/style.css
View File

@ -544,7 +544,6 @@ header {
margin: 0px;
padding: 0px;
/*width: 100%; height: 12px; */
z-index: 110;
color: #ffffff;
}
@ -877,7 +876,6 @@ aside .posted-date-selector-months {
overflow: auto;
height: auto;
/*.contact-block-div { width:60px; height: 60px; }*/
}
#contact-block .contact-block-h4 {
float: left;
@ -959,7 +957,6 @@ aside .posted-date-selector-months {
margin-bottom: 2em;
/*.action .s10 { width: 10px; overflow: hidden; padding: 0px;}
.action .s16 { width: 16px; overflow: hidden; padding: 0px;}*/
}
.widget h3 {
padding: 0px;
@ -1126,6 +1123,13 @@ section {
width: 20em;
margin-top: 0.5em;
}
.wall-item-container .wall-item-actions-events {
float: left;
margin-top: 0.5em;
}
.wall-item-container .wall-item-actions-events a {
margin-right: 3em;
}
.wall-item-container .wall-item-actions-social {
float: left;
margin-top: 0.5em;
@ -1241,7 +1245,6 @@ section {
height: 32px;
margin-left: 16px;
/*background: url(../../../images/icons/22/user.png) no-repeat center center;*/
}
.comment-edit-preview .contact-photo-menu-button {
top: 15px !important;
@ -2111,7 +2114,6 @@ ul.tabs li .active {
min-height: 22px;
padding-top: 6px;
/* a { display: block;}*/
}
#photo-caption {
display: block;

3
view/theme/quattro/quattro.less
View File

@ -519,6 +519,9 @@ section {
.wall-item-name { font-weight: bold; }
.wall-item-actions-author { float: left; width: 20em; margin-top: 0.5em; }
.wall-item-actions-events { float: left; margin-top: 0.5em;
a { margin-right: 3em; }
}
.wall-item-actions-social { float: left; margin-top: 0.5em;
a { margin-right: 3em; }
}

15
view/theme/quattro/templates/wall_thread.tpl
View File

@ -114,6 +114,14 @@
<a href="#" id="share-{{$item.id}}" title="{{$item.vote.share.0}}" onclick="jotShare({{$item.id}}); return false">{{$item.vote.share.1}}</a>
{{/if}}
{{/if}}
{{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>
</div>
{{/if}}
</div>
@ -134,8 +142,11 @@
</div>
<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}}{{if $item.indent==comment}}