aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--mod/blog/views/default/object/blog.php6
-rw-r--r--mod/file/views/default/object/file.php6
-rw-r--r--views/default/css/elements/chrome.php10
-rw-r--r--views/default/output/tags.php16
4 files changed, 20 insertions, 18 deletions
diff --git a/mod/blog/views/default/object/blog.php b/mod/blog/views/default/object/blog.php
index 23ccb57be..fd2c4fee8 100644
--- a/mod/blog/views/default/object/blog.php
+++ b/mod/blog/views/default/object/blog.php
@@ -23,11 +23,7 @@ $owner_link = elgg_view('output/url', array(
'text' => $owner->name,
));
$author_text = elgg_echo('blog:author_by_line', array($owner_link));
-if ($blog->tags) {
- $tags = "<p class=\"elgg-tags\">" . elgg_view('output/tags', array('tags' => $blog->tags)) . "</p>";
-} else {
- $tags = "";
-}
+$tags = elgg_view('output/tags', array('tags' => $blog->tags));
$date = elgg_view_friendly_time($blog->publish_date);
// The "on" status changes for comments, so best to check for !Off
diff --git a/mod/file/views/default/object/file.php b/mod/file/views/default/object/file.php
index 1d3aa7140..89367feb3 100644
--- a/mod/file/views/default/object/file.php
+++ b/mod/file/views/default/object/file.php
@@ -34,11 +34,7 @@ $file_icon = elgg_view('file/icon', array(
'size' => 'small'
));
-if ($file->tags) {
- $tags = "<p class=\"elgg-tags\">" . elgg_view('output/tags', array('tags' => $file->tags)) . "</p>";
-} else {
- $tags = "";
-}
+$tags = elgg_view('output/tags', array('tags' => $file->tags));
$date = elgg_view_friendly_time($file->time_created);
$comments_count = elgg_count_comments($file);
diff --git a/views/default/css/elements/chrome.php b/views/default/css/elements/chrome.php
index eb131c7bd..974dcc2e6 100644
--- a/views/default/css/elements/chrome.php
+++ b/views/default/css/elements/chrome.php
@@ -113,6 +113,16 @@ h2 {
padding:1px 0 0 14px;
font-size: 85%;
}
+.elgg-tags li {
+ display: inline;
+ margin-right: 5px;
+}
+.elgg-tags li:after {
+ content: ",";
+}
+.elgg-tags li:last-child:after {
+ content: "";
+}
.elgg-tagcloud {
text-align:justify;
}
diff --git a/views/default/output/tags.php b/views/default/output/tags.php
index 1dbf14a7d..f4804e76e 100644
--- a/views/default/output/tags.php
+++ b/views/default/output/tags.php
@@ -1,7 +1,6 @@
<?php
/**
* Elgg tags
- * Displays a list of tags, separated by commas
*
* Tags can be a single string (for one tag) or an array of strings
*
@@ -9,7 +8,8 @@
* @subpackage Core
*
* @uses $vars['tags'] The tags to display
- * @uses $vars['tagtype'] The tagtype, optionally
+ * @uses $vars['type'] The entity type, optional
+ * @uses $vars['subtype'] The entity subtype, optional
*/
if (!empty($vars['subtype'])) {
@@ -28,23 +28,23 @@ if (empty($vars['tags']) && !empty($vars['value'])) {
}
if (!empty($vars['tags'])) {
- $tagstr = "";
if (!is_array($vars['tags'])) {
$vars['tags'] = array($vars['tags']);
}
+ echo '<ul class="elgg-tags">';
foreach($vars['tags'] as $tag) {
- if (!empty($tagstr)) {
- $tagstr .= ", ";
- }
if (!empty($vars['type'])) {
$type = "&type={$vars['type']}";
} else {
$type = "";
}
+ $url = elgg_get_site_url() . 'pg/search/?q=' . urlencode($tag) . "&search_type=tags{$type}{$subtype}{$object}";
if (is_string($tag)) {
- $tagstr .= "<a rel=\"tag\" href=\"".elgg_get_site_url()."pg/search/?q=".urlencode($tag) . "&search_type=tags{$type}{$subtype}{$object}\">" . htmlspecialchars($tag, ENT_QUOTES, 'UTF-8') . "</a>";
+ echo '<li>';
+ echo "<a rel=\"tag\" href=\"$url\">" . htmlspecialchars($tag, ENT_QUOTES, 'UTF-8') . "</a>";
+ echo '</li>';
}
}
- echo $tagstr;
+ echo '</ul>';
}