Changes for mobile based on footer

Conflicts:
	Gemfile
	config/mongoid.yml

.gitignore

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

Gemfile

@@ -14,11 +14,12 @@ gem 'execjs'
 gem 'jquery-rails', '2.1.4'
 gem 'jquery-ui-rails'
 gem "select2-rails", '3.3.1'
-gem 'kaminari', :git => 'git://github.com/amatsuda/kaminari.git'
+gem 'kaminari'
 gem "acts_as_unvlogable"
 gem 'youtube_it'
 gem 'gotcha'
 
+
 # gem "memcached", "~> 1.4.3"
 # gem "memcache-client"
 
@@ -38,7 +39,7 @@ gem 'resque-scheduler' # job scheduling
 gem 'resque-restriction'
 #gem 'rb-readline'
 # gem 'ruby-debug19'
-gem 'rubyzip'
+gem 'rubyzip','0.9.9'
 
 gem 'sunspot_mongo'
 gem 'sunspot_solr'

app/assets/stylesheets/application.css

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

app/controllers/default_widget_controller.rb

@@ -11,23 +11,21 @@ class DefaultWidgetController< OrbitWidgetController
   end
 
   def query_for_default_widget
-
-    @ori_class_name = @default_widget["query"].split('.')[0]
-    result = nil
-    result_objects = nil
-
+    @ori_class_name =  @default_widget["query"].split('.')[0]
+    @result =  eval(@default_widget["query"])
     if !params["tag_id"].blank?
       if params["category_id"].blank? #has tag no cate
-        result = @ori_class_name.constantize.where(:tagged_ids.in => params["tag_id"])
+        @result.selector[:tagged_ids] = { "$in" => params['tag_id'] }
       else #has tag and cate
-        result = eval("#{@ori_class_name}.where(:#{get_category_field_name}.in=>params['category_id'], :tagged_ids.in => params['tag_id'])")
+        @result.selector[get_category_field_name] = { "$in" => params['category_id'].collect{|t| BSON::ObjectId(t)}}
+        @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
-    result.available_for_lang(I18n.locale).can_display.desc(:is_top, :postdate)
+    eval("@result.#{@default_widget[:sorting_query]}")
   end
 
   def search_result
@@ -95,9 +93,9 @@ class DefaultWidgetController< OrbitWidgetController
   end
   
   def get_category_field_name
-    @ori_class_name = @ori_class_name.constantize
+    @ori_class_name = @ori_class_name.constantize unless @ori_class_name.is_a? Class
     @ori_class_name.fields.each_key do |key|
-      return key if key.include?('category_id')
+      return key.to_s if key.include?('category_id')
     end
     nil
   end

app/helpers/application_helper.rb

@@ -9,8 +9,7 @@ module ApplicationHelper
 
   def delayed_impressionist(item)
     user_id = current_user.nil? ? nil : current_user.id
-    request = DelayImpressionistRequest.new(request)
-    Resque.enqueue(DelayedImpressionist,:request=>request,:obj=>item,:class=>item.class.to_s,:controller_name=>controller_name,:action_name=>action_name,:user=>user_id)
+    Resque.enqueue(DelayedImpressionist,:request=>DelayImpressionistRequest.new(request),:obj=>item,:class=>item.class.to_s,:controller_name=>controller_name,:action_name=>action_name,:user=>user_id)
   end
 
   def check_user_role_enable(attribute_fields)

app/jobs/backup_server.rb

@@ -2,16 +2,24 @@ 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} ]
 
-    %x[rm #{archive_db_list_path}]
-    %x[ls #{Rails.root}/tmp/#{dbname}* | du -h --max-depth=1 --block-size=1M |sort -h >> #{archive_db_list_path}]
+    Dir.foreach('tmp') do |item|
+      date_str = item.to_s.gsub("#{dbname}-",'')
+      next if not date_str.match(/\d{4}-\d{2}-\d{2}-\d{2}-\d{2}/)
+      if Date.parse(date_str).to_time < Site.first.backup_keep_for_days.days.ago
+        OrbitLogger.info  "Deleting #{date_str}"
+        %x[rm -rf tmp/#{item}] 
+      end
+    end
+
+
+    %x[rm -f #{archive_db_list_path}]
+    %x[cd tmp ; ls -l |grep #{dbname} | awk '{print $8}'|xargs  du -h --block-size=1M --max-depth=0 |sort -h >> #{archive_db_list_path}]
     OrbitLogger.info "DB backup done Path:#{dbdirectory}"
-    
   end
 end

app/jobs/delayed_impressionist.rb

@@ -17,10 +17,16 @@ 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,10 +29,11 @@ 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

@@ -42,7 +42,6 @@ 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")
 
@@ -89,9 +88,9 @@ class User
     var[:id].each do |id,val|  
       # binding.pry if id == '5052c5b22b5c49ab02000004'
       if (val=="true")
-        self.roles = self.roles.reject{|t| t.id.to_s==id}
+        self.role_ids.reject!{|t| t.to_s == id}
       elsif(val=="false")
-        self.roles << Role.find(id)
+        self.role_ids += Array(id)
       end
     end
   end
@@ -106,9 +105,9 @@ class User
       # binding.pry if id == '5052c5b22b5c49ab02000004'
 	  
       if ( self.roles.include?(@roid) == false or val=="true")
-        self.sub_roles = self.sub_roles.reject{|t| t.id.to_s==id}
+        self.sub_role_ids.reject!{|t| t.to_s == id}
       elsif(val=="false")
-        self.sub_roles << SubRole.find(id)
+        self.sub_role_ids += Array(id)
       end
 	  
     end
@@ -273,10 +272,6 @@ class User
   end
   
   protected
-    def save_roles
-      # self.roles = self.sub_roles.collect{|t| t.role}.uniq
-      self.roles = self.roles.uniq
-    end
 
   def rebuild_status_record
     self.status_record = {}

app/views/admin/users_new_interface/_index_paginator.html.erb

@@ -5,6 +5,6 @@
             <% end -%>
           <%end -%>
             <div class="paginationFixed" id="user_pagination">
-               <%= paginate @users, :params => {:inner => false}%>
+               <%= paginate @users, :params => {:inner => false} rescue nil %>
             </div>
         </div>

app/views/mobile/dialog_contact.mobile.erb

@@ -3,9 +3,5 @@
 <% end %>
 
 <ul>
-  <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>
+  <li>電話：<a href="tel:+88652721001">05-2721001</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 = "24.987449, 121.576117"
+  var $map_center = "23.568993,120.493893"
   var $map_zoom = 17
 </script>

config/config.yml

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

config/initializers/resque.rb

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

config/resque_schedule.yml

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

lib/import_data/announce_categories.json

@@ -1,6 +0,0 @@
-[{"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,24 +4,33 @@ module OrbitApp
         Version = "0.1"
 
         def display_visitors(options={})
-            impressions = Impression.where(options).and(:referrer.ne => nil).distinct(:session_hash).count
+            map = "function(){ emit( this.referrer,{session_hash: this.session_hash,created_at: this.created_at}); };"
+            reduce = "function(key, values){ var sum = 0; values.forEach(function(doc){sum += doc.amount; }); return {amount: sum};};"
+            if options.blank?
+              impressions = Impression.collection.map_reduce(map, reduce,read: :primary, out: "vr")
+            else
+              query = Impression.where(options).selector
+              impressions = Impression.where(options).collection.map_reduce(map, reduce,read: :primary, out: "vr",:query=>query)
+            end
+          impressions.count            
         end
 
         def display_visitors_today
-          display_visitors(created_at: {'$gte' => Date.today.beginning_of_day, '$lte' => Date.today.end_of_day})
+          display_visitors(created_at: {'$gte' => Date.today.beginning_of_day , '$lte' => DateTime.now})
         end
 
         def display_visitors_this_week
-          display_visitors(created_at: {'$gte' => Date.today.beginning_of_week, '$lte' => Date.today.end_of_week})
+          display_visitors(created_at: {'$gte' => Date.today.beginning_of_day - 7.days, '$lte' => DateTime.now})
         end
 
         def display_visitors_this_month
-          display_visitors(created_at: {'$gte' => Date.today.beginning_of_month, '$lte' => Date.today.end_of_month})
+          display_visitors(created_at: {'$gte' => Date.today.beginning_of_day - 1.month, '$lte' => DateTime.now})
         end
 
         def display_visitors_this_year
-          display_visitors(created_at: {'$gte' => Date.today.beginning_of_year, '$lte' => Date.today.end_of_year})
+          display_visitors(created_at: {'$gte' => Date.today.beginning_of_day - 1.year, '$lte' =>DateTime.now})
         end
       end # end of VisitorCounterEval
   end # of Module
 end # of OrbitApp
+

lib/orbit_app/module/widget.rb

@@ -102,12 +102,17 @@ 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
@@ -122,7 +127,7 @@ module OrbitApp
           end
 
           def to_module_app_format
-            {"query"=>@query,"image"=>@image,"more_link"=>@more_link,"enabled_styles"=>@enabled_styles} rescue nil
+            {"query"=>@query,"image"=>@image,"more_link"=>@more_link,"enabled_styles"=>@enabled_styles,:sorting_query=>@sorting_query} rescue nil
           end
 
           def link_field(field_name,setting)

lib/tasks/import.rake

@@ -1,55 +0,0 @@
-# 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,4 +326,44 @@ 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,4 +1,5 @@
 # encoding: utf-8 
+require 'erb'
 
 namespace :site do
   
@@ -9,21 +10,26 @@ 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.title = 'RulingOrbit Demo Site'
-    site.save
+    site.update_attribute(:title,'RulingOrbit Demo Site')
+    site.update_attribute(:resque_namespace,@resque_namespace)
 
     # 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
@@ -31,6 +37,78 @@ 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

@@ -0,0 +1,14 @@
+# 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.god.erb

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

lib/template/setting/resque_schedule.god.erb

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

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

lib/template/setting/solr.god.erb

@@ -6,16 +6,19 @@ development_gid = ''
 
   God.watch do |w|
     w.dir        = rails_root
-    w.name    = "scheduler"
-    w.group   = 'resque'
+    w.name    = "<%= @resque_namespace.nil? ? "" : "#{@resque_namespace}-" %>sunspot-solr"
+    w.group   = 'rulingcom'
+    w.pid_file = "#{rails_root}/solr/pids/production/sunspot-solr-production.pid"
     w.interval = 30.seconds
-    w.env       = {"QUEUE"=>"critical,high,low", "RAILS_ENV"=>rails_env}
-    w.start     = "HOME= #{user_home} QUEUE=* RAILS_ENV=#{rails_env} rake -f #{rails_root}/Rakefile resque:scheduler"
+    w.env       = {"RAILS_ENV"=>rails_env,"HOME"=>user_home ,"RAILS_ENV"=>rails_env}
+    w.start     = "rake -f #{rails_root}/Rakefile sunspot:solr:start"
+    w.stop = "sudo kill -KILL $(cat #{w.pid_file})"
+    w.keepalive
 
     w.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_resque-#{w.name}.log"
+    
+    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|

solr/conf/schema.xml

@@ -59,12 +59,26 @@
     <!-- *** This fieldType is used by Sunspot! *** -->
     <fieldType name="rand" class="solr.RandomSortField" omitNorms="true"/>
     <!-- *** This fieldType is used by Sunspot! *** -->
-    <fieldType name="text" class="solr.TextField" omitNorms="false">
+<!--     <fieldType name="text" class="solr.TextField" omitNorms="false">
       <analyzer>
         <tokenizer class="solr.CJKTokenizerFactory"/>
         <filter class="solr.StandardFilterFactory"/>
         <filter class="solr.LowerCaseFilterFactory"/>
       </analyzer>
+    </fieldType> -->
+    <fieldType name="text" class="solr.TextField" omitNorms="false">
+    <analyzer>
+    <tokenizer class="solr.StandardTokenizerFactory"/>
+    <filter class="solr.StandardFilterFactory"/>
+    <filter class="solr.LowerCaseFilterFactory"/>
+    <filter class="solr.NGramFilterFactory" minGramSize="1" maxGramSize="15"/>
+    </analyzer>
+
+    <analyzer type="query">
+    <tokenizer class="solr.StandardTokenizerFactory"/>
+    <filter class="solr.StandardFilterFactory"/>
+    <filter class="solr.LowerCaseFilterFactory"/>
+      </analyzer>
     </fieldType>
     <!-- *** This fieldType is used by Sunspot! *** -->
     <fieldType name="boolean" class="solr.BoolField" omitNorms="true"/>

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

@@ -0,0 +1,78 @@
+
+.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/widget/bulletins_controller.rb

@@ -66,14 +66,75 @@ 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])
-    @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
+  
+    @part = PagePart.find(params[:part_id]) if !params[:part_id].blank?
+    
+    @title = @part.title_translations[I18n.locale.to_s]
+    
+    if !@part.blank? and @part.widget_data_count
+      @page_num = @part.widget_data_count
+    else
+      @page_num = 5
+    end
+    
+    date_now = Time.now
+
+    @selected_tag = Tag.find(params[:tag_id]).first
+    @bulletins = Bulletin.available_for_lang(I18n.locale).can_display.where(:tagged_ids => @selected_tag.id.to_s, :is_hidden => false).any_of( {deadline: nil,:postdate.lte => date_now} , {:deadline.gte => date_now,:postdate.lte => date_now} ).desc(:is_top, :postdate).page(params[:page]).per(@page_num) rescue nil
   end
   
   def reload_web_links
-    @selected_tag = Tag.find(params[:tag_id])
-    @web_links = WebLink.where(:name => @selected_tag.name).where(:is_hidden => false).desc(:is_top, sort).available_for_lang(I18n.locale).page(params[:page]).per(5) rescue nil
+  
+    @part = PagePart.find(params[:part_id]) if !params[:part_id].blank?
+    
+    if !@part.blank? and @part.widget_data_count
+      @page_num = @part.widget_data_count
+    else
+      @page_num = 5
+    end
+    
+    date_now = Time.now
+
+    @selected_tag = Tag.find(params[:tag_id]).first
+    @ModuleApp = ModuleApp.first(:conditions => {:key=>'web_resource'})
+    @link_selected_tag = Tag.first(:conditions => {:name => @selected_tag.name, :module_tag_id => @ModuleApp.id})
+    @web_links = WebLink.where(:tagged_ids => @link_selected_tag.id.to_s, :is_hidden => false).desc(:is_top,:created_at).available_for_lang(I18n.locale).page(params[:page]).per(@page_num) rescue nil
   end
 
   def bulletins_side_bar

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 , :tag_id => @selected_tag.id )  %>
+		<%= 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] )  %>
 	</li>
 <% end %>
 
 <div class='pagination'>
-	<%= link_to_previous_page @bulletins, 'Previous Page', :params => {:controller => 'widget/bulletins', :action => 'reload_bulletins', :tag_id => @selected_tag.id}, :remote => true, :class => 'previous' %>
-	<%= link_to_next_page @bulletins, 'Next Page', :params => {:controller => 'widget/bulletins', :action => 'reload_bulletins', :tag_id => @selected_tag.id}, :remote => true, :class => 'next' %>
+	<%= link_to_previous_page @bulletins, 'Previous Page', :params => {:controller => 'widget/bulletins', :action => 'reload_bulletins', :part_id => params[:part_id], :tag_id => [@selected_tag.id]}, :remote => true, :class => 'previous' %>
+	<%= link_to_next_page @bulletins, 'Next Page', :params => {:controller => 'widget/bulletins', :action => 'reload_bulletins', :part_id => params[:part_id], :tag_id => [@selected_tag.id]}, :remote => true, :class => 'next' %>
 </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(:id => tag.id), :remote => true, :class => ('active' if tag.eql?(@selected_tag)) %>
+	<%= 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)) %>
 </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', :tag_id => @selected_tag.id}, :remote => true, :class => 'previous' %>
-	<%= link_to_next_page @web_links, 'Next Page', :params => {:controller => 'widget/bulletins', :action => 'reload_web_links', :tag_id => @selected_tag.id}, :remote => true, :class => 'next' %>
+	<%= link_to_previous_page @web_links, 'Previous Page', :params => {:controller => 'widget/bulletins', :action => 'reload_web_links', :part_id => params[:part_id], :tag_id => @selected_tag.id}, :remote => true, :class => 'previous' %>
+	<%= link_to_next_page @web_links, 'Next Page', :params => {:controller => 'widget/bulletins', :action => 'reload_web_links', :part_id => params[:part_id], :tag_id => @selected_tag.id}, :remote => true, :class => 'next' %>
 </div>

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

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

@@ -0,0 +1,3 @@
+$('#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

@@ -35,6 +35,6 @@ en:
     update_bulletin_category_success: Update Category Successfully
     url: URL
     widget:
-      bulletins_and_web_links: Bulletins and Web Resources
+      bulletins_and_web_links: Differential Nav.
       index: Index
       search: Search

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

@@ -35,6 +35,6 @@ zh_tw:
     update_bulletin_category_success: 更新類別成功
     url: 連結位置
     widget:
-      bulletins_and_web_links: 索引
+      bulletins_and_web_links: 分眾頁籤
       index: 索引
       search: 搜尋

vendor/built_in_modules/announcement/init.rb

@@ -29,7 +29,8 @@ module Announcement
 
     widgets do
       default_widget do
-        query 'Bulletin.any_of( {deadline: nil,:postdate.lte => Time.now} , {:deadline.gte => Time.now,:postdate.lte => Time.now} )'
+	  sorting 'desc(:postdate)'
+        query 'Bulletin.available_for_lang(I18n.locale).any_of( {deadline: nil,:postdate.lte => Time.now} , {:deadline.gte => Time.now,:postdate.lte => Time.now} )'
         enable ["typeA","typeB_style3","typeC"]
         image :image
         field :postdate
@@ -51,6 +52,11 @@ 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

@@ -1,50 +0,0 @@
-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,6 +14,7 @@ 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
@@ -30,6 +31,7 @@ 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
@@ -40,7 +42,5 @@ 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,12 +1 @@
-<% #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,4 +1,34 @@
 <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| %>
@@ -62,11 +92,18 @@
     </div>
    
     <div class="form-actions">
-      <%= f.submit t('submit'), class: 'btn btn-primary' %>
+      <%= f.submit t('submit'), class: 'btn btn-primary', :id => 'button-mail' %>
       <%= 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>Thank you for your email, we will get back to you soon.</h3>
+<h3><%= @acknowledgement.content.html_safe%></h3>

vendor/built_in_modules/dictionary/.gitignore

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

vendor/built_in_modules/dictionary/Gemfile

@@ -0,0 +1,17 @@
+source "http://rubygems.org"
+
+# Declare your gem's dependencies in archive.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 'ruby-debug19', :require => 'ruby-debug'

vendor/built_in_modules/dictionary/MIT-LICENSE

@@ -0,0 +1,20 @@
+Copyright 2012 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/dictionary/README.rdoc

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

vendor/built_in_modules/dictionary/Rakefile

@@ -0,0 +1,39 @@
+#!/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    = 'Archive'
+  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/dictionary/app/controllers/application_controller.rb

@@ -0,0 +1,23 @@
+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/dictionary/app/controllers/panel/dictionary/back_end/dictionary_vocab_categorys_controller.rb

@@ -0,0 +1,144 @@
+class Panel::Dictionary::BackEnd::DictionaryVocabCategorysController < OrbitBackendController  
+  include OrbitControllerLib::DivisionForDisable
+
+  before_filter :for_app_manager,:except => [:index,:get_categorys_json,:get_dictionary_vocabs_json]
+
+  before_filter :force_order_for_visitor,:only=>[:index,:get_categorys_json,:get_dictionary_vocabs_json]
+  before_filter :force_order_for_user,:except => [:index,:get_categorys_json,:get_dictionary_vocabs_json]
+  before_filter :for_app_sub_manager,:except => [:index,:get_categorys_json,:get_dictionary_vocabs_json]
+  
+  def index
+    @dictionary_vocab_categorys =  get_categories_for_index("DictionaryVocabCategory")
+    @dictionary_vocab_category = DictionaryVocabCategory.new(:display => 'List')
+  
+    @url = panel_dictionary_back_end_dictionary_vocab_categorys_path
+  
+    respond_to do |format|
+      format.html # index.html.erb
+      format.js
+    end
+  end
+
+  def show
+    @dictionary_vocab_category = DictionaryVocabCategory.find(params[:id])
+
+    respond_to do |format|
+      format.html # show.html.erb
+      format.js
+    end
+  end
+
+  # GET /dictionary_vocabs/new
+  # GET /dictionary_vocabs/new.xml
+  def new
+    @dictionary_vocab_category = DictionaryVocabCategory.new(:display => 'List')
+
+    respond_to do |format|
+      format.html # new.html.erb
+      format.js
+    end
+  end
+  
+  # GET /dictionary_vocabs/1/edit
+  def edit
+    @dictionary_vocab_category = DictionaryVocabCategory.find(params[:id])
+  
+    @url = panel_dictionary_back_end_dictionary_vocab_category_path(@dictionary_vocab_category)
+
+    respond_to do |format|
+      format.html
+      format.js
+    end
+  end
+
+  # POST /dictionary_vocabs
+  # POST /dictionary_vocabs.xml
+  def create
+    @dictionary_vocab_category = DictionaryVocabCategory.new(params[:dictionary_vocab_category])
+
+    respond_to do |format|
+      if @dictionary_vocab_category.save
+        format.html { redirect_to(panel_dictionary_back_end_dictionary_vocab_categorys_url, :notice => t('dictionary_vocab_category.create_dictionary_vocab_category_success')) }
+        format.js
+      else
+        format.html { render :action => "new" }
+        format.js { render action: "new" }
+      end
+    end
+  end
+
+  # PUT /dictionary_vocabs/1
+  # PUT /dictionary_vocabs/1.xml
+  def update
+    @dictionary_vocab_category = DictionaryVocabCategory.find(params[:id])
+  
+    @url = panel_dictionary_back_end_dictionary_vocab_category_path(@dictionary_vocab_category)
+
+    respond_to do |format|
+      if @dictionary_vocab_category.update_attributes(params[:dictionary_vocab_category])
+        format.html { redirect_to(panel_dictionary_back_end_dictionary_vocab_categorys_url, :notice => t('dictionary_vocab_category.update_dictionary_vocab_category_success')) }
+        # format.xml  { head :ok }
+        format.js
+      else
+        format.html { render :action => "edit" }
+        format.js { render :action => "edit" }
+      end
+    end
+  end
+
+  # DELETE /dictionary_vocabs/1
+  # DELETE /dictionary_vocabs/1.xml
+  def destroy
+    @dictionary_vocab_category = DictionaryVocabCategory.find(params[:id])
+    @dictionary_vocab_category.disable = @dictionary_vocab_category.disable ? false : true
+
+    if @dictionary_vocab_category.save! 
+      respond_to do |format|
+        flash[:notice] = t("update.success_")
+        # flash[:error] +=  @dictionary_vocab_category.disable ?  t(:enable) : t(disable)
+        format.html { redirect_to(panel_archive_back_end_dictionary_vocab_categorys_url) }
+        # format.xml  { head :ok }
+        format.js 
+      end
+    else
+      flash[:error] = t("update.fail")
+      format.html { render :action => "index" }
+    end
+  end
+
+  def get_categorys_json
+    categorys = DictionaryVocabCategory.all
+    data = Array.new
+
+    categorys.each do |c|
+      data << {
+        category: c.title,
+        link: "#{url_for( :action => "index",
+                          :controller => "panel/dictionary/front_end/dictionary_vocabs",
+                          :format => :rss,
+                          :only_path => false,
+                          :inner=>true,
+                          :category_id => c )}"
+      }
+    end
+
+    render :json => JSON.pretty_generate(data)
+  end
+
+  def get_dictionary_vocabs_json
+    dictionary_vocab = DictionaryVocabCategory.find(params[:dictionary_vocab_category_id]).dictionary_vocabs
+    p dictionary_vocab
+    data = Array.new
+
+    dictionary_vocab.each do |b|
+
+      data << {
+        title: b.title,
+        link: "http://#{request.host_with_port}#{panel_dictionary_front_end_dictionary_vocab_path(b, :category_id => b.dictionary_vocab_category.id)}",
+        tag: b.sorted_tags.to_a,
+      }
+    end
+
+    render :json => JSON.pretty_generate(data)
+  end
+end

vendor/built_in_modules/dictionary/app/controllers/panel/dictionary/back_end/dictionary_vocabs_controller.rb

@@ -0,0 +1,72 @@
+class Panel::Dictionary::BackEnd::DictionaryVocabsController < OrbitBackendController
+  # before_filter :for_app_manager,:except => [:index,:show] 
+  include OrbitControllerLib::DivisionForDisable
+
+  before_filter :force_order_for_visitor,:only=>[:index]
+  before_filter :force_order_for_user,:except => [:index]
+
+  before_filter :for_app_sub_manager,:except => [:index]
+  before_filter :only => [ :new,:edit,:update,:create] do |controller|
+    controller.get_categorys('DictionaryVocabCategory')
+  end
+  
+  def index
+    @vocabs =  DictionaryVocab.all
+  end
+
+  def show
+    @vocab = DictionaryVocab.find(params[:id])
+    # @comment = @market_item.comments.build
+    respond_to do |format|
+      format.html # show.html.erb
+      format.xml  { render :xml => @vocab }
+    end
+  end
+
+  def new
+    @vocab = DictionaryVocab.new
+    @categories = get_categories_for_index("DictionaryVocabCategory").where(disable: false)
+
+    respond_to do |format|
+      format.html # new.html.erb
+      format.xml  { render xml: @vocab}
+    end
+  end
+  
+  def create
+    @vocab = DictionaryVocab.new(params[:dictionary_vocab])
+    @vocab.create_user_id = current_user.id
+    @vocab.update_user_id = current_user.id
+    @categories = get_categories_for_index("DictionaryVocabCategory")
+
+    if @vocab.save
+      flash[:success] = "Success!"
+      redirect_to :action => :index
+    else
+      render 'new'
+    end 
+  end
+
+  def edit
+    @vocab = DictionaryVocab.find(params[:id])
+    @categories = DictionaryVocabCategory.all
+  end
+
+  def update
+    @vocab = DictionaryVocab.find(params[:id])
+    @vocab.update_attributes(params[:dictionary_vocab])
+
+    redirect_to :action => :index
+  end
+  
+  def destroy
+    @vocab = DictionaryVocab.find(params[:id])
+    @vocab.destroy
+    # @market_item.save
+    respond_to do |format|
+      format.html { redirect_to(panel_dictionary_back_end_dictionary_vocabs_url) }
+      format.js
+    end
+  end
+
+end

vendor/built_in_modules/dictionary/app/controllers/panel/dictionary/front_end/dictionary_vocabs_controller.rb

@@ -0,0 +1,99 @@
+class Panel::Dictionary::FrontEnd::DictionaryVocabsController < OrbitWidgetController
+  include AdminHelper
+
+  def initialize
+    super
+    @app_title = 'dictionary_vocabs'
+  end
+
+  def index
+    @item = Page.find(params[:page_id])
+    @title = @item.title
+    if !@item.frontend_data_count.blank?
+      @page_num = @item.frontend_data_count
+    else
+      @page_num = 10
+    end
+
+    if params[:search_query].empty?
+      @vocabs = DictionaryVocab.desc(:created_at).page(params[:page_main]).per(@page_num)
+    else
+      @vocabs = DictionaryVocab.solr_search do 
+        fulltext params[:search_query]
+      end.results
+    end
+
+    if !params[:category_id].blank?
+      @vocabs = DictionaryVocab.default_sort(params[:sort]).can_display.where(:dictionary_vocab_category_id.in => params[:category_id]).desc( :is_top ).page( params[:page_main] ).per(@page_num)
+      @current_category = DictionaryVocabCategory.from_id(params[:category_id]) rescue nil
+    end
+
+    if params[:sort]
+      @vocabs = get_sorted_and_filtered('dictionary_vocab', nil, @vocabs)
+    end
+    # @item = Page.find(params[:page_id])
+    # @title = @item.title
+    # if !@item.frontend_data_count.blank?
+    #   @page_num = @item.frontend_data_count
+    # else
+    #   @page_num = 10
+    # end
+
+    # date_now = Time.now
+    # @archive_file_categorys = ArchiveFileCategory.all
+    # # @archive_files = ArchiveFile.where( :is_hidden => false ).desc(:is_top).page(params[:page]).per(@page_num)
+
+    # if !params[:category_id].blank? && !params[:tag_id].blank?
+    #   @archive_files = @archive_files.default_sort(params[:sort]).can_display.where(:archive_file_category_id.in => params[:category_id], :tagged_ids.in => params[:tag_id]).desc( :is_top ).page( params[:page_main] ).per(@page_num)
+
+    #     @current_category = ArchiveFileCategory.from_id(params[:category_id]) rescue nil
+
+    # elsif !params[:category_id].blank?
+    #   @archive_files = ArchiveFile.default_sort(params[:sort]).can_display.where(:archive_file_category_id.in => params[:category_id]).desc( :is_top ).page( params[:page_main] ).per(@page_num)
+    #   @current_category = ArchiveFileCategory.from_id(params[:category_id]) rescue nil
+    # elsif !params[:tag_id].blank?
+    #   @archive_files = ArchiveFile.default_sort(params[:sort]).can_display.where(:tagged_ids.in => params[:tag_id]).desc( :is_top ).page( params[:page_main] ).per(@page_num)
+    # else
+    #   @archive_files = ArchiveFile.default_sort(params[:sort]).can_display.desc( :is_top ).page( params[:page_main] ).per(@page_num)
+    # end
+      
+    # get_categorys
+
+    # if params[:sort]
+    #   @archive_files = get_sorted_and_filtered('archive_file', nil, @archive_files)
+    # end
+  end
+
+  def show
+    @vocab = DictionaryVocab.find(params[:id])
+  end
+
+  # protected
+
+  # def reload_archive_files
+  #   @item = Page.find(params[:page_id])
+  #   @title = @item.title
+  #   if @item.frontend_data_count
+  #     @page_num = @item.frontend_data_count
+  #   else
+  #     @page_num = 0
+  #   end
+  #   date_now = Time.now
+  #   @archive_file_categorys = ArchiveFileCategory.all
+  #   # @archive_files = ArchiveFile.where( :is_hidden => false ).desc(:is_top).page(params[:page]).per(@page_num)
+
+  #   if !params[:category_id].blank?
+  #     @archive_files = ArchiveFile.can_display.where(:archive_file_category_id => params[:category_id]).desc( :is_top ).page( params[:page_main] ).per(@page_num)
+  #     @current_category = ArchiveFileCategory.from_id(params[:category_id]) rescue nil
+  #   elsif !params[:tag_id].blank?
+  #     @archive_files = ArchiveFile.can_display.where(:tagged_ids => params[:tag_id]).desc( :is_top ).page( params[:page_main] ).per(@page_num)
+  #   else
+  #     @archive_files = ArchiveFile.can_display.desc( :is_top ).page( params[:page_main] ).per(@page_num)
+  #   end
+  #   get_categorys
+  # end
+
+  # def get_categorys
+  #   @archive_file_categorys = ArchiveFileCategory.excludes('disabled' => true)
+  # end
+end

vendor/built_in_modules/dictionary/app/controllers/panel/dictionary/widget/dictionary_vocabs_controller.rb

@@ -0,0 +1,15 @@
+class Panel::Dictionary::Widget::DictionaryVocabsController < OrbitWidgetController
+  include AdminHelper
+
+  def initialize
+    super
+    @app_title = 'dictionary_vocabs'
+  end
+
+  def get_categorys
+    @dictionary_vocab_categorys = DictionaryVocabCategory.excludes('disable' => true)
+  end
+
+  def dictionary_search_block
+  end
+end

vendor/built_in_modules/dictionary/app/helpers/panel/dictionary/back_end/dictionary_vocab_categorys_helper.rb

@@ -0,0 +1,20 @@
+module Panel::Dictionary::BackEnd::DictionaryVocabCategorysHelper
+include ActionView::Helpers::UrlHelper
+
+  
+  def show_anc_cate_permission_link(dictionary_vocab_category)
+    type = 'submit'
+    oa = dictionary_vocab_category.get_object_auth_by_title(type)
+    if oa.nil?
+      dictionary_vocab_category.object_auths.new(title: type ).save
+      oa = dictionary_vocab_category.get_object_auth_by_title(type)
+    end
+     link_to t(:category_auth),admin_object_auth_ob_auth_path(oa)
+  end
+
+  def show_toggle_dictionary_btn(dictionary_vocab_category)
+    trans_path = "dictionary.backend"
+    return dictionary_vocab_category.disable ? t("#{trans_path}.close") : t("#{trans_path}.open")
+  end
+
+end

vendor/built_in_modules/dictionary/app/models/dictionary_vocab.rb

@@ -0,0 +1,73 @@
+# encoding: utf-8
+class DictionaryVocab
+  include Mongoid::Document
+  include Mongoid::Timestamps
+  include Mongoid::MultiParameterAttributes
+  include Mongoid::Sortable
+  include Sunspot::Mongo
+
+  BelongsToCategory =  :dictionary_vocab_category
+  include OrbitCoreLib::BelongsToCategoryMayDisable
+
+  # PAYMENT_TYPES = @site_valid_locales
+
+  # include OrbitTag::Taggable
+  # taggable
+
+  field :word, :type => String
+  field :definition, :type => String
+
+  field :create_user_id
+  field :update_user_id
+
+  # field :is_top, :type => Boolean, :default => false
+  # field :is_hot, :type => Boolean, :default => false
+  field :is_hidden, :type => Boolean, :default => false
+
+  scope :can_display, where(is_hidden: false)
+    
+  searchable do
+    text :word
+  end
+
+  belongs_to :dictionary_vocab_category
+
+  # has_many :archive_file_multiples, :autosave => true, :dependent => :destroy
+
+  # accepts_nested_attributes_for :archive_file_multiples, :allow_destroy => true
+
+  # after_save :save_archive_file_multiples
+
+  searchable do
+    text :word, :definition
+
+    boolean :frontend_search do
+      !is_hidden
+    end
+  end
+
+
+ #  def self.widget_datas
+
+	#   where( :is_hidden => false ).desc(:is_top, :title)
+
+ #  end
+
+ #  def is_top?
+ #    self.is_top
+ #  end
+
+
+ #  def get_file_icon( file_data )
+ #    file_icon = "<span class=\"o-archives-file-type\">#{file_data.split('.')[-1]}</span>".html_safe
+ #  end
+
+ #  def save_archive_file_multiples
+	# self.archive_file_multiples.each do |t|
+	#   if t.should_destroy
+	# 	t.destroy
+	#   end
+ #    end
+ #  end
+
+end

vendor/built_in_modules/dictionary/app/models/dictionary_vocab_category.rb

@@ -0,0 +1,42 @@
+# encoding: utf-8
+class DictionaryVocabCategory
+  include Mongoid::Document
+  include Mongoid::Timestamps
+  include OrbitCoreLib::ObjectAuthable
+  include OrbitCoreLib::ObjectDisable
+  include Sunspot::Mongo
+  include Mongoid::MultiParameterAttributes
+  APP_NAME = 'Dictionary'
+  ObjectAuthTitlesOptions = %W{submit_new fact_check}
+  AfterObjectAuthUrl = '/panel/dictionary/back_end/dictionary_vocab_categorys'
+  
+  field :disable, type: Boolean, :default => false
+  field :display
+  field :key  
+  field :title, localize: true
+  
+  has_many :dictionary_vocabs
+
+  # searchable do
+  #   text :titles do
+  #     title_translations.to_a.collect{|t| t[1]}
+  #   end
+
+  #   boolean :frontend_search do
+  #     !disable
+  #   end
+
+  #   text :files do
+  #     archive_files.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)
+    DictionaryVocabCategory.find(id) rescue nil
+  end
+  
+end

vendor/built_in_modules/dictionary/app/views/panel/dictionary/back_end/dictionary_vocab_categorys/_dictionary_vocab_category.html.erb

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

vendor/built_in_modules/dictionary/app/views/panel/dictionary/back_end/dictionary_vocab_categorys/_form.html.erb

@@ -0,0 +1,29 @@
+<% # encoding: utf-8 %>
+
+<%= form_for(@dictionary_vocab_category, :remote => true, :url => @url) do |f| %>
+
+  <h2><%= (@dictionary_vocab_category.new_record? ? t(:new, scope: :dictionary) : t(:edit, scope: :dictionary)) %></h2>
+
+  <div id="widget-title">
+    <%= f.label t(:key, scope: :dictionary) %>
+    <%= 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}", "#{t(:name)} - #{I18nVariable.from_locale(locale)}", :class => 'control-label' %>
+          <div class="controls">
+            <%= f.text_field locale, :class =>' input-xxlarge', :value => (@dictionary_vocab_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/dictionary/app/views/panel/dictionary/back_end/dictionary_vocab_categorys/create.js.erb

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

vendor/built_in_modules/dictionary/app/views/panel/dictionary/back_end/dictionary_vocab_categorys/destroy.js.erb

@@ -0,0 +1 @@
+$("#<%= dom_id @dictionary_vocab_category %>").find(".dictionary_toggle").text("<%= show_toggle_archive_btn(@dictionary_vocab_category) %>");

vendor/built_in_modules/dictionary/app/views/panel/dictionary/back_end/dictionary_vocab_categorys/edit.js.erb

@@ -0,0 +1 @@
+$("#form > form").replaceWith("<%= j render "form" %>");

vendor/built_in_modules/dictionary/app/views/panel/dictionary/back_end/dictionary_vocab_categorys/index.html.erb

@@ -0,0 +1,19 @@
+<%= flash_messages %>
+
+<table id="dictionary_vocab_categorys" class="table main-list">
+  <thead>
+    <tr>
+      <th class="span1-2"><%= t(:key, scope: :dictionary) %></th>
+      <% @site_valid_locales.each do |locale| %>
+      <th class="span1-2"><%= I18nVariable.first(:conditions => { :key => locale })[I18n.locale] %></th>
+      <% end %>
+    </tr>
+  </thead>
+  <tbody>
+
+  <%= render :partial => 'dictionary_vocab_category', :collection => @dictionary_vocab_categorys %>
+  
+  </tbody>
+</table>
+
+<div id="form"><%= render :partial => "form" %></div>

vendor/built_in_modules/dictionary/app/views/panel/dictionary/back_end/dictionary_vocab_categorys/new.js.erb

@@ -0,0 +1 @@
+$("#form > form").replaceWith("<%= j render "form" %>");

vendor/built_in_modules/dictionary/app/views/panel/dictionary/back_end/dictionary_vocab_categorys/update.js.erb

@@ -0,0 +1,4 @@
+$("#<%= dom_id @dictionary_vocab_category %>").replaceWith("<%= j render :partial => 'dictionary_vocab_category', :collection => [@dictionary_vocab_category] %>");
+<% @dictionary_vocab_category = DictionaryVocabCategory.new(:display => 'List') # reset for new form %>
+$(".edit_dictionary_vocab_category").replaceWith("<%= j render "form" %>")
+$(".new_dictionary_vocab_category")[0].reset();

vendor/built_in_modules/dictionary/app/views/panel/dictionary/back_end/dictionary_vocabs/_form.html.erb

@@ -0,0 +1,17 @@
+<br />
+<div class="site-map"> 
+   <h4><%= t :category, :scope => :dictionary %></h4>
+  <%= f.collection_select :dictionary_vocab_category_id, @categories, :id, :title %>
+</div>	
+<div class="site-map"> 
+   <h4><%= t :word, :scope => :dictionary %></h4>
+   <%= f.text_field :word %>    
+</div>	
+<div class="site-map">
+   <h4><%= t :definition, :scope => :dictionary %></h4> 
+   <%= f.text_field :definition %>  
+</div> 
+<br />
+<div class="site-map">
+   <%= f.submit t('submit'), class: 'btn btn-primary'%>
+</div>

vendor/built_in_modules/dictionary/app/views/panel/dictionary/back_end/dictionary_vocabs/edit.html.erb

@@ -0,0 +1,3 @@
+<%= form_for @vocab, url: panel_dictionary_back_end_dictionary_vocab_path(@vocab) do |f| %>
+  <%= render 'form', f: f %>
+<% end %>

vendor/built_in_modules/dictionary/app/views/panel/dictionary/back_end/dictionary_vocabs/index.html.erb

@@ -0,0 +1,32 @@
+    <% flash.each do |key, value| %>
+       <div class="alert alert-<%= key %>"><%= value %></div>
+    <% end %>
+    <table class="table table-striped">
+
+      <thead>
+        <tr>
+          <th class="span2"><%= t :category, :scope => :dictionary %></th>
+          <th class="span2"><%= t :word, :scope => :dictionary %></th>
+          <th class="span2"><%= t :time, :scope => :dictionary %></th>
+          <th class="span2"></th>
+        </tr>
+      </thead>
+
+      <tbody>
+        <% @vocabs.each do |vocab| %>
+            <tr>
+              <td><%= vocab.dictionary_vocab_category.title %></td>
+              <td><%= link_to truncate(vocab.word,length: 25), panel_dictionary_back_end_dictionary_vocab_path(vocab) %></td>
+              <td><% if vocab.created_at > Time.now.beginning_of_day %>
+                      <%="#{time_ago_in_words(vocab.created_at)}"%>
+                      <%=t :ago,:scope => :dictionary%>
+                  <% else %>
+                    <%= vocab.created_at.strftime("%Y/%m/%d") %>
+                  <% end %></td>        
+              <td><%= link_to t(:edit), edit_panel_dictionary_back_end_dictionary_vocab_path(vocab) %> |
+                  <%= link_to t(:delete), panel_dictionary_back_end_dictionary_vocab_path(vocab), method: :delete , :data => { :confirm => 'Are you sure?'} %></td>
+            </tr>
+        <% end %>
+      </tbody>
+
+    </table>

vendor/built_in_modules/dictionary/app/views/panel/dictionary/back_end/dictionary_vocabs/new.html.erb

@@ -0,0 +1,15 @@
+<% if @vocab.errors.any? %>
+  <div id="error_explanation">
+    <div class="alert alert-error">
+      此表單包含了 <%= @vocab.errors.count.to_s + "個錯誤" %>.
+    </div>
+    <ul>
+    <% @vocab.errors.full_messages.each do |msg| %>
+      <li>* <%= msg %></li>
+    <% end %>
+    </ul>
+  </div>
+<% end %>
+<%= form_for @vocab, url: panel_dictionary_back_end_dictionary_vocabs_path do |f| %>
+  <%= render 'form', f: f %>
+<% end %>

vendor/built_in_modules/dictionary/app/views/panel/dictionary/back_end/dictionary_vocabs/show.html.erb

@@ -0,0 +1,29 @@
+    <table class="table"  align ="center">
+        <tr>
+          <td ><%= t :category, :scope => :dictionary %></td>
+          <td><%= @vocab.dictionary_vocab_category.key %></td>
+        </tr>
+        <tr>
+          <td ><%= t :word, :scope => :dictionary %></td>
+          <td><%= @vocab.word %></td>
+        </tr>
+        <tr>
+          <td ><%= t :definition, :scope => :dictionary %></td>
+          <td><pre><%= @vocab.definition %></pre></td>
+        </tr>
+        <tr>
+          <td><%= t :time, :scope => :dictionary %></td>
+          <td><% if @vocab.created_at > Time.now.beginning_of_day %>
+                      <%="#{time_ago_in_words(@vocab.created_at)}"%>
+                      <%=t :ago,:scope => :dictionary%>
+                  <% else %>
+                    <%= @vocab.created_at.strftime("%Y/%m/%d") %>
+                  <% end %></td>
+        </tr>  
+        <tr>
+          <td ></td>
+          <td><%= link_to t(:edit),edit_panel_dictionary_back_end_dictionary_vocab_path(@vocab) %> |
+			<%= link_to t(:delete), panel_dictionary_back_end_dictionary_vocab_path(@vocab), method: :delete , :data => { :confirm => 'Are you sure?'} %> |
+			<%= link_to t(:back), panel_dictionary_back_end_dictionary_vocabs_path%></td>
+        </tr>
+    </table>

vendor/built_in_modules/dictionary/app/views/panel/dictionary/front_end/dictionary_vocabs/index.html.erb

@@ -0,0 +1,26 @@
+<div class="row">
+  <div class="span8">
+    <table class="table">
+
+      <thead>
+        <tr>
+          <th class="span2"><%=  sortable(:category, t("dictionary.category"))%></th>
+          <th class="span2"><%= t :word, :scope => :dictionary %></th>
+          <th class="span2"><%= t :definition, :scope => :dictionary %></th>
+        </tr>
+      </thead>
+
+      <tbody>
+        <% @vocabs.each do |vocab| %>
+            <tr>
+              <td><%= vocab.dictionary_vocab_category.title %></td>
+              <td><%= link_to truncate(vocab.word,length: 25), panel_dictionary_front_end_dictionary_vocab_path(vocab) %></td>
+              <td><%= link_to truncate(vocab.definition,length: 25), panel_dictionary_front_end_dictionary_vocab_path(vocab) %></td>
+            </tr>
+        <% end %>
+      </tbody>
+    </table>
+  </div>
+</div>
+
+<%= paginate(@vocabs, :param_name => :page_main, :params => {:inner => 'false'} ) rescue nil %>

vendor/built_in_modules/dictionary/app/views/panel/dictionary/front_end/dictionary_vocabs/show.html.erb

@@ -0,0 +1,31 @@
+<div class="row">
+  <div class="span8">
+    <table class="table"  align ="center">
+        <tr>
+          <td ><%= t :category, :scope => :dictionary %></td>
+          <td><%= @vocab.dictionary_vocab_category.title %></td>
+        </tr>
+        <tr>
+          <td ><%= t :word, :scope => :dictionary %></td>
+          <td><%= @vocab.word %></td>
+        </tr>
+        <tr>
+          <td ><%= t :definition, :scope => :dictionary %></td>
+          <td><pre><%= @vocab.definition %></pre></td>
+        </tr>
+        <tr>
+          <td><%= t :time, :scope => :dictionary %></td>
+          <td><% if @vocab.created_at > Time.now.beginning_of_day %>
+                      <%="#{time_ago_in_words(@vocab.created_at)}"%>
+                      <%=t :ago,:scope => :dictionary%>
+                  <% else %>
+                    <%= @vocab.created_at.strftime("%Y/%m/%d") %>
+                  <% end %></td>
+        </tr>  
+        <tr>
+          <td ></td>
+          <td><%= link_to t(:back), panel_dictionary_front_end_dictionary_vocabs_path%></td>
+        </tr>
+    </table>
+  </div>
+</div>

vendor/built_in_modules/dictionary/app/views/panel/dictionary/widget/dictionary_vocabs/dictionary_search_block.html.erb

@@ -0,0 +1,6 @@
+<%= form_tag panel_dictionary_front_end_dictionary_vocabs_path, method: :get do %>
+  <p>
+    <%= text_field_tag :search_query, params[:search_query],{ value: (params[:search_query].blank? ? '' : params[:search_query]), placeholder: t("dictionary.widget.search") }%>
+    <%= submit_tag t("dictionary.widget.search"), name: nil %>
+  </p>
+<% end %>

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

@@ -0,0 +1,15 @@
+en:
+  dictionary:
+    backend: 
+      close: Close
+      open: Open
+    frontend:
+      dictionary: Dictionary Front－end
+    dictionary: Dictionary
+    category: Category
+    word: Word
+    definition: Definition
+    time: Created time
+    ago: ago
+    widget:
+      search: Search

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

@@ -0,0 +1,18 @@
+zh_tw:
+  dictionary:
+    backend: 
+      close: 關閉
+      open: 開啟
+    frontend:
+      dictionary: 字典前台
+    dictionary: 字彙辭典
+    category: 類別
+    word: 字彙中文
+    definition: 英文定義
+    time: 建立時間
+    ago: 前
+    new: 新增
+    edit: 修改
+    key: 索引值
+    widget:
+      search: 搜尋

vendor/built_in_modules/dictionary/config/routes.rb

@@ -0,0 +1,27 @@
+Rails.application.routes.draw do
+  namespace :panel do
+    namespace :dictionary do
+      namespace :back_end do
+        resources :dictionary_vocabs do
+          collection do
+            get 'delete'
+          end
+        end
+        resources :dictionary_vocab_categorys
+        resources :tags
+      end
+
+      namespace :front_end do
+        match "dictionary_vocabs", to: "dictionary_vocabs#index"
+        resources :dictionary_vocabs
+      end
+      
+      namespace :widget do
+        match "dictionary_search_block", to: "dictionary_vocabs#dictionary_search_block"
+        match "dictionary_vocabs",       to: "dictionary_vocabs#index"
+        resources :dictionary_vocabs
+      end
+    end
+  end
+  match "/appfront/*path" => redirect("/panel/*path")
+end

vendor/built_in_modules/dictionary/dictionary.gemspec

@@ -0,0 +1,23 @@
+$:.push File.expand_path("../lib", __FILE__)
+
+# Maintain your gem's version:
+require "dictionary/version"
+
+# Describe your gem and declare its dependencies:
+Gem::Specification.new do |s|
+  s.name        = "dictionary"
+  s.version     = Archive::VERSION
+  s.authors     = ["TODO: Your name"]
+  s.email       = ["TODO: Your email"]
+  s.homepage    = "TODO"
+  s.summary     = "TODO: Summary of Dictionary."
+  s.description = "TODO: Description of Dictionary."
+
+  s.files = Dir["{app,config,db,lib}/**/*"] + ["MIT-LICENSE", "Rakefile", "README.rdoc"]
+  s.test_files = Dir["test/**/*"]
+
+  s.add_dependency "rails", "~> 3.1.4"
+  # s.add_dependency "jquery-rails"
+
+  s.add_development_dependency "sqlite3"
+end

vendor/built_in_modules/dictionary/dictionary.json

@@ -0,0 +1,12 @@
+{
+	"title": "dictionary",
+  "version": "0.1",
+  "organization": "Rulingcom",
+  "author": "RD dep",
+  "intro": "Archive",
+  "update_info": "Some info",
+  "create_date": "11-11-2011",
+	"app_pages":  ["dictionary_vocabs"],
+	"widgets": {"dictionary_vocabs":[]},
+	"enable_frontend": true
+}

vendor/built_in_modules/dictionary/init.rb

@@ -0,0 +1,88 @@
+module Dictionary
+  OrbitApp.registration "Dictionary",:type=> 'ModuleApp' do
+    module_label 'dictionary.dictionary'
+    base_url File.expand_path File.dirname(__FILE__)    
+
+    # personal_plugin :enable => true,:path=>"panel/archive/plugin/profile",:i18n=>'archive.archive'
+    
+    version "0.1"
+    organization "Rulingcom"
+    author "RD dep"
+    intro "I am intro"
+    update_info 'some update_info'
+
+    front_end do
+      app_page 'dictionary_vocabs' do 
+        frontend_i18n "dictionary.frontend.dictionary"
+      end
+    end
+
+    category ["DictionaryVocabCategory"]
+
+    taggable
+
+    widgets do
+      # default_widget do
+      #   query 'ArchiveFile.all'
+      #   field :category
+      #   link_field :title,{:method => 'panel_archive_front_end_archive_file_path',:args=>:self}
+      #   link_field :archive_file_category_with_title,{:method => 'panel_archive_front_end_archive_files_path',:args=>{:category_id => [:archive_file_category,:id]}}
+      # end
+
+      categories_query 'DictionaryVocabCategory.all'
+      # tags_query 'ArchiveTag.all'
+
+      # customize_widget "index" do 
+      #   widget_i18n "archive.widget.index"
+      #   style ["1"]
+      # end
+
+      customize_widget "dictionary_search_block" do
+        widget_i18n "dictionary.widget.search"
+      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
+
+    
+    side_bar do
+      head_label_i18n  'dictionary.dictionary',:icon_class=>"icons-book"
+      available_for [:admin,:guest,:manager,:sub_manager]
+      active_for_controllers ({ :private => ['dictionary_vocab_categorys', 'dictionary_vocabs'] })
+      active_for_object_auth ['DictionaryVocabCategory'] 
+
+      head_link_path "panel_dictionary_back_end_dictionary_vocabs_path"
+
+      context_link 'all',
+                            :link_path=>"panel_dictionary_back_end_dictionary_vocabs_path" ,
+                            :priority=>1,
+                            :active_for_action=>{:dictionary_vocabs=>:index},
+                            :available_for => [:all]
+
+      context_link 'add', 
+                            :link_path => "new_panel_dictionary_back_end_dictionary_vocab_path",
+                            :priority  => 2,
+                            :active_for_action => { :dictionary_vocabs => :new },
+                            :available_for     => [:sub_manager]
+      
+      context_link 'categories',
+                            :link_path => "panel_dictionary_back_end_dictionary_vocab_categorys_path" ,
+                            :priority  => 3,
+                            :active_for_action => { :dictionary_vocab_categorys => :index },
+                            :available_for => [:manager]
+
+      # context_link 'tags',
+      #                       :link_path=>"admin_tags_path(:module_app_id => ModuleApp.first(conditions: {title: 'Archive'}))" ,
+      #                       :priority=>4,
+      #                       # :active_for_action=>{:bulletin_categorys=>:index},
+      #                       :available_for => [:manager]
+
+      context_link 'module_authorization',
+                            :link_path => "admin_module_app_manager_auth_proc_path(ModuleApp.first(conditions: {title: 'Dictionary'}))",
+                            :priority => 6,
+                            :active_for_app_auth => 'Dictionary'
+
+    end
+  end
+end

vendor/built_in_modules/dictionary/lib/dictionary.rb

@@ -0,0 +1,4 @@
+require "dictionary/engine"
+
+module Dictionary
+end

vendor/built_in_modules/dictionary/lib/dictionary/engine.rb

@@ -0,0 +1,4 @@
+module Dictionary
+  class Engine < Rails::Engine
+  end
+end

vendor/built_in_modules/dictionary/lib/dictionary/version.rb

@@ -0,0 +1,3 @@
+module Dictionary
+  VERSION = "0.0.1"
+end

vendor/built_in_modules/dictionary/lib/tasks/dictionary_tasks.rake

@@ -0,0 +1,4 @@
+# desc "Explaining what the task does"
+# task :dictionary do
+#   # Task goes here
+# end

vendor/built_in_modules/dictionary/script/rails

@@ -0,0 +1,6 @@
+#!/usr/bin/env ruby.exe
+#!/usr/bin/env ruby
+# This command will automatically be run when you run "rails" with Rails 3 gems installed from the root of your application.
+
+ENGINE_PATH = File.expand_path('../..',  __FILE__)
+load File.expand_path('../../test/dummy/script/rails',  __FILE__)

vendor/built_in_modules/dictionary/test/archive_test.rb

@@ -0,0 +1,7 @@
+require 'test_helper'
+
+class ArchiveTest < ActiveSupport::TestCase
+  test "truth" do
+    assert_kind_of Module, Archive
+  end
+end

vendor/built_in_modules/dictionary/test/dummy/Rakefile

@@ -0,0 +1,7 @@
+#!/usr/bin/env rake
+# Add your own tasks in files placed in lib/tasks ending in .rake,
+# for example lib/tasks/capistrano.rake, and they will automatically be available to Rake.
+
+require File.expand_path('../config/application', __FILE__)
+
+Dummy::Application.load_tasks

vendor/built_in_modules/dictionary/test/dummy/app/assets/javascripts/application.js

@@ -0,0 +1,9 @@
+// This is a manifest file that'll be compiled into including all the files listed below.
+// Add new JavaScript/Coffee code in separate files in this directory and they'll automatically
+// be included in the compiled file accessible from http://example.com/assets/application.js
+// It's not advisable to add code directly here, but if you do, it'll appear at the bottom of the
+// the compiled file.
+//
+//= require jquery
+//= require jquery_ujs
+//= require_tree .

vendor/built_in_modules/dictionary/test/dummy/app/assets/stylesheets/application.css

@@ -0,0 +1,7 @@
+/*
+ * This is a manifest file that'll automatically include all the stylesheets available in this directory
+ * and any sub-directories. You're free to add application-wide styles to this file and they'll appear at
+ * the top of the compiled file, but it's generally better to create a new file per style scope.
+ *= require_self
+ *= require_tree . 
+*/

vendor/built_in_modules/dictionary/test/dummy/app/controllers/application_controller.rb

@@ -0,0 +1,3 @@
+class ApplicationController < ActionController::Base
+  protect_from_forgery
+end

vendor/built_in_modules/dictionary/test/dummy/app/helpers/application_helper.rb

@@ -0,0 +1,2 @@
+module ApplicationHelper
+end