aboutsummaryrefslogtreecommitdiffstats
path: root/view/theme/diabook-blue/wallwall_item.tpl
diff options
context:
space:
mode:
authorMichael Vogel <icarus@dabo.de>2012-03-11 20:22:28 +0100
committerMichael Vogel <icarus@dabo.de>2012-03-11 20:22:28 +0100
commitd653e27e2dfc172fd66a0987312952d736aca3e7 (patch)
treee0725ca5cf27fc4400a7566eebc0721528d69fd4 /view/theme/diabook-blue/wallwall_item.tpl
parentebdf4842184cc8d0576abe99b29650c6b6512167 (diff)
parent1dad15a021cc5d03f4238ab77ff051fc0ca1e35e (diff)
downloadvolse-hubzilla-d653e27e2dfc172fd66a0987312952d736aca3e7.tar.gz
volse-hubzilla-d653e27e2dfc172fd66a0987312952d736aca3e7.tar.bz2
volse-hubzilla-d653e27e2dfc172fd66a0987312952d736aca3e7.zip
Merge commit 'upstream/master'
Conflicts: view/theme/diabook/wall_item.tpl view/theme/diabook/wallwall_item.tpl
Diffstat (limited to 'view/theme/diabook-blue/wallwall_item.tpl')
-rw-r--r--view/theme/diabook-blue/wallwall_item.tpl4
1 files changed, 2 insertions, 2 deletions
diff --git a/view/theme/diabook-blue/wallwall_item.tpl b/view/theme/diabook-blue/wallwall_item.tpl
index 603a908c5..e02e5a8be 100644
--- a/view/theme/diabook-blue/wallwall_item.tpl
+++ b/view/theme/diabook-blue/wallwall_item.tpl
@@ -52,7 +52,7 @@
</div>
<div class="wall-item-actions">
- <div class="wall-item-location">$item.location&nbsp;</div>
+
<div class="wall-item-actions-social">
@@ -88,7 +88,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">