ntue mail cron & log filter fix

.gitignore

@@ -4,8 +4,6 @@
 .rvmrc
 
 Gemfile.lock
-Procfile
-log/*
 
 db/*.sqlite3
 log/*.log
@@ -16,9 +14,7 @@ public/uploads/**/*
 solr/data
 tmp/**/*
 uploads/**/*
-config/*.god
-log/*.gz
-tmp/restart.txt
+
 *.swp
 *.pid
 *.lck

Gemfile

@@ -1,6 +1,8 @@
 source 'http://rubygems.org'
 gem 'rails', "~> 3.2.9"
 
+gem 'savon', '~> 2.2.0'
+
 gem "brakeman"
 gem 'mime-types'
 
@@ -14,11 +16,7 @@ gem 'execjs'
 gem 'jquery-rails', '2.1.4'
 gem 'jquery-ui-rails'
 gem "select2-rails", '3.3.1'
-gem 'kaminari'
-gem "acts_as_unvlogable"
-gem 'youtube_it'
-gem 'gotcha'
-
+gem 'kaminari', :git => 'git://github.com/amatsuda/kaminari.git'
 
 # gem "memcached", "~> 1.4.3"
 # gem "memcache-client"
@@ -39,7 +37,7 @@ gem 'resque-scheduler' # job scheduling
 gem 'resque-restriction'
 #gem 'rb-readline'
 # gem 'ruby-debug19'
-gem 'rubyzip','0.9.9'
+gem 'rubyzip'
 
 gem 'sunspot_mongo'
 gem 'sunspot_solr'
@@ -50,7 +48,7 @@ gem 'sinatra'
 gem 'sprockets'
 gem 'social-share-button'
 
-gem 'tinymce-rails', '3.5.8.3'
+gem 'tinymce-rails', "~> 3.5.8"
 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/assets/stylesheets/application.css

@@ -5,4 +5,3 @@
  *= require_self
  *= require social-share-button 
 */
-

app/controllers/default_widget_controller.rb

@@ -11,21 +11,23 @@ class DefaultWidgetController< OrbitWidgetController
   end
 
   def query_for_default_widget
-    @ori_class_name =  @default_widget["query"].split('.')[0]
-    @result =  eval(@default_widget["query"])
+
+    @ori_class_name = @default_widget["query"].split('.')[0]
+    result = nil
+    result_objects = nil
+
     if !params["tag_id"].blank?
       if params["category_id"].blank? #has tag no cate
-        @result.selector[:tagged_ids] = { "$in" => params['tag_id'] }
+        result = @ori_class_name.constantize.where(:tagged_ids.in => params["tag_id"])
       else #has tag and cate
-        @result.selector[get_category_field_name] = { "$in" => params['category_id'].collect{|t| BSON::ObjectId(t)}}
-        @result.selector[:tagged_ids] = { "$in" => params['tag_id'] }
+        result = eval("#{@ori_class_name}.where(:#{get_category_field_name}.in=>params['category_id'], :tagged_ids.in => params['tag_id'])")
       end
     elsif params["category_id"].blank?  #no tag no cate
+      result = eval(@default_widget["query"])
     else #no tag has cate
-      
-      @result.selector[get_category_field_name] = { "$in" => params['category_id'].collect{|t| BSON::ObjectId(t)}}
+      result = eval("#{@ori_class_name}.where(:#{get_category_field_name}.in=>params['category_id'])")
     end
-    eval("@result.#{@default_widget[:sorting_query]}")
+    result.available_for_lang(I18n.locale).can_display.desc(:is_top, :postdate)
   end
 
   def search_result
@@ -38,13 +40,9 @@ class DefaultWidgetController< OrbitWidgetController
 
   def default_widget
     @search = params["search_query"].blank?  ?  false : true
-    if !params[:id].blank? and !params["clicked_field_name"].blank?
+    if !params[:id].blank?
       clicked_field_name = params["clicked_field_name"].to_sym
       redirect_to eval("#{@page_part.module_app.widget_fields_link_method[clicked_field_name][:method]}('#{params[:id]}', {inner: #{params[:inner] || true}})")
-    elsif !params[:id].blank? and params["preview"]
-      clicked_field_name = :title
-      @preview_pages = @page_part.module_app.widget_fields_link_method.find_all{|t| t[1].has_key?(:preview)}.collect{|t| t[0]}
-      redirect_to eval("#{@page_part.module_app.widget_fields_link_method[clicked_field_name][:method]}('#{params[:id]}', {preview: true,inner: #{params[:inner] || true},clicked_field_name: '#{@preview_pages.first.to_s}'})")      
     else
       @tag_class = nil
       @default_widget = @page_part.module_app.get_default_widget
@@ -93,9 +91,9 @@ class DefaultWidgetController< OrbitWidgetController
   end
   
   def get_category_field_name
-    @ori_class_name = @ori_class_name.constantize unless @ori_class_name.is_a? Class
+    @ori_class_name = @ori_class_name.constantize
     @ori_class_name.fields.each_key do |key|
-      return key.to_s if key.include?('category_id')
+      return key if key.include?('category_id')
     end
     nil
   end

app/controllers/orbit_frontend_component_controller.rb

@@ -7,10 +7,4 @@ 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,13 +44,29 @@ 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?
-    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?
+
+    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? ? '?' : '&'}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)
@@ -62,8 +78,8 @@ class PagesController < ApplicationController
     url = "/#{@item.path}"
     options = ''
     options << "#{options.blank? ? '?' : '&'}id=#{params[:id]}" unless params[: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? ? '?' : '&'}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? ? '?' : '&'}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?
@@ -82,43 +98,23 @@ class PagesController < ApplicationController
     elsif params[:same_page_id]
       @item = Item.find(params[:same_page_id])
     else
-      category_ids = Array(params[:category_id]) unless params[:category_id].nil?
-      tag_ids = Array(params[:tag_id]) unless params[:tag_id].nil?
+      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]]
       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.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
+        @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
       elsif !category_ids.blank?
-        @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
+        @item = Item.where(module_app_id: module_app.id, app_frontend_url: params[:app_action], :category.in => category_ids).any_in(tag: [nil, []]).first
       elsif !tag_ids.blank?
-        @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
+        @item = Item.where(module_app_id: module_app.id, app_frontend_url: params[:app_action], :tag.in => tag_ids).any_in(category: [nil, []]).first
       end
       @item = Item.find(params[:orig_page]) unless @item || params[:orig_page].blank?
-      @item = Item.where(default_query.merge(nil_categories).merge(nil_tags)).first unless @item
-      @item = Item.where(default_query).first unless @item
+      @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
     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

@@ -0,0 +1,35 @@
+# 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,9 +7,8 @@ module ApplicationHelper
     request.referer.include?('?') ?   [request.referer,param_hash.to_param].join('&') : [request.referer,param_hash.to_param].join('?')
   end
 
-  def delayed_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)
+  def delayed_impressionist(object)
+    # Resque.enqueue_at(1.minute.from_now,DelayedImpressionist,object)
   end
 
   def check_user_role_enable(attribute_fields)
@@ -243,27 +242,25 @@ module ApplicationHelper
     "#{t(:view_count)}: #{object.view_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(options={})
+    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_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")
@@ -314,8 +311,4 @@ 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,13 +3,6 @@ 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
@@ -84,13 +77,4 @@ 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/backup_server.rb

@@ -2,24 +2,16 @@ class BackupServer
   @queue = :high
 
   def self.perform()
+    #CronMail.time_check("Going to backup Orbit").deliver
     dbhost = Mongoid.config.database.connection.primary.join ':'
     dbname = Mongoid.config.database.name
     archive_db_list_path = OrbitSystemPreference::ArchiveDbListPath
     dbdirectory = "#{Rails.root}/tmp/#{dbname}-"+Time.now.strftime("%Y-%m-%d-%H-%M")
     %x[mongodump -h #{dbhost} -d #{dbname} -o #{dbdirectory} ]
 
-    Dir.foreach('tmp') do |item|
-      date_str = item.to_s.gsub("#{dbname}-",'')
-      next if not date_str.match(/\d{4}-\d{2}-\d{2}-\d{2}-\d{2}/)
-      if Date.parse(date_str).to_time < Site.first.backup_keep_for_days.days.ago
-        OrbitLogger.info  "Deleting #{date_str}"
-        %x[rm -rf tmp/#{item}] 
-      end
-    end
-
-
-    %x[rm -f #{archive_db_list_path}]
-    %x[cd tmp ; ls -l |grep #{dbname} | awk '{print $8}'|xargs  du -h --block-size=1M --max-depth=0 |sort -h >> #{archive_db_list_path}]
+    %x[rm #{archive_db_list_path}]
+    %x[ls #{Rails.root}/tmp/#{dbname}* | du -h --max-depth=1 --block-size=1M |sort -h >> #{archive_db_list_path}]
     OrbitLogger.info "DB backup done Path:#{dbdirectory}"
+    
   end
 end

app/jobs/dashboard_counter.rb

@@ -1,21 +1,36 @@
 class DashboardCounter < Resque::Plugins::RestrictionJob
-  extend OrbitApp::Module::VisitorCounterEval
-
   @queue = :high
 
   def self.perform(*args)
     site = Site.first
     obj = new(*args)
-    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.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.save
-    OrbitLogger.info "DashboardCounter done #{site.visitor_counters.to_s}"
+    OrbitLogger.info "DashboardCounter done #{site.dashboard_counter.to_s}"
+  end
 
-    #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.
+
+  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})
   end
 
 end

app/jobs/delayed_impressionist.rb

@@ -1,51 +1,7 @@
-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"])
-    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)
-    @try = 1
-    loop do
-        result = new_impression.save rescue false
-        break if (result || @try >= 10)
-        @try = @try + 1
-        puts "trying:#{@try}"
-    end
-    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
-
+class DelayedImpressionist 
+ @queue = :low
+ def self.perform(object)  
+   impressionist(object)
+    true
+ end
 end

app/jobs/get_announcement_from_rss.rb

@@ -1,7 +0,0 @@
-class GetAnnouncementFromRss 
-  @queue = :high
-
-  def self.perform()
-    %x(ruby "#{Rails.root}/lib/rss_ntu_job.rb")
-  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.get_impressionist)
+      tag.update_attribute(:cloud_view_count, tag.impressionist_count(:created_at.gte => 14.days.ago, :created_at.lte => Time.now))
     end
     OrbitLogger.info "UpdateTagCloud Done"
   end

app/mailer/mail_cron_mailer.rb

@@ -62,7 +62,7 @@ class MailCronMailer < ActionMailer::Base
       @mail_cron_log = {  
         :mail_subject => @data.mail_subject,
         :mail_to => group_mail,
-        :mail_user => @user.name,
+        :mail_user => @user.user_id,
         :mailer_count => group_mail.split(",").size,
         :mail_from_app => @data.mail_from_app 
       } 

app/models/mail_cron.rb

@@ -29,42 +29,4 @@ class MailCron
       end
     end
   end
-
-  def self.send_mail_now(mail_cron_id)
-
-    mail_data = MailCron.find(mail_cron_id)
-
-    if !mail_data.blank?
-
-      @mail_j = 0
-      @read_mails = Array.new 
-
-      @mails = mail_data.mail_to.split(",")
-
-      @mails.each do |send_mail|
-
-        @read_mails << send_mail
-
-        @mail_j += 1 
-
-        if  0 == @mail_j % 30 
-          MailCronMailer.cron_mail( mail_data.id, @read_mails.join(',') ).deliver
-          @read_mails = Array.new
-
-          sleep 10
-        end
-
-      end
-
-      if !@read_mails.join(',').blank?
-        MailCronMailer.cron_mail( mail_data.id, @read_mails.join(',') ).deliver
-        @read_mails = Array.new
-
-        sleep 10
-      end  
-
-    end  
-    
-  end
-
 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.cloud_view_count})
+      temp_tags.merge!({tag => Tag.get_impressionist(tag)})
     }
     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,7 +18,6 @@ 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=>{}
@@ -29,11 +28,10 @@ class Site
   mount_uploader :default_image, ImageUploader
 
   field :search,:type => Hash
-  field :resque_namespace,:type => String, :default=>APP_CONFIG['orbit']
+
   field :title, localize: true
   field :footer, localize: true
   field :sub_menu, localize: true
-  field :backup_keep_for_days,:type=>Integer,:default=> APP_CONFIG['backup_keep_for_days']
 
   field :mobile_on, :type => Boolean, :default => false
   

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,6 +17,30 @@ 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, :validatable #, :timeoutable
+  devise :database_authenticatable, :recoverable, :rememberable, :trackable, :registerable, :validatable #, :timeoutable
   
   mount_uploader :avatar, AvatarUploader
   
@@ -42,6 +42,7 @@ class User
 
   before_create :initialize_desktop
   before_save :rebuild_status_record
+  before_save :save_roles
   scope :remote_account, where(:nccu_id.ne => nil)
   scope :not_guest_user, all_of(:name.ne => "guest")
 
@@ -88,9 +89,9 @@ class User
     var[:id].each do |id,val|  
       # binding.pry if id == '5052c5b22b5c49ab02000004'
       if (val=="true")
-        self.role_ids.reject!{|t| t.to_s == id}
+        self.roles = self.roles.reject{|t| t.id.to_s==id}
       elsif(val=="false")
-        self.role_ids += Array(id)
+        self.roles << Role.find(id)
       end
     end
   end
@@ -105,9 +106,9 @@ class User
       # binding.pry if id == '5052c5b22b5c49ab02000004'
 	  
       if ( self.roles.include?(@roid) == false or val=="true")
-        self.sub_role_ids.reject!{|t| t.to_s == id}
+        self.sub_roles = self.sub_roles.reject{|t| t.id.to_s==id}
       elsif(val=="false")
-        self.sub_role_ids += Array(id)
+        self.sub_roles << SubRole.find(id)
       end
 	  
     end
@@ -272,6 +273,10 @@ class User
   end
   
   protected
+    def save_roles
+      # self.roles = self.sub_roles.collect{|t| t.role}.uniq
+      self.roles = self.roles.uniq
+    end
 
   def rebuild_status_record
     self.status_record = {}

app/views/admin/designs/index.html.erb

@@ -8,5 +8,6 @@
 </table>
 
 <div class="form-actions form-fixed pagination-right">
+	<%= link_to content_tag(:i, nil, :class => 'icon-plus icon-white') + t(:add), new_admin_design_path, :class => 'btn btn-primary pull-right' %>
     <%= link_to content_tag(:i, nil, :class => 'icon-plus icon-white') + t(:upload), upload_package_admin_designs_path, :class => 'btn btn-primary pull-right' %>
 </div>

app/views/admin/page_parts/_custom_widget_setting.html.erb

@@ -17,4 +17,4 @@
         <%= render :partial=> "widget_ext_options" %>  
       </div>
     </div>
-    <% end %>
+    <% end %>

app/views/default_widget/_typeA.html.erb

@@ -1,22 +1,19 @@
-<%= 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>
+    <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| %>
         <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? %>
+          <% @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?%>
           <% end %>
         </tr>
-      </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>
+      <% end %>
     </table>
-  </div>
-<% end %>
+  <% 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, class: get_top_hot_class(row_data)) do %>
+      <%= content_tag(:li) 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, category_id: get_row_category(row_data), tag_id: get_row_tags(row_data)}), 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}),: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, 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? %>
+      <%= 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?%>
         <% end %>
       <% end %>
     <% end %>

app/views/layouts/page_layout.html.erb

@@ -1,17 +1,6 @@
 <!DOCTYPE HTML>
 <html class="<%= I18n.locale.to_s %>">
 <head>
-  <script type="text/javascript">
-  var _gaq = _gaq || [];
-  _gaq.push(['_setAccount', 'UA-39393439-1']);
-  _gaq.push(['_trackPageview']);
-
-  (function() {
-    var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
-    ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
-    var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
-  })();
-</script>
 <meta charset="utf-8">
 	<%= page_title(@item).html_safe %>
 	<link rel="shortcut icon" href="<%= asset_path "ncculogo.ico" %>">

app/views/mobile/dialog_contact.mobile.erb

@@ -3,6 +3,9 @@
 <% end %>
 
 <ul>
-  <li>學務處電話：<a href="tel:+886-2-3366-2995~2997">+886-2-3366-2995~2997</a></li>
-  <li>學務處傳真：+886-2-2391-9095</li>
+  <li>總機電話：<a href="tel:+886229393091">02-29393091</a></li>
+  <li>傳真：02-29379611</li>
+  <li>緊急重大事件通聯窗口：校內分機 66119、66110</li>
+  <li>總值日室：<a href="tel:+88229387132">02-29387132</a></li>
+  <li>駐警衛室：<a href="tel:+88229387129">02-29387129</a></li>
 </ul>

app/views/mobile/map.mobile.erb

@@ -5,6 +5,6 @@
 <div id='map_canvas'></div>
 
 <script type='text/javascript'>
-  var $map_center = "25.015205, 121.535491"
+  var $map_center = "24.987449, 121.576117"
   var $map_zoom = 17
 </script>

config/config.yml

@@ -3,7 +3,6 @@ defaults: &defaults
   store_ip: 'redmine.rulingcom.com:3001'
   orbit: 'Orbit'
   ruling_digital: 'RulingDigital'
-  backup_keep_for_days: 30
   
 development:
   <<: *defaults

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/initializers/resque.rb

@@ -3,7 +3,7 @@ require 'resque_scheduler/server'
 # require 'yaml'
 
 Resque.redis = 'localhost:6379'
-Resque.redis.namespace = Site.first.resque_namespace rescue APP_CONFIG['orbit']
+Resque.redis.namespace = "resque"
 
 # If you want to be able to dynamically change the schedule,
 # uncomment this line.  A dynamic schedule can be updated via the

config/locales/mobile.en.yml

@@ -4,10 +4,10 @@ en:
     bulletin: Bulletin
     contact: Contact
     copyright: Copyright
-    copyright_text: Copyright© 2008 National Taiwan University ALL RIGHTS RESERVED
+    copyright_text: Thisi University © All RIGHTS RESERVED. 
     copyright_orbit: Powered by RulingDigital
     home: Home
     language: Language
     location: Location
-    location_description: '<h3>National Taiwan University</h3>No. 1, Sec. 4, Roosevelt Road, Taipei, 10617 Taiwan (R.O.C)'
+    location_description: '<h3>This University</h3>No.101,Sec. 2, Jiafeng S Road, Zhubei City, Hsinchu County 302, Taiwan'
     page: Page

config/locales/mobile.zh_tw.yml

@@ -4,10 +4,10 @@ zh_tw:
     bulletin: 公告
     contact: 聯絡資訊
     copyright: 著作權宣告
-    copyright_text: 本網站著作權屬於國立臺灣大學 學生事務處
+    copyright_text: 本網站著作權屬於本大學。
     copyright_orbit: 銳綸數位建置
     home: 首頁
     language: 語言
     location: 地理位置
-    location_description: '<h3>臺灣大學總務處 版權所有</h3>10617 臺北市大安區羅斯福路四段一號'
+    location_description: '<h3>本大學</h3>302新竹縣竹北市嘉豐南路二段101號'
     page: 頁面

config/locales/ntu.en.yml

@@ -1,4 +0,0 @@
-en: 
-
-  ntu:
-    rss_origin: Back to NTU Announcements

config/locales/ntu.zh_tw.yml

@@ -1,4 +0,0 @@
-zh_tw: 
-
-  ntu:
-    rss_origin: 回臺大校園公佈欄

config/mongoid.yml

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

config/resque.god

@@ -4,32 +4,33 @@ user_home = ENV['HOME'] || File.dirname(__FILE__) + '/../..'
 development_uid = ''
 development_gid = ''
 
-num_workers = rails_env == 'production' ? <%= @resque_workers %> : 1
+num_workers = rails_env == 'production' ? 5 : 2
 
 num_workers.times do |num|
   God.watch do |w|
 
     w.dir        = rails_root
-    w.name    = "<%= @resque_namespace.nil? ? "" : "#{@resque_namespace}-" %>resque-worker-#{num}"
-    w.group   = 'rulingcom'
+    w.name    = "worker-#{num}"
+    w.group   = 'resque'
 
     w.interval = 30.seconds
 
     queue = case num
-        when 0..2
+        when 0
+                'critical'
+        when 1..2
                 'high,low'
         when 3..num_workers
                 'low'
     end
 
-    w.pid_file = "#{rails_root}/tmp/#{w.name}.pid"
-    w.env       = {"RAILS_ENV"=>rails_env,"PIDFILE" => w.pid_file ,"HOME"=>user_home, "QUEUE"=>queue, "RAILS_ENV"=>rails_env }
-    w.start     = "rake -f #{rails_root}/Rakefile resque:work"
-    w.stop = "sudo kill -KILL $(cat #{w.pid_file})"
+    w.env       = {"QUEUE"=>queue, "RAILS_ENV"=>rails_env}
+    w.start     = "HOME=#{user_home} QUEUE=* RAILS_ENV=#{rails_env} rake -f #{rails_root}/Rakefile resque:work"
+
     w.uid = (rails_env == 'production' )? "root" : development_uid
     w.gid = (rails_env == 'production' )? "root" : development_gid
   
-     w.log = (rails_env == 'production' )? "/var/log/#{w.group}/#{w.name}.log":"#{rails_root}/log/dev-#{w.name}.log"
+     w.log = (rails_env == 'production' )? "/var/log/#{w.group}/#{w.name}.log":"#{rails_root}/log/dev_resque-#{w.name}.log"
 
     # restart if memory gets too high
     w.transition(:up, :restart) do |on|

config/resque_schedule.god

@@ -6,19 +6,16 @@ development_gid = ''
 
   God.watch do |w|
     w.dir        = rails_root
-    w.name    = "<%= @resque_namespace.nil? ? "" : "#{@resque_namespace}-" %>sunspot-solr"
-    w.group   = 'rulingcom'
-    w.pid_file = "#{rails_root}/solr/pids/production/sunspot-solr-production.pid"
+    w.name    = "scheduler"
+    w.group   = 'resque'
     w.interval = 30.seconds
-    w.env       = {"RAILS_ENV"=>rails_env,"HOME"=>user_home ,"RAILS_ENV"=>rails_env}
-    w.start     = "rake -f #{rails_root}/Rakefile sunspot:solr:start"
-    w.stop = "sudo kill -KILL $(cat #{w.pid_file})"
-    w.keepalive
+    w.env       = {"QUEUE"=>"critical,high,low", "RAILS_ENV"=>rails_env}
+    w.start     = "HOME= #{user_home} QUEUE=* RAILS_ENV=#{rails_env} rake -f #{rails_root}/Rakefile resque:scheduler"
 
     w.uid = (rails_env == 'production' )? "root" : development_uid
     w.gid = (rails_env == 'production' )? "root" : development_gid
-    
-    w.log = (rails_env == 'production' )? "/var/log/#{w.group}/#{w.name}.log":"#{rails_root}/log/dev-#{w.name}.log"
+  
+     w.log = (rails_env == 'production' )? "/var/log/#{w.group}/#{w.name}.log":"#{rails_root}/log/dev_resque-#{w.name}.log"
 
     # restart if memory gets too high
     w.transition(:up, :restart) do |on|

config/resque_schedule.yml

@@ -1,17 +1,5 @@
-dashboard_counter_cache:
-  cron: 0 * * * * *
-  class: DashboardCounter
-  args:
-  description: DashboardCounterCache
-
-backup_server:
-  cron: 0 0 2 * * *
-  class: BackupServer
-  args:
-  description: BackupServer and remove old backups
-
 update_tag_cloud:
-  cron: 0 30 2 * * *
+  cron: 0 0 [0,12] * * *
   class: UpdateTagCloud
   args:
   description: UpdateTagCloud
@@ -26,10 +14,4 @@ email_cron:
   cron: 0 0 [10,16,22] * * *
   class: EmailCron
   args:
-  description: EmailCron
-
-get_announcement_from_rss:
-  cron: 0 0 [2,12] * * *
-  class: GetAnnouncementFromRss
-  args:
-  description: Loop through the announcement RSS until 24h ago
+  description: EmailCron

config/routes.rb

@@ -7,6 +7,11 @@ 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

@@ -1,18 +0,0 @@
-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/orbit_app/helper/default_widget_tag_helper.rb

@@ -6,14 +6,15 @@ 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

@@ -1,28 +0,0 @@
-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

@@ -1,36 +0,0 @@
-module OrbitApp
-    module Module
-      module VisitorCounterEval
-        Version = "0.1"
-
-        def display_visitors(options={})
-            map = "function(){ emit( this.referrer,{session_hash: this.session_hash,created_at: this.created_at}); };"
-            reduce = "function(key, values){ var sum = 0; values.forEach(function(doc){sum += doc.amount; }); return {amount: sum};};"
-            if options.blank?
-              impressions = Impression.collection.map_reduce(map, reduce,read: :primary, out: "vr")
-            else
-              query = Impression.where(options).selector
-              impressions = Impression.where(options).collection.map_reduce(map, reduce,read: :primary, out: "vr",:query=>query)
-            end
-          impressions.count            
-        end
-
-        def display_visitors_today
-          display_visitors(created_at: {'$gte' => Date.today.beginning_of_day , '$lte' => DateTime.now})
-        end
-
-        def display_visitors_this_week
-          display_visitors(created_at: {'$gte' => Date.today.beginning_of_day - 7.days, '$lte' => DateTime.now})
-        end
-
-        def display_visitors_this_month
-          display_visitors(created_at: {'$gte' => Date.today.beginning_of_day - 1.month, '$lte' => DateTime.now})
-        end
-
-        def display_visitors_this_year
-          display_visitors(created_at: {'$gte' => Date.today.beginning_of_day - 1.year, '$lte' =>DateTime.now})
-        end
-      end # end of VisitorCounterEval
-  end # of Module
-end # of OrbitApp
-

lib/orbit_app/module/widget.rb

@@ -102,17 +102,12 @@ module OrbitApp
           def  initialize(&block)
             @query = nil
             @image = nil
-	      @sorting_query = 'desc(:created_at)'
             @more_link = {}
             @fields = []
             @enabled_styles = STYLE
              block.arity < 1 ? instance_eval(&block) : block.call(self) if block_given?
           end
 
-	  def sorting(query)
-	    @sorting_query = query
-	  end
-
           def enable(args)
             @enabled_styles = args
           end
@@ -127,7 +122,7 @@ module OrbitApp
           end
 
           def to_module_app_format
-            {"query"=>@query,"image"=>@image,"more_link"=>@more_link,"enabled_styles"=>@enabled_styles,:sorting_query=>@sorting_query} rescue nil
+            {"query"=>@query,"image"=>@image,"more_link"=>@more_link,"enabled_styles"=>@enabled_styles} rescue nil
           end
 
           def link_field(field_name,setting)

lib/orbit_tag/taggable.rb

@@ -43,7 +43,6 @@ 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
@@ -59,6 +58,9 @@ module OrbitTag
 
           def tag_ids=(ids)
             self.tags = ids
+            ids = [ids].flatten
+            ids.delete('')
+            self.tagged_ids = ids
           end
 
           private

lib/rss_ntu_job.rb

@@ -1,99 +0,0 @@
-# encoding: utf-8
-
-# encoding: utf-8
-
-require 'rss'
-require 'mongo'
-
-AUTHORS = %w[ 學生事務處-學生住宿服務組
-            學生事務處-學生職業生涯發展中心
-            學生事務處-衛生保健及醫療中心
-            學生事務處-課外活動指導組
-            學生事務處-學生活動中心管理組
-            學生事務處-僑生及陸生輔導組
-            學生事務處-生活輔導組
-            學生事務處-軍訓組
-            學生事務處-學生心理輔導中心
-            學生事務處-學生事務處]
-
-DB_BASE_NAME = "site"
-
-all = []
-continue = true
-i = 1
-yesterday = Time.now - 86400
-
-while continue do
-  open("http://ann.cc.ntu.edu.tw/asp/rss.asp?page=#{i}") do |rss|
-    feed = RSS::Parser.parse(rss.read.encode('utf-8', 'big5', invalid: :replace, undef: :replace, replace: '').gsub('<pubDate>Wes,', '<pubDate>Wed,').gsub(/(encoding=\"big5\")/, 'encoding="utf-8"'))
-    feed.items.each do |item|
-      if item.pubDate > yesterday
-        if AUTHORS.include?(item.author)
-          author = item.author.strip
-          category = item.category.to_s.gsub(/\<(\/)*category\>/, '')
-          all << {title: item.title.strip, author: author, link: item.link.strip, date: item.pubDate, category: category, description: item.description.gsub("\r\n", '<br/>').strip}
-        end
-      else
-        continue = false
-        break
-      end
-    end
-  end
-  i += 1
-end
-
-# Get corresponding category_id or create a new one
-def get_category_id(category, categories, coll_cat)
-  if categories.keys.include? "rss_#{category}"
-    [categories["rss_#{category}"], categories]
-  else
-    cat = {
-      _type: "BulletinCategory",
-      key: "rss_#{category}",
-      disable: false,
-      title: {:zh_tw => category},
-      created_at: Time.now,
-      updated_at: Time.now
-    }
-    categories["rss_#{category}"] = result = coll_cat.save(cat)
-    [result, categories]
-  end
-end
-
-# Get categories and id based on a given site number
-def get_mongo_and_categories(site_number="0")
-  db = Mongo::Connection.new("localhost", 27017).db("#{DB_BASE_NAME}_#{site_number}")
-  coll_bulletin = db["bulletins"]
-  coll_cat =  db["bulletin_categories"]
-
-  categories = coll_cat.find().to_a.inject({}) do |categories, category|
-    categories[category['key']] = category['_id']
-    categories
-  end
-  [categories, coll_bulletin, coll_cat]
-end
-
-# Get categories
-categories, coll_bulletin, coll_cat = get_mongo_and_categories
-
-all.each do |bul| # Loop through all the items
-  category_id, categories = get_category_id(bul[:category], categories, coll_cat)
-  unless coll_bulletin.find_one(rss_link: bul[:link]) 
-    bulletin = {  _type: "Bulletin",
-                  postdate: bul[:date],
-                  created_at: bul[:date],
-                  updated_at: bul[:date],
-                  is_checked: true,
-                  is_pending: false,
-                  is_rejected: false,
-                  bulletin_category_id: category_id,
-                  title: {:zh_tw => bul[:title]},
-                  text: {:zh_tw => bul[:description]},
-                  available_for_zh_tw: true,
-                  rss_link: bul[:link] }
-    coll_bulletin.save(bulletin) 
-  end
-end
-
-
-

lib/rss_ntu_migrate.rb

@@ -1,91 +0,0 @@
-# encoding: utf-8
-
-require 'rss'
-require 'mongo'
-
-AUTHORS = %w[ 學生事務處-學生住宿服務組
-            學生事務處-學生職業生涯發展中心
-            學生事務處-衛生保健及醫療中心
-            學生事務處-課外活動指導組
-            學生事務處-學生活動中心管理組
-            學生事務處-僑生及陸生輔導組
-            學生事務處-生活輔導組
-            學生事務處-軍訓組
-            學生事務處-學生心理輔導中心
-            學生事務處-學生事務處]
-
-DB_BASE_NAME = "site"
-
-all = []
-continue = true
-i = 1
-while continue do
-  open("http://ann.cc.ntu.edu.tw/asp/rss.asp?page=#{i}") do |rss|
-    feed = RSS::Parser.parse(rss.read.encode('utf-8', 'big5', invalid: :replace, undef: :replace, replace: '').gsub('<pubDate>Wes,', '<pubDate>Wed,').gsub(/(encoding=\"big5\")/, 'encoding="utf-8"'))
-    feed.items.size
-    feed.items.each do |item|
-      if AUTHORS.include?(item.author)
-        author = item.author.strip
-        category = item.category.to_s.gsub(/\<(\/)*category\>/, '')
-        all << {title: item.title.strip, author: author, link: item.link.strip, date: item.pubDate, category: category, description: item.description.gsub("\r\n", '<br/>').strip}
-      end
-    end
-    continue = false if feed.items.size < 100
-  end
-  i += 1
-end
-
-# Get corresponding category_id or create a new one
-def get_category_id(category, categories, coll_cat)
-  if categories.keys.include? "rss_#{category}"
-    [categories["rss_#{category}"], categories]
-  else
-    cat = {
-      _type: "BulletinCategory",
-      key: "rss_#{category}",
-      disable: false,
-      title: {:zh_tw => category},
-      created_at: Time.now,
-      updated_at: Time.now
-    }
-    categories["rss_#{category}"] = result = coll_cat.save(cat)
-    [result, categories]
-  end
-end
-
-# Get categories and id based on a given site number
-def get_mongo_and_categories(site_number="0")
-  db = Mongo::Connection.new("localhost", 27017).db("#{DB_BASE_NAME}_#{site_number}")
-  coll_bulletin = db["bulletins"]
-  coll_cat =  db["bulletin_categories"]
-
-  categories = coll_cat.find().to_a.inject({}) do |categories, category|
-    categories[category['key']] = category['_id']
-    categories
-  end
-  [categories, coll_bulletin, coll_cat]
-end
-
-# Get categories
-categories, coll_bulletin, coll_cat = get_mongo_and_categories
-
-all.each do |bul| # Loop through all the items
-  category_id, categories = get_category_id(bul[:category], categories, coll_cat)
-  unless coll_bulletin.find_one(rss_link: bul[:link]) 
-    bulletin = {  _type: "Bulletin",
-                  postdate: bul[:date],
-                  created_at: bul[:date],
-                  updated_at: bul[:date],
-                  is_checked: true,
-                  is_pending: false,
-                  is_rejected: false,
-                  bulletin_category_id: category_id,
-                  title: {:zh_tw => bul[:title]},
-                  text: {:zh_tw => bul[:description]},
-                  available_for_zh_tw: true,
-                  rss_link: bul[:link] }
-    coll_bulletin.save(bulletin) 
-  end
-end
-
-

lib/tasks/migrate.rake

@@ -310,88 +310,4 @@ namespace :migrate do
     Rake::Task["web_link_url:web_link_url_i18n"].execute
   end
 
-  task :save_users => :environment do
-    User.where(:email.not => /guest/).each{|s|s.save}
-  end
-
-  task :fix_bulletin_rss_available_lang => :environment do
-    Bulletin.all.each do |bull|
-      if bull.create_user_id.nil?
-        bull.update_attribute(:available_for_zh_tw, true)
-      end
-    end
-  end 
-
-  task :fix_imported_rss => :environment do
-    categories = BulletinCategory.where(key: /rss_/).entries
-    unless categories.blank?
-      categories.each do |category|
-        bulletins = category.bulletins
-        unless bulletins.blank?
-          bulletins.each do |bulletin|
-            bulletin.update_attribute(:is_top, false) unless bulletin.is_top?
-            bulletin.update_attribute(:is_hot, false) unless bulletin.is_hot?
-            bulletin.update_attribute(:is_hidden, false) unless bulletin.is_hidden?
-          end
-        end
-      end
-    end
-  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
-
-  task :add_missing_user_link => :environment do
-    User.all.each do |user|
-      user.role_ids.uniq!
-      user.sub_role_ids.uniq!
-      user.save
-      user.roles.each do |role|
-        unless role.user_ids.include?(user.id)
-          role.user_ids << user.id
-          role.save
-        end
-      end
-      user.sub_roles.each do |sub_role|
-        unless sub_role.user_ids.include?(user.id)
-          sub_role.user_ids << user.id
-          sub_role.save
-        end
-      end
-    end
-    Role.all.each do |role|
-      role.user_ids.uniq!
-      role.save
-      role.users.each do |user|
-        unless user.role_ids.include?(role.id)
-          user.role_ids << role.id
-          user.save
-        end
-      end
-    end
-    SubRole.all.each do |sub_role|
-      sub_role.user_ids.uniq!
-      sub_role.save
-      sub_role.users.each do |user|
-        unless user.sub_role_ids.include?(sub_role.id)
-          user.sub_role_ids << sub_role.id
-          user.save
-        end
-      end
-    end
-  end
-
 end

lib/tasks/ntu_mongo_files.rake

@@ -1,168 +0,0 @@
-# encoding: utf-8 
-
-namespace :mongo_files do
-
-  MODELS = {  'ad_image' => 'file',
-              'archive_file_multiple' => 'file',
-              'asset' => 'data',
-              'bulletin' => 'image',
-              'bulletin_file' => 'file',
-              'design' => 'zip_file',
-              'design_file' => 'file',
-              'gallery_image' => 'file',
-              'image' => 'file',
-              'lab_file' => 'file',
-              'location_info' => 'file',
-              'preview_file' => 'file',
-              'project_file' => 'file',
-              'research_file' => 'file',
-              'site' => 'default_image',
-              'stylesheet' => 'file_orig',
-              'user' => 'avatar',
-              'writing_book_file' => 'file',
-              'writing_conference_file' => 'file',
-              'writing_journal_file' => 'file',
-              'writing_patent_file' => 'file' }
-
-  IMAGE_UPLOADER_MODELS = %w[ad_image bulletin image site]
-
-  task :clean => :environment do
-    @files = Mongoid.database['fs.files']
-    @chunks = Mongoid.database['fs.chunks']
-    clean_duplicates
-    clean_unused
-    remove_objects
-  end
-
-  # Remove unused files from db
-  def clean_unused
-    db_array = @files.find().inject([]) do |db_files, file|
-      db_files << file['filename']
-      db_files
-    end
-
-    p "# of files in db: #{db_array.size}"
-
-    name_array = MODELS.inject([]) do |model_files, (model, type)|
-      model.classify.constantize.all.each do |item|
-        url = item.send(type).url
-        thumb_url = item.send(type).thumb.url rescue nil
-        if url && !url.eql?('sign-in-logo.png')
-          url = url.gsub('/gridfs/', '')
-          model_files << url
-        end
-        if thumb_url && !thumb_url.eql?('sign-in-logo.png')
-          thumb_url = thumb_url.gsub('/gridfs/', '')
-          model_files << thumb_url
-        end
-      end
-      model_files
-    end
-
-    p "# of files from uploaders: #{name_array.size}"
-    useless_files = db_array - name_array
-    p "# of unmatched files: #{useless_files.size}"
-
-    useless_files.each do |file|
-      id = @files.find_one('filename' => file)['_id']
-      @files.remove('_id' => id)
-      @chunks.remove('files_id' => id)
-    end
-    # p files.remove('filename' => { "$in" => useless_files})
-  end
-
-
-  # Remove duplicate files from db
-  def clean_duplicates
-    p "# of files in db: #{@files.count}"
-    file_hash = @files.find().sort({uploadDate: -1}).inject({}) do |db_files, file|
-      name = file['filename']
-      if db_files[name]
-        db_files[name] += [file['_id']]
-      else
-        db_files[name] = [file['_id']]
-      end
-      db_files
-    end
-    file_array = file_hash.inject([]) do |files, (key, value)|
-      files += value.drop(1) if value.size > 1
-      files
-    end
-    p "# of duplicate ids to delete: #{file_array.size}"
-    file_array.each do |id|
-      @files.remove('_id' => id)
-      @chunks.remove('files_id' => id)
-    end
-  end
-
-  task :file_size => :environment do
-    files = Mongoid.database['fs.files']
-    size_array = files.find().inject([]) do |size, file|
-      # size << [file['length'], file['filename']]
-      size << [file['filename'], file['length']]
-      size
-    end
-    size_array.sort.each do |pair|
-      p "#{pair[0]} - #{pair[1]}"
-    end
-    p size_array.size
-  end
-
-  def remove_objects
-    # Destroy writing_journals and writing_journal_files
-    Mongoid.database['writing_journals'].remove()
-    Mongoid.database['writing_journal_files'].remove()
-
-    db_array = @files.find().inject([]) do |db_files, file|
-      db_files << file['filename'] if file['filename'] =~ /writing_journal_file|news_bulletin_file|image\/image/
-      db_files
-    end
-    p db_array.size
-    db_array.each do |file|
-      id = @files.find_one('filename' => file)['_id']
-      @files.remove('_id' => id)
-      @chunks.remove('files_id' => id)
-    end
-  end
-
-  def remove_unlinked
-    # name_array = AdBanner.all.inject([]) do |files, banner|
-    #   banner.ad_images.inject(files) do |image_files, image|
-    #     url = image.file.url
-    #     thumb_url = image.file.thumb.url rescue nil
-    #     if url && !url.eql?('sign-in-logo.png')
-    #       url = url.gsub('/gridfs/', '')
-    #       image_files << url
-    #     end
-    #     if thumb_url && !thumb_url.eql?('sign-in-logo.png')
-    #       thumb_url = thumb_url.gsub('/gridfs/', '')
-    #       image_files << thumb_url
-    #     end
-    #     image_files
-    #   end
-    #   files
-    # end
-    name_array = Design.all.inject([]) do |files, design|
-      files += design.images.inject(files) do |image_files, image|
-        p image_files += get_url_and_thumb(image.file)
-        image_files
-      end
-      files
-    end
-    p name_array.size
-  end
-
-  def get_url_and_thumb(file)
-    url = file.url
-    thumb_url = file.thumb.url rescue nil
-    files = [url, thumb_url].inject([]) do |urls, current|
-      urls << current.gsub('/gridfs/', '') if current && !current.eql?('sign-in-logo.png')
-      urls
-    end
-    files
-  end
-
-  task :delete_rss_ann => :environment do
-    Bulletin.where(create_user_id: nil).destroy
-  end
-end

lib/tasks/site.rake

@@ -1,5 +1,4 @@
 # encoding: utf-8 
-require 'erb'
 
 namespace :site do
   
@@ -10,26 +9,21 @@ namespace :site do
     Site.create( :school => 'RulingDigital University', :department => 'Computer Science', :valid_locales => [ 'en', 'zh_tw' ], :in_use_locales => [ 'zh_tw', 'en' ]) 
     User.create!(:email=>'chris@rulingcom.com',:admin=>true,:user_id=>'chris',:password=>'password')
     `mongo #{Mongoid.config.database.name} --eval "db.fs.chunks.ensureIndex({files_id: 1, n: 1})"`
-
     puts  "Congres you can now login within url"
     puts 'Please upload design package (/admin/designs/upload_package ) and run rake site:necessary_data'
     I18nVariable.create!( :document_class => 'language', :key => 'en', :en => 'English', :zh_tw => '英文' )
     I18nVariable.create!( :document_class => 'language', :key => 'zh_tw', :en => 'Chinese', :zh_tw => '中文' )
-    Info.create!(key: "profile", built_in: true, disabled: false, title: {"zh_tw"=>"基本欄位", "en"=>"Basic Info"}, to_search: false)  
+    Info.create!(key: "profile", built_in: true, disabled: false, title: {"zh_tw"=>"基本欄位", "en"=>"Basic Info"}, to_search: false)
   end
   
-  task :create_logrotate => :environment do #Can remove after all products update
-    create_rulingcom_logrotate
-  end
-
   task :necessary_data => :environment do
-    auto_setting
     site = Site.first
-    site.update_attribute(:title,'RulingOrbit Demo Site')
-    site.update_attribute(:resque_namespace,@resque_namespace)
+    site.title = 'RulingOrbit Demo Site'
+    site.save
 
     # home_trans = I18nVariable.create!( :document_class => 'Home', :key => 'home', :en => 'Homepage', :zh_tw => '首頁')
     design = Design.first
+    site = Site.first
     site.design = design
     site.save
     theme = design.themes.first
@@ -37,78 +31,6 @@ namespace :site do
 
     home.title_translations = {"zh_tw"=>"首頁", "en"=>"Home"}
     home.save 
-
-    puts "Rember to restart server after you setup all sites for starting God"
   end
 
-  task :start_auto_setting => :environment do
-    auto_setting
-  end
-
-  def auto_setting
-    puts "Enter your resque namespace[Orbit]:......"
-    @resque_namespace = STDIN.gets.gsub("\n",'')
-    @resque_namespace = APP_CONFIG['orbit'] if @resque_namespace.empty?
-
-
-    puts "Is this the only site [ Entry site? ] on this mechine?[Default No]:......"
-    site_is_alone = false
-    site_is_alone = STDIN.gets.gsub("\n",'')
-    site_is_alone = true if site_is_alone.downcase == 'yes'
-
-    puts "Is this a primary site?[Default No]:......"
-    site_is_primary = false
-    site_is_primary = STDIN.gets.gsub("\n",'')
-    site_is_primary = true if site_is_primary.downcase == 'yes'
-
-    puts "Traffic heavy?[Default No]:......"
-    traffic_heavy = false
-    traffic_heavy = STDIN.gets.gsub("\n",'')
-    traffic_heavy = true if traffic_heavy.downcase == 'yes'
-
-    @traffic_rate = traffic_heavy ? 2 : 1
-
-    if site_is_alone
-        @resque_workers = 5 * @traffic_rate  #Entry Site 
-    else
-        if site_is_primary
-            @resque_workers = 2  * @traffic_rate  #Primary Site 
-        else
-            @resque_workers = 1  * @traffic_rate  #Secondary Site 
-        end
-    end
-    
-    resque_setting = ERB.new(File.new("lib/template/setting/resque.god.erb").read)
-    File.open("config/resque.god", 'w') { |file| file.write(resque_setting.result) }
-
-    resque_schedule_setting = ERB.new(File.new("lib/template/setting/resque_schedule.god.erb").read)
-    File.open("config/resque_schedule.god", 'w') { |file| file.write(resque_schedule_setting.result) }
-
-    if site_is_primary
-        solr_setting = ERB.new(File.new("lib/template/setting/solr.god.erb").read)
-        File.open("config/solr.god", 'w') { |file| file.write(solr_setting.result) }        
-        create_rulingcom_logrotate
-    end  
-  end
-
-
-def create_rulingcom_logrotate
-    `sudo mkdir -p /var/log/rulingcom` unless File.directory? "/var/log/rulingcom"
-    @project_folder = ENV["PWD"]
-    puts "Is your Orbit folder: #{@project_folder} (If YES => Press enter,or enter your path)"
-    user_enter_project_folder = STDIN.gets.gsub("\n",'')
-    @project_folder = user_enter_project_folder unless user_enter_project_folder.empty?
-
-    @user_home_folder = ENV["HOME"]
-    puts "Is your Home folder: #{@user_home_folder} (If YES => Press enter,or enter your path)"
-    user_enter_home_folder = STDIN.gets.gsub("\n",'')
-    @user_home_folder = user_enter_home_folder unless user_enter_home_folder.empty?
-
-    logrotate_setting = ERB.new(File.new("lib/template/setting/rulingcom_log.erb").read)
-    File.open("#{@project_loc}/tmp/logrotate_setting", 'w') { |file| file.write(logrotate_setting.result) } 
-
-    `sudo cp #{@project_loc}/tmp/logrotate_setting /etc/logrotate.d/rulingcom` 
-    `logrotate -v -f /etc/logrotate.conf`
-end
-
 end

lib/tasks/system_check.rake

@@ -1,14 +0,0 @@
-# encoding: utf-8 
-namespace :system_check do
-  task :god_can_start => :environment do
-     unless File.directory? "/var/log/rulingcom"
-       puts "Creating Rulingcom log folder"
-       `sudo mkdir -p /var/log/rulingcom`
-     end
-  end
-  task :set_resque_namespace,[:namespace] => :environment do |t,args|
-    site = Site.first
-    site.resque_namespace = args[:namespace]
-    site.save
-  end
-end

lib/tasks/web_link_url.rake

@@ -9,17 +9,17 @@ namespace :web_link_url do
   	
   	@weblinks.each do |wl|
 
-      if wl.url_translations.is_a?(String)
-      
-        @wlurl = wl.url_translations
-        
-        wl.url_translations = {}
-    	
-        wl.url_translations["zh_tw"] = @wlurl
-    	
-        wl.url_translations["en"] = @wlurl
+  	  if wl.url.nil? 
 
-        wl.save
+  	  @wlurl = wl.url_translations
+
+      wl.url_translations = {}
+  	
+      wl.url_translations["zh_tw"] = @wlurl
+  	
+      wl.url_translations["en"] = @wlurl
+
+      wl.save
 
   	  else
   	  	puts 'no data'

lib/template/setting/resque_schedule.god.erb

@@ -1,59 +0,0 @@
-rails_env   = ENV['RAILS_ENV']  || "production"
-rails_root  = ENV['RAILS_ROOT'] || File.dirname(__FILE__) + '/..'
-user_home = ENV['HOME'] || File.dirname(__FILE__) + '/../..'
-development_uid = ''
-development_gid = ''
-
-  God.watch do |w|
-    w.dir        = rails_root
-    w.name    = "<%= @resque_namespace.nil? ? "" : "#{@resque_namespace}-" %>resque-scheduler"
-    w.group   = 'rulingcom'
-    w.interval = 10.seconds
-    w.pid_file = "#{rails_root}/tmp/#{w.name}.pid"
-
-    w.env       = {"QUEUE"=>"*", "RAILS_ENV"=>rails_env,"HOME"=>user_home, "RAILS_ENV"=>rails_env}
-    w.start     = "rake -f #{rails_root}/Rakefile resque:scheduler"
-    w.stop = "sudo kill -KILL $(cat #{w.pid_file})"
-    w.uid = (rails_env == 'production' )? "root" : development_uid
-    w.gid = (rails_env == 'production' )? "root" : development_gid
-  
-    w.log = (rails_env == 'production' )? "/var/log/#{w.group}/#{w.name}.log":"#{rails_root}/log/dev-#{w.name}.log"
-
-    # restart if memory gets too high
-    w.transition(:up, :restart) do |on|
-      on.condition(:memory_usage) do |c|
-        c.above = 350.megabytes
-        c.times = 2
-      end
-    end
-
-    # determine the state on startup
-    w.transition(:init, { true => :up, false => :start }) do |on|
-      on.condition(:process_running) do |c|
-        c.running = true
-      end
-    end
-
-    # determine when process has finished starting
-    w.transition([:start, :restart], :up) do |on|
-      on.condition(:process_running) do |c|
-        c.running = true
-        c.interval = 5.seconds
-      end
-
-      # failsafe
-      on.condition(:tries) do |c|
-        c.times = 5
-        c.transition = :start
-        c.interval = 5.seconds
-      end
-    end
-
-    # start if process is not running
-    w.transition(:up, :start) do |on|
-      on.condition(:process_running) do |c|
-        c.running = false
-      end
-    end
-  end
-

lib/template/setting/rulingcom_log.erb

@@ -1,33 +0,0 @@
-/var/log/rulingcom/*.log  {
-    daily
-    dateext
-    compress
-    rotate 30
-}
-
-#Resque
-<%= "#{@project_folder}/nginx/logs/access.log" %>{
-    daily
-    dateext
-    compress
-    rotate 30
-}
-
-#DB log
-/var/log/mongodb{
-    daily
-    dateext
-    compress
-    rotate 30
-}
-
-#Orbit
-<%= "#{@project_folder}/log/*production.log" %>{
-    daily
-    dateext
-    compress
-    rotate 30
-}
-# end of Orbit,EXTEND IF NEEDED
-
-#Remember to save this file as /etc/logrotate.d/rulingcom

vendor/built_in_modules/announcement/app/assets/stylesheets/announcement/bulletins_and_web_links.css

@@ -1,78 +0,0 @@
-
-.mega_tab_block {
-    clear: both;
-    position: relative;
-}
-
-.mega_tab_block h3 {
-    font: 22px/100% 'arial',sans-serif;
-    margin: 0 0 10px;
-    padding: 0;
-}
-
-.mega_tab_block .pagination {
-    float: left;
-    height: auto;
-    margin: 10px 0 0;
-    width: auto;
-}
-.mega_tab_block .pagination a {
-    background: none repeat scroll 0 0 #EEEEEE;
-    display: block;
-    float: left;
-    margin: 0 5px 0 0;
-    padding: 10px;
-}
-
-
-.tag_block {
-    clear: both;
-    margin: 0 0 20px;
-    position: relative;
-}
-.mega_tab_block .tag_list {
-    background: none repeat scroll 0 0 #EEEEEE;
-    margin: 0;
-    overflow: hidden;
-    padding: 0 0 0 5px;
-}
-.mega_tab_block .tag_list li {
-    float: left;
-    list-style: none outside none;
-}
-.mega_tab_block .tag_list li a {
-    background: none repeat scroll 0 0 #DDDDDD;
-    float: left;
-    margin: 0 5px 0 0;
-    padding: 10px;
-}
-
-.news_block {
-    clear: both;
-    margin: 0 0 20px;
-    overflow: hidden;
-    position: relative;
-}
-.mega_tab_block .news_list {
-    margin: 0;
-    padding: 0;
-}
-.mega_tab_block .news_list li {
-    list-style: none outside none;
-    padding: 5px 0;
-}
-
-
-.links_block {
-    clear: both;
-    overflow: hidden;
-    position: relative;
-}
-.mega_tab_block .links_list {
-    margin: 0;
-    padding: 0;
-}
-.mega_tab_block .links_list li {
-    list-style: none outside none;
-    padding: 5px 0;
-}

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

@@ -1,3 +1,4 @@
+# encoding: utf-8
 class Panel::Announcement::BackEnd::ApprovalsController  < OrbitBackendController
   before_filter :authenticate_user!
   before_filter :is_admin?
@@ -15,6 +16,14 @@ 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')
@@ -61,6 +70,66 @@ 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,
+        :create_user_id => bulletin.create_user_id,
+        :update_user_id => bulletin.create_user_id
+      } 
+
+      @mail_cron = MailCron.new(@mail_cron) 
+
+      @mail_cron.save
+
+    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,3 +1,4 @@
+# encoding: utf-8
 class Panel::Announcement::BackEnd::BulletinsController < OrbitBackendController
   include OrbitControllerLib::DivisionForDisable
 
@@ -77,6 +78,9 @@ 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
@@ -94,6 +98,9 @@ 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
@@ -146,6 +153,13 @@ 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
@@ -226,6 +240,14 @@ 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!
@@ -293,6 +315,66 @@ 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,
+        :create_user_id => bulletin.create_user_id,
+        :update_user_id => bulletin.create_user_id
+      } 
+
+      @mail_cron = MailCron.new(@mail_cron) 
+
+      @mail_cron.save
+
+    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,7 +26,6 @@ class Panel::Announcement::FrontEnd::BulletinsController < OrbitWidgetController
   end
 
   def index
-
     @item = Page.find(params[:page_id]) rescue nil
     if @item
       if @item.frontend_data_count
@@ -61,11 +60,7 @@ 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
-      if params["tag_id"]
-        params["tag_id"].each do |tag_id|
-          delayed_impressionist(Tag.find tag_id) rescue nil
-        end
-      end
+      delayed_impressionist(@tag) if @tag
     end
 
   end

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

@@ -66,75 +66,14 @@ class Panel::Announcement::Widget::BulletinsController < OrbitWidgetController
     
   end
   
-  def bulletins_and_web_links
-  
-    @part = PagePart.find(params[:part_id]) if !params[:part_id].blank?
-    
-    @title = @part.title_translations[I18n.locale.to_s]
-    
-    if !@part.blank? and @part.widget_data_count
-      @page_num = @part.widget_data_count
-    else
-      @page_num = 5
-    end
-
-    date_now = Time.now
-
-    if !params[:tag_id].blank?
-      @tags = Tag.any_in(:_id => params[:tag_id]).asc(:created_at)
-    elsif params[:tag_id].blank? and !@part.tag.blank?
-      @tags = Tag.any_in(:_id => @part.tag).asc(:created_at)
-    else
-      @ModuleApp_b = ModuleApp.first(:conditions => {:key=>'announcement'})
-      @tags = Tag.where(:module_tag_id => @ModuleApp_b.id).asc(:created_at)
-    end
-
-    @selected_tag = Tag.find(params[:id]).first rescue @tags[0]
-
-    @bulletins = Bulletin.available_for_lang(I18n.locale).can_display.where(:tagged_ids => @selected_tag.id.to_s, :is_hidden => false).any_of( {deadline: nil,:postdate.lte => date_now} , {:deadline.gte => date_now,:postdate.lte => date_now} ).desc(:is_top, :postdate).page(params[:page]).per(@page_num) rescue nil
-
-    if @part.widget_style == 'bulletins_and_web_links'
-      @ModuleApp_w = ModuleApp.first(:conditions => {:key=>'web_resource'})
-      @link_selected_tag = Tag.first(:conditions => {:name => @selected_tag.name, :module_tag_id => @ModuleApp_w.id})
-      @web_links = WebLink.where(:tagged_ids => @link_selected_tag.id.to_s, :is_hidden => false).desc(:is_top,:created_at).available_for_lang(I18n.locale).page(params[:page]).per(@page_num) rescue nil
-    end
-    
-  end
-  
   def reload_bulletins
-  
-    @part = PagePart.find(params[:part_id]) if !params[:part_id].blank?
-    
-    @title = @part.title_translations[I18n.locale.to_s]
-    
-    if !@part.blank? and @part.widget_data_count
-      @page_num = @part.widget_data_count
-    else
-      @page_num = 5
-    end
-    
-    date_now = Time.now
-
-    @selected_tag = Tag.find(params[:tag_id]).first
-    @bulletins = Bulletin.available_for_lang(I18n.locale).can_display.where(:tagged_ids => @selected_tag.id.to_s, :is_hidden => false).any_of( {deadline: nil,:postdate.lte => date_now} , {:deadline.gte => date_now,:postdate.lte => date_now} ).desc(:is_top, :postdate).page(params[:page]).per(@page_num) rescue nil
+    @selected_tag = Tag.find(params[:tag_id])
+    @bulletins = Bulletin.available_for_lang(I18n.locale).can_display.where(:tagged_ids => params[:tag_id]).where(:is_hidden => false).any_of( {deadline: nil,:postdate.lte => date_now} , {:deadline.gte => date_now,:postdate.lte => date_now} ).desc(:is_top, sort).page(params[:page]).per(5) rescue nil
   end
   
   def reload_web_links
-  
-    @part = PagePart.find(params[:part_id]) if !params[:part_id].blank?
-    
-    if !@part.blank? and @part.widget_data_count
-      @page_num = @part.widget_data_count
-    else
-      @page_num = 5
-    end
-    
-    date_now = Time.now
-
-    @selected_tag = Tag.find(params[:tag_id]).first
-    @ModuleApp = ModuleApp.first(:conditions => {:key=>'web_resource'})
-    @link_selected_tag = Tag.first(:conditions => {:name => @selected_tag.name, :module_tag_id => @ModuleApp.id})
-    @web_links = WebLink.where(:tagged_ids => @link_selected_tag.id.to_s, :is_hidden => false).desc(:is_top,:created_at).available_for_lang(I18n.locale).page(params[:page]).per(@page_num) rescue nil
+    @selected_tag = Tag.find(params[:tag_id])
+    @web_links = WebLink.where(:name => @selected_tag.name).where(:is_hidden => false).desc(:is_top, sort).available_for_lang(I18n.locale).page(params[:page]).per(5) rescue nil
   end
 
   def bulletins_side_bar

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,7 +40,12 @@ class Bulletin
   field :not_checked_reason
   
   field :public, :type => Boolean, :default => true
-  field :rss_link
+
+
+  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) }
@@ -218,6 +223,18 @@ class Bulletin
 
 
   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

@@ -0,0 +1,29 @@
+<% # 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/bulletins/_form.html.erb

@@ -265,6 +265,50 @@
 					
 					</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>
@@ -300,6 +344,11 @@
 			$(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/app/views/panel/announcement/front_end/bulletins/show.html.erb

@@ -36,11 +36,6 @@
 			</div>
 		</div>
 	<% end %>
-	<% unless @bulletin.rss_link.blank? %>
-		<div>
-			<%= link_to t('ntu.rss_origin'), @bulletin.rss_link %>
-		</div>
-	<% end %>
 </div>
 
 <%= share_links(@bulletin, 'announcement') %>

vendor/built_in_modules/announcement/app/views/panel/announcement/widget/bulletins/_bulletins.html.erb

@@ -1,10 +1,10 @@
 <% @bulletins.each do |bulletin| %>
 	<li>
-		<%= link_to bulletin.title, panel_announcement_front_end_bulletin_path(bulletin, :category_id => bulletin.bulletin_category_id , :part_id => params[:part_id], :tag_id => [@selected_tag.id] )  %>
+		<%= link_to bulletin.title, panel_announcement_front_end_bulletin_path(bulletin, :category_id => bulletin.bulletin_category_id , :tag_id => @selected_tag.id )  %>
 	</li>
 <% end %>
 
 <div class='pagination'>
-	<%= link_to_previous_page @bulletins, 'Previous Page', :params => {:controller => 'widget/bulletins', :action => 'reload_bulletins', :part_id => params[:part_id], :tag_id => [@selected_tag.id]}, :remote => true, :class => 'previous' %>
-	<%= link_to_next_page @bulletins, 'Next Page', :params => {:controller => 'widget/bulletins', :action => 'reload_bulletins', :part_id => params[:part_id], :tag_id => [@selected_tag.id]}, :remote => true, :class => 'next' %>
+	<%= link_to_previous_page @bulletins, 'Previous Page', :params => {:controller => 'widget/bulletins', :action => 'reload_bulletins', :tag_id => @selected_tag.id}, :remote => true, :class => 'previous' %>
+	<%= link_to_next_page @bulletins, 'Next Page', :params => {:controller => 'widget/bulletins', :action => 'reload_bulletins', :tag_id => @selected_tag.id}, :remote => true, :class => 'next' %>
 </div>

vendor/built_in_modules/announcement/app/views/panel/announcement/widget/bulletins/_tag.html.erb

@@ -1,3 +1,3 @@
 <li>
-	<%= link_to tag.name, panel_announcement_widget_bulletins_and_web_links_path(:inner=>true, :id => [tag.id], :part_id=>params[:part_id]), :remote => true, :class => ('active' if tag.eql?(@selected_tag)) %>
+	<%= link_to tag.name, panel_announcement_widget_bulletins_and_web_links_path(:id => tag.id), :remote => true, :class => ('active' if tag.eql?(@selected_tag)) %>
 </li>

vendor/built_in_modules/announcement/app/views/panel/announcement/widget/bulletins/_web_links.html.erb

@@ -5,6 +5,6 @@
 <% end %>
 
 <div class='pagination'>
-	<%= link_to_previous_page @web_links, 'Previous Page', :params => {:controller => 'widget/bulletins', :action => 'reload_web_links', :part_id => params[:part_id], :tag_id => @selected_tag.id}, :remote => true, :class => 'previous' %>
-	<%= link_to_next_page @web_links, 'Next Page', :params => {:controller => 'widget/bulletins', :action => 'reload_web_links', :part_id => params[:part_id], :tag_id => @selected_tag.id}, :remote => true, :class => 'next' %>
+	<%= link_to_previous_page @web_links, 'Previous Page', :params => {:controller => 'widget/bulletins', :action => 'reload_web_links', :tag_id => @selected_tag.id}, :remote => true, :class => 'previous' %>
+	<%= link_to_next_page @web_links, 'Next Page', :params => {:controller => 'widget/bulletins', :action => 'reload_web_links', :tag_id => @selected_tag.id}, :remote => true, :class => 'next' %>
 </div>

vendor/built_in_modules/announcement/app/views/panel/announcement/widget/bulletins/bulletins_and_web_links.html.erb

@@ -1,36 +0,0 @@
-<div class="mega_tab_block">
-
-	<div class="tag_block">
-		<ul id='bulletins_web_links_tags' class="tag_list">
-			<%= render :partial => 'tag', :collection => @tags %>
-		</ul>
-	</div>
-
-	<div class="news_block">
-		<h3 class="news_title2">
-			<%#= link_to t("announcement.bulletins"), panel_announcement_front_end_bulletins_path, :class => 'more' %>
-			<%= link_to @title, panel_announcement_front_end_bulletins_path, :class => 'more' %>
-		</h3>
-		<ul id='bulletins_web_links_bulletins' class="news_list">
-			<%= render 'bulletins' if @bulletins %>
-		</ul>
-	</div>
-
-	<% if @part.widget_style == 'bulletins_and_web_links' %>
-
-	<div class="links_block">
-		<h3 class="links_title"><%= t(:related_links) %></h3>
-		<ul id='bulletins_web_links_web_links' class="links_list">
-			<%= render 'web_links' if @web_links %>
-		</ul>
-	</div>
-
-	<% end %>
-
-</div>
-
-<% content_for :page_specific_javascript do %>
-	<%= javascript_include_tag "news_link" %>
-<% end %>
-
-<%= stylesheet_link_tag "announcement/bulletins_and_web_links" %>

vendor/built_in_modules/announcement/app/views/panel/announcement/widget/bulletins/bulletins_and_web_links.js.erb

@@ -1,3 +0,0 @@
-$('#bulletins_web_links_tags').html("<%= j render :partial => 'tag', :collection => @tags %>")
-$('#bulletins_web_links_bulletins').html("<%= j render 'bulletins' if @bulletins %>")
-$('#bulletins_web_links_web_links').html("<%= j render 'web_links' if @web_links %>")

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

@@ -16,7 +16,6 @@ en:
       bulletin_category_with_title: Bulletin Category with Title
       postdate: Post Date
       title: Title
-      subtitle: SubTitle
     editing_announcement: Edit Announcement
     editing_announcement_category: Edit Category
     error:
@@ -35,6 +34,23 @@ en:
     update_bulletin_category_success: Update Category Successfully
     url: URL
     widget:
-      bulletins_and_web_links: Differential Nav.
+      bulletins_and_web_links: Bulletins and Web Resources
       index: Index
-      search: Search
+      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
+

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

@@ -16,7 +16,6 @@ zh_tw:
       bulletin_category_with_title: 公告類別及標題
       postdate: 張貼日期
       title: 標題
-      subtitle: 副標題
     editing_announcement: 編輯類別
     editing_announcement_category: 編輯類別
     error:
@@ -35,6 +34,24 @@ zh_tw:
     update_bulletin_category_success: 更新類別成功
     url: 連結位置
     widget:
-      bulletins_and_web_links: 分眾頁籤
+      bulletins_and_web_links: 索引
       index: 索引
-      search: 搜尋
+      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: 時間
+
+

vendor/built_in_modules/announcement/init.rb

@@ -23,20 +23,18 @@ module Announcement
     end
 
     category ["BulletinCategory"]
-    data_count 1..10
+    data_count 3..10
 
     taggable
 
     widgets do
       default_widget do
-	  sorting 'desc(:postdate)'
-        query 'Bulletin.available_for_lang(I18n.locale).any_of( {deadline: nil,:postdate.lte => Time.now} , {:deadline.gte => Time.now,:postdate.lte => Time.now} )'
-        enable ["typeA","typeB_style3","typeC"]
+        query 'Bulletin.any_of( {deadline: nil,:postdate.lte => Time.now} , {:deadline.gte => Time.now,:postdate.lte => Time.now} )'
+        enable ["typeA","typeC"]
         image :image
         field :postdate
-        link_field :title,{:method => 'panel_announcement_front_end_bulletin_path',:args=>:self,:preview=>true}
+        link_field :title,{:method => 'panel_announcement_front_end_bulletin_path',:args=>:self}
         link_field :bulletin_category_with_title,{:method => 'panel_announcement_front_end_bulletins_path',:args=>{:category_id => [:bulletin_category,:id]}}
-        field :subtitle
         link_to_more 'panel_announcement_front_end_bulletins_path',:title_i18n=> 'more_plus'
       end
 
@@ -52,11 +50,6 @@ module Announcement
         widget_i18n "announcement.widget.search"
       end
 
-      customize_widget "bulletins_and_web_links" do
-        widget_i18n "announcement.widget.bulletins_and_web_links"
-        style ["bulletins_and_links","bulletins_only"]
-      end
-
       # item "index","announcement.widget.index",:default_template=>true,:fields=>["title","category","postdate"]
       # item "bulletins_and_web_links","announcement.widget.bulletins_and_web_links"
     end

vendor/built_in_modules/ask/.gitignore

@@ -3,4 +3,5 @@ log/*.log
 pkg/
 test/dummy/db/*.sqlite3
 test/dummy/log/*.log
-test/dummy/tmp/
+test/dummy/tmp/
+test/dummy/.sass-cache

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

@@ -0,0 +1,28 @@
+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/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/app/models/ask_question.rb

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

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

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