aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMario Vavti <mario@mariovavti.com>2017-03-15 21:22:16 +0100
committerMario Vavti <mario@mariovavti.com>2017-03-15 21:22:16 +0100
commita73ea134cd09af039e01e4f6ae7f455ecb76279e (patch)
tree24e813a4e279eb1b415b80297f31ec94aabc0471
parente7a5aa7b9cbe0ff9a3840500c4e7eebf6896dc93 (diff)
downloadvolse-hubzilla-a73ea134cd09af039e01e4f6ae7f455ecb76279e.tar.gz
volse-hubzilla-a73ea134cd09af039e01e4f6ae7f455ecb76279e.tar.bz2
volse-hubzilla-a73ea134cd09af039e01e4f6ae7f455ecb76279e.zip
re-add spaces between tags
-rw-r--r--include/text.php9
-rwxr-xr-xview/tpl/conv_item.tpl2
2 files changed, 7 insertions, 4 deletions
diff --git a/include/text.php b/include/text.php
index 2d1bc4222..224ba17d0 100644
--- a/include/text.php
+++ b/include/text.php
@@ -1459,8 +1459,10 @@ function format_hashtags(&$item) {
continue;
if(strpos($item['body'], $t['url']))
continue;
+ if($s)
+ $s .= ' ';
- $s .= '<span class="badge badge-pill badge-info"><i class="fa fa-hashtag"></i>&nbsp;<a class="text-white" href="' . zid($t['url']) . '" >' . $term . '</a></span> ';
+ $s .= '<span class="badge badge-pill badge-info"><i class="fa fa-hashtag"></i>&nbsp;<a class="text-white" href="' . zid($t['url']) . '" >' . $term . '</a></span>';
}
}
@@ -1480,8 +1482,9 @@ function format_mentions(&$item) {
continue;
if(strpos($item['body'], $t['url']))
continue;
-
- $s .= '<span class="badge badge-pill badge-success"><i class="fa fa-at"></i>&nbsp;<a class="text-white" href="' . zid($t['url']) . '" >' . $term . '</a></span> ';
+ if($s)
+ $s .= ' ';
+ $s .= '<span class="badge badge-pill badge-success"><i class="fa fa-at"></i>&nbsp;<a class="text-white" href="' . zid($t['url']) . '" >' . $term . '</a></span>';
}
}
diff --git a/view/tpl/conv_item.tpl b/view/tpl/conv_item.tpl
index 6f42521ae..1868f926d 100755
--- a/view/tpl/conv_item.tpl
+++ b/view/tpl/conv_item.tpl
@@ -58,7 +58,7 @@
<div class="p-2 wall-item-tools clearfix">
<div class="body-tags">
- <span class="tag">{{$item.mentions}}{{$item.tags}}{{$item.categories}}</span>
+ <span class="tag">{{$item.mentions}} {{$item.tags}} {{$item.categories}}</span>
</div>
{{**
{{if $item.mentions}}