diff --git a/view/theme/quattro/dark/style.css b/view/theme/quattro/dark/style.css index 89f3649abf..1eda67de13 100644 --- 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 e49a0b16cb..71569971e5 100644 --- 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 5ea6b40c3b..55b81e5daf 100644 --- 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 368e26c3a2..3c9915576f 100644 --- 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 64e3794ccb..a5baff6e40 100644 --- a/view/theme/quattro/templates/wall_thread.tpl +++ b/view/theme/quattro/templates/wall_thread.tpl @@ -114,6 +114,14 @@ {{$item.vote.share.1}} {{/if}} {{/if}} + {{if $item.isevent}} +
+
+ {{$item.attend.0}} + {{$item.attend.1}} + {{$item.attend.2}} +
+ {{/if}} @@ -134,8 +142,11 @@
-
{{$item.like}}
-
{{$item.dislike}}
+ {{if $item.responses}} + {{foreach $item.responses as $verb=>$response}} +
{{$response.output}}
+ {{/foreach}} + {{/if}}
{{if $item.threaded}}{{if $item.comment}}{{if $item.indent==comment}}