backup

.gitignore

@@ -14,9 +14,7 @@ public/uploads/**/*
 solr/data
 tmp/**/*
 uploads/**/*
-config/*.god
+
-log/*.gz
-tmp/restart.txt
 *.swp
 *.pid
 *.lck

Gemfile

@@ -1,8 +1,6 @@
 source 'http://rubygems.org'
 gem 'rails', "~> 3.2.9"
 
-gem 'savon', '~> 2.2.0'
-
 gem "brakeman"
 gem 'mime-types'
 
@@ -16,12 +14,11 @@ gem 'execjs'
 gem 'jquery-rails', '2.1.4'
 gem 'jquery-ui-rails'
 gem "select2-rails", '3.3.1'
-gem 'kaminari'
+gem 'kaminari', :git => 'git://github.com/amatsuda/kaminari.git'
 gem "acts_as_unvlogable"
 gem 'youtube_it'
 gem 'gotcha'
 
-
 # gem "memcached", "~> 1.4.3"
 # gem "memcache-client"
 
@@ -41,7 +38,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'

app/assets/javascripts/tinymce_orbit.js.erb

@@ -15,11 +15,6 @@ function load_tinymce() {
     theme_advanced_statusbar_location : "bottom",
     theme_advanced_resizing : true,
 
-    // Domain Absolute URLs
-    relative_urls : false,
-    remove_script_host : false,
-    document_base_url: window.location.protocol + '//' + window.location.host,
-
     // Skin options
     skin : "o2k7",
     skin_variant : "silver",

app/assets/stylesheets/application.css

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

app/assets/stylesheets/mobile/orbit-mobile.css.erb.css

@@ -101,8 +101,8 @@ div[data-role="page"] {
 	border: none;
 	z-index: 50;
 	/*background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#545b60), to(#191a1c));*/
-	background-image: -webkit-linear-gradient(top, #6D35AF, #391C69);
+	background-image: -webkit-linear-gradient(top, #5282A6, #133757);
-	-webkit-box-shadow: 0 1px 3px rgba(0, 0, 0, 0.8), inset 0 1px 0 #AE73F5, 0 -1px 0 rgba(31, 32, 36, 1) inset;
+	-webkit-box-shadow: 0 1px 3px rgba(0, 0, 0, 0.8), inset 0 1px 0 rgba(127, 149, 165, 1), 0 -1px 0 rgba(31, 32, 36, 1) inset;
 }
 .header h1.ui-title {
 	margin: 8px 30%;
@@ -116,9 +116,9 @@ div[data-role="page"] {
 	margin-left: -15px;
 	font-size: 20px;
 	/*color: #727272;*/
-	color: #C5A7D3;
+	color: #7CA6C5;
 	/*background-color: #252525;*/
-	background-color: #38177F;
+	background-color: #144366;
 	border-radius: 0 0 5px 5px;
 	height: 15px;
 	line-height: 16px;
@@ -135,14 +135,14 @@ div[data-role="page"] {
 	background-image: none;
 }
 .header .ui-btn-up-a {
-	border: 1px solid #7220A0;
+	border: 1px solid #133547;
-	background-color: #9B2DCF;
+	background-color: #0C4C64;
 	background-image: -webkit-gradient(linear, left top, left bottom, from( #0D6691 ), to( #0E3A4B ));
-	background-image: -webkit-linear-gradient(#9B1DF0, #5F2879);
+	background-image: -webkit-linear-gradient( #0D6691 , #0E3A4B );
-	background-image: -moz-linear-gradient(#9B1DF0, #5F2879);
+	background-image: -moz-linear-gradient( #0D6691 , #0E3A4B );
-	background-image: -ms-linear-gradient(#9B1DF0, #5F2879);
+	background-image: -ms-linear-gradient( #0D6691 , #0E3A4B );
-	background-image: -o-linear-gradient(#9B1DF0, #5F2879);
+	background-image: -o-linear-gradient( #0D6691 , #0E3A4B );
-	background-image: linear-gradient(#9B1DF0, #5F2879);
+	background-image: linear-gradient( #0D6691 , #0E3A4B );
 }
 .header h1 img {
 	height: 30px;

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 = eval("#{@ori_class_name}.where(:#{get_category_field_name}.in=>params['category_id'], :tagged_ids.in => params['tag_id'])")
-        @result.selector[: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 = eval("#{@ori_class_name}.where(:#{get_category_field_name}.in=>params['category_id'])")
-      @result.selector[get_category_field_name] = { "$in" => params['category_id'].collect{|t| BSON::ObjectId(t)}}
     end
-    eval("@result.#{@default_widget[:sorting_query]}")
+    result.available_for_lang(I18n.locale).can_display.desc(:is_top, :postdate)
   end
 
   def search_result
@@ -93,9 +95,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/front_controller.rb

@@ -73,7 +73,7 @@ class FrontController < ApplicationController
     res << " active" if (current_page.id.eql?(page.id) || current_page.descendant_of?(page))
     res << "'>"
     root = "/"
-    res << "<a href='#{(page.class.to_s.eql?('Page') ? root + page.path : page.url)}' target=#{(page.class.to_s.eql?('Page') ? '_self' : '_blank')} ><span>#{page.title}</span></a>"
+    res << "<a href='#{(page.class.to_s.eql?('Page') ? root + page.path : page.url)}'><span>#{page.title}</span></a>"
     if page.visible_children.size > 0 && current < menu.levels
       res << "<span class='dot'></span>"
       res << menu_level(page, current_page, current + 1, menu)

app/controllers/sessions_controller.rb

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

app/helpers/application_helper.rb

@@ -9,7 +9,8 @@ module ApplicationHelper
 
   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)
+    request = DelayImpressionistRequest.new(request)
+    Resque.enqueue(DelayedImpressionist,:request=>request,:obj=>item,:class=>item.class.to_s,:controller_name=>controller_name,:action_name=>action_name,:user=>user_id)
   end
 
   def check_user_role_enable(attribute_fields)
@@ -220,7 +221,7 @@ module ApplicationHelper
       javascripts << "<script type='text/javascript' src='/assets/orbit-bar-search.js'></script>\n"
     end
     javascripts << "<script type='text/javascript' src='/assets/lib/jquery.preload-min.js'></script>\n"
-    # javascripts << "<script type='text/javascript' src='/static/jquery.cycle.all.latest.js'></script>\n"
+    javascripts << "<script type='text/javascript' src='/static/jquery.cycle.all.latest.js'></script>\n"
     javascripts << "<script type='text/javascript' src='/static/kernel.js'></script>\n"
     # javascripts << "<script type='text/javascript' src='/assets/social-share-button.js'></script>\n"
     javascripts << "<script type='text/javascript' src='/assets/lib/social-share-button.js'></script>\n"

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|
+    %x[rm #{archive_db_list_path}]
-      date_str = item.to_s.gsub("#{dbname}-",'')
+    %x[ls #{Rails.root}/tmp/#{dbname}* | du -h --max-depth=1 --block-size=1M |sort -h >> #{archive_db_list_path}]
-      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}]
     OrbitLogger.info "DB backup done Path:#{dbdirectory}"
+    
   end
 end

app/jobs/delayed_impressionist.rb

@@ -17,16 +17,10 @@ class DelayedImpressionist
     arg = args[0]
     @request= DelayImpressionistRequest.new
     @request.restore(arg["request"])
+    request = @request
     obj = eval("#{arg["class"]}.find '#{arg['obj']['_id']}'")
     # imp = new(@request,arg["controller_name"],arg["action_name"],arg["user"],obj)
     new_impression = obj.impressions.build(:user_id=>arg["user"],:controller_name=>arg["controller_name"],:action_name=>arg["action_name"],:ip_address=>@request.remote_ip,:referrer=>@request.referer)
-    @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

app/models/site.rb

@@ -29,11 +29,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/user/user.rb

@@ -7,7 +7,7 @@ class User
   
   mount_uploader :avatar, AvatarUploader
   
-  field :admin, :type => Boolean, :default => false
+  field :admin, :type => Boolean, :default => true
   field :active_role
   field :user_id
   field :sid
@@ -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/front/show_banner.html.erb

@@ -1,3 +1,19 @@
+<script type='text/javascript' src='/static/jquery.cycle.all.latest.js'></script>
+<script type='text/javascript'>
+  jQuery(function( $ ){     
+
+      $('#slideshow-<%= @ad_banner.title.dehumanize %>').cycle({
+        delay: -1000,
+        fx: "<%= @ad_banner.ad_fx.nil? ? 'fade': @ad_banner.ad_fx %>",
+        timeoutFn: getTimeout,
+        pager: '.banner_nav-<%= @ad_banner.title.dehumanize %>',
+        pagerAnchorBuilder: function(idx, slide) {
+          return "<li><a href='#'></a></li>";
+        }
+      });
+  });
+</script>
+
 <div style='position:relative'>
   <ul id='banner_nav' class='clear banner_nav-<%= @ad_banner.title.dehumanize %>'></ul>
   <div id='slideshow-<%= @ad_banner.title.dehumanize %>' class='slideshow'>
@@ -7,15 +23,4 @@
       <% end %>
     <% end %>
   </div>
-</div>
+</div>
-<script type='text/javascript'>
-  var banner = {"banner_name":"#slideshow-<%= @ad_banner.title.dehumanize %>",
-                "banner_fx":"<%= @ad_banner.ad_fx.nil? ? 'fade': @ad_banner.ad_fx %>",
-                "banner_pager":".banner_nav-<%= @ad_banner.title.dehumanize %>",
-                "image_loaded":0,
-                "time_to_next":<%= @ad_banner.transition_msec %>,
-                "current":0,
-                "best_size": "<%= @ad_banner.best_size %>"
-              };
-  banners.push(banner);
-</script>

app/views/front/show_page_sub_menu.html.erb

@@ -4,7 +4,7 @@
     <ul class='list'>
       <% @menu_page.visible_children.each do |child| %>
         <li class="<%= @page_id.eql?(child.id) ? 'active' : nil %>">
-          <a href="<%= (child.class.to_s.eql?('Page') ? '/' + child.path : child.url) %>" <%= "target=_blank" if child.class.to_s.eql?('Page').blank? %> ><%= child.title %></a>
+          <a href="<%= (child.class.to_s.eql?('Page') ? '/' + child.path : child.url) %>"><%= child.title %></a>
         </li>
       <% end %>
     </ul>

app/views/mobile/dialog_contact.mobile.erb

@@ -3,5 +3,9 @@
 <% end %>
 
 <ul>
-  <li>電話：<a href="tel:+886227321104">+886-2-2732-1104</a> <a href="tel:+886266396688">+886-2-6639-6688</a></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.024562,121.544611"
+  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.delivery_method = :smtp
-  # config.action_mailer.smtp_settings = {
+  config.action_mailer.smtp_settings = {
-  #   :enable_starttls_auto => true,
+    :enable_starttls_auto => true,
-  #   :address => "smtp.gmail.com",
+    :address => "smtp.gmail.com",
-  #   :port => '587',
+    :port => '587',
-  #   :domain => "smtp.gmail.com",
+    :domain => "smtp.gmail.com",
-  #   :authentication => "plain",
+    :authentication => "plain",
-  #   :user_name => "redmine@rulingcom.com",
+    :user_name => "redmine@rulingcom.com",
-  #   :password => "rulingredmine" }
+    :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/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.name    = "worker-#{num}"
-    w.group   = 'rulingcom'
+    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       = {"QUEUE"=>queue, "RAILS_ENV"=>rails_env}
-    w.env       = {"RAILS_ENV"=>rails_env,"PIDFILE" => w.pid_file ,"HOME"=>user_home, "QUEUE"=>queue, "RAILS_ENV"=>rails_env }
+    w.start     = "HOME=#{user_home} QUEUE=* RAILS_ENV=#{rails_env} rake -f #{rails_root}/Rakefile resque:work"
-    w.start     = "rake -f #{rails_root}/Rakefile resque:work"
+
-    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"
+     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.name    = "scheduler"
-    w.group   = 'rulingcom'
+    w.group   = 'resque'
-    w.pid_file = "#{rails_root}/solr/pids/production/sunspot-solr-production.pid"
     w.interval = 30.seconds
-    w.env       = {"RAILS_ENV"=>rails_env,"HOME"=>user_home ,"RAILS_ENV"=>rails_env}
+    w.env       = {"QUEUE"=>"critical,high,low", "RAILS_ENV"=>rails_env}
-    w.start     = "rake -f #{rails_root}/Rakefile sunspot:solr:start"
+    w.start     = "HOME= #{user_home} QUEUE=* RAILS_ENV=#{rails_env} rake -f #{rails_root}/Rakefile resque:scheduler"
-    w.stop = "sudo kill -KILL $(cat #{w.pid_file})"
-    w.keepalive
 
     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

@@ -4,12 +4,6 @@ dashboard_counter_cache:
   args:
   description: DashboardCounterCache
 
-backup_server:
-  cron: 0 0 2 * * *
-  class: BackupServer
-  args:
-  description: BackupServer and remove old backups
-
 update_tag_cloud:
   cron: 0 0 [0,12] * * *
   class: UpdateTagCloud

config/routes.rb

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

lib/import_data/announce_categories.json

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

lib/orbit_app/module/visitor_counter_eval.rb

@@ -4,33 +4,24 @@ module OrbitApp
         Version = "0.1"
 
         def display_visitors(options={})
-            map = "function(){ emit( this.referrer,{session_hash: this.session_hash,created_at: this.created_at}); };"
+            impressions = Impression.where(options).and(:referrer.ne => nil).distinct(:session_hash).count
-            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})
+          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_day - 7.days, '$lte' => DateTime.now})
+          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_day - 1.month, '$lte' => DateTime.now})
+          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_day - 1.year, '$lte' =>DateTime.now})
+          display_visitors(created_at: {'$gte' => Date.today.beginning_of_year, '$lte' => Date.today.end_of_year})
         end
       end # end of VisitorCounterEval
   end # of Module
 end # of OrbitApp
-

lib/orbit_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/parsers/parser_front_end.rb

@@ -32,7 +32,13 @@ module ParserFrontEnd
         ret = ''
         part = PagePart.find(front['part_id']) if front['part_id']
         ret << eval("\"#{front['path']}\"") rescue ''
-        ret << (ret.include?("?") ? "&#{args.to_param}" : "?#{args.to_param}") if args
+        args.each do |index,arg|
+          if index=="tag_id" || index=="category_id"
+            ret << (ret.include?("?") ? "&#{index}[]=#{arg}": "?#{index}[]=#{arg}" )
+            else
+            ret << (ret.include?("?") ? "&#{index}=#{arg}": "?#{index}=#{arg}" )    
+          end
+        end if args
         fragment = Nokogiri::HTML::DocumentFragment.new(body, "<div class='dymanic_load widget' path='#{ret}'></div>")
       end
       front.swap(fragment)

lib/tasks/import.rake

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

lib/tasks/migrate.rake

@@ -326,44 +326,4 @@ namespace :migrate 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/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.title = 'RulingOrbit Demo Site'
-    site.update_attribute(:resque_namespace,@resque_namespace)
+    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/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

public/static/kernel.js

@@ -1,72 +1,45 @@
-var banners = [];
-var banner_index = 0;
-$q = jQuery;
-$q.getScript('/static/jquery.cycle.all.latest.js');
-
 $(document).ready(function() {
-    $.each($(".dymanic_load"),function(){
+	
-        if($(this).attr("path")==''){$(this).html("App setting Failed");} 
+	$.each($(".dymanic_load"),function(){
-        if($(this).attr("path")!=''){
+		if($(this).attr("path")==''){$(this).html("App setting Failed");} 
-            if($(this).attr("path").indexOf("show_banner")>0){
+		
-                    ajax_load_proc($(this),$(this).attr("path"),"true");         
+		if($(this).attr("path")!=''){
-            }else{
+				 ajax_load_proc($(this),$(this).attr("path"));
-                    ajax_load_proc($(this),$(this).attr("path"),$(this).attr("path"));
+				} 
-            }
+			}
-        }});
+			);
-    $("#main_content").addClass("module");
+	$("#main_content").addClass("module");
-});
+	});
 
-function ajax_load_proc(wapper,url,isBanner){
+function ajax_load_proc(wapper,url){
-    $.get(encodeURI(url), {}, function(respText,textSta,XML){ 
+	$.get(encodeURI(url), {}, function(respText,textSta,XML){ 
-        if (textSta == 'success') {
+			if (textSta == 'success') {
-            if(isBanner=="true"){
+				wapper.html(respText);	
-                wapper.html(respText);
+			};
-                var banner = banners[banner_index];
+			if(textSta == 'error')
-                if($(banner.banner_name+" img").length>1){
+				wapper.html("Loading Failed<br/>  <a href='"+$(this).attr('path')+"'>Go See</a>");
-                	$(banner.banner_name+" > img").each(function(){
+	});
-	                        $(this).load(function(){ banner.image_loaded++; });
-	                });
-	                BannerCycle(banner_index);
-                }
-                banner_index++;
-            }else{
-                wapper.html(respText);
-            }        
-        };
-        if(textSta == 'error')
-                wapper.html("Loading Failed<br/>  <a href='"+$(this).attr('path')+"'>Go See</a>");
-    });
 }
 
-function BannerCycle(banner_index){
+// Ad Banner FX code [start]
-    var banner = banners[banner_index];
+function getTimeout() { 
-    if (banner.image_loaded==$(banner.banner_name+" img").length){
+    return $(this).attr('time_to_next'); 
-        $q(banner.banner_name).cycle({
+} 
-            delay: -1000,
-            fx: banner.banner_fx,
-            timeout: banner.time_to_next,
-            pager: banner.banner_pager,
-            pagerAnchorBuilder: function(idx, slide) { return "<li><a href='#'></a></li>"; }
-         });
-    }else{
-            setTimeout("BannerCycle("+banner_index+")",500);
-    }
-}
 
 $(document).ready(function() { 
-        $(document).on('click', '.slideshow img', function()
+	$(document).on('click', '.slideshow img', function()
-        {
+	{
-                if($(this).attr('link_url')!='')
+		if($(this).attr('link_url')!='')
-                {
+		{
-                        if($(this).attr('link_open')=='new_window')
+			if($(this).attr('link_open')=='new_window')
-                        {
+			{
-                                window.open($(this).attr('link_url'));
+				window.open($(this).attr('link_url'));
-                        } 
+			} 
-                        else
+			else
-                        {
+			{
-                                document.location.href=$(this).attr('link_url')
+				document.location.href=$(this).attr('link_url')
-                        }
+			}
-                }
+		}
-        })
+	})
 });
-//    Ad Banner FX code [end]
+//    Ad Banner FX code [end]

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

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

@@ -9,12 +9,12 @@ class Panel::Announcement::BackEnd::BulletinCategorysController < OrbitBackendCo
 #     @module_app = ModuleApp.where(:title=>'Announcement').first
 #   end
 # =======
-  before_filter :for_app_manager,:except => [:index,:get_categorys_json,:get_bulletins_json, :get_bulletin_categories]
+  before_filter :for_app_manager,:except => [:index,:get_categorys_json,:get_bulletins_json]
 
 
   before_filter :force_order_for_visitor,:only=>[:index,:get_categorys_json,:get_bulletins_json]
-  before_filter :force_order_for_user,:except => [:index,:get_categorys_json,:get_bulletins_json, :get_bulletin_categories]
+  before_filter :force_order_for_user,:except => [:index,:get_categorys_json,:get_bulletins_json]
-  before_filter :for_app_sub_manager,:except => [:index,:get_categorys_json,:get_bulletins_json, :get_bulletin_categories]
+  before_filter :for_app_sub_manager,:except => [:index,:get_categorys_json,:get_bulletins_json]
 
   def index
     @bulletin_categorys = get_categories_for_index("BulletinCategory")
@@ -53,25 +53,6 @@ class Panel::Announcement::BackEnd::BulletinCategorysController < OrbitBackendCo
     render :json => JSON.pretty_generate(data)
   end
 
-  def get_bulletin_categories
-    I18n.locale = params[:locale] || :zh_tw
-    @categories = BulletinCategory.all.order_by(:title, :asc)
-    respond_to do |format|
-      format.json {
-        custom_categories = @categories.inject([]) do |data, category|
-          data << {
-            title: category.title,
-            link_html: "#{request.protocol}#{request.host_with_port}#{panel_announcement_front_end_bulletins_path(category_id: category.id, locale: I18n.locale)}",
-            link_json: "#{request.protocol}#{request.host_with_port}#{get_bulletins_panel_announcement_back_end_bulletins_path(category_id: category.id, locale: I18n.locale, format: 'json')}",
-            link_rss: "#{request.protocol}#{request.host_with_port}#{get_bulletins_panel_announcement_back_end_bulletins_path(category_id: category.id, locale: I18n.locale, format: 'rss')}"
-          }
-        end
-        render json: JSON.pretty_generate(custom_categories)
-      }
-      format.rss {}
-    end
-  end
-
   def get_bulletins_json
     bulletin = BulletinCategory.find(params[:bulletin_category_id]).bulletins
     p bulletin

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

@@ -1,4 +1,3 @@
-# encoding: utf-8
 class Panel::Announcement::BackEnd::BulletinsController < OrbitBackendController
   include OrbitControllerLib::DivisionForDisable
 
@@ -7,8 +6,8 @@ class Panel::Announcement::BackEnd::BulletinsController < OrbitBackendController
   #  before_filter :for_admin_only,:only => [:]
   #  before_filter :for_app_manager,:only => [:index,:show,] 
   before_filter :force_order_for_visitor,:only=>[:index,:show,:get_sorted_and_filtered_bulletins]
-  before_filter :force_order_for_user,:except => [:index,:show,:get_sorted_and_filtered_bulletins, :get_bulletins]
+  before_filter :force_order_for_user,:except => [:index,:show,:get_sorted_and_filtered_bulletins]
-  before_filter :for_app_sub_manager,:except => [:index,:show,:get_sorted_and_filtered_bulletins, :get_bulletins]
+  before_filter :for_app_sub_manager,:except => [:index,:show,:get_sorted_and_filtered_bulletins]
 
   before_filter :only => [ :new,:create,:edit,:update,:create] do |controller|
     controller.get_categorys('BulletinCategory')
@@ -23,9 +22,6 @@ class Panel::Announcement::BackEnd::BulletinsController < OrbitBackendController
 
 
   def index
-
-    email_group_data
-
     # @bulletins = Bulletin.all
     # @bulletins = Bulletin.desc("postdate desc")
     get_categorys('BulletinCategory',params[:bulletin_category_id])
@@ -81,9 +77,6 @@ class Panel::Announcement::BackEnd::BulletinsController < OrbitBackendController
   # GET /bulletins/new
   # GET /bulletins/new.xml
   def new
-
-    email_group_data
-
     if(session[:in_validate_object].blank?)
       @bulletin = Bulletin.new(:postdate => DateTime.now)
     else
@@ -101,9 +94,6 @@ class Panel::Announcement::BackEnd::BulletinsController < OrbitBackendController
 
   # GET /bulletins/1/edit
   def edit
-
-    email_group_data
-
     @bulletin = Bulletin.find(params[:id])
     if !current_user.admin? && (@bulletin.is_rejected? || @bulletin.is_checked?)
       redirect_to :action => :index
@@ -119,9 +109,6 @@ class Panel::Announcement::BackEnd::BulletinsController < OrbitBackendController
   # POST /bulletins
   # POST /bulletins.xml
   def create
-
-    email_group_data
-    
     @tags = get_tags
     if params[:bulletin_link]
 
@@ -159,13 +146,6 @@ class Panel::Announcement::BackEnd::BulletinsController < OrbitBackendController
       respond_to do |format|
         if @bulletin.save
 
-          if @bulletin.email_sent == true && @bulletin.is_checked == true && !@bulletin.is_rejected
-            send_email_data(@bulletin)
-
-            @bulletin.email_sent = false
-            @bulletin.save
-          end
-
           format.html { redirect_to(panel_announcement_back_end_bulletins_url, :notice => t('announcement.create_bulletin_success')) }
           format.xml  { render :xml => @bulletin, :status => :created, :location => @bulletin }
           # format.js
@@ -227,8 +207,6 @@ class Panel::Announcement::BackEnd::BulletinsController < OrbitBackendController
 
   def update
 
-    email_group_data
-
       @bulletin = Bulletin.find(params[:id])
 
       # @bulletin.image.clear if params[:bulletin][:image_del] == '1'
@@ -248,14 +226,6 @@ class Panel::Announcement::BackEnd::BulletinsController < OrbitBackendController
             @bulletin.is_rejected = false
             @bulletin.de_pending!
           end
-
-          if @bulletin.email_sent == true && @bulletin.is_checked == true && !@bulletin.is_rejected
-            send_email_data(@bulletin)
-
-            @bulletin.email_sent = false
-            @bulletin.save
-          end
-
           # if (params[:bulletin][:is_checked] == "false")
           #   @bulletin.is_rejected = true
           #   @bulletin.save!
@@ -320,115 +290,9 @@ class Panel::Announcement::BackEnd::BulletinsController < OrbitBackendController
     redirect_to panel_announcement_back_end_bulletins_url(:filter => params[:filter], :direction => params[:direction], :sort => params[:sort], :sort_options => params[:sort_options])
   end
 
-  # ================================================================
-  # language:
-  #   - default: zh_tw
-  #   - specify language: locale=[string]
-  # category:
-  #   - default: no category
-  #   - specify: category_id=[ID]
-  # pagination:
-  #   - default: 10
-  #   - specify the number of results: per=[number]
-  #   - specify the page: page=[number]
-  # ================================================================
-  def get_bulletins
-    I18n.locale = params[:locale] || :zh_tw
-    bulletins = params[:category_id] ? Bulletin.where(bulletin_category_id: params[:category_id]).order_by(:created_at, :desc) : Bulletin.all.order_by(:created_at, :desc)
-    bulletins = bulletins.reject{|b| b.title_translations[I18n.locale.to_s].blank?}
-    @bulletins = Kaminari.paginate_array(bulletins).page(params[:page]).per(params[:per] || 10)
-
-    respond_to do |format|
-      format.json { 
-        custom_bulletins = @bulletins.inject([]) do |data, bulletin|
-          deadline = bulletin.deadline.nil? ? t(:no_deadline) : display_date_time(bulletin.deadline)
-          image_url = "#{'/' unless bulletin.image.url.start_with?('/')}#{bulletin.image.url}"
-          data << {
-            title: bulletin.title,
-            link: "#{request.protocol}#{request.host_with_port}#{panel_announcement_front_end_bulletin_path(bulletin, category_id: bulletin.bulletin_category.id, locale: I18n.locale)}",
-            image: "#{request.protocol}#{request.host_with_port}#{image_url}",
-            category: bulletin.bulletin_category.title,
-            description: bulletin.subtitle,
-            postdate: display_date_time(bulletin.postdate),
-            deadline: deadline,
-            tag: bulletin.sorted_tags.map{|tag| tag.name}
-          }
-        end
-        render json: JSON.pretty_generate(custom_bulletins)
-      }
-      format.rss  { 
-        @category = BulletinCategory.find(params[:category_id]) rescue nil
-      }
-    end
-  end
-
 
   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")}：",
-        :mail_subject => "#{t("announcement.mail_subject",:site_title => @site.title)}：#{bulletin.title}",
-        :mail_to => @group_mail.join(','),
-        :mail_content => @mail_content ,
-        # :mail_sentdate => bulletin.email_sentdate,
-        :mail_sentdate => DateTime.now,
-        :create_user_id => bulletin.create_user_id,
-        :update_user_id => bulletin.create_user_id
-      } 
-
-      @mail_cron = MailCron.new(@mail_cron) 
-
-      @mail_cron.save
-
-      MailCron.send_mail_now(@mail_cron.id)
-
-    end
-    
-  end
-
-  def email_group_data
-
-    @email_group_data =  Bulletin.email_group_data
-    
-  end
-
   def delete_out_invalid_date_from_params
     if((params[:bulletin]["deadline(1i)"] && params[:bulletin]["deadline(1i)"].blank?) or (params[:bulletin]["deadline(2i)"] && params[:bulletin]["deadline(2i)"].blank?) or (params[:bulletin]["deadline(3i)"] && params[:bulletin]["deadline(3i)"].blank?)) 
       params[:bulletin].delete("deadline(1i)")

vendor/built_in_modules/announcement/app/controllers/panel/announcement/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
-  
+    @selected_tag = Tag.find(params[:tag_id])
-    @part = PagePart.find(params[:part_id]) if !params[:part_id].blank?
+    @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
-    
-    @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
   end
   
   def reload_web_links
-  
+    @selected_tag = Tag.find(params[:tag_id])
-    @part = PagePart.find(params[:part_id]) if !params[:part_id].blank?
+    @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
-    
-    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
   end
 
   def bulletins_side_bar

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

@@ -40,12 +40,6 @@ class Bulletin
   field :not_checked_reason
   
   field :public, :type => Boolean, :default => true
-
-
-  field :email_sent, :type => Boolean, :default => false
-  field :email_sentdate , :type => DateTime
-  field :email_group, :type => Array
-  field :other_mailaddress
   
   scope :can_display, where(is_checked: true, is_rejected: false, is_pending: false)
   scope :available_for_lang, ->(locale){ where("available_for_#{locale}".to_sym => true) }
@@ -89,10 +83,6 @@ class Bulletin
   def bulletin_category_with_title
     self.bulletin_category.title
   end
-  
-  def bulletin_create_dept
-    User.get_member_list_attribute_value(self.create_user_id,"staff","Unit").get_value_by_locale(I18n.locale)
-  end
 
   def share_item
       Item.first(conditions:{name: 'announcement'})
@@ -225,46 +215,8 @@ class Bulletin
     preview_object
   end
 
-  def get_email_group_data(email_group_data)
-
-    group_mail = Array.new
-
-    self.email_group.each do |egroup|
-
-      if email_group_data.include?(egroup) and (egroup == '0' or egroup == '1' or egroup == '2' or egroup == '3')
-
-        group_mail << "#{email_group_data[egroup]["email"]}(#{email_group_data[egroup]["name"]})"
-
-      elsif email_group_data.include?(egroup) and egroup == '4'
-
-        self.other_mailaddress.split(",").each do |otmail|
-
-          group_mail <<  "#{otmail}(#{email_group_data[egroup]["name"]})" 
-
-        end
-
-      end
-
-    end
-
-    group_mail.join("<br />").html_safe
-
-  end
-
 
   protected
-
-  def self.email_group_data
-
-    @email_group_data = { 
-      '0'=> {"name"=>I18n.t('announcement.email_group_data_0'), "email"=>"alluser@tea.ntue.edu.tw"}, 
-      '1'=> {"name"=>I18n.t('announcement.email_group_data_1'), "email"=>"allstu@tea.ntue.edu.tw"}, 
-      '2'=> {"name"=>I18n.t('announcement.email_group_data_2'), "email"=>"allgrad@tea.ntue.edu.tw"}, 
-      '3'=> {"name"=>I18n.t('announcement.email_group_data_3'), "email"=>"allad@tea.ntue.edu.tw"}, 
-      '4'=> {"name"=>I18n.t('announcement.email_group_data_4')}
-    }
-    
-  end
   
   def check_deadline
     if(!self.deadline.nil? and (self.deadline < self.postdate ))

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

@@ -11,14 +11,4 @@ class BulletinFile
   
   belongs_to :bulletin
 
-  validate :check_file_title
-
-  private
-
-  def check_file_title
-    if self.title.blank?
-      errors.add( :file,  I18n.t("announcement.file_name_not_null"))
-    end
-  end
-
 end

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

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

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

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

vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletin_categorys/get_bulletin_categories.rss.builder

@@ -1,16 +0,0 @@
-xml.instruct! :xml, :version => "1.0" 
-xml.rss :version => "2.0" do
-  xml.channel do
-    xml.title t('announcement.announcement') + ' ' + t('announcement.categories')
-    xml.link "#{request.protocol}#{request.host_with_port}#{get_bulletin_categories_panel_announcement_back_end_bulletin_categorys_path(format: 'rss')}"
-
-    @categories.each do |category|
-      xml.item do
-        xml.title category.title
-        xml.pubDate category.created_at.to_s(:rfc822)
-        xml.link "#{request.protocol}#{request.host_with_port}#{get_bulletins_panel_announcement_back_end_bulletins_path(category_id: category.id, locale: I18n.locale, format: 'rss')}"
-        xml.guid "#{request.protocol}#{request.host_with_port}#{panel_announcement_front_end_bulletins_path(category_id: category.id)}"
-      end
-    end
-  end
-end

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

@@ -22,11 +22,7 @@
               	<img class="pull-left upload-picture" src="/assets/default-img.png" />
               <% end %>
           </div>
-					<span class="alert widgetInfo">
+					<span class="alert widgetInfo"><%= t("ad.widget_info_for_ad_image_size", :best_size=> "290px x 150px") %></span>
-						<%= t("ad.widget_info_for_ad_image_size", :best_size=> "290px(w) x 230px(h)") %>
-						<br />
-						<%= t("announcement.image_upload_size_note", :image_upload_size =>'900kb') %>
-					</span>
 					<div class="controls file-upload input-prepend">
 						<%= t(:browse) %>
 						<%= f.file_field :image, :id => "input-upload", :class => '', :onchange => "document.getElementById('fu').innerHTML = this.form.fu.value = this.value;" %>
@@ -269,47 +265,6 @@
 					
 					</div>
 				</div>
-
-
-        <div id="widget" class="widget-box">
-            <div class="widget-action clear">
-                <a class="action"><i title="Added to the file" class="icon-exclamation-sign icon-white tip"></i></a>
-            </div>
-            <h3 class="widget-title"><i class="icons-bell"></i><%= t('announcement.email_eminder')%></h3>
-            <div class="widget-content">
-                <div class="controls">
-                    <label class="checkbox inline"><input id="remind-check" type="checkbox" value="1" name="bulletin[email_sent]"><%= t('announcement.activate_email_eminder')%></label>
-                    <div id="content-box">
-                        <hr />
-
-										
-						<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 if !@email_group_data.blank? %>
-		                    </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>
@@ -345,11 +300,6 @@
 			$(this).parents('table').append(("<%= escape_javascript(add_attribute 'form_bulletin_file', f, :bulletin_files) %>").replace(old_id, new_id));
 		});
 		$('.for_preview').popover({ html : true });
-	
-    $('#remind-check').prop('checked') ? '':$('#content-box').addClass('hide')
-    $('#remind-check').on('change', function() {
-        $(this).prop('checked') ? $('#content-box').removeClass('hide'):$('#content-box').addClass('hide')
-    })
 	});
 	</script>
 <% end %>

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

@@ -1,7 +1,5 @@
 <% # encoding: utf-8 %>
 
-<%= f.error_messages %>
-
 <tr id="<%= "bulletin_file_#{form_bulletin_file.id}" if !form_bulletin_file.new_record? %>" class='list_item'>
   <td>
     <div class="control-group">

vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/get_bulletins.rss.builder

@@ -1,21 +0,0 @@
-xml.instruct! :xml, :version => "1.0" 
-xml.rss :version => "2.0" do
-  xml.channel do
-    if @category
-      xml.title @category.title
-    else
-      xml.title t('announcement.announcement')
-    end
-    xml.link "#{request.protocol}#{request.host_with_port}#{get_bulletins_panel_announcement_back_end_bulletins_path(bulletin_category_id: @category.try(:id), format: 'rss')}"
-
-    @bulletins.each do |bulletin|
-      xml.item do
-        xml.title bulletin.title
-        xml.pubDate bulletin.postdate.to_s(:rfc822)
-        xml.description bulletin.subtitle
-        xml.link "#{request.protocol}#{request.host_with_port}#{panel_announcement_front_end_bulletin_path(bulletin, category_id: bulletin.bulletin_category.id, locale: I18n.locale)}"
-        xml.guid "#{request.protocol}#{request.host_with_port}#{panel_announcement_front_end_bulletin_path(bulletin)}"
-      end
-    end
-  end
-end

vendor/built_in_modules/announcement/app/views/panel/announcement/front_end/bulletins/show.html.erb

@@ -4,8 +4,8 @@
 	<div class="info1">
 		<span class="pull-right"><%= dislpay_view_count(@bulletin) %></span>
 		<span class="date"><%= display_date_time(@bulletin.postdate) %></span>
-		<% unit = User.get_member_list_attribute_value(@bulletin.create_user_id,"staff","Unit").get_value_by_locale(I18n.locale) rescue nil %>
+		<% unit =  @bulletin.cache_dept[I18n.locale.to_s] rescue nil %>
-		<span><%= t('announcement.default_widget.bulletin_create_dept') + ": " + unit unless unit.blank? %></span>
+		<span><%=  link_to unit,panel_announcement_front_end_index_bulletins_by_unit_path(:name=>unit) unless unit.blank? %></span>
 	</div>
 </div>
 <div class="news_image">

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_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', :part_id => params[:part_id], :tag_id => [@selected_tag.id]}, :remote => true, :class => 'next' %>
+	<%= 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_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', :part_id => params[:part_id], :tag_id => @selected_tag.id}, :remote => true, :class => 'next' %>
+	<%= 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

@@ -17,7 +17,6 @@ en:
       postdate: Post Date
       title: Title
       subtitle: SubTitle
-      bulletin_create_dept: Unit
     editing_announcement: Edit Announcement
     editing_announcement_category: Edit Category
     error:
@@ -25,7 +24,6 @@ en:
     file: Attachment
     file_description: File Description
     file_name: File Name
-    file_name_not_null: Name cannot be null
     frontend:
       bulletins: Announcement front-end
       search_result: Search result
@@ -37,25 +35,6 @@ 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}】
-    mail_subject: 【北教大公告提醒】
-    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
-    image_upload_size_note: The following recommendations %{image_upload_size} upload size
-

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

@@ -17,7 +17,6 @@ zh_tw:
       postdate: 張貼日期
       title: 標題
       subtitle: 副標題
-      bulletin_create_dept: 單位
     editing_announcement: 編輯類別
     editing_announcement_category: 編輯類別
     error:
@@ -25,7 +24,6 @@ zh_tw:
     file: 附加檔案
     file_description: 檔案描述
     file_name: 檔案名稱
-    file_name_not_null: 名稱不得為空值
     frontend:
       bulletins: 公告前台
       search_result: 搜尋結果頁
@@ -37,26 +35,6 @@ 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_subject: 【北教大公告提醒】
-    mail_hi: 您好
-    mail_url_view: 此封信件為公告事件提醒，請點選以下連結詳細觀看
-    mail_source: 來源
-    mail_time: 時間
-    image_upload_size_note: 建議檔案小於%{image_upload_size}
-
-

vendor/built_in_modules/announcement/config/routes.rb

@@ -17,7 +17,6 @@ Rails.application.routes.draw do
             get 'load_quick_edit'
           end
           collection do
-            get "get_bulletins"
             post "preview"
             put "preview"
             get 'delete'
@@ -28,7 +27,6 @@ Rails.application.routes.draw do
 
         resources :bulletin_categorys do
           collection do
-            get "get_bulletin_categories"
             get 'get_categorys_json'
           end
           # if want to use json

vendor/built_in_modules/announcement/init.rb

@@ -29,15 +29,13 @@ module Announcement
 
     widgets do
       default_widget do
-	  sorting 'desc(:postdate)'
+        query 'Bulletin.any_of( {deadline: nil,:postdate.lte => Time.now} , {:deadline.gte => Time.now,:postdate.lte => Time.now} )'
-        query 'Bulletin.can_display.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"]
         image :image
         field :postdate
         link_field :title,{:method => 'panel_announcement_front_end_bulletin_path',:args=>:self,:preview=>true}
         link_field :bulletin_category_with_title,{:method => 'panel_announcement_front_end_bulletins_path',:args=>{:category_id => [:bulletin_category,:id]}}
-        link_field :subtitle,{:method => 'panel_announcement_front_end_bulletin_path',:args=>:self,:preview=>true}
+        field :subtitle
-        field :bulletin_create_dept
         link_to_more 'panel_announcement_front_end_bulletins_path',:title_i18n=> 'more_plus'
       end
 
@@ -53,11 +51,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/init.rb

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

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

@@ -14,7 +14,6 @@ class Panel::Ask::FrontEnd::AskQuestionsController < OrbitWidgetController
   def create
     @ask_question = AskQuestion.new(params[:ask_question])
     if gotcha_valid? && @ask_question.save
-     @acknowledgement = AskAcknowledgement.last
       @ask_acknowledgement = AskAcknowledgement.first || AskAcknowlegement.new
       #@ask_question.save
       redirect_to root_path
@@ -31,7 +30,6 @@ class Panel::Ask::FrontEnd::AskQuestionsController < OrbitWidgetController
   end
 
   def thank_you
-    @acknowledgement = AskAcknowledgement.last
     @item = Page.find(params[:page_id]) rescue nil
     if @item
       if @item.frontend_data_count
@@ -42,5 +40,7 @@ class Panel::Ask::FrontEnd::AskQuestionsController < OrbitWidgetController
       @frontend_style = @item.frontend_style
     end
     @item = Page.find(params[:page_id]) rescue nil
+>>>>>>> a4fa967... Fix mailing redirect
   end
+
 end

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

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

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

@@ -1,34 +1,4 @@
 <link href='/assets/ask.css' rel='stylesheet' type='text/css' />
-<style type="text/css">
-  .spinner {
-    position: fixed;
-    top: 50%;
-    left: 50%;
-    margin-left: -50px; /* half width of the spinner gif */
-    margin-top: -50px; /* half height of the spinner gif */
-    text-align:center;
-    z-index:1234;
-    overflow: auto;
-    width: 100px; /* width of the spinner gif */
-    height: 102px; /*hight of the spinner gif +2px to fix IE8 issue */
-} 
-</style>
-<script type="text/javascript">
-$(document).ready(function(){
-    $("#spinner").bind("ajaxSend", function() {
-        $(this).show();
-    }).bind("ajaxStop", function() {
-        $(this).hide();
-    }).bind("ajaxError", function() {
-        $(this).hide();
-    });
- 
-     });
-</script>
-
-<div id="spinner" class="spinner" style="display:none;">
-    Sending Mail <%= image_tag 'loading.gif', :id => "img-spinner"%>
-</div>
 <div id="new-ask-question" class="ask-question">
   <div id="acknowledgement"></div>
   <%= form_for @ask_question, url: panel_ask_front_end_ask_questions_path(standalone: true), html: {class: 'form-horizontal'} do |f| %>
@@ -92,18 +62,11 @@ $(document).ready(function(){
     </div>
    
     <div class="form-actions">
-      <%= f.submit t('submit'), class: 'btn btn-primary', :id => 'button-mail' %>
+      <%= f.submit t('submit'), class: 'btn btn-primary' %>
       <%= f.button t('cancel'), type: 'reset', class: 'btn' %>
     </div>
   <% end %>
 </div>
-<script type="text/javascript">
-$(document).ready(function(){
-    $('#button-mail').click(function() {
-        $('#spinner').show();
-    });
-});
-</script>
 <script type="text/javascript">
   $(function() {
     $('#new-ask-question .required').each(function() {

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

@@ -1 +1 @@
-<h3><%= @acknowledgement.content.html_safe%></h3>
+<h3>Thank you for your email, we will get back to you soon.</h3>

vendor/built_in_modules/er_email/.gitignore

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

vendor/built_in_modules/er_email/Gemfile

@@ -1,17 +0,0 @@
-source "http://rubygems.org"
-
-# Declare your gem's dependencies in er_email.gemspec.
-# Bundler will treat runtime dependencies like base dependencies, and
-# development dependencies will be added by default to the :development group.
-gemspec
-
-# jquery-rails is used by the dummy application
-gem "jquery-rails"
-
-# Declare any dependencies that are still in development here instead of in
-# your gemspec. These might include edge Rails or gems from your path or
-# Git. Remember to move these dependencies to your gemspec before releasing
-# your gem to rubygems.org.
-
-# To use debugger
-# gem 'debugger'

vendor/built_in_modules/er_email/MIT-LICENSE

@@ -1,20 +0,0 @@
-Copyright 2013 YOURNAME
-
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

vendor/built_in_modules/er_email/README.rdoc

@@ -1,3 +0,0 @@
-= ErEmail
-
-This project rocks and uses MIT-LICENSE.

vendor/built_in_modules/er_email/Rakefile

@@ -1,40 +0,0 @@
-#!/usr/bin/env rake
-begin
-  require 'bundler/setup'
-rescue LoadError
-  puts 'You must `gem install bundler` and `bundle install` to run rake tasks'
-end
-begin
-  require 'rdoc/task'
-rescue LoadError
-  require 'rdoc/rdoc'
-  require 'rake/rdoctask'
-  RDoc::Task = Rake::RDocTask
-end
-
-RDoc::Task.new(:rdoc) do |rdoc|
-  rdoc.rdoc_dir = 'rdoc'
-  rdoc.title    = 'ErEmail'
-  rdoc.options << '--line-numbers'
-  rdoc.rdoc_files.include('README.rdoc')
-  rdoc.rdoc_files.include('lib/**/*.rb')
-end
-
-APP_RAKEFILE = File.expand_path("../test/dummy/Rakefile", __FILE__)
-load 'rails/tasks/engine.rake'
-
-
-
-Bundler::GemHelper.install_tasks
-
-require 'rake/testtask'
-
-Rake::TestTask.new(:test) do |t|
-  t.libs << 'lib'
-  t.libs << 'test'
-  t.pattern = 'test/**/*_test.rb'
-  t.verbose = false
-end
-
-
-task :default => :test

vendor/built_in_modules/er_email/app/controllers/application_controller.rb

@@ -1,23 +0,0 @@
-class ApplicationController < ActionController::Base
-  protect_from_forgery
-  before_filter :set_locale
-  
-  # Set I18n.locale
-  def set_locale
-    # update session if passed
-    session[:locale] = params[:locale] if params[:locale]
-
-    # set locale based on session or default
-    begin
-      # check if locale is valid for non site pages
-      if !VALID_LOCALES.include?(session[:locale])
-        I18n.locale = I18n.default_locale
-      else
-        I18n.locale = session[:locale]
-      end
-     rescue
-       I18n.locale = I18n.default_locale
-     end    
-  end
-  
-end

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

@@ -1,145 +0,0 @@
-class Panel::ErEmail::BackEnd::ApprovalsController  < OrbitBackendController
-  before_filter :authenticate_user!
-  before_filter :is_admin?
-  include AdminHelper
-  # layout 'admin'
-
-  
-  def preview_and_approve
-    email_group_data
-    @email_er = EmailEr.find params[:email_er_id]
-  end
-  
-  def approve
-    notice = ""
-    @email_er = EmailEr.find params[:email_er_id]
-    @email_er.proc_check(params[:email_er][:is_checked],params[:email_er][:not_checked_reason])
-    @email_er.de_pending
-     if @email_er.save
-
-        if @email_er.is_checked == true and !@email_er.is_rejected
-          send_email_data(@email_er)
-        end
-
-        notice = t('er_email.approve_email_er_success')
-     else
-        notice = t('er_email.approve_email_er_fail')
-     end
-    redirect_to(panel_er_email_back_end_email_ers_url,:notice => notice)
-  end
-  
-  def setting
-    @sys_users = User.all(conditions: {admin: false}).includes(:avatar).not_guest_user
-    @email_er_categorys = EmailErCategory.all
-    @options_from_collection_for_select_email_er_categorys = @email_er_categorys.collect{|bc| [bc.title,bc.id] }
-    if params.has_key? :category
-      @email_er_category = EmailErCategory.find params[:category][:id]
-    else
-      @email_er_category =  @email_er_categorys.first
-    end
-    preload_object_auth = @email_er_category.get_object_auth_by_title('fact_check')
-    @users_array =  preload_object_auth.privilege_users rescue []
-    respond_to do |format|
-      format.html
-      format.js
-    end
-  end
-  
-  def update_setting
-    object_auth = update_setting_by_params
-    if object_auth.save!
-      flash[:notice] = t('update.success_')
-    else
-      flash[:notice] = t('update.fail')
-    end
-  end
-  
-  def user_list
-    @email_er_category = EmailErCategory.find params[:category][:id]
-  end
-
-  protected
-  def update_setting_by_params
-    category = EmailErCategory.find params[:category][:id]
-    privilege_users = params[:users].collect{|key,value| User.find key }  rescue []
-    object_auth_ary = category.object_auths.where(title: 'fact_check') || (category.object_auths.create :title=> 'fact_check')
-    object_auth = object_auth_ary.first
-    object_auth.privilege_users = privilege_users
-    object_auth
-  end 
-
-  def send_email_data(email_er)
-
-    @user = User.find(email_er.create_user_id)
-
-    email_group_data
-
-    @group_mail = Array.new
-
-    email_er.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 << email_er.other_mailaddress 
-
-      end
-
-    end
-
-    if !@group_mail.join.blank?
-
-      @mail_content = {
-        "text" => email_er.mail_content
-      }
-
-      @mail_cron = {  
-        :mail_from_app => 'er_email',
-        :mail_from => @user.email,
-        :mail_reply_to => @user.email,
-        :mail_subject => email_er.mail_subject,
-        :mail_to => @group_mail.join(','),
-        :mail_content => @mail_content ,
-        # :mail_sentdate => email_er.mail_sentdate,
-        :mail_sentdate => DateTime.now,
-        :create_user_id => email_er.create_user_id,
-        :update_user_id => email_er.create_user_id
-      } 
-
-      @mail_cron = MailCron.new(@mail_cron)
-
-      email_er.email_er_files.each do | mrfile |
-
-        @mcfile = @mail_cron.mail_cron_files.build
-
-        tmp_file = File.new(mrfile.file_identifier, 'w+')
-        
-        tmp_file.write(Mongo::GridFileSystem.new(Mongoid.database).open(mrfile.file.url.gsub("/gridfs/", ""), 'r').read.force_encoding("UTF-8"))
-
-        @mcfile.file = tmp_file
-
-        @mcfile.title =  mrfile.title
-
-        # delete file
-        FileUtils.rm_f(tmp_file)
-
-      end
-
-      @mail_cron.save
-
-      MailCron.send_mail_now(@mail_cron.id)
-
-    end
-    
-  end
-
-  def email_group_data
-
-    @email_group_data =  EmailEr.email_group_data
-    
-  end
-
-end

vendor/built_in_modules/er_email/app/controllers/panel/er_email/back_end/email_er_categorys_controller.rb

@@ -1,128 +0,0 @@
-class Panel::ErEmail::BackEnd::EmailErCategorysController < OrbitBackendController   
-  include OrbitControllerLib::DivisionForDisable
-
-  before_filter :for_app_manager,:except => [:index,:get_categorys_json] 
-  before_filter :force_order_for_visitor,:only=>[:index,:get_categorys_json]
-  before_filter :force_order_for_user,:except => [:index,:get_categorys_json]
-  before_filter :for_app_sub_manager,:except => [:index,:get_categorys_json]
-
-  
-  def index
-    @email_er_categorys =  get_categories_for_index("EmailErCategory") 
-    @email_er_category = EmailErCategory.new(:display => 'List')
-	
-	  @url = panel_er_email_back_end_email_er_categorys_path
-	
-    respond_to do |format|
-      format.html # index.html.erb
-      format.js
-    end
-  end
-
-  def get_categorys_json
-    categorys = EmailErCategory.all
-    data = Array.new
-
-    categorys.each do |c|
-      data << {
-        category: c.title, 
-        link: "#{url_for( :action => "index",
-                          :controller => "panel/er_email/back_end/email_ers",
-                          :format => :rss,
-                          :only_path => false,
-                          :inner=>true,
-                          :category_id => c )}"
-      }
-    end 
-    render :json => JSON.pretty_generate(data)
-  end 
-
-  # GET /email_ers/1
-  # GET /email_ers/1.xml
-  def show
-    @email_er_category = EmailErCategory.find(params[:id])
-
-    respond_to do |format|
-      format.html # show.html.erb
-      format.js
-    end
-  end
-
-  # GET /email_ers/new
-  # GET /email_ers/new.xml
-  def new
-    @email_er_category = EmailErCategory.new(:display => 'List')
-
-    respond_to do |format|
-      format.html # new.html.erb
-      format.js
-    end
-  end
-  
-  # GET /email_ers/1/edit
-  def edit
-    @email_er_category = EmailErCategory.find(params[:id])
-	
-	@url = panel_er_email_back_end_email_er_category_path(@email_er_category)
-
-    respond_to do |format|
-      format.html
-      format.js
-    end
-  end
-
-  # POST /email_ers
-  # POST /email_ers.xml
-  def create
-    @email_er_category = EmailErCategory.new(params[:email_er_category])
-
-    respond_to do |format|
-      if @email_er_category.save
-        format.html { redirect_to(panel_er_email_back_end_email_er_categorys_url, :notice => t('email_er_category.create_email_er_category_success')) }
-        format.js
-      else
-        format.html { render :action => "new" }
-        format.js { render action: "new" }
-      end
-    end
-  end
-
-  # PUT /email_ers/1
-  # PUT /email_ers/1.xml
-  def update
-    @email_er_category = EmailErCategory.find(params[:id])
-	
-	@url = panel_er_email_back_end_email_er_category_path(@email_er_category)
-
-    respond_to do |format|
-      if @email_er_category.update_attributes(params[:email_er_category])
-        format.html { redirect_to(panel_er_email_back_end_email_er_categorys_url, :notice => t('email_er_category.update_email_er_category_success')) }
-        # format.xml  { head :ok }
-        format.js
-      else
-        format.html { render :action => "edit" }
-        format.js { render :action => "edit" }
-      end
-    end
-  end
-
-  # DELETE /email_ers/1
-  # DELETE /email_ers/1.xml
-  def destroy
-    @email_er_category = EmailErCategory.find(params[:id])
-    @email_er_category.disable = @email_er_category.disable ? false : true
-
-    if @email_er_category.save! 
-      respond_to do |format|
-        flash[:notice] = t("update.success_")
-        # flash[:error] +=  @email_er_category.disable ?  t(:enable) : t(disable)
-        format.html { redirect_to(panel_er_email_back_end_email_er_categorys_url) }
-        # format.xml  { head :ok }
-        format.js 
-      end
-    else
-      flash[:error] = t("update.fail")
-      format.html { render :action => "index" }
-    end
-  end
-end

vendor/built_in_modules/er_email/app/controllers/panel/er_email/back_end/email_ers_controller.rb

@@ -1,318 +0,0 @@
-class Panel::ErEmail::BackEnd::EmailErsController < OrbitBackendController
-  # before_filter :for_app_manager,:except => [:index,:show] 
-  include OrbitControllerLib::DivisionForDisable
-
-
-  before_filter :force_order_for_user
-
-
-  before_filter :only => [ :new,:edit,:update,:create] do |controller|
-    controller.get_categorys('EmailErCategory')
-  end
-
-  def preview
-    email_er = EmailEr.new params
-    @preview_obj = email_er.to_preview
-    @preview_obj.save
-    render '/shared/preview/preview.html.erb',:layout=>false
-  end
-
-  def index
-
-    get_categorys("EmailErCategory",params[:email_er_category_id])
-
-    email_group_data
-
-    @filter = params[:filter]
-    new_filter = params[:new_filter]
-
-    if @filter && params[:clear]
-      @filter.delete(params[:type])
-    elsif @filter && new_filter
-      if @filter.has_key?(new_filter[:type]) && @filter[new_filter[:type]].include?(new_filter[:id].to_s)
-        @filter[new_filter[:type]].delete(new_filter[:id].to_s)
-      elsif @filter.has_key?(new_filter[:type])
-        @filter[new_filter[:type]] << new_filter[:id].to_s
-      else
-        @filter.merge!({new_filter[:type] => [new_filter[:id].to_s]})
-      end
-    elsif new_filter
-      @filter = {new_filter[:type] => [new_filter[:id].to_s]}
-    end
-
-    @email_er_categories = get_categories_for_index("EmailErCategory")
-    @email_er_category_ids = @email_er_categories.collect{|t| t.id.to_s} + [nil]
-
-    @email_ers = (params[:sort] || @filter) ? get_sorted_and_filtered("email_er",:email_er_category_id.in => @email_er_category_ids) : get_viewable("email_er",:email_er_category_id.in => @email_er_category_ids)
-
-    respond_to do |format|
-      format.html # index.html.erb
-      format.xml  { render :xml => @email_ers }
-      format.js
-    end
-  end
-
-  # GET /email_ers/1
-  # GET /email_ers/1.xml
-
-  def show
-    
-    email_group_data
-
-    @item = Page.find(params[:page_id]) rescue nil
-    if params[:preview] == "true"
-      preview_content
-    else
-      @email_er = EmailEr.all.can_display.where(_id: params[:id]).first
-      if @email_er and !@email_er.disable? and !@email_er.is_rejected
-        if @email_er.enabled_for_lang(I18n.locale.to_s)
-          delayed_impressionist(@email_er)
-          # get_categorys 
-        else
-          render :text => "<div class='alert alert-error'>#{t('sys.can_not_display_due_to_no_context')}</div>".html_safe 
-        end
-      else
-        render :nothing => true, :status => 403
-      end
-    end
-
-  end
-
-  def preview_content
-    @email_er = EmailEr.find params[:id] rescue nil
-    @email_er = Preview.find(params[:id]).get_virtual_object if @email_er.nil?
-    # get_categorys
-  end
-
-  # GET /email_ers/new
-  # GET /email_ers/new.xml
-  def new
-
-    email_group_data
-
-    @email_er = EmailEr.new(:mail_sentdate => DateTime.now)
-
-    respond_to do |format|
-      format.html # new.html.erb
-      format.xml  { render :xml => @email_er }
-    end
-  end
-
-  # GET /email_ers/1/edit
-  def edit
-
-    email_group_data
-
-    @email_er = EmailEr.find(params[:id])
-
-  end
-
-  # POST /email_ers
-  # POST /email_ers.xml
-  def create
-
-    email_group_data
-
-    @email_er = EmailEr.new(params[:email_er])
-    @email_er.create_user_id = current_user.id
-    @email_er.update_user_id = current_user.id
-
-    if(is_manager? || is_admin?)
-      @email_er.is_checked = true
-      @email_er.is_rejected = false
-      @email_er.de_pending
-    end
-
-    respond_to do |format|
-      if @email_er.save
-
-          if @email_er.is_checked == true and !@email_er.is_rejected
-            send_email_data(@email_er)
-          end
-
-        format.html { redirect_to(panel_er_email_back_end_email_ers_url) }
-        format.xml  { render :xml => @email_er, :status => :created, :location => @email_er }
-        # format.js
-        format.js { 
-          @info = {"success"=>"true","redirect_url"=>panel_er_email_back_end_email_ers_url}
-          flash[:notice] = t('er_email.create_er_email_success')
-          render "/shared/preview/after_create.js.erb"
-        }
-      else
-        format.html { render :action => "new" }
-        format.xml  { render :xml => @email_er.errors, :status => :unprocessable_entity }
-        format.js { 
-          @info = {"success"=>"false","redirect_url"=>new_panel_er_email_back_end_email_er_url(:email_er => @email_er)}
-          session[:in_validate_object] = @email_er
-          render "/shared/preview/after_create.js.erb"
-        }
-      end
-    end
-  end
-
-  # PUT /email_ers/1
-  # PUT /email_ers/1.xml
-  def update
-
-    email_group_data
-
-    @email_er = EmailEr.find(params[:id])
-	
-    @email_er.update_user_id = current_user.id 
-
-    respond_to do |format|
-      if @email_er.update_attributes(params[:email_er])
-
-        if(is_manager? || is_admin?)
-          @email_er.is_checked = true
-          @email_er.is_rejected = false
-          @email_er.de_pending!
-        end
-
-        if @email_er.is_checked == true and !@email_er.is_rejected
-          send_email_data(@email_er)
-        end
-
-        format.html { redirect_to(panel_er_email_back_end_email_ers_url(:page => params[:page])) }
-        format.xml  { head :ok }
-      else
-        format.html { render :action => "edit" }
-        format.xml  { render :xml => @email_er.errors, :status => :unprocessable_entity }
-      end
-    end
-  end
-
-  # DELETE /email_ers/1
-  # DELETE /email_ers/1.xml
-  def destroy
-    @email_er = EmailEr.find(params[:id])
-    @email_er.destroy
-
-    respond_to do |format|
-      format.html { redirect_to(panel_er_email_back_end_email_ers_url) }
-      # format.xml  { head :ok }
-      format.js
-    end
-  end
-
-  def delete
-    if params[:ids]
-      # email_ers = EmailEr.any_in(:_id => params[:ids]).destroy_all
-    end
-    redirect_to panel_er_email_back_end_email_ers_url(:direction => params[:direction], :sort => params[:sort], :sort_options => params[:sort_options])
-  end
-
-  def email_resend
-    if params[:id]
-      @email_er = EmailEr.find(params[:id])
-
-      @email_er.is_checked = false
-      @email_er.is_pending = true
-
-      @email_er.save
-
-    end
-    redirect_to panel_er_email_back_end_email_ers_url(:direction => params[:direction], :sort => params[:sort], :sort_options => params[:sort_options])
-  end
-
-  def test_send_email
-    if params[:id]
-      @email_er = EmailEr.find(params[:id])
-      
-      if (@email_er.create_user_id ==  current_or_guest_user.id) || is_manager?
-        if current_or_guest_user.admin? || (!@email_er.is_rejected? && !@email_er.is_checked?)
-          if @email_er.is_pending
-            send_email_data( @email_er , true )
-          end
-        end
-      end
-    end
-    redirect_to panel_er_email_back_end_email_ers_url(:direction => params[:direction], :sort => params[:sort], :sort_options => params[:sort_options])
-  end
-
-  protected
-
-  def send_email_data(email_er , test_send = false)
-
-    @user = User.find(email_er.create_user_id)
-
-    if !test_send
-
-      email_group_data
-
-      @group_mail = Array.new
-
-      email_er.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 << email_er.other_mailaddress 
-
-        end
-
-      end
-
-    else
-
-      # @group_mail = ["spen@rulingcom.com"]  
-      @group_mail = [@user.email]
-
-    end
-
-    if !@group_mail.join.blank?
-
-      @mail_content = {
-        "text" => email_er.mail_content
-      }
-
-      @mail_cron = {  
-        :mail_from_app => 'er_email',
-        :mail_from => @user.email,
-        :mail_reply_to => @user.email,
-        :mail_subject => email_er.mail_subject,
-        :mail_to => @group_mail.join(','),
-        :mail_content => @mail_content ,
-        # :mail_sentdate => email_er.mail_sentdate,
-        :mail_sentdate => DateTime.now,
-        :create_user_id => email_er.create_user_id,
-        :update_user_id => email_er.create_user_id
-      } 
-
-      @mail_cron = MailCron.new(@mail_cron)
-
-      email_er.email_er_files.each do | mrfile |
-
-        @mcfile = @mail_cron.mail_cron_files.build
-
-        tmp_file = File.new(mrfile.file_identifier, 'w+')
-        
-        tmp_file.write(Mongo::GridFileSystem.new(Mongoid.database).open(mrfile.file.url.gsub("/gridfs/", ""), 'r').read.force_encoding("UTF-8"))
-
-        @mcfile.file = tmp_file
-
-        @mcfile.title =  mrfile.title
-
-        # delete file
-        FileUtils.rm_f(tmp_file)
-
-      end
-
-      @mail_cron.save
-
-      MailCron.send_mail_now(@mail_cron.id)
-
-    end
-    
-  end
-
-  def email_group_data
-
-    @email_group_data =  EmailEr.email_group_data
-    
-  end
-  
-end

vendor/built_in_modules/er_email/app/helpers/panel/er_email/back_end/email_er_categorys_helper.rb

@@ -1,16 +0,0 @@
-module Panel::ErEmail::BackEnd::EmailErCategorysHelper
-include ActionView::Helpers::UrlHelper
-
-  
-  def show_anc_cate_permission_link(email_er_category)
-    type = 'submit'
-    oa = email_er_category.get_object_auth_by_title(type)
-    if oa.nil?
-      email_er_category.object_auths.new(title: type ).save
-      oa = email_er_category.get_object_auth_by_title(type)
-    end
-#    link_to t(:category_auth), edit_admin_object_auth_path(oa)
-     link_to t(:category_auth),admin_object_auth_ob_auth_path(oa)
-  end
-
-end

vendor/built_in_modules/er_email/app/helpers/panel/er_email/back_end/email_ers_helper.rb

@@ -1,58 +0,0 @@
-module Panel::ErEmail::BackEnd::EmailErsHelper
-  def show_reject_reason(email_er)
-    by_email_er = email_er.is_rejected
-    by_user = (((email_er.create_user_id == current_user.id) rescue nil) or is_manager? or is_admin?)
-    by_email_er && by_user
-  end
-
-  def show_form_status_field(email_er)
-    #by_email_er = (!email_er.is_expired? and email_er.is_pending?)
-    by_user = ((email_er.email_er_category.authed_users('fact_check').include?(current_user) rescue nil) or is_manager? or is_admin?)
-    by_user
-  end
-
-  def show_approval_link(email_er)
-    by_email_er = (email_er.is_pending?)
-    by_user = ((email_er.email_er_category.authed_users('fact_check').include?(current_user) rescue nil) or is_manager? or is_admin?)
-    by_email_er and  by_user
-  end
-
-  def show_delete_link(email_er)
-    if !current_user.nil?
-      by_email_er = (email_er.create_user_id == current_user.id ) 
-      by_user = (is_manager? or is_admin?)
-      by_email_er or  by_user  
-    else
-      false
-    end
-    
-  end
-
-  def show_email_er_title_at_index (email_er)
-    if email_er.is_checked?
-      link_to email_er.title, panel_er_email_front_end_email_er_path(email_er, :category_id => email_er.email_er_category.id) rescue ''
-    else
-      email_er.title
-    end  
-  end
-
-  def file_picture_preview_setting(file_path)
-    ext = File.extname(file_path)[1..-1].downcase
-    unless file_path.nil?
-      case ext
-        when "jpg","jpeg","png","gif"
-          {"data-content" => "#{image_tag file_path}" }
-        when "pdf", "zip", "rar"
-          {"data-content" => "#{image_tag("http://#{request.host_with_port}/assets/ft-icons/#{ext}/#{ext}-64_32.png")}"}
-        when "doc", "docx"
-          {"data-content" => "#{image_tag("http://#{request.host_with_port}/assets/ft-icons/docx_mac/docx_mac-64_32.png")}"}
-        when "xls", "xlsx"
-          {"data-content" => "#{image_tag("http://#{request.host_with_port}/assets/ft-icons/xlsx_mac/xlsx_mac-64_32.png")}"}
-        when "ppt", "pptx"
-          {"data-content" => "#{image_tag("http://#{request.host_with_port}/assets/ft-icons/pptx_mac/pptx_mac-64_32.png")}"}
-        else
-          {"data-content" => t("sys.not_previewable") }
-      end
-    end
-  end
-end

vendor/built_in_modules/er_email/app/models/email_er.rb

@@ -1,124 +0,0 @@
-# encoding: utf-8
-
-class EmailEr
-  include Mongoid::Document
-  include Mongoid::Timestamps
-  include Mongoid::MultiParameterAttributes
-  
-  include OrbitCoreLib::Preview
-
-  BelongsToCategory =  :email_er_category
-  include OrbitCoreLib::BelongsToCategoryMayDisable
-
-  PAYMENT_TYPES = @site_valid_locales 
-
-  field :mail_subject 
-  field :mail_sentdate , :type => DateTime
-  field :mail_content 
-  
-  field :create_user_id
-  field :update_user_id
-
-  field :is_checked, :type => Boolean, :default => false
-  field :is_pending, :type => Boolean, :default => true 
-  field :is_rejected, :type => Boolean, :default => false  
-  
-  field :not_checked_reason  
-
-  field :email_group, :type => Array
-  field :other_mailaddress
-
-  scope :can_display,where(is_hidden: false)
-
-  has_many :email_er_files, :autosave => true, :dependent => :destroy
-
-  accepts_nested_attributes_for :email_er_files, :allow_destroy => true
-  
-  validates :mail_subject,presence:{message:'blank is not allowed'}
-  validates :other_mailaddress, 
-            :length => {:maximum => 1000, :message => I18n.t("er_email.other_mailaddress_note_limit")}
-
-  def proc_check(check,not_pass_info = "")
-    self.is_checked = true
-      if check =="true"
-        self.is_rejected = false
-      elsif check == "false"
-        self.is_rejected = true
-        self.not_checked_reason = not_pass_info
-      end
-  end
-
-  def de_pending
-    self.is_pending = false
-  end
-
-  def de_pending!
-    de_pending
-    self.save!
-  end
-
-  def is_checked?
-    !self.is_pending && self.is_checked && (self.is_rejected == false)
-  end
-  
-  def is_pending?
-    self.is_pending
-  end
-  
-  def is_rejected?
-    !self.is_pending && self.is_rejected && (self.is_rejected == true)
-  end 
-
-  def get_email_group_data(email_group_data)
-
-    group_mail = Array.new
-
-    self.email_group.each do |egroup|
-
-      if email_group_data.include?(egroup) and (egroup == '0' or egroup == '1' or egroup == '2' or egroup == '3')
-
-        #group_mail << "#{email_group_data[egroup]["email"]}(#{email_group_data[egroup]["name"]})"
-        group_mail << "#{email_group_data[egroup]["name"]}"
-
-      elsif email_group_data.include?(egroup) and egroup == '4'
-
-        self.other_mailaddress.split(",").each do |otmail|
-
-          group_mail <<  "#{otmail}(#{email_group_data[egroup]["name"]})"
-
-        end
-
-      end
-
-    end
-
-    group_mail.join("<br />").html_safe
-
-  end
-
-  def to_preview
-    preview_object = Preview.new(:expired_at=>DateTime.now+30.minutes,:preview_at_link=>"panel_er_email_back_end_email_er_path",:object_class_type=>"EmailEr")
-
-    self.email_er["email_er_files_attributes"].each_with_index do |atr,idx| 
-      preview_object.preview_files.build(:file=>self.email_er["email_er_files_attributes"][idx.to_s],:field_name_for_rebuild=>'email_er_files',:file_in_array=>true)
-    end unless self.email_er["email_er_files_attributes"].nil?
-
-    preview_object.object = self.email_er.except("email_er_files_attributes")
-    preview_object
-  end
-
-  protected
-
-  def self.email_group_data
-
-    @email_group_data = { 
-      '0'=> {"name"=>I18n.t('er_email.email_group_data_0'), "email"=>"alluser@tea.ntue.edu.tw"}, 
-      '1'=> {"name"=>I18n.t('er_email.email_group_data_1'), "email"=>"allstu@tea.ntue.edu.tw"}, 
-      '2'=> {"name"=>I18n.t('er_email.email_group_data_2'), "email"=>"allgrad@tea.ntue.edu.tw"}, 
-      '3'=> {"name"=>I18n.t('er_email.email_group_data_3'), "email"=>"allad@tea.ntue.edu.tw"}, 
-      '4'=> {"name"=>I18n.t('er_email.email_group_data_4')}
-    }
-    
-  end
-  
-end

vendor/built_in_modules/er_email/app/models/email_er_category.rb

@@ -1,47 +0,0 @@
-# encoding: utf-8
-
-class EmailErCategory
-  include Mongoid::Document
-  include Mongoid::Timestamps
-  include OrbitCoreLib::ObjectAuthable
-  include OrbitCoreLib::ObjectDisable
-  include Sunspot::Mongo
-  # include Mongoid::MultiParameterAttributes
-  APP_NAME = 'ErEmail'
-  ObjectAuthTitlesOptions = %W{submit_new fact_check}
-  AfterObjectAuthUrl = '/panel/er_email/back_end/email_er_categorys'
-  
-  field :disable, type: Boolean, :default => false
-  field :display
-  field :key  
-  field :title, localize: true
-  
-  has_many :email_ers
-
-  validates :title, :at_least_one => true
-  
-  searchable do
-    text :titles do
-      title_translations.to_a.collect{|t| t[1]}
-    end
-
-    boolean :frontend_search do
-      !disable
-    end
-
-    text :files do
-      email_ers.can_display.collect{|t| t.title_translations.to_a.collect{|t| t[1]}}
-    end
-
-  end
-
-
-  def pp_object
-    title
-  end
-
-  def self.from_id(id)
-    EmailErCategory.find(id) rescue nil
-  end
-  
-end

vendor/built_in_modules/er_email/app/models/email_er_file.rb

@@ -1,23 +0,0 @@
-class EmailErFile
-
-  include Mongoid::Document
-  include Mongoid::Timestamps
-
-  mount_uploader :file, AssetUploader
-
-  field :should_destroy, :type => Boolean  
-  field :title
-  
-  belongs_to :email_er
-
-  validate :file_size
-
-	private
-
-  def file_size
-    if file.file.size > 10.megabytes
-      errors.add( :file,  I18n.t("er_email.email_file_limit"))
-    end
-  end
-
-end

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

@@ -1,76 +0,0 @@
- <% if email_er -%>
-
-<div class="modal hide fade in banner-preview" id="email_er-<%=email_er.id%>">
-  <div class="modal-header">
-    <a class="close" data-dismiss="modal">×</a>
-    <h3><%= t(:preview) %></h3>
-  </div>
-  <div class="modal-body">
-    <p class="email_er_slideshow">
-			<iframe src=<%= panel_er_email_back_end_email_er_path(email_er, :category_id => email_er.email_er_category.id ,:preview=>true) %> style="width:1024px;height:300px" >
-
-			</iframe> 
-
-			<% if @email_er.email_er_files.size > 0 %>
-				<%= label_tag t('file_')%>
-				<% @email_er.email_er_files.each do | efile | %>
-				<%= link_to (!efile.title.blank? ? efile.title : t('download')), efile.file.url, {:target => '_blank', :title => efile.title} if efile.file.file %>
-				<% end %>
-				<br />
-			 <% end %>
-
-			<% if !@email_er.email_group.blank? %>
-				<%= label_tag 'group_mail' %>
-				<%= @email_er.get_email_group_data(@email_group_data) %>
-			<% end %>
-
-    </p>
-  </div>
-  <div class="modal-footer">
-		
-		<%= form_for email_er, :url => panel_er_email_back_end_email_er_approve_path(email_er),:method => :post, :html => {:class => 'clear'} do |f| %>
-		<%= f.label :approval_stat, t('approval.stat') %>
-			<%= content_tag :label,:class => "radio inline" do -%>
-				<%= f.radio_button :is_checked, true , {:class => 'privacy'} %> 
-				<%= t('approval.pass') %>
-			<% end -%>
-			<%= content_tag :label,:class => "radio inline" do -%>
-				<%= f.radio_button :is_checked, false, (!@email_er.is_checked ? {:checked => true, :class => 'privacy'} : {})%> 
-				<%= t('approval.not_pass') %>
-			<% end -%>
-
-				<%= label :is_checked_false, t('approval.not_pass_reason') %>
-			    <%= f.text_field :not_checked_reason %>
-			<%= f.submit t(:submit_approval),:class=>"btn"%>
-		<% end %>
-
-    <a href="#" class="btn" data-dismiss="modal"><%= t(:close) %></a>
-  </div>
-  <div>
-  	<script type="text/javascript" src="/static/kernel.js"></script>
-		<script type="text/javascript">
-			$(document).ready(function() {
-	 
-		$(".modal").on("hidden", function () {
-	  $("#show_preview").remove();
-			});
-			
-			$("iframe").load(function(){
-          // Get the body element
-          var frameBody = $("iframe").contents().find("body");
-
-          // Get all links inside the BODY tag
-          $('a', frameBody).click(function(e){
-                  //Disable all default actions       
-                  e.preventDefault();
-          });
-					$('input', frameBody).attr("disabled", true);
-      });
-		});
-		</script>
-	</div>
-</div>
-
-
-
-<% end -%>

vendor/built_in_modules/er_email/app/views/panel/er_email/back_end/approvals/_modal_list.html.erb

@@ -1,44 +0,0 @@
-<% if email_er_category -%>
-
-<div class="modal hide fade in" id="email_er_category-<%=email_er_category.id%>">
-  <div class="modal-header">
-    <a class="close" data-dismiss="modal">×</a>
-    <h3><%= t("approval.user_list") %></h3>
-  </div>
-  <div class="modal-body">
-		<div class="clear">
-			<% email_er_category.get_object_auth_by_title('fact_check').auth_users.each do |user| %>
-			<div class="checkbox clear checked">
-					<div class='member-avatar'>
-						<% if user.avatar? %>
-							<%= image_tag(user.avatar.thumb.url,:class => "member-img") %>
-						<% else %>
-							<%= image_tag "person.png",:class => "member-img" %>
-						<% end %>	
-					</div>
-					<%= label_tag "lab-user-#{user.id}", (user.name rescue ''),:class=>"member-name",:id=>nil -%>
-			</div>
-			<% end -%>
-		<divl>
-  </div>
-  <div class="modal-footer">
-    <a href="#" class="btn" data-dismiss="modal"><%= t(:close) %></a>
-  </div>
-  <div>
-  	<script type="text/javascript" src="/static/kernel.js"></script>
-		<script type="text/javascript">
-			$(document).ready(function() {
-	
-			$("#email_er_category-<%=email_er_category.id%>").on("show", function () {
-			});
-		$(".modal").on("hidden", function () {
-	  $("#show_preview").remove();
-			});
-		});
-		</script>
-	</div>
-</div>
-
-
-
-<% end -%>

vendor/built_in_modules/er_email/app/views/panel/er_email/back_end/approvals/preview_and_approve.js.erb

@@ -1,5 +0,0 @@
-$('#show_preview').html("<%= escape_javascript(render(:partial => 'modal_approve',:locals => {:email_er => @email_er})) %>");
-var start_modal_with_id = "email_er-<%=@email_er.id%>";
-$("#"+start_modal_with_id).css("width","1050px");
-$("#"+start_modal_with_id).css("height","768px");
-$("#"+start_modal_with_id).css("margin","-270px 0 0 -550px");

vendor/built_in_modules/er_email/app/views/panel/er_email/back_end/approvals/setting.html.erb

@@ -1,53 +0,0 @@
-<% content_for :page_specific_css do %>
-	<%= stylesheet_link_tag "inc/permission-checkbox"  %>
-<% end %>
-<% content_for :page_specific_javascript do %>
-	<%= javascript_include_tag "inc/permission-checkbox"  %>
-	<%= javascript_include_tag "inc/search"  %>
-	<%= javascript_include_tag "inc/modal-preview"  %>
-<% end %>
-<%= form_tag('', :remote => true,:class => "prevent_enter_submit_form")  %>
-<div class="subnav clear">
-    <ul class="nav nav-pills filter pull-left">
-        <li class="accordion-group">
-            <div class="form-search" style="margin: 5px 10px;">
-                <%= label_tag :category, t(:category) %>
-                <%= select "category",'id',@options_from_collection_for_select_email_er_categorys %>
-								<%= search_field_tag 'user_filter' %>
-            </div>
-        </li>
-    </ul>
-		<%= link_to t("approval.user_list"), panel_er_email_back_end_approval_user_list_path , :class=>'preview_trigger btn btn-success pull-right'%>	
-</div>
-<%#= label_tag :role, t(:roles) %>
-<div class="clear">
-<%= content_tag :div do -%>
-	<% form_tag panel_er_email_back_end_approval_setting_path  do %>
-              <%= render :partial =>  "layouts/users_checkbox_ary"  %>
-	<div class="form-actions form-fixed pagination-right">
-	<%= submit_tag t(:update_), :class => 'btn btn-primary' %>
-	</div>
-	<% end -%>
-<% end -%>
-</div>
-
-<script type="text/javascript" charset="utf-8">
-var availableTags = [];
-$(document).ready(function() {
-	
-	$(".prevent_enter_submit_form").bind("keypress", function(e) {
-		if (e.keyCode == 13) {
-			return false;
-		}
-	});
-   
-	$('#category_id').change(function() {
-		$.ajax({
-			type: 'GET',
-			dataType: "script",
-			url:$(this).parents("from").attr("href"),
-			data:$(this).parents("form").serialize()
-		});
-	});
-});
-</script>

vendor/built_in_modules/er_email/app/views/panel/er_email/back_end/approvals/setting.js.erb

@@ -1,2 +0,0 @@
-$("#users_checkbox_ary").replaceWith('<%= escape_javascript(render :partial=>  "layouts/users_checkbox_ary"  )%>');
-permissionCheckbox();

vendor/built_in_modules/er_email/app/views/panel/er_email/back_end/approvals/update_setting.js.erb

@@ -1 +0,0 @@
-alert( "<% flash.each do |key, msg| %><%= msg %><% end%>");

vendor/built_in_modules/er_email/app/views/panel/er_email/back_end/approvals/user_list.js.erb

@@ -1,2 +0,0 @@
-$('#show_preview').html("<%= escape_javascript(render(:partial => 'modal_list',:locals => {:email_er_category => @email_er_category})) %>");
-var start_modal_with_id = "email_er_category-<%=@email_er_category.id%>"

vendor/built_in_modules/er_email/app/views/panel/er_email/back_end/email_er_categorys/_email_er_category.html.erb

@@ -1,19 +0,0 @@
-
-
-	<tr id="<%= dom_id email_er_category %>" class="with_action">
-		<td>
-			<%= email_er_category.key %>
-			<div class="quick-edit">
-				<ul class="nav nav-pills hide">
-					<li><%= link_to t(:edit), edit_panel_er_email_back_end_email_er_category_path(email_er_category), :remote => true %></li>
-					<li><%= link_to show_toggle_archive_btn(email_er_category) , panel_er_email_back_end_email_er_category_path(email_er_category), :confirm => t(:sure?), :method => :delete, :remote => true,:class=> "archive_toggle" %></li> 
-					<%if is_manager? || is_admin? %>
-						<li><%= show_anc_cate_permission_link(email_er_category) %></li>
-					<% end %>
-				</ul>
-			</div>
-		</td>
-		<% @site_valid_locales.each do |locale| %>
-		<td><%= email_er_category.title_translations[locale] rescue nil %></td>
-		<% end %>
-	</tr>

vendor/built_in_modules/er_email/app/views/panel/er_email/back_end/email_er_categorys/_form.html.erb

@@ -1,30 +0,0 @@
-<% # encoding: utf-8 %>
-
-<%= form_for(@email_er_category, :remote => true, :url => @url) do |f| %>
-
-	<h2><%= (@email_er_category.new_record? ? 'Add' : 'Edit') %></h2>
-
-	<div id="widget-title">
-		<%= f.label :key %>
-		<%= f.text_field :key %>
-	</div>
-	
-	<div id="widget-title">
-		<%= f.fields_for :title_translations do |f| %>
-		  <% @site_valid_locales.each do |locale| %>
-				<div class="control-group">
-					<%= label_tag "name-#{locale}", "Name-#{I18nVariable.from_locale(locale)}", :class => 'control-label' %>
-					<div class="controls">
-						<%= f.text_field locale, :class =>' input-xxlarge', :value => (@email_er_category.title_translations[locale] rescue nil) %>
-					</div>
-				</div>
-		  <% end %>
-		<% end %>
-	</div>
-  
-  <div class="form-actions">
-    <%= f.submit 'Submit/送出', :class=>'btn btn-primary' %>
-  </div>
-  
-<% end %>
- 

vendor/built_in_modules/er_email/app/views/panel/er_email/back_end/email_er_categorys/create.js.erb

@@ -1,2 +0,0 @@
-$('<%= j render :partial => 'email_er_category', :collection => [@email_er_category] %>').appendTo('#email_er_categorys').hide().fadeIn();
-$("#new_email_er_category")[0].reset();