diff options
| author | friendica <info@friendica.com> | 2012-06-22 15:27:54 -0700 |
|---|---|---|
| committer | friendica <info@friendica.com> | 2012-06-22 15:27:54 -0700 |
| commit | 4e7eb36dd1e65bf481ffe30614565674cbef4fe5 (patch) | |
| tree | df53b965865e49668cde611604b88dbe13379165 | |
| parent | 181a17bd0575874da23497f913c5fc4bdb0f1e54 (diff) | |
| parent | 9953e6dea45af458c21dddafd9c0e08dbef1c521 (diff) | |
| download | volse-hubzilla-4e7eb36dd1e65bf481ffe30614565674cbef4fe5.tar.gz volse-hubzilla-4e7eb36dd1e65bf481ffe30614565674cbef4fe5.tar.bz2 volse-hubzilla-4e7eb36dd1e65bf481ffe30614565674cbef4fe5.zip | |
Merge https://github.com/friendica/friendica into pull
| -rw-r--r-- | view/theme/dispy/wall_item.tpl | 2 | ||||
| -rw-r--r-- | view/theme/dispy/wallwall_item.tpl | 3 | ||||
| -rw-r--r-- | view/wallwall_item.tpl | 2 |
3 files changed, 4 insertions, 3 deletions
diff --git a/view/theme/dispy/wall_item.tpl b/view/theme/dispy/wall_item.tpl index 6263eef51..115f05ad7 100644 --- a/view/theme/dispy/wall_item.tpl +++ b/view/theme/dispy/wall_item.tpl @@ -1,4 +1,4 @@ -<a name="$item.id" /> +<a name="$item.id" ></a> <div class="wall-item-outside-wrapper$item.indent$item.previewing" id="wall-item-outside-wrapper-$item.id" > <div class="wall-item-content-wrapper$item.indent" id="wall-item-content-wrapper-$item.id" > <div class="wall-item-info" id="wall-item-info-$item.id"> diff --git a/view/theme/dispy/wallwall_item.tpl b/view/theme/dispy/wallwall_item.tpl index e2a972790..da5fa13b3 100644 --- a/view/theme/dispy/wallwall_item.tpl +++ b/view/theme/dispy/wallwall_item.tpl @@ -1,4 +1,4 @@ -<a name="$item.id" /> +<a name="$item.id" ></a> <div class="wall-item-outside-wrapper$item.indent$item.previewing wallwall" id="wall-item-outside-wrapper-$item.id" > <div class="wall-item-content-wrapper$item.indent" id="wall-item-content-wrapper-$item.id" > <div class="wall-item-info wallwall" id="wall-item-info-$item.id"> @@ -88,6 +88,7 @@ class="icon recycle wall-item-share-buttons" title="$item.vote.share.0" onclick <div class="wall-item-wrapper-end"></div> <div class="wall-item-like" id="wall-item-like-$item.id">$item.like</div> <div class="wall-item-dislike" id="wall-item-dislike-$item.id">$item.dislike</div> + <div class="wall-item-comment-separator"></div> <div class="wall-item-comment-wrapper"> $item.comment </div> diff --git a/view/wallwall_item.tpl b/view/wallwall_item.tpl index 37e56ee8b..9cbfc991e 100644 --- a/view/wallwall_item.tpl +++ b/view/wallwall_item.tpl @@ -77,7 +77,7 @@ <div class="wall-item-like" id="wall-item-like-$item.id">$item.like</div> <div class="wall-item-dislike" id="wall-item-dislike-$item.id">$item.dislike</div> <div class="wall-item-comment-separator"></div> - <div class="wall-item-comment-wrapper" > + <div class="wall-item-comment-wrapper"> $item.comment </div> |