From 091729fa957a3a18d801dbe36d174d8bce43a54d Mon Sep 17 00:00:00 2001
From: Ismayil Khayredinov <ismayil.khayredinov@hypejunction.com>
Date: Mon, 9 Jan 2012 17:29:14 +0100
Subject: fixes tags html markup issues

---
 views/default/output/tags.php | 40 ++++++++++++++++++++++++++++++++--------
 1 file changed, 32 insertions(+), 8 deletions(-)

(limited to 'views')

diff --git a/views/default/output/tags.php b/views/default/output/tags.php
index 6dedfacc7..27b7a32a4 100644
--- a/views/default/output/tags.php
+++ b/views/default/output/tags.php
@@ -7,6 +7,9 @@
  * @uses $vars['type']    The entity type, optional
  * @uses $vars['subtype'] The entity subtype, optional
  * @uses $vars['entity']  Optional. Entity whose tags are being displayed (metadata ->tags)
+ * @uses $vars['list_class'] Optional. Additional classes to be passed to <ul> element
+ * @uses $vars['item_class'] Optional. Additional classes to be passed to <li> elements
+ * @uses $vars['icon_class'] Optional. Additional classes to be passed to tags icon image
  */
 
 if (isset($vars['entity'])) {
@@ -38,9 +41,21 @@ if (!empty($vars['tags'])) {
 		$vars['tags'] = array($vars['tags']);
 	}
 
-	echo '<div>';
-	echo elgg_view_icon('tag');
-	echo '<ul class="elgg-tags">';
+	$list_class = "elgg-tags";
+	if (isset($vars['list_class'])) {
+		$list_class = "$list_class {$vars['list_class']}";
+		unset($vars['list_class']);
+	}
+
+	$item_class = "item-tag";
+	if (isset($vars['item_class'])) {
+		$item_class = "$item_class {$vars['item_class']}";
+		unset($vars['item_class']);
+	}
+
+	$icon_class = elgg_extract('icon_class', $vars);
+	$list_items = '<li>' . elgg_view_icon('tag', $icon_class) . '</li>';
+
 	foreach($vars['tags'] as $tag) {
 		if (!empty($vars['type'])) {
 			$type = "&type={$vars['type']}";
@@ -49,11 +64,20 @@ if (!empty($vars['tags'])) {
 		}
 		$url = elgg_get_site_url() . 'search?q=' . urlencode($tag) . "&search_type=tags{$type}{$subtype}{$object}";
 		if (is_string($tag)) {
-			echo '<li>';
-			echo elgg_view('output/url', array('href' => $url, 'text' => $tag, 'rel' => 'tag'));
-			echo '</li>';
+			$list_items .= "<li class=\"$item_class\">";
+			$list_items .= elgg_view('output/url', array('href' => $url, 'text' => $tag, 'rel' => 'tag'));
+			$list_items .= '</li>';
 		}
 	}
-	echo '</ul>';
-	echo '</div>';
+
+	$list = <<<___HTML
+		<div class="clearfix">
+			<ul class="$list_class">
+				$list_items
+			</ul>
+		</div>
+___HTML;
+
+	echo $list;
 }
+
-- 
cgit v1.2.3


From 2158154912debce1ab9b52651daf09c714cb89d4 Mon Sep 17 00:00:00 2001
From: Ismayil Khayredinov <ismayil.khayredinov@hypejunction.com>
Date: Mon, 9 Jan 2012 17:34:01 +0100
Subject: tags css

---
 views/default/css/elements/components.php | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

(limited to 'views')

diff --git a/views/default/css/elements/components.php b/views/default/css/elements/components.php
index 77313fa1a..ffb598c8b 100644
--- a/views/default/css/elements/components.php
+++ b/views/default/css/elements/components.php
@@ -265,17 +265,16 @@
 	Tags
 *************************************** */
 .elgg-tags {
-	display: inline;
 	font-size: 85%;
 }
-.elgg-tags li {
-	display: inline;
+.elgg-tags > li {
+	float:left;
 	margin-right: 5px;
 }
-.elgg-tags li:after {
+.elgg-tags li.item-tag:after {
 	content: ",";
 }
-.elgg-tags li:last-child:after {
+.elgg-tags li.item-tag:last-child:after {
 	content: "";
 }
 .elgg-tagcloud {
-- 
cgit v1.2.3


From c305d4e8b91b57977802bd29a163ec1f1087582b Mon Sep 17 00:00:00 2001
From: Ismayil Khayredinov <ismayil.khayredinov@hypejunction.com>
Date: Wed, 11 Jan 2012 23:43:42 +0100
Subject: class namespacing

---
 views/default/css/elements/components.php | 4 ++--
 views/default/output/tags.php             | 4 +---
 2 files changed, 3 insertions(+), 5 deletions(-)

(limited to 'views')

diff --git a/views/default/css/elements/components.php b/views/default/css/elements/components.php
index ffb598c8b..c71ef1de9 100644
--- a/views/default/css/elements/components.php
+++ b/views/default/css/elements/components.php
@@ -271,10 +271,10 @@
 	float:left;
 	margin-right: 5px;
 }
-.elgg-tags li.item-tag:after {
+.elgg-tags li.elgg-tag:after {
 	content: ",";
 }
-.elgg-tags li.item-tag:last-child:after {
+.elgg-tags li.elgg-tag:last-child:after {
 	content: "";
 }
 .elgg-tagcloud {
diff --git a/views/default/output/tags.php b/views/default/output/tags.php
index 27b7a32a4..3082dd41e 100644
--- a/views/default/output/tags.php
+++ b/views/default/output/tags.php
@@ -44,13 +44,11 @@ if (!empty($vars['tags'])) {
 	$list_class = "elgg-tags";
 	if (isset($vars['list_class'])) {
 		$list_class = "$list_class {$vars['list_class']}";
-		unset($vars['list_class']);
 	}
 
-	$item_class = "item-tag";
+	$item_class = "elgg-tag";
 	if (isset($vars['item_class'])) {
 		$item_class = "$item_class {$vars['item_class']}";
-		unset($vars['item_class']);
 	}
 
 	$icon_class = elgg_extract('icon_class', $vars);
-- 
cgit v1.2.3