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/application_controller.rb

@@ -1,15 +1,15 @@
 class ApplicationController < ActionController::Base
   protect_from_forgery
-  
-  include ParserFrontEnd, ParserBackEnd
+
+  include ParserFrontEnd, ParserBackEnd, ApplicationHelper
   
   layout :layout_by_resource
   
-  helper :all
+  helper :admin
   before_filter :set_locale, :set_site
 
   def set_current_user
-    User.current = current_user
+    User.current = current_or_guest_user
   end
 
   def front_end_available(module_app_title='')
@@ -48,14 +48,29 @@ class ApplicationController < ActionController::Base
      redirect_to root_path
   end
   
-  # Check if the current_user is admin
+  # Check if the current_user is admin,if not redirect
   def is_admin?
-    current_user.admin? ? true : auth_failed_in_backend
+    current_or_guest_user.admin? ? true : auth_failed_in_backend
   end
   
-  def is_manager?
-     @module_app.managing_users.include?(current_user) || is_admin?
-  end
+  # def is_manager?
+  #    @module_app.is_manager?(current_or_guest_user) || is_admin?
+  # end
+  
+  # # Check if the current_user is admin
+  # def is_member?
+  #   if (current_user rescue false)
+  #     return true
+  #   end
+  #   return false
+  # end
+  
+  # def is_guest?
+  #   if session[:guest_user_id]
+  #     return true
+  #   end
+  #   return false
+  # end
   
   def for_admin_only
     if is_admin?
@@ -76,7 +91,7 @@ class ApplicationController < ActionController::Base
   end
   
   def for_app_sub_manager
-    if (@module_app.sub_managing_users.include?(current_user) || is_manager?)
+    if (@module_app.sub_managing_users.include?(current_or_guest_user) || is_manager?)
       true
     else
       flash[:error] = t("access.denied.app.not_sub_manager")
@@ -85,7 +100,7 @@ class ApplicationController < ActionController::Base
   end
 
   def for_app_user
-    if (@module_app.app_auth.auth_users.include?(current_user) || for_app_sub_manager )
+    if (@module_app.app_auth.auth_users.include?(current_or_guest_user) || for_app_sub_manager )
       true
     else
       flash[:error] = t("access.denied.app.not_authed_user")
@@ -95,7 +110,7 @@ class ApplicationController < ActionController::Base
 
   def check_object_premission(obj,title)
     flash[:error] = t("access.denied.object")
-    auth_failed_in_backend unless (obj.get_object_auth_by_title(title).auth_users.include?(current_user) || is_manager? || is_admin? )
+    auth_failed_in_backend unless (obj.get_object_auth_by_title(title).auth_users.include?(current_or_guest_user) || is_manager? || is_admin? )
   end
   
   # Render the page
@@ -191,6 +206,17 @@ class ApplicationController < ActionController::Base
       [shift_out] + a
     end
   end
+    # called (once) when the user logs in, insert any code your application needs
+    # to hand off from guest_user to current_user.
+    def logging_in
+      # For example:
+      # guest_comments = guest_user.comments.all
+      # guest_comments.each do |comment|
+        # comment.user_id = current_user.id
+        # comment.save
+      # end
+    end
+
 
   def render_main_rss
     ret = ''