fix for

1.Announcement 15 per page
2.Search keywords.
3.Redis search index with new code.

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

@@ -15,18 +15,18 @@ class Panel::Announcement::FrontEnd::BulletinsController < OrbitWidgetController
       search = Redis::Search.query("Bulletin", params[:search_query], :conditions =>search_cond,:limit=>Bulletin.all.count)
       search_result = search.collect{|t| t["id"]}
 
-      @bulletins = Bulletin.all.can_display.any_in(_id:search_result).page( params[:page_main]).per(10)
+      @bulletins = Bulletin.all.can_display.any_in(_id:search_result).page( params[:page_main]).per(15)
     else
       date_now = Time.now
       if !params[:category_id].blank?
-        @bulletins = Bulletin.all.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_main]).per(10)
+        @bulletins = Bulletin.all.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_main]).per(15)
         @current_category = BulletinCategory.from_id(params[:category_id]) rescue nil
       elsif !params[:tag_id].blank?
         @tag = AnnouncementTag.find(params[:tag_id]) rescue nil
         @tag = AnnouncementTag.where(key: params[:tag_id])[0] unless @tag
-        @bulletins = @tag.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_main]).per(10)
+        @bulletins = @tag.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_main]).per(15)
       else
-        @bulletins = Bulletin.all.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_main]).per(10)
+        @bulletins = Bulletin.all.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_main]).per(15)
       end
     end
 	  

vendor/built_in_modules/announcement/app/models/bulletin.rb

@@ -76,11 +76,11 @@ class Bulletin
   # end
 
   def s_title
-   self.title_translations[:zh_tw]
+   self.title_translations["zh_tw"]
   end
 
   def s_title_en
-   self.title_translations[:en]
+   self.title_translations["en"]
   end
 
   # def s_text_en

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

@@ -18,11 +18,11 @@
     <% if @bulletins.blank? and !params[:search_query].blank? %>
       <%=render :partial => 'shared/search_not_found'  %>
       <% elsif  !params[:search_query].blank?  %>
-        <%= t("search.result_get",:item_num=>@bulletins.count) %>
+        <%= t("search.result_get",:search_word => params[:search_query],:item_num=>@bulletins.count) %>
      <% end %>
 <% @bulletins.each do |post| %>
   <tr>
-	<td><%= post.bulletin_category.title rescue nil %></td>
+	<td><%= (post.bulletin_category.title rescue nil ) if !params[:search_query].blank? %></td>
 	<td><%= link_to post.title, panel_announcement_front_end_bulletin_path(post, :category_id => post.bulletin_category_id) %>
 	<%#= link_to post.title, panel_announcement_back_end_bulletin_path(post) %>
 	</td>

vendor/built_in_modules/announcement/app/views/panel/announcement/widget/bulletins/bulletins_search_block.html.erb

@@ -1,6 +1,6 @@
 <%= form_tag panel_announcement_front_end_bulletins_path, method: :get do %>
   <p>
-    <%= text_field_tag :search_query, params[:search_query] %>
+    <%= text_field_tag :search_query, params[:search_query],{:value => (params[:search_query].blank?? '' : params[:search_query]),:placeholder=>t("announcement.search") }%>
     <%= submit_tag "Search", name: nil %>
   </p>
 <% end %>

vendor/built_in_modules/announcement/app/views/panel/announcement/widget/bulletins/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_announcement_front_end_bulletins_path(:tag_id => tag.id),:style=>"font-size: #{100+ tag.cloud_amper * 10}%", :class => "hot#{rand(4) + 1} #{(tag.id.to_s.eql?(params[:tag_id]) || tag.key.eql?(params[:tag_id])) ? 'active' : nil}" %>
+			<%= 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> 							

vendor/built_in_modules/announcement/config/locales/en.yml

@@ -62,6 +62,7 @@ en:
     categories: Categories
     error: 
       no_avilb_cate_for_posting: You need a category to submit your post,please contact admin
+    search: Search in announcement
     sure?: Sure?
     campus_news: Campus News
     more: more+

vendor/built_in_modules/announcement/config/locales/zh_tw.yml

@@ -42,6 +42,7 @@ zh_tw:
       no_avilb_cate_for_posting: 您目前沒有分類可以刊登公告，請聯絡系統管理員為您開通分類
     tags: 標籤
     categories: 分類
+    search: 搜尋公告
     status: 狀態
     sure?: 確定嗎?
     campus_news: 校園新聞

vendor/built_in_modules/news/app/models/news_bulletin.rb

@@ -101,11 +101,11 @@ class NewsBulletin
 # end
 
  def s_title
-   self.title_translations[:zh_tw]
+    self.title_translations["zh_tw"]
  end
 
  def s_title_en
-   self.title_translations[:en]
+   self.title_translations["en"]
  end
 
  # def s_text_en

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

@@ -10,7 +10,7 @@
 	   <% if @news_bulletins.blank? and !params[:search_query].blank? %>
 	   	<%=render :partial => 'shared/search_not_found'  %>
 	   <% elsif  !params[:search_query].blank?  %>
-        	<%= t("search.result_get",:item_num=>@news_bulletins.count) %>
+        	<%= t("search.result_get",:search_word => params[:search_query],:item_num=>@news_bulletins.count) %>
 	   <% end %>
 <table class="table table-bordered">
 	<tbody>

vendor/built_in_modules/news/app/views/panel/news/widget/news_bulletins/news_bulletins_search_block.html.erb

@@ -1,6 +1,6 @@
 <%= form_tag panel_news_front_end_news_bulletins_path, method: :get do %>
   <p>
-    <%= text_field_tag :search_query, params[:search_query] %>
+    <%= text_field_tag :search_query, params[:search_query],{:value => (params[:search_query].blank?? '' : params[:search_query]),:placeholder=>t("news.search") }%>
     <%= hidden_field_tag :category_id, params[:category_id] %>
     <%= submit_tag "Search", name: nil %>
   </p>

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), :style => "font-size: #{100+ tag.cloud_amper * 10}%",:class => "hot#{rand(4) + 1} #{(tag.id.to_s.eql?(params[:tag_id]) || tag.key.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> 							

vendor/built_in_modules/news/config/locales/en.yml

@@ -59,6 +59,7 @@ en:
     all_articles: List
     add_new: Add
     sure?: Sure?
+    search: Search in news
     campus_news: Campus News
     more: more+
     news_bulletins: NewsBulletins

vendor/built_in_modules/news/config/locales/zh_tw.yml

@@ -39,6 +39,7 @@ zh_tw:
     all_articles: 列表
     tags: 標籤
     categories: 分類
+    search: 搜尋新聞
     status: 狀態
     sure?: 確定嗎?
     campus_news: 校園新聞