aboutsummaryrefslogtreecommitdiffstats
path: root/view/theme/diabook/wall_item.tpl
diff options
context:
space:
mode:
authorSimon L'nu <simon.lnu@gmail.com>2012-03-11 01:24:59 -0500
committerSimon L'nu <simon.lnu@gmail.com>2012-03-11 01:24:59 -0500
commitdfdf0f13357d9e8a66d10da9e0f8506a010e2ab2 (patch)
tree0431b729c1a7b75c27dda6d887e66e9d6b4a1de1 /view/theme/diabook/wall_item.tpl
parent665ad7e6600778c446aa9c5fc48ed32b309e64a7 (diff)
parent5915325367013f96ffdabb7ef5ca56aa652ccd8d (diff)
downloadvolse-hubzilla-dfdf0f13357d9e8a66d10da9e0f8506a010e2ab2.tar.gz
volse-hubzilla-dfdf0f13357d9e8a66d10da9e0f8506a010e2ab2.tar.bz2
volse-hubzilla-dfdf0f13357d9e8a66d10da9e0f8506a010e2ab2.zip
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
* remotes/upstream/master: bug #328 default the text template var on conversations bug #327 - composed private message is lost if no recip specified. revup fixed login-fields, fixed. notofication.png, changed locations German translation * master:
Diffstat (limited to 'view/theme/diabook/wall_item.tpl')
-rw-r--r--view/theme/diabook/wall_item.tpl4
1 files changed, 2 insertions, 2 deletions
diff --git a/view/theme/diabook/wall_item.tpl b/view/theme/diabook/wall_item.tpl
index b1a014949..ebe40fd4e 100644
--- a/view/theme/diabook/wall_item.tpl
+++ b/view/theme/diabook/wall_item.tpl
@@ -46,7 +46,7 @@
</div>
<div class="wall-item-actions">
- <div class="wall-item-location">$item.location&nbsp;</div>
+
<div class="wall-item-actions-social">
@@ -82,7 +82,7 @@
<a class="icon pencil" href="$item.edpost.0" title="$item.edpost.1"></a>
{{ endif }}
</div>
-
+ <div class="wall-item-location">$item.location&nbsp;</div>
</div>
</div>
<div class="wall-item-bottom">