aboutsummaryrefslogtreecommitdiffstats
path: root/view/tpl
diff options
context:
space:
mode:
authorredmatrix <redmatrix@redmatrix.me>2015-05-06 18:39:12 -0700
committerredmatrix <redmatrix@redmatrix.me>2015-05-06 18:39:12 -0700
commit75b8bfc07a2431a6d4d5f2f72864d6cd3aa33cf6 (patch)
treec66d2a27b37c15d16095b6f1f720c70917d00c98 /view/tpl
parentf17c1f96944cd347296ede2a4d0afaee17b49234 (diff)
parenta1ed2bf2ac97c438b1b44bd96b8cb07a4eb81337 (diff)
downloadvolse-hubzilla-75b8bfc07a2431a6d4d5f2f72864d6cd3aa33cf6.tar.gz
volse-hubzilla-75b8bfc07a2431a6d4d5f2f72864d6cd3aa33cf6.tar.bz2
volse-hubzilla-75b8bfc07a2431a6d4d5f2f72864d6cd3aa33cf6.zip
Merge branch 'master' of https://github.com/redmatrix/redmatrix
Diffstat (limited to 'view/tpl')
-rw-r--r--view/tpl/diaspora_consensus.tpl17
-rw-r--r--view/tpl/diaspora_post.tpl1
2 files changed, 18 insertions, 0 deletions
diff --git a/view/tpl/diaspora_consensus.tpl b/view/tpl/diaspora_consensus.tpl
new file mode 100644
index 000000000..b6b7cf13d
--- /dev/null
+++ b/view/tpl/diaspora_consensus.tpl
@@ -0,0 +1,17 @@
+<poll>
+<guid>{{$guid_q}}</guid>
+<question>{{$question}}</question>
+<poll_answer>
+ <guid>{{$guid_y}}</guid>
+ <answer>{{$agree}}</answer>
+</poll_answer>
+<poll_answer>
+ <guid>{{$guid_n}}</guid>
+ <answer>{{$disagree}}</answer>
+</poll_answer>
+<poll_answer>
+ <guid>{{$guid_a}}</guid>
+ <answer>{{$abstain}}</answer>
+</poll_answer>
+</poll>
+
diff --git a/view/tpl/diaspora_post.tpl b/view/tpl/diaspora_post.tpl
index 2fe916e00..ebfe9e5b7 100644
--- a/view/tpl/diaspora_post.tpl
+++ b/view/tpl/diaspora_post.tpl
@@ -4,6 +4,7 @@
<raw_message>{{$body}}</raw_message>
<guid>{{$guid}}</guid>
<diaspora_handle>{{$handle}}</diaspora_handle>
+ {{$poll}}
<public>{{$public}}</public>
<created_at>{{$created}}</created_at>
<provider_display_name>{{$provider}}</provider_display_name>