Merge branch 'design_team' into ldap

Conflicts:
	config/environments/development.rb

vendor/built_in_modules/announcement/app/controllers/panel/announcement/front_end/bulletins_controller.rb

@@ -14,7 +14,9 @@ class Panel::Announcement::FrontEnd::BulletinsController < OrbitWidgetController
     if !params[:category_id].blank?
       @bulletins = Bulletin.can_display.where(:bulletin_category_id => params[:category_id]).any_of( {deadline: nil,:postdate.lte => date_now} , {:deadline.gte => date_now,:postdate.lte => date_now} ).desc( :is_top, :postdate).page( params[:page]).per(10)
     elsif !params[:tag_id].blank?
-      @bulletins = AnnouncementTag.find(params[:tag_id]).bulletins.can_display.any_of( {deadline: nil,:postdate.lte => date_now} , {:deadline.gte => date_now,:postdate.lte => date_now} ).desc( :is_top, :postdate).page( params[:page]).per(10)
+      tmp = AnnouncementTag.find(params[:tag_id]) rescue nil
+      tmp = AnnouncementTag.where(key: params[:tag_id])[0] unless tmp
+      @bulletins = tmp.bulletins.can_display.any_of( {deadline: nil,:postdate.lte => date_now} , {:deadline.gte => date_now,:postdate.lte => date_now} ).desc( :is_top, :postdate).page( params[:page]).per(10)
     else
       @bulletins = Bulletin.can_display.any_of( {deadline: nil,:postdate.lte => date_now} , {:deadline.gte => date_now,:postdate.lte => date_now} ).desc( :is_top, :postdate).page( params[:page]).per(10)
     end

vendor/built_in_modules/announcement/app/controllers/panel/announcement/widget/bulletins_controller.rb

@@ -26,7 +26,7 @@ class Panel::Announcement::Widget::BulletinsController < OrbitWidgetController
   end
   
   def bulletins_and_web_links
-    @tags = AnnouncementTag.all
+    @tags = AnnouncementTag.any_in(key: ['students', 'alumni', 'employee', 'guest'])
     @selected_tag = AnnouncementTag.find(params[:id]) rescue @tags[0]
     @bulletins = @selected_tag.get_visible_bulletins.can_display.page(params[:page]).per(5) rescue nil
     @web_links = WebResourceTag.first(:conditions => {:en => @selected_tag[:en]}).get_visible_links.page(params[:page]).per(5) rescue nil

vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/approvals/_privilege_user.html.erb

@@ -7,7 +7,7 @@
 				<% sys_user.sub_roles.each do |sr| %>
 					<div class="for_unit" style="display:none;"> <%= sr.key %></div>
 				<% end %>
-				<%= content_tag :div,:data=>{'original-title'=>t('announcement.bulletin.approval_setting_window_title'),:content => "#{sys_user.sub_roles.collect{|sr| sr.key}.join(',')}"},:class=>"checkbox clear" do %>
+				<%= content_tag :div,:data=>{'original-title'=>t('announcement.bulletin.approval_setting_window_title'),:content => "#{sys_user.sub_roles.collect{|sr| sr.i18n_variable[I18n.locale]}.join(',')}"},:class=>"checkbox clear" do %>
 					<div class="check-icon">
 					</div>
 					<div class='member-avatar'>

vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_form.html.erb

@@ -91,12 +91,20 @@
 			</div>
 			<h3 class="widget-title"><i class="icons-tag icons-white"></i>Tags</h3>
 				<div class="widget-content clear form-horizontal">
-					<% @tags.each do |tag| %>
-						<%= content_tag :label,:class => "checkbox inline" do -%>
-							<%= check_box_tag 'bulletin[tag_ids][]', tag.id, @bulletin.tag_ids.include?(tag.id)%>
-							<%= tag[I18n.locale] %>
+					<p>
+						<% @tags.each do |tag| %>
+							<%= content_tag :label,:class => "checkbox inline" do -%>
+								<%= check_box_tag 'bulletin[tag_ids][]', tag.id, @bulletin.tag_ids.include?(tag.id)%>
+								<%= tag[I18n.locale] %>
+							<% end %>
 						<% end %>
-					<% end %>
+					</p>
+		           	<span class="label label-tags">Default<a href><i class="icon-remove icon-white"></i></a></span>
+		           	<span class="label label-tags">Default<a href><i class="icon-remove icon-white"></i></a></span>
+		           	<span class="label label-tags">Default<a href><i class="icon-remove icon-white"></i></a></span>
+		           	<span class="label label-tags">Default<a href><i class="icon-remove icon-white"></i></a></span>
+		            <hr>
+					<input type="text" class="input-xlarge">
 				</div>
 		</div> 
   	<% if params[:action] != 'new' %>

vendor/built_in_modules/announcement/app/views/panel/announcement/front_end/bulletins/show.html.erb

@@ -14,18 +14,28 @@
 <div class="news_paragraph">
 	<%= @bulletin.text[I18n.locale].html_safe %>
 </div>
-
-<b><%= t('announcement.link') %></b>
-<% @bulletin.bulletin_links.each do | blink | %>
-  <%= link_to blink.i18n_variable[I18n.locale], blink.url, :target => '_blank' %>
-<% end %>
-</li>
-<li>
-<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 %>
-<% end %>
-
+<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 %>
+	<% 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 %>
+</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">