backup

Conflicts:
	vendor/built_in_modules/ask/init.rb
	vendor/built_in_modules/ask_new/app/controllers/panel/ask/front_end/ask_questions_controller.rb
	vendor/built_in_modules/ask_new/app/views/panel/ask/front_end/ask_questions/thank_you.html.erb
	vendor/built_in_modules/ask_new/config/routes.rb

Gemfile

@@ -1,8 +1,6 @@
 source 'http://rubygems.org'
 gem 'rails', "~> 3.2.9"
 
-gem 'savon', '~> 2.2.0'
-
 gem "brakeman"
 gem 'mime-types'
 
@@ -17,6 +15,9 @@ gem 'jquery-rails', '2.1.4'
 gem 'jquery-ui-rails'
 gem "select2-rails", '3.3.1'
 gem 'kaminari', :git => 'git://github.com/amatsuda/kaminari.git'
+gem "acts_as_unvlogable"
+gem 'youtube_it'
+gem 'gotcha'
 
 # gem "memcached", "~> 1.4.3"
 # gem "memcache-client"
@@ -48,7 +49,7 @@ gem 'sinatra'
 gem 'sprockets'
 gem 'social-share-button'
 
-gem 'tinymce-rails', "~> 3.5.8"
+gem 'tinymce-rails', '3.5.8.3'
 gem 'therubyracer' if RUBY_PLATFORM.downcase.include?("linux")
 gem 'libv8', '~> 3.11.8' if RUBY_PLATFORM.downcase.include?("linux")
 gem 'mongoid-encryptor', :require => 'mongoid/encryptor'

app/controllers/orbit_frontend_component_controller.rb

@@ -7,4 +7,10 @@ class OrbitFrontendComponentController< ApplicationController
     @app_title = request.fullpath.split('/')[2]
   end
   
+  def delay_impressionist(item)
+    user_id = current_user.nil? ? nil : current_user.id
+    Resque.enqueue(DelayedImpressionist,:request=>DelayImpressionistRequest.new(request),:obj=>item,:class=>item.class.to_s,:controller_name=>controller_name,:action_name=>action_name,:user=>user_id)
+  end
+
+
 end

app/controllers/pages_controller.rb

@@ -44,29 +44,13 @@ class PagesController < ApplicationController
     #  render :file => "#{Rails.root}/public/404.html", :status => :not_found
     #end
   end
-   
-  def convert_array_param(key,array)
-    array.collect{|t| "#{key}[]=#{t}"}.join("&")
-  end
 
   def index_from_link
     url = "/#{@item.path}"
     options = ''
     options << "#{options.blank? ? '?' : '&'}page_main=#{params[:page_main]}" unless params[:page_main].blank?
-
-    if params[:category_id].is_a? Array
-      options << "#{options.blank? ? '?' : '&'}#{convert_array_param('category_id',params[:category_id])}" unless params[:category_id].blank?
-      elsif params[:category_id].is_a? String
-        options << "#{options.blank? ? '?' : '&'}category_id=#{params[:category_id]}" unless params[:category_id].blank?
-    end
-    
-    if params[:tag_id].is_a? Array
-      options << "#{options.blank? ? '?' : '&'}#{convert_array_param('tag_id',params[:tag_id])}" unless params[:tag_id].blank?
-      elsif params[:category_id].is_a? String
-        options << "#{options.blank? ? '?' : '&'}tag_id=#{params[:tag_id]}" unless params[:tag_id].blank?
-    end
-    
-
+    options << "#{options.blank? ? '?' : '&'}#{convert_array_param('category_id', params[:category_id])}" unless params[:category_id].blank?
+    options << "#{options.blank? ? '?' : '&'}#{convert_array_param('tag_id', params[:tag_id])}" unless params[:tag_id].blank?
     options << "#{options.blank? ? '?' : '&'}search_query=#{params[:search_query]}" unless params[:search_query].blank?
     options << "#{options.blank? ? '?' : '&'}name=#{params[:name]}" unless params[:name].blank?
     uri = URI::escape(url + options)
@@ -78,8 +62,8 @@ class PagesController < ApplicationController
     url = "/#{@item.path}"
     options = ''
     options << "#{options.blank? ? '?' : '&'}id=#{params[:id]}" unless params[:id].blank?
-    options << "#{options.blank? ? '?' : '&'}category_id=#{params[:category_id]}" unless params[:category_id].blank?
-    options << "#{options.blank? ? '?' : '&'}tag_id=#{params[:tag_id]}" unless params[:tag_id].blank?
+    options << "#{options.blank? ? '?' : '&'}#{convert_array_param('category_id', params[:category_id])}" unless params[:category_id].blank?
+    options << "#{options.blank? ? '?' : '&'}#{convert_array_param('tag_id', params[:tag_id])}" unless params[:tag_id].blank?
     options << "#{options.blank? ? '?' : '&'}preview=#{params[:preview]}" unless params[:preview].blank?
     options << "#{options.blank? ? '?' : '&'}controller_action=#{params[:controller_action]}" unless params[:controller_action].blank?
     options << "#{options.blank? ? '?' : '&'}clicked_field_name=#{params[:clicked_field_name]}" unless params[:clicked_field_name].blank?
@@ -98,23 +82,43 @@ class PagesController < ApplicationController
     elsif params[:same_page_id]
       @item = Item.find(params[:same_page_id])
     else
-      category_ids = params[:category_id].is_a?(Array) ? params[:category_id] : [params[:category_id]]
-      tag_ids = params[:tag_id].is_a?(Array) ? params[:tag_id] : [params[:tag_id]]
+      category_ids = Array(params[:category_id]) unless params[:category_id].nil?
+      tag_ids = Array(params[:tag_id]) unless params[:tag_id].nil?
       module_app = ModuleApp.first(:conditions => {:key => params[:app_name]})
+
+      default_query = { is_published: true, module_app_id: module_app.id, :app_frontend_url.in => [params[:app_action], 'default_widget'] }
+      specific_categories = { :category => category_ids }
+      in_categories = { :category.in => category_ids }
+      nil_categories = { :category.in => [nil, []] }
+      specific_tags = { :tag => tag_ids }
+      in_tags = { :tag.in => tag_ids }
+      nil_tags = { :tag.in => [nil, []] }
+
       if !category_ids.blank? && !tag_ids.blank?
-        @item = Item.first(:conditions => {:module_app_id => module_app.id, :app_frontend_url => params[:app_action], :category.in => category_ids, :tag.in => tag_ids})
-        @item = Item.first(:conditions => {:module_app_id => module_app.id, :app_frontend_url => params[:app_action], :category.in => category_ids, :tag.in => [nil, []]}) unless @item
+        @item = Item.where(default_query.merge(specific_categories).merge(specific_tags)).first
+        @item = Item.where(default_query.merge(specific_categories).merge(in_tags)).first unless @item
+        @item = Item.where(default_query.merge(specific_categories).merge(nil_tags)).first unless @item
+        @item = Item.where(default_query.merge(specific_tags).merge(in_categories)).first unless @item
+        @item = Item.where(default_query.merge(specific_tags).merge(nil_categories)).first unless @item
+        @item = Item.where(default_query.merge(in_categories).merge(in_tags)).first unless @item
+        @item = Item.where(default_query.merge(in_categories).merge(nil_tags)).first unless @item
+        @item = Item.where(default_query.merge(in_tags).merge(nil_categories)).first unless @item
       elsif !category_ids.blank?
-        @item = Item.where(module_app_id: module_app.id, app_frontend_url: params[:app_action], :category.in => category_ids).any_in(tag: [nil, []]).first
+        @item = Item.where(default_query.merge(specific_categories).merge(nil_tags)).first
+        @item = Item.where(default_query.merge(specific_categories)).first unless @item
+        @item = Item.where(default_query.merge(in_categories).merge(nil_tags)).first unless @item
+        @item = Item.where(default_query.merge(in_categories)).first unless @item
       elsif !tag_ids.blank?
-        @item = Item.where(module_app_id: module_app.id, app_frontend_url: params[:app_action], :tag.in => tag_ids).any_in(category: [nil, []]).first
+        @item = Item.where(default_query.merge(specific_tags).merge(nil_categories)).first
+        @item = Item.where(default_query.merge(specific_tags)).first unless @item
+        @item = Item.where(default_query.merge(in_tags).merge(nil_categories)).first unless @item
+        @item = Item.where(default_query.merge(in_tags)).first unless @item
       end
       @item = Item.find(params[:orig_page]) unless @item || params[:orig_page].blank?
-      @item = Item.where(module_app_id: module_app.id, app_frontend_url: params[:app_action]).all_of("tag" => {"$in" => [nil, []]},"category" => { "$in" => [nil, []]}).first unless @item
-      @item = Item.where(module_app_id: module_app.id, app_frontend_url: 'default_widget').first unless @item
-      @item = Item.where(module_app_id: module_app.id, app_frontend_url: params[:app_action]).first unless @item
+      @item = Item.where(default_query.merge(nil_categories).merge(nil_tags)).first unless @item
+      @item = Item.where(default_query).first unless @item
     end
-    raise PageError,'Missing Frontend Page' if @item.nil?
+    raise PageError, 'Missing Frontend Page' if @item.nil?
   end
   
   def save_from_no_lang_for_page

app/controllers/sessions_controller.rb

@@ -1,35 +0,0 @@
-# encoding: utf-8
-
-class SessionsController < Devise::SessionsController
-	prepend_before_filter :require_no_authentication, :only => [ :new, :create ]
-
-  require 'savon'
-
-  def create 
-
-    @sys_id = params["sys_id"]
-
-    client = Savon.client(wsdl: 'http://sso.ntue.edu.tw/soap/soapserver.php?wsdl')
-
-    client.operations
-
-    response = client.call(:chkidno, message: { sys_id: @sys_id })
-
-    @id = response.body[:chkidno_response][:return][:id]
-
-    login_uid = @id
-
-  	resource = User.first(conditions:{user_id: login_uid})
-
-    if !resource.blank?
-      resource_name = resource.class.to_s.downcase
-  	  sign_in(resource_name, resource)
-  	  redirect_to after_sign_in_path_for(resource)
-  	else
-  	  flash[:error] = "很抱歉,您無此權限或帳號登入本站,請洽本站管理員<br />Sorry, you don't have the account or authority to login. Please contact the website administrator."
-  	  redirect_to :root
-    end
-
-  end
-
-end

app/helpers/application_helper.rb

@@ -1,5 +1,5 @@
 module ApplicationHelper
-
+  include OrbitApp::Module::VisitorCounter
   FLASH_NOTICE_KEYS = [:error, :notice, :warning]
 
 
@@ -7,8 +7,10 @@ module ApplicationHelper
     request.referer.include?('?') ?   [request.referer,param_hash.to_param].join('&') : [request.referer,param_hash.to_param].join('?')
   end
 
-  def delayed_impressionist(object)
-    # Resque.enqueue_at(1.minute.from_now,DelayedImpressionist,object)
+  def delayed_impressionist(item)
+    user_id = current_user.nil? ? nil : current_user.id
+    request = DelayImpressionistRequest.new(request)
+    Resque.enqueue(DelayedImpressionist,:request=>request,:obj=>item,:class=>item.class.to_s,:controller_name=>controller_name,:action_name=>action_name,:user=>user_id)
   end
 
   def check_user_role_enable(attribute_fields)
@@ -242,25 +244,27 @@ module ApplicationHelper
     "#{t(:view_count)}: #{object.view_count}"
   end
 
-  def display_visitors(options={})
-    Impression.where(options).and(:referrer.ne => nil).distinct(:session_hash).count
-  end
+  # def display_visitors(options={})
+  #   # Impression.where(options).and(:referrer.ne => nil).distinct(:session_hash).count
+  #   impressions = Impression.where(options).and(:referrer.ne => nil)
+  #   impressions.map{|i| i[:session_hash]}.uniq.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_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_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_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
+  # def display_visitors_this_year
+  #   display_visitors(created_at: {'$gte' => Date.today.beginning_of_year, '$lte' => Date.today.end_of_year})
+  # end
 
   def display_date_time(object)
     object.strftime("%Y-%m-%d %H:%M")
@@ -311,4 +315,8 @@ module ApplicationHelper
     link_to title, params.merge({direction: direction, sort: column, sort_options: column}), {:class => "#{css_class} sortable", :remote => options[:remote]}
   end
 
+  def convert_array_param(key, array)
+    Array(array).collect{|t| "#{key}[]=#{t}"}.join("&")
+  end
+
 end

app/helpers/default_widget_helper.rb

@@ -3,6 +3,13 @@ module DefaultWidgetHelper
     I18n.t("#{@page_part.module_app.key}.default_widget.#{field}")
   end
 
+  def get_top_hot_class(row_data)
+    class_attr = []
+    class_attr << 'data_is_hot' if( row_data.is_hot? rescue false )
+    class_attr << 'data_is_top' if( row_data.is_top? rescue false)
+    return class_attr.join(" ")
+  end
+
   def link_to_field(row_data,field, switch, options=nil)
     method_ary = @page_part.module_app.widget_fields_link_method
     field = field.to_sym
@@ -77,4 +84,13 @@ module DefaultWidgetHelper
       content_tag(:span,get_display(row_data,field_setting),:class=>field_setting[:class])
     end
   end
+
+  def get_row_category(row_data)
+    row_data.send("#{row_data.class.to_s.underscore}_category_id") rescue nil
+  end
+
+  def get_row_tags(row_data)
+    row_data.tagged_ids rescue nil
+  end
+
 end

app/jobs/dashboard_counter.rb

@@ -1,36 +1,21 @@
 class DashboardCounter < Resque::Plugins::RestrictionJob
+  extend OrbitApp::Module::VisitorCounterEval
+
   @queue = :high
 
   def self.perform(*args)
     site = Site.first
     obj = new(*args)
-    site.dashboard_counter[:visitors_this_week] = obj.display_visitors_this_week 
-    site.dashboard_counter[:visitors_this_month] = obj.display_visitors_this_month 
-    site.dashboard_counter[:visitors_this_year] = obj.display_visitors_this_year
+    site.visitor_counters[:total] = display_visitors
+    site.visitor_counters[:today] = display_visitors_today 
+    site.visitor_counters[:this_week] = display_visitors_this_week 
+    site.visitor_counters[:this_month] = display_visitors_this_month 
+    site.visitor_counters[:this_year] = display_visitors_this_year
     site.save
-    OrbitLogger.info "DashboardCounter done #{site.dashboard_counter.to_s}"
-  end
+    OrbitLogger.info "DashboardCounter done #{site.visitor_counters.to_s}"
 
-
-  def display_visitors(options={})
-    impressions = Impression.where(options).and(:referrer.ne => nil)
-    impressions.map{|i| i[:session_hash]}.uniq.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})
+    #Notice this is mainly used at user dashbroad. however the code there is currentlly using realtime evaluation.
+    #and the site model will need a field call dashboard_counter to complete this job.
   end
 
 end

app/jobs/delayed_impressionist.rb

@@ -1,7 +1,45 @@
-class DelayedImpressionist 
- @queue = :low
- def self.perform(object)  
-   impressionist(object)
-    true
- end
+class DelayedImpressionist
+  def self.before_filter(*args)
+    return
+  end
+
+  include ImpressionistController::InstanceMethods
+    @queue = :low
+
+  def initialize(request,controller_name,action_name,user,obj)
+    @controller_name = controller_name
+    @action_name = action_name
+    @user = User.find user unless user.nil?
+    @request =   request
+  end 
+
+  def self.perform(*args)
+    arg = args[0]
+    @request= DelayImpressionistRequest.new
+    @request.restore(arg["request"])
+    request = @request
+    obj = eval("#{arg["class"]}.find '#{arg['obj']['_id']}'")
+    # imp = new(@request,arg["controller_name"],arg["action_name"],arg["user"],obj)
+    new_impression = obj.impressions.build(:user_id=>arg["user"],:controller_name=>arg["controller_name"],:action_name=>arg["action_name"],:ip_address=>@request.remote_ip,:referrer=>@request.referer)
+    new_impression.save
+    obj.update_attribute(:view_count,obj.impression_count)
+  end
+
+private
+  def user
+    @user
+  end
+
+  def action_name
+    @action_name
+  end
+
+  def controller_name
+    @controller_name
+  end
+
+  def request
+    @request
+  end
+
 end

app/jobs/update_tag_cloud.rb

@@ -3,7 +3,7 @@ class UpdateTagCloud
 
   def self.perform()
     Tag.all.each do |tag|
-      tag.update_attribute(:cloud_view_count, tag.impressionist_count(:created_at.gte => 14.days.ago, :created_at.lte => Time.now))
+      tag.update_attribute(:cloud_view_count, tag.get_impressionist)
     end
     OrbitLogger.info "UpdateTagCloud Done"
   end

app/models/module_app.rb

@@ -140,7 +140,7 @@ class ModuleApp
   def sorted_tags_for_cloud
     temp_tags = {}
     self.tags.each{ |tag|
-      temp_tags.merge!({tag => Tag.get_impressionist(tag)})
+      temp_tags.merge!({tag => tag.cloud_view_count})
     }
     if !temp_tags.blank?
       sorted_tags = temp_tags.sort{|a,b| a[1]<=>b[1]}.reverse

app/models/page.rb

@@ -3,7 +3,7 @@ class Page < Item
   include Impressionist::Impressionable
   include ParserFrontEnd
   
-  is_impressionable :counter_cache => { :column_name => :view_count }
+  is_impressionable #:counter_cache => { :column_name => :view_count }
   
   field :content, localize: true
   field :app_frontend_url

app/models/site.rb

@@ -18,6 +18,7 @@ class Site
   field :title_always_on, :type => Boolean, :default => false
   field :dashbroad_allow_visitor, :type => Boolean, :default => false
   field :mail_settings, :type => Hash
+  field :visitor_counters,:type=> Hash,:default=>{:total=>0,:today=>0,:this_week=>0,:this_month=>0,:this_year=>0}
 
   field :disk_space, :type => String
   field :system_package_info, :type => Hash,:default=>{}

app/models/tag.rb

@@ -8,7 +8,7 @@ class Tag
   include Mongoid::Timestamps
   include Impressionist::Impressionable
   
-  is_impressionable :counter_cache => { :column_name => :view_count }
+  is_impressionable #:counter_cache => { :column_name => :view_count }
   
   field :name, localize: true
   field :view_count, :type => Integer, :default => 0
@@ -17,30 +17,6 @@ class Tag
   belongs_to :module_tag, polymorphic: true
   has_many :taggings, dependent: :destroy
 
-  #field :cloud_amper,:type: Integer,:default=> 0 
-
-  # def self.sorted_for_cloud
-  #   tags = {}
-  #   self.all.each{ |tag|
-  #     tags.merge!({tag => self.get_impressionist(tag)})
-  #   }
-  #   if !tags.blank?
-  #     sorted_tags = tags.sort{|a,b| a[1]<=>b[1]}.reverse
-  #     sorted_tags[0][1] = :hot1
-  #     offset = (sorted_tags.size - 1) / 3
-  #     i = 1
-  #     class_i = 2
-  #     sorted_tags[1..-1].collect!{ |x|
-  #       x[1] = "hot#{class_i}"
-  #       i == offset ? i = 1 : i += 1 if class_i < 4
-  #       class_i += 1 if i == offset && class_i < 4
-  #     }
-  #     sorted_tags
-  #   else
-  #     []
-  #   end
-  # end
-
   protected
   
   def self.get_impressionist(item_tag = self)

app/models/user/user.rb

@@ -3,7 +3,7 @@ class User
   include Mongoid::Document
   include Mongoid::Timestamps
 
-  devise :database_authenticatable, :recoverable, :rememberable, :trackable, :registerable, :validatable #, :timeoutable
+  devise :database_authenticatable, :recoverable, :rememberable, :trackable, :validatable #, :timeoutable
   
   mount_uploader :avatar, AvatarUploader
   

app/views/default_widget/_typeA.html.erb

@@ -1,19 +1,22 @@
-<%= content_tag :div,:class=>@tag_class do%>
+<%= content_tag :div, class: @tag_class do %>
   <div class="default_widget_type_A">
     <table class="default_widget_tb" border="0" cellpadding="0" cellspacing="0" >
-    <thead>
-      <tr>
-        <% @frontend_field_names.each_with_index do |field,index|%>
-          <%= content_tag(:th,content_tag(:span,get_field_header(field),:class=>@frontend_classes[index]))unless field.blank?%>
-        <% end %>
-      </tr>
-    </thead>
-      <% @data.each do |row_data| %>
+      <thead>
         <tr>
-          <% @frontend_field_names.each_with_index do |field,index|%>
-              <%= content_tag(:td,content_tag(:span,link_to_field(row_data,field, @frontend_sat_to_links[index], {orig_page: @page_id.to_s}),:class=>@frontend_classes[index]))unless field.blank?%>
+          <% @frontend_field_names.each_with_index do |field, index| %>
+            <%= content_tag(:th, content_tag(:span, get_field_header(field), class: @frontend_classes[index])) unless field.blank? %>
           <% end %>
         </tr>
-      <% end %>
+      </thead>
+      <tbody>
+        <% @data.each do |row_data| %>
+          <tr class="<%= get_top_hot_class(row_data) %>">
+            <% @frontend_field_names.each_with_index do |field, index|%>
+              <%= content_tag(:td, content_tag(:span, link_to_field(row_data, field, @frontend_sat_to_links[index], {orig_page: @page_id.to_s, category_id: get_row_category(row_data), tag_id: get_row_tags(row_data)}), class: @frontend_classes[index])) unless field.blank? %>
+            <% end %>
+          </tr>
+        <% end %>
+      </tbody>
     </table>
-  <% end %>
+  </div>
+<% end %>

app/views/default_widget/_typeB.html.erb

@@ -1,13 +1,13 @@
-<%= content_tag :div,:class=>@tag_class do%>
+<%= content_tag :div, class: @tag_class do %>
   <ul class="default_widget_list">
     <% @data.each do |row_data| %>
-      <%= content_tag(:li) do %>
+      <%= content_tag(:li, class: get_top_hot_class(row_data)) do %>
         <div class="img app-pic">
-          <%= image_tag row_data.send(@widget_image_field)%>
+          <%= image_tag row_data.send(@widget_image_field) %>
         </div>
         <div class="wrap">
-          <% @frontend_field_names.each_with_index do |field,index|%>
-              <%= content_tag(:span,link_to_field(row_data,field, @frontend_sat_to_links[index], {orig_page: @page_id.to_s}),:class=>@frontend_classes[index]) unless field.blank?%>
+          <% @frontend_field_names.each_with_index do |field, index| %>
+            <%= content_tag(:span, link_to_field(row_data,field, @frontend_sat_to_links[index], {orig_page: @page_id.to_s, category_id: get_row_category(row_data), tag_id: get_row_tags(row_data)}), class: @frontend_classes[index]) unless field.blank? %>
           <% end %>
         </div>
       <% end %>

app/views/default_widget/_typeC.html.erb

@@ -1,12 +1,12 @@
-<%= content_tag :div,:class=>@tag_class do%>
+<%= content_tag :div, class: @tag_class do %>
   <div class="img app-pic">
-    <%= image_tag @data.first.send(@widget_image_field)%>
+    <%= image_tag @data.first.send(@widget_image_field) %>
   </div>
   <ul class="default_widget_list">
     <% @data.each do |row_data| %>
-      <%= content_tag(:li) do %>
-        <% @frontend_field_names.each_with_index do |field,index|%>
-            <%= content_tag(:span, link_to_field(row_data,field, @frontend_sat_to_links[index], {orig_page: @page_id.to_s}),:class=>@frontend_classes[index]) unless field.blank?%>
+      <%= content_tag(:li, class: get_top_hot_class(row_data)) do %>
+        <% @frontend_field_names.each_with_index do |field, index|%>
+            <%= content_tag(:span, link_to_field(row_data, field, @frontend_sat_to_links[index], {orig_page: @page_id.to_s, category_id: get_row_category(row_data), tag_id: get_row_tags(row_data)}), class: @frontend_classes[index]) unless field.blank? %>
         <% end %>
       <% end %>
     <% end %>

config/environments/development.rb

@@ -34,15 +34,15 @@ Orbit::Application.configure do
   #   :sender_address => %{"notifier" <redmine@rulingcom.com>},
   #   :exception_recipients => %w{chris@rulingcom.com}
 
-  # config.action_mailer.delivery_method = :smtp
-  # config.action_mailer.smtp_settings = {
-  #   :enable_starttls_auto => true,
-  #   :address => "smtp.gmail.com",
-  #   :port => '587',
-  #   :domain => "smtp.gmail.com",
-  #   :authentication => "plain",
-  #   :user_name => "redmine@rulingcom.com",
-  #   :password => "rulingredmine" }
+  config.action_mailer.delivery_method = :smtp
+  config.action_mailer.smtp_settings = {
+    :enable_starttls_auto => true,
+    :address => "smtp.gmail.com",
+    :port => '587',
+    :domain => "smtp.gmail.com",
+    :authentication => "plain",
+    :user_name => "redmine@rulingcom.com",
+    :password => "rulingredmine" }
 
 end
 

config/mongoid.yml

@@ -8,7 +8,7 @@ defaults: &defaults
 
 development:
   <<: *defaults
-  database: demo_site_development
+  database: test_site
 test:
   <<: *defaults
   database: test_site
@@ -21,4 +21,4 @@ production:
   # password: <%= ENV['MONGOID_PASSWORD'] %>
   # database: <%= ENV['MONGOID_DATABASE'] %>
   <<: *defaults
-  database: demo_site_production
+  database: test_site

config/resque_schedule.yml

@@ -1,3 +1,9 @@
+dashboard_counter_cache:
+  cron: 0 * * * * *
+  class: DashboardCounter
+  args:
+  description: DashboardCounterCache
+
 update_tag_cloud:
   cron: 0 0 [0,12] * * *
   class: UpdateTagCloud
@@ -14,4 +20,4 @@ email_cron:
   cron: 0 0 [10,16,22] * * *
   class: EmailCron
   args:
-  description: EmailCron
+  description: EmailCron

config/routes.rb

@@ -7,11 +7,6 @@ Orbit::Application.routes.draw do
     match "/users_passwd" => "desktop/registrations#update", :as => :users_passwd, :via => :put
   end
 
-  devise_scope :user do
-    get 'soap_login' => 'sessions#create'
-  end
-
-
   mount Resque::Server, :at => "/admin/resque"
   mount Rack::GridFS::Endpoint.new(:db => Mongoid.database,:lookup=>:path), :at => "gridfs"
 

lib/delay_impressionist_request.rb

@@ -0,0 +1,18 @@
+class DelayImpressionistRequest
+  attr_accessor :session_options,:remote_ip,:referer,:user_agent
+  def initialize(request=nil)
+    if request
+      self.session_options=request.session_options
+      self.remote_ip=request.remote_ip
+      self.referer=request.referer
+      self.user_agent=request.user_agent
+    end
+  end
+
+  def restore(args)
+    args.each do |key,value|  
+      self.send("#{key}=", value)
+    end
+  end
+
+end

lib/import_data/announce_categories.json

@@ -0,0 +1,6 @@
+[{"old_id":1,"key":"administrative","title_translations":{"en":"Official","zh_tw":"行政公告"}}
+,{"old_id":2,"key":"events","title_translations":{"en":"Activities","zh_tw":"活動"}}
+,{"old_id":3,"key":"intern_opportunities","title_translations":{"en":"Internship","zh_tw":"實習機會"}}
+,{"old_id":4,"key":"scholarship_and_exchange_student","title_translations":{"en":"Scholarship","zh_tw":"獎學金與交換生資訊"}}
+,{"old_id":5,"key":"news","title_translations":{"en":"Newsletter","zh_tw":"新聞"}}
+,{"old_id":6,"key":"enrollments","title_translations":{"en":"Admission","zh_tw":"招生資訊"}}]

lib/orbit_app/helper/default_widget_tag_helper.rb

@@ -6,15 +6,14 @@ module DefaultWidgetTagHelper
     @request = req
     params.delete :inner
     @params = params
-
-    params_str ="?"
+    params_str = "?"
     params.each do |index,param|  
       if param.is_a?(Array) and !param.blank?
+        params_str << "&" unless params_str.eql?("?")
         params_str << param.collect{|t| "#{index}[]=#{t}"}.join("&")
         params.delete index
       end
-    end  
-    
+    end
     params_str = params_str + (params_str.eql?("?") ? params.to_param : "&#{params.to_param}" )
       content_tag :div,:class=> 'more' do 
   	 link_to I18n.t(@more_link[:label_i18n]),[eval("#{@more_link[:path_method]}"),params_str].join()

lib/orbit_app/module/visitor_counter.rb

@@ -0,0 +1,28 @@
+module OrbitApp
+    module Module
+      module VisitorCounter
+        Version = "0.1"
+
+        def display_visitors(options={})
+          Site.first.visitor_counters["total"]
+        end
+
+        def display_visitors_today
+          Site.first.visitor_counters["today"]
+        end
+
+        def display_visitors_this_week
+          Site.first.visitor_counters["this_week"]
+        end
+
+        def display_visitors_this_month
+          Site.first.visitor_counters["this_month"]
+        end
+
+        def display_visitors_this_year
+          Site.first.visitor_counters["this_year"]
+        end
+
+    end # of VisitorCounter
+  end # of Module
+end # of OrbitApp

lib/orbit_app/module/visitor_counter_eval.rb

@@ -0,0 +1,27 @@
+module OrbitApp
+    module Module
+      module VisitorCounterEval
+        Version = "0.1"
+
+        def display_visitors(options={})
+            impressions = Impression.where(options).and(:referrer.ne => nil).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 # end of VisitorCounterEval
+  end # of Module
+end # of OrbitApp

lib/orbit_tag/taggable.rb

@@ -43,6 +43,7 @@ module OrbitTag
           def tags=(tag_ids)
             ids = [tag_ids].flatten
             tag_ids.delete('')
+            self.tagged_ids = tag_ids
             ids = self.taggings.blank? ? [] : self.taggings.map{|t| t.tag.id}
             tag_ids.each do |tag_id|
               unless ids.include? tag_id
@@ -58,9 +59,6 @@ module OrbitTag
 
           def tag_ids=(ids)
             self.tags = ids
-            ids = [ids].flatten
-            ids.delete('')
-            self.tagged_ids = ids
           end
 
           private

lib/tasks/import.rake

@@ -0,0 +1,55 @@
+# encoding: utf-8 
+require 'pry'
+namespace :import do
+  task :ntu_mb_news_report => :environment do
+
+    jfile = File.new("#{Rails.root}/lib/import_data/news_report.json").read
+    jdata = JSON.parse(jfile)    
+
+  end
+
+  task :ntu_mb => :environment do
+    DEPARTMENTS = %w[Management BA Acc Fin IB IM EMBA GMBA]
+    print 'Enter the numer of department you want to import'
+    puts DEPARTMENTS.map.with_index{|t,i| "#{i}.#{t}" }.to_s
+    num = STDIN.gets.gsub("\n",'').to_i
+
+    puts "Destroy all BulletinCategory? (Default No)"
+    if STDIN.gets.gsub("\n",'').downcase == 'yes'
+      BulletinCategory.destroy_all
+    else
+      puts "Did not destroy"
+    end
+    jfile = File.new("#{Rails.root}/lib/import_data/announce_categories.json").read
+    jdata = JSON.parse(jfile)
+    jdata.each do |data|
+        a = BulletinCategory.new data
+        a.save
+    end
+    news_report_category = BulletinCategory.new {"key":"news_report","title_translations":{"en":"NewsReport","zh_tw":"新聞報導"}}
+    puts "Imported #{jdata.count}+1(NewsReport)"
+
+
+    puts "Destroy all Bulletin? (Default No)"
+    if STDIN.gets.gsub("\n",'').downcase == 'yes'
+      Bulletin.destroy_all
+    else
+      puts "Did not destroy"
+    end
+    counter = 0
+    jfile = File.new("#{Rails.root}/lib/import_data/announcements.json").read
+    jdata = JSON.parse(jfile)
+    jdata.each do |data|
+      # puts data
+      # puts DEPARTMENTS[num]
+      if data["department"] == DEPARTMENTS[num]
+        a = Bulletin.new data
+        a.bulletin_category = BulletinCategory.where(:key=>data["category_key"]).first
+        a.save
+        counter = counter +1
+      end
+    end
+    puts "Imported #{counter}"
+
+  end
+end

lib/tasks/migrate.rake

@@ -310,4 +310,20 @@ namespace :migrate do
     Rake::Task["web_link_url:web_link_url_i18n"].execute
   end
 
+  task :fix_tagged_ids => :environment do
+    Tag.all.each do |tag|
+      tag.taggings.each do |tagging|
+        tagged_ids = tagging.taggable.tagged_ids
+        unless tagged_ids.include?(tag.id.to_s)
+          tagged_ids << tag.id.to_s
+          tagging.taggable.update_attribute(:tagged_ids, tagged_ids)
+        end
+      end
+    end
+  end
+
+  task :clear_news_tags => :environment do
+    `mongo #{Mongoid.config.database.name} --eval "db.tags.remove({_type: {$ne: 'Tag'}})"`
+  end
+
 end

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

@@ -1,4 +1,3 @@
-# encoding: utf-8
 class Panel::Announcement::BackEnd::ApprovalsController  < OrbitBackendController
   before_filter :authenticate_user!
   before_filter :is_admin?
@@ -7,7 +6,6 @@ class Panel::Announcement::BackEnd::ApprovalsController  < OrbitBackendControlle
 
   
   def preview_and_approve
-    email_group_data
     @bulletin = Bulletin.find params[:bulletin_id]
   end
   
@@ -17,14 +15,6 @@ class Panel::Announcement::BackEnd::ApprovalsController  < OrbitBackendControlle
     @bulletin.proc_check(params[:bulletin][:is_checked],params[:bulletin][:not_checked_reason])
     @bulletin.de_pending
      if @bulletin.save
-
-        if @bulletin.email_sent == true && @bulletin.is_checked == true && !@bulletin.is_rejected
-          send_email_data(@bulletin)
-
-          @bulletin.email_sent = false
-          @bulletin.save
-        end
-
         notice = t('announcement.approve_bulletin_success')
      else
         notice = t('announcement.approve_bulletin_fail')
@@ -71,69 +61,6 @@ class Panel::Announcement::BackEnd::ApprovalsController  < OrbitBackendControlle
     object_auth.privilege_users = privilege_users
     object_auth
   end
-
-  def send_email_data(bulletin)
-
-    @site = Site.first
-    @user = User.find(bulletin.create_user_id)
-    @host = request.host_with_port
-
-    email_group_data
-
-    @group_mail = Array.new
-
-    bulletin.email_group.each do |egroup|
-
-      if @email_group_data.include?(egroup) and (egroup == '0' or egroup == '1' or egroup == '2' or egroup == '3')
-
-        @group_mail << @email_group_data[egroup]["email"]
-
-      elsif @email_group_data.include?(egroup) and egroup == '4'
-
-        @group_mail <<  bulletin.other_mailaddress 
-
-      end
-
-    end
-
-    if !@group_mail.join.blank?
-
-      @mail_content = {
-        "host" => @host,
-        "site_title" => @site.title,
-        "title" => bulletin.title,
-        "template" => 'announcement_mailer/cron_mail',
-        "url" => "http://#{@host}#{panel_announcement_front_end_bulletin_path(bulletin, :category_id => bulletin.bulletin_category.id)}"
-      }
-
-      @mail_cron = {  
-        :mail_from_app => 'announcement',
-        :mail_from => @user.email,
-        :mail_reply_to => @user.email,
-        :mail_subject => "#{t("announcement.mail_subject",:site_title => @site.title)}：#{bulletin.title}",
-        :mail_to => @group_mail.join(','),
-        :mail_content => @mail_content ,
-        # :mail_sentdate => bulletin.email_sentdate,
-        :mail_sentdate => DateTime.now,
-        :create_user_id => bulletin.create_user_id,
-        :update_user_id => bulletin.create_user_id
-      } 
-
-      @mail_cron = MailCron.new(@mail_cron) 
-
-      @mail_cron.save
-
-      MailCron.send_mail_now(@mail_cron.id)
-
-    end
-    
-  end
-
-  def email_group_data
-
-    @email_group_data =  Bulletin.email_group_data
-    
-  end
   
   # def get_categorys(id = nil)
   #   @bulletin_categorys = []

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

@@ -1,4 +1,3 @@
-# encoding: utf-8
 class Panel::Announcement::BackEnd::BulletinsController < OrbitBackendController
   include OrbitControllerLib::DivisionForDisable
 
@@ -78,9 +77,6 @@ class Panel::Announcement::BackEnd::BulletinsController < OrbitBackendController
   # GET /bulletins/new
   # GET /bulletins/new.xml
   def new
-
-    email_group_data
-
     if(session[:in_validate_object].blank?)
       @bulletin = Bulletin.new(:postdate => DateTime.now)
     else
@@ -98,9 +94,6 @@ class Panel::Announcement::BackEnd::BulletinsController < OrbitBackendController
 
   # GET /bulletins/1/edit
   def edit
-
-    email_group_data
-
     @bulletin = Bulletin.find(params[:id])
     if !current_user.admin? && (@bulletin.is_rejected? || @bulletin.is_checked?)
       redirect_to :action => :index
@@ -153,13 +146,6 @@ class Panel::Announcement::BackEnd::BulletinsController < OrbitBackendController
       respond_to do |format|
         if @bulletin.save
 
-          # if @bulletin.email_sent == true && @bulletin.is_checked == true && !@bulletin.is_rejected
-          #   send_email_data(@bulletin)
-
-          #   @bulletin.email_sent = false
-          #   @bulletin.save
-          # end
-
           format.html { redirect_to(panel_announcement_back_end_bulletins_url, :notice => t('announcement.create_bulletin_success')) }
           format.xml  { render :xml => @bulletin, :status => :created, :location => @bulletin }
           # format.js
@@ -240,14 +226,6 @@ class Panel::Announcement::BackEnd::BulletinsController < OrbitBackendController
             @bulletin.is_rejected = false
             @bulletin.de_pending!
           end
-
-          # if @bulletin.email_sent == true && @bulletin.is_checked == true && !@bulletin.is_rejected
-          #   send_email_data(@bulletin)
-
-          #   @bulletin.email_sent = false
-          #   @bulletin.save
-          # end
-
           # if (params[:bulletin][:is_checked] == "false")
           #   @bulletin.is_rejected = true
           #   @bulletin.save!
@@ -315,69 +293,6 @@ class Panel::Announcement::BackEnd::BulletinsController < OrbitBackendController
 
   protected
 
-  def send_email_data(bulletin)
-
-    @site = Site.first
-    @user = User.find(bulletin.create_user_id)
-    @host = request.host_with_port
-
-    email_group_data
-
-    @group_mail = Array.new
-
-    bulletin.email_group.each do |egroup|
-
-      if @email_group_data.include?(egroup) and (egroup == '0' or egroup == '1' or egroup == '2' or egroup == '3')
-
-        @group_mail << @email_group_data[egroup]["email"]
-
-      elsif @email_group_data.include?(egroup) and egroup == '4'
-
-        @group_mail <<  bulletin.other_mailaddress 
-
-      end
-
-    end
-
-    if !@group_mail.join.blank?
-
-      @mail_content = {
-        "host" => @host,
-        "site_title" => @site.title,
-        "title" => bulletin.title,
-        "template" => 'announcement_mailer/cron_mail',
-        "url" => "http://#{@host}#{panel_announcement_front_end_bulletin_path(bulletin, :category_id => bulletin.bulletin_category.id)}"
-      }
-
-      @mail_cron = {  
-        :mail_from_app => 'announcement',
-        :mail_from => @user.email,
-        :mail_reply_to => @user.email,
-        :mail_subject => "#{t("announcement.mail_subject",:site_title => @site.title)}：#{bulletin.title}",
-        :mail_to => @group_mail.join(','),
-        :mail_content => @mail_content ,
-        # :mail_sentdate => bulletin.email_sentdate,
-        :mail_sentdate => DateTime.now,
-        :create_user_id => bulletin.create_user_id,
-        :update_user_id => bulletin.create_user_id
-      } 
-
-      @mail_cron = MailCron.new(@mail_cron) 
-
-      @mail_cron.save
-
-      MailCron.send_mail_now(@mail_cron.id)
-
-    end
-    
-  end
-
-  def email_group_data
-
-    @email_group_data =  Bulletin.email_group_data
-    
-  end
-
   def delete_out_invalid_date_from_params
     if((params[:bulletin]["deadline(1i)"] && params[:bulletin]["deadline(1i)"].blank?) or (params[:bulletin]["deadline(2i)"] && params[:bulletin]["deadline(2i)"].blank?) or (params[:bulletin]["deadline(3i)"] && params[:bulletin]["deadline(3i)"].blank?)) 
       params[:bulletin].delete("deadline(1i)")

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

@@ -26,6 +26,7 @@ class Panel::Announcement::FrontEnd::BulletinsController < OrbitWidgetController
   end
 
   def index
+
     @item = Page.find(params[:page_id]) rescue nil
     if @item
       if @item.frontend_data_count
@@ -60,7 +61,11 @@ class Panel::Announcement::FrontEnd::BulletinsController < OrbitWidgetController
       else
         @bulletins = Bulletin.all.available_for_lang(I18n.locale).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(@page_num)
       end
-      delayed_impressionist(@tag) if @tag
+      if params["tag_id"]
+        params["tag_id"].each do |tag_id|
+          delayed_impressionist(Tag.find tag_id) rescue nil
+        end
+      end
     end
 
   end

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

@@ -14,7 +14,7 @@ class Bulletin
   include OrbitTag::Taggable
   taggable
 
-  is_impressionable :counter_cache => { :column_name => :view_count }
+  is_impressionable #:counter_cache => { :column_name => :view_count }
 
   field :title, localize: true
   field :subtitle, localize: true
@@ -40,12 +40,6 @@ class Bulletin
   field :not_checked_reason
   
   field :public, :type => Boolean, :default => true
-
-
-  field :email_sent, :type => Boolean, :default => false
-  field :email_sentdate , :type => DateTime
-  field :email_group, :type => Array
-  field :other_mailaddress
   
   scope :can_display, where(is_checked: true, is_rejected: false, is_pending: false)
   scope :available_for_lang, ->(locale){ where("available_for_#{locale}".to_sym => true) }
@@ -221,46 +215,8 @@ class Bulletin
     preview_object
   end
 
-  def get_email_group_data(email_group_data)
-
-    group_mail = Array.new
-
-    self.email_group.each do |egroup|
-
-      if email_group_data.include?(egroup) and (egroup == '0' or egroup == '1' or egroup == '2' or egroup == '3')
-
-        group_mail << "#{email_group_data[egroup]["email"]}(#{email_group_data[egroup]["name"]})"
-
-      elsif email_group_data.include?(egroup) and egroup == '4'
-
-        self.other_mailaddress.split(",").each do |otmail|
-
-          group_mail <<  "#{otmail}(#{email_group_data[egroup]["name"]})" 
-
-        end
-
-      end
-
-    end
-
-    group_mail.join("<br />").html_safe
-
-  end
-
 
   protected
-
-  def self.email_group_data
-
-    @email_group_data = { 
-      '0'=> {"name"=>I18n.t('announcement.email_group_data_0'), "email"=>"alluser@tea.ntue.edu.tw"}, 
-      '1'=> {"name"=>I18n.t('announcement.email_group_data_1'), "email"=>"allstu@tea.ntue.edu.tw"}, 
-      '2'=> {"name"=>I18n.t('announcement.email_group_data_2'), "email"=>"allgrad@tea.ntue.edu.tw"}, 
-      '3'=> {"name"=>I18n.t('announcement.email_group_data_3'), "email"=>"allad@tea.ntue.edu.tw"}, 
-      '4'=> {"name"=>I18n.t('announcement.email_group_data_4')}
-    }
-    
-  end
   
   def check_deadline
     if(!self.deadline.nil? and (self.deadline < self.postdate ))

vendor/built_in_modules/announcement/app/views/announcement_mailer/cron_mail.html.erb

@@ -1,29 +0,0 @@
-<% # encoding: utf-8 %>
-<!DOCTYPE html>
-<html>
-  <head>
-    <meta content="text/html; charset=UTF-8" http-equiv="Content-Type" />
-  </head>
-  <body bgcolor="#FFFFFF">
-  	<div style="text-ident:20px">
-  	</div>
-
-				<%= t('announcement.mail_hi') %> <br /><br />
-				<%= t('announcement.mail_url_view') %> <br /><br /> 
-				<a href="<%= @data.mail_content["url"] %>" target="_blank"> <%= @data.mail_content["title"] %> </a> <br /><br />
-				</div>
-				<span style="color:#555">--<br />
-				<%= t('announcement.mail_source') %> ：<a href="http://<%= @data.mail_content["host"] %>" target="_blank"> <%= @data.mail_content["site_title"] %> </a><br />
-				<%= t('announcement.mail_time') %> <%= DateTime.now %>
-			  </span>
-
-  </body>
-</html>
-
-
-
-
-
-
-
- 

vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/approvals/_modal_approve.html.erb

@@ -14,12 +14,6 @@
 			<%# preview_block_ad_images_helper(bulletin).each do |ad_image| -%>
 				<%#= image_tag ad_image.file,:alt => (ad_image.title[locale] || " "),:time_to_next => bulletin.transition_msec,:link_open=> ad_image.link_open, :link_url =>((ad_image.out_link || bulletin.context || " ")) %>
 			<%# end -%>
-
-			<% if !@bulletin.email_group.blank? %>
-				<%= label_tag 'group_mail' %>
-				<%= @bulletin.get_email_group_data(@email_group_data) %>
-			<% end %>
-
     </p>
   </div>
   <div class="modal-footer">

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

@@ -265,50 +265,6 @@
 					
 					</div>
 				</div>
-
-
-        <div id="widget" class="widget-box">
-            <div class="widget-action clear">
-                <a class="action"><i title="Added to the file" class="icon-exclamation-sign icon-white tip"></i></a>
-            </div>
-            <h3 class="widget-title"><i class="icons-bell"></i><%= t('announcement.email_eminder')%></h3>
-            <div class="widget-content">
-                <div class="controls">
-                    <label class="checkbox inline"><input id="remind-check" type="checkbox" value="1" name="bulletin[email_sent]"><%= t('announcement.activate_email_eminder')%></label>
-                    <div id="content-box">
-                        <hr />
-
-												<%#= f.datetime_picker :email_sentdate, :picker_type => 'separated', :label => t("announcement.email_sentdate") %>
-												
-												<br /> 
-
-				                <%= f.label :email_group ,t("announcement.email_group")%>
-				                <div class="form-inline">
-				                    <ul class="nav nav-pills">
-														<% @email_group_data.collect do |k,v| %>
-															<li class="pull-left">
-															<%= check_box_tag 'bulletin[email_group][]', k, (@bulletin.email_group.nil? ?  false : @bulletin.email_group.include?(k)), :id => "field-#{k}" %>
-															<label for="field-<%= k %>"><%= v["name"] %></label>
-															<%= hidden_field_tag 'bulletin[email_group][]', '' %>
-															</li>
-														<% end %>
-				                    </ul>
-				                </div>
-
-
-										    <%= f.label :other_mailaddress ,"#{t("announcement.other_mailaddress")}(#{t("announcement.other_mailaddress_note")})"%>
-												<%= f.text_area :other_mailaddress, :class=>"span12", :cols=>"25", :rows=>"10" %>
-
-                    </div>
-
-
-                    
-
-                </div>
-            </div>
-        </div>
-
-
 			</div>		
 	
 		</div>
@@ -344,11 +300,6 @@
 			$(this).parents('table').append(("<%= escape_javascript(add_attribute 'form_bulletin_file', f, :bulletin_files) %>").replace(old_id, new_id));
 		});
 		$('.for_preview').popover({ html : true });
-	
-    $('#remind-check').prop('checked') ? '':$('#content-box').addClass('hide')
-    $('#remind-check').on('change', function() {
-        $(this).prop('checked') ? $('#content-box').removeClass('hide'):$('#content-box').addClass('hide')
-    })
 	});
 	</script>
 <% end %>

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

@@ -37,21 +37,4 @@ en:
     widget:
       bulletins_and_web_links: Bulletins and Web Resources
       index: Index
-      search: Search
-    email_eminder: Email Reminder
-    activate_email_eminder: Activate Email Reminder
-    email_sentdate: Email Time
-    email_group: Email Group
-    email_group_data_0: All Faculty
-    email_group_data_1: Undergraduates
-    email_group_data_2: Postgraduates
-    email_group_data_3: Continuing Ed. Postgraduates 
-    email_group_data_4: Other
-    mail_subject: this is an announcement reminder from【%{site_title}】
-    other_mailaddress: Other Email
-    other_mailaddress_note: Divide different email accounts with ","
-    mail_hi: Hi
-    mail_url_view: This email is the reminder of an announcement, please click the link for the details
-    mail_source: Source
-    mail_time: Time
-
+      search: Search

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

@@ -37,22 +37,4 @@ zh_tw:
     widget:
       bulletins_and_web_links: 索引
       index: 索引
-      search: 搜尋
-    email_eminder: 寄送提醒
-    activate_email_eminder: 開啟寄送提醒
-    email_sentdate: 寄送時間
-    email_group: 寄送群組
-    other_mailaddress: 其他Mail
-    other_mailaddress_note: 輸入多組mail時,請用","逗號隔開
-    email_group_data_0: 全校教職員
-    email_group_data_1: 大學部學生
-    email_group_data_2: 日間部研究生
-    email_group_data_3: 進修部研究生
-    email_group_data_4: 其他
-    mail_subject: 來自【%{site_title}】的公告事件提醒
-    mail_hi: 您好
-    mail_url_view: 此封信件為公告事件提醒，請點選以下連結詳細觀看
-    mail_source: 來源
-    mail_time: 時間
-
-
+      search: 搜尋

vendor/built_in_modules/announcement/init.rb

@@ -23,7 +23,7 @@ module Announcement
     end
 
     category ["BulletinCategory"]
-    data_count 3..10
+    data_count 1..10
 
     taggable
 

vendor/built_in_modules/ask/.gitignore

@@ -1,7 +0,0 @@
-.bundle/
-log/*.log
-pkg/
-test/dummy/db/*.sqlite3
-test/dummy/log/*.log
-test/dummy/tmp/
-test/dummy/.sass-cache

vendor/built_in_modules/ask/app/controllers/panel/ask/front_end/ask_questions_controller.rb

@@ -1,28 +0,0 @@
-class Panel::Ask::FrontEnd::AskQuestionsController < OrbitWidgetController
-
-  layout false
-
-  def initialize
-    super
-    @app_title = 'ask'
-  end
-
-  def index
-    @ask_question = AskQuestion.new
-  end
-
-  def create
-    @ask_question = AskQuestion.new(params[:ask_question])
-    if verify_recaptcha model: @ask_question,  private_key: '6Lfl7OESAAAAAD4rl5S16-zjt5yiKNYJ6jsqdwmL'
-      @ask_acknowledgement = AskAcknowledgement.first || AskAcknowlegement.new
-      @ask_question.save
-      AskAdmin.all.each do |ask_admin|
-        Resque.enqueue(SendAskNoticeMail, ask_admin.id, @ask_question.id)
-      end
-    end
-    respond_to do |format|
-      format.js
-    end
-  end
-
-end

vendor/built_in_modules/ask/app/views/panel/ask/front_end/ask_questions/create.js.erb

@@ -1,11 +0,0 @@
-<% if @ask_question.errors.empty? %>
-  $('html,body').scrollTop(0);
-  $('#acknowledgement')
-        .html('<%= j simple_format(@ask_acknowledgement.content) %>')
-        .fadeIn(600)
-        .delay(3000)
-        .fadeOut(600);
-<% else %>
-  alert('<%= @ask_question.errors.full_messages.join('\n') %>');
-  Recaptcha.reload()
-<% end %>

vendor/built_in_modules/ask/init.rb

@@ -14,6 +14,7 @@ module Ask
       app_page 'ask_questions' do
         frontend_i18n 'ask.ask'
       end
+
     end
 
     widgets do

vendor/built_in_modules/ask_new/app/controllers/panel/ask/front_end/ask_questions_controller.rb

@@ -0,0 +1,46 @@
+class Panel::Ask::FrontEnd::AskQuestionsController < OrbitWidgetController
+
+  layout false
+
+  def initialize
+    super
+    @app_title = 'ask'
+  end
+
+  def index
+    @ask_question = AskQuestion.new
+  end
+
+  def create
+    @ask_question = AskQuestion.new(params[:ask_question])
+    if gotcha_valid? && @ask_question.save
+      @ask_acknowledgement = AskAcknowledgement.first || AskAcknowlegement.new
+      #@ask_question.save
+      redirect_to root_path
+      AskAdmin.all.each do |ask_admin|
+        AskMailer.notice(ask_admin, @ask_question).deliver
+        Resque.enqueue(SendAskNoticeMail, ask_admin.id, @ask_question.id)
+      end
+ #      redirect_to panel_ask_front_end_thank_you_path
+      respond_to do |format|
+        format.js
+       # format.js { render :thank_you, notice: 'Your question has been successfully sent.' }
+      end
+    end
+  end
+
+  def thank_you
+    @item = Page.find(params[:page_id]) rescue nil
+    if @item
+      if @item.frontend_data_count
+        @page_num = @item.frontend_data_count
+      else
+        @page_num = 15
+      end
+      @frontend_style = @item.frontend_style
+    end
+    @item = Page.find(params[:page_id]) rescue nil
+>>>>>>> a4fa967... Fix mailing redirect
+  end
+
+end

vendor/built_in_modules/ask_new/app/mailers/ask_mailer.rb

@@ -1,6 +1,6 @@
 class AskMailer < ActionMailer::Base
   default from: 'orbit_test@rulingcom.com'
-
+  
   def reply(ask_question)
     @ask_question = ask_question
     mail(:to => @ask_question.email, :subject => "#{t('ask.reply')}:#{@ask_question.title}")

vendor/built_in_modules/ask_new/app/models/ask_question.rb

@@ -1,4 +1,8 @@
 class AskQuestion
+  include ActiveModel::Validations
+  include ActiveModel::Conversion
+  extend ActiveModel::Naming
+  
   include Mongoid::Document
   include Mongoid::Timestamps
   include OrbitCoreLib::ObjectDisable
@@ -15,4 +19,5 @@ class AskQuestion
 
   belongs_to :ask_category
   has_one :ask_reply, dependent: :destroy
+
 end

vendor/built_in_modules/ask_new/app/views/ask_mailer/reply.html.erb

@@ -5,7 +5,7 @@
   </head>
   <body>
     <p>
-      <%= @ask_question.ask_reply.content %>
+      <%= @ask_question.content %>
     </p>
     <p>此為系統自動發信，請勿直接回覆</p>
   </body>

vendor/built_in_modules/ask_new/app/views/panel/ask/back_end/ask_questions/index.html.erb

@@ -18,6 +18,5 @@
 
 <div class="form-actions form-fixed pagination-right">
   <div id="ask_questions_pagination" class="paginationFixed">
-  <%= paginate @ask_questions %>
   </div>
 </div>

vendor/built_in_modules/ask_new/app/views/panel/ask/front_end/ask_questions/create.js.erb

@@ -0,0 +1,12 @@
+<% #if @ask_question.errors.empty? %>
+  //$('html,body').scrollTop(0);
+  //$('#acknowledgement')
+  //      .html('<%= j simple_format(@ask_acknowledgement.content) %>')
+  //      .fadeIn(600)
+  //      .delay(3000)
+   //     .fadeOut(600);
+<% #else %>
+  //alert('<%= @ask_question.errors.full_messages.join('\n') %>');
+  //Recaptcha.reload()
+<% #end %>
+window.location.href= "<%= panel_ask_front_end_thank_you_path %>"

vendor/built_in_modules/ask_new/app/views/panel/ask/front_end/ask_questions/index.html.erb

@@ -1,8 +1,7 @@
 <link href='/assets/ask.css' rel='stylesheet' type='text/css' />
 <div id="new-ask-question" class="ask-question">
   <div id="acknowledgement"></div>
-  <%= form_for @ask_question, url: panel_ask_front_end_ask_questions_path(standalone: true), remote: true,
-    html: {class: 'form-horizontal'} do |f| %>
+  <%= form_for @ask_question, url: panel_ask_front_end_ask_questions_path(standalone: true), html: {class: 'form-horizontal'} do |f| %>
     <div class="control-group">
       <%= f.label :ask_category_id, class: 'control-label required' %>
       <div class="controls">
@@ -55,11 +54,13 @@
         <%= f.text_area :content, rows: 8, class: 'input-xlarge' %>
       </div>
     </div>
-    <div class="control-group">
+   <div class="control-group">
       <div class="controls">
-        <%= recaptcha_tags ajax: true, public_key: '6Lfl7OESAAAAAKdxTSSmWSOWlL__04A9AqQzD7_z' %>
+        <%= gotcha_error %>
+        <%= gotcha%>
       </div>
     </div>
+   
     <div class="form-actions">
       <%= f.submit t('submit'), class: 'btn btn-primary' %>
       <%= f.button t('cancel'), type: 'reset', class: 'btn' %>
@@ -77,4 +78,4 @@
       return false;
     });
   });
-</script>
+</script>

vendor/built_in_modules/ask_new/app/views/panel/ask/front_end/ask_questions/thank_you.html.erb

@@ -0,0 +1 @@
+<h3>Thank you for your email, we will get back to you soon.</h3>

vendor/built_in_modules/ask_new/config/routes.rb

@@ -18,6 +18,7 @@ Rails.application.routes.draw do
       end
 
       namespace :front_end do
+        match "ask_questions/thank_you" => "ask_questions#thank_you", :as => 'thank_you'
         resources :ask_questions
       end
     end

vendor/built_in_modules/ask_new/init.rb

@@ -0,0 +1,49 @@
+module Ask
+  OrbitApp.registration "Ask",:type=> 'ModuleApp' do
+    module_label 'ask.ask'
+    base_url File.expand_path File.dirname(__FILE__)
+    # personal_plugin :enable => true,:path=>"panel/faq/plugin/profile",:i18n=>'admin.faq'
+
+    version "0.1"
+    organization "Rulingcom"
+    author "RD dep"
+    intro "I am intro"
+    update_info 'some update_info'
+
+    front_end do
+      app_page 'ask_questions' do
+        frontend_i18n 'ask.ask'
+      end
+    end
+
+    widgets do
+      default_widget do
+      end
+    end
+
+    side_bar do
+      head_label_i18n 'ask.ask', icon_class: 'icons-light-bulb'
+      available_for [:admin,:manager,:sub_manager]
+      active_for_controllers({ private: ['ask_questions'] })
+      head_link_path "panel_ask_back_end_ask_questions_path"
+
+      context_link 'categories', link_path: 'panel_ask_back_end_ask_categories_path',
+                               priority: 1,
+                               active_for_action: {:ask_categories=>:index},
+                               available_for: [:all]
+
+      context_link 'ask.acknowledgement', link_path: 'panel_ask_back_end_ask_acknowledgements_path',
+                               priority: 1,
+                               available_for: [:all]
+
+      context_link 'ask.admin', link_path: 'panel_ask_back_end_ask_admins_path',
+                               priority: 1,
+                               available_for: [:all]
+
+      context_link 'ask.export', link_path: 'export_panel_ask_back_end_ask_questions_path',
+                               priority: 1,
+                               available_for: [:all]
+    end
+
+  end
+end