Fix announcement versioning

Conflicts:

	Gemfile

.gitignore

@@ -4,8 +4,6 @@
 .rvmrc
 
 Gemfile.lock
-Procfile
-log/*
 
 db/*.sqlite3
 log/*.log
@@ -13,16 +11,13 @@ public/assets
 public/index.html
 public/panel/**/*
 public/uploads/**/*
-solr/data
+solr
 tmp/**/*
 uploads/**/*
-config/*.god
-log/*.gz
-tmp/restart.txt
+
 *.swp
 *.pid
 *.lck
 
 .sass-cache/*
-*.supported
-mongoid.yml
+*.supported

Gemfile

@@ -14,11 +14,7 @@ gem 'execjs'
 gem 'jquery-rails', '2.1.4'
 gem 'jquery-ui-rails'
 gem "select2-rails", '3.3.1'
-gem 'kaminari'
-gem "acts_as_unvlogable"
-gem 'youtube_it'
-gem 'gotcha'
-
+gem 'kaminari', :git => 'git://github.com/amatsuda/kaminari.git'
 
 # gem "memcached", "~> 1.4.3"
 # gem "memcache-client"
@@ -39,7 +35,7 @@ gem 'resque-scheduler' # job scheduling
 gem 'resque-restriction'
 #gem 'rb-readline'
 # gem 'ruby-debug19'
-gem 'rubyzip','0.9.9'
+gem 'rubyzip'
 
 gem 'sunspot_mongo'
 gem 'sunspot_solr'
@@ -50,14 +46,14 @@ gem 'sinatra'
 gem 'sprockets'
 gem 'social-share-button'
 
-gem 'tinymce-rails', '3.5.8.3'
+gem 'tinymce-rails'
 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','~> 0.4.2' if RUBY_PLATFORM.downcase.include?("linux")
 
 
-gem "impressionist",'1.2.0'
+gem "impressionist", :git => 'git://github.com/charlotte-ruby/impressionist.git'
 #gem 'contacts'
 #gem 'event-calendar', :require => 'event_calendar'#, :git => 'git://github.com/elevation/event_calendar.git'
 
@@ -69,6 +65,7 @@ gem 'redis-namespace'
 gem 'redis-search'
 gem 'syslog-logger'
 gem "recaptcha", :require => "recaptcha/rails"
+gem 'mongoid-versioning'
 
 # Gems used only for assets and not required
 # in production environments by default.

Gemfile.lock

@@ -0,0 +1,409 @@
+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)
+    syslog-logger (1.6.8)
+    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
+  syslog-logger
+  tinymce-rails
+  uglifier
+  watchr

app/assets/javascripts/lib/checkbox.card.js

@@ -1,23 +0,0 @@
-!function ($) {
-	$.fn.cardCheck = function(param) {
-		_defaultSettings = {
-			check: '',
-		};
-		_set = $.extend(_defaultSettings, param);
-		$card = $(this);
-		$check = _set.check;
-		$check.each(function(){
-			if($(this).attr('checked')) {
-			$(this).parent($card).addClass("active");
-			}
-		});
-		$card.on('click', function() {
-			$(this).toggleClass('active')
-		});
-	}
-}(window.jQuery);
-$(function(){
-	$('.checkbox-card > li').cardCheck({
-		check: $('.checkbox-card > li input[type="checkbox"]'),
-	});
-});

app/assets/javascripts/lib/jquery.nanoscroller.js

@@ -1,752 +0,0 @@
-/*! nanoScrollerJS - v0.7.2
-* http://jamesflorentino.github.com/nanoScrollerJS/
-* Copyright (c) 2013 James Florentino; Licensed MIT */
-
-
-(function($, window, document) {
-  "use strict";
-
-  var BROWSER_IS_IE7, BROWSER_SCROLLBAR_WIDTH, DOMSCROLL, DOWN, DRAG, KEYDOWN, KEYUP, MOUSEDOWN, MOUSEMOVE, MOUSEUP, MOUSEWHEEL, NanoScroll, PANEDOWN, RESIZE, SCROLL, SCROLLBAR, TOUCHMOVE, UP, WHEEL, defaults, getBrowserScrollbarWidth;
-  defaults = {
-    /**
-      a classname for the pane element.
-      @property paneClass
-      @type String
-      @default 'pane'
-    */
-
-    paneClass: 'pane',
-    /**
-      a classname for the slider element.
-      @property sliderClass
-      @type String
-      @default 'slider'
-    */
-
-    sliderClass: 'slider',
-    /**
-      a classname for the content element.
-      @property contentClass
-      @type String
-      @default 'content'
-    */
-
-    contentClass: 'content',
-    /**
-      a setting to enable native scrolling in iOS devices.
-      @property iOSNativeScrolling
-      @type Boolean
-      @default false
-    */
-
-    iOSNativeScrolling: false,
-    /**
-      a setting to prevent the rest of the page being
-      scrolled when user scrolls the `.content` element.
-      @property preventPageScrolling
-      @type Boolean
-      @default false
-    */
-
-    preventPageScrolling: false,
-    /**
-      a setting to disable binding to the resize event.
-      @property disableResize
-      @type Boolean
-      @default false
-    */
-
-    disableResize: false,
-    /**
-      a setting to make the scrollbar always visible.
-      @property alwaysVisible
-      @type Boolean
-      @default false
-    */
-
-    alwaysVisible: false,
-    /**
-      a default timeout for the `flash()` method.
-      @property flashDelay
-      @type Number
-      @default 1500
-    */
-
-    flashDelay: 1500,
-    /**
-      a minimum height for the `.slider` element.
-      @property sliderMinHeight
-      @type Number
-      @default 20
-    */
-
-    sliderMinHeight: 20,
-    /**
-      a maximum height for the `.slider` element.
-      @property sliderMaxHeight
-      @type Number
-      @default null
-    */
-
-    sliderMaxHeight: null
-  };
-  /**
-    @property SCROLLBAR
-    @type String
-    @static
-    @final
-    @private
-  */
-
-  SCROLLBAR = 'scrollbar';
-  /**
-    @property SCROLL
-    @type String
-    @static
-    @final
-    @private
-  */
-
-  SCROLL = 'scroll';
-  /**
-    @property MOUSEDOWN
-    @type String
-    @final
-    @private
-  */
-
-  MOUSEDOWN = 'mousedown';
-  /**
-    @property MOUSEMOVE
-    @type String
-    @static
-    @final
-    @private
-  */
-
-  MOUSEMOVE = 'mousemove';
-  /**
-    @property MOUSEWHEEL
-    @type String
-    @final
-    @private
-  */
-
-  MOUSEWHEEL = 'mousewheel';
-  /**
-    @property MOUSEUP
-    @type String
-    @static
-    @final
-    @private
-  */
-
-  MOUSEUP = 'mouseup';
-  /**
-    @property RESIZE
-    @type String
-    @final
-    @private
-  */
-
-  RESIZE = 'resize';
-  /**
-    @property DRAG
-    @type String
-    @static
-    @final
-    @private
-  */
-
-  DRAG = 'drag';
-  /**
-    @property UP
-    @type String
-    @static
-    @final
-    @private
-  */
-
-  UP = 'up';
-  /**
-    @property PANEDOWN
-    @type String
-    @static
-    @final
-    @private
-  */
-
-  PANEDOWN = 'panedown';
-  /**
-    @property DOMSCROLL
-    @type String
-    @static
-    @final
-    @private
-  */
-
-  DOMSCROLL = 'DOMMouseScroll';
-  /**
-    @property DOWN
-    @type String
-    @static
-    @final
-    @private
-  */
-
-  DOWN = 'down';
-  /**
-    @property WHEEL
-    @type String
-    @static
-    @final
-    @private
-  */
-
-  WHEEL = 'wheel';
-  /**
-    @property KEYDOWN
-    @type String
-    @static
-    @final
-    @private
-  */
-
-  KEYDOWN = 'keydown';
-  /**
-    @property KEYUP
-    @type String
-    @static
-    @final
-    @private
-  */
-
-  KEYUP = 'keyup';
-  /**
-    @property TOUCHMOVE
-    @type String
-    @static
-    @final
-    @private
-  */
-
-  TOUCHMOVE = 'touchmove';
-  /**
-    @property BROWSER_IS_IE7
-    @type Boolean
-    @static
-    @final
-    @private
-  */
-
-  BROWSER_IS_IE7 = window.navigator.appName === 'Microsoft Internet Explorer' && /msie 7./i.test(window.navigator.appVersion) && window.ActiveXObject;
-  /**
-    @property BROWSER_SCROLLBAR_WIDTH
-    @type Number
-    @static
-    @default null
-    @private
-  */
-
-  BROWSER_SCROLLBAR_WIDTH = null;
-  /**
-    Returns browser's native scrollbar width
-    @method getBrowserScrollbarWidth
-    @return {Number} the scrollbar width in pixels
-    @static
-    @private
-  */
-
-  getBrowserScrollbarWidth = function() {
-    var outer, outerStyle, scrollbarWidth;
-    outer = document.createElement('div');
-    outerStyle = outer.style;
-    outerStyle.position = 'absolute';
-    outerStyle.width = '100px';
-    outerStyle.height = '100px';
-    outerStyle.overflow = SCROLL;
-    outerStyle.top = '-9999px';
-    document.body.appendChild(outer);
-    scrollbarWidth = outer.offsetWidth - outer.clientWidth;
-    document.body.removeChild(outer);
-    return scrollbarWidth;
-  };
-  /**
-    @class NanoScroll
-    @param element {HTMLElement|Node} the main element
-    @param options {Object} nanoScroller's options
-    @constructor
-  */
-
-  NanoScroll = (function() {
-
-    function NanoScroll(el, options) {
-      this.el = el;
-      this.options = options;
-      BROWSER_SCROLLBAR_WIDTH || (BROWSER_SCROLLBAR_WIDTH = getBrowserScrollbarWidth());
-      this.$el = $(this.el);
-      this.doc = $(document);
-      this.win = $(window);
-      this.$content = this.$el.children("." + options.contentClass);
-      this.$content.attr('tabindex', 0);
-      this.content = this.$content[0];
-      if (this.options.iOSNativeScrolling && (this.el.style.WebkitOverflowScrolling != null)) {
-        this.nativeScrolling();
-      } else {
-        this.generate();
-      }
-      this.createEvents();
-      this.addEvents();
-      this.reset();
-    }
-
-    /**
-      Prevents the rest of the page being scrolled
-      when user scrolls the `.content` element.
-      @method preventScrolling
-      @param event {Event}
-      @param direction {String} Scroll direction (up or down)
-      @private
-    */
-
-
-    NanoScroll.prototype.preventScrolling = function(e, direction) {
-      if (!this.isActive) {
-        return;
-      }
-      if (e.type === DOMSCROLL) {
-        if (direction === DOWN && e.originalEvent.detail > 0 || direction === UP && e.originalEvent.detail < 0) {
-          e.preventDefault();
-        }
-      } else if (e.type === MOUSEWHEEL) {
-        if (!e.originalEvent || !e.originalEvent.wheelDelta) {
-          return;
-        }
-        if (direction === DOWN && e.originalEvent.wheelDelta < 0 || direction === UP && e.originalEvent.wheelDelta > 0) {
-          e.preventDefault();
-        }
-      }
-    };
-
-    /**
-      Enable iOS native scrolling
-    */
-
-
-    NanoScroll.prototype.nativeScrolling = function() {
-      this.$content.css({
-        WebkitOverflowScrolling: 'touch'
-      });
-      this.iOSNativeScrolling = true;
-      this.isActive = true;
-    };
-
-    /**
-      Updates those nanoScroller properties that
-      are related to current scrollbar position.
-      @method updateScrollValues
-      @private
-    */
-
-
-    NanoScroll.prototype.updateScrollValues = function() {
-      var content;
-      content = this.content;
-      this.maxScrollTop = content.scrollHeight - content.clientHeight;
-      this.contentScrollTop = content.scrollTop;
-      if (!this.iOSNativeScrolling) {
-        this.maxSliderTop = this.paneHeight - this.sliderHeight;
-        this.sliderTop = this.contentScrollTop * this.maxSliderTop / this.maxScrollTop;
-      }
-    };
-
-    /**
-      Creates event related methods
-      @method createEvents
-      @private
-    */
-
-
-    NanoScroll.prototype.createEvents = function() {
-      var _this = this;
-      this.events = {
-        down: function(e) {
-          _this.isBeingDragged = true;
-          _this.offsetY = e.pageY - _this.slider.offset().top;
-          _this.pane.addClass('active');
-          _this.doc.bind(MOUSEMOVE, _this.events[DRAG]).bind(MOUSEUP, _this.events[UP]);
-          return false;
-        },
-        drag: function(e) {
-          _this.sliderY = e.pageY - _this.$el.offset().top - _this.offsetY;
-          _this.scroll();
-          _this.updateScrollValues();
-          if (_this.contentScrollTop >= _this.maxScrollTop) {
-            _this.$el.trigger('scrollend');
-          } else if (_this.contentScrollTop === 0) {
-            _this.$el.trigger('scrolltop');
-          }
-          return false;
-        },
-        up: function(e) {
-          _this.isBeingDragged = false;
-          _this.pane.removeClass('active');
-          _this.doc.unbind(MOUSEMOVE, _this.events[DRAG]).unbind(MOUSEUP, _this.events[UP]);
-          return false;
-        },
-        resize: function(e) {
-          _this.reset();
-        },
-        panedown: function(e) {
-          _this.sliderY = (e.offsetY || e.originalEvent.layerY) - (_this.sliderHeight * 0.5);
-          _this.scroll();
-          _this.events.down(e);
-          return false;
-        },
-        scroll: function(e) {
-          if (_this.isBeingDragged) {
-            return;
-          }
-          _this.updateScrollValues();
-          if (!_this.iOSNativeScrolling) {
-            _this.sliderY = _this.sliderTop;
-            _this.slider.css({
-              top: _this.sliderTop
-            });
-          }
-          if (e == null) {
-            return;
-          }
-          if (_this.contentScrollTop >= _this.maxScrollTop) {
-            if (_this.options.preventPageScrolling) {
-              _this.preventScrolling(e, DOWN);
-            }
-            _this.$el.trigger('scrollend');
-          } else if (_this.contentScrollTop === 0) {
-            if (_this.options.preventPageScrolling) {
-              _this.preventScrolling(e, UP);
-            }
-            _this.$el.trigger('scrolltop');
-          }
-        },
-        wheel: function(e) {
-          if (e == null) {
-            return;
-          }
-          _this.sliderY += -e.wheelDeltaY || -e.delta;
-          _this.scroll();
-          return false;
-        }
-      };
-    };
-
-    /**
-      Adds event listeners with jQuery.
-      @method addEvents
-      @private
-    */
-
-
-    NanoScroll.prototype.addEvents = function() {
-      var events;
-      this.removeEvents();
-      events = this.events;
-      if (!this.options.disableResize) {
-        this.win.bind(RESIZE, events[RESIZE]);
-      }
-      if (!this.iOSNativeScrolling) {
-        this.slider.bind(MOUSEDOWN, events[DOWN]);
-        this.pane.bind(MOUSEDOWN, events[PANEDOWN]).bind("" + MOUSEWHEEL + " " + DOMSCROLL, events[WHEEL]);
-      }
-      this.$content.bind("" + SCROLL + " " + MOUSEWHEEL + " " + DOMSCROLL + " " + TOUCHMOVE, events[SCROLL]);
-    };
-
-    /**
-      Removes event listeners with jQuery.
-      @method removeEvents
-      @private
-    */
-
-
-    NanoScroll.prototype.removeEvents = function() {
-      var events;
-      events = this.events;
-      this.win.unbind(RESIZE, events[RESIZE]);
-      if (!this.iOSNativeScrolling) {
-        this.slider.unbind();
-        this.pane.unbind();
-      }
-      this.$content.unbind("" + SCROLL + " " + MOUSEWHEEL + " " + DOMSCROLL + " " + TOUCHMOVE, events[SCROLL]);
-    };
-
-    /**
-      Generates nanoScroller's scrollbar and elements for it.
-      @method generate
-      @chainable
-      @private
-    */
-
-
-    NanoScroll.prototype.generate = function() {
-      var contentClass, cssRule, options, paneClass, sliderClass;
-      options = this.options;
-      paneClass = options.paneClass, sliderClass = options.sliderClass, contentClass = options.contentClass;
-      if (!this.$el.find("" + paneClass).length && !this.$el.find("" + sliderClass).length) {
-        this.$el.append("<div class=\"" + paneClass + "\"><div class=\"" + sliderClass + "\" /></div>");
-      }
-      this.pane = this.$el.children("." + paneClass);
-      this.slider = this.pane.find("." + sliderClass);
-      if (BROWSER_SCROLLBAR_WIDTH) {
-        cssRule = this.$el.css('direction') === 'rtl' ? {
-          left: -BROWSER_SCROLLBAR_WIDTH
-        } : {
-          right: -BROWSER_SCROLLBAR_WIDTH
-        };
-        this.$el.addClass('has-scrollbar');
-      }
-      if (cssRule != null) {
-        this.$content.css(cssRule);
-      }
-      return this;
-    };
-
-    /**
-      @method restore
-      @private
-    */
-
-
-    NanoScroll.prototype.restore = function() {
-      this.stopped = false;
-      this.pane.show();
-      this.addEvents();
-    };
-
-    /**
-      Resets nanoScroller's scrollbar.
-      @method reset
-      @chainable
-      @example
-          $(".nano").nanoScroller();
-    */
-
-
-    NanoScroll.prototype.reset = function() {
-      var content, contentHeight, contentStyle, contentStyleOverflowY, paneBottom, paneHeight, paneOuterHeight, paneTop, sliderHeight;
-      if (this.iOSNativeScrolling) {
-        this.contentHeight = this.content.scrollHeight;
-        return;
-      }
-      if (!this.$el.find("." + this.options.paneClass).length) {
-        this.generate().stop();
-      }
-      if (this.stopped) {
-        this.restore();
-      }
-      content = this.content;
-      contentStyle = content.style;
-      contentStyleOverflowY = contentStyle.overflowY;
-      if (BROWSER_IS_IE7) {
-        this.$content.css({
-          height: this.$content.height()
-        });
-      }
-      contentHeight = content.scrollHeight + BROWSER_SCROLLBAR_WIDTH;
-      paneHeight = this.pane.outerHeight();
-      paneTop = parseInt(this.pane.css('top'), 10);
-      paneBottom = parseInt(this.pane.css('bottom'), 10);
-      paneOuterHeight = paneHeight + paneTop + paneBottom;
-      sliderHeight = Math.round(paneOuterHeight / contentHeight * paneOuterHeight);
-      if (sliderHeight < this.options.sliderMinHeight) {
-        sliderHeight = this.options.sliderMinHeight;
-      } else if ((this.options.sliderMaxHeight != null) && sliderHeight > this.options.sliderMaxHeight) {
-        sliderHeight = this.options.sliderMaxHeight;
-      }
-      if (contentStyleOverflowY === SCROLL && contentStyle.overflowX !== SCROLL) {
-        sliderHeight += BROWSER_SCROLLBAR_WIDTH;
-      }
-      this.maxSliderTop = paneOuterHeight - sliderHeight;
-      this.contentHeight = contentHeight;
-      this.paneHeight = paneHeight;
-      this.paneOuterHeight = paneOuterHeight;
-      this.sliderHeight = sliderHeight;
-      this.slider.height(sliderHeight);
-      this.events.scroll();
-      this.pane.show();
-      this.isActive = true;
-      if ((content.scrollHeight === content.clientHeight) || (this.pane.outerHeight(true) >= content.scrollHeight && contentStyleOverflowY !== SCROLL)) {
-        this.pane.hide();
-        this.isActive = false;
-      } else if (this.el.clientHeight === content.scrollHeight && contentStyleOverflowY === SCROLL) {
-        this.slider.hide();
-      } else {
-        this.slider.show();
-      }
-      this.pane.css({
-        opacity: (this.options.alwaysVisible ? 1 : ''),
-        visibility: (this.options.alwaysVisible ? 'visible' : '')
-      });
-      return this;
-    };
-
-    /**
-      @method scroll
-      @private
-      @example
-          $(".nano").nanoScroller({ scroll: 'top' });
-    */
-
-
-    NanoScroll.prototype.scroll = function() {
-      if (!this.isActive) {
-        return;
-      }
-      this.sliderY = Math.max(0, this.sliderY);
-      this.sliderY = Math.min(this.maxSliderTop, this.sliderY);
-      this.$content.scrollTop((this.paneHeight - this.contentHeight + BROWSER_SCROLLBAR_WIDTH) * this.sliderY / this.maxSliderTop * -1);
-      if (!this.iOSNativeScrolling) {
-        this.slider.css({
-          top: this.sliderY
-        });
-      }
-      return this;
-    };
-
-    /**
-      Scroll at the bottom with an offset value
-      @method scrollBottom
-      @param offsetY {Number}
-      @chainable
-      @example
-          $(".nano").nanoScroller({ scrollBottom: value });
-    */
-
-
-    NanoScroll.prototype.scrollBottom = function(offsetY) {
-      if (!this.isActive) {
-        return;
-      }
-      this.reset();
-      this.$content.scrollTop(this.contentHeight - this.$content.height() - offsetY).trigger(MOUSEWHEEL);
-      return this;
-    };
-
-    /**
-      Scroll at the top with an offset value
-      @method scrollTop
-      @param offsetY {Number}
-      @chainable
-      @example
-          $(".nano").nanoScroller({ scrollTop: value });
-    */
-
-
-    NanoScroll.prototype.scrollTop = function(offsetY) {
-      if (!this.isActive) {
-        return;
-      }
-      this.reset();
-      this.$content.scrollTop(+offsetY).trigger(MOUSEWHEEL);
-      return this;
-    };
-
-    /**
-      Scroll to an element
-      @method scrollTo
-      @param node {Node} A node to scroll to.
-      @chainable
-      @example
-          $(".nano").nanoScroller({ scrollTo: $('#a_node') });
-    */
-
-
-    NanoScroll.prototype.scrollTo = function(node) {
-      if (!this.isActive) {
-        return;
-      }
-      this.reset();
-      this.scrollTop($(node).get(0).offsetTop);
-      return this;
-    };
-
-    /**
-      To stop the operation.
-      This option will tell the plugin to disable all event bindings and hide the gadget scrollbar from the UI.
-      @method stop
-      @chainable
-      @example
-          $(".nano").nanoScroller({ stop: true });
-    */
-
-
-    NanoScroll.prototype.stop = function() {
-      this.stopped = true;
-      this.removeEvents();
-      this.pane.hide();
-      return this;
-    };
-
-    /**
-      To flash the scrollbar gadget for an amount of time defined in plugin settings (defaults to 1,5s).
-      Useful if you want to show the user (e.g. on pageload) that there is more content waiting for him.
-      @method flash
-      @chainable
-      @example
-          $(".nano").nanoScroller({ flash: true });
-    */
-
-
-    NanoScroll.prototype.flash = function() {
-      var _this = this;
-      if (!this.isActive) {
-        return;
-      }
-      this.reset();
-      this.pane.addClass('flashed');
-      setTimeout(function() {
-        _this.pane.removeClass('flashed');
-      }, this.options.flashDelay);
-      return this;
-    };
-
-    return NanoScroll;
-
-  })();
-  $.fn.nanoScroller = function(settings) {
-    return this.each(function() {
-      var options, scrollbar;
-      if (!(scrollbar = this.nanoscroller)) {
-        options = $.extend({}, defaults, settings);
-        this.nanoscroller = scrollbar = new NanoScroll(this, options);
-      }
-      if (settings && typeof settings === "object") {
-        $.extend(scrollbar.options, settings);
-        if (settings.scrollBottom) {
-          return scrollbar.scrollBottom(settings.scrollBottom);
-        }
-        if (settings.scrollTop) {
-          return scrollbar.scrollTop(settings.scrollTop);
-        }
-        if (settings.scrollTo) {
-          return scrollbar.scrollTo(settings.scrollTo);
-        }
-        if (settings.scroll === 'bottom') {
-          return scrollbar.scrollBottom(0);
-        }
-        if (settings.scroll === 'top') {
-          return scrollbar.scrollTop(0);
-        }
-        if (settings.scroll && settings.scroll instanceof $) {
-          return scrollbar.scrollTo(settings.scroll);
-        }
-        if (settings.stop) {
-          return scrollbar.stop();
-        }
-        if (settings.flash) {
-          return scrollbar.flash();
-        }
-      }
-      return scrollbar.reset();
-    });
-  };
-})(jQuery, window, document);

app/assets/javascripts/member-selection.js

@@ -1,25 +0,0 @@
-$(document).ready(function() {  
-  $(".select_user_modal").on('click', function(){
-    var ids = [];
-    var users = $(this).siblings('#selected_users').children('span.selected_user');
-    users.each(function(i) {
-      ids.push(users.eq(i).attr('user_id'));
-    });
-    $("#main-wrap").after("<span id='select_user'></span>");
-    $.ajax({
-      type: 'GET',
-      url: $(this).attr("rel"),
-      dataType: 'script',
-      data: {field: $(this).attr("field"), ids: ids},
-      success: function (msg) {
-        $("#select_user_modal").modal('show'); },
-      error: function(){
-        alert("ERROR");
-      }
-    });  
-    return false;
-  });
-  $(document).on('click', ".remove_user", function(){
-    $(this).parent().remove();
-  });
-});

app/assets/javascripts/tinymce_orbit.js.erb

@@ -9,7 +9,7 @@ function load_tinymce() {
     // Theme options
     theme_advanced_buttons1 : "bold,italic,underline,strikethrough,|,justifyleft,justifycenter,justifyright,justifyfull,|,formatselect,fontselect,fontsizeselect",
     theme_advanced_buttons2 : "cut,copy,paste,pastetext,pasteword,|,bullist,numlist,|,undo,redo,|,link,unlink,anchor,image,cleanup,help,code,|,forecolor,backcolor",
-    theme_advanced_buttons3 : "tablecontrols,|,hr,removeformat,visualaid,|,sub,sup,|,fullscreen,|,template",
+    theme_advanced_buttons3 : "tablecontrols,|,hr,removeformat,visualaid,|,sub,sup,|,fullscreen",
     theme_advanced_toolbar_location : "top",
     theme_advanced_toolbar_align : "left",
     theme_advanced_statusbar_location : "bottom",
@@ -20,7 +20,7 @@ function load_tinymce() {
     skin_variant : "silver",
     font_size_style_values : "xx-small,x-small,small,medium,large,x-large,xx-large",
     // Drop lists for link/image/media/template dialogs
-    template_external_list_url : "/tinymce/lists/template_list.js",
+    template_external_list_url : "js/template_list.js",
     // external_link_list_url : "js/link_list.js",
     // external_image_list_url : "js/image_list.js",
     // media_external_list_url : "js/media_list.js"

app/assets/stylesheets/application.css

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

app/assets/stylesheets/ask.css

@@ -1,40 +0,0 @@
-#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/member_select.css

@@ -1,230 +0,0 @@
-/* Member Filter */
-#select_user #select_user_modal.modal {
-  width: 80%;
-  margin-left: -40%;
-}
-#select_user #select_user_modal .modal-body {
-  max-height: 425px;
-}
-#select_user #select_user_modal .modal-body form {
-  margin-bottom: 0px;
-}
-#select_user #select_user_modal .modal-body form fieldset {
-  min-height: 360px;
-}
-#select_user #select_user_modal .modal-body .radio.inline,
-#select_user #select_user_modal .modal-body .checkbox.inline {
-  display: inline-block;
-  padding-top: 5px;
-  margin-bottom: 0;
-  vertical-align: middle;
-  min-width: 100px;
-  margin-left: 0;
-}
-#select_user #select_user_modal .modal-body .form-actions {
-  margin: 20px 0 0;
-  padding: 10px 0 0;
-  background-color: transparent;
-  text-align: right;
-}
-#select_user #select_user_modal .modal-body .tabs-left > .nano {
-  width: 160px;
-  min-height: 425px;
-  float: left;
-}
-#select_user #select_user_modal .modal-body .tabs-left > .nano .pane {
-  right: 6px;
-}
-#select_user #select_user_modal .modal-body .tabs-left > .nano > .content > .nav-tabs {
-  width: 140px;
-  float: left;
-  margin-bottom: 0;
-  margin-right: 0;
-  border-right: 1px solid #ddd;
-  border-bottom: none;
-}
-#select_user #select_user_modal .modal-body .tabs-left > .nano > .content > .nav-tabs > li {
-  float: none;
-}
-#select_user #select_user_modal .modal-body .tabs-left > .nano > .content > .nav-tabs > li > a {
-  min-width: 74px;
-  margin-right: 0;
-  margin-bottom: 3px;
-}
-#select_user #select_user_modal .modal-body .tabs-left > .nano > .content > .nav-tabs > li > a {
-  margin-right: -1px;
-  -webkit-border-radius: 4px 0 0 4px;
-     -moz-border-radius: 4px 0 0 4px;
-          border-radius: 4px 0 0 4px;
-}
-#select_user #select_user_modal .modal-body .tabs-left > .nano > .content > .nav-tabs > li > a:hover {
-  border-color: #eeeeee #dddddd #eeeeee #eeeeee;
-}
-#select_user #select_user_modal .modal-body .tabs-left > .nano > .content > .nav-tabs .active > a,
-#select_user #select_user_modal .modal-body .tabs-left > .nano > .content > .nav-tabs .active > a:hover {
-  border-color: #ddd transparent #ddd #ddd;
-  *border-right-color: #ffffff;
-}
-#select_user #select_user_modal .member-filter-options {
-  float: left;
-  display: inline-block;
-  width: 175px;
-  min-height: 425px;
-  margin-right: 10px;
-  padding: 0 10px 0 0;
-}
-#select_user #select_user_modal .member-filter-options select {
-  width: 165px; 
-}
-#select_user #select_user_modal .member-filter-options .btn {
-  display: block;
-}
-#select_user #select_user_modal .member-filter-result {
-  padding-left: 15px;
-  min-height: 360px;
-  width: auto;
-}
-
-
-/* Check Box Card */
-.checkbox-card {
-  margin: 0;
-}
-.checkbox-card li {
-  position: relative;
-  list-style: none;
-  color: #FFFFFF;
-  width: 180px;
-  height: 40px;
-  margin: 0 10px 10px 0;
-  float: left;
-  display: inline-block;
-  background-color: #cccccc;
-  overflow: hidden;
-  -webkit-border-radius: 3px;
-     -moz-border-radius: 3px;
-      border-radius: 3px;
-  -webkit-transition: all .2s linear;
-     -moz-transition: all .2s linear;
-     -o-transition: all .2s linear;
-      transition: all .2s linear;
-}
-.checkbox-card li.mark {
-  width: 0;
-  height: 0;
-  padding: 0;
-  margin: 0;
-  -ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=0)";
-  filter: alpha(opacity=0);
-  opacity: 0;
-  visibility: hidden;
-}
-.checkbox-card li:hover {
-  background-color: #0088cc;
-}
-.checkbox-card li:after {
-  content: "";
-  display: block;
-  clear: both;
-  height: 0;
-  visibility: hidden;
-}
-.checkbox-card li.active:before {
-  -webkit-text-size-adjust : none;
-  font-family: FontAwesome;
-  font-weight: normal;
-  font-style: normal;
-  color: #FFF;
-  text-decoration: inherit;
-  content: "\f00c";
-  position: absolute;
-  right: 0px;
-  top: 0px;
-  line-height: 14px;
-  text-indent: 10px;
-  font-size: 10px;
-  width: 0px;
-  height: 0px;
-  border-style: solid;
-  border-width: 0 22px 22px 0;
-  border-color: transparent #51a351 transparent transparent;
-}
-.checkbox-card li.active label {
-}
-.checkbox-card li label {
-  margin-bottom: 0px;
-  overflow: hidden;
-  -webkit-border-radius: 3px;
-     -moz-border-radius: 3px;
-      border-radius: 3px;
-}
-.checkbox-card li input {
-  opacity: 0;
-  width: 100%;
-  height: 100%;
-  position: absolute;
-  top: 0;
-  left: 0;
-  margin: 0;
-  z-index: 10;
-}
-.checkbox-card li label span {
-  -webkit-text-size-adjust : none;
-  font-size: 10px;
-  display: block;
-  width: 130px;
-  white-space: nowrap;
-  overflow: hidden;
-  text-overflow: ellipsis;
-  color: #666666;
-  margin-top: -3px;
-}
-.checkbox-card li:hover label span,
-.checkbox-card li:hover label span.user-name {
-  color: #FFFFFF;
-}
-.checkbox-card li label span.user-name {
-  font-size: 12px;
-  color: #363636;
-  padding: 2px 0 0;
-  margin-top: 0;
-}
-.checkbox-card li .user-pic {
-  float: left;
-  margin-right: 5px;
-  width: 40px;
-  height: 40px;
-}
-#selected_users .selected_user {
-  display: block;
-  margin-bottom: 5px;
-}
-#selected_users .selected_user .remove_user {
-  font-size: 15px;
-}
-/*
-.promoter {
-  border-color: #CCCCCC;
-  border-style: solid;
-  border-width: 0 1px;
-  padding: 0 10px 5px 10px;
-}
-.promoter > div {
-  border-bottom: 1px solid #CCCCCC;
-}
-.promoter > div:after {
-  content: "";
-  clear: both;
-  display: block;
-  visibility: hidden;
-}
-.promoter > div > span {
-  display: block;
-  margin-left: 70px;
-  padding-bottom: 5px;
-}
-.promoter p {
-  width: 70px;
-  float: left;
-  text-align:right;
-}*/

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

@@ -55,9 +55,9 @@
 	width:100%;
 }
 #orbit-bar .orbit-logo .brand {
-	background: url(<%= asset_path 'ga-logo.png' %>) no-repeat center center;
-	text-indent: -9999px;
-	padding: 5px 20px 4px;
+	background:url(<%= asset_path 'orbit-bar.png' %>) no-repeat -162px -5px;
+	text-indent:-9999px;
+	padding:5px 20px 4px;
 }
 #orbit-bar .orbit-logo .brand:hover {
 	background-color:#009ddc;

app/assets/stylesheets/style.css.erb

@@ -1,7 +1,5 @@
 /*style*/
-* {
-	outline: none;
-}
+
 @font-face{ 
 	font-family: 'WebSymbolsRegular';
 	src: url(<%= asset_path 'websymbols-regular-webfont.eot' %>);

app/controllers/admin/mail_cron_logs_controller.rb

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

@@ -1,126 +0,0 @@
-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/member_selects_controller.rb

@@ -70,30 +70,4 @@ class Admin::MemberSelectsController < OrbitBackendController
 	
   end
 
-  def select_members
-    selected_users = User.find(params[:ids]) rescue []
-    @field = params[:field]
-    roles = Role.all
-    @sorted_users = roles.inject({}) do |users, role|
-      users[role] = role.users.where(:email.not => /guest|rulingcom/) - selected_users
-      users
-    end
-  end
-
-  def set_roles
-    roles = Role.find(params[:role_ids]) rescue []
-    @field = params[:field]
-    @users = roles.inject([]) do |users, role|
-      users += role.users.where(:email.not => /guest|rulingcom/).entries
-      users
-    end
-    render 'admin/member_selects/update_selected_users'
-  end
-
-  def set_users
-    @users = User.find(params[:user_ids]) rescue []
-    @field = params[:field]
-    render 'admin/member_selects/update_selected_users'
-  end
-
 end

app/controllers/admin/user_actions_controller.rb

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

app/controllers/default_widget_controller.rb

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

app/controllers/orbit_frontend_component_controller.rb

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

app/controllers/pages_controller.rb

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

app/controllers/saml_logins_controller.rb

@@ -1,36 +0,0 @@
-class SamlLoginsController < ApplicationController
-
-  require "net/http"
-  require "uri"
-  require 'rexml/document'
-  include REXML
-
-  def index 
-  
-    if params[:wa] == "wsignoutcleanup1.0" #logout
-
-      redirect_to :root
-
-    else  #login
-
-
-    @wresult = params[:wresult]
-    @wctx = params[:wctx]
-
-    @main_url = LIST[:sites][@wctx]['url']
-    @main_public_key = LIST[:sites][@wctx]['key']
-
-    @doc = REXML::Document.new @wresult
-
-    @main_public_key = "-----BEGIN PUBLIC KEY-----\nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAzKawlFWAMzA/uV/kcewd\nmtj8PcqxosmnSh7ZzJ0DumG2ieeP9oDBicqbqIEaeJVvrRzYJD2a+u8x5KKMKB8J\nHbMUpCBFlIpkDMjU/oZVMcYT9pcH51QWNvCgHG7prVykSGFz1JRvjSP6cwuZKBFd\nFFneOViETqoMIO1DbRLXsGfPvMOJY9C1xDwv1dLv0Wbj7M9N6eNz06a50bu3I4gl\nMumxWnZUabXL3G62S/Si4NM7J2jOUnkEOxJWOhcAX/iiqS9T8AHu84um2+mLQpfB\nJJFFIWCIAtU78VnIN5JSWwjFU5TsiSyCFYpGXKxUFD25cFmt3SfG0gwmrFis5Pdn\nhwIDAQAB\n-----END PUBLIC KEY-----\n"
-    
-    public_key = OpenSSL::PKey::RSA.new(@main_public_key)
-    encrypted_data = public_key.public_encrypt(@doc.elements["//saml:AttributeValue"].text)
-    
-    redirect_to "http://#{@main_url}/user_login?" + { :wresult => encrypted_data }.to_param
-
-   end
-
-  end
-
-end

app/controllers/sessions_controller.rb

@@ -1,40 +0,0 @@
-# encoding: utf-8
-
-class SessionsController < Devise::SessionsController
-	prepend_before_filter :require_no_authentication, :only => [ :new, :create ]
-
-
-  def create 
-	  @site = Site.first
-
-      private_key = OpenSSL::PKey::RSA.new(@site.private_key)
-      wresult = private_key.private_decrypt(request.params['wresult'])
-
-  	  @ids = wresult.split("@")
-
-      login_uid = @ids[0]
-
-  	  resource = User.first(conditions:{user_id: login_uid})
-
-	  if !resource.blank?
-	     resource_name = resource.class.to_s.downcase
-	     sign_in(resource_name, resource)
-	     session[:user_id_type] = "myntu"
-	     redirect_to after_sign_in_path_for(resource)
-	  else
-	     flash[:error] = "很抱歉,您無此權限或帳號登入本站,請洽本站管理員<br />Sorry, you don't have the account or authority to login. Please contact the website administrator."
-	     redirect_to :root
-	  end
-  end
-
-  def destroy
-  	@user_id_type = session[:user_id_type]
-    sign_out
-    if @user_id_type == "myntu"
-      redirect_to "https://adfs.ntu.edu.tw/adfs/ls/?wa=wsignout1.0&wreply=https://galogin.ntu.edu.tw"
-    else
-      redirect_to root_path
-    end
-  end
-
-end

app/helpers/application_helper.rb

@@ -1,5 +1,5 @@
 module ApplicationHelper
-  include OrbitApp::Module::VisitorCounter
+
   FLASH_NOTICE_KEYS = [:error, :notice, :warning]
 
 
@@ -7,9 +7,8 @@ module ApplicationHelper
     request.referer.include?('?') ?   [request.referer,param_hash.to_param].join('&') : [request.referer,param_hash.to_param].join('?')
   end
 
-  def delayed_impressionist(item)
-    user_id = current_user.nil? ? nil : current_user.id
-    Resque.enqueue(DelayedImpressionist,:request=>DelayImpressionistRequest.new(request),:obj=>item,:class=>item.class.to_s,:controller_name=>controller_name,:action_name=>action_name,:user=>user_id)
+  def delayed_impressionist(object)
+    # Resque.enqueue_at(1.minute.from_now,DelayedImpressionist,object)
   end
 
   def check_user_role_enable(attribute_fields)
@@ -243,27 +242,25 @@ module ApplicationHelper
     "#{t(:view_count)}: #{object.view_count}"
   end
 
-  # def display_visitors(options={})
-  #   # Impression.where(options).and(:referrer.ne => nil).distinct(:session_hash).count
-  #   impressions = Impression.where(options).and(:referrer.ne => nil)
-  #   impressions.map{|i| i[:session_hash]}.uniq.count
-  # end
+  def display_visitors(options={})
+    Impression.where(options).and(:referrer.ne => nil).distinct(:session_hash).count
+  end
 
-  # def display_visitors_today
-  #   display_visitors(created_at: {'$gte' => Date.today.beginning_of_day, '$lte' => Date.today.end_of_day})
-  # end
+  def display_visitors_today
+    display_visitors(created_at: {'$gte' => Date.today.beginning_of_day, '$lte' => Date.today.end_of_day})
+  end
 
-  # def display_visitors_this_week
-  #   display_visitors(created_at: {'$gte' => Date.today.beginning_of_week, '$lte' => Date.today.end_of_week})
-  # end
+  def display_visitors_this_week
+    display_visitors(created_at: {'$gte' => Date.today.beginning_of_week, '$lte' => Date.today.end_of_week})
+  end
 
-  # def display_visitors_this_month
-  #   display_visitors(created_at: {'$gte' => Date.today.beginning_of_month, '$lte' => Date.today.end_of_month})
-  # end
+  def display_visitors_this_month
+    display_visitors(created_at: {'$gte' => Date.today.beginning_of_month, '$lte' => Date.today.end_of_month})
+  end
 
-  # def display_visitors_this_year
-  #   display_visitors(created_at: {'$gte' => Date.today.beginning_of_year, '$lte' => Date.today.end_of_year})
-  # end
+  def display_visitors_this_year
+    display_visitors(created_at: {'$gte' => Date.today.beginning_of_year, '$lte' => Date.today.end_of_year})
+  end
 
   def display_date_time(object)
     object.strftime("%Y-%m-%d %H:%M")
@@ -303,7 +300,7 @@ module ApplicationHelper
 
   # NTU link
   def get_link(site_number)
-    "http://#{site_number}.#{request.domain(3)}"
+    "http://#{request.host}:2#{site_number}00"
   end
 
   def sortable(column, title = nil, options = {})
@@ -314,8 +311,4 @@ module ApplicationHelper
     link_to title, params.merge({direction: direction, sort: column, sort_options: column}), {:class => "#{css_class} sortable", :remote => options[:remote]}
   end
 
-  def convert_array_param(key, array)
-    Array(array).collect{|t| "#{key}[]=#{t}"}.join("&")
-  end
-
 end

app/helpers/default_widget_helper.rb

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

app/jobs/backup_server.rb

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

app/jobs/dashboard_counter.rb

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

app/jobs/delayed_impressionist.rb

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

app/jobs/email_cron.rb

@@ -1,42 +0,0 @@
-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/get_announcement_from_rss.rb

@@ -1,7 +0,0 @@
-class GetAnnouncementFromRss 
-  @queue = :high
-
-  def self.perform()
-    %x(ruby "#{Rails.root}/lib/rss_ntu_job.rb")
-  end
-end

app/jobs/send_ask_notice_mail.rb

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

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

app/mailer/mail_cron_mailer.rb

@@ -1,81 +0,0 @@
-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/mail_cron.rb

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

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

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

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

app/models/mongoid/sortable.rb

@@ -23,7 +23,7 @@ module Mongoid
     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
+        if last_record.sort_number
           self.sort_number = (last_record.sort_number + 10) / 10 * 10
         else
           self.sort_number = 10

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

app/models/site.rb

@@ -18,7 +18,6 @@ class Site
   field :title_always_on, :type => Boolean, :default => false
   field :dashbroad_allow_visitor, :type => Boolean, :default => false
   field :mail_settings, :type => Hash
-  field :visitor_counters,:type=> Hash,:default=>{:total=>0,:today=>0,:this_week=>0,:this_month=>0,:this_year=>0}
 
   field :disk_space, :type => String
   field :system_package_info, :type => Hash,:default=>{}
@@ -29,11 +28,10 @@ class Site
   mount_uploader :default_image, ImageUploader
 
   field :search,:type => Hash
-  field :resque_namespace,:type => String, :default=>APP_CONFIG['orbit']
+
   field :title, localize: true
   field :footer, localize: true
   field :sub_menu, localize: true
-  field :backup_keep_for_days,:type=>Integer,:default=> APP_CONFIG['backup_keep_for_days']
 
   field :mobile_on, :type => Boolean, :default => false
   

app/models/tag.rb

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

app/models/user/role.rb

@@ -10,7 +10,7 @@ class Role < Attribute
   field :title, localize: true
   
   has_many :sub_roles, :autosave => true, :dependent => :destroy
-  has_and_belongs_to_many :users
+  has_many :users
   # has_many :statuses, :autosave => true, :dependent => :destroy
   # has_many :attribute_fields, :autosave => true, :dependent => :destroy
   has_many :role_statuses, :autosave => true, :dependent => :destroy

app/models/user/user.rb

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

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

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

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

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

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

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

@@ -1,6 +0,0 @@
-<%= 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

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

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

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

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

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

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

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

@@ -1,35 +0,0 @@
-<% # 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

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

@@ -1,5 +0,0 @@
-<%= 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

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

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

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

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

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

@@ -1,12 +0,0 @@
-
-<% 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/member_selects/_modal_select.html.erb

@@ -1,86 +0,0 @@
-<div id="select_user_modal" class="modal hide fade">
-  <div class="modal-header">
-    <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
-    <h3><%= t('list.user') %></h3>
-  </div>
-  <div class="modal-body">
-    <div class="tabbable tabs-left">
-      <div class="nano">
-        <div class="content">
-          <ul class="nav nav-tabs">
-            <li class="active"><a href="#all" data-toggle="tab"><%= t('list.role') %></a></li>
-            <% @sorted_users.each_key do |role| %>
-              <li class=""><a href="#r_<%= role.id %>" data-toggle="tab"><%= role.title %></a></li>
-            <% end %>
-          </ul>
-        </div>
-      </div>
-      <div class="tab-content">
-        <div class="tab-pane fade in active" id="all">
-          <%= form_tag set_roles_admin_member_selects_path(field: @field), remote: true do %>
-            <fieldset>
-              <% @sorted_users.each_key do |role| %>
-                <label class="checkbox inline">
-                  <%= check_box_tag 'role_ids[]', role.id , false %> <%= role.title %>
-                </label>
-              <% end %>
-            </fieldset>
-            <div class="form-actions">
-              <button type="button" class="btn" data-dismiss="modal"><%= t(:cancel) %></button>
-              <%= submit_tag t(:submit), class: "btn btn-primary" %>
-            </div>
-          <% end %>
-        </div>
-        <% @sorted_users.each do |role, users| %>
-          <div class="tab-pane fade" id="r_<%= role.id %>">
-            <%= form_tag set_users_admin_member_selects_path(field: @field), remote: true do %>
-              <fieldset class="clearfix">
-                <div class="member-filter-result nano">
-                  <div class="content">
-                    <ul class="checkbox-card clearfix">
-                      <% users.each do |user| %>
-                        <li>
-                          <label>
-                            <%= image_tag (user.avatar.file ? user.avatar : "menber-pic.png"), class: "user-pic" %>
-                            <span class="user-name"><%= user.name %></span>
-                          </label>
-                          <%= check_box_tag 'user_ids[]', user.id , false %>
-                        </li>
-                      <% end %>
-                    </ul>
-                  </div>
-                </div>
-                <div class="form-actions condition">
-                  <button type="button" class="btn" data-dismiss="modal"><%= t(:cancel) %></button>
-                  <%= submit_tag t(:submit), class: "btn btn-primary" %>
-                </div>
-              </fieldset>
-            <% end %>
-          </div>
-        <% end %>
-      </div>
-    </div>
-  </div>
-</div>
-
-
-<script type="text/javascript">
-  $(document).ready(function() {
-    $(".modal").on("hidden", function () {
-      $("#select_user").remove();
-      $('#select_user_modal').on('shown', function() {
-        $(this).find('.nano').nanoScroller({ scrollTop: 0, iOSNativeScrolling: true });
-        $(this).find('.checkbox-card > li').cardCheck({
-          check: $(this).find('.checkbox-card > li input[type="checkbox"]'),
-        });
-      });
-    });
-    $('#select_user_modal').on('shown', function() {
-      $('#select_user_modal').off('shown')
-      $(this).find('.nano').nanoScroller({ scrollTop: 0, iOSNativeScrolling: true });
-      $(this).find('.checkbox-card > li').cardCheck({
-        check: $(this).find('.checkbox-card > li input[type="checkbox"]'),
-      });
-    });
-  });
-</script>

app/views/admin/member_selects/_promoter_front.html.erb

@@ -1,14 +0,0 @@
-<% unless users.blank? %>
-  <div class="promoter-block">
-    <p class="promoter-title"><%= t(:promoter) %>：</p>
-    <ul>
-      <% users.each do |user| %>
-        <li class="promoter">
-          <p>
-              <%= link_to user.name, "mailto:#{user.email}", class: "promoter-name" %> / <span class="promoter-phone"><%= user.office_tel %></span>
-          </p>
-        </li>
-      <% end %>
-    </ul>
-  </div>
-<% end %>

app/views/admin/member_selects/_selection_box.html.erb

@@ -1,16 +0,0 @@
-<% content_for :page_specific_javascript do -%>
-  <%= javascript_include_tag "member-selection" %>
-  <%= javascript_include_tag "lib/jquery.nanoscroller" %>
-  <%= javascript_include_tag "lib/checkbox.card" %>
-<% end -%>
-<% content_for :page_specific_css do -%>
-  <%= stylesheet_link_tag "member_select" %>
-<% end %>
-
-<div>
-  <div id="selected_users">
-    <%= render partial: 'admin/member_selects/user', collection: users, locals: {field: field} %>
-    <%= hidden_field_tag field %>
-  </div>
-  <%= link_to t(:add), '#', class: 'btn btn-primary btn-small select_user_modal', rel: select_members_admin_member_selects_path, field: field %>
-</div>

app/views/admin/member_selects/_user.html.erb

@@ -1,5 +0,0 @@
-<span class="alert alert-info selected_user" user_id="<%= user.id %>">
-  <%= user.name %>
-  <%= hidden_field_tag field, user.id %>
-  <%= content_tag :span, '×', class: 'close remove_user' %>
-</span>

app/views/admin/member_selects/select_members.js.erb

@@ -1,2 +0,0 @@
-$("#select_user").html("<%= j render partial: 'admin/member_selects/modal_select', locals: {field: 'bulletin[user_ids][]'} %>");
-$("#select_user_modal").modal();

app/views/admin/member_selects/update_selected_users.js.erb

@@ -1,2 +0,0 @@
-$("#selected_users").append("<%= j render partial: 'user', collection: @users, locals: {field: @field} %>");
-$("#select_user_modal").modal('hide');

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

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

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

@@ -8,9 +8,6 @@
 		<%= 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/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, :module_app_id => @module_app_id), :confirm => t('sure?'), :method => :delete, :remote => true  %>
+	<%= link_to t(:delete_), admin_tag_path(tag), :confirm => t('sure?'), :method => :delete, :remote => true  %>
 	</div>
 </div>

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

@@ -1,7 +1,3 @@
-<% 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>

app/views/default_widget/_typeA.html.erb

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

app/views/default_widget/_typeB.html.erb

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

app/views/default_widget/_typeC.html.erb

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

app/views/devise/sessions/new.html.erb

@@ -9,20 +9,15 @@
 		    <%= content_tag :span, msg, :class => [key, "notice label label-warning"] %>
 		  <% end %>
 			<p class="alert hide">You need to sign in or sign up before continuing.</p>
-			<% @request_hosts = request.host_with_port.split(".") %>
-			<a href="https://adfs.ntu.edu.tw/adfs/ls/?wa=wsignin1.0&wtrealm=https://galogin.ntu.edu.tw/saml_login&wctx=<%= @request_hosts[0] %>" class="btn btn-primary" style="width: 310px;margin-top: 10px;">使用計中帳號登入</a>
-			<p style="margin: 40px 0 20px; position: relative; border-bottom: 1px solid #DDD;">
-				<span style="position: absolute; width: 140px; left: 50%; margin-left: -70px; font-size: 14px; top: -9px; background-color: #fff; text-align: center;">或使用本站帳號登入</span>
-			</p>
 			<div class="main">
 				<div class="control-group clear">
 					<%= f.label :user_id ,t("users.user_id")%>
-					<%= f.text_field :user_id, :placeholder => t("users.user_id"), :style => "width: 326px;" %>
+					<%= f.text_field :user_id, :placeholder => t("users.user_id"), :style => "width: 330px;" %>
 					<span class="help-inline">Please correct the error</span>
 				</div>
 				<div class="control-group clear">
 					<%= f.label :password,t("password") %>
-					<%= f.password_field :password, :placeholder => t(:dots), :style => "width: 326px;" %>
+					<%= f.password_field :password, :placeholder => t(:dots), :style => "width: 330px;" %>
 					<span class="help-inline">Please correct the error</span>
 					<%= link_to t(:forgot_password), new_user_password_path, :class => 'pull-right forgot hide' %>
 				</div>

app/views/layouts/_orbit_bar.html.erb

@@ -10,10 +10,19 @@
     </div>
     <ul class="nav">
       <li><a href="<%= root_path %>" data-icons="&#xe022;"></a></li>
-      <!-- <li><a href="<%#= desktop_path %>" data-icons="&#xe060;"></a></li> -->
+      <li><a href="<%= desktop_path %>" data-icons="&#xe060;"></a></li>
     </ul>
     <ul class="nav pull-right">
-      
+      <!--
+      <li class="dropdown">
+          <a class="dropdown-toggle" data-icons="&#xe02d;" href="#" data-toggle="dropdown"></a>
+          <ul class="dropdown-menu">
+            <% #t('ntu.site_names').each do |site| %>
+              <li><%#= link_to site[1], get_link(site[0]) %></li>
+            <%# end %>
+          </ul>
+      </li>
+      -->
       <li class="search clear" title="<%= t :search_google %>">
       <a class="orbit-bar-search" href="#" data-icons="&#xe024;"></a>
       <form class="navbar-search" method="get" action="http://www.google.com/custom">
@@ -25,17 +34,6 @@
         <input type='hidden' name='sitesearch' value='<%= @site.search["sitesearch"] rescue '' %>'>
         <%= text_field_tag 'q','',{:class => "search-query span3",:placeholder=> t(:search_google) ,:disabled=> ((@site.search["sitesearch"] || @site.search["domains"] ).blank? rescue true)}%>
       </form>
-
-      <li class="dropdown language">
-          <a class="dropdown-toggle orbit-bar-language" data-icons="&#xe02d;" href="#" data-toggle="dropdown"></a>
-          <ul class="dropdown-menu language-menu">
-            <% t('ntu.site_names').each do |site| %>
-              <li><%= link_to site[1], get_link(site[0]) %></li>
-            <% end %>
-          </ul>
-      </li>
-      
-
       </li>
       <li class="dropdown language">
         <a class="dropdown-toggle orbit-bar-language" href="#" data-toggle="dropdown" data-icons="&#xe054;"></a>
@@ -55,7 +53,7 @@
         <ul class="dropdown-menu account-menu">
           <!-- <li><%= link_to content_tag(:i, nil, :class => 'icons-tools') + ' ' +  t(:account_setting), desktop_path+"#settings-account" %></li> -->
           <!-- <li><%= link_to content_tag(:i, nil, :class => 'icons-screen') + ' ' +  t(:desktop), desktop_path %></li> -->
-          <li><%= link_to content_tag(:i, nil, :class => 'icons-logout') + ' ' +  t(:logout), user_logout_path %></li>
+          <li><%= link_to content_tag(:i, nil, :class => 'icons-logout') + ' ' +  t(:logout), destroy_user_session_path %></li>
           <li class="divider"></li>
           <li>
           <a href="#">
@@ -70,13 +68,7 @@
         <a class="dropdown-toggle orbit-bar-member" href="#" data-icons="&#xe076;"></a>
         <div class="dropdown-menu">
           <ul class="log">
-            <li style="margin-top: 30px;">
-              <% @request_hosts = request.host_with_port.split(".") %>
-              <a class="btn btn-primary" href="https://adfs.ntu.edu.tw/adfs/ls/?wa=wsignin1.0&wtrealm=https://galogin.ntu.edu.tw/saml_login&wctx=<%= @request_hosts[0] %>" style="padding: 3px 0;color: #fff;">使用計中帳號登入</a>
-            </li>
-            <li class="divider" style="margin: 40px 0 0;">
-              <span style="width: 140px;left: 50%;margin-left: -70px;font-size: 14px;">或使用本站帳號登入</span>
-            </li>
+            <li class="title hide"></li>
 
             <%= form_for :user, :url => user_session_path do |f| %>
               <li>

app/views/layouts/application.html.erb

@@ -3,7 +3,7 @@
 <head>
   <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
   <title><%= @title || APP_CONFIG['orbit'] %></title>
-  <link rel="shortcut icon" href="<%= asset_path "favicon.ico" %>">
+  <link rel="shortcut icon" href="<%= asset_path "ncculogo.ico" %>">
   <%= yield :page_specific_link %>
   <%= stylesheet_link_tag "new_admin" %>
   <%= javascript_include_tag "new_admin" %>

app/views/layouts/new_admin.html.erb

@@ -3,7 +3,7 @@
 <head>
 <meta charset="utf-8">
 	<title><%= @title || APP_CONFIG['orbit'] %></title>
-	<link rel="shortcut icon" href="<%= asset_path "favicon.ico" %>">
+	<link rel="shortcut icon" href="<%= asset_path "ncculogo.ico" %>">
 	<!--[if lt IE 9]>
 	   <%= javascript_include_tag "html5" %>
 	<![endif]-->

app/views/layouts/page_layout.html.erb

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

app/views/layouts/standalone.html.erb

@@ -3,7 +3,7 @@
 <head>
 <meta charset="utf-8">
   <%= page_title(@item).html_safe %>
-  <link rel="shortcut icon" href="<%= asset_path "favicon.ico" %>">
+  <link rel="shortcut icon" href="<%= asset_path "ncculogo.ico" %>">
   <%= page_metas(@item).html_safe %>
   <!--[if lt IE 9]>
      <%= javascript_include_tag "html5" %>

app/views/mobile/dialog_contact.mobile.erb

@@ -3,7 +3,9 @@
 <% end %>
 
 <ul>
-  <li>總務處電話：<a href="tel:+886229393091">02-29393091</a></li>
-  <li>總務處傳真：02-29379611</li>
-  <li>總務處單一窗口 李梅森專員：<a href="tel:+886233662233">02-33662233</a></li>
+  <li>總機電話：<a href="tel:+886229393091">02-29393091</a></li>
+  <li>傳真：02-29379611</li>
+  <li>緊急重大事件通聯窗口：校內分機 66119、66110</li>
+  <li>總值日室：<a href="tel:+88229387132">02-29387132</a></li>
+  <li>駐警衛室：<a href="tel:+88229387129">02-29387129</a></li>
 </ul>

app/views/mobile/map.mobile.erb

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

config/config.yml

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

config/environments/development.rb

@@ -21,7 +21,7 @@ Orbit::Application.configure do
   config.active_support.deprecation = :log
 
   # Only use best-standards-support built into browsers
-  config.action_dispatch.best_standards_support = :builtin
+  config.action_dispatch.best_standards_support = :builtin  
 
   # config.cache_store = :mem_cache_store
 
@@ -33,16 +33,17 @@ Orbit::Application.configure do
   #   :email_prefix => "[R4_error]",
   #   :sender_address => %{"notifier" <redmine@rulingcom.com>},
   #   :exception_recipients => %w{chris@rulingcom.com}
-
-  config.action_mailer.delivery_method = :smtp
-  config.action_mailer.smtp_settings = {
-    :enable_starttls_auto => true,
-    :address => "smtp.gmail.com",
-    :port => '587',
-    :domain => "smtp.gmail.com",
-    :authentication => "plain",
-    :user_name => "redmine@rulingcom.com",
-    :password => "rulingredmine" }
-
+    
+  # config.action_mailer.delivery_method = :smtp
+  # config.action_mailer.smtp_settings = {
+  #   :tls => true,
+  #   :enable_starttls_auto => true,
+  #   :address => "smtp.gmail.com",
+  #   :port => '587',
+  #   :domain => "smtp.gmail.com",
+  #   :authentication => "plain",
+  #   :user_name => "redmine@rulingcom.com",
+  #   :password => "rulingredmine" }
+    
 end
 

config/environments/production.rb

@@ -19,6 +19,7 @@ Orbit::Application.configure do
 
   # Generate digests for assets URLs
   config.assets.digest = true
+  config.logger = Logger::Syslog.new
 
   # Defaults to Rails.root.join("public/assets")
   # config.assets.manifest = YOUR_PATH
@@ -63,9 +64,9 @@ Orbit::Application.configure do
   config.action_mailer.delivery_method = :smtp
   config.action_mailer.smtp_settings = {
     :enable_starttls_auto => true,
-    :address => "http://smtp.gmail.com",
+    :address => "smtp.gmail.com",
     :port => '587',
-    :domain => "http://smtp.gmail.com",
+    :domain => "smtp.gmail.com",
     :authentication => "plain",
     :user_name => "redmine@rulingcom.com",
     :password => "rulingredmine"

config/initializers/resque.rb

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

config/locales/en.yml

@@ -272,8 +272,6 @@ 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
@@ -335,7 +333,6 @@ en:
   posted_by: Posted by
   preview: Preview
   profile: Profile
-  promoter: Promoter
   publications: Publications
   purchase: Purchase
   quantity: Quantity
@@ -468,7 +465,6 @@ en:
   url: URL
   use_status: Use Statue
   user: User
-  user_actions: User log
   user_action:
     time: Time
     name: Account

config/locales/mobile.en.yml

@@ -9,5 +9,5 @@ en:
     home: Home
     language: Language
     location: Location
-    location_description: '<h3>OFFICE OF GENERAL AFFAIRS, NTU</h3>No. 1, Sec. 4, Roosevelt Road, Taipei, 10617 Taiwan (R.O.C)'
+    location_description: '<h3>This University</h3>No.101,Sec. 2, Jiafeng S Road, Zhubei City, Hsinchu County 302, Taiwan'
     page: Page

config/locales/mobile.zh_tw.yml

@@ -9,5 +9,5 @@ zh_tw:
     home: 首頁
     language: 語言
     location: 地理位置
-    location_description: '<h3>臺灣大學總務處 版權所有</h3>10617 臺北市大安區羅斯福路四段一號'
+    location_description: '<h3>本大學</h3>302新竹縣竹北市嘉豐南路二段101號'
     page: 頁面

config/locales/ntu.en.yml

@@ -1,17 +0,0 @@
-en: 
-
-  ntu:
-    rss_origin: Back to NTU Announcements
-    site_names:
-      "www": "Dean of General Affairs"
-      "sec": "Office of the Dean and Secretariat"
-      "doc": "Documentation Division"
-      "general": "General Service Division"
-      "property": "Property Management Division"
-      "construction": "Construction and Maintenance Division"
-      "cashier": "Cashier Division"
-      "procurement": "Procurement Division"
-      "fss": "Facilities Service Division"
-      "police": "Campus Security"
-      "social": "General Affairs Division, College of Social Science"
-      "medicine": "General Service Division, College of Medicine"

config/locales/ntu.zh_tw.yml

@@ -1,17 +0,0 @@
-zh_tw: 
-
-  ntu:
-    rss_origin: 回臺大校園公佈欄
-    site_names:
-      "www": "總務處"
-      "sec": "總務長室暨總務處秘書室"
-      "doc": "文書組"
-      "general": "事務組"
-      "property": "保管組"
-      "construction": "營繕組"
-      "cashier": "出納組"
-      "procurement": "採購組"
-      "fss": "經營管理組"
-      "police": "駐警隊"
-      "social": "社科院總務分處"
-      "medicine": "醫學院總務分處"

config/locales/zh_tw.yml

@@ -272,8 +272,6 @@ zh_tw:
     setting: 電子郵件設定
     tls: 電子郵件TLS
     user_name: 電子郵件帳號
-    mail_cron: 待寄Email
-    mail_cron_log: Email發送記錄
   manager: 管理者
   markup: 輸入模式
   markup_options: 標註選項
@@ -336,7 +334,6 @@ zh_tw:
   posted_by: 張貼人
   preview: 預覽
   profile: 基本資料
-  promoter: 承辦人
   publications: 著作
   purchase: 購買
   quantity: 數量
@@ -469,7 +466,6 @@ zh_tw:
   url: 網址
   use_status: 使用狀態
   user: 使用者
-  user_actions: 使用者Log
   user_action:
     time: 時間
     name: 使用帳號

config/mongoid.yml

@@ -8,10 +8,11 @@ defaults: &defaults
 
 development:
   <<: *defaults
-  database: test_site
+  database: production_7
 test:
   <<: *defaults
   database: test_site
+
 # set these environment variables on your prod server
 production:
   # host: <%= ENV['MONGOID_HOST'] %>
@@ -20,4 +21,4 @@ production:
   # password: <%= ENV['MONGOID_PASSWORD'] %>
   # database: <%= ENV['MONGOID_DATABASE'] %>
   <<: *defaults
-  database: production_8
+  database: demo_site_production

config/resque.god

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