From 50edfdd02fbf680098b4b324f94a1916c7b325da Mon Sep 17 00:00:00 2001
From: Christophe Vilayphiou <chris@rulingcom.com>
Date: Wed, 9 May 2012 14:59:06 +0800
Subject: [PATCH] Changes for tag key in side_bar announcement and news, fix
 ad_banner css for dot

---
 app/assets/stylesheets/style.css.erb                          | 3 +++
 .../announcement/widget/bulletins/bulletins_side_bar.html.erb | 4 ++--
 .../widget/news_bulletins/news_bulletins_side_bar.html.erb    | 2 +-
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/app/assets/stylesheets/style.css.erb b/app/assets/stylesheets/style.css.erb
index bc38be86..9bba5765 100644
--- a/app/assets/stylesheets/style.css.erb
+++ b/app/assets/stylesheets/style.css.erb
@@ -682,6 +682,9 @@
 	resize: none;
 	max-height: 500px;
 }
+#banner [id^="slideshow-"] {
+	z-index: 2 !important;
+}
 [class^="icons-"] {
 	display: inline-block;
 	width: 16px;
diff --git a/vendor/built_in_modules/announcement/app/views/panel/announcement/widget/bulletins/bulletins_side_bar.html.erb b/vendor/built_in_modules/announcement/app/views/panel/announcement/widget/bulletins/bulletins_side_bar.html.erb
index ada22224..fde9e976 100644
--- a/vendor/built_in_modules/announcement/app/views/panel/announcement/widget/bulletins/bulletins_side_bar.html.erb
+++ b/vendor/built_in_modules/announcement/app/views/panel/announcement/widget/bulletins/bulletins_side_bar.html.erb
@@ -13,8 +13,8 @@
 	<h3 class="h3"><%= t('announcement.tag_cloud') %></h3> 								
 	<div class="cloud"> 		
 		<% @tags.each do |tag| %>	
-			<%= link_to tag[I18n.locale], panel_announcement_front_end_bulletins_path(:tag_id => tag.id), :class => "hot#{rand(4) + 1} #{tag.id.to_s.eql?(params[:tag_id]) ? 'active' : nil}" %>
-		<% end %>	
+			<%= link_to tag[I18n.locale], panel_announcement_front_end_bulletins_path(:tag_id => tag.id), :class => "hot#{rand(4) + 1} #{(tag.id.to_s.eql?(params[:tag_id]) || tag.key.eql?(params[:tag_id])) ? 'active' : nil}" %>
+		<% end %>
 	</div> 							
 </div> 							
 <!-- <div class="clear"></div>  -->							
diff --git a/vendor/built_in_modules/news/app/views/panel/news/widget/news_bulletins/news_bulletins_side_bar.html.erb b/vendor/built_in_modules/news/app/views/panel/news/widget/news_bulletins/news_bulletins_side_bar.html.erb
index 815395ff..5ea1a930 100644
--- a/vendor/built_in_modules/news/app/views/panel/news/widget/news_bulletins/news_bulletins_side_bar.html.erb
+++ b/vendor/built_in_modules/news/app/views/panel/news/widget/news_bulletins/news_bulletins_side_bar.html.erb
@@ -13,7 +13,7 @@
 	<h3 class="h3"><%= t('announcement.tag_cloud') %></h3> 								
 	<div class="cloud"> 		
 		<% @tags.each do |tag| %>	
-			<%= link_to tag[I18n.locale], panel_news_front_end_news_bulletins_path(:tag_id => tag.id), :class => "hot#{rand(4) + 1} #{tag.id.to_s.eql?(params[:tag_id]) ? 'active' : nil}" %>
+			<%= link_to tag[I18n.locale], panel_news_front_end_news_bulletins_path(:tag_id => tag.id), :class => "hot#{rand(4) + 1} #{(tag.id.to_s.eql?(params[:tag_id]) || tag.key.eql?(params[:tag_id])) ? 'active' : nil}" %>
 		<% end %>	
 	</div> 							
 </div>