diff options
| author | Tobias Diekershoff <tobias.diekershoff@gmx.net> | 2011-03-13 11:37:24 +0100 |
|---|---|---|
| committer | Tobias Diekershoff <tobias.diekershoff@gmx.net> | 2011-03-13 11:37:24 +0100 |
| commit | a2ee5ebe427522228dc03dc81da11f348a399c4d (patch) | |
| tree | 8bffe9c8c9abe370523816f7742e6e26364fa5b5 /view/wall_item.tpl | |
| parent | 8fea19dd38cf9c43bb6f6fa1a4f349555cbe90f8 (diff) | |
| parent | a912a0d3cae0ae9c873dcb5c45624a725bd2c2d6 (diff) | |
| download | volse-hubzilla-a2ee5ebe427522228dc03dc81da11f348a399c4d.tar.gz volse-hubzilla-a2ee5ebe427522228dc03dc81da11f348a399c4d.tar.bz2 volse-hubzilla-a2ee5ebe427522228dc03dc81da11f348a399c4d.zip | |
Merge branch 'master' of git://github.com/friendika/friendika
Conflicts:
addon/twitter/twitter.php
Diffstat (limited to 'view/wall_item.tpl')
| -rw-r--r-- | view/wall_item.tpl | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/view/wall_item.tpl b/view/wall_item.tpl index 1cad41118..5cae6b142 100644 --- a/view/wall_item.tpl +++ b/view/wall_item.tpl @@ -8,18 +8,21 @@ <div class="wall-item-photo-end"></div> <div class="wall-item-wrapper" id="wall-item-wrapper-$id" > $lock - <a href="$profile_url" title="$linktitle" class="wall-item-name-link"><span class="wall-item-name$sparkle" id="wall-item-name-$id" >$name</span></a> - <div class="wall-item-ago" id="wall-item-ago-$id">$ago</div> - <div class="wall-item-location" id="wall-item-location-$id">$location</div> - $vote + <div class="wall-item-location" id="wall-item-location-$id">$location</div> </div> </span> + <div class="wall-item-author"> + <a href="$profile_url" title="$linktitle" class="wall-item-name-link"><span class="wall-item-name$sparkle" id="wall-item-name-$id" >$name</span></a> + <div class="wall-item-ago" id="wall-item-ago-$id">$ago</div> + + </div> <div class="wall-item-content" id="wall-item-content-$id" > <div class="wall-item-title" id="wall-item-title-$id">$title</div> <div class="wall-item-title-end"></div> <div class="wall-item-body" id="wall-item-body-$id" >$body</div> </div> <div class="wall-item-tools" id="wall-item-tools-$id"> + $vote $plink $drop </div> |