diff options
| author | friendica <info@friendica.com> | 2013-03-21 18:29:08 -0700 |
|---|---|---|
| committer | friendica <info@friendica.com> | 2013-03-21 18:29:08 -0700 |
| commit | 0999b88a486b2b392bf3b785d3da7ea1652ab1c2 (patch) | |
| tree | eb70621f682c6ec71cc4f10b774b4fb8c703c3db /view/tpl | |
| parent | ddf5bf8968a12501939cd37898d303967b748600 (diff) | |
| parent | fe87e7f972ecdc09296cf0a064f978e1bb57a8b8 (diff) | |
| download | volse-hubzilla-0999b88a486b2b392bf3b785d3da7ea1652ab1c2.tar.gz volse-hubzilla-0999b88a486b2b392bf3b785d3da7ea1652ab1c2.tar.bz2 volse-hubzilla-0999b88a486b2b392bf3b785d3da7ea1652ab1c2.zip | |
Merge https://github.com/friendica/red into zpull
Diffstat (limited to 'view/tpl')
| -rw-r--r-- | view/tpl/event_head.tpl | 14 | ||||
| -rw-r--r-- | view/tpl/smarty3/event_head.tpl | 14 |
2 files changed, 14 insertions, 14 deletions
diff --git a/view/tpl/event_head.tpl b/view/tpl/event_head.tpl index 471748b97..45f07cf5d 100644 --- a/view/tpl/event_head.tpl +++ b/view/tpl/event_head.tpl @@ -27,21 +27,21 @@ eventRender: function(event, element, view) { //console.log(view.name); - if (event.item['author-name']==null) return; + 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( - event.item['author-avatar'], - event.item['author-name'], + 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( - event.item['author-avatar'], - event.item['author-name'], + event.item['author']['xchan_photo_s'], + event.item['author']['xchan_name'], event.item.desc, event.item.location )); @@ -49,8 +49,8 @@ case "agendaDay": element.find(".fc-event-title").html( "<img src='{0}' style='height:24px;width:24px'>{1}<p>{2}</p><p>{3}</p>".format( - event.item['author-avatar'], - event.item['author-name'], + event.item['author']['xchan_photo_s'], + event.item['author']['xchan_name'], event.item.desc, event.item.location )); diff --git a/view/tpl/smarty3/event_head.tpl b/view/tpl/smarty3/event_head.tpl index 32288b7ad..6cbb98ae7 100644 --- a/view/tpl/smarty3/event_head.tpl +++ b/view/tpl/smarty3/event_head.tpl @@ -32,21 +32,21 @@ eventRender: function(event, element, view) { //console.log(view.name); - if (event.item['author-name']==null) return; + 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( - event.item['author-avatar'], - event.item['author-name'], + 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( - event.item['author-avatar'], - event.item['author-name'], + event.item['author']['xchan_photo_s'], + event.item['author']['xchan_name'], event.item.desc, event.item.location )); @@ -54,8 +54,8 @@ case "agendaDay": element.find(".fc-event-title").html( "<img src='{0}' style='height:24px;width:24px'>{1}<p>{2}</p><p>{3}</p>".format( - event.item['author-avatar'], - event.item['author-name'], + event.item['author']['xchan_photo_s'], + event.item['author']['xchan_name'], event.item.desc, event.item.location )); |