backup

2013-08-27 10:26:11 +08:00
164 changed files with 1388 additions and 46515 deletions
@@ -4,8 +4,6 @@
 .rvmrc

 Gemfile.lock
-Procfile
-log/*

 db/*.sqlite3
 log/*.log
@@ -16,9 +14,7 @@ public/uploads/**/*
 solr/data
 tmp/**/*
 uploads/**/*
-config/*.god
-log/*.gz
-tmp/restart.txt
+
 *.swp
 *.pid
 *.lck
@@ -14,12 +14,11 @@ gem 'execjs'
 gem 'jquery-rails', '2.1.4'
 gem 'jquery-ui-rails'
 gem "select2-rails", '3.3.1'
-gem 'kaminari'
+gem 'kaminari', :git => 'git://github.com/amatsuda/kaminari.git'
 gem "acts_as_unvlogable"
 gem 'youtube_it'
 gem 'gotcha'

-
 # gem "memcached", "~> 1.4.3"
 # gem "memcache-client"

@@ -39,7 +38,7 @@ gem 'resque-scheduler' # job scheduling
 gem 'resque-restriction'
 #gem 'rb-readline'
 # gem 'ruby-debug19'
-gem 'rubyzip','0.9.9'
+gem 'rubyzip'

 gem 'sunspot_mongo'
 gem 'sunspot_solr'
@@ -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"]'),
-	});
-});
@@ -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);
@@ -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();
-  });
-});
@@ -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"
@@ -5,4 +5,3 @@
 *= require_self
 *= require social-share-button 
 */
-
@@ -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;
-}*/
@@ -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;
@@ -1,7 +1,5 @@
 /*style*/
-* {
-	outline: none;
-}
+
@font-face{ 
 	font-family: 'WebSymbolsRegular';
 	src: url(<%= asset_path 'websymbols-regular-webfont.eot' %>);
@@ -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
@@ -11,21 +11,23 @@ class DefaultWidgetController< OrbitWidgetController
  end

  def query_for_default_widget
-    @ori_class_name =  @default_widget["query"].split('.')[0]
-    @result =  eval(@default_widget["query"])
+
+    @ori_class_name = @default_widget["query"].split('.')[0]
+    result = nil
+    result_objects = nil
+
    if !params["tag_id"].blank?
      if params["category_id"].blank? #has tag no cate
-        @result.selector[:tagged_ids] = { "$in" => params['tag_id'] }
+        result = @ori_class_name.constantize.where(:tagged_ids.in => params["tag_id"])
      else #has tag and cate
-        @result.selector[get_category_field_name] = { "$in" => params['category_id'].collect{|t| BSON::ObjectId(t)}}
-        @result.selector[:tagged_ids] = { "$in" => params['tag_id'] }
+        result = eval("#{@ori_class_name}.where(:#{get_category_field_name}.in=>params['category_id'], :tagged_ids.in => params['tag_id'])")
      end
    elsif params["category_id"].blank?  #no tag no cate
+      result = eval(@default_widget["query"])
    else #no tag has cate
-      
-      @result.selector[get_category_field_name] = { "$in" => params['category_id'].collect{|t| BSON::ObjectId(t)}}
+      result = eval("#{@ori_class_name}.where(:#{get_category_field_name}.in=>params['category_id'])")
    end
-    eval("@result.#{@default_widget[:sorting_query]}")
+    result.available_for_lang(I18n.locale).can_display.desc(:is_top, :postdate)
  end

  def search_result
@@ -93,9 +95,9 @@ class DefaultWidgetController< OrbitWidgetController
  end
  
  def get_category_field_name
-    @ori_class_name = @ori_class_name.constantize unless @ori_class_name.is_a? Class
+    @ori_class_name = @ori_class_name.constantize
    @ori_class_name.fields.each_key do |key|
-      return key.to_s if key.include?('category_id')
+      return key if key.include?('category_id')
    end
    nil
  end
@@ -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
@@ -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
@@ -9,7 +9,8 @@ module ApplicationHelper

  def delayed_impressionist(item)
    user_id = current_user.nil? ? nil : current_user.id
-    Resque.enqueue(DelayedImpressionist,:request=>DelayImpressionistRequest.new(request),:obj=>item,:class=>item.class.to_s,:controller_name=>controller_name,:action_name=>action_name,:user=>user_id)
+    request = DelayImpressionistRequest.new(request)
+    Resque.enqueue(DelayedImpressionist,:request=>request,:obj=>item,:class=>item.class.to_s,:controller_name=>controller_name,:action_name=>action_name,:user=>user_id)
  end

  def check_user_role_enable(attribute_fields)
@@ -303,7 +304,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 = {})
@@ -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
@@ -17,16 +17,10 @@ class DelayedImpressionist
    arg = args[0]
    @request= DelayImpressionistRequest.new
    @request.restore(arg["request"])
+    request = @request
    obj = eval("#{arg["class"]}.find '#{arg['obj']['_id']}'")
    # imp = new(@request,arg["controller_name"],arg["action_name"],arg["user"],obj)
    new_impression = obj.impressions.build(:user_id=>arg["user"],:controller_name=>arg["controller_name"],:action_name=>arg["action_name"],:ip_address=>@request.remote_ip,:referrer=>@request.referer)
-    @try = 1
-    loop do
-        result = new_impression.save rescue false
-        break if (result || @try >= 10)
-        @try = @try + 1
-        puts "trying:#{@try}"
-    end
    new_impression.save
    obj.update_attribute(:view_count,obj.impression_count)
  end
@@ -1,7 +0,0 @@
-class GetAnnouncementFromRss 
-  @queue = :high
-
-  def self.perform()
-    %x(ruby "#{Rails.root}/lib/rss_ntu_job.rb")
-  end
-end
@@ -29,11 +29,10 @@ class Site
  mount_uploader :default_image, ImageUploader

  field :search,:type => Hash
-  field :resque_namespace,:type => String, :default=>APP_CONFIG['orbit']
+
  field :title, localize: true
  field :footer, localize: true
  field :sub_menu, localize: true
-  field :backup_keep_for_days,:type=>Integer,:default=> APP_CONFIG['backup_keep_for_days']

  field :mobile_on, :type => Boolean, :default => false
  
@@ -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
@@ -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 = {}
@@ -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>
@@ -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 %>
@@ -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>
@@ -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>
@@ -1,2 +0,0 @@
-$("#select_user").html("<%= j render partial: 'admin/member_selects/modal_select', locals: {field: 'bulletin[user_ids][]'} %>");
-$("#select_user_modal").modal();
@@ -1,2 +0,0 @@
-$("#selected_users").append("<%= j render partial: 'user', collection: @users, locals: {field: @field} %>");
-$("#select_user_modal").modal('hide');
@@ -17,4 +17,4 @@
        <%= render :partial=> "widget_ext_options" %>  
      </div>
    </div>
-    <% end %>
+    <% end %>
@@ -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>
@@ -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>
@@ -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" %>
@@ -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]-->
@@ -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" %>
@@ -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" %>
@@ -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>
@@ -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>
@@ -3,7 +3,6 @@ defaults: &defaults
  store_ip: 'redmine.rulingcom.com:3001'
  orbit: 'Orbit'
  ruling_digital: 'RulingDigital'
-  backup_keep_for_days: 30
  
 development:
  <<: *defaults
@@ -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
@@ -335,7 +335,6 @@ en:
  posted_by: Posted by
  preview: Preview
  profile: Profile
-  promoter: Promoter
  publications: Publications
  purchase: Purchase
  quantity: Quantity
@@ -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
@@ -9,5 +9,5 @@ zh_tw:
    home: 首頁
    language: 語言
    location: 地理位置
-    location_description: '<h3>臺灣大學總務處 版權所有</h3>10617 臺北市大安區羅斯福路四段一號'
+    location_description: '<h3>本大學</h3>302新竹縣竹北市嘉豐南路二段101號'
    page: 頁面
@@ -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"
@@ -1,17 +0,0 @@
-zh_tw: 
-
-  ntu:
-    rss_origin: 回臺大校園公佈欄
-    site_names:
-      "www": "總務處"
-      "sec": "總務長室暨總務處秘書室"
-      "doc": "文書組"
-      "general": "事務組"
-      "property": "保管組"
-      "construction": "營繕組"
-      "cashier": "出納組"
-      "procurement": "採購組"
-      "fss": "經營管理組"
-      "police": "駐警隊"
-      "social": "社科院總務分處"
-      "medicine": "醫學院總務分處"
@@ -336,7 +336,6 @@ zh_tw:
  posted_by: 張貼人
  preview: 預覽
  profile: 基本資料
-  promoter: 承辦人
  publications: 著作
  purchase: 購買
  quantity: 數量
@@ -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|
@@ -6,19 +6,16 @@ development_gid = ''

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

    w.uid = (rails_env == 'production' )? "root" : development_uid
    w.gid = (rails_env == 'production' )? "root" : development_gid
-    
-    w.log = (rails_env == 'production' )? "/var/log/#{w.group}/#{w.name}.log":"#{rails_root}/log/dev-#{w.name}.log"
+  
+     w.log = (rails_env == 'production' )? "/var/log/#{w.group}/#{w.name}.log":"#{rails_root}/log/dev_resque-#{w.name}.log"

    # restart if memory gets too high
    w.transition(:up, :restart) do |on|
@@ -4,14 +4,8 @@ dashboard_counter_cache:
  args:
  description: DashboardCounterCache

-backup_server:
-  cron: 0 0 2 * * *
-  class: BackupServer
-  args:
-  description: BackupServer and remove old backups
-
 update_tag_cloud:
-  cron: 0 30 2 * * *
+  cron: 0 0 [0,12] * * *
  class: UpdateTagCloud
  args:
  description: UpdateTagCloud
@@ -27,9 +21,3 @@ email_cron:
  class: EmailCron
  args:
  description: EmailCron
-
-get_announcement_from_rss:
-  cron: 0 0 [2,12] * * *
-  class: GetAnnouncementFromRss
-  args:
-  description: Loop through the announcement RSS until 24h ago
@@ -7,13 +7,6 @@ Orbit::Application.routes.draw do
    match "/users_passwd" => "desktop/registrations#update", :as => :users_passwd, :via => :put
  end

-  devise_scope :user do
-    get 'user_login' => 'sessions#create'
-    match 'user_logout' => 'sessions#destroy'
-  end
-
-  match "saml_login" => 'saml_logins#index'
-
  mount Resque::Server, :at => "/admin/resque"
  mount Rack::GridFS::Endpoint.new(:db => Mongoid.database,:lookup=>:path), :at => "gridfs"

@@ -195,11 +188,6 @@ Orbit::Application.routes.draw do
    resources :member_selects do
      match 'member_select_search' => "member_selects#member_select_search" ,:as => :member_select_search,:via => "post"
      match 'member_select_add' => "member_selects#member_select_add" ,:as => :member_select_add,:via => "post"
-      collection do
-        get 'select_members'
-        post 'set_roles'
-        post 'set_users'
-      end
    end

    match 'module_store' => 'module_store#index'
@@ -0,0 +1,6 @@
+[{"old_id":1,"key":"administrative","title_translations":{"en":"Official","zh_tw":"行政公告"}}
+,{"old_id":2,"key":"events","title_translations":{"en":"Activities","zh_tw":"活動"}}
+,{"old_id":3,"key":"intern_opportunities","title_translations":{"en":"Internship","zh_tw":"實習機會"}}
+,{"old_id":4,"key":"scholarship_and_exchange_student","title_translations":{"en":"Scholarship","zh_tw":"獎學金與交換生資訊"}}
+,{"old_id":5,"key":"news","title_translations":{"en":"Newsletter","zh_tw":"新聞"}}
+,{"old_id":6,"key":"enrollments","title_translations":{"en":"Admission","zh_tw":"招生資訊"}}]
@@ -1,144 +0,0 @@
-# encoding : utf-8
-
-# Usage ===============
-#
-# ARGV[0] = folder path of xml files
-# ARGV[1] = folder path of files
-#
-#======================
-
-
-require 'mongo'
-require 'nokogiri'
-include Mongo
-
-CSV_PATH = ARGV[0]
-FILE_PATH = ARGV[1]
-FIELDS = %w[title file createdate modifydate createuser modifyuser]
-DB_BASE_NAME = "production"
-
-TABLE = {
-  "0" => ["gaTaco", "ntuga"],
-  "1" => ["fdLai", "fdhome"],
-  "5" => ["prLin", "property01"],
-  "3" => ["gsTien", "ckh", "general01", "lynn"],
-  "10" => ["cmChen", "construction01", "allen", "enAmeliaxu", "energy"],
-#  "2" => ["caLin", "cashier01"],
-  "6" => ["pcAmyok", "purchasing01", "purchasing02"],
-  "7" => ["fmHsyu", "ntufss"],
-  "4" => ["soChang", "social01"],
-  "8" => ["meJune", "medicine01"],
-  "9" => ["plKoa", "police"]
-}
-
-which_site = {}
-
-data = []
-
-Dir.foreach(ARGV[0]) do |file|
-  if file =~ /\w\.\w/
-    doc = Nokogiri::XML(File.open(File.join(ARGV[0], file)))
-    doc.xpath("//row").each { |row| 
-      xml_fields = row.children.map{ |row| [row.name, row.content] }
-      fields = FIELDS.inject([]) do |fields, field|
-        xml_fields.each do |xf|
-          if xf[0].include?(field)
-            fields << xf[1] 
-            break
-          end
-        end
-        fields
-      end
-      data << fields + [File.basename(file, '.xml')]
-    }
-    data.each do |d|
-      title, file, c_time, m_time, creator, modifier, category = d
-      if file =~ /\w\.\w/
-        file = File.join(File.join(ARGV[1], file))
-        site = ""
-        TABLE.each do |key, value|
-          if value.include? modifier
-            site = key
-            break
-          elsif value.include? creator
-            site = key
-            break
-          end
-        end
-        site = "0" if site.empty?
-        if which_site[site]
-          if which_site[site][category]
-            which_site[site][category] += [[title, file, c_time, m_time]]
-          else
-            which_site[site][category] = [[title, file, c_time, m_time]]
-          end
-        else
-          which_site[site] = {category => [[title, file, c_time, m_time]]}
-        end
-      end
-    end
-  end
-end
-
-def save_category archive_file_category, in_category
-  category = {
-    title: {"zh_tw" => in_category, "en" => in_category},
-    key: "import_#{category}"
-  }
-  archive_file_category.save(category)
-end
-
-def save_file_multiples archive_file_multiples, grid ,archive_id,title, file, c_time, m_time
-  a_file = File.open(file) rescue nil
-  if a_file
-    filename = File.basename(file)
-    archive_file = {
-      file_title: {"zh_tw" => title, "en" => title },
-      choose_lang: ["zh_tw", "en"],
-      file: filename,
-      archive_file_id: archive_id,
-      created_at: c_time,
-      updated_at: m_time
-    }
-    a_file_id = archive_file_multiples.save(archive_file)
-    grid.put(a_file, filename: "assets/archive_file_multiple/file/#{a_file_id}/#{filename}")
-  end
-end
-
-def save_archive archive_files, category_id
-  archive = {
-    title: {"zh_tw" => " ", "en" => " "},
-    archive_file_category_id: category_id,
-    is_top: false,
-    is_hot: false,
-    is_hidden: false,
-    created_at: c_time,
-    updated_at: m_time
-  }
-  archive_files.save(archive)
-end
-
-which_site.each do |site, categories|
-
-  db = MongoClient.new("localhost", 27017).db("#{DB_BASE_NAME}_#{site}")
-
-  categories.each do |category, data|
-    archive_file_category = db.collection('archive_file_categories')
-    category_id = save_category archive_file_category, category
-
-    archive_files = db.collection('archive_files')
-    archive_id = save_archive archive_files, category_id
-
-    grid = Grid.new(db)
-    archive_file_multiples = db.collection('archive_file_multiples')
-    file_ids = []
-
-    data.each do |file|
-      save_file_multiples(archive_file_multiples, grid ,archive_id , *file)
-    end
-  end
-
-end
-
-
-
@@ -4,33 +4,24 @@ module OrbitApp
        Version = "0.1"

        def display_visitors(options={})
-            map = "function(){ emit( this.referrer,{session_hash: this.session_hash,created_at: this.created_at}); };"
-            reduce = "function(key, values){ var sum = 0; values.forEach(function(doc){sum += doc.amount; }); return {amount: sum};};"
-            if options.blank?
-              impressions = Impression.collection.map_reduce(map, reduce,read: :primary, out: "vr")
-            else
-              query = Impression.where(options).selector
-              impressions = Impression.where(options).collection.map_reduce(map, reduce,read: :primary, out: "vr",:query=>query)
-            end
-          impressions.count            
+            impressions = 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' => DateTime.now})
+          display_visitors(created_at: {'$gte' => Date.today.beginning_of_day, '$lte' => Date.today.end_of_day})
        end

        def display_visitors_this_week
-          display_visitors(created_at: {'$gte' => Date.today.beginning_of_day - 7.days, '$lte' => DateTime.now})
+          display_visitors(created_at: {'$gte' => Date.today.beginning_of_week, '$lte' => Date.today.end_of_week})
        end

        def display_visitors_this_month
-          display_visitors(created_at: {'$gte' => Date.today.beginning_of_day - 1.month, '$lte' => DateTime.now})
+          display_visitors(created_at: {'$gte' => Date.today.beginning_of_month, '$lte' => Date.today.end_of_month})
        end

        def display_visitors_this_year
-          display_visitors(created_at: {'$gte' => Date.today.beginning_of_day - 1.year, '$lte' =>DateTime.now})
+          display_visitors(created_at: {'$gte' => Date.today.beginning_of_year, '$lte' => Date.today.end_of_year})
        end
      end # end of VisitorCounterEval
  end # of Module
 end # of OrbitApp
-
@@ -102,17 +102,12 @@ module OrbitApp
          def  initialize(&block)
            @query = nil
            @image = nil
-	      @sorting_query = 'desc(:created_at)'
            @more_link = {}
            @fields = []
            @enabled_styles = STYLE
             block.arity < 1 ? instance_eval(&block) : block.call(self) if block_given?
          end

-	  def sorting(query)
-	    @sorting_query = query
-	  end
-
          def enable(args)
            @enabled_styles = args
          end
@@ -127,7 +122,7 @@ module OrbitApp
          end

          def to_module_app_format
-            {"query"=>@query,"image"=>@image,"more_link"=>@more_link,"enabled_styles"=>@enabled_styles,:sorting_query=>@sorting_query} rescue nil
+            {"query"=>@query,"image"=>@image,"more_link"=>@more_link,"enabled_styles"=>@enabled_styles} rescue nil
          end

          def link_field(field_name,setting)
@@ -1,35 +0,0 @@
-# encoding: utf-8
-
-require 'mongo'
-include Mongo
-
-DB_BASE_NAME = "production"
-
-main_db = MongoClient.new("localhost", 27017).db("#{DB_BASE_NAME}_#{0}")
-main_bulletin = main_db["bulletins"]
-main_cat =  main_db["bulletin_categories"]
-
-copy_db = MongoClient.new("localhost", 27017).db("#{DB_BASE_NAME}_#{11}")
-copy_bulletin = copy_db["bulletins"]
-copy_cat =  copy_db["bulletin_categories"]
-
-
-main_cat.find(key: /rss_/).each do |category|
-  category_id = \
-  if cat = copy_cat.find_one(key: category['key'])
-    cat['_id']
-  else
-    copy_category = category.clone
-    copy_category['_id'] = BSON::ObjectId.new
-    copy_cat.save copy_category
-  end
-
-  main_bulletin.find(bulletin_category_id: category['_id']).each do |bulletin|
-    unless copy_bulletin.find_one(rss_link: bulletin['rss_link'])
-      copybulletin = bulletin.clone
-      copybulletin['_id'] = BSON::ObjectId.new
-      copybulletin['bulletin_category_id'] = category_id
-      bulletin_id = copy_bulletin.save copybulletin
-    end
-  end
-end
@@ -1,129 +0,0 @@
-# encoding: utf-8
-
-require 'rss'
-require 'mongo'
-
-SITES = { "總務處-各單位公告" => "0",
-          "總務處-文書組" => "1",
-          "總務處-出納組" => "2",
-          "總務處-事務組" => "3",
-          "總務處-保管組" => "5",
-          "總務處-採購組" => "6",
-          "總務處-經營管理組" => "7",
-          "總務處-駐衛警察隊" => "9",
-          "總務處-營繕組" => "10",
-          "總務處-總務處" => "11",
-          "社會科學院-社會科學院總務分處" => "4",
-          "醫學院-醫學院總務分處" => "8" }
-
-SITE_KEYS = SITES.keys
-
-DB_BASE_NAME = "production"
-
-all = {}
-continue = true
-i = 1
-yesterday = Time.now - 86400
-
-while continue do
-  open("http://ann.cc.ntu.edu.tw/asp/rss.asp?page=#{i}") do |rss|
-    feed = RSS::Parser.parse(rss.read.encode('utf-8', 'big5', invalid: :replace, undef: :replace, replace: '').gsub('<pubDate>Wes,', '<pubDate>Wed,').gsub(/(encoding=\"big5\")/, 'encoding="utf-8"'))
-    feed.items.each do |item|
-      if item.pubDate > yesterday
-        if SITE_KEYS.include?(item.author)
-          author = item.author.strip
-          category = item.category.to_s.gsub(/\<(\/)*category\>/, '')
-          if all[author]
-            all[author][item.link.strip] = {title: item.title.strip, author: author, link: item.link.strip, date: item.pubDate, category: category, description: item.description.gsub("\r\n", '<br/>').strip}
-          else
-            all[author] = {item.link.strip => {title: item.title.strip, author: author, link: item.link.strip, date: item.pubDate, category: category, description: item.description.gsub("\r\n", '<br/>').strip}}
-          end
-        end
-      else
-        continue = false
-        break
-      end
-    end
-  end
-  i += 1
-end
-
-# Get corresponding category_id or create a new one
-def get_category_id(category, categories, coll_cat)
-  if categories.keys.include? "rss_#{category}"
-    [categories["rss_#{category}"], categories]
-  else
-    cat = {
-      _type: "BulletinCategory",
-      key: "rss_#{category}",
-      disable: false,
-      title: {:zh_tw => category},
-      created_at: Time.now,
-      updated_at: Time.now
-    }
-    categories["rss_#{category}"] = result = coll_cat.save(cat)
-    [result, categories]
-  end
-end
-
-# Get categories and id based on a given site number
-def get_mongo_and_categories(site_number="0")
-  db = Mongo::Connection.new("localhost", 27017).db("#{DB_BASE_NAME}_#{site_number}")
-  coll_bulletin = db["bulletins"]
-  coll_cat =  db["bulletin_categories"]
-
-  categories = coll_cat.find().to_a.inject({}) do |categories, category|
-    categories[category['key']] = category['_id']
-    categories
-  end
-  [categories, coll_bulletin, coll_cat]
-end
-
-# Get main site (總務處) categories
-@main_categories, @main_coll_bulletin, @main_coll_cat = get_mongo_and_categories
-@copy_categories, @copy_coll_bulletin, @copy_coll_cat = get_mongo_and_categories('11')
-
-all.each do |key, value| # Loop through all the authors
-  site_number = SITES[key]
-  categories, coll_bulletin, coll_cat = get_mongo_and_categories(site_number) # Get current's site categories
-  value.each_value do |bul| # Loop through all the items
-    category_id, categories = get_category_id(bul[:category], categories, coll_cat)
-    unless coll_bulletin.find_one(rss_link: bul[:link]) 
-      bulletin = {  _type: "Bulletin",
-                    postdate: bul[:date],
-                    created_at: bul[:date],
-                    updated_at: bul[:date],
-                    is_checked: true,
-                    is_pending: false,
-                    is_rejected: false,
-                    bulletin_category_id: category_id,
-                    title: {:zh_tw => bul[:title]},
-                    text: {:zh_tw => bul[:description]},
-                    available_for_zh_tw: true,
-                    rss_link: bul[:link],
-                    is_top: false,
-                    is_hot: false,
-                    is_hidden: false }
-      coll_bulletin.save(bulletin) 
-
-      unless site_number.eql?("0") || @main_coll_bulletin.find_one(rss_link: bul[:link]) # Copy the item to the main site
-
-        category_id, @main_categories = get_category_id(bul[:category], @main_categories, @main_coll_cat)
-        main_bulletin = bulletin.clone
-        main_bulletin['_id'] = BSON::ObjectId.new
-        main_bulletin[:bulletin_category_id] = category_id
-        @main_coll_bulletin.save(main_bulletin)
-
-        category_id, @copy_categories = get_category_id(bul[:category], @copy_categories, @copy_coll_cat)
-        copy_bulletin = bulletin.clone
-        copy_bulletin['_id'] = BSON::ObjectId.new
-        copy_bulletin[:bulletin_category_id] = category_id
-        @copy_coll_bulletin.save(copy_bulletin)
-
-      end
-    end
-  end
-end
-
-
-
@@ -1,113 +0,0 @@
-# encoding: utf-8
-
-require 'rss'
-require 'mongo'
-
-SITES = { "總務處-各單位公告" => "0",
-          "總務處-文書組" => "1",
-          "總務處-出納組" => "2",
-          "總務處-事務組" => "3",
-          "總務處-保管組" => "5",
-          "總務處-採購組" => "6",
-          "總務處-經營管理組" => "7",
-          "總務處-駐衛警察隊" => "9",
-          "總務處-營繕組" => "10",
-          "總務處-總務處" => "11",
-          "社會科學院-社會科學院總務分處" => "4",
-          "醫學院-醫學院總務分處" => "8" }
-
-SITE_KEYS = SITES.keys
-
-DB_BASE_NAME = "production"
-
-all = {}
-continue = true
-i = 1
-while continue do
-  open("http://ann.cc.ntu.edu.tw/asp/rss.asp?page=#{i}") do |rss|
-    feed = RSS::Parser.parse(rss.read.encode('utf-8', 'big5', invalid: :replace, undef: :replace, replace: '').gsub('<pubDate>Wes,', '<pubDate>Wed,').gsub(/(encoding=\"big5\")/, 'encoding="utf-8"'))
-    feed.items.size
-    feed.items.each do |item|
-      if SITE_KEYS.include?(item.author)
-        author = item.author.strip
-        category = item.category.to_s.gsub(/\<(\/)*category\>/, '')
-        if all[author]
-          all[author][item.link.strip] = {title: item.title.strip, author: author, link: item.link.strip, date: item.pubDate, category: category, description: item.description.gsub("\r\n", '<br/>').strip}
-        else
-          all[author] = {item.link.strip => {title: item.title.strip, author: author, link: item.link.strip, date: item.pubDate, category: category, description: item.description.gsub("\r\n", '<br/>').strip}}
-        end
-      end
-    end
-    continue = false if feed.items.size < 100
-  end
-  i += 1
-end
-
-# Get corresponding category_id or create a new one
-def get_category_id(category, categories, coll_cat)
-  if categories.keys.include? "rss_#{category}"
-    [categories["rss_#{category}"], categories]
-  else
-    cat = {
-      _type: "BulletinCategory",
-      key: "rss_#{category}",
-      disable: false,
-      title: {:zh_tw => category},
-      created_at: Time.now,
-      updated_at: Time.now
-    }
-    categories["rss_#{category}"] = result = coll_cat.save(cat)
-    [result, categories]
-  end
-end
-
-# Get categories and id based on a given site number
-def get_mongo_and_categories(site_number="0")
-  db = Mongo::Connection.new("localhost", 27017).db("#{DB_BASE_NAME}_#{site_number}")
-  coll_bulletin = db["bulletins"]
-  coll_cat =  db["bulletin_categories"]
-
-  categories = coll_cat.find().to_a.inject({}) do |categories, category|
-    categories[category['key']] = category['_id']
-    categories
-  end
-  [categories, coll_bulletin, coll_cat]
-end
-
-# Get main site (總務處) categories
-@main_categories, @main_coll_bulletin, @main_coll_cat = get_mongo_and_categories
-
-all.each do |key, value| # Loop through all the authors
-  site_number = SITES[key]
-  categories, coll_bulletin, coll_cat = get_mongo_and_categories(site_number) # Get current's site categories
-  value.each_value do |bul| # Loop through all the items
-    category_id, categories = get_category_id(bul[:category], categories, coll_cat)
-    unless coll_bulletin.find_one(rss_link: bul[:link]) 
-      bulletin = {  _type: "Bulletin",
-                    postdate: bul[:date],
-                    created_at: bul[:date],
-                    updated_at: bul[:date],
-                    is_checked: true,
-                    is_pending: false,
-                    is_rejected: false,
-                    bulletin_category_id: category_id,
-                    title: {:zh_tw => bul[:title]},
-                    text: {:zh_tw => bul[:description]},
-                    available_for_zh_tw: true,
-                    rss_link: bul[:link],
-                    is_top: false,
-                    is_hot: false,
-                    is_hidden: false }
-      coll_bulletin.save(bulletin) 
-      unless site_number.eql? "0" # Copy the item to the main site
-        category_id, @main_categories = get_category_id(bul[:category], @main_categories, @main_coll_cat)
-        main_bulletin = bulletin.clone
-        main_bulletin['_id'] = BSON::ObjectId.new
-        main_bulletin[:bulletin_category_id] = category_id
-        @main_coll_bulletin.save(main_bulletin)
-      end
-    end
-  end
-end
-
-
@@ -0,0 +1,55 @@
+# encoding: utf-8 
+require 'pry'
+namespace :import do
+  task :ntu_mb_news_report => :environment do
+
+    jfile = File.new("#{Rails.root}/lib/import_data/news_report.json").read
+    jdata = JSON.parse(jfile)    
+
+  end
+
+  task :ntu_mb => :environment do
+    DEPARTMENTS = %w[Management BA Acc Fin IB IM EMBA GMBA]
+    print 'Enter the numer of department you want to import'
+    puts DEPARTMENTS.map.with_index{|t,i| "#{i}.#{t}" }.to_s
+    num = STDIN.gets.gsub("\n",'').to_i
+
+    puts "Destroy all BulletinCategory? (Default No)"
+    if STDIN.gets.gsub("\n",'').downcase == 'yes'
+      BulletinCategory.destroy_all
+    else
+      puts "Did not destroy"
+    end
+    jfile = File.new("#{Rails.root}/lib/import_data/announce_categories.json").read
+    jdata = JSON.parse(jfile)
+    jdata.each do |data|
+        a = BulletinCategory.new data
+        a.save
+    end
+    news_report_category = BulletinCategory.new {"key":"news_report","title_translations":{"en":"NewsReport","zh_tw":"新聞報導"}}
+    puts "Imported #{jdata.count}+1(NewsReport)"
+
+
+    puts "Destroy all Bulletin? (Default No)"
+    if STDIN.gets.gsub("\n",'').downcase == 'yes'
+      Bulletin.destroy_all
+    else
+      puts "Did not destroy"
+    end
+    counter = 0
+    jfile = File.new("#{Rails.root}/lib/import_data/announcements.json").read
+    jdata = JSON.parse(jfile)
+    jdata.each do |data|
+      # puts data
+      # puts DEPARTMENTS[num]
+      if data["department"] == DEPARTMENTS[num]
+        a = Bulletin.new data
+        a.bulletin_category = BulletinCategory.where(:key=>data["category_key"]).first
+        a.save
+        counter = counter +1
+      end
+    end
+    puts "Imported #{counter}"
+
+  end
+end
@@ -310,74 +310,6 @@ namespace :migrate do
    Rake::Task["web_link_url:web_link_url_i18n"].execute
  end

-  task :save_users => :environment do
-    User.where(:email.not => /guest/).each{|s|s.save}
-  end
-
-  task :fix_bulletin_rss_available_lang => :environment do
-    Bulletin.all.each do |bull|
-      if bull.create_user_id.nil?
-        bull.update_attribute(:available_for_zh_tw, true)
-      end
-    end
-  end
-
-  task :fix_imported_data => :environment do
-    categories = BulletinCategory.where(key: /import_/).entries
-    unless categories.blank?
-      categories.each do |category|
-        bulletins = category.bulletins
-        unless bulletins.blank?
-          bulletins.each do |bulletin|
-            unless bulletin.bulletin_files.blank?
-              file = bulletin.bulletin_files[0]
-              bulletin.text_translations = file.description_translations
-              bulletin.save
-              file.update_attribute(:description, nil)
-            end
-          end
-        end
-      end
-    end
-    categories = ArchiveFileCategory.where(key: /import_/).entries
-    unless categories.blank?
-      categories.each do |category|
-        files = category.archive_files
-        unless files.blank?
-          files.each{|file| file.update_attributes({is_top: false, is_hot: false, is_hidden: false})}
-        end
-      end
-    end
-  end 
-
-  task :delete_rss_announcement => :environment do
-    categories = BulletinCategory.where(key: /rss_/).entries
-    unless categories.blank?
-      categories.each do |category|
-        bulletins = category.bulletins
-        unless bulletins.blank?
-          bulletins.each(&:destroy)
-        end
-      end
-    end
-  end 
-
-  task :fix_imported_rss => :environment do
-    categories = BulletinCategory.where(key: /rss_/).entries
-    unless categories.blank?
-      categories.each do |category|
-        bulletins = category.bulletins
-        unless bulletins.blank?
-          bulletins.each do |bulletin|
-            bulletin.update_attribute(:is_top, false) unless bulletin.is_top?
-            bulletin.update_attribute(:is_hot, false) unless bulletin.is_hot?
-            bulletin.update_attribute(:is_hidden, false) unless bulletin.is_hidden?
-          end
-        end
-      end
-    end
-  end
-
  task :fix_tagged_ids => :environment do
    Tag.all.each do |tag|
      tag.taggings.each do |tagging|
@@ -394,44 +326,4 @@ namespace :migrate do
    `mongo #{Mongoid.config.database.name} --eval "db.tags.remove({_type: {$ne: 'Tag'}})"`
  end

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

 namespace :site do
  
@@ -10,26 +9,21 @@ namespace :site do
    Site.create( :school => 'RulingDigital University', :department => 'Computer Science', :valid_locales => [ 'en', 'zh_tw' ], :in_use_locales => [ 'zh_tw', 'en' ]) 
    User.create!(:email=>'chris@rulingcom.com',:admin=>true,:user_id=>'chris',:password=>'password')
    `mongo #{Mongoid.config.database.name} --eval "db.fs.chunks.ensureIndex({files_id: 1, n: 1})"`
-
    puts  "Congres you can now login within url"
    puts 'Please upload design package (/admin/designs/upload_package ) and run rake site:necessary_data'
    I18nVariable.create!( :document_class => 'language', :key => 'en', :en => 'English', :zh_tw => '英文' )
    I18nVariable.create!( :document_class => 'language', :key => 'zh_tw', :en => 'Chinese', :zh_tw => '中文' )
-    Info.create!(key: "profile", built_in: true, disabled: false, title: {"zh_tw"=>"基本欄位", "en"=>"Basic Info"}, to_search: false)  
+    Info.create!(key: "profile", built_in: true, disabled: false, title: {"zh_tw"=>"基本欄位", "en"=>"Basic Info"}, to_search: false)
  end
  
-  task :create_logrotate => :environment do #Can remove after all products update
-    create_rulingcom_logrotate
-  end
-
  task :necessary_data => :environment do
-    auto_setting
    site = Site.first
-    site.update_attribute(:title,'RulingOrbit Demo Site')
-    site.update_attribute(:resque_namespace,@resque_namespace)
+    site.title = 'RulingOrbit Demo Site'
+    site.save

    # home_trans = I18nVariable.create!( :document_class => 'Home', :key => 'home', :en => 'Homepage', :zh_tw => '首頁')
    design = Design.first
+    site = Site.first
    site.design = design
    site.save
    theme = design.themes.first
@@ -37,78 +31,6 @@ namespace :site do

    home.title_translations = {"zh_tw"=>"首頁", "en"=>"Home"}
    home.save 
-
-    puts "Rember to restart server after you setup all sites for starting God"
  end

-  task :start_auto_setting => :environment do
-    auto_setting
-  end
-
-  def auto_setting
-    puts "Enter your resque namespace[Orbit]:......"
-    @resque_namespace = STDIN.gets.gsub("\n",'')
-    @resque_namespace = APP_CONFIG['orbit'] if @resque_namespace.empty?
-
-
-    puts "Is this the only site [ Entry site? ] on this mechine?[Default No]:......"
-    site_is_alone = false
-    site_is_alone = STDIN.gets.gsub("\n",'')
-    site_is_alone = true if site_is_alone.downcase == 'yes'
-
-    puts "Is this a primary site?[Default No]:......"
-    site_is_primary = false
-    site_is_primary = STDIN.gets.gsub("\n",'')
-    site_is_primary = true if site_is_primary.downcase == 'yes'
-
-    puts "Traffic heavy?[Default No]:......"
-    traffic_heavy = false
-    traffic_heavy = STDIN.gets.gsub("\n",'')
-    traffic_heavy = true if traffic_heavy.downcase == 'yes'
-
-    @traffic_rate = traffic_heavy ? 2 : 1
-
-    if site_is_alone
-        @resque_workers = 5 * @traffic_rate  #Entry Site 
-    else
-        if site_is_primary
-            @resque_workers = 2  * @traffic_rate  #Primary Site 
-        else
-            @resque_workers = 1  * @traffic_rate  #Secondary Site 
-        end
-    end
-    
-    resque_setting = ERB.new(File.new("lib/template/setting/resque.god.erb").read)
-    File.open("config/resque.god", 'w') { |file| file.write(resque_setting.result) }
-
-    resque_schedule_setting = ERB.new(File.new("lib/template/setting/resque_schedule.god.erb").read)
-    File.open("config/resque_schedule.god", 'w') { |file| file.write(resque_schedule_setting.result) }
-
-    if site_is_primary
-        solr_setting = ERB.new(File.new("lib/template/setting/solr.god.erb").read)
-        File.open("config/solr.god", 'w') { |file| file.write(solr_setting.result) }        
-        create_rulingcom_logrotate
-    end  
-  end
-
-
-def create_rulingcom_logrotate
-    `sudo mkdir -p /var/log/rulingcom` unless File.directory? "/var/log/rulingcom"
-    @project_folder = ENV["PWD"]
-    puts "Is your Orbit folder: #{@project_folder} (If YES => Press enter,or enter your path)"
-    user_enter_project_folder = STDIN.gets.gsub("\n",'')
-    @project_folder = user_enter_project_folder unless user_enter_project_folder.empty?
-
-    @user_home_folder = ENV["HOME"]
-    puts "Is your Home folder: #{@user_home_folder} (If YES => Press enter,or enter your path)"
-    user_enter_home_folder = STDIN.gets.gsub("\n",'')
-    @user_home_folder = user_enter_home_folder unless user_enter_home_folder.empty?
-
-    logrotate_setting = ERB.new(File.new("lib/template/setting/rulingcom_log.erb").read)
-    File.open("#{@project_loc}/tmp/logrotate_setting", 'w') { |file| file.write(logrotate_setting.result) } 
-
-    `sudo cp #{@project_loc}/tmp/logrotate_setting /etc/logrotate.d/rulingcom` 
-    `logrotate -v -f /etc/logrotate.conf`
-end
-
 end
@@ -1,14 +0,0 @@
-# encoding: utf-8 
-namespace :system_check do
-  task :god_can_start => :environment do
-     unless File.directory? "/var/log/rulingcom"
-       puts "Creating Rulingcom log folder"
-       `sudo mkdir -p /var/log/rulingcom`
-     end
-  end
-  task :set_resque_namespace,[:namespace] => :environment do |t,args|
-    site = Site.first
-    site.resque_namespace = args[:namespace]
-    site.save
-  end
-end
@@ -9,17 +9,17 @@ namespace :web_link_url do
  	
  	@weblinks.each do |wl|

-      if wl.url_translations.is_a?(String)
-      
-        @wlurl = wl.url_translations
-        
-        wl.url_translations = {}
-    	
-        wl.url_translations["zh_tw"] = @wlurl
-    	
-        wl.url_translations["en"] = @wlurl
+  	  if wl.url.nil? 

-        wl.save
+  	  @wlurl = wl.url_translations
+
+      wl.url_translations = {}
+  	
+      wl.url_translations["zh_tw"] = @wlurl
+  	
+      wl.url_translations["en"] = @wlurl
+
+      wl.save

  	  else
  	  	puts 'no data'
@@ -1,59 +0,0 @@
-rails_env   = ENV['RAILS_ENV']  || "production"
-rails_root  = ENV['RAILS_ROOT'] || File.dirname(__FILE__) + '/..'
-user_home = ENV['HOME'] || File.dirname(__FILE__) + '/../..'
-development_uid = ''
-development_gid = ''
-
-  God.watch do |w|
-    w.dir        = rails_root
-    w.name    = "<%= @resque_namespace.nil? ? "" : "#{@resque_namespace}-" %>resque-scheduler"
-    w.group   = 'rulingcom'
-    w.interval = 10.seconds
-    w.pid_file = "#{rails_root}/tmp/#{w.name}.pid"
-
-    w.env       = {"QUEUE"=>"*", "RAILS_ENV"=>rails_env,"HOME"=>user_home, "RAILS_ENV"=>rails_env}
-    w.start     = "rake -f #{rails_root}/Rakefile resque:scheduler"
-    w.stop = "sudo kill -KILL $(cat #{w.pid_file})"
-    w.uid = (rails_env == 'production' )? "root" : development_uid
-    w.gid = (rails_env == 'production' )? "root" : development_gid
-  
-    w.log = (rails_env == 'production' )? "/var/log/#{w.group}/#{w.name}.log":"#{rails_root}/log/dev-#{w.name}.log"
-
-    # restart if memory gets too high
-    w.transition(:up, :restart) do |on|
-      on.condition(:memory_usage) do |c|
-        c.above = 350.megabytes
-        c.times = 2
-      end
-    end
-
-    # determine the state on startup
-    w.transition(:init, { true => :up, false => :start }) do |on|
-      on.condition(:process_running) do |c|
-        c.running = true
-      end
-    end
-
-    # determine when process has finished starting
-    w.transition([:start, :restart], :up) do |on|
-      on.condition(:process_running) do |c|
-        c.running = true
-        c.interval = 5.seconds
-      end
-
-      # failsafe
-      on.condition(:tries) do |c|
-        c.times = 5
-        c.transition = :start
-        c.interval = 5.seconds
-      end
-    end
-
-    # start if process is not running
-    w.transition(:up, :start) do |on|
-      on.condition(:process_running) do |c|
-        c.running = false
-      end
-    end
-  end
-
@@ -1,33 +0,0 @@
-/var/log/rulingcom/*.log  {
-    daily
-    dateext
-    compress
-    rotate 30
-}
-
-#Resque
-<%= "#{@project_folder}/nginx/logs/access.log" %>{
-    daily
-    dateext
-    compress
-    rotate 30
-}
-
-#DB log
-/var/log/mongodb{
-    daily
-    dateext
-    compress
-    rotate 30
-}
-
-#Orbit
-<%= "#{@project_folder}/log/*production.log" %>{
-    daily
-    dateext
-    compress
-    rotate 30
-}
-# end of Orbit,EXTEND IF NEEDED
-
-#Remember to save this file as /etc/logrotate.d/rulingcom
@@ -1,9 +0,0 @@
-// This list may be created by a server logic page PHP/ASP/ASPX/JSP in some backend system.
-// There templates will be displayed as a dropdown in all media dialog if the "template_external_list_url"
-// option is defined in TinyMCE init.
-
-var tinyMCETemplateList = [
-  // Name, URL, Description
-  ["Simple snippet", "/tinymce/templates/snippet1.htm", "Simple HTML snippet."],
-  ["Layout", "/tinymce/templates/layout1.htm", "HTML Layout."]
-];
@@ -1,15 +0,0 @@
-<table border="1">
-	<thead>
-		<tr>
-			<td>Column 1</td>
-			<td>Column 2</td>
-		</tr>
-	</thead>
-
-	<tbody>
-		<tr>
-			<td>Username: {$username}</td>
-			<td>Staffid: {$staffid}</td>
-		</tr>
-	</tbody>
-</table>
@@ -1 +0,0 @@
-This is just some <strong>code</strong>.
@@ -1,78 +0,0 @@
-
-.mega_tab_block {
-    clear: both;
-    position: relative;
-}
-
-.mega_tab_block h3 {
-    font: 22px/100% 'arial',sans-serif;
-    margin: 0 0 10px;
-    padding: 0;
-}
-
-.mega_tab_block .pagination {
-    float: left;
-    height: auto;
-    margin: 10px 0 0;
-    width: auto;
-}
-.mega_tab_block .pagination a {
-    background: none repeat scroll 0 0 #EEEEEE;
-    display: block;
-    float: left;
-    margin: 0 5px 0 0;
-    padding: 10px;
-}
-
-
-.tag_block {
-    clear: both;
-    margin: 0 0 20px;
-    position: relative;
-}
-.mega_tab_block .tag_list {
-    background: none repeat scroll 0 0 #EEEEEE;
-    margin: 0;
-    overflow: hidden;
-    padding: 0 0 0 5px;
-}
-.mega_tab_block .tag_list li {
-    float: left;
-    list-style: none outside none;
-}
-.mega_tab_block .tag_list li a {
-    background: none repeat scroll 0 0 #DDDDDD;
-    float: left;
-    margin: 0 5px 0 0;
-    padding: 10px;
-}
-
-.news_block {
-    clear: both;
-    margin: 0 0 20px;
-    overflow: hidden;
-    position: relative;
-}
-.mega_tab_block .news_list {
-    margin: 0;
-    padding: 0;
-}
-.mega_tab_block .news_list li {
-    list-style: none outside none;
-    padding: 5px 0;
-}
-
-
-.links_block {
-    clear: both;
-    overflow: hidden;
-    position: relative;
-}
-.mega_tab_block .links_list {
-    margin: 0;
-    padding: 0;
-}
-.mega_tab_block .links_list li {
-    list-style: none outside none;
-    padding: 5px 0;
-}
@@ -95,7 +95,6 @@ class Panel::Announcement::BackEnd::BulletinsController < OrbitBackendController
  # GET /bulletins/1/edit
  def edit
    @bulletin = Bulletin.find(params[:id])
-    @users = @bulletin.get_users
    if !current_user.admin? && (@bulletin.is_rejected? || @bulletin.is_checked?)
      redirect_to :action => :index
    else
@@ -66,75 +66,14 @@ class Panel::Announcement::Widget::BulletinsController < OrbitWidgetController
    
  end
  
-  def bulletins_and_web_links
-  
-    @part = PagePart.find(params[:part_id]) if !params[:part_id].blank?
-    
-    @title = @part.title_translations[I18n.locale.to_s]
-    
-    if !@part.blank? and @part.widget_data_count
-      @page_num = @part.widget_data_count
-    else
-      @page_num = 5
-    end
-
-    date_now = Time.now
-
-    if !params[:tag_id].blank?
-      @tags = Tag.any_in(:_id => params[:tag_id]).asc(:created_at)
-    elsif params[:tag_id].blank? and !@part.tag.blank?
-      @tags = Tag.any_in(:_id => @part.tag).asc(:created_at)
-    else
-      @ModuleApp_b = ModuleApp.first(:conditions => {:key=>'announcement'})
-      @tags = Tag.where(:module_tag_id => @ModuleApp_b.id).asc(:created_at)
-    end
-
-    @selected_tag = Tag.find(params[:id]).first rescue @tags[0]
-
-    @bulletins = Bulletin.available_for_lang(I18n.locale).can_display.where(:tagged_ids => @selected_tag.id.to_s, :is_hidden => false).any_of( {deadline: nil,:postdate.lte => date_now} , {:deadline.gte => date_now,:postdate.lte => date_now} ).desc(:is_top, :postdate).page(params[:page]).per(@page_num) rescue nil
-
-    if @part.widget_style == 'bulletins_and_web_links'
-      @ModuleApp_w = ModuleApp.first(:conditions => {:key=>'web_resource'})
-      @link_selected_tag = Tag.first(:conditions => {:name => @selected_tag.name, :module_tag_id => @ModuleApp_w.id})
-      @web_links = WebLink.where(:tagged_ids => @link_selected_tag.id.to_s, :is_hidden => false).desc(:is_top,:created_at).available_for_lang(I18n.locale).page(params[:page]).per(@page_num) rescue nil
-    end
-    
-  end
-  
  def reload_bulletins
-  
-    @part = PagePart.find(params[:part_id]) if !params[:part_id].blank?
-    
-    @title = @part.title_translations[I18n.locale.to_s]
-    
-    if !@part.blank? and @part.widget_data_count
-      @page_num = @part.widget_data_count
-    else
-      @page_num = 5
-    end
-    
-    date_now = Time.now
-
-    @selected_tag = Tag.find(params[:tag_id]).first
-    @bulletins = Bulletin.available_for_lang(I18n.locale).can_display.where(:tagged_ids => @selected_tag.id.to_s, :is_hidden => false).any_of( {deadline: nil,:postdate.lte => date_now} , {:deadline.gte => date_now,:postdate.lte => date_now} ).desc(:is_top, :postdate).page(params[:page]).per(@page_num) rescue nil
+    @selected_tag = Tag.find(params[:tag_id])
+    @bulletins = Bulletin.available_for_lang(I18n.locale).can_display.where(:tagged_ids => params[:tag_id]).where(:is_hidden => false).any_of( {deadline: nil,:postdate.lte => date_now} , {:deadline.gte => date_now,:postdate.lte => date_now} ).desc(:is_top, sort).page(params[:page]).per(5) rescue nil
  end
  
  def reload_web_links
-  
-    @part = PagePart.find(params[:part_id]) if !params[:part_id].blank?
-    
-    if !@part.blank? and @part.widget_data_count
-      @page_num = @part.widget_data_count
-    else
-      @page_num = 5
-    end
-    
-    date_now = Time.now
-
-    @selected_tag = Tag.find(params[:tag_id]).first
-    @ModuleApp = ModuleApp.first(:conditions => {:key=>'web_resource'})
-    @link_selected_tag = Tag.first(:conditions => {:name => @selected_tag.name, :module_tag_id => @ModuleApp.id})
-    @web_links = WebLink.where(:tagged_ids => @link_selected_tag.id.to_s, :is_hidden => false).desc(:is_top,:created_at).available_for_lang(I18n.locale).page(params[:page]).per(@page_num) rescue nil
+    @selected_tag = Tag.find(params[:tag_id])
+    @web_links = WebLink.where(:name => @selected_tag.name).where(:is_hidden => false).desc(:is_top, sort).available_for_lang(I18n.locale).page(params[:page]).per(5) rescue nil
  end

  def bulletins_side_bar
@@ -28,7 +28,6 @@ class Bulletin

  field :create_user_id
  field :update_user_id, :class_name => "User"
-  field :user_ids
  
  field :is_top, :type => Boolean, :default => false
  field :is_hot, :type => Boolean, :default => false
@@ -41,7 +40,6 @@ class Bulletin
  field :not_checked_reason
  
  field :public, :type => Boolean, :default => true
-  field :rss_link
  
  scope :can_display, where(is_checked: true, is_rejected: false, is_pending: false)
  scope :available_for_lang, ->(locale){ where("available_for_#{locale}".to_sym => true) }
@@ -217,10 +215,6 @@ class Bulletin
    preview_object
  end

-  def get_users
-    User.find(self.user_ids) rescue []
-  end
-

  protected
  
@@ -116,17 +116,6 @@
 		<% elsif current_user.admin? %>
 			<%= f.hidden_field :is_checked,:value => true%>
 		<% end %>
-
-		<div id="widget-member" class="widget-box widget-size-300">
-			<div class="widget-action clear tip" title="Rejected Report">
-				<a class="action"><i class="icon-cog icon-white"></i></a>
-			</div>
-			<h3 class="widget-title"><i class="icons-tag"></i><%= t(:promoter) %></h3>
-				<div class="widget-content clear form-horizontal">
-					<%= render partial: 'admin/member_selects/selection_box', locals: {field: 'bulletin[user_ids][]', users: @users} %>
-				</div>
-		</div>
-
 	</div>
  

@@ -141,7 +130,7 @@
 		
 			<%= f.label :category,t(:category)%> 
 			<%= f.select :bulletin_category_id, @bulletin_categorys.collect{|t| [ t.title, t.id ]}, {}, :class => "input-medium" %>
-
+			
 			<ul class="nav nav-tabs">
 				<%# @site_valid_locales.each_with_index do |locale, i| %>
 				<% @site_valid_locales.each_with_index do |locale, i| %>
@@ -15,7 +15,6 @@
 <div class="news_paragraph">
 	<%= @bulletin.text.html_safe rescue '' %>
 </div>
-
 <div class="linkAndFile">
 	<% if @bulletin.bulletin_links.size > 0 %>
 		<div>
@@ -37,22 +36,6 @@
 			</div>
 		</div>
 	<% end %>
-	<% unless @bulletin.rss_link.blank? %>
-		<div>
-			<%= link_to t('ntu.rss_origin'), @bulletin.rss_link %>
-		</div>
-	<% end %>
 </div>

-<% unless @bulletin.user_ids.blank? %>
-	<div class="promoter">
-		<div>
-			<p><%= t(:promoter) %>：</p>
-			<span><%= @bulletin.get_users.map{|u| "<span>#{u.name}</span>"}.join(', ').html_safe %></span>
-		</div>
-	</div>
-<% end %>
-
 <%= share_links(@bulletin, 'announcement') %>
-
-<%= render partial: 'admin/member_selects/promoter_front', locals: {users: @bulletin.get_users} %>
@@ -1,10 +1,10 @@
 <% @bulletins.each do |bulletin| %>
 	<li>
-		<%= link_to bulletin.title, panel_announcement_front_end_bulletin_path(bulletin, :category_id => bulletin.bulletin_category_id , :part_id => params[:part_id], :tag_id => [@selected_tag.id] )  %>
+		<%= link_to bulletin.title, panel_announcement_front_end_bulletin_path(bulletin, :category_id => bulletin.bulletin_category_id , :tag_id => @selected_tag.id )  %>
 	</li>
 <% end %>

 <div class='pagination'>
-	<%= link_to_previous_page @bulletins, 'Previous Page', :params => {:controller => 'widget/bulletins', :action => 'reload_bulletins', :part_id => params[:part_id], :tag_id => [@selected_tag.id]}, :remote => true, :class => 'previous' %>
-	<%= link_to_next_page @bulletins, 'Next Page', :params => {:controller => 'widget/bulletins', :action => 'reload_bulletins', :part_id => params[:part_id], :tag_id => [@selected_tag.id]}, :remote => true, :class => 'next' %>
+	<%= link_to_previous_page @bulletins, 'Previous Page', :params => {:controller => 'widget/bulletins', :action => 'reload_bulletins', :tag_id => @selected_tag.id}, :remote => true, :class => 'previous' %>
+	<%= link_to_next_page @bulletins, 'Next Page', :params => {:controller => 'widget/bulletins', :action => 'reload_bulletins', :tag_id => @selected_tag.id}, :remote => true, :class => 'next' %>
 </div>
@@ -1,3 +1,3 @@
 <li>
-	<%= link_to tag.name, panel_announcement_widget_bulletins_and_web_links_path(:inner=>true, :id => [tag.id], :part_id=>params[:part_id]), :remote => true, :class => ('active' if tag.eql?(@selected_tag)) %>
+	<%= link_to tag.name, panel_announcement_widget_bulletins_and_web_links_path(:id => tag.id), :remote => true, :class => ('active' if tag.eql?(@selected_tag)) %>
 </li>
@@ -5,6 +5,6 @@
 <% end %>

 <div class='pagination'>
-	<%= link_to_previous_page @web_links, 'Previous Page', :params => {:controller => 'widget/bulletins', :action => 'reload_web_links', :part_id => params[:part_id], :tag_id => @selected_tag.id}, :remote => true, :class => 'previous' %>
-	<%= link_to_next_page @web_links, 'Next Page', :params => {:controller => 'widget/bulletins', :action => 'reload_web_links', :part_id => params[:part_id], :tag_id => @selected_tag.id}, :remote => true, :class => 'next' %>
+	<%= link_to_previous_page @web_links, 'Previous Page', :params => {:controller => 'widget/bulletins', :action => 'reload_web_links', :tag_id => @selected_tag.id}, :remote => true, :class => 'previous' %>
+	<%= link_to_next_page @web_links, 'Next Page', :params => {:controller => 'widget/bulletins', :action => 'reload_web_links', :tag_id => @selected_tag.id}, :remote => true, :class => 'next' %>
 </div>
@@ -1,36 +0,0 @@
-<div class="mega_tab_block">
-
-	<div class="tag_block">
-		<ul id='bulletins_web_links_tags' class="tag_list">
-			<%= render :partial => 'tag', :collection => @tags %>
-		</ul>
-	</div>
-
-	<div class="news_block">
-		<h3 class="news_title2">
-			<%#= link_to t("announcement.bulletins"), panel_announcement_front_end_bulletins_path, :class => 'more' %>
-			<%= link_to @title, panel_announcement_front_end_bulletins_path, :class => 'more' %>
-		</h3>
-		<ul id='bulletins_web_links_bulletins' class="news_list">
-			<%= render 'bulletins' if @bulletins %>
-		</ul>
-	</div>
-
-	<% if @part.widget_style == 'bulletins_and_web_links' %>
-
-	<div class="links_block">
-		<h3 class="links_title"><%= t(:related_links) %></h3>
-		<ul id='bulletins_web_links_web_links' class="links_list">
-			<%= render 'web_links' if @web_links %>
-		</ul>
-	</div>
-
-	<% end %>
-
-</div>
-
-<% content_for :page_specific_javascript do %>
-	<%= javascript_include_tag "news_link" %>
-<% end %>
-
-<%= stylesheet_link_tag "announcement/bulletins_and_web_links" %>
@@ -1,3 +0,0 @@
-$('#bulletins_web_links_tags').html("<%= j render :partial => 'tag', :collection => @tags %>")
-$('#bulletins_web_links_bulletins').html("<%= j render 'bulletins' if @bulletins %>")
-$('#bulletins_web_links_web_links').html("<%= j render 'web_links' if @web_links %>")
@@ -35,6 +35,6 @@ en:
    update_bulletin_category_success: Update Category Successfully
    url: URL
    widget:
-      bulletins_and_web_links: Differential Nav.
+      bulletins_and_web_links: Bulletins and Web Resources
      index: Index
      search: Search
@@ -35,6 +35,6 @@ zh_tw:
    update_bulletin_category_success: 更新類別成功
    url: 連結位置
    widget:
-      bulletins_and_web_links: 分眾頁籤
+      bulletins_and_web_links: 索引
      index: 索引
      search: 搜尋
@@ -29,8 +29,7 @@ module Announcement

    widgets do
      default_widget do
-	  sorting 'desc(:postdate)'
-        query 'Bulletin.available_for_lang(I18n.locale).any_of( {deadline: nil,:postdate.lte => Time.now} , {:deadline.gte => Time.now,:postdate.lte => Time.now} )'
+        query 'Bulletin.any_of( {deadline: nil,:postdate.lte => Time.now} , {:deadline.gte => Time.now,:postdate.lte => Time.now} )'
        enable ["typeA","typeB_style3","typeC"]
        image :image
        field :postdate
@@ -52,11 +51,6 @@ module Announcement
        widget_i18n "announcement.widget.search"
      end

-      customize_widget "bulletins_and_web_links" do
-        widget_i18n "announcement.widget.bulletins_and_web_links"
-        style ["bulletins_and_links","bulletins_only"]
-      end
-
      # item "index","announcement.widget.index",:default_template=>true,:fields=>["title","category","postdate"]
      # item "bulletins_and_web_links","announcement.widget.bulletins_and_web_links"
    end
@@ -133,28 +133,4 @@ border-radius: 3px;
 }
 .o-archives.layout-table .o-archives-category {
 	font-weight: normal;
-}
-.o-archives.layout-table table {
-    width: 100%;
-}
-.o-archives.layout-table tbody tr td {
-    border-top: none;
-    padding: 0;
-}
-.o-archives.layout-table tbody tr:nth-child(odd) td {
-    border-bottom: none;
-    padding: 10px 0 0;
-}
-.o-archives.layout-table tbody tr:nth-child(even) td .o-archives-category {
-    margin-bottom: 5px;
-}
-.o-archives.layout-table tbody .o-archives-list-item ol {
-    margin: 0;
-    padding: 0;
-}
-.o-archives.layout-table tbody .promoter-block {
-    margin: 0 0 10px;
-    padding: 0;
-    background-color: transparent;
-    border: none;
 }
@@ -70,7 +70,6 @@ class Panel::Archive::BackEnd::ArchiveFilesController < OrbitBackendController
  # GET /archive_files/1/edit
  def edit
    @archive_file = ArchiveFile.find(params[:id])
-    @users = @archive_file.get_users
 	
 	@tags = get_tags
  end
@@ -60,12 +60,6 @@ class Panel::Archive::FrontEnd::ArchiveFilesController < OrbitWidgetController
    get_categorys
  end

-  def download
-    file = ArchiveFileMultiple.find(params[:id])
-    file.update_attribute(:download_count, file.download_count + 1)
-    render text: 'OK'
-  end
-
  protected

  def reload_archive_files
@@ -20,12 +20,11 @@ class ArchiveFile

  field :create_user_id
  field :update_user_id
-  field :user_ids
-  
-  field :is_top, :type => Boolean, :default => false 
-  field :is_hot, :type => Boolean, :default => false 
-  field :is_hidden, :type => Boolean, :default => false 
-  
+
+  field :is_top, :type => Boolean, :default => false
+  field :is_hot, :type => Boolean, :default => false
+  field :is_hidden, :type => Boolean, :default => false
+
  scope :can_display,where(is_hidden: false)

  # belongs_to :archive_file_category
@@ -86,8 +85,4 @@ class ArchiveFile
    end
  end

-  def get_users
-    User.find(self.user_ids) rescue []
-  end
-  
 end
@@ -9,7 +9,7 @@ class ArchiveFileMultiple
  field :file_title, localize: true
  # field :description
  field :choose_lang, :type => Array, :default => nil
-  field :download_count, type: Integer, default: 0
+
  field :should_destroy, :type => Boolean

  default_scope asc(:sort_number)
@@ -31,18 +31,8 @@
 				<%= tag.name %>
 				<% end %>
 			</div>
-		</div>  
-
-		<div id="widget-member" class="widget-box widget-size-300">
-			<div class="widget-action clear tip" title="Rejected Report">
-				<a class="action"><i class="icon-cog icon-white"></i></a>
-			</div>
-			<h3 class="widget-title"><i class="icons-tag"></i><%= t(:promoter) %></h3>
-				<div class="widget-content clear form-horizontal">
-					<%= render partial: 'admin/member_selects/selection_box', locals: {field: 'archive_file[user_ids][]', users: @users} %>
-				</div>
 		</div>
-  
+
 	</div>


@@ -96,13 +86,12 @@
 							<th>File</th>
 							<th>File Name</th>
 							<th class="span2"><%= t('呈現語系')%></th>
-							<th class="span2"><%= t('archive.download_count')%></th>
 							<th class="span1"></th>
 						</tr>
 					</thead>
 					<tfoot>
 						<tr>
-							<td style="text-align:center" colspan="6">
+							<td style="text-align:center" colspan="4">
 								<div id='add_archive_file_multiple' class="info_input archive_file_multiples_block">
 									<%= hidden_field_tag 'archive_file_multiple_field_count', @archive_file.archive_file_multiples.count %>
 									<a class="add"><span class="btn btn-primary btn-small"><i class="icon-plus icon-white"></i> ADD/新增</span></a>