diff options
| author | redmatrix <redmatrix@redmatrix.me> | 2015-11-26 11:38:07 -0800 |
|---|---|---|
| committer | redmatrix <redmatrix@redmatrix.me> | 2015-11-26 11:38:07 -0800 |
| commit | 5ec5b127d0b1e8a5d4b6e2d87f6a318aac17f987 (patch) | |
| tree | 36f9f4b1e29d7a7d5212ebe19bf53b89d3e94da5 /view/tpl | |
| parent | 0cf9e498b963f2f8b5717d1eae8de183dd98d8d6 (diff) | |
| parent | c407e72dcc4d4f892e88e8260e662104586695f2 (diff) | |
| download | volse-hubzilla-5ec5b127d0b1e8a5d4b6e2d87f6a318aac17f987.tar.gz volse-hubzilla-5ec5b127d0b1e8a5d4b6e2d87f6a318aac17f987.tar.bz2 volse-hubzilla-5ec5b127d0b1e8a5d4b6e2d87f6a318aac17f987.zip | |
Merge https://github.com/redmatrix/hubzilla into pending_merge
Diffstat (limited to 'view/tpl')
| -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 |
4 files changed, 26 insertions, 8 deletions
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}}"> |