From 9ead6cafda3ee86fb1ba663b10e0b831bfdaa911 Mon Sep 17 00:00:00 2001
From: Christophe Vilayphiou <chris@rulingcom.com>
Date: Wed, 9 May 2012 04:15:02 +0800
Subject: [PATCH] Ray's changes

---
 app/assets/javascripts/event.js               |   2 +-
 app/assets/stylesheets/style.css.erb          | 333 +++++++++++++++++-
 app/models/item.rb                            |  11 +
 lib/parsers/parser_common.rb                  |  16 +-
 .../{nccu_calendar.rss => nccu_calendar.xml}  |   0
 .../front_end/bulletins/show.html.erb         |  33 +-
 .../bulletins/bulletins_side_bar.html.erb     |  10 +-
 .../front_end/news_bulletins/index.html.erb   |  28 +-
 .../front_end/news_bulletins/show.html.erb    |  32 +-
 .../news_bulletins_side_bar.html.erb          |  10 +-
 10 files changed, 403 insertions(+), 72 deletions(-)
 rename public/static/{nccu_calendar.rss => nccu_calendar.xml} (100%)

diff --git a/app/assets/javascripts/event.js b/app/assets/javascripts/event.js
index afe558d8..7db3e47c 100644
--- a/app/assets/javascripts/event.js
+++ b/app/assets/javascripts/event.js
@@ -66,7 +66,7 @@ $(document).ready(function(){
 	function getEvent(selet){
 		$.ajax({
 			type: "GET",
-			url: "/static/Other.xml",
+			url: "/static/nccu_calendar.xml",
 			dataType: "xml",
 			timeout: 1000,
 			error: function(xml){
diff --git a/app/assets/stylesheets/style.css.erb b/app/assets/stylesheets/style.css.erb
index b4410a47..bc38be86 100644
--- a/app/assets/stylesheets/style.css.erb
+++ b/app/assets/stylesheets/style.css.erb
@@ -113,6 +113,7 @@
 	background-image: none;
 	overflow: hidden;
 	width: 28px;
+	margin-bottom: 0;
 	position: relative;
 }
 #orbit-bar .nav > li > a.orbit-bar-home {
@@ -579,6 +580,35 @@
 .popover-title {
 	display: none;
 }
+
+/*show link and file*/
+.linkAndFile {
+	clear: both;
+}
+.linkAndFile>div {
+	margin-top: 20px;
+}
+.linkAndFile [class^="icons-"] {
+	float: left;
+	margin-top: 10px;
+}
+.linkAndFile .showLink, .linkAndFile .showFile {
+	background-color: #ededed;
+	padding: 5px;
+	border-radius: 5px;
+	margin-left: 25px;
+}
+.linkAndFile .showLink a, .linkAndFile .showFile a {
+    display: inline-block;
+    margin: 5px 10px;
+}
+.linkAndFile>div>a:last-child {
+    margin-right: 5px
+}
+.news_paragraph p {
+    line-height: 20px;
+}
+
 /*icons*/
 .the-icons i:after {
 	content: attr(class);
@@ -734,15 +764,99 @@
 .icons-unlock {
 	background-position: -192px -32px;
 }
+.icons-thumbtack {
+	background-position: -224px -32px;
+}
+.icons-pin {
+	background-position: -257px -32px;
+}
+.icons-shield {
+	background-position: -288px -32px;
+}
+.icons-key {
+	background-position: -320px -32px;
+}
+.icons-fire {
+	background-position: -352px -32px;
+}
+.icons-bulls-eye {
+	background-position: -384px -32px;
+}
+.icons-flash {
+	background-position: -416px -32px;
+}
 .icons-time {
 	background-position: -448px -32px;
 }
+.icons-halo {
+	background-position: -480px -32px;
+}
+.icons-hourglass {
+	background-position: -513px -32px;
+}
+.icons-alarm-clock {
+	background-position: -545px -32px;
+}
+.icons-paper {
+	background-position: -577px -32px;
+}
 .icons-banner {
 	background-position: -608px -32px;
 }
 /*3*/
+.icons-phone {
+	background-position: 0px -64px;
+}
+.icons-mobile {
+	background-position: -32px -64px;
+}
+.icons-mail {
+	background-position: -64px -64px;
+}
+.icons-mail-open {
+	background-position: -96px -64px;
+}
+.icons-mail-read {
+	background-position: -128px -64px;
+}
 .icons-content {
-	background-position: -160px -66px;
+	background-position: -160px -64px;
+}
+.icons-content-out {
+	background-position: -192px -64px;
+}
+.icons-content-in {
+	background-position: -224px -64px;
+}
+.icons-projector {
+	background-position: -256px -64px;
+}
+.icons-tape {
+	background-position: -288px -64px;
+}
+.icons-chat-a {
+	background-position: -320px -64px;
+}
+.icons-chat-b {
+	background-position: -352px -64px;
+}
+.icons-chat-c {
+	background-position: -384px -64px;
+}
+.icons-comment {
+	background-position: -416px -64px;
+}
+.icons-rss {
+	background-position: -448px -64px;
+}
+.icons-ship {
+	background-position: -480px -64px;
+}
+.icons-send {
+	background-position: -512px -64px;
+}
+.icons-bell {
+	background-position: -544px -64px;
 }
 .icons-announcement {
 	background-position: -576px -64px;
@@ -803,20 +917,110 @@
 .icons-page-copy {
 	background-position: -64px -128px;
 }
-.icons- {
-	background-position: -0px -128px;
+.icons-folder {
+	background-position: -96px -128px;
+}
+.icons-folder-open {
+	background-position: -128px -128px;
+}
+.icons-folder-lock {
+	background-position: -160px -128px;
+}
+.icons-folder-plus {
+	background-position: -192px -128px;
+}
+.icons-folder-minus {
+	background-position: -224px -128px;
+}
+.icons-page-plus {
+	background-position: -256px -128px;
+}
+.icons-page-minus {
+	background-position: -288px -128px;
+}
+.icons-page-edit {
+	background-position: -320px -128px;
+}
+.icons-page-download {
+	background-position: -352px -128px;
 }
 /*6*/
+.icons-house-w {
+	background-position: 0px -160px;
+}
+.icons-house-b {
+	background-position: -32px -160px;
+}
+.icons-signs {
+	background-position: -64px -160px;
+}
 .icons-globe {
 	background-position: -96px -160px;
 }
+.icons-map {
+	background-position: -128px -160px;
+}
+.icons-markers {
+	background-position: -160px -160px;
+}
+.icons-barrier {
+	background-position: -192px -160px;
+}
+.icons-assist {
+	background-position: -224px -160px;
+}
+.icons-cones {
+	background-position: -256px -160px;
+}
+.icons-group {
+	background-position: -288px -160px;
+}
+.icons-cuble {
+	background-position: -320px -160px;
+}
 .icons-structure {
 	background-position: -352px -160px;
 }
+.icons-layer {
+	background-position: -384px -160px;
+}
 /*7*/
+.icons-shopcar-a {
+	background-position: 0px -192px;
+}
+.icons-shopcar-b {
+	background-position: -34px -192px;
+}
 .icons-purchase {
 	background-position: -64px -192px;
 }
+.icons-shopcart {
+	background-position: -96px -192px;
+}
+.icons-van {
+	background-position: -128px -192px;
+}
+.icons-form {
+	background-position: -160px -192px;
+}
+.icons-gift {
+	background-position: -192px -192px;
+}
+.icons-credit-card {
+	background-position: -224px -192px;
+}
+.icons-cash {
+	background-position: -256px -192px;
+}
+.icons-assets {
+	background-position: -288px -192px;
+}
+.icons-computer {
+	background-position: -320px -192px;
+}
+.icons-library {
+	background-position: -352px -192px;
+}
 /*8*/
 .icons-dashboard {
 	background-position: 0 -224px;
@@ -846,21 +1050,90 @@
 	background-position: -256px -224px;
 }
 /*9*/
+.icons-book-cover {
+	background-position: 0px -256px;
+}
+.icons-book-make {
+	background-position: -32px -256px;
+}
+.icons-binder {
+	background-position: -64px -256px;
+}
+.icons-album {
+	background-position: -96px -256px;
+}
+.icons-camera {
+	background-position: -128px -256px;
+}
+.icons-video-camera {
+	background-position: -160px -256px;
+}
+.icons-pillar {
+	background-position: -192px -256px;
+}
+.icons-chart {
+	background-position: -224px -256px;
+}
 .icons-picture {
 	background-position: -256px -256px;
 }
+.icons-pictures {
+	background-position: -288px -256px;
+}
+.icons-brief {
+	background-position: -320px -256px;
+}
+.icons-film {
+	background-position: -352px -256px;
+}
 .icons-asset {
 	background-position: -384px -256px;
 }
-.icons-asset-upload {
-	background-position: -448px -256px;
-}
 .icons-asset-download {
 	background-position: -416px -256px;
 }
+.icons-asset-upload {
+	background-position: -448px -256px;
+}
+.icons-music {
+	background-position: -480px -256px;
+}
+.icons-book-open-w {
+	background-position: -512px -256px;
+}
+.icons-book-open-b {
+	background-position: -544px -256px;
+}
+.icons-clapper-board {
+	background-position: -576px -256px;
+}
 /*10*/
-.icons- {
-	background-position: -0px -288px;
+.icons-date {
+	background-position: 0px -288px;
+}
+.icons-screen {
+	background-position: -32px -288px;
+}
+.icons-iphone {
+	background-position: -64px -288px;
+}
+.icons-ipad {
+	background-position: -96px -288px;
+}
+.icons-ipod {
+	background-position: -128px -288px;
+}
+.icons-battery-low {
+	background-position: -160px -288px;
+}
+.icons-battery-mid {
+	background-position: -192px -288px;
+}
+.icons-battery-full {
+	background-position: -224px -288px;
+}
+.icons-battery-charge {
+	background-position: -256px -288px;
 }
 /*11*/
 .icons-pie {
@@ -888,14 +1161,50 @@
 	background-position: -224px -320px;
 }
 /*12*/
+.icons-heart-w {
+	background-position: 0px -352px;
+}
+.icons-heart-b {
+	background-position: -32px -352px;
+}
+.icons-like {
+	background-position: -64px -352px;
+}
+.icons-hate {
+	background-position: -96px -352px;
+}
+.icons-medal {
+	background-position: -128px -352px;
+}
+.icons-warning {
+	background-position: -160px -352px;
+}
+.icons-check {
+	background-position: -192px -352px;
+}
+.icons-check-box-solid {
+	background-position: -224px -352px;
+}
+.icons-check-box-dot {
+	background-position: -256px -352px;
+}
 .icons-check-2 {
 	background-position: -288px -352px;
 }
+.icons-check-circle-solid {
+	background-position: -320px -352px;
+}
+.icons-check-circle-dot {
+	background-position: -352px -352px;
+}
+.icons-check-circle-b {
+	background-position: -384px -352px;
+}
 .icons-star-thin {
 	background-position: -416px -352px;
 }
-.icons- {
-	background-position: -0px -352px;
+.icons-star {
+	background-position: -448px -352px;
 }
 /*13*/
 .icons- {
@@ -940,5 +1249,5 @@
 }
 /*21*/
 .icons- {
-	background-position: -0px -640px
-}
+	background-position: -0px -640px;
+}
\ No newline at end of file
diff --git a/app/models/item.rb b/app/models/item.rb
index c8b7812c..cea088fc 100644
--- a/app/models/item.rb
+++ b/app/models/item.rb
@@ -31,6 +31,17 @@ class Item
     nodes << node = node.parent while !node.parent.blank? rescue nil
     nodes.reverse
   end
+
+  # Get an array of ancestor's id
+  def ancestor_ids
+    node, nodes = self, []
+    while !node.parent.blank? do
+      node = node.parent rescue nil
+      nodes << node.id if node
+    end
+    # nodes << node = node.parent while !node.parent.blank? rescue nil
+    nodes.reverse
+  end
   
   # Build the url from the array of ancestors
   def url
diff --git a/lib/parsers/parser_common.rb b/lib/parsers/parser_common.rb
index 7e0bcf74..28600980 100644
--- a/lib/parsers/parser_common.rb
+++ b/lib/parsers/parser_common.rb
@@ -1,7 +1,7 @@
 module ParserCommon
  include ActionView::Helpers::TagHelper
 
-  def menu_level(page, current_page_id, current, menu, edit = false)
+  def menu_level(page, current_page, current, menu, edit = false)
     res = ''
     if page.ordered_and_visible_children.size > 0
       res << "<ul class='"
@@ -10,10 +10,10 @@ module ParserCommon
       i = nil
       i = 1 if menu.values["li_incremental_#{current}"]
       if menu.values['home'] && current == 1
-        res << menu_li(page, current_page_id, current, menu, i, edit)
+        res << menu_li(page, current_page, current, menu, i, edit)
       end
       page.ordered_and_visible_children.each do |child|
-        res << menu_li(child, current_page_id, current, menu, i, edit)
+        res << menu_li(child, current_page, current, menu, i, edit)
         i += 1 if i
       end
       res << "</ul>"
@@ -21,16 +21,16 @@ module ParserCommon
     res
   end
   
-  def menu_li(page, current_page_id, current, menu, i, edit)
+  def menu_li(page, current_page, current, menu, i, edit)
     res = "<li class='"
     res << menu.values["li_class_#{current}"] rescue nil
     res << "_#{i}" if i
-    res << " active" if page.id.eql?(current_page_id)
+    res << " active" if (current_page.id.eql?(page.id) || current_page.ancestor_ids.include?(page.id))
     res << "'>"
-    res << "<a href='#{edit ? admin_page_path(page.id) : page.full_name}'><span>#{page.i18n_variable[I18n.locale]}</span></a>"
+    res << "<a href='/#{edit ? admin_page_path(page.id) : page.full_name}'><span>#{page.i18n_variable[I18n.locale]}</span></a>"
     if page.ordered_and_visible_children.size > 0 && current <= menu.levels
       res << "<span class='dot'></span>"
-      res << menu_level(page, current_page_id, current + 1, menu, edit)
+      res << menu_level(page, current_page, current + 1, menu, edit)
     end unless (page.is_home? rescue nil)
     res << "</li>"
   end
@@ -104,7 +104,7 @@ module ParserCommon
     page_menu = body.css('.page_menu').first
     home = get_homepage
     menu = page.design.layout.menu
-    fragment = Nokogiri::HTML::DocumentFragment.new(body, menu_level(home, page.id, 1, menu, edit))
+    fragment = Nokogiri::HTML::DocumentFragment.new(body, menu_level(home, page, 1, menu, edit))
     page_menu.swap(fragment)
   end
 
diff --git a/public/static/nccu_calendar.rss b/public/static/nccu_calendar.xml
similarity index 100%
rename from public/static/nccu_calendar.rss
rename to public/static/nccu_calendar.xml
diff --git a/vendor/built_in_modules/announcement/app/views/panel/announcement/front_end/bulletins/show.html.erb b/vendor/built_in_modules/announcement/app/views/panel/announcement/front_end/bulletins/show.html.erb
index 17d5d4b7..8c373ddb 100644
--- a/vendor/built_in_modules/announcement/app/views/panel/announcement/front_end/bulletins/show.html.erb
+++ b/vendor/built_in_modules/announcement/app/views/panel/announcement/front_end/bulletins/show.html.erb
@@ -14,21 +14,28 @@
 <div class="news_paragraph">
 	<%= @bulletin.text[I18n.locale].html_safe %>
 </div>
-
-<% if @bulletin.bulletin_links.size > 0 %>
-	<b><%= t('announcement.link') %></b>
-	<% @bulletin.bulletin_links.each do | blink | %>
-	  <%= link_to blink.i18n_variable[I18n.locale], blink.url, :target => '_blank' %>
+<div class="linkAndFile">
+	<% if @bulletin.bulletin_links.size > 0 %>
+		<div>
+			<i class="icons-link"></i>
+			<div class="showLink">
+					<% @bulletin.bulletin_links.each do | blink | %>
+					  <%= link_to blink.i18n_variable[I18n.locale], blink.url, :target => '_blank' %>
+					<% end %>
+			</div>
+		</div>
 	<% end %>
-<% end %>
-
-<% if @bulletin.bulletin_files.size > 0 %>
-	<b><%= t('announcement.file') %></b>
-	<% @bulletin.bulletin_files.each do | bfile | %>
-	<%= link_to bfile.filetitle[I18n.locale], bfile.file.url, {:target => '_blank', :title => bfile.description} if bfile.file.file %>
+	<% if @bulletin.bulletin_files.size > 0 %>
+		<div>
+			<i class="icons-paperclip"></i>
+			<div class="showFile">
+					<% @bulletin.bulletin_files.each do | bfile | %>
+					<%= link_to bfile.filetitle[I18n.locale], bfile.file.url, {:target => '_blank', :title => bfile.description} if bfile.file.file %>
+					<% end %>
+			</div>
+		</div>
 	<% end %>
-<% end %>
-
+</div>
 <div class="fb">
 	<iframe src="//www.facebook.com/plugins/like.php?href=http%3A%2F%2Fwww.nccu.edu.tw&amp;send=false&amp;layout=standard&amp;width=450&amp;show_faces=false&amp;action=like&amp;colorscheme=light&amp;font&amp;height=35&amp;appId=263319013700607" scrolling="no" frameborder="0" style="border:none; overflow:hidden; width:450px; height:35px;" allowTransparency="true"></iframe>
 </div>
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 78943a33..ada22224 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
@@ -3,7 +3,7 @@
 	<h3 class="h3"><%= t('announcement.categories') %></h3> 								
 	<ul class="list"> 
 		<% @bulletin_categorys.each do |category| %>
-			<li>	
+			<li class="<%= category.id.to_s.eql?(params[:category_id]) ? 'active' : nil %>">	
 				<%= link_to category.i18n_variable[I18n.locale], panel_announcement_front_end_bulletins_path(:category_id => category.id) %>
 			</li>
 		<% end %>							
@@ -11,13 +11,11 @@
 </div> 							
 <div class="tag_cloud"> 								
 	<h3 class="h3"><%= t('announcement.tag_cloud') %></h3> 								
-	<ul class="cloud"> 		
+	<div class="cloud"> 		
 		<% @tags.each do |tag| %>	
-			<li class="hot<%#=rand(4) + 1%>">
-				<%= link_to tag[I18n.locale], panel_announcement_front_end_bulletins_path(:tag_id => tag.id) %>
-			</li>
+			<%= 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 %>	
-	</ul> 							
+	</div> 							
 </div> 							
 <!-- <div class="clear"></div>  -->							
 <!-- <div class="rss_feed"> 								
diff --git a/vendor/built_in_modules/news/app/views/panel/news/front_end/news_bulletins/index.html.erb b/vendor/built_in_modules/news/app/views/panel/news/front_end/news_bulletins/index.html.erb
index 7b3b6399..9fc3f129 100644
--- a/vendor/built_in_modules/news/app/views/panel/news/front_end/news_bulletins/index.html.erb
+++ b/vendor/built_in_modules/news/app/views/panel/news/front_end/news_bulletins/index.html.erb
@@ -9,21 +9,21 @@
 <% end %>
 
 <table class="table table-bordered">
-  <tbody>
-  	<tr>
-  		<th><%= t('news.news_bulletin.image') %></th>
+	<tbody>
+		<tr>
+			<th class="span2"><%= t('news.news_bulletin.image') %></th>
 			<th><%= t('news.news_bulletin.title') %></th>
-			<th><%= t('news.news_bulletin.postdate') %></th>
-	  </tr>
-	  <% @news_bulletins.each do |post| %>
-		  <tr>
-		  	<td><%= image_tag post.image %></td>
-				<td>
-					<%= link_to post.title[I18n.locale], panel_news_front_end_news_bulletin_path(post) %>
-					<%= post.subtitle[I18n.locale].html_safe %>
-				</td>
-				<td><%= post.postdate %></td>
-		  </tr>
+			<th class="span2 pagination-right"><%= t('news.news_bulletin.postdate') %></th>
+		</tr>
+		<% @news_bulletins.each do |post| %>
+		<tr>
+			<td><%= image_tag post.image %></td>
+			<td>
+				<%= link_to post.title[I18n.locale], panel_news_front_end_news_bulletin_path(post), :class => 'news_title' %>
+				<%= post.subtitle[I18n.locale].html_safe %>
+			</td>
+			<td><%= post.postdate %></td>
+		</tr>
 		<% end %> 
 	</tbody>
 </table>
diff --git a/vendor/built_in_modules/news/app/views/panel/news/front_end/news_bulletins/show.html.erb b/vendor/built_in_modules/news/app/views/panel/news/front_end/news_bulletins/show.html.erb
index fae904cb..cc63cd86 100644
--- a/vendor/built_in_modules/news/app/views/panel/news/front_end/news_bulletins/show.html.erb
+++ b/vendor/built_in_modules/news/app/views/panel/news/front_end/news_bulletins/show.html.erb
@@ -14,20 +14,28 @@
 <div class="news_paragraph">
 	<%= @news_bulletin.text[I18n.locale].html_safe %>
 </div>
-
-<% if @news_bulletin.news_bulletin_links.size > 0 %>
-	<b><%= t('announcement.link') %></b>
-	<% @news_bulletin.news_bulletin_links.each do | blink | %>
-	  <%= link_to blink.i18n_variable[I18n.locale], blink.url, :target => '_blank' %>
+<div class="linkAndFile">
+	<% if @news_bulletin.news_bulletin_links.size > 0 %>
+		<div>
+			<i class="icons-link"></i>
+			<div class="showLink">
+					<% @news_bulletin.news_bulletin_links.each do | blink | %>
+					  <%= link_to blink.i18n_variable[I18n.locale], blink.url, :target => '_blank' %>
+					<% end %>
+			</div>
+		</div>
 	<% end %>
-<% end %>
-
-<% if @news_bulletin.news_bulletin_files.size > 0 %>
-	<b><%= t('announcement.file') %></b>
-	<% @news_bulletin.news_bulletin_files.each do | bfile | %>
-	<%= link_to bfile.filetitle[I18n.locale], bfile.file.url, {:target => '_blank', :title => bfile.description} if bfile.file.file %>
+	<% if @news_bulletin.news_bulletin_files.size > 0 %>
+		<div>
+			<i class="icons-paperclip"></i>
+			<div class="showFile">
+					<% @news_bulletin.news_bulletin_files.each do | bfile | %>
+					<%= link_to bfile.filetitle[I18n.locale], bfile.file.url, {:target => '_blank', :title => bfile.description} if bfile.file.file %>
+					<% end %>
+			</div>
+		</div>
 	<% end %>
-<% end %>
+</div>
 
 <div class="fb">
 	<iframe src="//www.facebook.com/plugins/like.php?href=http%3A%2F%2Fwww.nccu.edu.tw&amp;send=false&amp;layout=standard&amp;width=450&amp;show_faces=false&amp;action=like&amp;colorscheme=light&amp;font&amp;height=35&amp;appId=263319013700607" scrolling="no" frameborder="0" style="border:none; overflow:hidden; width:450px; height:35px;" allowTransparency="true"></iframe>
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 84e58f40..815395ff 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
@@ -3,7 +3,7 @@
 	<h3 class="h3"><%= t('announcement.categories') %></h3> 								
 	<ul class="list"> 
 		<% @news_bulletin_categorys.each do |category| %>
-			<li>	
+			<li class="<%= category.id.to_s.eql?(params[:category_id]) ? 'active' : nil %>">	
 				<%= link_to category.i18n_variable[I18n.locale], panel_news_front_end_news_bulletins_path(:category_id => category.id) %>
 			</li>
 		<% end %>							
@@ -11,13 +11,11 @@
 </div> 							
 <div class="tag_cloud"> 								
 	<h3 class="h3"><%= t('announcement.tag_cloud') %></h3> 								
-	<ul class="cloud"> 		
+	<div class="cloud"> 		
 		<% @tags.each do |tag| %>	
-			<li class="hot<%#=rand(4) + 1%>">
-				<%= link_to tag[I18n.locale], panel_news_front_end_news_bulletins_path(:tag_id => tag.id) %>
-			</li>
+			<%= 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}" %>
 		<% end %>	
-	</ul> 							
+	</div> 							
 </div> 							
 <!-- <div class="clear"></div>  -->							
 <!-- <div class="rss_feed">