Ray's changes

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>

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"> 								

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>

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>

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">