]> git.mxchange.org Git - friendica.git/commitdiff
Add support for attending an event to frost themes
authorFabrixxm <fabrix.xm@gmail.com>
Fri, 4 Dec 2015 14:01:46 +0000 (15:01 +0100)
committerFabrixxm <fabrix.xm@gmail.com>
Fri, 4 Dec 2015 14:01:46 +0000 (15:01 +0100)
fix #1953

view/theme/frost-mobile/style.css
view/theme/frost-mobile/templates/wall_thread.tpl
view/theme/frost/style.css
view/theme/frost/templates/wall_thread.tpl

index 91dd907a0c8cfe089bda545f6675c4bf36d5b2f5..400b23c10b38b2f2e4f73e335c2d833a31bcf476 100644 (file)
@@ -1246,13 +1246,14 @@ input#dfrn-url {
 /*     background: #EEEEEE;*/\r
 }\r
 \r
-.wall-item-like, .wall-item-dislike {\r
+.wall-item-response {\r
+       clear: both;\r
        font-style: italic;\r
        margin-left: 0px;\r
        opacity: 0.6;\r
 }\r
 \r
-.wall-item-like.comment, .wall-item-dislike.comment {\r
+.wall-item-response.comment {\r
        margin-left: 5px;\r
 }\r
 \r
@@ -1372,20 +1373,11 @@ input#dfrn-url {
        margin-right: 10px;\r
 }\r
 \r
-.editpost {\r
-       margin-left: 10px;\r
-       float: left;\r
-}\r
-.star-item {\r
-       margin-left: 10px;\r
-       float: left;\r
-}\r
-.tag-item {\r
-       margin-left: 10px;\r
-       float: left;\r
-}\r
-\r
-.filer-item {\r
+.editpost,\r
+.star-item,\r
+.tag-item,\r
+.filer-item,\r
+.event-item {\r
        margin-left: 10px;\r
        float: left;\r
 }\r
@@ -3990,6 +3982,16 @@ aside input[type='text'] {
        opacity: 0.5;\r
 }\r
 \r
+.event-icon {\r
+       display: block; width: 33px; height: 33px;\r
+       background-size: 100% 100%;\r
+       background-repeat: no-repeat;\r
+       opacity: 0.5;\r
+}\r
+.event-attend-icon { background-image: url('images/event-attend.png'); }\r
+.event-maybeattend-icon { background-image: url('images/event-maybeattend.png'); }\r
+.event-dontattend-icon { background-image: url('images/event-dontattend.png'); }\r
+\r
 .icon.dim { opacity: 0.3;filter:alpha(opacity=30); }\r
 \r
 [class^="comment-edit-bb"] {\r
index c96129195544d10d481ec3045c1aa04bbe28f27e..377c90242f257e95aa11592266b35ee903d538fa 100644 (file)
                        <a href="#" id="filer-{{$item.id}}" onclick="itemFiler({{$item.id}}); return false;" class="filer-item filer-icon" title="{{$item.filer}}"></a>
                        {{/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>
+                       {{/if}}
+                       
                        {{*<!--<div class="wall-item-delete-wrapper" id="wall-item-delete-wrapper-{{$item.id}}" >-->*}}
                                {{if $item.drop.dropping}}<a href="item/drop/{{$item.id}}" onclick="return confirmDelete();" class="wall-item-delete-wrapper icon drophide" title="{{$item.drop.delete}}" id="wall-item-delete-wrapper-{{$item.id}}" {{*onmouseover="imgbright(this);" onmouseout="imgdull(this);" *}}></a>{{/if}}
                        {{*<!--</div>-->*}}
                </div>
        </div>  
        {{*<!--<div class="wall-item-wrapper-end"></div>-->*}}
-       <div class="wall-item-like {{$item.indent}}" id="wall-item-like-{{$item.id}}">{{$item.like}}</div>
-       <div class="wall-item-dislike {{$item.indent}}" id="wall-item-dislike-{{$item.id}}">{{$item.dislike}}</div>
+       {{if $item.responses}}
+               {{foreach $item.responses as $verb=>$response}}
+                       <div class="wall-item-response {{$item.indent}}" id="wall-item-{{$verb}}-{{$item.id}}">{{$response.output}}</div>
+               {{/foreach}}
+       {{/if}}
+
 
        {{if $item.threaded}}
        {{if $item.comment}}
index 7cf1c8a982432aa3d5071b2fdc41b2d1a711c2db..3dd400c76b396e2d752304cdb05f93c5212d136a 100644 (file)
@@ -1204,22 +1204,22 @@ input#dfrn-url {
        border: none;
 }
 
-.wall-item-like, .wall-item-dislike {
+.wall-item-response {
        font-style: italic;
        margin-left: 0px;
        opacity: 0.4;
 }
-.wall-item-dislike {
+.wall-item-respose:last-chid {
        margin-bottom: 15px;
 }
-.wall-item-like:hover, .wall-item-dislike:hover {
+.wall-item-response:hover {
        opacity: 1.0;
 }
 
-.wall-item-like.comment, .wall-item-dislike.comment {
+.wall-item-response.comment {
        margin-left: 75px;
 }
-.wall-item-dislike.comment {
+.wall-item-response.comment:last-chid  {
        margin-bottom: 0px;
 }
 
@@ -1345,20 +1345,11 @@ input#dfrn-url {
        margin-right: 10px;
 }
 
-.editpost {
-       margin-left: 10px;
-       float: left;
-}
-.star-item {
-       margin-left: 10px;
-       float: left;
-}
-.tag-item {
-       margin-left: 10px;
-       float: left;
-}
-
-.filer-item {
+.editpost,
+.star-item ,
+.tag-item,
+.filer-item,
+.event-item {
        margin-left: 10px;
        float: left;
 }
@@ -3831,6 +3822,21 @@ aside input[type='text'] {
        opacity: 1.0;
 }
 
+.event-icon {
+       display: block; width: 16px; height: 16px;
+       background-size: 100% 100%;
+       background-repeat: no-repeat;
+       opacity: 0.4;
+}
+.event-attend-icon { background-image: url('images/event-attend-16.png'); }
+.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 {
+       opacity: 1.0;
+}
+
+
 .icon.dim { opacity: 0.3;filter:alpha(opacity=30); }
 /*[class^="comment-edit-bb"] {*/
 .comment-edit-bb {
index 3f98a39eb40194da5c66db64a51d34b82608b192..0f1dcf75a460fe4a6fc4131357c9f58cfc29ab55 100644 (file)
                        {{if $item.filer}}
                        <a href="#" id="filer-{{$item.id}}" onclick="itemFiler({{$item.id}}); return false;" class="filer-item filer-icon" title="{{$item.filer}}"></a>
                        {{/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>
+                       {{/if}}
+
+
                        {{*<!--<div class="wall-item-delete-wrapper" id="wall-item-delete-wrapper-{{$item.id}}" >-->*}}
                                {{if $item.drop.dropping}}<a href="item/drop/{{$item.id}}" onclick="return confirmDelete();" class="wall-item-delete-wrapper icon drophide" title="{{$item.drop.delete}}" id="wall-item-delete-wrapper-{{$item.id}}" {{*onmouseover="imgbright(this);" onmouseout="imgdull(this);" *}}></a>{{/if}}
                        {{*<!--</div>-->*}}
                                {{if $item.drop.pagedrop}}<input type="checkbox" onclick="checkboxhighlight(this);" title="{{$item.drop.select}}" class="item-select" name="itemselected[]" value="{{$item.id}}" />{{/if}}
                        {{*<!--<div class="wall-item-delete-end"></div>-->*}}
+                       
+                       
                </div>
        </div>  
        {{*<!--<div class="wall-item-wrapper-end"></div>-->*}}
-       <div class="wall-item-like {{$item.indent}}" id="wall-item-like-{{$item.id}}">{{$item.like}}</div>
-       <div class="wall-item-dislike {{$item.indent}}" id="wall-item-dislike-{{$item.id}}">{{$item.dislike}}</div>
+       {{if $item.responses}}
+               {{foreach $item.responses as $verb=>$response}}
+                       <div class="wall-item-response {{$item.indent}}" id="wall-item-{{$verb}}-{{$item.id}}">{{$response.output}}</div>
+               {{/foreach}}
+       {{/if}}
 
        {{if $item.threaded}}
        {{if $item.comment}}