diff options
Diffstat (limited to 'view')
| -rw-r--r-- | view/css/conversation.css | 3 | ||||
| -rw-r--r-- | view/theme/redbasic/css/style.css | 16 | ||||
| -rwxr-xr-x | view/tpl/conv_item.tpl | 5 | ||||
| -rwxr-xr-x | view/tpl/conv_list.tpl | 5 | ||||
| -rwxr-xr-x | view/tpl/event_head.tpl | 19 | ||||
| -rwxr-xr-x | view/tpl/search_item.tpl | 5 |
6 files changed, 41 insertions, 12 deletions
diff --git a/view/css/conversation.css b/view/css/conversation.css index 6a64e7cc2..24a22defb 100644 --- a/view/css/conversation.css +++ b/view/css/conversation.css @@ -249,11 +249,10 @@ a.wall-item-name-link { /* event item */ .event-title h3 { + margin: 0px 0px 10px 0px; font-weight: bold; } -.event-title, -.event-end, .event-description { padding-bottom: 10px; } diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index 357bb5093..fe6f10365 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -857,6 +857,18 @@ nav .acpopup { border-color: #ccc !important; } +.wall-event-item { + padding: 10px; + color: #fff; + background-color: #3A87AD; /* should reflect calendar color */ + border-top-left-radius: $radiuspx; + border-top-right-radius: $radiuspx; +} + +.vevent .event-end { + padding-bottom: 10px; +} + #event-summary-text { margin-top: 15px; } @@ -1242,14 +1254,14 @@ a.rconnect:hover, a.rateme:hover, div.rateme:hover { white-space: nowrap; overflow: hidden; text-overflow: ellipsis; -/* display: block; */ + display: block; } .dropdown-sub-text { line-height: 1em; overflow: hidden; text-overflow: ellipsis; -/* display: block; */ + display: block; } .notify-seen a { diff --git a/view/tpl/conv_item.tpl b/view/tpl/conv_item.tpl index 5257b3ed6..206ee245e 100755 --- a/view/tpl/conv_item.tpl +++ b/view/tpl/conv_item.tpl @@ -13,6 +13,11 @@ {{$item.photo}} </div> {{/if}} + {{if $item.event}} + <div class="wall-event-item" id="wall-event-item-{{$item.id}}"> + {{$item.event}} + </div> + {{/if}} <div class="wall-item-head"> <div class="wall-item-info" id="wall-item-info-{{$item.id}}" > <div class="wall-item-photo-wrapper{{if $item.owner_url}} wwfrom{{/if}}" id="wall-item-photo-wrapper-{{$item.id}}"> diff --git a/view/tpl/conv_list.tpl b/view/tpl/conv_list.tpl index 53f65bc78..cf1310ea6 100755 --- a/view/tpl/conv_list.tpl +++ b/view/tpl/conv_list.tpl @@ -13,6 +13,11 @@ {{$item.photo}} </div> {{/if}} + {{if $item.event}} + <div class="wall-event-item" id="wall-event-item-{{$item.id}}"> + {{$item.event}} + </div> + {{/if}} <div class="wall-item-head"> <div class="wall-item-info" id="wall-item-info-{{$item.id}}" > <div class="wall-item-photo-wrapper{{if $item.owner_url}} wwfrom{{/if}}" id="wall-item-photo-wrapper-{{$item.id}}"> diff --git a/view/tpl/event_head.tpl b/view/tpl/event_head.tpl index ec43d7ab7..4362360d3 100755 --- a/view/tpl/event_head.tpl +++ b/view/tpl/event_head.tpl @@ -64,33 +64,36 @@ }, eventRender: function(event, element, view) { + //console.log(view.name); if (event.item['author']['xchan_name']==null) return; switch(view.name){ case "month": - element.find(".fc-event-title").html( - "<img src='{0}' style='height:10px;width:10px'>{1} : {2}".format( + element.find(".fc-title").html( + "<img src='{0}' style='height:10px;width:10px'> {1}: {2}".format( event.item['author']['xchan_photo_s'], event.item['author']['xchan_name'], event.title )); break; case "agendaWeek": - element.find(".fc-event-title").html( - "<img src='{0}' style='height:12px; width:12px'>{1}<p>{2}</p><p>{3}</p>".format( + element.find(".fc-title").html( + "<img src='{0}' style='height:10px; width:10px'> {1}: {2}<p>{3}</p><p>{4}</p>".format( event.item['author']['xchan_photo_s'], event.item['author']['xchan_name'], - event.item.desc, + event.title, + event.item.description, event.item.location )); break; case "agendaDay": - element.find(".fc-event-title").html( - "<img src='{0}' style='height:24px;width:24px'>{1}<p>{2}</p><p>{3}</p>".format( + element.find(".fc-title").html( + "<img src='{0}' style='height:10px;width:10px'> {1}: {2}<p>{3}</p><p>{4}</p>".format( event.item['author']['xchan_photo_s'], event.item['author']['xchan_name'], - event.item.desc, + event.title, + event.item.description, event.item.location )); break; diff --git a/view/tpl/search_item.tpl b/view/tpl/search_item.tpl index b44e1c39e..b2689c7ba 100755 --- a/view/tpl/search_item.tpl +++ b/view/tpl/search_item.tpl @@ -7,6 +7,11 @@ {{$item.photo}} </div> {{/if}} + {{if $item.event}} + <div class="wall-event-item" id="wall-event-item-{{$item.id}}"> + {{$item.event}} + </div> + {{/if}} <div class="wall-item-head"> <div class="wall-item-info" id="wall-item-info-{{$item.id}}" > <div class="wall-item-photo-wrapper{{if $item.owner_url}} wwfrom{{/if}}" id="wall-item-photo-wrapper-{{$item.id}}"> |