backup

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

.gitignore

@@ -11,7 +11,7 @@ public/assets
 public/index.html
 public/panel/**/*
 public/uploads/**/*
-solr
+solr/data
 tmp/**/*
 uploads/**/*
 
@@ -21,3 +21,4 @@ uploads/**/*
 
 .sass-cache/*
 *.supported
+mongoid.yml

Gemfile

@@ -15,6 +15,9 @@ gem 'jquery-rails', '2.1.4'
 gem 'jquery-ui-rails'
 gem "select2-rails", '3.3.1'
 gem 'kaminari', :git => 'git://github.com/amatsuda/kaminari.git'
+gem "acts_as_unvlogable"
+gem 'youtube_it'
+gem 'gotcha'
 
 # gem "memcached", "~> 1.4.3"
 # gem "memcache-client"
@@ -46,14 +49,14 @@ gem 'sinatra'
 gem 'sprockets'
 gem 'social-share-button'
 
-gem 'tinymce-rails'
+gem 'tinymce-rails', '3.5.8.3'
 gem 'therubyracer' if RUBY_PLATFORM.downcase.include?("linux")
 gem 'libv8', '~> 3.11.8' if RUBY_PLATFORM.downcase.include?("linux")
 gem 'mongoid-encryptor', :require => 'mongoid/encryptor'
-gem 'rb-readline' if RUBY_PLATFORM.downcase.include?("linux")
+gem 'rb-readline','~> 0.4.2' if RUBY_PLATFORM.downcase.include?("linux")
 
 
-gem "impressionist", :git => 'git://github.com/charlotte-ruby/impressionist.git'
+gem "impressionist",'1.2.0'
 #gem 'contacts'
 #gem 'event-calendar', :require => 'event_calendar'#, :git => 'git://github.com/elevation/event_calendar.git'
 
@@ -63,6 +66,8 @@ gem 'chinese_pinyin', '0.4.1'
 gem 'rmmseg-cpp-huacnlee', '0.2.9'
 gem 'redis-namespace'
 gem 'redis-search'
+gem 'syslog-logger'
+gem "recaptcha", :require => "recaptcha/rails"
 
 # Gems used only for assets and not required
 # in production environments by default.

Gemfile.lock

@@ -1,407 +0,0 @@
-GIT
-  remote: git://github.com/amatsuda/kaminari.git
-  revision: 2e09b5374fec33b57c6387ca7bac89ecaa60c9eb
-  specs:
-    kaminari (0.14.1)
-      actionpack (>= 3.0.0)
-      activesupport (>= 3.0.0)
-
-GIT
-  remote: git://github.com/charlotte-ruby/impressionist.git
-  revision: 0894f6a550a33f83f4937d655e9f0774521781e4
-  specs:
-    impressionist (1.2.0)
-      httpclient (~> 2.2)
-      nokogiri (~> 1.5)
-
-GEM
-  remote: http://rubygems.org/
-  specs:
-    actionmailer (3.2.12)
-      actionpack (= 3.2.12)
-      mail (~> 2.4.4)
-    actionpack (3.2.12)
-      activemodel (= 3.2.12)
-      activesupport (= 3.2.12)
-      builder (~> 3.0.0)
-      erubis (~> 2.7.0)
-      journey (~> 1.0.4)
-      rack (~> 1.4.5)
-      rack-cache (~> 1.2)
-      rack-test (~> 0.6.1)
-      sprockets (~> 2.2.1)
-    activemodel (3.2.12)
-      activesupport (= 3.2.12)
-      builder (~> 3.0.0)
-    activerecord (3.2.12)
-      activemodel (= 3.2.12)
-      activesupport (= 3.2.12)
-      arel (~> 3.0.2)
-      tzinfo (~> 0.3.29)
-    activeresource (3.2.12)
-      activemodel (= 3.2.12)
-      activesupport (= 3.2.12)
-    activesupport (3.2.12)
-      i18n (~> 0.6)
-      multi_json (~> 1.0)
-    arel (3.0.2)
-    attr_required (0.0.5)
-    bcrypt-ruby (3.0.0)
-    binding_of_caller (0.7.1)
-      debug_inspector (>= 0.0.1)
-    bourne (1.1.2)
-      mocha (= 0.10.5)
-    brakeman (1.9.2)
-      erubis (~> 2.6)
-      fastercsv (~> 1.5)
-      haml (~> 3.0)
-      highline (~> 1.6)
-      multi_json (~> 1.2)
-      ruby2ruby (~> 2.0)
-      ruby_parser (~> 3.1.1)
-      sass (~> 3.0)
-      terminal-table (~> 1.4)
-    bson (1.8.2)
-    bson_ext (1.8.2)
-      bson (~> 1.8.2)
-    builder (3.0.4)
-    capybara (2.0.2)
-      mime-types (>= 1.16)
-      nokogiri (>= 1.3.3)
-      rack (>= 1.0.0)
-      rack-test (>= 0.5.4)
-      selenium-webdriver (~> 2.0)
-      xpath (~> 1.0.0)
-    carrierwave (0.6.2)
-      activemodel (>= 3.2.0)
-      activesupport (>= 3.2.0)
-    carrierwave-mongoid (0.2.2)
-      carrierwave (~> 0.6.1)
-      mongoid (~> 2.1)
-    childprocess (0.3.8)
-      ffi (~> 1.0, >= 1.0.11)
-    chinese_pinyin (0.4.1)
-    chronic (0.9.0)
-    coderay (1.0.9)
-    coffee-rails (3.2.2)
-      coffee-script (>= 2.2.0)
-      railties (~> 3.2.0)
-    coffee-script (2.2.0)
-      coffee-script-source
-      execjs
-    coffee-script-source (1.4.0)
-    columnize (0.3.6)
-    database_cleaner (0.9.1)
-    debug_inspector (0.0.2)
-    debugger (1.2.4)
-      columnize (>= 0.3.1)
-      debugger-linecache (~> 1.1.1)
-      debugger-ruby_core_source (~> 1.1.7)
-    debugger-linecache (1.1.2)
-      debugger-ruby_core_source (>= 1.1.1)
-    debugger-ruby_core_source (1.1.8)
-    delorean (2.1.0)
-      chronic
-    devise (1.5.3)
-      bcrypt-ruby (~> 3.0)
-      orm_adapter (~> 0.0.3)
-      warden (~> 1.1)
-    diff-lcs (1.1.3)
-    encrypted_strings (0.3.3)
-    erubis (2.7.0)
-    exception_notification (3.0.1)
-      actionmailer (>= 3.0.4)
-    execjs (1.4.0)
-      multi_json (~> 1.0)
-    factory_girl (4.2.0)
-      activesupport (>= 3.0.0)
-    factory_girl_rails (4.2.1)
-      factory_girl (~> 4.2.0)
-      railties (>= 3.0.0)
-    faker (1.1.2)
-      i18n (~> 0.5)
-    fastercsv (1.5.5)
-    fattr (2.2.1)
-    fb_graph (2.6.4)
-      httpclient (>= 2.2.0.2)
-      multi_json (>= 1.3)
-      rack-oauth2 (>= 0.14.4)
-      tzinfo
-    ffi (1.4.0)
-    haml (3.1.8)
-    highline (1.6.15)
-    hike (1.2.1)
-    httpclient (2.3.2)
-    i18n (0.6.1)
-    journey (1.0.4)
-    jquery-rails (2.1.4)
-      railties (>= 3.0, < 5.0)
-      thor (>= 0.14, < 2.0)
-    jquery-ui-rails (4.0.1)
-      jquery-rails
-      railties (>= 3.1.0)
-    json (1.7.7)
-    mail (2.4.4)
-      i18n (>= 0.4.0)
-      mime-types (~> 1.16)
-      treetop (~> 1.4.8)
-    metaclass (0.0.1)
-    method_source (0.8.1)
-    mime-types (1.21)
-    mini_magick (3.5.0)
-      subexec (~> 0.2.1)
-    mocha (0.10.5)
-      metaclass (~> 0.0.1)
-    mongo (1.8.2)
-      bson (~> 1.8.2)
-    mongo_session_store-rails3 (3.0.6)
-      actionpack (>= 3.0)
-      mongo
-    mongoid (2.6.0)
-      activemodel (~> 3.1)
-      mongo (~> 1.7)
-      tzinfo (~> 0.3.22)
-    mongoid-encryptor (0.0.5)
-      activesupport (~> 3.0)
-      encrypted_strings (~> 0.3.3)
-      mongoid (~> 2)
-    mongoid-tree (0.7.0)
-      mongoid (~> 2.0)
-    multi_json (1.6.1)
-    net-ldap (0.3.1)
-    nokogiri (1.5.6)
-    options (2.3.0)
-      fattr
-    orm_adapter (0.0.7)
-    polyglot (0.3.3)
-    pr_geohash (1.0.0)
-    progress_bar (0.4.0)
-      highline (~> 1.6.1)
-      options (~> 2.3.0)
-    pry (0.9.12)
-      coderay (~> 1.0.5)
-      method_source (~> 0.8)
-      slop (~> 3.4)
-    pry-debugger (0.2.1)
-      debugger (~> 1.2.0)
-      pry (~> 0.9.10)
-    pry-remote (0.1.6)
-      pry (~> 0.9)
-      slop (~> 3.0)
-    pry-stack_explorer (0.4.9)
-      binding_of_caller (>= 0.7)
-      pry (~> 0.9.11)
-    rack (1.4.5)
-    rack-cache (1.2)
-      rack (>= 0.4)
-    rack-gridfs (0.4.1)
-      mime-types
-      mongo (~> 1.2)
-      rack
-    rack-oauth2 (1.0.0)
-      activesupport (>= 2.3)
-      attr_required (>= 0.0.5)
-      httpclient (>= 2.2.0.2)
-      i18n
-      multi_json (>= 1.3.6)
-      rack (>= 1.1)
-    rack-protection (1.3.2)
-      rack
-    rack-ssl (1.3.3)
-      rack
-    rack-test (0.6.2)
-      rack (>= 1.0)
-    radius (0.7.3)
-    rails (3.2.12)
-      actionmailer (= 3.2.12)
-      actionpack (= 3.2.12)
-      activerecord (= 3.2.12)
-      activeresource (= 3.2.12)
-      activesupport (= 3.2.12)
-      bundler (~> 1.0)
-      railties (= 3.2.12)
-    railties (3.2.12)
-      actionpack (= 3.2.12)
-      activesupport (= 3.2.12)
-      rack-ssl (~> 1.3.2)
-      rake (>= 0.8.7)
-      rdoc (~> 3.4)
-      thor (>= 0.14.6, < 2.0)
-    rake (10.0.3)
-    rdoc (3.12.1)
-      json (~> 1.4)
-    redis (3.0.2)
-    redis-namespace (1.2.1)
-      redis (~> 3.0.0)
-    redis-search (0.9.0)
-      chinese_pinyin (>= 0.3.0)
-      redis (>= 2.1.1)
-      redis-namespace (>= 1.0.2)
-    resque (1.23.0)
-      multi_json (~> 1.0)
-      redis-namespace (~> 1.0)
-      sinatra (>= 0.9.2)
-      vegas (~> 0.1.2)
-    resque-restriction (0.3.0)
-      resque (>= 1.7.0)
-    resque-scheduler (2.0.0)
-      redis (>= 2.0.1)
-      resque (>= 1.20.0)
-      rufus-scheduler
-    rmmseg-cpp-huacnlee (0.2.9)
-    rsolr (1.0.8)
-      builder (>= 2.1.2)
-    rspec (2.12.0)
-      rspec-core (~> 2.12.0)
-      rspec-expectations (~> 2.12.0)
-      rspec-mocks (~> 2.12.0)
-    rspec-core (2.12.2)
-    rspec-expectations (2.12.1)
-      diff-lcs (~> 1.1.3)
-    rspec-mocks (2.12.2)
-    rspec-rails (2.12.2)
-      actionpack (>= 3.0)
-      activesupport (>= 3.0)
-      railties (>= 3.0)
-      rspec-core (~> 2.12.0)
-      rspec-expectations (~> 2.12.0)
-      rspec-mocks (~> 2.12.0)
-    ruby2ruby (2.0.3)
-      ruby_parser (~> 3.1)
-      sexp_processor (~> 4.0)
-    ruby_parser (3.1.1)
-      sexp_processor (~> 4.1)
-    rubyzip (0.9.9)
-    rufus-scheduler (2.0.17)
-      tzinfo (>= 0.3.23)
-    sass (3.2.5)
-    sass-rails (3.2.6)
-      railties (~> 3.2.0)
-      sass (>= 3.1.10)
-      tilt (~> 1.3)
-    select2-rails (3.3.1)
-      sass-rails (>= 3.2)
-      thor (~> 0.14)
-    selenium-webdriver (2.30.0)
-      childprocess (>= 0.2.5)
-      multi_json (~> 1.0)
-      rubyzip
-      websocket (~> 1.0.4)
-    sexp_processor (4.1.5)
-    shoulda-matchers (1.4.2)
-      activesupport (>= 3.0.0)
-      bourne (~> 1.1.2)
-    simplecov (0.7.1)
-      multi_json (~> 1.0)
-      simplecov-html (~> 0.7.1)
-    simplecov-html (0.7.1)
-    sinatra (1.3.4)
-      rack (~> 1.4)
-      rack-protection (~> 1.3)
-      tilt (~> 1.3, >= 1.3.3)
-    slop (3.4.3)
-    social-share-button (0.1.1)
-    spork (0.9.2)
-    sprockets (2.2.2)
-      hike (~> 1.2)
-      multi_json (~> 1.0)
-      rack (~> 1.0)
-      tilt (~> 1.1, != 1.3.0)
-    subexec (0.2.2)
-    sunspot (1.3.3)
-      pr_geohash (~> 1.0)
-      rsolr (~> 1.0.7)
-    sunspot-rails-tester (0.0.4)
-      sunspot_rails (~> 1.2)
-    sunspot_mongo (1.0.1)
-      sunspot_rails
-    sunspot_rails (1.3.3)
-      nokogiri
-      sunspot (= 1.3.3)
-    sunspot_solr (1.3.3)
-    terminal-table (1.4.5)
-    thor (0.17.0)
-    tilt (1.3.3)
-    tinymce-rails (3.5.8)
-      railties (>= 3.1.1)
-    treetop (1.4.12)
-      polyglot
-      polyglot (>= 0.3.1)
-    tzinfo (0.3.35)
-    uglifier (1.3.0)
-      execjs (>= 0.3.0)
-      multi_json (~> 1.0, >= 1.0.2)
-    vegas (0.1.11)
-      rack (>= 1.0.0)
-    warden (1.2.1)
-      rack (>= 1.0)
-    watchr (0.7)
-    websocket (1.0.7)
-    xpath (1.0.0)
-      nokogiri (~> 1.3)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  brakeman
-  bson_ext
-  capybara
-  carrierwave
-  carrierwave-mongoid
-  chinese_pinyin (= 0.4.1)
-  coffee-rails
-  database_cleaner
-  debugger
-  delorean
-  devise (= 1.5.3)
-  exception_notification
-  execjs
-  factory_girl_rails
-  faker
-  fb_graph
-  impressionist!
-  jquery-rails (= 2.1.4)
-  jquery-ui-rails
-  kaminari!
-  mime-types
-  mini_magick
-  mongo_session_store-rails3 (= 3.0.6)
-  mongoid (> 2.1, < 3.0.0)
-  mongoid-encryptor
-  mongoid-tree
-  net-ldap (~> 0.3.1)
-  nokogiri
-  progress_bar
-  pry
-  pry-debugger
-  pry-remote
-  pry-stack_explorer
-  rack-gridfs
-  radius
-  rails (~> 3.2.9)
-  rake
-  redis (>= 2.1.1)
-  redis-namespace
-  redis-search
-  resque
-  resque-restriction
-  resque-scheduler
-  rmmseg-cpp-huacnlee (= 0.2.9)
-  rspec (~> 2.0)
-  rspec-rails (~> 2.0)
-  rubyzip
-  sass-rails
-  select2-rails (= 3.3.1)
-  shoulda-matchers
-  simplecov
-  sinatra
-  social-share-button
-  spork
-  sprockets
-  sunspot-rails-tester
-  sunspot_mongo
-  sunspot_solr
-  tinymce-rails
-  uglifier
-  watchr

app/assets/javascripts/desktopload.js.erb

@@ -1,6 +1,6 @@
 
 orbitDesktop.prototype.themefolder = "desktop_themes";
 orbitDesktopAPI.prototype.notifyImgPath = "/assets/";
-alert("<%= @desktop.inspect %>")
+// alert("<%= @desktop.inspect %>")
 var od = new orbitDesktop("#ajax_container");
 

app/assets/javascripts/event.js

@@ -55,7 +55,7 @@ $(document).ready(function(){
 		}
 		return false;
 	});
-	getEvent(selet);
+
 	function resetText() {
 		$events.find('li').find($mon).html('');
 		$events.find('li').find($day).html('');
@@ -63,60 +63,4 @@ $(document).ready(function(){
 		$events.find('li').find($link_text).attr('href', '');
 		$events.find('li').find($time).html('');
 	}
-	function getEvent(selet){
-		$.ajax({
-			type: "GET",
-			url: "/static/nccu_calendar.xml",
-			dataType: "xml",
-			timeout: 1000,
-			error: function(xml){
-				$events.find('.links_next').addClass('disabled')
-				$events.find('.error_mag').show();
-				$events.find('ul').hide();
-				$events.find('.error_mag').html("讀取錯誤");
-			},
-			success: function(xml) {
-				xmlLength = $(xml).find('entry').length;
-				$(xml).find('entry').slice(selet, selet+objLength).each(function(i){
-					title_text = $(this).find('title').text()
-					link_text = $(this).find('link').attr('href')
-					summary_text = $(this).find('summary').text()
-					indexA = summary_text.indexOf("-");
-					indexB = summary_text.indexOf(" ");
-					indexC = summary_text.indexOf("/");
-					//清除前後空白字元
-					summary_text = jQuery.trim(summary_text);
-					//篩選標題
-					title_text = title_text.slice(0, 16)
-					if (summary_text.length == 31) {
-						startDate_text = summary_text.slice(0, indexA);
-						startMon_text = startDate_text.slice((indexC+1), (indexC+3));
-						startDay_text = startDate_text.slice(7);
-						endDate_text = summary_text.slice((indexA+1), indexB);
-						time_text = summary_text.slice((indexB+1));
-					} else {
-						startDate_text = summary_text.slice(0, indexB);
-						startMon_text = startDate_text.slice((indexC+1), (indexC+3));
-						startDay_text = startDate_text.slice(7);
-						endDate_text = '';
-						time_text = summary_text.slice((indexB+1));
-					}
-					if(startMon_text.slice(0, 1) == '0'){
-						startMon_text = month[startMon_text.slice(1)-1];
-					} else {
-						startMon_text = month[startMon_text-1];
-					}
-					$events.find('li').eq(i).find($mon).html(startMon_text);
-					$events.find('li').eq(i).find($day).html(startDay_text);
-					$events.find('li').eq(i).find($link_text).html(title_text+"…");
-					$events.find('li').eq(i).find($link_text).attr('href', link_text);
-					$events.find('li').eq(i).find($time).html('時間：'+time_text);
-					//console.log();
-					/*$('<li></li>')
-					.html('<div class="event_date"><span class="mon">'+startMon_text+'</span><span class="day">'+startDay_text+'</div>')
-					.appendTo('.events ul');*/
-				});//close each(
-			}
-		}); //close $.ajax(
-	}
 });

app/assets/javascripts/survey_form.js.erb

@@ -0,0 +1,56 @@
+<%#= encoding: utf-8 %>
+$(document).ready(function(){
+
+  $(document).on('click', '.survey_question_item a.remove_existing_record_question', function(){
+    if(confirm("<%= I18n.t(:sure?)%>")){
+      $(this).next('.should_destroy').val(1);
+      $(".survey_question_item#" + $(this).prev().attr('value')).hide();
+    }
+  });
+
+  $(document).on('click', '.survey_question_option_item a.remove_existing_record_option', function(){
+    if(confirm("<%= I18n.t(:sure?)%>")){
+      $(this).next('.should_destroy').val(1);
+      $(".survey_question_option_item#" + $(this).prev().attr('value')).hide();
+    }
+  });
+
+  $(document).on('click', '.survey_question_radiogroup_item a.remove_existing_record_radiogroup', function(){
+    if(confirm("<%= I18n.t(:sure?)%>")){
+      $(this).next('.should_destroy').val(1);
+      $(".survey_question_radiogroup_item#" + $(this).prev().attr('value')).hide();
+    }
+  });
+
+  $('.survey_question_item .type-selector').live('change', function(){
+    $item = $(this).parents('.survey_question_item');
+    $item.find('.type-specify').hide();
+    $item.find('.type-specify.type-' + $(this).val()).show();
+    $item.find('.type-specify.hide-type-' + $(this).val()).hide();
+  });
+
+  $('.survey_question_item .type-selector').trigger('change');
+
+  $('.survey_question_item .add_survey_question_option a.add').live('click', function(){
+    var new_id = $(this).prev().attr('value');
+    var old_id = new RegExp("new_survey_question_options", "g");
+    $(this).prev().attr('value', parseInt(new_id) + 1);
+    $_new = $($(this).next().html().replace(old_id, new_id));
+    $(this).parents('.survey_question_options_wrapper').find('tbody').append($_new);
+    $_new.find('a.delete_option').on('click', function(){
+      $(this).parents('.survey_question_option_item').remove();
+    });
+  });
+
+  $('.survey_question_item .add_survey_question_radiogroup a.add').live('click', function(){
+    var new_id = $(this).prev().attr('value');
+    var old_id = new RegExp("new_survey_question_radiogroups", "g");
+    $(this).prev().attr('value', parseInt(new_id) + 1);
+    $_new = $($(this).next().html().replace(old_id, new_id));
+    $(this).parents('.survey_question_radiogroups_wrapper').find('tbody').append($_new);
+    $_new.find('a.delete_radiogroup').on('click', function(){
+      $(this).parents('.survey_question_radiogroup_item').remove();
+    });
+  });
+
+});

app/assets/stylesheets/ask.css

@@ -0,0 +1,40 @@
+#acknowledgement {
+  display: none;
+  padding: 20px;
+  margin: -20px 0 30px 0;
+  background-color: #fff;
+  font-weight: bold;
+  font-size: 15px;
+  border: solid 2px #f0f0f0;
+}
+#aclnowledgement:after {
+  content: '';
+  display: table;
+  width: table;
+  clear: both;
+}
+
+.ask-question {
+
+}
+
+/* AQ form */
+#new-ask-question {
+  background-color: #f8f8f8;
+  padding: 20px 0;
+}
+#new-ask-question .form-horizontal .control-label {
+  width: 100px;
+}
+#new-ask-question .form-horizontal .controls {
+  margin-left: 120px;
+}
+#new-ask-question .form-horizontal .controls textarea {
+  width: 80%;
+  resize: vertical;
+}
+#new-ask-question .form-horizontal .form-actions {
+  padding-left: 120px;
+  background-color: transparent;
+  border: none;
+}

app/assets/stylesheets/desktop/desktop-select2.css

@@ -149,7 +149,7 @@ Version: 3.3.1 Timestamp: Wed Feb 20 09:57:22 PST 2013
   margin-top: 4px; }
 
 .select2-search input.select2-active {
-  background: white image-url("select2-spinner.gif") no-repeat 100%; }
+  background: white url("select2/spinner.gif") no-repeat 100%; }
 
 .select2-container-active .select2-choice,
 .select2-container-active .select2-choices {
@@ -261,7 +261,7 @@ disabled look for disabled choices in the results dropdown
   display: none; }
 
 .select2-more-results.select2-active {
-  background: #f4f4f4 image-url("select2-spinner.gif") no-repeat 100%; }
+  background: #f4f4f4 url("select2/spinner.gif") no-repeat 100%; }
 
 .select2-more-results {
   background: #f4f4f4;
@@ -323,7 +323,7 @@ disabled look for disabled choices in the results dropdown
   background: transparent !important; }
 
 .select2-container-multi .select2-choices .select2-search-field input.select2-active {
-  background: white image-url("select2-spinner.gif") no-repeat 100% !important; }
+  background: white url("select2/spinner.gif") no-repeat 100% !important; }
 
 .select2-default {
   color: #999999 !important; }

app/assets/stylesheets/list.css

@@ -12,6 +12,9 @@
 .main-list {
 	margin-bottom: 0;
 }
+#filter .main-list, #filter + .main-list {
+ 	table-layout: fixed;
+}
 .main-wrap>.main-list thead th {
 	background-color: transparent;
 	border-right: medium none;
@@ -36,7 +39,7 @@
 }
 .main-list tbody .quick-edit .nav {
 	position: absolute;
-	width: 350px;
+	width: 440px;
 	left: -8px;
 }
 .main-list tbody .quick-edit .nav .dropdown-menu {

app/assets/stylesheets/questionnaire.css

@@ -0,0 +1,150 @@
+.o-question {
+  font-size: 15px;
+}
+.o-question input[type=checkbox], .o-question input[type=radio] {
+  margin: 0;
+}
+.o-question textarea {
+  resize: vertical;
+}
+.o-question-topic {
+  font-size: 2em;
+  line-height: normal;
+  margin: 0;
+  padding: 0.5em 0;
+}
+.o-question-description {
+  font-size: 0.9em;
+  line-height: 1.5em;
+}
+.o-question-list {
+  clear: both;
+  margin: 40px 0;
+  padding: 0;
+  font-weight: bold;
+}
+.o-question-list > li {
+  margin: 0 0 0 40px;
+  padding: 16px 0;
+  border-top: solid 1px #eee;
+  position: relative;
+}
+.o-question-list > li .required-star {
+  position: absolute;
+  left: -42px;
+  padding-top: 4px;
+}
+.o-question-list > li:first-child {
+  border: 0;
+}
+.o-question-title {
+  font-weight: bold;
+  font-size: 1.2em;
+  line-height: 1.5em;
+  margin-bottom: 16px;
+}
+.o-question-title + .o-question-description {
+  font-weight: normal;
+  background-color: #f6f6f6;
+  padding: 16px;
+  position: relative;
+  margin-top: 20px;
+  width: 90%;
+}
+.o-question-title + .o-question-description:before {
+  display: block;
+  content: "";
+  border-left: 12px solid transparent;
+  border-right: 12px solid transparent; 
+  border-bottom: 12px solid #f6f6f6;
+  position: absolute;
+  top: -12px;
+  left: 16px;
+}
+.o-question-title + input[type=text],
+.o-question-title + textarea,
+.o-question-title + select,
+.o-question-description + input[type=text],
+.o-question-description + textarea,
+.o-question-description + select {
+  display: block;
+}
+.o-question-title + input[type=text], .o-question-title + textarea {
+  border: solid 1px #ccc;
+  padding: 6px;
+  margin: 20px 0;
+  line-height: 24px;
+}
+.o-question-title + input[type=text] {
+  width: 40%;
+}
+.o-question-title + textarea {
+  width: 70%;
+}
+.o-question-group {
+  margin: 20px 0;
+  padding: 0;
+}
+.o-question-option {
+  font-weight: normal;
+}
+.o-question-group.view-list {
+  list-style: none;
+}
+.o-question-group.view-list .o-question-option {}
+.o-question-group.view-list > li {
+  margin-top: 8px;
+}
+.o-question-group.view-list > li:first-child {
+  margin: 0;
+}
+.o-question-group.view-list > li > * {
+  display: inline-block;
+  margin: 0;
+  padding: 0;
+  vertical-align: middle;
+}
+.o-question-group.view-list > li input + .o-question-option {
+  margin: 0 0 0 12px;
+}
+.o-question-group.view-dropdown {
+  height: 24px;
+  line-height: 24px;
+}
+.o-question-group.view-grid {
+  border-collapse: collapse;
+  max-width: 90%;
+  min-width: 50%;
+  width: auto;
+}
+.o-question-group.view-grid th, .o-question-group.view-grid td {
+  padding: 6px;
+}
+.o-question-group.view-grid thead th {
+  text-align: center;
+}
+.o-question-group.view-grid tbody th {}
+.o-question-group.view-grid tbody .odd .o-question-title, .o-question-group.view-grid tbody .odd td {
+  background-color: #f6f6f6;
+}
+.o-question-group.view-grid .o-question-title {
+  font-size: 1em;
+}
+.o-question-group.view-grid tbody .odd .o-question-title {
+  background-color: transparent;
+}
+.o-question-group.view-grid tbody .odd td {}
+.o-question-group.view-grid tbody tr:hover td {
+  background-color: #aaa;
+}
+.o-question-group.view-grid tbody td {
+  vertical-align: middle;
+  text-align: center;
+}
+.o-question-group.view-grid tbody td input {
+  vertical-align: baseline;
+}
+.o-question-action {
+  padding: 20px;
+  background-color: #f6f6f6;
+}

app/assets/stylesheets/standalone.css

@@ -0,0 +1,52 @@
+@import url(http://fonts.googleapis.com/css?family=Open+Sans:400,700);
+body {
+  margin: 0;
+  padding: 50px 0;
+  background-color: #eee;
+  font-family: 'Open Sans', sans-serif;
+}
+
+.wrapper {
+  background: #FFFFFF none;
+  box-shadow: 0 0 50px rgba(0, 0, 0, 0.1);
+  margin: 0 auto;
+  overflow: hidden;
+  width: 980px;
+}
+
+.wrapper > h1 {
+  margin: 0;
+  padding: 20px;
+  font-family: 'Open Sans', sans-serif;
+  font-weight: bold;
+}
+section {
+  border-top: dashed 3px #eee;
+  padding: 40px;
+  overflow: hidden;
+}
+section:first-child {
+  border: 0;
+  padding-top: 0;
+}
+section > h2 {
+  font-size: 13px;
+  font-weight: bold;
+  border: solid 1px #ddd;
+  background-color: #2676C0;
+  color: #fff;
+  display: inline-block;
+  padding: 0 16px;
+  box-shadow: 0 1px 1px #fff, 0 2px 6px rgba(0,0,0,0.1);
+}
+.side {
+  float: right;
+  width: 189px;
+  padding-left: 20px;
+  border-left: solid 1px #eee;
+}
+.main {
+  float: left;
+  width: 710px;
+  padding-right: 20px;
+}

app/controllers/admin/assets_controller.rb

@@ -11,7 +11,7 @@ class Admin::AssetsController < OrbitBackendController
   def new
     @asset = Asset.new
     @asset_categories = AssetCategory.all
-    @tags = AssetTag.all
+    @tags = get_tags
     respond_to do |format|
       format.html {}
       format.js { render 'js/show_pop_up', :locals => {:partial => 'admin/assets/new'} }
@@ -21,7 +21,7 @@ class Admin::AssetsController < OrbitBackendController
   def edit
     @asset = Asset.find(params[:id])
     @asset_categories = AssetCategory.all
-    @tags = AssetTag.all
+    @tags = get_tags
     respond_to do |format|
       format.html {}
       format.js { render 'js/show_pop_up', :locals => {:partial => 'admin/assets/edit'} }
@@ -46,7 +46,7 @@ class Admin::AssetsController < OrbitBackendController
     else
       flash[:error] = t('create.fail')
       @asset_categories = AssetCategory.all
-      @tags = AssetTag.all
+      @tags = get_tags
       respond_to do |format|
         format.js { 
           if params[:uploader]
@@ -69,7 +69,7 @@ class Admin::AssetsController < OrbitBackendController
     else
       flash[:error] = t('update.fail')
       @asset_categories = AssetCategory.all
-      @tags = AssetTag.all
+      @tags = get_tags
       respond_to do |format|
         format.html { render :action => :edit }
         format.js { render 'js/reload_pop_up', :locals => {:value => @asset, :values => nil, :partial => 'admin/assets/edit', :locals => {:is_html => false}} }
@@ -96,7 +96,7 @@ class Admin::AssetsController < OrbitBackendController
   def file_upload
     @asset = Asset.new
     @asset_categories = AssetCategory.all
-    @tags = AssetTag.all
+    @tags = get_tags
     render :layout => false
   end
 

app/controllers/admin/mail_cron_logs_controller.rb

@@ -0,0 +1,38 @@
+class Admin::MailCronLogsController <  OrbitBackendController
+  
+  layout "new_admin"
+  before_filter :authenticate_user!
+  before_filter :is_admin?
+
+  def index  
+
+    # @mail_cron_logs = MailCronLog.all.desc(:created_at).page(params[:page_main] ).per('20')
+    @mail_cron_logs = (params[:sort]) ? get_sorted_and_filtered("mail_cron_log") : get_viewable("mail_cron_log")
+
+    respond_to do |format|
+      format.html # index.html.erb
+      format.xml  { render :xml => @mail_crons }
+      format.js
+    end
+
+  end 
+  
+  def destroy 
+    @mail_cron_log = MailCronLog.find(params[:id])
+    @mail_cron_log.destroy
+
+    respond_to do |format|
+      format.html { redirect_to(admin_mail_cron_logs_url) }
+      # format.xml  { head :ok }
+      format.js
+    end
+  end 
+
+  def delete
+    if params[:ids]
+      mail_cron_logs = MailCronLog.any_in(:_id => params[:ids]).destroy_all
+    end
+    redirect_to admin_mail_cron_logs_url(:direction => params[:direction], :sort => params[:sort], :sort_options => params[:sort_options])
+  end
+  
+end

app/controllers/admin/mail_crons_controller.rb

@@ -0,0 +1,126 @@
+class Admin::MailCronsController <  OrbitBackendController
+  
+  layout "new_admin"
+  before_filter :authenticate_user!
+  before_filter :is_admin?
+
+  def index  
+
+    # @mail_crons = MailCron.all.asc(:mail_sentdate).page(params[:page_main] ).per('20')
+    @mail_crons = (params[:sort]) ? get_sorted_and_filtered("mail_cron") : get_viewable("mail_cron")
+
+    respond_to do |format|
+      format.html # index.html.erb
+      format.xml  { render :xml => @mail_crons }
+      format.js
+    end
+
+  end
+  
+  def show  
+  end
+  
+  def new 
+    @mail_cron = MailCron.new 
+
+    respond_to do |format|
+      format.html # new.html.erb
+      format.xml  { render :xml => @mail_cron }
+    end
+  end
+  
+  def create 
+    @mail_cron = MailCron.new(params[:mail_cron])
+
+    @mail_cron.create_user_id = current_user.id
+    @mail_cron.update_user_id = current_user.id
+
+    respond_to do |format|
+      if @mail_cron.save
+        format.html { redirect_to(admin_mail_crons_url) }
+        format.xml  { render :xml => @mail_cron, :status => :created, :location => @mail_cron }
+      else
+        format.html { render :action => "new" }
+        format.xml  { render :xml => @mail_cron.errors, :status => :unprocessable_entity }
+      end
+    end
+  end 
+
+  def edit 
+    @mail_cron = MailCron.find(params[:id])
+  end 
+  
+  def update   
+
+
+
+    @datas = MailCron.where(:mail_sentdate.lte => Time.now, :mail_sent => false)
+
+    @datas.each do |mail_data| 
+
+      @mail_j = 0
+      @read_mails = Array.new 
+
+      @mails = mail_data.mail_to.split(",")
+
+      @mails.each do |send_mail|
+
+        @read_mails << send_mail
+
+        @mail_j += 1 
+
+        if  0 == @mail_j % 30 
+          MailCronMailer.cron_mail( mail_data.id, @read_mails.join(',') ).deliver
+          @read_mails = Array.new
+
+          sleep 10
+        end
+
+      end
+
+      if !@read_mails.join(',').blank?
+        MailCronMailer.cron_mail( mail_data.id, @read_mails.join(',') ).deliver
+        @read_mails = Array.new
+
+        sleep 10
+      end  
+
+    end
+    
+    @mail_cron = MailCron.find(params[:id])
+  
+    @mail_cron.update_user_id = current_user.id 
+
+    respond_to do |format|
+      if @mail_cron.update_attributes(params[:mail_cron])
+        format.html { redirect_to(admin_mail_crons_url) }
+        format.js  { render 'toggle_enable' }
+        format.xml  { head :ok }
+      else
+        format.html { render :action => "edit" }
+        format.xml  { render :xml => @mail_cron.errors, :status => :unprocessable_entity }
+      end
+    end
+  end
+  
+  def destroy 
+    @mail_cron = MailCron.find(params[:id])
+    @mail_cron.destroy
+
+    respond_to do |format|
+      format.html { redirect_to(admin_mail_crons_url) }
+      # format.xml  { head :ok }
+      format.js
+    end
+  end
+
+  def delete
+    if params[:ids]
+      mail_crons = MailCron.any_in(:_id => params[:ids]).destroy_all
+    end
+    redirect_to admin_mail_crons_url(:direction => params[:direction], :sort => params[:sort], :sort_options => params[:sort_options])
+  end
+  
+  protected 
+  
+end

app/controllers/admin/page_parts_controller.rb

@@ -22,6 +22,11 @@ class Admin::PagePartsController < OrbitBackendController
     @part = PagePart.find(params[:id])
     @r_tag = @part.public_r_tag.blank? ? LIST[:public_r_tags][0] : @part.public_r_tag
     @tag_objects = @r_tag.classify.constantize.all rescue nil
+    if @r_tag.eql?('tag_cloud')
+      @tag_objects = ModuleApp.where(has_tag: true)
+    else
+      @tag_objects = @r_tag.classify.constantize.all rescue nil
+    end
 
     @module_apps = ModuleApp.for_widget_select
     @categories = nil
@@ -119,7 +124,11 @@ class Admin::PagePartsController < OrbitBackendController
   def reload_r_tag_options
     @part = PagePart.find params[:id]
     @r_tag = params[:type]
+    if params[:type].eql?('tag_cloud')
+      @tag_objects = ModuleApp.where(has_tag: true)
+    else
       @tag_objects = @r_tag.classify.constantize.all rescue nil
+    end
     respond_to do |format|
       format.js  {}
     end

app/controllers/admin/user_actions_controller.rb

@@ -0,0 +1,8 @@
+class Admin::UserActionsController < OrbitBackendController
+  layout "new_admin"
+  before_filter :authenticate_user!
+  before_filter :is_admin?
+  def index
+    @user_actions = UserAction.all
+  end
+end

app/controllers/application_controller.rb

@@ -29,6 +29,7 @@ class ApplicationController < ActionController::Base
 
   def set_current_user
     User.current = current_or_guest_user
+    UserActionRecoder.perform(current_or_guest_user,params.to_s)
   end
 
   def front_end_available(module_app_title='')
@@ -109,7 +110,7 @@ class ApplicationController < ActionController::Base
   end
 
   # Render the page
-  def render_page(args=nil)
+  def render_page(args={})
     if @item
       respond_to do |format|
         format.html { render :text => parse_page_content(@item,args), :layout => 'page_layout' }
@@ -155,7 +156,7 @@ class ApplicationController < ActionController::Base
   # Set the site variables
   def set_site
     # set site if exist or create site
-    @site = Site.first || Site.create({:valid_locales => [], :in_use_locales => []})
+    @site = Site.first || Site.create({:valid_locales => VALID_LOCALES, :in_use_locales => VALID_LOCALES})
     session[:site] = @site.id
     @site_in_use_locales = site_locales_default_head(@site.in_use_locales)
     @site_valid_locales = site_locales_default_head(@site.valid_locales)
@@ -228,6 +229,174 @@ class ApplicationController < ActionController::Base
     redirect_to ret
   end
 
+  def get_sorted_and_filtered(object_class, query = nil, objects = nil)
+    objects ||= get_objects(object_class, query)
+    object_class = object_class.classify.constantize
+    if !params[:sort].blank?
+      options = params[:sort_options]
+      options = [options] if !options.class.eql?(Array)
+      options.each do |option|
+        if object_class.fields.include?(option)
+          if object_class.fields[option].type.to_s.eql?('Object') && !object_class.relations[option].nil?
+            objects = get_objects_from_referenced_objects(object_class.fields[option].options[:class_name].constantize, objects, option)
+          else
+            (objects = objects.order_by(option, params[:direction])) rescue nil
+          end
+        elsif object_class.relations.include?(option)
+          case object_class.relations[option].macro
+            when :references_one
+              a = Array.new
+              objects.each { |object| a << [get_string_value_from_object(object), object] }
+              sorted = params[:direction].eql?('asc') ? a.sort : a.sort.reverse!
+              objects = sorted.collect {|x| x[1] }
+            when :references_many, :references_and_referenced_in_many
+              objects = get_objects_from_self(object_class, objects, option)
+            when :referenced_in
+              objects = get_objects_from_referenced_objects(object_class.relations[option].class_name.constantize, objects, "#{option}_id")
+          end
+        elsif option.eql?('tags')
+          tag_array = @module_app.tags.inject([]){ |result, value|
+            result << [value.name, value]
+          }
+          params[:direction].eql?('asc') ? tag_array.sort : tag_array.sort.reverse!
+          sorted_objects = Array.new
+          tag_array.each do |x|
+            taggings = x[1].taggings
+            taggings.each {|tagging| sorted_objects << tagging.taggable }
+          end
+          # debugger
+          sorted_objects.flatten!
+          sorted_objects.uniq!
+          objects = get_with_nil(objects, option, sorted_objects)
+        end
+      end
+    end
+    if @filter
+      @filter.each do |key, value|
+        case key
+          when 'status'
+            a = Array.new
+            objects.each do |object|
+              value.each do |v|
+                a << object if object[v]
+              end
+            end
+            objects = a.uniq
+          when 'categories'
+            a = Array.new
+            objects.each do |object|
+              a << object if (value.include?(object.send("#{object.class.to_s.underscore}_category").id.to_s) rescue nil)
+            end
+            objects = a.uniq
+          when 'tags'
+            a = Array.new
+            objects.each do |object|
+              object.tags.each do |tag|
+                a << object if value.include?(tag.id.to_s)
+              end
+            end
+            objects = a.uniq
+          end if value.size > 0
+      end
+    end
+    Kaminari.paginate_array(filter_authorized_objects(objects)).page(params[:page]).per(10)
+  end
+
+  def get_viewable(object_class, query=nil)
+    objects = get_objects(object_class,query).order_by(:created_at, :desc)
+    Kaminari.paginate_array(objects).page(params[:page]).per(10)
+  end
+
+  def get_objects(object_class, query=nil)
+    object_class = object_class.classify.constantize
+    # debugger
+    # a=1
+    if query
+      if object_class.include?(Mongoid::Sortable)
+        objects = object_class.default_sort(params[:sort]).where(query)
+      else
+        objects = object_class.where(query)
+      end
+    else
+      if object_class.include?(Mongoid::Sortable)
+        objects = object_class.default_sort(params[:sort]).all
+      else
+        objects = object_class.all
+      end
+    end
+    objects
+  end
+
+  def get_objects_from_referenced_objects(object_class, objects, option)
+    referer_ids = objects.distinct(option)
+    referenced_objects = object_class.find(referer_ids) rescue nil
+    if referenced_objects
+      a = Array.new
+      referenced_objects.to_a.each { |referer| a << [get_string_value_from_object(referer), referer.id] }
+      sorted = params[:direction].eql?('asc') ? a.sort : a.sort.reverse!
+      sorted_objects = sorted.collect {|x| objects.where(option => x[1]).entries }
+      sorted_objects.flatten!
+      sorted_objects.uniq!
+      get_with_nil(objects, option, sorted_objects)
+    else
+      objects
+    end
+  end
+
+  def get_objects_from_self(object_class, objects, option)
+    referenced_class = object_class.relations[option].class_name.constantize
+    referenced_objects = referenced_class.all rescue nil
+    if referenced_objects
+      reverse_relation = nil
+      referenced_class.relations.each { |relation| reverse_relation = relation[1].name.to_s if relation[1].class_name.eql?(object_class.to_s) }
+      a = Array.new
+      referenced_objects.each { |referenced_object| a << [get_string_value_from_object(referenced_object), referenced_object] }
+      a.compact!
+      sorted = params[:direction].eql?('asc') ? a.sort : a.sort.reverse!
+      sorted_objects = Array.new
+      sorted.each {|x| sorted_objects << x[1].send(reverse_relation) }
+      sorted_objects.flatten!
+      sorted_objects.uniq!
+      get_with_nil(objects, option, sorted_objects)
+    else
+      objects
+    end
+  end
+
+  def get_string_value_from_object(object)
+    s = object.name_translations[I18n.locale.to_s] unless s rescue nil
+    s = object.title_translations[I18n.locale.to_s] unless s rescue nil
+    s = object.name unless s rescue nil
+    s = object.title unless s rescue nil
+    s.downcase rescue ''
+  end
+
+  def get_with_nil(objects, option, sorted_objects)
+    tmp = Array.new
+    objects.each { |object| tmp << [get_string_value_from_object(object), object] if (object.send(option).blank? || (object.send(option).size == 0 rescue nil)) }
+    sorted = params[:direction].eql?('asc') ? tmp.sort : tmp.sort.reverse!
+    sorted_tmp = sorted.collect {|a| a[1] }
+    a = params[:direction].eql?('asc') ? (sorted_tmp + sorted_objects) : (sorted_objects + sorted_tmp)
+    a.flatten
+  end
+
+
+  def filter_authorized_objects(objects)
+    if(!is_admin? || !is_manager?)
+      objects.delete_if{ |object|
+        if object.is_pending == true
+          if check_permission(:manager)
+            object.create_user_id != current_user.id
+          else
+            !object.send("#{object.class.to_s.underscore}_category").authed_users('fact_check').include?(current_user) rescue false
+          end
+        else
+          false
+        end
+      }
+    end
+    objects
+  end
 
   private
 

app/controllers/default_widget_controller.rb

@@ -12,37 +12,41 @@ class DefaultWidgetController< OrbitWidgetController
 
   def query_for_default_widget
 
-    ori_class_name = @default_widget["query"].split('.')[0]
+    @ori_class_name = @default_widget["query"].split('.')[0]
     result = nil
     result_objects = nil
 
     if !params["tag_id"].blank?
-      @tags = Tag.find(params["tag_id"]) rescue nil
-      result_ids = nil
-
-      result_ids = @tags.collect{|tag| tag.send(ori_class_name.downcase.pluralize).entries.collect{|t| t.id}}
       if params["category_id"].blank? #has tag no cate
-        #nothing
+        result = @ori_class_name.constantize.where(:tagged_ids.in => params["tag_id"])
       else #has tag and cate
-        # result_ids = @tags.collect{|tag| tag.send(ori_class_name.downcase.pluralize).where(:#{get_category_field_name(ori_class_name)}.in=>params["category_id"]).available_for_lang(I18n.locale).can_display.collect{|t| t.id}}.flatten
+        result = eval("#{@ori_class_name}.where(:#{get_category_field_name}.in=>params['category_id'], :tagged_ids.in => params['tag_id'])")
-        result_ids << eval("#{ori_class_name}.where(:#{get_category_field_name(ori_class_name)}.in=>params['category_id']).entries.collect{|t| t.id}")
-        result_ids.flatten!
-
       end
-      result = eval("#{ori_class_name}.where(:id=>result_ids)")
     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(ori_class_name)}.in=>params['category_id'])")
+      result = eval("#{@ori_class_name}.where(:#{get_category_field_name}.in=>params['category_id'])")
     end
-    date_now = Time.now
     result.available_for_lang(I18n.locale).can_display.desc(:is_top, :postdate)
   end
 
+  def search_result
+      @search = query_for_default_widget.solr_search do 
+        fulltext params[:search_query]
+      end
+      search_result =  @search.results.collect{|result| result.id}
+      @items = eval(@ori_class_name).all.available_for_lang(I18n.locale).can_display.any_in(_id:search_result)
+  end
+
   def default_widget
-    if !params[:id].blank?
+    @search = params["search_query"].blank?  ?  false : true
+    if !params[:id].blank? and !params["clicked_field_name"].blank?
       clicked_field_name = params["clicked_field_name"].to_sym
       redirect_to eval("#{@page_part.module_app.widget_fields_link_method[clicked_field_name][:method]}('#{params[:id]}', {inner: #{params[:inner] || true}})")
+    elsif !params[:id].blank? and params["preview"]
+      clicked_field_name = :title
+      @preview_pages = @page_part.module_app.widget_fields_link_method.find_all{|t| t[1].has_key?(:preview)}.collect{|t| t[0]}
+      redirect_to eval("#{@page_part.module_app.widget_fields_link_method[clicked_field_name][:method]}('#{params[:id]}', {preview: true,inner: #{params[:inner] || true},clicked_field_name: '#{@preview_pages.first.to_s}'})")      
     else
       @tag_class = nil
       @default_widget = @page_part.module_app.get_default_widget
@@ -64,8 +68,13 @@ class DefaultWidgetController< OrbitWidgetController
         @fields = @page_part.widget_field
         @data_limit = @page_part.widget_data_count.is_a?(Fixnum) ? @page_part.widget_data_count : (@page_part.widget_data_count.to_i rescue 3)
       end
-      if @paginate
+
+      if @paginate || @search
+        if @search
+          @data = search_result.page(params[:page_main]).per(@data_limit) rescue []
+        else #regular listing
           @data = query_for_default_widget.includes(@widget_image_field).page(params[:page_main]).per(@data_limit)
+        end
         # @data = query_for_default_widget.limit(@data_limit).includes(@widget_image_field)
       else
         @data = query_for_default_widget.includes(@widget_image_field).limit(@data_limit)
@@ -85,9 +94,9 @@ class DefaultWidgetController< OrbitWidgetController
     end
   end
   
-  def get_category_field_name(ori_class_name)
+  def get_category_field_name
-    ori_class_name = ori_class_name.constantize
+    @ori_class_name = @ori_class_name.constantize
-    ori_class_name.fields.each_key do |key|
+    @ori_class_name.fields.each_key do |key|
       return key if key.include?('category_id')
     end
     nil

app/controllers/front_controller.rb

@@ -38,6 +38,11 @@ class FrontController < ApplicationController
     @ad_images = AdImage.all
   end
 
+  def show_tag_cloud
+    module_app = ModuleApp.find(params[:id]) rescue nil
+    @tags = module_app.sorted_tags_for_cloud
+  end
+
   private
 
   def menu_level(page, current_page, current, menu)

app/controllers/orbit_backend_controller.rb

@@ -35,166 +35,4 @@ class OrbitBackendController < ApplicationController
       redirect_to root_url
     end
   end
-
-  def get_sorted_and_filtered(object_class, query=nil)
-    objects = get_objects(object_class, query)
-    object_class = object_class.classify.constantize
-    if !params[:sort].blank?
-      options = params[:sort_options]
-      options = [options] if !options.class.eql?(Array)
-      options.each do |option|
-        if object_class.fields.include?(option)
-          if object_class.fields[option].type.to_s.eql?('Object') && !object_class.relations[option].nil?
-            objects = get_objects_from_referenced_objects(object_class.fields[option].options[:class_name].constantize, objects, option)
-          else
-            (objects = objects.order_by(option, params[:direction])) rescue nil
-          end
-        elsif object_class.relations.include?(option)
-          case object_class.relations[option].macro
-            when :references_one
-              a = Array.new 
-              objects.each { |object| a << [get_string_value_from_object(object), object] }
-              sorted = params[:direction].eql?('asc') ? a.sort : a.sort.reverse!
-              objects = sorted.collect {|x| x[1] }
-            when :references_many, :references_and_referenced_in_many
-              objects = get_objects_from_self(object_class, objects, option) 
-            when :referenced_in
-              objects = get_objects_from_referenced_objects(object_class.relations[option].class_name.constantize, objects, "#{option}_id")
-          end
-        elsif option.eql?('tags')
-          tag_array = @module_app.tags.inject([]){ |result, value|
-            result << [value.name, value]
-          }
-          params[:direction].eql?('asc') ? tag_array.sort : tag_array.sort.reverse!
-          sorted_objects = Array.new
-          tag_array.each do |x|
-            taggings = x[1].taggings
-            taggings.each {|tagging| sorted_objects << tagging.taggable }
-          end
-          # debugger
-          sorted_objects.flatten!
-          sorted_objects.uniq!
-          objects = get_with_nil(objects, option, sorted_objects)
-        end 
-      end
-    end
-    if @filter
-      @filter.each do |key, value|
-        case key
-          when 'status'
-            a = Array.new
-            objects.each do |object|
-              value.each do |v|
-                a << object if object[v]
-              end
-            end
-            objects = a.uniq
-          when 'categories'
-            a = Array.new
-            objects.each do |object|
-              a << object if (value.include?(object.send("#{object.class.to_s.underscore}_category").id.to_s) rescue nil)
-            end
-            objects = a.uniq
-          when 'tags'
-            a = Array.new
-            objects.each do |object|
-              object.tags.each do |tag|
-                a << object if value.include?(tag.id.to_s)
-              end
-            end
-            objects = a.uniq
-          end if value.size > 0
-      end
-    end
-    Kaminari.paginate_array(filter_authorized_objects(objects)).page(params[:page]).per(10)
-  end
-
-  def get_string_value_from_object(object)
-    s = object.name_translations[I18n.locale.to_s] unless s rescue nil
-    s = object.title_translations[I18n.locale.to_s] unless s rescue nil
-    s = object.name unless s rescue nil
-    s = object.title unless s rescue nil
-    s.downcase rescue ''
-  end
-
-  def get_objects_from_referenced_objects(object_class, objects, option)    
-    referer_ids = objects.distinct(option)
-    referenced_objects = object_class.find(referer_ids) rescue nil
-    if referenced_objects
-      a = Array.new 
-      referenced_objects.to_a.each { |referer| a << [get_string_value_from_object(referer), referer.id] }
-      sorted = params[:direction].eql?('asc') ? a.sort : a.sort.reverse!
-      sorted_objects = sorted.collect {|x| objects.where(option => x[1]).entries }
-      sorted_objects.flatten!
-      sorted_objects.uniq!
-      get_with_nil(objects, option, sorted_objects)
-    else
-      objects
-    end 
-  end
-
-  def get_objects_from_self(object_class, objects, option) 
-    referenced_class = object_class.relations[option].class_name.constantize
-    referenced_objects = referenced_class.all rescue nil
-    if referenced_objects
-      reverse_relation = nil
-      referenced_class.relations.each { |relation| reverse_relation = relation[1].name.to_s if relation[1].class_name.eql?(object_class.to_s) }
-      a = Array.new 
-      referenced_objects.each { |referenced_object| a << [get_string_value_from_object(referenced_object), referenced_object] }
-      a.compact!
-      sorted = params[:direction].eql?('asc') ? a.sort : a.sort.reverse!
-      sorted_objects = Array.new
-      sorted.each {|x| sorted_objects << x[1].send(reverse_relation) }
-      sorted_objects.flatten!
-      sorted_objects.uniq!
-      get_with_nil(objects, option, sorted_objects)
-    else
-      objects
-    end 
-  end
-
-  def get_with_nil(objects, option, sorted_objects)
-    tmp = Array.new 
-    objects.each { |object| tmp << [get_string_value_from_object(object), object] if (object.send(option).blank? || (object.send(option).size == 0 rescue nil)) }
-    sorted = params[:direction].eql?('asc') ? tmp.sort : tmp.sort.reverse!
-    sorted_tmp = sorted.collect {|a| a[1] }
-    a = params[:direction].eql?('asc') ? (sorted_tmp + sorted_objects) : (sorted_objects + sorted_tmp)
-    a.flatten
-  end
-
-
-  def get_viewable(object_class, query=nil)
-    objects = get_objects(object_class,query).order_by(:created_at, :desc)
-    Kaminari.paginate_array(objects).page(params[:page]).per(10)
-  end
-
-  def get_objects(object_class, query=nil)
-    object_class = object_class.classify.constantize
-    # debugger
-    # a=1
-    if query
-      objects = object_class.where(query)
-    else
-      objects = object_class.all
-    end
-    objects
-  end
-
-  def filter_authorized_objects(objects)
-    if(!is_admin? || !is_manager?)
-      objects.delete_if{ |object|
-        if object.is_pending == true
-          if check_permission(:manager)
-            object.create_user_id != current_user.id
-          else
-            !object.send("#{object.class.to_s.underscore}_category").authed_users('fact_check').include?(current_user) rescue false
-          end
-        else
-          false
-        end 
-      }
-    end
-    objects
-  end
-  
 end

app/controllers/orbit_frontend_component_controller.rb

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

app/controllers/orbit_widget_controller.rb

@@ -1,4 +1,9 @@
 class OrbitWidgetController< OrbitFrontendComponentController
+ include FrontEndArrayParamsHelper
+  before_filter {get_tags_and_cates(params)}
 
+  def get_tags_and_cates(params)
+    params = tags_and_cates(params)
+  end
 
 end

app/controllers/pages_controller.rb

@@ -5,7 +5,7 @@ class PagesController < ApplicationController
   # caches_page :index
 
   def check_frontend_open
-    if Me.frontend_closed
+    if Me.frontend_closed and current_user.nil?  #Need to be change
       redirect_to '/admin/dashboards'  
     end
   end
@@ -14,10 +14,11 @@ class PagesController < ApplicationController
     @item = Page.find_by_name('home')
 
     if @item
-      impressionist(@item)
+      delayed_impressionist(@item)
       render_page 
     else
-      render :text => t(:need_home)
+      redirect_to '/admin/dashboards',:notice=>t(:need_home)
+      # render :text => t(:need_home)
     end
   end
   
@@ -25,13 +26,13 @@ class PagesController < ApplicationController
     #begin  
       @item = Item.first(:conditions => {:path => params[:page_name]})
       if @item && @item.is_published && (@item.enabled_for.nil? ? true : @item.enabled_for.include?(I18n.locale.to_s))
-        impressionist(@item)
+        delayed_impressionist(@item)
         case @item.class.to_s
           when 'Page'
             if params[:clicked_field_name]
               render_page({"clicked_field_name"=>params["clicked_field_name"]}) unless save_from_no_lang_for_page
               else
-              render_page unless save_from_no_lang_for_page
+              render_page(params) unless save_from_no_lang_for_page
             end
           when 'Link'
             redirect_to(@item[:url]) unless save_from_no_lang_for_page
@@ -48,8 +49,8 @@ class PagesController < ApplicationController
     url = "/#{@item.path}"
     options = ''
     options << "#{options.blank? ? '?' : '&'}page_main=#{params[:page_main]}" unless params[:page_main].blank?
-    options << "#{options.blank? ? '?' : '&'}category_id=#{params[:category_id]}" unless params[:category_id].blank?
+    options << "#{options.blank? ? '?' : '&'}#{convert_array_param('category_id', params[:category_id])}" unless params[:category_id].blank?
-    options << "#{options.blank? ? '?' : '&'}tag_id=#{params[:tag_id]}" unless params[:tag_id].blank?
+    options << "#{options.blank? ? '?' : '&'}#{convert_array_param('tag_id', params[:tag_id])}" unless params[:tag_id].blank?
     options << "#{options.blank? ? '?' : '&'}search_query=#{params[:search_query]}" unless params[:search_query].blank?
     options << "#{options.blank? ? '?' : '&'}name=#{params[:name]}" unless params[:name].blank?
     uri = URI::escape(url + options)
@@ -61,8 +62,8 @@ class PagesController < ApplicationController
     url = "/#{@item.path}"
     options = ''
     options << "#{options.blank? ? '?' : '&'}id=#{params[:id]}" unless params[:id].blank?
-    options << "#{options.blank? ? '?' : '&'}category_id=#{params[:category_id]}" unless params[:category_id].blank?
+    options << "#{options.blank? ? '?' : '&'}#{convert_array_param('category_id', params[:category_id])}" unless params[:category_id].blank?
-    options << "#{options.blank? ? '?' : '&'}tag_id=#{params[:tag_id]}" unless params[:tag_id].blank?
+    options << "#{options.blank? ? '?' : '&'}#{convert_array_param('tag_id', params[:tag_id])}" unless params[:tag_id].blank?
     options << "#{options.blank? ? '?' : '&'}preview=#{params[:preview]}" unless params[:preview].blank?
     options << "#{options.blank? ? '?' : '&'}controller_action=#{params[:controller_action]}" unless params[:controller_action].blank?
     options << "#{options.blank? ? '?' : '&'}clicked_field_name=#{params[:clicked_field_name]}" unless params[:clicked_field_name].blank?
@@ -81,21 +82,41 @@ class PagesController < ApplicationController
     elsif params[:same_page_id]
       @item = Item.find(params[:same_page_id])
     else
-      category_ids = params[:category_id].is_a?(Array) ? params[:category_id] : [params[:category_id]]
+      category_ids = Array(params[:category_id]) unless params[:category_id].nil?
-      tag_ids = params[:tag_id].is_a?(Array) ? params[:tag_id] : [params[:tag_id]]
+      tag_ids = Array(params[:tag_id]) unless params[:tag_id].nil?
       module_app = ModuleApp.first(:conditions => {:key => params[:app_name]})
+
+      default_query = { is_published: true, module_app_id: module_app.id, :app_frontend_url.in => [params[:app_action], 'default_widget'] }
+      specific_categories = { :category => category_ids }
+      in_categories = { :category.in => category_ids }
+      nil_categories = { :category.in => [nil, []] }
+      specific_tags = { :tag => tag_ids }
+      in_tags = { :tag.in => tag_ids }
+      nil_tags = { :tag.in => [nil, []] }
+
       if !category_ids.blank? && !tag_ids.blank?
-        @item = Item.first(:conditions => {:module_app_id => module_app.id, :app_frontend_url => params[:app_action], :category.in => category_ids, :tag.in => tag_ids})
+        @item = Item.where(default_query.merge(specific_categories).merge(specific_tags)).first
-        @item = Item.first(:conditions => {:module_app_id => module_app.id, :app_frontend_url => params[:app_action], :category.in => category_ids, :tag.in => [nil, []]}) unless @item
+        @item = Item.where(default_query.merge(specific_categories).merge(in_tags)).first unless @item
+        @item = Item.where(default_query.merge(specific_categories).merge(nil_tags)).first unless @item
+        @item = Item.where(default_query.merge(specific_tags).merge(in_categories)).first unless @item
+        @item = Item.where(default_query.merge(specific_tags).merge(nil_categories)).first unless @item
+        @item = Item.where(default_query.merge(in_categories).merge(in_tags)).first unless @item
+        @item = Item.where(default_query.merge(in_categories).merge(nil_tags)).first unless @item
+        @item = Item.where(default_query.merge(in_tags).merge(nil_categories)).first unless @item
       elsif !category_ids.blank?
-        @item = Item.where(module_app_id: module_app.id, app_frontend_url: params[:app_action], :category.in => category_ids).any_in(tag: [nil, []]).first
+        @item = Item.where(default_query.merge(specific_categories).merge(nil_tags)).first
+        @item = Item.where(default_query.merge(specific_categories)).first unless @item
+        @item = Item.where(default_query.merge(in_categories).merge(nil_tags)).first unless @item
+        @item = Item.where(default_query.merge(in_categories)).first unless @item
       elsif !tag_ids.blank?
-        @item = Item.where(module_app_id: module_app.id, app_frontend_url: params[:app_action], :tag.in => tag_ids).any_in(category: [nil, []]).first
+        @item = Item.where(default_query.merge(specific_tags).merge(nil_categories)).first
+        @item = Item.where(default_query.merge(specific_tags)).first unless @item
+        @item = Item.where(default_query.merge(in_tags).merge(nil_categories)).first unless @item
+        @item = Item.where(default_query.merge(in_tags)).first unless @item
       end
       @item = Item.find(params[:orig_page]) unless @item || params[:orig_page].blank?
-      @item = Item.where(module_app_id: module_app.id, app_frontend_url: params[:app_action]).all_of("tag" => {"$in" => [nil, []]},"category" => { "$in" => [nil, []]}).first unless @item
+      @item = Item.where(default_query.merge(nil_categories).merge(nil_tags)).first unless @item
-      @item = Item.where(module_app_id: module_app.id, app_frontend_url: 'default_widget').first unless @item
+      @item = Item.where(default_query).first unless @item
-      @item = Item.where(module_app_id: module_app.id, app_frontend_url: params[:app_action]).first unless @item
     end
     raise PageError, 'Missing Frontend Page' if @item.nil?
   end

app/helpers/application_helper.rb

@@ -1,9 +1,22 @@
 module ApplicationHelper
-
+  include OrbitApp::Module::VisitorCounter
   FLASH_NOTICE_KEYS = [:error, :notice, :warning]
+
+
+  def current_path(param_hash)
+    request.referer.include?('?') ?   [request.referer,param_hash.to_param].join('&') : [request.referer,param_hash.to_param].join('?')
+  end
+
+  def delayed_impressionist(item)
+    user_id = current_user.nil? ? nil : current_user.id
+    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)
     @user.attribute_values.collect{|t| attribute_fields.include?(t.attribute_field) }.include?(true) rescue false
   end
+
   def show_attribute_value(value)
     if value.kind_of? Hash
         result = []
@@ -231,25 +244,27 @@ module ApplicationHelper
     "#{t(:view_count)}: #{object.view_count}"
   end
 
-  def display_visitors(options={})
+  # def display_visitors(options={})
-    Impression.where(options).and(:referrer.ne => nil).distinct(:session_hash).count
+  #   # Impression.where(options).and(:referrer.ne => nil).distinct(:session_hash).count
-  end
+  #   impressions = Impression.where(options).and(:referrer.ne => nil)
+  #   impressions.map{|i| i[:session_hash]}.uniq.count
+  # end
 
-  def display_visitors_today
+  # 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' => Date.today.end_of_day})
-  end
+  # end
 
-  def display_visitors_this_week
+  # 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_week, '$lte' => Date.today.end_of_week})
-  end
+  # end
 
-  def display_visitors_this_month
+  # 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_month, '$lte' => Date.today.end_of_month})
-  end
+  # end
 
-  def display_visitors_this_year
+  # 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_year, '$lte' => Date.today.end_of_year})
-  end
+  # end
 
   def display_date_time(object)
     object.strftime("%Y-%m-%d %H:%M")
@@ -292,4 +307,16 @@ module ApplicationHelper
     "http://#{request.host}:2#{site_number}00"
   end
 
+  def sortable(column, title = nil, options = {})
+    options[:remote] ||= true
+    title ||= column.titleize
+    css_class = column.to_s == params[:sort] ? "current #{params[:direction]}" : 'asc'
+    direction = column.to_s == params[:sort] && params[:direction] == 'asc' ? 'desc' : 'asc'
+    link_to title, params.merge({direction: direction, sort: column, sort_options: column}), {:class => "#{css_class} sortable", :remote => options[:remote]}
+  end
+
+  def convert_array_param(key, array)
+    Array(array).collect{|t| "#{key}[]=#{t}"}.join("&")
+  end
+
 end

app/helpers/default_widget_helper.rb

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

app/helpers/orbit_form_helper.rb

@@ -8,7 +8,7 @@ module OrbitFormHelper
     options[:icon_date] ||= 'icons-calendar'
     options[:icon_clear] ||= 'icons-cross-3'
     options[:input_class] ||= 'input-large'
-    options[:value] ||= options[:object][method] if options[:object] && options[:object][method]
+    options[:value] ||= options[:object].send(method) if options[:object] && options[:object][method]
     case options[:picker_type]
     when 'date'
       content_tag :div, :id => options[:id], :class => options[:class] do
@@ -22,7 +22,7 @@ module OrbitFormHelper
       options[:label] ||= I18n.t('datetime_picker.separated.label')
       content_tag :div, :id => options[:id], :class => "separated_picker #{options[:class]}" do
         concat label_tag options[:label] unless options[:no_label]
-        concat hidden_field(object_name, method)
+        concat hidden_field(object_name, method, :value => options[:value])
         concat separated_picker(object_name, method, options)
       end
     else

app/jobs/backup_server.rb

@@ -11,7 +11,7 @@ class BackupServer
 
     %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}]
-    OrbitJobLogger.info "DB backup done Path:#{dbdirectory}"
+    OrbitLogger.info "DB backup done Path:#{dbdirectory}"
     
   end
 end

app/jobs/dashboard_counter.rb

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

app/jobs/delayed_impressionist.rb

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

app/jobs/email_cron.rb

@@ -0,0 +1,42 @@
+class EmailCron
+  @queue = :mail
+
+  def self.perform
+
+    @datas = MailCron.where(:mail_sentdate.lte => Time.now)
+
+    @datas.each do |mail_data| 
+
+      @mail_j = 0
+      @read_mails = Array.new 
+
+      @mails = mail_data.mail_to.split(",")
+
+      @mails.each do |send_mail|
+
+        @read_mails << send_mail
+
+        @mail_j += 1 
+
+        if  0 == @mail_j % 30 
+          MailCronMailer.cron_mail( mail_data.id, @read_mails.join(',') ).deliver
+          @read_mails = Array.new
+
+          sleep 10
+        end
+
+      end
+
+      if !@read_mails.join(',').blank?
+        MailCronMailer.cron_mail( mail_data.id, @read_mails.join(',') ).deliver
+        @read_mails = Array.new
+
+        sleep 10
+      end  
+
+    end
+
+  end
+
+
+end

app/jobs/send_ask_notice_mail.rb

@@ -0,0 +1,10 @@
+class SendAskNoticeMail
+  @queue = :mail
+
+  def self.perform(ask_admin_id, ask_question_id)
+    ask_admin = AskAdmin.find(ask_admin_id)
+    ask_question = AskQuestion.find(ask_question_id)
+    AskMailer.notice(ask_admin, ask_question).deliver
+  end
+
+end

app/jobs/send_ask_reply_mail.rb

@@ -0,0 +1,9 @@
+class SendAskReplyMail
+  @queue = :mail
+
+  def self.perform(ask_question_id)
+    ask_question = AskQuestion.find(ask_question_id)
+    AskMailer.reply(ask_question).deliver
+  end
+
+end

app/jobs/update_tag_cloud.rb

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

app/jobs/user_action_recoder.rb

@@ -0,0 +1,8 @@
+class UserActionRecoder
+ @queue = :low
+ def self.perform(user,params)  
+   UserAction.create!(:user=>user,:params=>params,:page=>"#{params['controller']}##{params['action']}")
+    true
+ end
+
+end

app/mailer/mail_cron_mailer.rb

@@ -0,0 +1,81 @@
+class MailCronMailer < ActionMailer::Base 
+  default :from => "orbit_test@rulingcom.com"
+  
+  def get_settings
+    
+    @site = Site.first
+
+    @smtp_settings = {
+      :address => @site['site_settings']['address'],
+      :port => @site['site_settings']['port'],
+      :domain => @site['site_settings']['domain'],
+      :authentication => @site['site_settings']['authentication'],
+      # :user_name => @site['site_settings']['user_name'],
+      # :password => @site['site_settings']['password'],
+      :tls => (@site['site_settings']['tls'] == '0' ? false : true ) ,
+      :enable_starttls_auto => (@site['site_settings']['enable_starttls_auto'] == '0' ? false : true )
+    }
+
+    if !@site['site_settings']['user_name'].blank? 
+      @smtp_settings[:user_name] = @site['site_settings']['user_name']
+    end
+
+    if !@site['site_settings']['password'].blank? 
+      @smtp_settings[:password] = @site['site_settings']['password']
+    end 
+
+
+    ActionMailer::Base.smtp_settings = @smtp_settings
+
+  end
+
+
+  def cron_mail( data_id, group_mail )
+    
+    get_settings
+
+    @data = MailCron.find(data_id)
+
+    if @data
+
+      @user = User.find(@data.create_user_id)
+      
+      if !@data.mail_cron_files.blank?
+        @data.mail_cron_files.each_with_index do |mail_cron_file, i|
+          file_type = File.extname(mail_cron_file.file.to_s)
+          file_content = Mongo::GridFileSystem.new(Mongoid.database).open(mail_cron_file.file.url.gsub("/gridfs/", "").force_encoding("UTF-8"), 'r')
+          attachments["#{mail_cron_file.title}#{file_type}"] = file_content.read
+        end 
+      end
+
+      if !@data.mail_content["text"].blank?
+        mail( :from => @data.mail_from, :reply_to => @data.mail_reply_to, :bcc => group_mail, :subject => @data.mail_subject ) do |format| 
+          format.html { render :text => @data.mail_content["text"] } 
+        end 
+      elsif !@data.mail_content["template"].blank?
+        mail( :from => @data.mail_from, :reply_to => @data.mail_reply_to, :bcc => group_mail, :subject => @data.mail_subject ) do |format| 
+          format.html { render :template => @data.mail_content["template"], :collection => @data.mail_content  } 
+        end 
+      end 
+
+
+      @mail_cron_log = {  
+        :mail_subject => @data.mail_subject,
+        :mail_to => group_mail,
+        :mail_user => @user.name,
+        :mailer_count => group_mail.split(",").size,
+        :mail_from_app => @data.mail_from_app 
+      } 
+
+      @mail_cron_log = MailCronLog.new(@mail_cron_log) 
+
+
+      @mail_cron_log.save
+
+      @data.destroy
+
+    end
+
+  end
+
+end

app/models/asset.rb

@@ -2,6 +2,8 @@ class Asset
 
   include Mongoid::Document
   include Mongoid::Timestamps
+  include OrbitTag::Taggable
+  taggable
 
   mount_uploader :data, FileAssetUploader
 
@@ -16,19 +18,14 @@ class Asset
 
   belongs_to :asset_category
   belongs_to :assetable, polymorphic: true
-  has_and_belongs_to_many :tags, :class_name => "AssetTag"
+  # has_and_belongs_to_many :tags, :class_name => "AssetTag"
 
   before_save :clean_tags
 
-  def sorted_tags
-    #tags.order_by(I18n.locale, :asc)
-	tags
-  end
-
   protected
 
   def clean_tags
-    self.tag_ids.delete('')
+    self.tagged_ids.delete('')
   end
   
 end

app/models/item.rb

@@ -26,7 +26,7 @@ class Item
   after_save :rebuild_children_path, :if => "path_changed?"
   
   def enabled_for_lang(lang)
-    enabled_for.include?(lang)
+    enabled_for.include?(lang) rescue false
   end
 
   def self.find_by_name(item_name)
@@ -65,6 +65,10 @@ class Item
     end
   end
 
+  def self.structure_ordered_items
+    self.get_children(Item.root, [])
+  end
+  
   protected
   
   def rebuild_path
@@ -88,4 +92,12 @@ class Item
     true
   end
 
+  def self.get_children(item, tree)
+    tree << item
+    item.children.each do |child|
+      self.get_children(child, tree)
+    end
+    tree
+  end
+    
 end

app/models/mail_cron.rb

@@ -0,0 +1,70 @@
+class MailCron
+  
+  include Mongoid::Document
+  include Mongoid::Timestamps
+  
+
+  field :mail_from_app
+  field :mail_from 
+  field :mail_to  
+  field :mail_reply_to  
+  field :mail_subject
+  field :mail_content, :type => Hash
+  field :mail_sentdate , :type => DateTime
+
+  field :create_user_id
+  field :update_user_id
+  
+  has_many :mail_cron_files, :autosave => true, :dependent => :destroy 
+
+  accepts_nested_attributes_for :mail_cron_files, :allow_destroy => true 
+
+  after_save :save_mail_cron_files
+
+
+  def save_mail_cron_files
+    self.mail_cron_files.each do |t|
+      if t.should_destroy
+        t.destroy
+      end
+    end
+  end
+
+  def self.send_mail_now(mail_cron_id)
+
+    mail_data = MailCron.find(mail_cron_id)
+
+    if !mail_data.blank?
+
+      @mail_j = 0
+      @read_mails = Array.new 
+
+      @mails = mail_data.mail_to.split(",")
+
+      @mails.each do |send_mail|
+
+        @read_mails << send_mail
+
+        @mail_j += 1 
+
+        if  0 == @mail_j % 30 
+          MailCronMailer.cron_mail( mail_data.id, @read_mails.join(',') ).deliver
+          @read_mails = Array.new
+
+          sleep 10
+        end
+
+      end
+
+      if !@read_mails.join(',').blank?
+        MailCronMailer.cron_mail( mail_data.id, @read_mails.join(',') ).deliver
+        @read_mails = Array.new
+
+        sleep 10
+      end  
+
+    end  
+    
+  end
+
+end

app/models/mail_cron_file.rb

@@ -0,0 +1,13 @@
+class MailCronFile
+
+  include Mongoid::Document
+  include Mongoid::Timestamps
+
+  mount_uploader :file, AssetUploader
+
+  field :should_destroy, :type => Boolean  
+  field :title
+  
+  belongs_to :mail_cron
+
+end

app/models/mail_cron_log.rb

@@ -0,0 +1,14 @@
+class MailCronLog
+  
+  include Mongoid::Document
+  include Mongoid::Timestamps
+  
+
+  field :mail_subject  
+  field :mail_to 
+  field :mail_user 
+  field :mailer_count 
+  field :mail_from_app 
+
+
+end

app/models/module_app.rb

@@ -19,6 +19,7 @@ class ModuleApp
     self[:get_widget_style] = reg.get_widgets
     self[:using_default_widget] = !reg.get_default_widget.blank?
     self[:widgets] = reg.get_widgets
+    self[:has_tag] = reg.get_has_tags
   end
 
 
@@ -136,4 +137,26 @@ class ModuleApp
     self.where(key: key)[0] rescue nil
   end
 
+  def sorted_tags_for_cloud
+    temp_tags = {}
+    self.tags.each{ |tag|
+      temp_tags.merge!({tag => tag.cloud_view_count})
+    }
+    if !temp_tags.blank?
+      sorted_tags = temp_tags.sort{|a,b| a[1]<=>b[1]}.reverse
+      sorted_tags[0][1] = :hot1
+      offset = (sorted_tags.size - 1) / 3
+      i = 1
+      class_i = 2
+      sorted_tags[1..-1].collect!{ |x|
+        x[1] = "hot#{class_i}"
+        i == offset ? i = 1 : i += 1 if class_i < 4
+        class_i += 1 if i == offset && class_i < 4
+      }
+      sorted_tags
+    else
+      []
+    end
+  end
+  
 end

app/models/mongoid/sortable.rb

@@ -0,0 +1,34 @@
+module Mongoid
+  module Sortable
+    extend ActiveSupport::Concern
+
+    included do
+      field :sort_number, type: Integer
+
+      after_initialize :set_sort_number
+    end
+
+    module ClassMethods
+      def default_sort(sorted = true)
+        if !sorted
+          asc(:sort_number)
+        else
+          asc
+        end
+      end
+    end
+
+    private
+
+    def set_sort_number
+      if self.new? && self.sort_number.nil?
+        last_record = self.class.desc(:sort_number).first
+        if last_record && last_record.sort_number
+          self.sort_number = (last_record.sort_number + 10) / 10 * 10
+        else
+          self.sort_number = 10
+        end
+      end
+    end
+  end
+end

app/models/page.rb

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

app/models/prototype_auth.rb

@@ -51,8 +51,9 @@ class PrototypeAuth
   end
   
   def remove_operation(item,obj)
-    if (self.send item).include? obj
+    item = (item.to_s.singularize == item.to_s) ? "#{item.to_s}_id" : "#{item.to_s.singularize}_ids"
-       (self.send item).delete obj
+    if (self.send item).include? obj.id
+       (self.send item).delete obj.id
       self.save!
     else
       false #should put error message for user not existed in list

app/models/site.rb

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

app/models/tag.rb

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

app/models/tagging.rb

@@ -6,4 +6,12 @@ class Tagging
 
   belongs_to :tag
   belongs_to :taggable, polymorphic: true
+
+  before_destroy :update_taggable_tag_ids
+
+  private
+
+  def update_taggable_tag_ids
+    self.taggable.remove_id(self.tag.id)
+  end
 end

app/models/user/user.rb

@@ -3,7 +3,7 @@ class User
   include Mongoid::Document
   include Mongoid::Timestamps
 
-  devise :database_authenticatable, :recoverable, :rememberable, :trackable, :registerable, :validatable #, :timeoutable
+  devise :database_authenticatable, :recoverable, :rememberable, :trackable, :validatable #, :timeoutable
   
   mount_uploader :avatar, AvatarUploader
   
@@ -31,6 +31,8 @@ class User
   # has_many :papers, :autosave => true, :dependent => :destroy
   has_and_belongs_to_many :sub_role_tags
 
+  has_many :user_actions, :dependent => :destroy
+
 #  has_and_belongs_to_many :statuses
   has_and_belongs_to_many :roles
   has_and_belongs_to_many :sub_roles
@@ -181,7 +183,14 @@ class User
   def self.get_member_list_attribute_value(user_id,role_type,field_key)
     @attribute = ::Attribute.where(:key => role_type).first
     @AttributeField = ::AttributeField.where(:key => field_key, :attribute_id => @attribute.id).first
-    return ::AttributeValue.where(attribute_field_id: @AttributeField.id, :user_id => user_id).first[I18n.locale.to_s]
+    return ::AttributeValue.where(attribute_field_id: @AttributeField.id, :user_id => user_id).first
+  end
+
+  def self.get_role_member_data_by_sort(role_status_id)
+    a = Array.new
+    where(:role_status_ids=>role_status_id).desc(:_id).collect{|t| a << [ get_member_list_attribute_value(t.id,"staff","job_title")['val'].to_i, t ]  }
+    member_data = a.sort
+    member_data_tmp = member_data.collect {|v| v[1] }
   end
 
   def create_dept_cache

app/models/user/user_action.rb

@@ -0,0 +1,10 @@
+class UserAction
+  include Mongoid::Document
+  include Mongoid::Timestamps
+
+  belongs_to :user
+  field :params,:type => Hash
+
+  field :page
+
+end

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

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

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

@@ -1,7 +1,8 @@
 <% content_for :side_bar do %>
-	<%= render 'admin/sites/side_bar' %>
+  <%= render :partial => 'layouts/side_bar', :locals => {:link_name => t('site.settings'), :link_url => admin_site_site_info_path(@site), :side_bar_content => 'admin/sites/side_bar'} %>
 <% end %>
 
+
 <div class="main2">
 	<%= form_tag '',:multipart => true,:action=>"post" do |f| %>
 

app/views/admin/mail_cron_logs/_clear_filters.html.erb

@@ -0,0 +1,3 @@
+<div class="filter-clear">
+	<%= link_to content_tag(:i, nil, :class => 'icons-cycle') + t(:clear), admin_mail_crons_path(:filter => @filter, :sort => params[:sort], :direction => params[:direction], :clear => true, :type => type), :class => "btn btn-small js_history" %>
+</div>

app/views/admin/mail_cron_logs/_filter.html.erb

@@ -0,0 +1,11 @@
+<div id="filter" class="subnav">
+	<div class="filters">
+		<div id="sort_headers" class="table-label">
+			<%= render 'sort_headers' %> 
+		</div>
+	</div>
+</div>
+
+<% content_for :page_specific_javascript do %>
+	<%= javascript_include_tag "sort_header" %>
+<% end %>

app/views/admin/mail_cron_logs/_mail_cron_log.html.erb

@@ -0,0 +1,29 @@
+                <tr id="<%= dom_id mail_cron_log %>" class="with_action">
+                    <td class="span1">
+                        <% if is_manager? %>
+                            <%= check_box_tag 'to_delete[]', mail_cron_log.id, false, :class => "checkbox_in_list" %>
+                        <% end -%>
+                    </td>
+                    <td class="span1-2">
+                        <%= mail_cron_log.mail_subject %>
+                        <div class="quick-edit">
+                            <ul class="nav nav-pills hide">
+                                <%if at_least_module_manager %> 
+                                <li><%= link_to t(:delete_), admin_mail_cron_log_path(mail_cron_log), :confirm => t('sure?'), :method => :delete, :remote => true %></li>
+                                <% end -%>
+                            </ul>
+                        </div>
+                    </td>
+                    <td class="span2">
+                        <%= mail_cron_log.mail_to.gsub(/,/, "<br />").html_safe %> 
+                    </td>
+                    <td class="span2">
+                        <%= mail_cron_log.mail_user %> 
+                    </td>
+                    <td class="span2">
+                        <%= mail_cron_log.mail_from_app %> 
+                    </td>
+                    <td class="span2">
+                        <%= display_date_time(mail_cron_log.created_at) %>
+                    </td>
+                </tr>

app/views/admin/mail_cron_logs/_sort_headers.html.erb

@@ -0,0 +1,6 @@
+<%= render_sort_bar(true, delete_admin_mail_cron_logs_path(:direction => params[:direction], :sort => params[:sort], :sort_options => params[:sort_options]),  
+	['subject', 'mail_subject','span2', :subject] ,  
+	['mail_to', 'mail_to','span2', :mail_to] ,  
+	['mail_user', 'mail_user','span2', :mail_user] ,  
+	['mail_from_app', 'mail_from_app','span2', :mail_from_app] ,  
+	['sentdate', 'created_at','span2', :sentdate] ).html_safe %>

app/views/admin/mail_cron_logs/destroy.js.erb

@@ -0,0 +1 @@
+$("#<%= dom_id @mail_cron_log %>").remove();

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

@@ -0,0 +1,28 @@
+<% content_for :side_bar do %>
+  <%= render :partial => 'layouts/side_bar', :locals => {:link_name => t('site.settings'), :link_url => admin_site_site_info_path(@site), :icon => 'icons-cog', :side_bar_content => 'admin/sites/side_bar'} %>
+<% end %>
+
+ <%= render 'filter' %>
+<table class="table main-list">
+  <thead>
+    <tr>
+      <th class="span1"></th>
+      <th class="span2"></th>
+      <th class="span2"></th>
+      <th class="span2"></th>
+      <th class="span2"></th>
+      <th class="span2"></th>
+    </tr>
+  </thead>
+    <tbody id="tbody_mail_cron_logs" class="sort-holder">
+      <%= render :partial => "mail_cron_log",:collection=> @mail_cron_logs%>
+    </tbody>
+  </table>
+
+
+<div class="form-actions form-fixed pagination-right"> 
+  <div id="web_link_pagination" class="paginationFixed">
+  <%= paginate @mail_cron_logs, :params => {:direction => params[:direction], :sort => params[:sort], :filter => @filter, :new_filter => nil} %>
+  </div>
+</div>
+  

app/views/admin/mail_cron_logs/index.js.erb

@@ -0,0 +1,4 @@
+$("#delete_all").attr("action", "<%= delete_admin_mail_cron_logs_path(:direction => params[:direction], :sort => params[:sort], :filter => @filter, :new_filter => nil, :sort_options => params[:sort_options]) %>");
+$("#sort_headers").html("<%= j render 'sort_headers' %>");
+$("#tbody_mail_cron_logs").html("<%= j render :partial => 'mail_cron_log', :collection => @mail_cron_logs %>");
+$("#mail_cron_log_pagination").html("<%= j paginate @mail_cron_logs, :params => {:direction => params[:direction], :sort => params[:sort], :filter => @filter, :new_filter => nil} %>");

app/views/admin/mail_crons/_clear_filters.html.erb

@@ -0,0 +1,3 @@
+<div class="filter-clear">
+	<%= link_to content_tag(:i, nil, :class => 'icons-cycle') + t(:clear), admin_mail_crons_path(:filter => @filter, :sort => params[:sort], :direction => params[:direction], :clear => true, :type => type), :class => "btn btn-small js_history" %>
+</div>

app/views/admin/mail_crons/_filter.html.erb

@@ -0,0 +1,11 @@
+<div id="filter" class="subnav">
+	<div class="filters">
+		<div id="sort_headers" class="table-label">
+			<%= render 'sort_headers' %> 
+		</div>
+	</div>
+</div>
+
+<% content_for :page_specific_javascript do %>
+	<%= javascript_include_tag "sort_header" %>
+<% end %>

app/views/admin/mail_crons/_form.html.erb

@@ -0,0 +1,122 @@
+<div id= "poststuff">
+<% # encoding: utf-8 %>
+
+  <%= f.error_messages %>
+
+	<!--Widget start-->
+	
+	<div id="sub-wiget"> 
+
+		<div id="widget-date" class="widget-box widget-size-300"> 
+			<h3 class="widget-title"><i class="icons-calendar"></i><%= t(:date_) %></h3>
+				<div class="widget-content clear">
+				<div class="control-group">
+					<%= f.datetime_picker :mail_sentdate, :picker_type => 'separated', :label => t(:start) %>
+				</div> 
+			</div>
+		</div>
+  
+	</div>
+  
+  
+<!--Wiget End-->
+<!--Post Start-->
+
+	<div id="post-body">
+		<div id="post-body-content" class="clear">
+		
+			<%= f.label :mail_subject ,t(:mail_subject)%> 
+			<%= f.text_field :mail_subject %>
+		
+			<%= f.label :mail_from ,t(:mail_from)%> 
+			<%= f.text_field :mail_from %>
+		
+			<%= f.label :mail_reply_to ,t(:mail_reply_to)%> 
+			<%= f.text_field :mail_reply_to %>
+		
+			<%= f.label :mail_to ,t(:mail_to)%> 
+			<%= f.text_field :mail_to %> 
+		
+			<%= f.label :mail_content ,t(:mail_content)%> 
+			<%= f.text_area :mail_content, :class=>"span12", :cols=>"25", :rows=>"10" %>
+
+		</div>
+
+
+
+
+
+		<div>
+					
+			<div id='plugin_files' class="plugin_files_block">
+				
+			<table class="table table-condensed">
+				<thead>
+					<tr>
+						<th>File</th>
+						<th>File Name</th>
+						<th class="span1"></th>
+					</tr>
+				</thead>
+				<tfoot>
+					<tr>
+						<td style="text-align:center" colspan="3">
+							<div id='add_plugin_file' class="info_input plugin_files_block">
+								<%= hidden_field_tag 'plugin_file_field_count', @mail_cron.mail_cron_files.count %>
+								<a class="add"><span class="btn btn-primary btn-small"><i class="icon-plus icon-white"></i> ADD/新增</span></a>
+							</div>
+						</td>
+					</tr>
+				
+				</tfoot>
+				<tbody>
+					
+					<% @mail_cron.mail_cron_files.each_with_index do |mail_cron_file, i| %>
+						<%= f.fields_for :mail_cron_files, mail_cron_file do |f| %>
+							<%= render :partial => 'form_file', :object => mail_cron_file, :locals => {:f => f, :i => i} %>
+						<% end %>
+					<% end %>	
+				</tbody>
+			</table>
+			
+			</div>
+			
+		</div>
+
+
+<!--Post End-->
+	</div>
+
+  
+	<div class="form-actions">
+	<%= f.submit t('submit'), :class=>'btn btn-primary' %>
+	<%= link_to t('cancel'), get_go_back, :class=>"btn" %> 
+	</div> 
+
+
+	
+
+<% content_for :page_specific_javascript do %>
+	<%= javascript_include_tag "archive_plugin_form" %>
+	<script>
+		$('#add_plugin_file a.add').live('click', function(){
+			var new_id = $(this).prev().attr('value');
+			var old_id = new RegExp("new_add_plugin_files", "g");
+			$(this).prev().attr('value', parseInt(new_id) + 1);
+			$(this).parents('table').append(("<%= escape_javascript(add_attribute 'form_file', f, :mail_cron_files) %>").replace(old_id, new_id));
+		});
+		
+		$('.add_plugin_files_block a.delete').live('click', function(){
+		  $(this).parents('.list_item').remove();
+		});
+
+		$('.action a.remove_existing_record').live('click', function(){
+		  $(this).next('.should_destroy').attr('value', 1);
+		  $("tr#add_plugin_file_" + $(this).prev().attr('value')).hide();
+		});
+
+	</script>
+<% end %>
+
+
+</div> 

app/views/admin/mail_crons/_form_file.html.erb

@@ -0,0 +1,35 @@
+<% # encoding: utf-8 %>
+
+		<tr id="<%= "plugin_file_#{form_file.id}" if !form_file.new_record? %>" class='list_item'>
+			<td>
+				<div class="control-group">
+					<div class="controls">
+					<%= f.file_field :file %>
+					<%= form_file.file.file ? ( link_to t(:view), form_file.file.url, {:class => 'btn', :target => '_blank', :title => t(:view)} ) : '' %>
+					</div>
+				</div>
+			</td>	
+			<td>	
+			
+				<div class="tab-content">
+
+					<%= f.text_field :title %>
+					
+				</div>
+				
+			</td>
+			
+			<td>
+			<span class="action">
+			<% if form_file.new_record? %>
+			  <a class="delete"><i class="icon-remove"></i></a>
+			<% else %>	
+			  <%= f.hidden_field :id %>
+			  <a class="remove_existing_record"><i class="icon-remove"></i></a>
+			  <%= f.hidden_field :should_destroy, :value => nil, :class => 'should_destroy' %>
+			<% end %>
+			</span>
+			
+			</td>
+		</tr>
+		

app/views/admin/mail_crons/_mail_cron.html.erb

@@ -0,0 +1,26 @@
+                <tr id="<%= dom_id mail_cron %>" class="with_action">
+                    <td class="span1">
+                        <% if is_manager? %>
+                            <%= check_box_tag 'to_delete[]', mail_cron.id, false, :class => "checkbox_in_list" %>
+                        <% end -%>
+                    </td>
+                    <td class="span1-2">
+                        <%= mail_cron.mail_subject %>
+                        <div class="quick-edit">
+                            <ul class="nav nav-pills hide">
+                                <%if at_least_module_manager %>
+                                <li><%= link_to t(:delete_), admin_mail_cron_path(mail_cron), :confirm => t('sure?'), :method => :delete, :remote => true %></li>
+                                <% end -%>
+                            </ul>
+                        </div>
+                    </td>
+                    <td class="span2">
+                        <%= mail_cron.mail_to.gsub(/,/, "<br />").html_safe %> 
+                    </td>
+                    <td class="span2">
+                        <%= mail_cron.mail_from_app %> 
+                    </td>
+                    <td class="span2">
+                        <%= display_date_time(mail_cron.mail_sentdate) %>
+                    </td>
+                </tr>

app/views/admin/mail_crons/_sort_headers.html.erb

@@ -0,0 +1,5 @@
+<%= render_sort_bar(true, delete_admin_mail_crons_path(:direction => params[:direction], :sort => params[:sort], :sort_options => params[:sort_options]),  
+	['subject', 'mail_subject','span2', :mail_subject] ,  
+	['mail_to', 'mail_to','span2', :mail_to] ,  
+	['mail_from_app', 'mail_from_app','span2', :mail_from_app] ,  
+	['sentdate', 'mail_sentdate','span2', :mail_sentdate] ).html_safe %>

app/views/admin/mail_crons/destroy.js.erb

@@ -0,0 +1 @@
+$("#<%= dom_id @mail_cron %>").remove();

app/views/admin/mail_crons/edit.html.erb

@@ -0,0 +1,9 @@
+<% content_for :side_bar do %>
+  <%= render :partial => 'layouts/side_bar', :locals => {:link_name => t('site.settings'), :link_url => admin_site_site_info_path(@site), :icon => 'icons-cog', :side_bar_content => 'admin/sites/side_bar'} %>
+<% end %>
+
+<h1><%= t('mail_cron.editing_mail_cron') %></h1>
+
+<%= form_for @mail_cron, :url => admin_mail_cron_path(@mail_cron), :html => {:class => 'clear'} do |f| %>
+	<%= render :partial => 'form', :locals => {:f => f} %>
+<% end %>

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

@@ -0,0 +1,27 @@
+<% content_for :side_bar do %>
+  <%= render :partial => 'layouts/side_bar', :locals => {:link_name => t('site.settings'), :link_url => admin_site_site_info_path(@site), :icon => 'icons-cog', :side_bar_content => 'admin/sites/side_bar'} %>
+<% end %>
+
+ <%= render 'filter' %>
+<table class="table main-list">
+  <thead>
+    <tr>
+      <th class="span1"></th>
+      <th class="span2"></th>
+      <th class="span2"></th>
+      <th class="span2"></th>
+      <th class="span2"></th>
+    </tr>
+  </thead>
+    <tbody id="tbody_mail_crons" class="sort-holder">
+      <%= render :partial => "mail_cron",:collection=> @mail_crons%>
+    </tbody>
+  </table>
+
+
+<div class="form-actions form-fixed pagination-right"> 
+  <div id="web_link_pagination" class="paginationFixed">
+  <%= paginate @mail_crons, :params => {:direction => params[:direction], :sort => params[:sort], :filter => @filter, :new_filter => nil} %>
+  </div>
+</div>
+  

app/views/admin/mail_crons/index.js.erb

@@ -0,0 +1,4 @@
+$("#delete_all").attr("action", "<%= delete_admin_mail_crons_path(:direction => params[:direction], :sort => params[:sort], :filter => @filter, :new_filter => nil, :sort_options => params[:sort_options]) %>");
+$("#sort_headers").html("<%= j render 'sort_headers' %>");
+$("#tbody_mail_crons").html("<%= j render :partial => 'mail_cron', :collection => @mail_crons %>");
+$("#mail_cron_pagination").html("<%= j paginate @mail_crons, :params => {:direction => params[:direction], :sort => params[:sort], :filter => @filter, :new_filter => nil} %>");

app/views/admin/mail_crons/new.html.erb

@@ -0,0 +1,12 @@
+
+<% content_for :side_bar do %>
+  <%= render :partial => 'layouts/side_bar', :locals => {:link_name => t('site.settings'), :link_url => admin_site_site_info_path(@site), :icon => 'icons-cog', :side_bar_content => 'admin/sites/side_bar'} %>
+<% end %>
+
+<div id="poststuff">
+<h1><%= t('mail_cron.new_mail_cron') %></h1>
+<%= form_for @mail_cron, :url => admin_mail_crons_path, :html => {:class => 'clear'} do |f| %>
+	<%= render :partial => 'form', :locals => {:f => f} %>
+<% end %>
+</div> 
+

app/views/admin/sites/_side_bar.html.erb

@@ -8,6 +8,9 @@
 		<%= content_tag :li, link_to(t('mail.setting'), admin_site_mail_setting_path(@site)), :class => active_for_action('sites', 'mail_setting') %>
 		<%#= content_tag :li, link_to(t(:theme), admin_site_ui_theme_path(@site)), :class => active_for_action('sites', 'ui_theme') %>
 		<%= content_tag :li, link_to(t('sitemap'), admin_site_sitemap_path(@site)), :class => active_for_action('sites', 'sitemap') %>
+		<%= content_tag :li, link_to(t('user_actions'), admin_user_actions_path), :class => active_for_action('user_actions', 'index') %>
+		<%= content_tag :li, link_to(t('mail.mail_cron'), admin_mail_crons_path), :class => active_for_action('mail_cron', 'index') %>
+		<%= content_tag :li, link_to(t('mail.mail_cron_log'), admin_mail_cron_logs_path), :class => active_for_action('mail_cron_log', 'index') %>
 	<% end -%>
 
 <% end -%>

app/views/admin/sites/show_system_preference.html.erb

@@ -9,7 +9,7 @@
 <div class="tab-content">
   <div class="tab-pane  active in" id="summary">
         <h2><%= I18n.t("site.system_preference_.summary.disk_space") %>:</h2>
-         <%= content_tag :p,@site.disk_space %>
+         <%= content_tag :p,@site.disk_space.gsub(/\n/,"<br />").html_safe if @site.disk_space %>
         <h2><%= I18n.t("site.system_preference_.summary.code_update_at") %>: </h2>
         <% @site.system_package_info.each do |index,value| %>
           <h2><%= index.titleize %> <%= I18n.t("site.system_preference_.summary.version") %>:</h2>       
@@ -20,7 +20,7 @@
   <div class="tab-pane" id="commits">
     <% if @git_commit_list_file %>
       <% @git_commit_list_file.lines do |line|%>
-        <%= (line + "<br/>").html_safe %>
+        <%= line %><br/>
       <% end%>
       <% else %>
       <div class="well"><%= I18n.t("site.system_preference_.summary.no_data") %></div>
@@ -29,7 +29,7 @@
   <div class="tab-pane" id="backups">
     <%if @db_backup_list_file %>
       <% @db_backup_list_file.lines do |line|%>
-        <%=(line + "<br/>").html_safe %>
+        <%=line %><br/>
       <% end %>
       <% else %>
         <div class="well"><%= I18n.t("site.system_preference_.summary.no_data") %></div>
@@ -38,7 +38,7 @@
   <div class="tab-pane" id="resque_logs">
   <%if @db_backup_list_file %>
     <% @resque_logs_file.lines do |line|%>
-      <%=(line + "<br/>").html_safe %>
+      <%=line %><br/>
     <% end if @resque_logs_file%>
     <%else %>
           <div class="well"><%= I18n.t("site.system_preference_.summary.no_data") %></div>

app/views/admin/tags/_tag.html.erb

@@ -8,6 +8,6 @@
 	</div>
 	<div class="action">
 	<%= link_to t(:edit), edit_admin_tag_path(tag, :module_app_id => @module_app_id), :remote => true  %>
-	<%= link_to t(:delete_), admin_tag_path(tag), :confirm => t('sure?'), :method => :delete, :remote => true  %>
+	<%= link_to t(:delete_), admin_tag_path(tag, :module_app_id => @module_app_id), :confirm => t('sure?'), :method => :delete, :remote => true  %>
 	</div>
 </div>

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

@@ -0,0 +1,20 @@
+<% content_for :side_bar do %>
+  <%= render :partial => 'layouts/side_bar', :locals => {:link_name => t('site.settings'), :link_url => admin_site_site_info_path(@site), :icon => 'icons-cog', :side_bar_content => 'admin/sites/side_bar'} %>
+<% end %>
+
+<table class="table">
+  <tr>
+    <th><%= I18n.t 'user_action.time' %></th>
+    <th><%= I18n.t 'user_action.name' %></th>
+    <th><%= I18n.t 'user_action.page' %></th>
+  </tr>
+
+  <%  @user_actions.each do |user_action| %>
+    <tr>
+      <td><%= user_action.created_at %></td>
+      <td><%= user_action.user.name %></td>
+      <td><%= user_action.page %></td>
+    </tr> 
+  <% end %>
+</table>
+

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

@@ -6,7 +6,7 @@
       <%= content_tag :li, link_to((t(:member_authorization) + content_tag(:i, nil, :class => 'icon-chevron-right')).html_safe, '#'), :class => active_for_action('users_new_interfacexx', 'index')  if (is_admin? rescue nil) %>
       <%= content_tag :li, link_to((t(:member_registration) + content_tag(:i, nil, :class => 'icon-chevron-right')).html_safe, '#'), :class => active_for_action('users_new_interfacexx', 'index')  if (is_admin? rescue nil) %>
       <%= content_tag :li, link_to((t(:member_role) + content_tag(:i, nil, :class => 'icon-chevron-right')).html_safe,admin_roles_path ), :class => active_for_action('users_new_interfacexx', 'index')  if (is_admin? rescue nil) %>
-      <%= content_tag :li, link_to((t(:member_info) + content_tag(:i, nil, :class => 'icon-chevron-right')).html_safe, edit_admin_info_path(Info.first.id.to_s)), :class => active_for_action('users_new_interfacexx', 'index') if (is_admin? rescue nil) %>
+      <%= content_tag :li, link_to((t(:member_info) + content_tag(:i, nil, :class => 'icon-chevron-right')).html_safe, edit_admin_info_path(Info.first.id.to_s)), :class => active_for_action('users_new_interfacexx', 'index') if (is_admin? rescue nil) and Info.first %>
     <% end -%>
 <% end -%>
 

app/views/default_widget/_typeA.html.erb

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

app/views/default_widget/_typeB.html.erb

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

app/views/default_widget/_typeC.html.erb

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

app/views/default_widget/default_widget.html.erb

@@ -1,5 +1,7 @@
+<%= render :partial => 'shared/search_header',:locals=>{:items=>@data}  %>
+
 <%= render @partial %>
-<% if @paginate %>
+<% if @paginate and  !@data.blank? %>
   <%= paginate @data, :param_name => :page_main, :params => {:same_page_id => @page_id} %>
 <% elsif @page_part.module_app %>
   <%=  @page_part.module_app.get_registration.default_widget_setting.link_to_more_tag(request,params) %>

app/views/front/show_tag_cloud.html.erb

@@ -0,0 +1,10 @@
+<% unless @tags.blank? %>
+  <div class="tag_cloud">                 
+    <h3 class="h3"><%= t(:tag_cloud) %></h3>                
+    <div class="cloud">     
+      <% @tags.each do |tag| %> 
+        <%= link_to tag[0].name,  current_path({:tag_id => tag[0].id, :category_id => params[:category_id]}), :class => "#{tag[1]} #{tag[0].id.to_s.eql?(params[:tag_id]) ? 'active' : nil} " %>
+      <% end %>
+    </div>              
+  </div>  
+<% end %>

app/views/layouts/application.html.erb

@@ -2,24 +2,16 @@
 <html>
 <head>
   <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-  <title>R4</title>
+  <title><%= @title || APP_CONFIG['orbit'] %></title>
-  <link rel="shortcut icon" href="/favicon.ico">
+  <link rel="shortcut icon" href="<%= asset_path "ncculogo.ico" %>">
   <%= yield :page_specific_link %>
-  <%= stylesheet_link_tag "application" %>
+  <%= stylesheet_link_tag "new_admin" %>
-  <%= javascript_include_tag "application" %>
+  <%= javascript_include_tag "new_admin" %>
   <%= csrf_meta_tag %>
 </head>
-<body>
+<body class="folded">
+    <%= render 'layouts/orbit_bar' %>
 <div id="container">
-  <ul class="hmenu">
-    <%= render 'devise/menu/registration_items' %>
-    <%= render 'devise/menu/login_items' %>
-  </ul>
-
-  <div id="header">
-      <h1>RulingSite</h1>
-  </div>
-
   <div class="content">
            <p class="notice"><%= notice %></p>
        <p class="alert"><%= alert %></p>
@@ -27,10 +19,6 @@
   	<div class="secondary"><%= yield :secondary %></div>
   	<div class="tertiary"><%= yield :tertiary %></div>
   </div>
-
-  <div id="footer">
-      <p>Rulingcom</p>
-  </div>
 </div>
 <%= yield :page_specific_javascript %>
 </body>

app/views/layouts/standalone.html.erb

@@ -0,0 +1,31 @@
+<!DOCTYPE HTML>
+<html class="<%= I18n.locale.to_s %>">
+<head>
+<meta charset="utf-8">
+  <%= page_title(@item).html_safe %>
+  <link rel="shortcut icon" href="<%= asset_path "ncculogo.ico" %>">
+  <%= page_metas(@item).html_safe %>
+  <!--[if lt IE 9]>
+     <%= javascript_include_tag "html5" %>
+  <![endif]-->
+  <%= page_stylesheets(@item).html_safe %>
+  <link href='/assets/standalone.css' rel='stylesheet' type='text/css' />
+  <%= yield :page_stylesheets %>
+  <%= page_javascripts(@item).html_safe %>
+  <%= csrf_meta_tag %>
+</head>
+<body>
+  <div class="wrapper">
+    <%= yield %>
+  </div>
+  <% if flash[:error] %>
+    <div class="modal alert alert-error hide" id="myModal">
+      <p type="button" class="close" data-dismiss="modal">×</p>
+        <%= "<strong>#{flash[:error]}</strong><br/>".html_safe%>
+    </div>
+    <script>
+      $('#myModal').modal('show')
+    </script>
+  <% end -%>
+</body>
+</html>

app/views/shared/_search_header.html.erb

@@ -0,0 +1,6 @@
+    <% if items.blank? and !params[:search_query].blank? %>
+      <%=render :partial => 'shared/search_not_found'  %>
+      <% elsif  !params[:search_query].blank?  %>
+        <%= t("search.result_get",:search_word => params[:search_query],:item_num=>items.count) unless (items.count == 30) %>
+        <%= t("search.too_many",:search_word => params[:search_query],:exceed_num=>items.count) if (items.count ==30) %>
+     <% end %>

config/environment.rb

@@ -6,4 +6,4 @@ YAML::ENGINE.yamler = 'syck'
 # Initialize the rails application
 Orbit::Application.initialize!
 Me = Site.first
-OrbitJobLogger = OrbitJobLog.new
+OrbitLogger = Logger::Syslog.new

config/environments/development.rb

@@ -34,16 +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 = {
-  #   :tls => true,
+    :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/environments/production.rb

@@ -58,4 +58,17 @@ Orbit::Application.configure do
 
   # Send deprecation notices to registered listeners
   config.active_support.deprecation = :notify
+
+
+  config.action_mailer.delivery_method = :smtp
+  config.action_mailer.smtp_settings = {
+    :enable_starttls_auto => true,
+    :address => "http://smtp.gmail.com",
+    :port => '587',
+    :domain => "http://smtp.gmail.com",
+    :authentication => "plain",
+    :user_name => "redmine@rulingcom.com",
+    :password => "rulingredmine"
+  }
+
 end

config/initializers/orbit_system_preference.rb

@@ -7,7 +7,7 @@ module OrbitSystemPreference
   DefaultDiskSpaceLimit = 3 #in GB
   module SystemPackage
     MongodbVersion = "mongod --version"
-    NginxVersion = "nginx -V"
+    NginxVersion = "nginx -V 2>&1"
     SystemVersion = "uname -a"
   end
 end

config/list.yml

@@ -43,6 +43,7 @@ public_r_tags:
   - sub_menu
   - sitemap
   - breadcrumb
+  - tag_cloud
 
 page_part_kinds:
   - text

config/locales/en.yml

@@ -272,6 +272,8 @@ en:
     setting: Mail settings
     tls: TLS
     user_name: User Name
+    mail_cron: Scheduled Email
+    mail_cron_log: Email Log
   manager: Manager
   markup: Markup
   markup_options: Markup options
@@ -461,9 +463,15 @@ en:
     success_: Successfully updated
   update_: Update
   update_at: Update at
+  upload: Upload
   url: URL
   use_status: Use Statue
   user: User
+  user_actions: User log
+  user_action:
+    time: Time
+    name: Account
+    page: Access Page and Action
   users:
     admin_change_password: You cannot change your own password here!
     avatar: Profile Picture

config/locales/zh_tw.yml

@@ -272,6 +272,8 @@ zh_tw:
     setting: 電子郵件設定
     tls: 電子郵件TLS
     user_name: 電子郵件帳號
+    mail_cron: 待寄Email
+    mail_cron_log: Email發送記錄
   manager: 管理者
   markup: 輸入模式
   markup_options: 標註選項
@@ -396,7 +398,7 @@ zh_tw:
       tab_backups: 備份記錄
       tab_commits: 程式版本
       tab_summary: 總覽
-      tab_logs: 登錄檔
+      tab_logs: 排程工作日誌
       summary:
         code_update_at:  程式更新紀錄
         disk_space: 硬碟空間
@@ -462,9 +464,15 @@ zh_tw:
     success_: 使用者已更新成功
   update_: 更新
   update_at: 最後更新時間
+  upload: 上傳
   url: 網址
   use_status: 使用狀態
   user: 使用者
+  user_actions: 使用者Log
+  user_action:
+    time: 時間
+    name: 使用帳號
+    page: 頁面
   users:
     admin_change_password: 您不能在此處修改自己的密碼！
     avatar: 大頭貼照
@@ -498,3 +506,4 @@ zh_tw:
   visitors_this_year: 今年造訪人次
   visitors_today: 今日造訪人次
   yes_: "是"
+  sort_number: 排序數

config/mongoid.yml

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

config/resque.god

@@ -25,7 +25,7 @@ num_workers.times do |num|
     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.start     = "HOME=#{user_home} QUEUE=* RAILS_ENV=#{rails_env} rake -f #{rails_root}/Rakefile resque:work"
 
     w.uid = (rails_env == 'production' )? "root" : development_uid
     w.gid = (rails_env == 'production' )? "root" : development_gid

config/resque_schedule.god

@@ -10,7 +10,7 @@ development_gid = ''
     w.group   = 'resque'
     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.start     = "HOME= #{user_home} QUEUE=* RAILS_ENV=#{rails_env} rake -f #{rails_root}/Rakefile resque:scheduler"
 
     w.uid = (rails_env == 'production' )? "root" : development_uid
     w.gid = (rails_env == 'production' )? "root" : development_gid

config/resque_schedule.yml

@@ -1,3 +1,9 @@
+dashboard_counter_cache:
+  cron: 0 * * * * *
+  class: DashboardCounter
+  args:
+  description: DashboardCounterCache
+
 update_tag_cloud:
   cron: 0 0 [0,12] * * *
   class: UpdateTagCloud
@@ -9,3 +15,9 @@ generate_system_summary:
   class: GenerateSystemSummary
   args:
   description: Generate the system status such as disk free space,package version list for showing at site tab
+
+email_cron:
+  cron: 0 0 [10,16,22] * * *
+  class: EmailCron
+  args:
+  description: EmailCron

config/routes.rb

@@ -1,6 +1,8 @@
 Orbit::Application.routes.draw do
   # get "robots.txt" => 'robots#index'
 
+
+
   devise_for :users do
     match "/users_passwd" => "desktop/registrations#update", :as => :users_passwd, :via => :put
   end
@@ -18,6 +20,7 @@ Orbit::Application.routes.draw do
 
   # routes for admin
   namespace :admin do
+    match 'user_actions' => 'user_actions#index'
     match 'system_preference' => "sites#show_system_preference",:as=>"system_preference"
     mount Resque::Server.new, :at => "/resque"
     resources :assets do   
@@ -26,6 +29,19 @@ Orbit::Application.routes.draw do
         get 'delete'
       end
     end
+
+    resources :mail_crons do   
+      collection do
+        get 'delete'
+      end
+    end
+
+    resources :mail_cron_logs do   
+      collection do
+        get 'delete'
+      end
+    end
+
     resources :asset_categories
     resources :asset_tags
     resources :app_auths 
@@ -259,7 +275,7 @@ Orbit::Application.routes.draw do
     end 
   end
 
-  controller_paths :front, %w[show_breadcrumb show_banner show_footer show_menu show_page_sub_menu show_site_sub_menu show_sitemap]
+  controller_paths :front, %w[show_breadcrumb show_banner show_footer show_menu show_page_sub_menu show_site_sub_menu show_sitemap show_tag_cloud]
   # controller_paths :mobile, %w[index announcement announcement_content dialog_contact dialog_copyright dialog_language map page page_content]
 
   # scope 'app' do
@@ -285,11 +301,11 @@ Orbit::Application.routes.draw do
 
 
   match '/panel/:app_name/front_end/:app_action/:id(/:controller_action)' => 'pages#show_from_link', :constraints => lambda { |request|
-    !request.query_string.include?("inner=true")
+    !request.query_string.include?("inner=true") && !request.query_string.include?("standalone=true")
   }
 
   match '/panel/:app_name/front_end/:app_action' => 'pages#index_from_link', :constraints => lambda { |request|
-    !request.query_string.include?("inner=true")
+    !request.query_string.include?("inner=true") && !request.query_string.include?("standalone=true")
   }
 
   match '/share/:model/:id' => 'application#render_share'

lib/delay_impressionist_request.rb

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

lib/import_data/announce_categories.json

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