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

Conflicts:
	app/controllers/admin/object_auths_new_interface_controller.rb
	app/helpers/application_helper.rb
	app/models/ad_banner.rb

app/helpers/admin/dashboard_helper.rb

@@ -3,26 +3,26 @@ module Admin::DashboardHelper
 	def get_link(title)
 		case title
 			when 'bulletin'
-				panel_announcement_back_end_bulletins_path
+				panel_announcement_front_end_bulletins_path
 			when 'news_bulletin'
-				panel_news_back_end_news_bulletins_path
+				panel_news_front_end_news_bulletins_path
 			when'page_context'
-				panel_page_content_back_end_page_contexts_path
+				panel_page_content_front_end_page_contexts_path
 			when'web_link'
-				panel_web_resource_back_end_web_links_path
+				panel_web_resource_front_end_web_links_path
 		end
 	end
 
 	def get_link_to_object(object)
 		case object._type.underscore
 			when 'bulletin'
-				panel_announcement_back_end_bulletin_path(object)
+				panel_announcement_front_end_bulletin_path(object)
 			when 'news_bulletin'
-				panel_news_back_end_news_bulletin_path(object)
+				panel_news_front_end_news_bulletin_path(object)
 			when'page_context'
-				panel_page_content_back_end_page_context_path(object)
+				panel_page_content_front_end_page_context_path(object)
 			when'web_link'
-				panel_web_resource_back_end_web_link_path(object)
+				panel_web_resource_front_end_web_link_path(object)
 		end
 	end
 

app/helpers/application_helper.rb

@@ -96,7 +96,6 @@ module ApplicationHelper
   end
 
   def visible_for_controllers(*controller_names)
-    puts controller_names
     (controller_names.include?(controller.controller_name) || controller_names.include?(request.fullpath)) ? '' : 'hide'
   end
   
@@ -173,8 +172,33 @@ module ApplicationHelper
     locale.to_sym == I18n.locale ? 'active in': ''
   end
 
+<<<<<<< HEAD
     def at_least_module_manager
       is_manager? || is_admin? 
     end
+=======
+  def dislpay_view_count(object)
+    "#{t(:view_count)}: #{object.view_count}"
+  end
+
+  def display_visitors(options={})
+    Impression.where(options).distinct(:session_hash).count
+  end
+
+  def display_visitors_today
+    display_visitors(created_at: {'$gte' => Date.today.beginning_of_day, '$lte' => Date.today.end_of_day})
+  end
+
+  def display_visitors_this_week
+    display_visitors(created_at: {'$gte' => Date.today.beginning_of_week, '$lte' => Date.today.end_of_week})
+  end
+
+  def display_visitors_this_month
+    display_visitors(created_at: {'$gte' => Date.today.beginning_of_month, '$lte' => Date.today.end_of_month})
+  end
+
+  def display_visitors_this_year
+    display_visitors(created_at: {'$gte' => Date.today.beginning_of_year, '$lte' => Date.today.end_of_year})
+  end
 
 end