aboutsummaryrefslogtreecommitdiffstats
path: root/view/tpl
diff options
context:
space:
mode:
authorMichael Johnston <michaelgeorgejohnston@gmail.com>2013-03-07 02:05:19 -0500
committerMichael Johnston <michaelgeorgejohnston@gmail.com>2013-03-07 02:07:51 -0500
commit41cd10f9035f52dce664aea443f06b15d3463994 (patch)
tree8b18faef9e89da9bcb7bf55ddb77d5c785d01ac2 /view/tpl
parent863dcda8ee2e6a193729b4cb74a0bb60d364372b (diff)
downloadvolse-hubzilla-41cd10f9035f52dce664aea443f06b15d3463994.tar.gz
volse-hubzilla-41cd10f9035f52dce664aea443f06b15d3463994.tar.bz2
volse-hubzilla-41cd10f9035f52dce664aea443f06b15d3463994.zip
some fixes related to events
- add backticks around column "desc" in sql query - fixed query for data passed to showEvent - showEvent was picking up on id from item instead of id from event - fixed references to author info in template
Diffstat (limited to 'view/tpl')
-rw-r--r--view/tpl/event.tpl2
-rw-r--r--view/tpl/smarty3/event.tpl2
2 files changed, 2 insertions, 2 deletions
diff --git a/view/tpl/event.tpl b/view/tpl/event.tpl
index 80c1dfc55..f1150c158 100644
--- a/view/tpl/event.tpl
+++ b/view/tpl/event.tpl
@@ -1,7 +1,7 @@
{{ for $events as $event }}
<div class="event">
- {{ if $event.item.author-name }}<a href="$event.item.author-link" ><img src="$event.item.author-avatar" height="32" width="32" />$event.item.author-name</a>{{ endif }}
+ {{ if $event.item.author.xchan_name }}<a href="$event.item.author.xchan_url" ><img src="$event.item.author.xchan_photo_s" height="32" width="32" />$event.item.author.xchan_name</a>{{ endif }}
$event.html
{{ if $event.item.plink }}<a href="$event.plink.0" title="$event.plink.1" class="plink-event-link icon s22 remote-link"></a>{{ endif }}
{{ if $event.edit }}<a href="$event.edit.0" title="$event.edit.1" class="edit-event-link icon s22 pencil"></a>{{ endif }}
diff --git a/view/tpl/smarty3/event.tpl b/view/tpl/smarty3/event.tpl
index 1ba472377..76c9433fd 100644
--- a/view/tpl/smarty3/event.tpl
+++ b/view/tpl/smarty3/event.tpl
@@ -6,7 +6,7 @@
{{foreach $events as $event}}
<div class="event">
- {{if $event.item.author-name}}<a href="{{$event.item.author-link}}" ><img src="{{$event.item.author-avatar}}" height="32" width="32" />{{$event.item.author-name}}</a>{{/if}}
+ {{if $event.item.author.xchan_name}}<a href="{{$event.item.author.xchan_url}}" ><img src="{{$event.item.author.xchan_photo_s}}" height="32" width="32" />{{$event.item.author.xchan_name}}</a>{{/if}}
{{$event.html}}
{{if $event.item.plink}}<a href="{{$event.plink.0}}" title="{{$event.plink.1}}" class="plink-event-link icon s22 remote-link"></a>{{/if}}
{{if $event.edit}}<a href="{{$event.edit.0}}" title="{{$event.edit.1}}" class="edit-event-link icon s22 pencil"></a>{{/if}}