attend functionality for quattro theme (part of #1953)

diff --git a/view/theme/quattro/dark/style.css b/view/theme/quattro/dark/style.css
index 89f3649abf04126acba27e95e244f3fa01b1abc2..1eda67de13a7343325f7759811fa891284532251 100644 (file)
--- a/view/theme/quattro/dark/style.css
+++ b/view/theme/quattro/dark/style.css
@@ -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;

diff --git a/view/theme/quattro/green/style.css b/view/theme/quattro/green/style.css
index e49a0b16cbd1fbc9022b400d5be139a74fa7af84..71569971e5ac6b2ea50068e7dd6820fbc29b3285 100644 (file)
--- a/view/theme/quattro/green/style.css
+++ b/view/theme/quattro/green/style.css
@@ -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;

diff --git a/view/theme/quattro/lilac/style.css b/view/theme/quattro/lilac/style.css
index 5ea6b40c3bd5b8369a9ef16fdfd12f2e549b777e..55b81e5dafaad6e60c413cdc2cad54373d32468b 100644 (file)
--- a/view/theme/quattro/lilac/style.css
+++ b/view/theme/quattro/lilac/style.css
@@ -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;

diff --git a/view/theme/quattro/quattro.less b/view/theme/quattro/quattro.less
index 368e26c3a2858672e981e0eb61ec5cf9666dc0dd..3c9915576f6b671cc6e8df659bc52599072e8739 100644 (file)
--- a/view/theme/quattro/quattro.less
+++ b/view/theme/quattro/quattro.less
@@ -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; }
         }

diff --git a/view/theme/quattro/templates/wall_thread.tpl b/view/theme/quattro/templates/wall_thread.tpl
index 64e3794ccb5c30eee3bb30cedd7da1ad7606830b..54a4964693bb4e08008392709161c928f48f6e23 100644 (file)
--- a/view/theme/quattro/templates/wall_thread.tpl
+++ b/view/theme/quattro/templates/wall_thread.tpl
@@ -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>
                        
@@ -136,6 +144,11 @@
                <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}}