fix announcement & add lang tab

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

@@ -14,7 +14,7 @@ class Panel::Announcement::BackEnd::BulletinsController < OrbitBackendController
     
   	# @bulletins = Bulletin.search(params[:search], params[:category_id])
     # @bulletins = Bulletin.all.order_by([params[:sort], params[:direction]])
-    @bulletins = params[:sort] ? get_sorted_bulletins : Bulletin.limit(1).desc("postdate")
+    @bulletins = params[:sort] ? get_sorted_bulletins : Bulletin.all
   	@bulletin_categories = BulletinCategory.all
 	
     @bulletin_link = BulletinLink.new

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

@@ -16,6 +16,15 @@ class BulletinFile
   belongs_to :bulletin
   # embedded_in :bulletin
   
+  before_save :set_key
+  
+  def filetitle
+    @filetitle ||= I18nVariable.first(:conditions => {:key => 'filetitle', :language_value_id => self.id, :language_value_type => self.class}) rescue nil
+  end
+  
+  def description
+    @description ||= I18nVariable.first(:conditions => {:key => 'description', :language_value_id => self.id, :language_value_type => self.class}) rescue nil
+  end
   
   protected
   

vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletin_categorys/_bulletin_category.html.erb

@@ -5,7 +5,6 @@
 			<div class="quick-edit">
 				<ul class="nav nav-pills hide">
 					<li><%= link_to t('bulletin_category.edit'), edit_panel_announcement_back_end_bulletin_category_path(bulletin_category), :remote => true %></li>
-					<li><%= link_to t('bulletin_category.quick_edit'), panel_announcement_back_end_bulletin_category_quick_edit_path(bulletin_category), :remote => true %></li>
 					<li><%= link_to t('bulletin_category.delete'), panel_announcement_back_end_bulletin_category_path(bulletin_category), :confirm => t('announcement.sure?'), :method => :delete, :remote => true %></li>
 				</ul>
 			</div>

vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletin_categorys/quick_edit.js.erb

@@ -1,3 +0,0 @@
-$.each($(".quick_edit"),function(obj){ $(this).remove(); });
-$("#<%= dom_id @bulletin_category %>").append("<div class='quick_edit'><%= j render "form" %></div>");
-//$("#form > form").replaceWith("<%= j render "form" %>");

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

@@ -1,17 +1,6 @@
 <% # encoding: utf-8 %>
 
   <%= f.error_messages %>
-  <%= f.select :bulletin_category_id, @bulletin_categorys.collect{|t| [ t.i18n_variable[I18n.locale], t.id ]}, {}, :class => "input-medium" %>
-	<div class="field">
-		<%= label :fact_check_stat, t('announcement.bulletin.fact_check_stat') %>
-		<%= f.radio_button :is_checked, true%> 
-		  <%= label :is_checked_true, t('announcement.bulletin.fact_check_pass')  %>
-		  <%= f.radio_button :is_checked, false, (@bulletin.is_checked.nil?? {:checked => true} : {})  %>
-		  <%= label :is_checked_false, t('announcement.bulletin.fact_check_not_pass') %>
-		
-		  <%= label :is_checked_false, t('announcement.bulletin.fact_check_not_pass_reason') %>
-		<%= f.text_field :not_checked_reason %>
-	</div>
   
 	<!--Widget start-->
 	
@@ -104,56 +93,46 @@
 			<%= f.label :category %>
 			<%= f.select :bulletin_category_id, @bulletin_categorys.collect{|t| [ t.i18n_variable[I18n.locale], t.id ]}, {}, :class => "input-medium" %>
 			
-			<div class="btn-group pull-right">
+			<ul class="nav nav-tabs">
-				<a class="btn dropdown-toggle" href="#" data-toggle="dropdown">
+				<% @site_valid_locales.each_with_index do |locale, i| %>
-					English
+			    <li <%= ( i == 0 ) ? " class='active'" : '' %>><a data-toggle="tab" href=".<%= locale %>"><%= I18nVariable.from_locale(locale) %></a></li>
-					<span class="caret"></span>
+				<% end %>
-				</a>
-				<ul class="dropdown-menu">
-					<li><a href="#">English</a></li>
-					<li><a href="#">Chinese</a></li>
-					<li><a href="#">Japanese</a></li>
-					<li><a href="#">French</a></li>
-					<li><a href="#">German</a></li>
-					<!--<li class="divider"></li>
-					<li><a href="#">Separated link</a></li>-->
 			</ul>
-			</div>
+			
+			<div class="tab-content">
+			
+				<% @site_valid_locales.each_with_index do |locale, i| %>
+				
+				<div class="<%= locale %> fade tab-pane <%= ( i == 0 ) ? "in active" : '' %>">
 
 					<div class="title">
 						<%= f.label :title %>
 						<%= f.fields_for :title, (@bulletin.new_record? ? @bulletin.build_title : @bulletin.title ) do |f| %>
-				  <% @site_valid_locales.each do |locale| %>
-					<td>
 							<%= I18nVariable.from_locale(locale) %>
 							<%= f.text_field locale, :class=>'post-title' %>
-						</td>
-				  <% end %>
 						<% end %>
 					</div>	
 
 					<div class="title">
 						<%= f.label :subtitle %>
 						<%= f.fields_for :subtitle, (@bulletin.new_record? ? @bulletin.build_subtitle : @bulletin.subtitle ) do |f| %>
-					<% @site_valid_locales.each do |locale| %>
-						<td>
 							<%= I18nVariable.from_locale(locale) %>
 							<%= f.text_area locale, :style=>"width:100%" %>
-						</td>
-					<% end %>
 						<% end %>
 					</div> 
 
 					<div class="title">
 						<%= f.label :text %>
 						<%= f.fields_for :text, (@bulletin.new_record? ? @bulletin.build_text : @bulletin.text ) do |f| %>
-					<% @site_valid_locales.each do |locale| %>
-						<td>
 							<%= I18nVariable.from_locale(locale) %>
 							<%= f.text_area locale, :style=>"width:100%" %>
-						</td>
 						<% end %>
+					</div> 
+					
+				</div>
+
 				<% end %>
+				
 			</div>
 			
 
@@ -171,10 +150,7 @@
 						<thead>
 							<tr>
 								<th>URL</th>
-								<% @site_valid_locales.each do |locale| %>
+								<th>Name</th>
-								<div class="control-group">
-									<th>Name - <%= I18nVariable.first(:conditions => {:key => locale})[I18n.locale] %></th>
-								<% end %>
 								<th class="span1"></th>
 							</tr>
 						</thead>

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

@@ -8,8 +8,14 @@
 				</div>
 			</td>	
 			<td>	
+			
+				<div class="tab-content">
+				
+					<% @site_valid_locales.each_with_index do |locale, i| %>
+					
+					<div class="<%= locale %> fade tab-pane <%= ( i == 0 ) ? "in active" : '' %>">
+						
 						<%= f.fields_for :filetitle, (form_bulletin_file.new_record? ? form_bulletin_file.build_filetitle : form_bulletin_file.filetitle ) do |f| %>
-				  <% @site_valid_locales.each do |locale| %>
 							<div class="control-group">
 								<label for="link-<%= locale %>" class="control-label"><%= I18nVariable.first(:conditions => {:key => locale})[I18n.locale] %></label>
 								<div class="controls">
@@ -17,11 +23,23 @@
 								</div>
 							</div>
 						<% end %>
+						
+					</div>
+
 					<% end %>
+					
+				</div>
+				
 			</td>
 			<td>	
+			
+				<div class="tab-content">
+				
+					<% @site_valid_locales.each_with_index do |locale, i| %>
+					
+					<div class="<%= locale %> fade tab-pane <%= ( i == 0 ) ? "in active" : '' %>">
+						
 						<%= f.fields_for :description, (form_bulletin_file.new_record? ? form_bulletin_file.build_description : form_bulletin_file.description ) do |f| %>
-				  <% @site_valid_locales.each do |locale| %>
 							<div class="control-group">
 								<label for="link-<%= locale %>" class="control-label"><%= I18nVariable.first(:conditions => {:key => locale})[I18n.locale] %></label>
 								<div class="controls">
@@ -29,7 +47,13 @@
 								</div>
 							</div>
 						<% end %>
+						
+					</div>
+
 					<% end %>
+					
+				</div>
+				
 			</td>	
 			<td>
 			<span class="action">

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

@@ -9,18 +9,28 @@
 				</div>
 			</td>	
 			<td>
+	
+			
+				<div class="tab-content">
+				
+					<% @site_valid_locales.each_with_index do |locale, i| %>
+					
+					<div class="<%= locale %> fade tab-pane <%= ( i == 0 ) ? "in active" : '' %>">
+						
 						<%= f.fields_for :i18n_variable, (form_bulletin_link.new_record? ? form_bulletin_link.build_i18n_variable : form_bulletin_link.i18n_variable) do |f| %>
-				  <% @site_valid_locales.each do |locale| %>
 							<div class="control-group">
+								<label for="link-<%= locale %>" class="control-label"><%= I18nVariable.first(:conditions => {:key => locale})[I18n.locale] %></label>
 								<div class="controls">
 								<%= f.text_field locale, :id => "link-#{locale}", :class => "input-xlarge" %>
 								</div>
 							</div>
-			</td>	
+						<% end %>
-			<td>	
+						
+					</div>
 
 					<% end %>
-				<% end %>
+					
+				</div>
 				
 			</td>
 			<td>

vendor/built_in_modules/announcement/config/routes.rb

@@ -14,9 +14,7 @@ Rails.application.routes.draw do
           match "file_quick_edit/:bulletin_id" => "bulletins#file_quick_edit" ,:as => :file_quick_edit
         end
 		
-        resources :bulletin_categorys, :controller => 'bulletin_categorys' do
+        resources :bulletin_categorys
-          match "quick_edit/:bulletin_category_id" => "bulletin_categorys#quick_edit" ,:as => :quick_edit
-        end
 		
 		resources :bulletin_links, :controller => 'bulletin_links' do
           match "link_quick_edit/:bulletin_link_id" => "bulletin_links#link_quick_edit" ,:as => :link_quick_edit

vendor/built_in_modules/page_content/app/views/panel/page_content/back_end/page_contexts/_form.html.erb

@@ -9,16 +9,30 @@
 	  <%= @page_context.page.i18n_variable[I18n.locale] %>
 	</div>
 
+	<ul class="nav nav-tabs">
+		<% @site_valid_locales.each_with_index do |locale, i| %>
+		<li <%= ( i == 0 ) ? " class='active'" : '' %>><a data-toggle="tab" href=".<%= locale %>"><%= I18nVariable.from_locale(locale) %></a></li>
+		<% end %>
+	</ul>
+			
+	<div class="tab-content">
+	
+		<% @site_valid_locales.each_with_index do |locale, i| %>
+		
+		<div class="<%= locale %> fade tab-pane <%= ( i == 0 ) ? "in active" : '' %>">
+
 			<div class="title">
 				<%= f.label :context %>
 				<%= f.fields_for :context, (@page_context.new_record? ? @page_context.build_context : @page_context.context ) do |f| %>
-			<% @site_valid_locales.each do |locale| %>
-				<td>
 					<%= I18nVariable.from_locale(locale) %>
 					<%= f.text_area locale, :style=>"width:100%" %>
-				</td>
 				<% end %>
+			</div>
+			
+		</div>
+
 		<% end %>
+		
 	</div>
 	  
 	  

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

@@ -45,49 +45,42 @@
 			<%= f.label :category %>
 			<%= f.select :web_link_category_id, @web_link_categorys.collect {|t| [ t.i18n_variable[I18n.locale], t.id ]} %>
 			
-			<div class="btn-group pull-right">
+			<ul class="nav nav-tabs">
-				<a class="btn dropdown-toggle" href="#" data-toggle="dropdown">
+				<% @site_valid_locales.each_with_index do |locale, i| %>
-					English
+			    <li <%= ( i == 0 ) ? " class='active'" : '' %>><a data-toggle="tab" href=".<%= locale %>"><%= I18nVariable.from_locale(locale) %></a></li>
-					<span class="caret"></span>
+				<% end %>
-				</a>
-				<ul class="dropdown-menu">
-					<li><a href="#">English</a></li>
-					<li><a href="#">Chinese</a></li>
-					<li><a href="#">Japanese</a></li>
-					<li><a href="#">French</a></li>
-					<li><a href="#">German</a></li>
-					<!--<li class="divider"></li>
-					<li><a href="#">Separated link</a></li>-->
 			</ul>
-			</div>
 			
+			<div class="tab-content">
+			
+				<% @site_valid_locales.each_with_index do |locale, i| %>
+				
+				<div class="<%= locale %> fade tab-pane <%= ( i == 0 ) ? "in active" : '' %>">
 					<div class="title">
 						<%= f.label :name %>
 						<%= f.fields_for :name, (@web_link.new_record? ? @web_link.build_name : @web_link.name ) do |f| %>
-				  <% @site_valid_locales.each do |locale| %>
-					<td>
 							<%= I18nVariable.from_locale(locale) %>
 							<%= f.text_field locale, :class=>'post-title' %>
-					</td>
 						<% end %>
-				<% end %>
-			</div>
-
-			<div class="title">
-				<%= f.label :url %>
-				<%= f.text_field :url %>
 					</div>
 
 					<div class="title">
 						<%= f.label :describe %>
 						<%= f.fields_for :context, (@web_link.new_record? ? @web_link.build_context : @web_link.context ) do |f| %>
-				  <% @site_valid_locales.each do |locale| %>
-					<td>
 								<%= I18nVariable.from_locale(locale) %>
 								<%= f.text_area locale, :style=>"width:100%" %>
-					</td>
 						<% end %>
+					</div>
+					
+				</div>
+
 				<% end %>
+				
+			</div>
+
+			<div class="title">
+				<%= f.label :url %>
+				<%= f.text_field :url %>
 			</div>
 			
 		</div>