Merge branch 'design_team' of https://github.com/Rulingcom/orbit into nccu_0509

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/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,58 +14,28 @@
 <div class="news_paragraph">
 	<%= @bulletin.text[I18n.locale].html_safe %>
 </div>
+<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>
-<!--
-<p id="notice"><%= flash_messages %></p>
-
-<ul>
-	<li>
-  <b><%= t('announcement.category') %></b>
-  <%= @bulletin.bulletin_category.i18n_variable[I18n.locale] %>
-	</li>
-	<li>
-  <b><%= t('announcement.postdate') %></b>
-  <%= @bulletin.postdate %>
-	</li>
-	<li>
-  <b><%= t('announcement.title') %></b>
-  <%= @bulletin.title[I18n.locale] %>
-	</li>
-	<li>
-  <%#= image_tag(@bulletin.image.url, :size => "320x240") if @bulletin.image.file %>
-  <%= link_to image_tag(@bulletin.image.url, :size => "320x240"), @bulletin.image.url, {:target => '_blank', :title => @bulletin.image_identifier} if @bulletin.image.file %>
-	</li>
-	<li>
-  <b><%= t('announcement.subtitle') %></b>
-  <%= @bulletin.subtitle[I18n.locale].html_safe %>
-	</li>
-	<li>
-  <b><%= t('announcement.text') %></b>
-  <%= @bulletin.text[I18n.locale].html_safe %>
-	</li>
-	<li>
-	<li>
-	<b><%= t('announcement.link') %></b>
-	<% @bulletin.bulletin_links.each do | blink | %>
-    <%= link_to blink.name, blink.url, :target => '_blank' %>
-	<% end %>
-	</li>
-	<li>
-	<b><%= t('announcement.file') %></b>
-	<% @bulletin.bulletin_files.each do | bfile | %>
-	<%= link_to bfile.filetitle, bfile.file.url, {:target => '_blank', :title => bfile.description} if bfile.file.file %>
-	<% end %>
-	</li>
-	<li>
-  <b><%= t('announcement.張貼者') %></b>
-  <%= User.find(@bulletin.create_user_id).name %>
-	</li>
-	<li>
-  <b><%= t('announcement.最後修改時間') %></b>
-  <%= @bulletin.updated_at.strftime("%Y-%m-%d %H:%I:%S") %>
-	</li>
--->
-
-<%#= link_back %>

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>
-		<% end %>	
-	</ul> 							
+			<%= 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>  -->							
 <!-- <div class="rss_feed"> 								

vendor/built_in_modules/news/app/controllers/panel/news/front_end/news_bulletins_controller.rb

@@ -13,7 +13,9 @@ class Panel::News::FrontEnd::NewsBulletinsController < OrbitWidgetController
     if !params[:category_id].blank?
       @news_bulletins = NewsBulletin.can_display.where(:news_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?
-      @news_bulletins = NewsTag.find(params[:tag_id]).news_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 = NewsTag.find(params[:tag_id]) rescue nil
+      tmp = NewsTag.where(key: params[:tag_id])[0] unless tmp
+      @news_bulletins = tmp.news_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) rescue nil
     else
       @news_bulletins = NewsBulletin.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/news/app/views/panel/news/front_end/news_bulletins/index.html.erb

@@ -8,25 +8,24 @@
 	<h1 class="h1"><%= t('news.list_news') %></h1>
 <% end %>
 
-
 <table class="table table-bordered">
-  <tr>
-	<th><%= t('news.news_bulletin.category') %></th>
-	<th><%= t('news.news_bulletin.title') %></th>
-	<th><%= t('news.news_bulletin.postdate') %></th>
-  </tr>
-
-<% @news_bulletins.each do |post| %>
-  <tr>
-	<td><%= post.news_bulletin_category.i18n_variable[I18n.locale] %></td>
-	<td><%= link_to post.title[I18n.locale], panel_news_front_end_news_bulletin_path(post) %>
-	<%#= link_to post.title, panel_news_back_end_news_bulletin_path(post) %>
-	</td>
-	<td><%= post.postdate %></td>
-  </tr>
-  
-<% end %>
-
+	<tbody>
+		<tr>
+			<th class="span2"><%= t('news.news_bulletin.image') %></th>
+			<th><%= t('news.news_bulletin.title') %></th>
+			<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>
 
 <%= paginate @news_bulletins, :params => {:inner => 'false'} %>

vendor/built_in_modules/news/app/views/panel/news/front_end/news_bulletins/show.html.erb

@@ -14,58 +14,29 @@
 <div class="news_paragraph">
 	<%= @news_bulletin.text[I18n.locale].html_safe %>
 </div>
+<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 %>
+	<% 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 %>
+</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>
-<!--
-<p id="notice"><%= flash_messages %></p>
-
-<ul>
-	<li>
-  <b><%= t('news.category') %></b>
-  <%= @news_bulletin.news_bulletin_category.i18n_variable[I18n.locale] %>
-	</li>
-	<li>
-  <b><%= t('news.postdate') %></b>
-  <%= @news_bulletin.postdate %>
-	</li>
-	<li>
-  <b><%= t('news.title') %></b>
-  <%= @news_bulletin.title[I18n.locale] %>
-	</li>
-	<li>
-  <%#= image_tag(@news_bulletin.image.url, :size => "320x240") if @news_bulletin.image.file %>
-  <%= link_to image_tag(@news_bulletin.image.url, :size => "320x240"), @news_bulletin.image.url, {:target => '_blank', :title => @news_bulletin.image_identifier} if @news_bulletin.image.file %>
-	</li>
-	<li>
-  <b><%= t('news.subtitle') %></b>
-  <%= @news_bulletin.subtitle[I18n.locale].html_safe %>
-	</li>
-	<li>
-  <b><%= t('news.text') %></b>
-  <%= @news_bulletin.text[I18n.locale].html_safe %>
-	</li>
-	<li>
-	<li>
-	<b><%= t('news.link') %></b>
-	<% @news_bulletin.news_bulletin_links.each do | blink | %>
-    <%= link_to blink.name, blink.url, :target => '_blank' %>
-	<% end %>
-	</li>
-	<li>
-	<b><%= t('news.file') %></b>
-	<% @news_bulletin.news_bulletin_files.each do | bfile | %>
-	<%= link_to bfile.filetitle, bfile.file.url, {:target => '_blank', :title => bfile.description} if bfile.file.file %>
-	<% end %>
-	</li>
-	<li>
-  <b><%= t('news.張貼者') %></b>
-  <%= User.find(@news_bulletin.create_user_id).name %>
-	</li>
-	<li>
-  <b><%= t('news.最後修改時間') %></b>
-  <%= @news_bulletin.updated_at.strftime("%Y-%m-%d %H:%I:%S") %>
-	</li>
--->
-
-<%#= link_back %>

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]) || tag.key.eql?(params[:tag_id])) ? 'active' : nil}" %>
 		<% end %>	
-	</ul> 							
+	</div> 							
 </div> 							
 <!-- <div class="clear"></div>  -->							
 <!-- <div class="rss_feed"> 								

vendor/built_in_modules/web_resource/app/views/panel/web_resource/back_end/web_links/index.html.erb

@@ -16,9 +16,9 @@
 	</table>
 <% end %>
 
-<div id="web_link_pagination" class="paginationFixed">
-	<%= paginate @web_links, :params => {:direction => params[:direction], :sort => params[:sort], :filter => @filter, :new_filter => nil} %>
-</div>
 <div class="form-actions form-fixed pagination-right">
-	<%= link_to content_tag(:i, nil, :class => 'icon-plus icon-white') + t('announcement.add_new'), new_panel_web_resource_back_end_web_link_path, :class => 'btn btn-primary' %>
+	<%= link_to content_tag(:i, nil, :class => 'icon-plus icon-white') + t('announcement.add_new'), new_panel_web_resource_back_end_web_link_path, :class => 'btn btn-primary pull-right' %>
+	<div id="web_link_pagination" class="paginationFixed">
+	<%= paginate @web_links, :params => {:direction => params[:direction], :sort => params[:sort], :filter => @filter, :new_filter => nil} %>
+	</div>
 </div>