Merge branch 'various_bugs' into nccu_master

Conflicts:
	Gemfile.lock
	app/assets/javascripts/ajax_form.js.erb
	app/assets/stylesheets/style.css.erb
	app/controllers/application_controller.rb
	app/controllers/sessions_controller.rb
	app/helpers/admin/web_link_helper.rb
	app/views/admin/attributes/_attribute_field.html.erb
	app/views/admin/designs/_form.html.erb
	app/views/admin/pages/_form.html.erb
	app/views/admin/sites/_side_bar.html.erb
	app/views/layouts/_orbit_bar.html.erb
	app/views/layouts/_side_bar.html.erb
	config/locales/en.yml
	config/locales/zh_tw.yml
	config/mongoid.yml
	vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/bulletins_controller.rb
	vendor/built_in_modules/announcement/app/controllers/panel/announcement/front_end/bulletins_controller.rb
	vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_bulletin.html.erb
	vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_filter.html.erb
	vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/index.html.erb
	vendor/built_in_modules/announcement/app/views/panel/announcement/widget/bulletins/_index.html.erb
	vendor/built_in_modules/news/app/views/panel/news/back_end/news_bulletins/_filter.html.erb
	vendor/built_in_modules/news/app/views/panel/news/back_end/news_bulletins/_filter_status.html.erb
	vendor/built_in_modules/news/app/views/panel/news/back_end/news_bulletins/_news_bulletin.html.erb
	vendor/built_in_modules/news/app/views/panel/news/back_end/news_bulletins/index.html.erb
	vendor/built_in_modules/web_resource/app/views/panel/web_resource/back_end/web_links/index.html.erb

app/controllers/admin/page_parts_controller.rb

@@ -26,6 +26,13 @@ class Admin::PagePartsController < ApplicationController
     @module_app = @part.module_app ? @part.module_app : @module_apps[0]
     @r_tag = @part.public_r_tag.blank? ? LIST[:public_r_tags][0] : @part.public_r_tag
     @tag_objects = @r_tag.classify.constantize.all rescue nil
+	
+	@widget_path = @part.widget_path ? @part.widget_path : @module_app.widgets.keys[0]
+	
+	if @module_app.widgets.any?{|b| b.class == Array}
+      @widget_style =  @module_app.widgets[@widget_path] if !@widget_path.blank? && !@module_app.widgets.blank?
+	end
+	
       case @module_app.key
         when 'announcement'
           @categories =  BulletinCategory.all
@@ -36,6 +43,9 @@ class Admin::PagePartsController < ApplicationController
         when 'web_resource'
           @categories =  WebLinkCategory.all
           @tags = WebResourceTag.all
+        when 'archive'
+          @categories =  ArchiveFileCategory.all
+          @tags = ArchiveTag.all
       end
   end
 
@@ -45,6 +55,10 @@ class Admin::PagePartsController < ApplicationController
 
   def update
     @part = PagePart.find(params[:id])
+	
+	params[:page_part][:widget_field] = params[:page_part][:widget_field].zip( params[:page_part][:widget_field_type] ) if params[:page_part][:widget_field]	  
+	params[:page_part][:widget_field_type] = nil
+	  
     if @part.update_attributes(params[:page_part])
       set_children_sub_menu(@part) if @part.public_r_tag && @part.public_r_tag.eql?('sub_menu')
       flash.now[:notice] = t('update.success.content')
@@ -76,7 +90,11 @@ class Admin::PagePartsController < ApplicationController
   def reload_widgets
     @categories =[]
     @module_app = ModuleApp.find(params[:id])
-    
+	
+    @widget_path = @module_app.widgets.keys[0] if ( @module_app.widgets[0].blank? )
+	
+    @widget_style =  @module_app.widgets[@widget_path] if ( !@widget_path.blank? )
+
     case @module_app.key
       when 'announcement'
         @categories =  BulletinCategory.all
@@ -87,12 +105,25 @@ class Admin::PagePartsController < ApplicationController
       when 'web_resource'
         @categories =  WebLinkCategory.all
         @tags = WebResourceTag.all
+      when 'archive'
+        @categories =  ArchiveFileCategory.all
+        @tags = ArchiveTag.all
     end
 
     respond_to do |format|
       format.js  {}
     end
   end
+  
+  def reload_widget_styles
+    @module_app = ModuleApp.find(params[:module_app_id])
+	
+    @widget_style =  @module_app.widgets[params[:id]]
+    
+    respond_to do |format|
+      format.js  {}
+    end
+  end
 
   def reload_r_tag_options
     @r_tag = (ModuleApp.find(params[:id]) rescue nil) || params[:id]