NKUT footer displaying number of visitors and last update time

Gemfile

@@ -43,7 +43,6 @@ gem 'resque', :require => 'resque/server' # background jobs
 gem 'resque-scheduler' # job scheduling
 gem 'resque-restriction'
 #gem 'rb-readline'
-gem 'roo'
 # gem 'ruby-debug19'
 gem 'rubyzip', '< 1.0.0'
 

app/assets/javascripts/kernel.js

@@ -38,6 +38,8 @@ $(document).ready(function() {
 			}
 		}
 	})
+
+	$('.page_footer').append($('#last_update_date')[0]);
 });
 //    Ad Banner FX code [end]
 

app/assets/javascripts/lib/modal-preview.js

@@ -1,13 +1,20 @@
 $(function() {
 	$(".post_preview").click(function(){
 		$("#main-wrap").after("<span id='show_preview'></span>");
+		
+		var  preview_url = $(this).attr('url');
 
-		$.post($(this).attr('url'), $(".previewable").serialize() ,function(data){
-			$('#show_preview .modal').modal();
+		$("form.previewable").ajaxSubmit({
+			beforeSubmit: function(a,f,o){
+			o.dataType = 'script';
+			o.url = preview_url;
+			o.type =  'post';
+		},success: function(msg) {
+			$('#show_preview .modal').modal()
 			$('#show_preview .modal').height(function() {
 				return $(window).height() * 0.7;
 			});
-		},'script');
+		}});
 	});
 	$(".preview_trigger").click(function(){
 		$("#main-wrap").after("<span id='show_preview'></span>");
@@ -38,10 +45,10 @@ $(function() {
 	// 			o.url = url.nodeValue;
 	// 			o.type =  'post';
 	// 		},success: function(msg) {
-				// $('#show_preview .modal').modal()
-				// $('#show_preview .modal').height(function() {
-				// 	return $(window).height() * 0.7;
-				// });
+	// 			$('#show_preview .modal').modal()
+	// 			$('#show_preview .modal').height(function() {
+	// 				return $(window).height() * 0.7;
+	// 			});
 	// 		}
 
 	// 		});

app/assets/javascripts/lib/social-share-button.coffee

@@ -1,33 +0,0 @@
-window.SocialShareButton =
-  openUrl : (url) ->
-    window.open(url)
-    false
-
-  share : (el) ->
-    site = $(el).data('site')
-    title = encodeURIComponent($(el).parent().data('title'))
-    img = encodeURIComponent($(el).parent().data("img"))
-    fb_url = encodeURIComponent($(el).parent().data("fb_url"))
-    url = encodeURIComponent(location.href)
-    switch site
-      when "weibo"
-        SocialShareButton.openUrl("http://v.t.sina.com.cn/share/share.php?url=#{url}&pic=#{img}&title=#{title}&content=utf-8")
-      when "twitter"
-        SocialShareButton.openUrl("https://twitter.com/home?status=#{title}: #{url}")
-      when "douban"
-        SocialShareButton.openUrl("http://www.douban.com/recommend/?url=#{url}&title=#{title}&image=#{img}")
-      when "facebook"
-        SocialShareButton.openUrl("http://www.facebook.com/sharer.php?t=#{title}&u=#{fb_url}")
-      when "qq"
-        SocialShareButton.openUrl("http://sns.qzone.qq.com/cgi-bin/qzshare/cgi_qzshare_onekey?url=#{url}&title=#{title}&pics=#{img}")
-      when "tqq"
-        SocialShareButton.openUrl("http://share.v.t.qq.com/index.php?c=share&a=index&url=#{url}&title=#{title}&pic=#{img}")
-      when "baidu"
-        SocialShareButton.openUrl("http://apps.hi.baidu.com/share/?url=#{url}&title=#{title}&content=")
-      when "kaixin001"
-        SocialShareButton.openUrl("http://www.kaixin001.com/rest/records.php?url=#{url}&content=#{title}&style=11&pic=#{img}")
-      when "renren"
-        SocialShareButton.openUrl("http://widget.renren.com/dialog/share?resourceUrl=#{url}&title=#{title}&description=")
-      when "google_plus"
-        SocialShareButton.openUrl("https://plus.google.com/share?url=#{url}&t=#{title}")
-    false

app/assets/javascripts/member-selection.js

@@ -10,7 +10,7 @@ $(document).ready(function() {
       type: 'GET',
       url: $(this).attr("rel"),
       dataType: 'script',
-      data: {field: $(this).attr("field"), ids: ids},
+      data: {ids: ids},
       success: function (msg) {
         $("#member-filter").modal('show'); },
       error: function(){
@@ -20,11 +20,6 @@ $(document).ready(function() {
     });  
     return false;
   });
-
-  $(document).on('click', ".remove_user", function(){
-    $(this).parent().remove();
-  });
-
   $("#remove_users").on('click', function(){
     var ids = [];
     var users = $('.selected_user input[type="checkbox"]:checked');

app/assets/javascripts/orbit-bar-search.js

@@ -1,10 +0,0 @@
-$(document).ajaxStop(function() {
-  $('.nav').find('.dropdown').on({
-    mouseleave: function() {
-      $(this).removeClass("open");
-    },
-    mouseenter: function() {
-      $(this).addClass("open")
-    }
-  });
-});

app/assets/stylesheets/member_select.css

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

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

@@ -179,6 +179,7 @@ div[data-role="page"] {
 }
 .content .orbit-cycle-slideshow {
 	height: 300px;
+	overflow: hidden;
 }
 .content .orbit-cycle-slideshow img {
 	width: 100%;
@@ -325,13 +326,22 @@ div[id^="dialog"] .content {
 	margin-bottom: 5px;
 }
 @media(min-width:320px){
+	.content .orbit-cycle-slideshow {
+		height: 130px;
+	}
 }
 @media(min-width: 480px){
+	.content .orbit-cycle-slideshow {
+		height: 170px;
+	}
 	.content .newitem {
 		width: 440px;
 	}
 }
 @media(min-width:600px) {
+	.content .orbit-cycle-slideshow {
+		height: 200px;
+	}
 	.main-menu ul {
 		width: 420px;
 	}
@@ -340,6 +350,9 @@ div[id^="dialog"] .content {
 	}
 }
 @media(min-width:768px) {
+	.content .orbit-cycle-slideshow {
+		height: 250px;
+	}
 	.main-menu ul {
 		width: 480px;
 	}
@@ -351,6 +364,9 @@ div[id^="dialog"] .content {
 	}
 }
 @media(min-width:800px) {
+	.content .orbit-cycle-slideshow {
+		height: 330px;
+	}
 	.main-menu ul {
 		width: 480px;
 	}
@@ -359,6 +375,9 @@ div[id^="dialog"] .content {
 	}
 }
 @media(min-width:961px) {
+	.content .orbit-cycle-slideshow {
+		height: 380px;
+	}
 	.main-menu ul {
 		width: 480px;
 	}

app/assets/stylesheets/social-share-button.css

@@ -1,90 +0,0 @@
-.social-share-button-baidu {
-	display:inline-block;
-	width:16px;
-	height:16px;
-	background:url("/assets/social-share-button.png") 0px 0px no-repeat;
-}
-.social-share-button-delicious {
-	display:inline-block;
-	width:16px;
-	height:16px;
-	background:url("/assets/social-share-button.png") -16px 0px no-repeat;
-}
-.social-share-button-douban {
-	display:inline-block;
-	width:16px;
-	height:16px;
-	background:url("/assets/social-share-button.png") 0px -16px no-repeat;
-}
-.social-share-button-email {
-	display:inline-block;
-	width:16px;
-	height:16px;
-	background:url("/assets/social-share-button.png") -16px -16px no-repeat;
-}
-.social-share-button-facebook {
-	display:inline-block;
-	width:16px;
-	height:16px;
-	background:url("/assets/social-share-button.png") -32px 0px no-repeat;
-}
-.social-share-button-flickr {
-	display:inline-block;
-	width:16px;
-	height:16px;
-	background:url("/assets/social-share-button.png") -32px -16px no-repeat;
-}
-.social-share-button-google {
-	display:inline-block;
-	width:16px;
-	height:16px;
-	background:url("/assets/social-share-button.png") 0px -32px no-repeat;
-}
-.social-share-button-google_plus {
-	display:inline-block;
-	width:16px;
-	height:16px;
-	background:url("/assets/social-share-button.png") -16px -32px no-repeat;
-}
-.social-share-button-kaixin001 {
-	display:inline-block;
-	width:16px;
-	height:16px;
-	background:url("/assets/social-share-button.png") -32px -32px no-repeat;
-}
-.social-share-button-qq {
-	display:inline-block;
-	width:16px;
-	height:16px;
-	background:url("/assets/social-share-button.png") -48px 0px no-repeat;
-}
-.social-share-button-renren {
-	display:inline-block;
-	width:16px;
-	height:16px;
-	background:url("/assets/social-share-button.png") -48px -16px no-repeat;
-}
-.social-share-button-tqq {
-	display:inline-block;
-	width:16px;
-	height:16px;
-	background:url("/assets/social-share-button.png") -48px -32px no-repeat;
-}
-.social-share-button-twitter {
-	display:inline-block;
-	width:16px;
-	height:16px;
-	background:url("/assets/social-share-button.png") 0px -48px no-repeat;
-}
-.social-share-button-weibo {
-	display:inline-block;
-	width:16px;
-	height:16px;
-	background:url("/assets/social-share-button.png") -16px -48px no-repeat;
-}
-.social-share-button-rss {
-	display:inline-block;
-	width:16px;
-	height:16px;
-	background:url("/assets/social-share-button.png") -32px -48px no-repeat;
-}

app/controllers/admin/pages_controller.rb

@@ -36,6 +36,26 @@ class Admin::PagesController < Admin::ItemsController
       @item.page_contexts.build(:create_user_id => current_user.id, :update_user_id => current_user.id )
     end
     if @item.update_attributes(params[:page])
+      unless params[:page]['frontend_field'].nil?
+        frontend_class = []
+        frontend_field_name = []
+        frontend_sat_to_link = []
+
+        params[:page]['frontend_field'].each do |field|
+          frontend_class << field['class']
+          frontend_field_name << field['field_name']
+          frontend_sat_to_link << field['sat_to_link']
+        end
+
+        @item['frontend_class'] = frontend_class
+        @item['frontend_field_name'] = frontend_field_name
+        @item['frontend_sat_to_link'] = frontend_sat_to_link
+      end
+      
+      @item['tag'] = params[:page]['tag'] == nil ?  [] : params[:page]['tag']
+
+      @item.save
+
       render 'admin/items/reload_items'
     else
       @error = error_messages_for(@item)

app/controllers/admin/sites_controller.rb

@@ -72,7 +72,10 @@ class Admin::SitesController < OrbitBackendController
   end
 
   def system_info
-    
+    @disk_free = `df -h /`.gsub("\n","<br/>").html_safe
+    @nginx_version = %x[/opt/nginx/sbin/nginx -v 2>&1].gsub("\n","<br/>              ").html_safe
+    @mongo_version = `mongod --version`.split("\n")[0].html_safe
+    @linux_version = `lsb_release -d`.split(":")[1].html_safe
   end
 
   def search_engine

app/controllers/admin/template_store_controller.rb

@@ -1,22 +1,95 @@
+require 'net/http'
+require 'uri'
+require 'fileutils'
+require 'zip/zip'
 class Admin::TemplateStoreController < OrbitBackendController
   
  
   @@store_domain = STORE_CONFIG[:store_settings]["url"] 
   def index
     @store = @@store_domain
+    @design_ids = Design.all.map{|d| d.template_store_id}
     @templates = JSON.parse(get_templates)
   end
 
   def show
      @store = @@store_domain
+     @design_ids = Design.all.map{|d| d.template_store_id}
     @template = JSON.parse(get_template(params[:id])) rescue nil
   end
 
  def download_theme
-    render :json => {"success"=>true}.to_json
+  url = @@store_domain + params["url"]
+  url_base = url.split('/')[2]
+  url_path = '/'+url.split('/')[3..-1].join('/')
+  Net::HTTP.start(url_base) do |http|
+    open("public/#{params['slug']}.zip", "wb") do |file|
+      http.get(url_path) do |str|
+        file.write(str)
+      end
+    end
+  end
+    upload_package("#{params['slug']}.zip", params["id"])
+    File.delete("public/#{params['slug']}.zip")
+    render :json => {"success"=>true,"url"=>@@store_domain + params["url"]}.to_json
   end
   protected
 
+  def upload_package(package_name,template_store_id)
+
+    temp_file = Tempfile.new("temp_file")
+    original_file = File.open("#{Rails.root}/public/#{package_name}")
+    temp_file.write(original_file.read.force_encoding('UTF-8'))
+    temp_file.rewind
+    filename = File.basename(original_file,".zip")
+    unzip_design(temp_file, filename, template_store_id)
+    temp_file.close
+
+  end
+
+  def unzip_design(file, zip_name, template_store_id)
+    Zip::ZipFile.open(file) { |zip_file|
+      design = Design.new.from_json(zip_file.read("#{zip_name}/info.json"))
+      design.template_store_id = template_store_id
+      Dir.mktmpdir('f_path') { |dir|
+        themes_entries = []
+        javascripts_entries = []
+        images_entries = []
+
+        zip_file.entries.each do |entry|
+          case (path = entry.to_s)
+            when /\A(#{zip_name})\/(default\.css)\z/    #for default css
+              design.build_css_default(:file => get_temp_file(zip_file, dir, entry))
+            when /\A(#{zip_name})\/(reset\.css)\z/    #for reset css
+              design.build_css_reset(:file => get_temp_file(zip_file, dir, entry))
+            when /\A(#{zip_name})\/(layout\.html)\z/    #for layout html
+              design.build_layout(:file => get_temp_file(zip_file, dir, entry))
+            when /\A(#{zip_name})\/(themes)\/.*(\.css)\z/   #for themes css
+              themes_entries << entry
+            when /\A(#{zip_name})\/(javascripts)\/.*(\.js)\z/   #for js
+              javascripts_entries << entry
+            when /\A(#{zip_name})\/(images)\/.*((\.jpg)|(\.png)|(\.gif))\z/   #for img
+              images_entries << entry
+          end
+        end
+
+        ['themes', 'javascripts', 'images'].each do |type|
+          eval("#{type}_entries").each do |entry|
+            eval("design.#{type}").build(:file => get_temp_file(zip_file, dir, entry))
+          end
+        end
+      }
+      design.save
+    }
+  end
+
+  def get_temp_file(zip_file, dir, entry)
+    filename = File.basename(entry.to_s)
+    temp_file = File.new(dir + '/' + filename, 'w+') 
+    temp_file.write (zip_file.read entry ).force_encoding('UTF-8')
+    temp_file
+  end
+
   def get_template(id)
     uri = URI.parse("#{@@store_domain}/api/templates/#{id}")
     http = Net::HTTP.new(uri.host, uri.port)

app/controllers/pages_controller.rb

@@ -2,6 +2,7 @@ class PagesController < ApplicationController
   include ApplicationHelper
   before_filter :get_item, :only => [:index_from_link, :show_from_link]
   before_filter :check_frontend_open, :only => [:index,:show]
+  before_filter :get_last_update_date, :only => [:index,:show]
   # caches_page :index
 
   def index
@@ -226,4 +227,8 @@ class PagesController < ApplicationController
       return false
     end
   end
+
+  def get_last_update_date
+    @last_update_date = t(:total_visitors)+' : '+ Impression.count.to_s+' | '+t(:update_at)+' : '+Bulletin.order_by(:updated_at.desc).limit(1).first[:updated_at].to_s
+  end
 end

app/controllers/sessions_controller.rb

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

app/helpers/application_helper.rb

@@ -194,8 +194,7 @@ module ApplicationHelper
     stylesheets << "<link href='#{asset_path 'orbit_bar_bootstrap'}' rel='stylesheet' type='text/css' />\n" 
     stylesheets << "<link href='#{page.design.css_reset.file.url}' rel='stylesheet' type='text/css' />\n" if page.design.css_reset
     # stylesheets << "<link href='#{asset_path 'banner_nav.css'}' rel='stylesheet' type='text/css' />\n" 
-    # stylesheets << "<link href='#{asset_path 'default_widget.css'}' rel='stylesheet' type='text/css' />\n"
-    stylesheets << "<link href='/assets/social-share-button.css' rel='stylesheet' type='text/css' />\n" 
+    # stylesheets << "<link href='#{asset_path 'default_widget.css'}' rel='stylesheet' type='text/css' />\n" 
     stylesheets << "<link href='#{page.design.css_default.file.url}' rel='stylesheet' type='text/css' />\n" if page.design.css_default
     theme = page.design.themes.detect{ |d| d.id == page.theme_id }
     stylesheets << "<link href='#{theme.file.url}' rel='stylesheet' type='text/css' />\n" if theme
@@ -204,12 +203,8 @@ module ApplicationHelper
 
   def page_javascripts(page, edit=nil)
     javascripts = ''
-    unless edit
-      javascripts << "<script type='text/javascript' src='/assets/orbit-bar-search.js'></script>\n"
-    end
     # javascripts << "<script type='text/javascript' src='/assets/lib/jquery.preload-min.js'></script>\n"
     # javascripts << "<script type='text/javascript' src='/assets/jquery.cycle.all.latest.js'></script>\n"
-    javascripts << "<script type='text/javascript' src='/assets/lib/social-share-button.js'></script>\n"
     page.design.javascripts.each do |js|
       javascripts << "<script type='text/javascript' src='#{js.file.url}'></script>"
     end
@@ -306,7 +301,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 = {})

app/helpers/orbit_backend_helper.rb

@@ -321,7 +321,17 @@ module OrbitBackendHelper
         content_tag :li, link_to(t(quick[:translation] || :rejected_reason) + ' ' + truncate(object.not_checked_reason, :length => 10), '#', rel: "tooltip", 'data-original-title' => (wrap_string_with(object.not_checked_reason, :line_width => 24)), class: "reject_info #{quick[:class]}")
       end
     else
-      content_tag :li, link_to(t(quick[:translation]), eval("#{quick[:link]}('#{object.id}')"), class: quick[:class])
+      if quick[:define_link]
+        if quick[:condition_option]
+          if eval("#{quick[:condition_option]}")
+            content_tag :li, link_to(t(quick[:translation]), eval("#{quick[:define_link]}"), class: quick[:class])
+          end 
+        else
+          content_tag :li, link_to(t(quick[:translation]), eval("#{quick[:define_link]}"), class: quick[:class])
+        end
+      else
+        content_tag :li, link_to(t(quick[:translation]), eval("#{quick[:link]}('#{object.id}')"), class: quick[:class])
+      end
     end
   end
 
@@ -345,7 +355,7 @@ module OrbitBackendHelper
       if object.is_a?(klass.constantize)
         autorized ||= object.user_can_sub_manage?(current_user)
       else
-        autorized ||= object.send(klass.underscore).user_can_sub_manage?(current_user) rescue nil
+        autorized ||= object.send(klass.underscore).user_can_sub_manage?(current_user)
       end
       autorized
     end
@@ -433,6 +443,10 @@ module OrbitBackendHelper
           res << "<li class='active'>#{t(:search_engine)}</li>"
         when 'site_info'
           res << "<li class='active'>#{t(:site_info)}</li>"
+        when 'update_manager'
+          res << "<li class='active'>#{t(:update_manager)}</li>"
+        when 'system_info'
+          res << "<li class='active'>#{t("site.system_preference")}</li>"
         end
       when 'items'
         res << "<li class='active'>#{t(:structure)}</li>"
@@ -444,4 +458,4 @@ module OrbitBackendHelper
     res.html_safe
   end
 
-end
+end

app/mailer/cron_mail.rb

@@ -2,28 +2,30 @@ class CronMail < ActionMailer::Base
   default :from => "orbit_test@rulingcom.com"
   
   def get_settings
-  	  	# @@smtp_settings = {
-   #    :address => "smtp.gmail.com",
-   #    :port => '587',
-   #    :domain => "smtp.gmail.com",
-   #    :authentication => "plain",
-   #    :user_name => "redmine@rulingcom.com",
-   #    :password => "rulingredmine",
-   #    :tls => true,
-			# :enable_starttls_auto => true
-   #   }
-  	@@smtp_settings = {
-      :address => @site['mail_settings']['address'],
-      :port => @site['mail_settings']['port'],
-      :domain => @site['mail_settings']['domain'],
-      :authentication => @site['mail_settings']['authentication'],
-      :user_name => @site['mail_settings']['user_name'],
-      :password => @site['mail_settings']['password'],
-      :tls => @site['mail_settings']['tls'],
-			:enable_starttls_auto => @site['mail_settings']['enable_starttls_auto']
+    @site = Site.first
+    @@smtp_settings = {
+      :enable_starttls_auto => @site['site_settings']['enable_starttls_auto'],
+      :address => @site['site_settings']['address'],
+      :port => @site['site_settings']['port'],
+      :domain => @site['site_settings']['domain'],
+      :authentication => @site['site_settings']['authentication'],
+      :user_name => @site['site_settings']['user_name'],
+      :password => @site['site_settings']['password']
     }
   end
 
+  def self.smtp_settings
+    @site = Site.first
+    @@smtp_settings = {
+      :enable_starttls_auto => @site['site_settings']['enable_starttls_auto'],
+      :address => @site['site_settings']['address'],
+      :port => @site['site_settings']['port'],
+      :domain => @site['site_settings']['domain'],
+      :authentication => @site['site_settings']['authentication'],
+      :user_name => @site['site_settings']['user_name'],
+      :password => @site['site_settings']['password']
+    }
+  end
 
   def time_check(msg)
   	get_settings

app/models/design/design.rb

@@ -7,6 +7,7 @@ class Design
   field :intro, :type => String
   field :title, :type => String
   field :version, :type => String
+  field :template_store_id, :type => String
 
   mount_uploader :zip_file, AssetUploader
 

app/views/admin/items/_site_bar.html.erb

@@ -22,8 +22,8 @@
 
 				<li title="<%= t('update_manager') %>"><%= link_to admin_site_update_manager_path(@site), :class => active_for_action('sites', 'update_manager') do %><span><i class="icon-refresh"></i></span><%end%></li>
 
-<!-- 				<li title="System Info"><a href="/orbit_4.0.1/admin/system_info/index.shtml?sidebarNavList=8&amp;subNavBlockList=0"><span><i class="icons-info-2"></i></span></a></li>
- -->			</ul>
+				<li title="<%= t("site.system_preference") %>"><%= link_to admin_site_system_info_path(@site), :class => active_for_action('sites', 'system_info') do %><span><i class="icons-info-2"></i></span><%end%></li>
+			</ul>
 		</div>
 		<div class="sub-nav-arrow"></div>
 	</div>

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

@@ -28,7 +28,6 @@
             <div class="form-actions">
               <button type="button" class="btn" data-dismiss="modal"><%= t(:cancel) %></button>
               <%= submit_tag t(:submit), class: "btn btn-primary" %>
-              <%= hidden_field_tag field, @field %>
             </div>
           <% end %>
         </div>
@@ -54,7 +53,6 @@
                 <div class="form-actions condition">
                   <button type="button" class="btn" data-dismiss="modal"><%= t(:cancel) %></button>
                   <%= submit_tag t(:submit), class: "btn btn-primary" %>
-                  <%= hidden_field_tag field, @field %>
                 </div>
               </fieldset>
             <% end %>

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

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

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

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

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

@@ -22,8 +22,8 @@
 
 				<li title="<%= t('update_manager') %>"><%= link_to admin_site_update_manager_path(@site), :class => active_for_action('sites', 'update_manager') do %><span><i class="icon-refresh"></i></span><%end%></li>
 
-<!-- 				<li title="System Info"><a href="/orbit_4.0.1/admin/system_info/index.shtml?sidebarNavList=8&amp;subNavBlockList=0"><span><i class="icons-info-2"></i></span></a></li>
- -->			</ul>
+				<li title="<%= t("site.system_preference") %>"><%= link_to admin_site_system_info_path(@site), :class => active_for_action('sites', 'system_info') do %><span><i class="icons-info-2"></i></span><%end%></li>
+			</ul>
 		</div>
 		<div class="sub-nav-arrow"></div>
 	</div>

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

@@ -65,7 +65,7 @@
                   <div class="control-group">
                     <label class="control-label muted"><%= t 'mail.domain' %></label>
                     <div class="controls">
-						<%= f.text_field :port, :value => (@site['site_settings']['port'] rescue nil), :class=>"input-large", :placeholder=>"Domain" %>
+						<%= f.text_field :domain, :value => (@site['site_settings']['domain'] rescue nil), :class=>"input-large", :placeholder=>"Domain" %>
                     </div>
                   </div>
                   <div class="control-group">
@@ -83,7 +83,7 @@
                   <div class="control-group">
                     <label class="control-label muted"><%= t 'mail.password' %></label>
                     <div class="controls">
-                      <%= f.text_field :password, :value => (@site['site_settings']['password'] rescue nil), :class=>"input-large", :placeholder=>"Password" %>
+                      <%= f.password_field :password, :value => (@site['site_settings']['password'] rescue nil), :class=>"input-large", :placeholder=>"Password" %>
                     </div>
                   </div>
                   <div class="control-group">

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

@@ -1,47 +0,0 @@
-<h1><%= I18n.t("site.system_preference") %></h1>
-<ul class="nav nav-tabs" id="myTab">
-  <li class="active"><a href="#summary"  data-toggle="tab"><%= I18n.t("site.system_preference_.tab_summary") %></a></li>
-  <li><a href="#commits" data-toggle="tab"><%= I18n.t("site.system_preference_.tab_commits") %></a></li>
-  <li><a href="#backups"  data-toggle="tab"><%= I18n.t("site.system_preference_.tab_backups") %></a></li>
-  <li><a href="#resque_logs"  data-toggle="tab"><%= I18n.t("site.system_preference_.tab_logs") %></a></li>
-</ul>
- 
-<div class="tab-content">
-  <div class="tab-pane  active in" id="summary">
-        <h2><%= I18n.t("site.system_preference_.summary.disk_space") %>:</h2>
-         <%= content_tag :p,@site.disk_space.gsub(/\n/,"<br />").html_safe if @site.disk_space %>
-        <h2><%= I18n.t("site.system_preference_.summary.code_update_at") %>: </h2>
-        <% @site.system_package_info.each do |index,value| %>
-          <h2><%= index.titleize %> <%= I18n.t("site.system_preference_.summary.version") %>:</h2>       
-          <%= content_tag :p,value %>
-        <% end %>
-        <h2><%= I18n.t("site.system_preference_.summary.weekness_report") %>:<%= '' %></h2>
-  </div>
-  <div class="tab-pane" id="commits">
-    <% if @git_commit_list_file %>
-      <% @git_commit_list_file.lines do |line|%>
-        <%= line %><br/>
-      <% end%>
-      <% else %>
-      <div class="well"><%= I18n.t("site.system_preference_.summary.no_data") %></div>
-    <% end %>
-  </div>
-  <div class="tab-pane" id="backups">
-    <%if @db_backup_list_file %>
-      <% @db_backup_list_file.lines do |line|%>
-        <%=line %><br/>
-      <% end %>
-      <% else %>
-        <div class="well"><%= I18n.t("site.system_preference_.summary.no_data") %></div>
-    <% end %>
-  </div>
-  <div class="tab-pane" id="resque_logs">
-  <%if @db_backup_list_file %>
-    <% @resque_logs_file.lines do |line|%>
-      <%=line %><br/>
-    <% end if @resque_logs_file%>
-    <%else %>
-          <div class="well"><%= I18n.t("site.system_preference_.summary.no_data") %></div>
-    <% end %>
-  </div>
-</div>

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

@@ -1,5 +1,159 @@
+<%= stylesheet_link_tag "lib/wrap-nav" %>
+<%= stylesheet_link_tag "lib/main-list" %>
+<%= stylesheet_link_tag "lib/main-forms" %>
+<%= stylesheet_link_tag "lib/fileupload.css" %>
+<%= stylesheet_link_tag "lib/togglebox.css" %>
+<%= stylesheet_link_tag "lib/list-check.css" %>
+
+<%= javascript_include_tag "lib/site_set" %>
+<%= javascript_include_tag "lib/list-check" %>
+
 <% content_for :side_bar do %>
   <%= render :partial => 'layouts/side_bar', :locals => {:link_name => t('site.settings'), :link_url => admin_site_site_info_path(@site), :icon => 'icons-cog', :side_bar_content => 'admin/sites/side_bar'} %>
 <% end %>
 
-system_info.html.erb
+<form class="form-horizontal main-forms">
+  <fieldset>
+    <div class="input-area">
+      <div class="nav-name"><strong><%= t("preferences.classification") %></strong></div>
+      <ul class="nav nav-pills language-nav">
+        <li class="active"><a href="#overview" data-toggle="tab"><%= t("site.system_preference_.tab_summary") %></a></li>
+        <li><a href="#mail-cron-logs" data-toggle="tab"><%= t("site.system_preference_.tab_send_reminders_log") %></a></li>
+      </ul>
+       
+      <div class="tab-content">
+        <!-- Overview -->
+        <div id="overview" class="tab-pane fade in active">
+          <h3 class="muted"><%= t("site.system_preference_.summary.disk_space") %></h3>
+          <blockquote>
+            <p>
+              <%= @disk_free %>
+            </p>
+          </blockquote>
+          <h3 class="muted">Nginx <%= t("site.system_preference_.summary.version") %></h3>
+          <blockquote>
+            <p>
+              <%= @nginx_version  %>
+            </p>
+          </blockquote>
+          </span>
+          <h3 class="muted">MongoDB <%= t("site.system_preference_.summary.version") %></h3>
+          <blockquote>
+            <p>
+              <%= @mongo_version  %>
+            </p>
+          </blockquote>
+          <h3 class="muted">Linux <%= t("site.system_preference_.summary.version") %></h3>
+          <blockquote>
+            <p>
+              <%= @linux_version  %>
+            </p>
+          </blockquote>
+          </span>   
+        </div>
+
+        <!-- Email Log -->
+        <div id="mail-cron-logs" class="tab-pane fade">
+          <ul class="nav nav-pills">
+            <li class="active">
+              <a href="#send-log" data-toggle="tab"><%= t(:email_log) %></a>
+            </li>
+            <li>
+              <a href="#waiting-sent" data-toggle="tab"><%= t(:email_queue) %></a>
+            </li>
+          </ul>
+          <div class="tab-content">
+            <div class="tab-pane fade in active" id="send-log">
+              <p class="">
+                <a href="#" class="btn list-active-btn disabled" data-check-action="list-be-remove" rel="/panel/announcement/back_end/bulletins/delete"><i class="icons-trash"></i></a>
+              </p>
+              <table class="table main-list table-striped">
+                <thead>
+                  <tr>
+                    <th>
+                      <input type="checkbox" class="list-check" name="to_delete[]" value="b" />
+                    </th>
+                    <th><%= t(:sent_date) %></th>
+                    <th><%= t(:subject) %></th>
+                    <th><%= t(:mail_to) %></th>
+                    <th><%= t(:mail_user) %></th>
+                    <th><%= t(:mail_from_app) %></th>
+                  </tr>
+                </thead>
+                <tbody>
+                  <tr>
+                    <td>
+                      <input type="checkbox" class="list-check" name="to_delete[]" value="b" />
+                    </td>
+                    <td>2014-01-16 17:57</td>
+                    <td>【轉知】國家教育研究院辦理普通高級中學語文及社會領域課綱微調分區公聽會
+                      <div class="quick-edit">
+                        <ul class="nav nav-pills">
+                          <li><a href="#" class="text-error"><%= t(:delete_) %></a></li>
+                        </ul>
+                      </div>
+                    </td>
+                    <td>alluser@tea.ntue.edu.tw</td>
+                    <td>蔣 欣潔</td>
+                    <td>er_email</td>
+                  </tr>
+                </tbody>
+              </table>
+            </div>
+            <div class="tab-pane fade in" id="waiting-sent">
+              <p class="">
+                <a href="#" class="btn list-active-btn disabled" data-check-action="list-be-remove" rel="/panel/announcement/back_end/bulletins/delete"><i class="icons-trash"></i></a>
+              </p>
+              <table class="table main-list table-striped">
+                <thead>
+                  <tr>
+                    <th>
+                      <input type="checkbox" class="list-check" name="to_delete[]" value="b" />
+                    </th>
+                    <th>Sentdate</th>
+                    <th>Subject</th>
+                    <th>Mail To</th>
+                    <th>Mail User</th>
+                    <th>Mail From App</th>
+                  </tr>
+                </thead>
+                <tbody>
+                  <tr>
+                    <td>
+                      <input type="checkbox" class="list-check" name="to_delete[]" value="b" />
+                    </td>
+                    <td>2014-01-16 17:57</td>
+                    <td>【轉知】國家教育研究院辦理普通高級中學語文及社會領域課綱微調分區公聽會
+                      <div class="quick-edit">
+                        <ul class="nav nav-pills">
+                          <li><a href="#" class="text-error"><%= t(:delete_) %></a></li>
+                        </ul>
+                      </div>
+                    </td>
+                    <td>alluser@tea.ntue.edu.tw</td>
+                    <td>蔣 欣潔</td>
+                    <td>er_email</td>
+                  </tr>
+                </tbody>
+              </table>
+            </div>
+          </div>
+        </div>
+      </div>
+    </div>
+  </fieldset>
+</form>
+
+<div id="dialog" class="modal hide fade" tabindex="-1" role="dialog" aria-labelledby="Delete item" aria-hidden="true">
+  <div class="modal-header">
+    <a class="close" data-dismiss="modal">×</a>
+    <h3><%= t(:sure?) %></h3>
+  </div>
+  <div class="modal-body">
+    <span class="text-warning text-center"><%= t(:this_action_can_not_be_restore) %></span>
+  </div>
+  <div class="modal-footer">
+    <button class="btn" data-dismiss="modal" aria-hidden="true"><%= t(:close) %></button>
+    <button class="delete-item btn btn-danger"><%= t(:delete_) %></button>
+  </div>
+</div>

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

@@ -60,7 +60,11 @@
                 <span class="item-price">Free</span>
               </span>
             </a>
-            <%= link_to "Download", "javascript:void(0);", "data-url" => template['template']['template']['url'], :class=> 'btn btn-primary download-link' %>
+            <% if @design_ids.include?(template["_id"]["$oid"]) %>
+              <%= link_to "Installed", "javascript:void(0);", "data-url" => template['template']['template']['url'], :class=> 'btn btn-success download-link', "disabled"=>"disabled", "data-name"=>template['title'], "data-slug"=>template["_slugs"][0], "data-id"=>template["_id"]["$oid"] %>
+            <% else %>
+              <%= link_to "Download", "javascript:void(0);", "data-url" => template['template']['template']['url'], :class=> 'btn btn-primary download-link', "data-name"=>template['title'], "data-slug"=>template["_slugs"][0], "data-id"=>template["_id"]["$oid"] %>
+            <% end %>
           </li>
         <% end %>
 
@@ -71,20 +75,20 @@
 <script type="text/javascript">
   (function(){
     $("a.download-link").on(clickEvent,function(){
-      var el = $(this),
-          downloadurl = $(this).data("url");
-
+      if($(this).attr("disabled") == "disabled")return false;
+      var el = $(this);
       el.removeClass("btn-primary").addClass("btn-info").text("Installing").attr('disabled',"disabled");
       $.ajax({
         url : "<%= admin_template_store_download_theme_path %>",
-        data : {"url" : downloadurl},
+        data : el.data(),
         dataType : "json",
-        type : "post",
-        success : function(data){
-          if(data.success){
+        type : "post"
+      }).done(function(data){
+         if(data.success){
             el.removeClass('btn-info').addClass('btn-success').text("Installed");
           }
-        }
+      }).fail(function(){
+          el.removeClass('btn-info').addClass('btn-danger').text("Error, please try again.").removeAttr('disabled');
       })
     })
   })()

app/views/admin/template_store/show.html.erb

@@ -8,7 +8,11 @@
         <div id="item-info">
           <%= image_tag "#{@store}#{@template['preview']['preview']['thumb']['url']}", :class => "item-thumb" %>
           <h2 class="item-name"><%= @template['title'] %></h2>
-           <%= link_to "Download", "javascript:void(0);", "data-url" => @template['template']['template']['url'], :class=> 'btn btn-primary download-link' %>
+           <% if @design_ids.include?(@template["_id"]["$oid"]) %>
+              <%= link_to "Installed", "javascript:void(0);", "data-url" => @template['template']['template']['url'], :class=> 'btn btn-success download-link', "disabled"=>"disabled", "data-name"=>@template['title'], "data-slug"=>@template["_slugs"][0], "data-id"=>@template["_id"]["$oid"] %>
+            <% else %>
+              <%= link_to "Download", "javascript:void(0);", "data-url" => @template['template']['template']['url'], :class=> 'btn btn-primary download-link', "data-name"=>@template['title'], "data-slug"=>@template["_slugs"][0], "data-id"=>@template["_id"]["$oid"] %>
+           <% end %>
           <ul class="item-extra-info">
             <li><span class="title">views</span><span class="count"><%= Random.new.rand(10..100) %></span></li>
             <!-- <li><span class="title">color</span><span class="color-tag green"></span></li> -->
@@ -64,21 +68,22 @@
 <script type="text/javascript">
   (function(){
     $("a.download-link").on(clickEvent,function(){
-      var el = $(this),
-          downloadurl = $(this).data("url");
-
+      if($(this).attr("disabled") == "disabled")return false;
+      var el = $(this);
       el.removeClass("btn-primary").addClass("btn-info").text("Installing").attr('disabled',"disabled");
       $.ajax({
         url : "<%= admin_template_store_download_theme_path %>",
-        data : {"url" : downloadurl},
+        data : el.data(),
         dataType : "json",
-        type : "post",
-        success : function(data){
-          if(data.success){
+        type : "post"
+      }).done(function(data){
+         if(data.success){
             el.removeClass('btn-info').addClass('btn-success').text("Installed");
           }
-        }
+      }).fail(function(){
+          el.removeClass('btn-info').addClass('btn-danger').text("Error, please try again.").removeAttr('disabled');
       })
     })
   })()
 </script>
+

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

@@ -12,11 +12,10 @@
             <input name="utf8" type="hidden" value="" />
             <input name="authenticity_token" type="hidden" value="" />
           </div>
-          <div class="other-sign-in">
-            <% @request_hosts = request.host_with_port.split(".") %>
-            <a class="btn btn-primary" type="submit" href="https://adfs.ntu.edu.tw/adfs/ls/?wa=wsignin1.0&wtrealm=https://galogin.ntu.edu.tw/saml_login&wctx=<%= @request_hosts[0] %>">使用計中帳號登入</a>
+<!--           <div class="other-sign-in">
+            <a class="btn btn-primary" type="submit">Other Sign In</a>
             <p>or</p>
-          </div>
+          </div> -->
           <div class="form-block">
             <div class="form-list clearfix">
               <form class="content" accept-charset="UTF-8" action="/users/sign_in" method="post">

app/views/layouts/_right_menu.html.erb

@@ -13,16 +13,6 @@
       </form>
     </li>
 
-    <!-- ntu sites -->
-    <li id="orbit-tag" class="dropdown">
-      <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>
-
     <!-- Language -->
     <li id="orbit-language" class="dropdown">
       <a href="#" role="button" class="dropdown-toggle" data-toggle="dropdown"><%= t(:_locale, :locale => I18n.locale) %></a>
@@ -46,7 +36,7 @@
           <% if @site.desktop_closed %>
           <li><%= link_to content_tag(:i, nil, class: 'icons-screen') + ' ' +  t(:desktop), desktop_path, tabindex: '-1' %></li>
           <% end %>
-          <li><%= link_to content_tag(:i, nil, class: 'icons-logout') + ' ' +  t(:logout), user_logout_path, tabindex: '-1' %></li>
+          <li><%= link_to content_tag(:i, nil, class: 'icons-logout') + ' ' +  t(:logout), destroy_user_session_path, tabindex: '-1' %></li>
           <li class="divider"></li>
           <li><a tabindex="-1" href="#"><i class="icons-lifebuoy"></i> <%= t(:help) %></a></li>
         </ul>
@@ -66,12 +56,6 @@
           </div>
           <div class="modal-body">
             <%= form_for :user, url: user_session_path, html: {class: 'container'} do |f| %>
-
-              <div class="other-sign-in">
-                <% @request_hosts = request.host_with_port.split(".") %>
-                <a class="btn btn-primary" type="submit" href="https://adfs.ntu.edu.tw/adfs/ls/?wa=wsignin1.0&wtrealm=https://galogin.ntu.edu.tw/saml_login&wctx=<%= @request_hosts[0] %>">使用計中帳號登入</a>
-                <p>or</p>
-              </div>
               <div class="input-prepend">
                 <span class="add-on">
                   <i class="icon-user"></i>

app/views/layouts/page_layout.html.erb

@@ -41,5 +41,6 @@
       }
     </style>
   <% end %>
+  <div id='last_update_date_wrap' style='display:none;'><div id='last_update_date'><%= @last_update_date %></div></div>
 </body>
 </html>

app/views/shared/preview/_modal_preview.html.erb

@@ -41,7 +41,7 @@
 
       function InsertPreviewImage(){
         if($("iframe").contents().find('.news_image').length){
-          $("iframe").contents().find('.news_image').append("<a href='' target='_blank'><img src='"+preview_img+"' width='320' height='240' /></a>");
+          $("iframe").contents().find('.news_image').append("<a href='' target='_blank'><img src='"+preview_img+"' width='320' /></a>");
         }else{
           setTimeout(InsertPreviewImage,1000);
         }

config/environments/production.rb

@@ -63,15 +63,5 @@ Orbit::Application.configure do
   config.action_mailer.delivery_method = :smtp
   config.action_mailer.perform_deliveries = true
   config.action_mailer.raise_delivery_errors = true
-  config.action_mailer.smtp_settings = {
-    :enable_starttls_auto => true,
-    :openssl_verify_mode => 'none',
-    :address => 'smtp.sendgrid.net',
-    :port => '587',
-    :domain => "new.tp.rulingcom.com",
-    :authentication => "plain",
-    :user_name => "rulingcom",
-    :password => "bjo4xjp6"
-  }
 
 end

config/locales/en.yml

@@ -192,6 +192,8 @@ en:
     link: Editing link
     page: Editing page
   email: Email
+  email_log: Email Log
+  email_queue: Waiting to be sent
   enable: Enable
   enabled_for: Enabled for
   end: End
@@ -274,6 +276,9 @@ en:
     setting: Mail settings
     tls: TLS
     user_name: User Name
+  mail_from_app: Mail From App
+  mail_to: Mail To
+  mail_user: Mail User
   manager: Manager
   markup: Markup
   markup_options: Markup options
@@ -378,7 +383,6 @@ en:
     system_email: System Email
   preview: Preview
   profile: Profile
-  promoter: Promoter
   publications: Publications
   purchase: Purchase
   quantity: Quantity
@@ -425,6 +429,7 @@ en:
     index: Index
     summary: Summary
     thumbnail: Thumbnail
+  sent_date: Sent Date
   settings: Site Setting
   site:
     backend_openness_on: Backend Openness 
@@ -455,6 +460,7 @@ en:
       tab_commits: Commits      
       tab_summary: Summary
       tab_logs: Logs
+      tab_send_reminders_log: Send reminders log
       summary:
         code_update_at: Code Update histroy
         disk_space: Disk Free
@@ -484,6 +490,7 @@ en:
   sub_role: Sub Role
   sub_role_field: Sub Role Field
   sub_role_info: " Sub Role Info."
+  subject: Subject
   subtitle: Subtitle
   submit: Submit
   submit_approval: Submit approval
@@ -507,6 +514,7 @@ en:
   text: Text
   theme: Theme
   themes: Themes
+  this_action_can_not_be_restore: This action can not be restored, are you sure you want to delete?
   title: Title
   to_search: Set as Search Key
   to_show: Display in frontend

config/locales/ntu.en.yml

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

config/locales/ntu.zh_tw.yml

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

config/locales/zh_tw.yml

@@ -192,6 +192,8 @@ zh_tw:
     link: 編輯連結
     page: 編輯頁面
   email: 電子郵件
+  email_log: 寄送紀錄
+  email_queue: 待寄送郵件
   enable: 開啟
   enabled_for: 啟用
   end: 結束
@@ -276,6 +278,9 @@ zh_tw:
     setting: 電子郵件設定
     tls: 電子郵件TLS
     user_name: 電子郵件帳號
+  mail_from_app: 寄送模組
+  mail_to: 收件者
+  mail_user: 寄件者
   manager: 管理者
   markup: 輸入模式
   markup_options: 標註選項
@@ -380,7 +385,6 @@ zh_tw:
     sidebar_nav: 側欄導引
     system_email: 系統信箱
   profile: 基本資料
-  promoter: 承辦人
   publications: 著作
   purchase: 購買
   quantity: 數量
@@ -427,6 +431,7 @@ zh_tw:
     index: 檢索
     summary: 摘要
     thumbnail: 縮圖
+  sent_date: 寄送日期
   settings: 基本設定
   site:
     frontend_closed: 前台關閉？
@@ -457,6 +462,7 @@ zh_tw:
       tab_commits: 程式版本
       tab_summary: 總覽
       tab_logs: 排程工作日誌
+      tab_send_reminders_log: 寄送提醒紀錄
       summary:
         code_update_at:  程式更新紀錄
         disk_space: 硬碟空間
@@ -486,6 +492,7 @@ zh_tw:
   sub_role: 子身份
   sub_role_field: 子身份欄位
   sub_role_info: 子身份資料
+  subject: 主題
   subtitle: 副標題
   submit: 送出
   submit_approval: 送出已核准
@@ -509,6 +516,7 @@ zh_tw:
   text: 內文
   theme: 套用頁面樣式
   themes: 主題
+  this_action_can_not_be_restore: 刪除後將無法還原，您確定要刪除嗎？
   title: 標題
   to_search: 加入搜尋條件
   to_show: 是否顯示於前台

config/routes.rb

@@ -8,11 +8,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
-
   mount Resque::Server, :at => "/admin/resque"
   mount Rack::GridFS::Endpoint.new(:db => Mongoid.database,:lookup=>:path), :at => "gridfs"
 

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

@@ -10,6 +10,7 @@ class Panel::Announcement::BackEnd::BulletinsController < OrbitBackendController
   end
 
   def preview
+    params['bulletin']['image'] = nil
     bulletin = Bulletin.new params
     @preview_obj = bulletin.to_preview
     @preview_obj.save
@@ -64,7 +65,6 @@ class Panel::Announcement::BackEnd::BulletinsController < OrbitBackendController
   # GET /bulletins/1/edit
   def edit
     @bulletin = Bulletin.find(params[:id])
-    @users = @bulletin.get_users
     @tags = get_tags
     is_authorized_sub_manager = @bulletin.category.auth_sub_manager.authorized_user_ids rescue nil
 

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

@@ -24,13 +24,10 @@ class Bulletin
 
   field :create_user_id
   field :update_user_id, :class_name => "User"
-  field :user_ids
   
   field :view_count, :type => Integer, :default => 0
   
   field :public, :type => Boolean, :default => true
-  field :rss_link
-
 
   mount_uploader :image, ImageUploader
 
@@ -152,9 +149,6 @@ class Bulletin
     preview_object
   end
 
-  def get_users
-    User.find(self.user_ids) rescue []
-  end
 
   protected
 

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

@@ -64,14 +64,6 @@
           <%= f.datetime_picker :deadline, :no_label => true %>
         </div>
       </div>
-      
-      <!-- Promoter -->
-      <div class="control-group">
-        <label class="control-label muted"><%= t(:promoter) %></label>
-        <div class="controls">
-          <%= render partial: 'admin/member_selects/selection_box', locals: {field: 'bulletin[user_ids][]', users: @users} %>
-        </div>
-      </div>
 
     </div>
 

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

@@ -36,21 +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>
-			<%= render partial: 'admin/member_selects/promoter_front', locals: {users: @bulletin.get_users} %>
-		</div>
-	</div>
-<% end %>
-
 <%= share_links(@bulletin, 'announcement') %>
-
-

vendor/built_in_modules/archive/app/controllers/panel/archive/back_end/archive_files_controller.rb

@@ -87,7 +87,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
     if !current_user.admin?
       redirect_to :action => :index
     else

vendor/built_in_modules/archive/app/models/archive_file.rb

@@ -22,8 +22,6 @@ class ArchiveFile
   field :title, localize: true
   field :create_user_id
   field :update_user_id, :class_name => "User"
-  field :user_ids
-
   
   scope :can_display,where(is_hidden: false)
 
@@ -75,10 +73,6 @@ class ArchiveFile
 
   end
 
-  def get_users
-    User.find(self.user_ids) rescue []
-  end
-
 
   def get_file_icon( file_data )
     file_icon = "<span class=\"o-archives-file-type\">#{file_data.split('.')[-1]}</span>".html_safe

vendor/built_in_modules/archive/app/views/panel/archive/back_end/archive_files/_form.html.erb

@@ -54,14 +54,6 @@
         </div>
       </div> 
 
-      <!-- Promoter -->
-      <div class="control-group">
-        <label class="control-label muted"><%= t(:promoter) %></label>
-        <div class="controls">
-          <%= render partial: 'admin/member_selects/selection_box', locals: {field: 'archive_file[user_ids][]', users: @users} %>
-        </div>
-      </div>
-
     </div>
 
     <!-- Status Module -->

vendor/built_in_modules/archive/app/views/panel/archive/front_end/archive_files/_index.html.erb

@@ -9,19 +9,19 @@
 				<tr>
 					<th class="column-ctrl col-title"><%= sortable(:title, t("archive.Title"))%></th>
 					<th class="column-ctrl col-file"><%= t("archive.Files")%></th>
-					<th class="column-ctrl col-promoter"><%= t(:promoter)%></th>
+					<th class="column-ctrl col-category"><%= sortable(:archive_file_category, t("archive.Category"))%></th>
 				</tr>
 			</thead>
 			<tbody>
 
 				<% @archive_files.each_with_index do |post,i| %>
 				<tr <% if ( (i + 1) % 2 ) == 0 %> class="even" <% end %>>
-					<td class="col-title">
+					<td>
 						<div class="o-archives-title"><%= post.title %>
 						<% if !post.is_hot.blank? %><span class="o-archives-hot"><%= t('hot')%></span><% end %>
 						</div>
 					</td>
-					<td class="col-file">
+					<td>
 						<div class="o-archives-list-item">
 							<% if !post.archive_file_multiples.blank? %>
 							<ol>
@@ -37,21 +37,9 @@
 							<% end %>
 						</div>
 					</td>
-					<td class="col-promoter">
-						<% unless post.get_users.blank? %>
-							<div class="promoter-block">
-						    <ul>
-						      <% post.get_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 %>
-					</td>
+					<td><div class="o-archives-category">
+						<%= post.category.title if !post.category.blank? %>
+					</div></td>
 				</tr>
 				<% end %>
 

vendor/built_in_modules/ask/app/controllers/panel/ask/back_end/asK_requests_controller.rb

@@ -1,45 +0,0 @@
-# encoding: utf-8
-
-class Panel::Ask::BackEnd::AskRequestsController < OrbitBackendController
-  include AdminHelper
-  #include OrbitControllerLib::DivisionForDisable
-
-  #before_filter :for_app_manager
-  skip_before_filter :verify_authenticity_token
-  open_for_visitor :only => [:transferred_request]
-
-  def transferred_request
-    app_title = request.fullpath.split('/')[2]
-    module_app ||= ModuleApp.first(conditions: {:key => app_title} )
-
-    if request.headers["HTTP_X_AUTH_TOKEN"] == '3kjlfksjDFJ' 
-      if !module_app.categories.where("title.en" => "Transferred Question").any?
-        ask_category = module_app.categories.build
-        ask_category.title_translations = { "zh_tw" => "轉介的問題", "en" => "Transferred Question" }
-        ask_category.save!
-      end
-
-      module_app.categories.enabled
-      category = module_app.categories.where("title.en" => "Transferred Question").first
-
-      @transferred_question = AskQuestion.new(
-        name:     params['name'],
-        identity: params['identity'],
-        email:    params['email'],
-        phone:    params['phone'],
-        tax:      params['tax'],
-        title:    params['title'],
-        content:  params['content'],
-        category_id: category.id)
-
-      @transferred_question.ask_reply = AskReply.new
-      @transferred_question.ask_reply.update_attributes(status: "待處理 (轉)")
-      @transferred_question.save
-
-      render :nothing => true
-    else
-      render :status => 500 
-    end
-  end
-end
-

vendor/built_in_modules/ask/app/controllers/panel/ask/back_end/ask_acknowledgements_controller.rb

@@ -1,14 +1,13 @@
 class Panel::Ask::BackEnd::AskAcknowledgementsController < OrbitBackendController
-  #include AdminHelper
-  #include OrbitControllerLib::DivisionForDisable
+  include AdminHelper
+  include OrbitControllerLib::DivisionForDisable
 
-  #before_filter :for_app_manager
-  open_for_manager
+  before_filter :for_app_manager
 
-  #def initialize
-  #  super
-  #  @app_title = 'ask_acknowledgement'
-  #end
+  def initialize
+    super
+    @app_title = 'ask_acknowledgement'
+  end
 
   def index
     @ask_acknowledgement = AskAcknowledgement.first || AskAcknowledgement.create

vendor/built_in_modules/ask/app/controllers/panel/ask/back_end/ask_admins_controller.rb

@@ -1,15 +1,14 @@
 class Panel::Ask::BackEnd::AskAdminsController < OrbitBackendController
 
-  #include AdminHelper
-  #include OrbitControllerLib::DivisionForDisable
+  include AdminHelper
+  include OrbitControllerLib::DivisionForDisable
 
-  #before_filter :for_app_manager
-  open_for_manager
+  before_filter :for_app_manager
 
-  #def initialize
-  #  super
-  #  @app_title = 'ask_admins'
-  #end
+  def initialize
+    super
+    @app_title = 'ask_admins'
+  end
 
   def index
     @ask_admins = AskAdmin.all

vendor/built_in_modules/ask/app/controllers/panel/ask/back_end/ask_questions_controller.rb

@@ -1,11 +1,11 @@
-class Panel::Ask::BackEnd::AskQuestionsController < OrbitBackendController
-  
-  require 'csv'
+require 'csv'
 
-  # def initialize
-  #   super
-  #   @app_title = 'ask_questions'
-  # end
+class Panel::Ask::BackEnd::AskQuestionsController < OrbitBackendController
+
+  def initialize
+    super
+    @app_title = 'ask_questions'
+  end
 
   def index
     @ask_questions = AskQuestion.all
@@ -53,12 +53,10 @@ class Panel::Ask::BackEnd::AskQuestionsController < OrbitBackendController
     Rails.application.config.mongoid.use_activesupport_time_zone = true
     date_start = "#{params[:export]['start(1i)']}-#{params[:export]['start(2i)']}-#{params[:export]['start(3i)']}"
     date_end = "#{params[:export]['end(1i)']}-#{params[:export]['end(2i)']}-#{params[:export]['end(3i)']}"
-    #@ask_questions = AskQuestion.includes(:ask_category).includes(:ask_reply).where(:created_at.gte => date_start, :created_at.lte => date_end)
-	@ask_questions = AskQuestion.where(:created_at.gte => date_start, :created_at.lte => date_end)
+    @ask_questions = AskQuestion.includes(:ask_category).includes(:ask_reply).where(:created_at.gte => date_start, :created_at.lte => date_end)
 
     csv = CSV.generate do |csv|
-      csv << [ t('status'),
-               t('category'),
+      csv << [ t('category'),
                AskQuestion.human_attribute_name(:name),
                AskQuestion.human_attribute_name(:identity),
                AskQuestion.human_attribute_name(:email),
@@ -70,8 +68,7 @@ class Panel::Ask::BackEnd::AskQuestionsController < OrbitBackendController
                AskReply.human_attribute_name(:comment)]
       @ask_questions.each do |ask_question|
         ask_question.ask_reply ||= AskReply.new
-        csv << [ ask_question.ask_reply.status,
-                 ask_question.category.title,
+        csv << [ ask_question.ask_category.name,
                  ask_question.name,
                  ask_question.identity,
                  ask_question.email,

vendor/built_in_modules/ask/app/controllers/panel/ask/back_end/ask_replies_controller.rb

@@ -1,4 +1,3 @@
-# encoding: utf-8
 class Panel::Ask::BackEnd::AskRepliesController < OrbitBackendController
 
   include AdminHelper
@@ -14,122 +13,19 @@ class Panel::Ask::BackEnd::AskRepliesController < OrbitBackendController
   def create
     @ask_question = AskQuestion.find(params[:ask_question_id])
     @ask_question.ask_reply = AskReply.new(params[:ask_reply])
-    @ask_reply = @ask_question.ask_reply
     @ask_question.save
-
     if @ask_question.ask_reply.send_email?
       Resque.enqueue(SendAskReplyMail, @ask_reply.ask_question.id)
     end
-
-    status_stack = []
-    new_status = ""
-    params[:ask_reply][:depts].each do |dns|
-      # host = dns.split(":").first # local test
-
-      begin
-        status_stack << send_request(dns, @ask_reply.ask_question, @ask_reply) # local test, switch host to dns if on server
-      rescue
-        status_stack << "fail"
-      end
-    end if params[:ask_reply][:status] == "轉介其他單位"
-
-    success_count   = status_stack.count("success")
-    failed_count    = status_stack.count("fail")
-
-    if failed_count == 0 && success_count > 0
-      new_status = "轉介其他單位"
-    elsif failed_count > 0 && success_count > 0
-      new_status = "部份轉介失敗"
-    elsif failed_count > 0 && success_count == 0
-      new_status = "轉介失敗"
-    elsif failed_count == 0 && success_count == 0 &&  @ask_reply.status == "待處理"
-      new_status = "待處理"
-    elsif failed_count == 0 && success_count == 0 &&  @ask_reply.status == "已處理"
-      new_status = "已處理"
-    elsif failed_count == 0 && success_count == 0 &&  @ask_reply.status == "轉介其他單位"
-      new_status = "轉介失敗"
-    end
-
-    @ask_reply.update_attributes(status: new_status)
-
     redirect_to panel_ask_back_end_ask_questions_path, notice: t('ask.reply_success')
   end
 
   def update
-
     @ask_reply = AskReply.find(params[:id])
     @ask_reply.update_attributes(params[:ask_reply])
-
     if @ask_reply.send_email?
       Resque.enqueue(SendAskReplyMail, @ask_reply.ask_question.id)
     end
-
-    status_stack = []
-    new_status = ""
-    params[:ask_reply][:depts].each do |dns|
-      # host = dns.split(":").first # local test
-
-      begin
-        status_stack << send_request(dns, @ask_reply.ask_question, @ask_reply) # local test, switch host to dns if on server
-      rescue
-        status_stack << "fail"
-      end
-    end if params[:ask_reply][:status] == "轉介其他單位"
-
-    success_count   = status_stack.count("success")
-    failed_count    = status_stack.count("fail")
-
-    if failed_count == 0 && success_count > 0
-      new_status = "轉介其他單位"
-    elsif failed_count > 0 && success_count > 0
-      new_status = "部份轉介失敗"
-    elsif failed_count > 0 && success_count == 0
-      new_status = "轉介失敗"
-    elsif failed_count == 0 && success_count == 0 &&  @ask_reply.status == "待處理"
-      new_status = "待處理"
-    elsif failed_count == 0 && success_count == 0 &&  @ask_reply.status == "已處理"
-      new_status = "已處理"
-    elsif failed_count == 0 && success_count == 0 &&  @ask_reply.status == "轉介其他單位"
-      new_status = "轉介失敗"
-    end
-
-    @ask_reply.update_attributes(status: new_status)
-
     redirect_to panel_ask_back_end_ask_questions_path, notice: t('ask.reply_success')
   end
-
-  private
-
-  def send_request(dep_dns, current_question, current_reply)
-    require 'net/http'
-    require 'uri'
-    require 'json'
-
-    uri_path = "/panel/ask/back_end/ask_requests/transferred_request"
-    http = Net::HTTP.new(dep_dns, 80) # port 4000 for local test, switch to port 80 for deployment
-    req = Net::HTTP::Post.new(uri_path)
-
-    body = {
-      'name' => current_question.name,
-      'title' => current_question.title,
-      'identity' => current_question.identity,
-      'email' => current_question.email,
-      'phone' => current_question.phone,
-      'tax' => current_question.tax,
-      'content' => current_question.content
-    }
-
-    status = ""
-    req.set_form_data(body)
-    req.add_field 'X-Auth-Token', '3kjlfksjDFJ'
-    response = http.request(req)
-
-    if response.code == "200" 
-      status = "success" 
-    else
-      status = "fail"
-    end 
-
-    return status
-  end
 end

vendor/built_in_modules/ask/app/models/ask_reply.rb

@@ -6,7 +6,6 @@ class AskReply
   field :comment, type: String
   field :status, type: String
   field :send_email, type: Boolean, detault: false
-  field :depts, :type => Array
 
   belongs_to :ask_question
 end

vendor/built_in_modules/ask/app/views/panel/ask/back_end/ask_questions/edit.html.erb

@@ -1,45 +1,3 @@
-<script type="text/javascript">
-var local_host = "<%= request.host %>";
-
-// var local_host = "<%= request.host_with_port %>"; // local test
-
-if (local_host[0] == "g" && local_host[1] == "a") {
-    local_host = "www." + local_host;
-}
-
-function hide_current_host_name(localhost) {
-  $('input[type=checkbox]').each(function() {
-    if ($(this).val() == local_host) {
-      $(this).addClass("hide");
-      $(this).next().addClass("hide");
-    }
-  });
-}
-
-$(document).ready(function() {
-
-  $('.dept_options').hide();
-
-  if ($("#ask_reply_status").val() == '轉介其他單位') {
-
-    hide_current_host_name(local_host);
-
-    $('.dept_options').show();
-  }
-
-  $("#ask_reply_status").change(function() {
-
-    hide_current_host_name(local_host);
-
-    $('.dept_options').slideUp();
-    if ($(this).find('option:selected').attr('value') == '轉介其他單位') {
-      $('.dept_options').slideDown();
-    }
-  });
-});
-
-</script>
-
 <div id="ask_question_reply">
   <%= form_for @ask_reply, url: @url, method: @method do |f| %>
     <table class="table">
@@ -74,26 +32,6 @@ $(document).ready(function() {
           ['轉介其他單位', '轉介其他單位']
         ] %></td>
       </tr>
-      <tr>
-        <td colspan="5" class="dept_options">
-          <div class="checkbox">
-<!--             <%= check_box("school", "depts", {:multiple => true}, (request.host + ":3000"), nil) %><%= label_tag((request.host + ":3000"), "測試站 3000") %>
-            <%= check_box("school", "depts", {:multiple => true}, (request.host + ":4000"), nil) %><%= label_tag((request.host + ":4000"), "測試站 4000") %> -->
-            <%= check_box("ask_reply", "depts", {:multiple => true}, "www.ga.ntu.edu.tw", nil) %><%= label_tag("www.ga.ntu.edu.tw", "總務處") %>
-            <%= check_box("ask_reply", "depts", {:multiple => true}, "sec.ga.ntu.edu.tw", nil) %><%= label_tag("sec.ga.ntu.edu.tw", "總務長室暨總務處秘書室") %>
-            <%= check_box("ask_reply", "depts", {:multiple => true}, "doc.ga.ntu.edu.tw", nil) %><%= label_tag("doc.ga.ntu.edu.tw", "文書組") %>
-            <%= check_box("ask_reply", "depts", {:multiple => true}, "general.ga.ntu.edu.tw", nil) %><%= label_tag("general.ga.ntu.edu.tw", "事務組") %>
-            <%= check_box("ask_reply", "depts", {:multiple => true}, "property.ga.ntu.edu.tw", nil) %><%= label_tag("property.ga.ntu.edu.tw", "保管組") %>
-            <%= check_box("ask_reply", "depts", {:multiple => true}, "construction.ga.ntu.edu.tw", nil) %><%= label_tag("construction.ga.ntu.edu.tw", "營繕組") %>
-            <%= check_box("ask_reply", "depts", {:multiple => true}, "cashier.ga.ntu.edu.tw", nil) %><%= label_tag("cashier.ga.ntu.edu.tw", "出納組") %>
-            <%= check_box("ask_reply", "depts", {:multiple => true}, "procurement.ga.ntu.edu.tw", nil) %><%= label_tag("procurement.ga.ntu.edu.tw", "採購組") %>
-            <%= check_box("ask_reply", "depts", {:multiple => true}, "fss.ga.ntu.edu.tw", nil) %><%= label_tag("fss.ga.ntu.edu.tw", "經營管理組") %>
-            <%= check_box("ask_reply", "depts", {:multiple => true}, "police.ga.ntu.edu.tw", nil) %><%= label_tag("police.ga.ntu.edu.tw", "駐警隊") %>
-            <%= check_box("ask_reply", "depts", {:multiple => true}, "social.ga.ntu.edu.tw", nil) %><%= label_tag("social.ga.ntu.edu.tw", "社科院總務分處") %>
-            <%= check_box("ask_reply", "depts", {:multiple => true}, "medicine.ga.ntu.edu.tw", nil) %><%= label_tag("medicine.ga.ntu.edu.tw", "醫學院總務分處") %>
-          </div>
-        </td>
-      </tr>  
       <tr>
         <td colspan="5">
           <%= f.label :send_email %><%= f.radio_button :send_email, 1, checked: @ask_reply.send_email? %><%= t('ask.yes') %>

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

@@ -84,11 +84,8 @@ $(document).ready(function(){
         <%= f.text_area :content, rows: 8, class: 'input-xlarge' %>
       </div>
     </div>
-
    <div class="control-group">
-      <%= f.label t('ask.validate_code'), class: 'control-label required' %>
       <div class="controls">
-        <label><%= t('ask.validate_code_note') %></label>
         <%= gotcha_error %>
         <%= gotcha%>
       </div>

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

@@ -17,8 +17,6 @@ en:
     admin: Administrator
     new_question: New question
     pending: Pending
-    validate_code: Verification code
-    validate_code_note: Please answer the following verification questions.
   mongoid:
     attributes:
       ask_question:

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

@@ -22,8 +22,6 @@ zh_tw:
     admin: 管理者
     new_question: 新的發問
     pending: 待處理
-    validate_code: 驗證碼
-    validate_code_note: 請回答下列驗證問句。
   mongoid:
     attributes:
       ask_question:

vendor/built_in_modules/ask/config/routes.rb

@@ -15,8 +15,6 @@ Rails.application.routes.draw do
         resources :ask_categories
         resources :ask_acknowledgements
         resources :ask_admins
-
-	match "ask_requests/transferred_request" => "ask_requests#transferred_request", :as => 'transferred_request', :via => :post
       end
 
       namespace :front_end do

vendor/built_in_modules/member_staff/app/views/panel/member_staff/front_end/member_staff_lists/index.html.erb

@@ -4,7 +4,6 @@
 
 <% @job_title_field = @member_lists.get_member_list_attribute_field("staff","job_title") %>
 <% @job_business_field = @member_lists.get_member_list_attribute_field("staff","business") %>
-<% @job_agent_field = @member_lists.get_member_list_attribute_field("staff","agent") %>
 		
 		<% if @item.frontend_style == 'Single' or @item.frontend_style == 'Two' %>
 
@@ -59,15 +58,6 @@
 										<%= @job_business %>
 									</li>
 									<% end %>
-									
-									<% @job_agent = @member_lists.get_member_list_attribute_value(member.id,@job_agent_field.id).get_value_by_locale(I18n.locale)
-									   if @job_agent != 'NoData' and !@job_agent.blank?
-									%>
-									<li><b class="o-members-label">
-										<%= @job_agent_field.title %></b>
-										<%= @job_agent %>
-									</li>
-									<% end %>
 								</ul>
 							</li>
 
@@ -120,15 +110,6 @@
 										<%= @job_business %>
 									</li>
 									<% end %>
-									
-									<% @job_agent = @member_lists.get_member_list_attribute_value(member.id,@job_agent_field.id).get_value_by_locale(I18n.locale)
-									   if @job_agent != 'NoData' and !@job_agent.blank?
-									%>
-									<li><b class="o-members-label">
-										<%= @job_agent_field.title %></b>
-										<%= @job_agent %>
-									</li>
-									<% end %>
 								</ul>
 							</li>
 
@@ -172,7 +153,6 @@
 									<td><span class="name"><%= t("users.name")%></span></td>
 									<td><span class="tel"><%= t("users.office_tel")%></span></td>
 									<td><span class="business"><%= @job_business_field.title %></span></td>
-									<td><span class="agent"><%= @job_agent_field.title %></span></td>
 								</tr>
 							</thead>
 
@@ -201,15 +181,6 @@
 									<% end %>
 									</span>
 								</td>
-								<td>
-									<span class="agent">
-									<% @job_agent = @member_lists.get_member_list_attribute_value(member.id,@job_agent_field.id).get_value_by_locale(I18n.locale)
-									   if @job_agent != 'NoData' and !@job_agent.blank?
-									%>
-									<%= @job_agent %>
-									<% end %>
-									</span>
-								</td>
 							</tr>
 							
 							<% end %>

vendor/built_in_modules/page_content/app/controllers/panel/page_content/back_end/page_contexts_controller.rb

@@ -48,7 +48,6 @@ class Panel::PageContent::BackEnd::PageContextsController < OrbitBackendControll
   # GET /page_contexts/1/edit
   def edit
     @page_context = PageContext.find(params[:id])
-    @users = @page_context.get_users
   end
 
   # POST /page_contexts

vendor/built_in_modules/page_content/app/models/page_context.rb

@@ -15,7 +15,6 @@ class PageContext
   field :update_user_id
   field :version, :type => Integer , :default => 0
   field :view_count, :type => Integer, :default => 0
-  field :user_ids
   
   field :archived, :type => Boolean, :default => false
   # field :current, :type => Boolean, :default => false
@@ -37,9 +36,5 @@ class PageContext
   def title
     self.page.title
   end
-
-  def get_users
-    User.find(self.user_ids) rescue []
-  end
   
 end

vendor/built_in_modules/page_content/app/views/panel/page_content/back_end/page_contexts/_form.html.erb

@@ -4,33 +4,6 @@
 
 <fieldset>
 	<div class="input-area">
-
-	  <!-- Module Tabs -->
-	  <div class="nav-name"><strong><%= t(:module) %></strong></div>
-	  <ul class="nav nav-pills module-nav">
-	    <li class="active">
-	      <a href="#basic" data-toggle="tab"><%= t(:basic) %></a>
-	    </li>
-	  </ul>
-
-	  <!-- Module -->
-	  <div class="tab-content module-area">
-
-	    <!-- Basic Module -->
-	    <div class="tab-pane fade in active" id="basic">
-
-	      <!-- Promoter -->
-	      <div class="control-group">
-	        <label class="control-label muted"><%= t(:promoter) %></label>
-	        <div class="controls">
-	          <%= render partial: 'admin/member_selects/selection_box', locals: {field: 'page_context[user_ids][]', users: @users} %>
-	        </div>
-	      </div>
-
-	    </div>
-
-	  </div>
-
 	  <!-- Language Tabs -->
 	  <div class="nav-name"><strong><%= t(:language) %></strong></div>
 	  <ul class="nav nav-pills language-nav">

vendor/built_in_modules/page_content/app/views/panel/page_content/front_end/page_contexts/index.html.erb

@@ -8,4 +8,4 @@
 
 <div class="page_content"><%= @page_context.context.html_safe rescue '' %></div>
 
-<%= render partial: 'admin/member_selects/promoter_front', locals: {users: @page_context.get_users} %>
+

vendor/built_in_modules/survey/app/controllers/panel/survey/back_end/surveys_controller.rb

@@ -1,8 +1,6 @@
-class Panel::Survey::BackEnd::SurveysController < OrbitBackendController
+require 'csv'
 
-  require 'csv'
-  require 'iconv'
-  require 'roo'
+class Panel::Survey::BackEnd::SurveysController < OrbitBackendController
 
   include AdminHelper
   include OrbitControllerLib::DivisionForDisable
@@ -107,145 +105,6 @@ class Panel::Survey::BackEnd::SurveysController < OrbitBackendController
     redirect_to panel_survey_back_end_surveys_url(:direction => params[:direction], :sort => params[:sort], :sort_options => params[:sort_options])
   end
 
-  def set_import
-    @survey = ::Survey.find(params[:id])
-  end
-
-  def import
-    @survey = ::Survey.find(params[:id])
-    @chart_data, @survey_questions, @survey_answers = @survey.generate_chart_data
-    @file = params[:file]
-
-    case File.extname(@file.original_filename)
-      when ".csv" then @spreadsheet = Roo::CSV.new(@file.path, csv_options: {encoding: Encoding::Big5})
-      # when ".xls" then Excel.new(file.path, nil, :ignore)
-      # when ".xlsx" then Excelx.new(file.path, nil, :ignore)
-      else raise "Unknown file type: #{file.original_filename}"
-    end
-
-    # Modify titles if changed
-    titles = @spreadsheet.row(1) - [" "]
-    @survey_questions.each_with_index do |question, index|
-      question.update_attributes(title: titles[index])
-    end
-    
-    @survey_answers.destroy
-    
-    # Start and end of speadsheet
-    @end_row = @spreadsheet.count
-
-    @max_row_start = 0
-    @survey_questions.each do |question|
-      case question.type
-      when ::SurveyQuestion::Radio, ::SurveyQuestion::Select, ::SurveyQuestion::Check
-        if question.survey_question_options.count > @max_row_start
-          @max_row_start = question.survey_question_options.count
-        end  
-      when ::SurveyQuestion::Radiogroup
-        if question.survey_question_options.count * question.survey_question_radiogroups.count > @max_row_start
-          @max_row_start = question.survey_question_options.count * question.survey_question_radiogroups.count
-        end
-      end  
-    end  
-    @start_row = @max_row_start + 2
-
-    # Modify multiline options if changed
-    (@start_row..@end_row).each do |row|
-      @answer_model = @survey.survey_answers.new
-      @survey_questions.each_with_index do |question, index|
-        case question.type
-
-        when ::SurveyQuestion::Oneline, ::SurveyQuestion::Multiline
-          @answer_model[question.id.to_s] = @spreadsheet.row(row)[index * 2]
-
-        when ::SurveyQuestion::Radio, ::SurveyQuestion::Select
-          if !@spreadsheet.row(row)[index*2].nil? && @spreadsheet.row(row)[index*2] != " " 
-            @answer_model[question.id.to_s] = @spreadsheet.row(row)[index*2]
-          end
-
-        when ::SurveyQuestion::Check
-          if !@spreadsheet.row(row)[index*2].nil? && @spreadsheet.row(row)[index*2] != " " 
-            @answer_model[question.id.to_s] = @spreadsheet.row(row)[index*2].split("\"").select.each_with_index { |str, i| i.odd? }
-          end
-
-        when ::SurveyQuestion::Radiogroup
-          radio_groups = []
-          spreadsheet_radiogroups_lines = 
-            question.survey_question_options.count * question.survey_question_radiogroups.count + 2
-          
-          # Grab each radiogroups line for update
-          (2...spreadsheet_radiogroups_lines).each do |line|
-            radio_groups << @spreadsheet.row(line)[index * 2]
-          end
-
-          # Grab answers info
-          answers = []
-          if not @spreadsheet.row(row)[index * 2].blank?
-            answers << eval(@spreadsheet.row(row)[index * 2])
-          end
-
-          # Save the answers
-          answers.each do |answer|
-            options = Hash[question.survey_question_options.collect { |o| [ o.id.to_s, o.name ] }]
-            # @answer_model = @survey.survey_answers.new
-            @answer_model[question.id.to_s] = {}
-
-            answer.each do |option, value|
-              @answer_model[question.id.to_s][options.invert[option]] = value
-            end
-
-            # @answer_model.save!
-          end
-
-          # Parse the needed info in the array
-          radio_titles = []
-          radio_options = []
-          radio_groups.each do |group|
-            option_with_radio = group.split(' - ')
-            radio_titles << option_with_radio[0]
-            radio_options << option_with_radio[1]
-          end
-
-          # Update the spreadsheet info to the DB
-          groups_of_options = []
-          groups_of_radios  = []
-          radio_titles.each_slice(question.survey_question_radiogroups.count) do |options|
-            groups_of_options << options
-          end
-
-          radio_options.each_slice(question.survey_question_radiogroups.count) do |options|
-            groups_of_radios << options
-          end
-
-          # Update option names
-          question.survey_question_options.each_with_index do |option, index|
-            groups_of_options[index].each do |modified_option|
-              if option.name_translations["zh_tw"] != modified_option
-                option.update_attributes(name: modified_option)
-                break
-              end
-            end
-          end
-
-          # Update radio names
-          question.survey_question_radiogroups.each_with_index do |option, index|
-            groups_of_radios.each do |radios|
-              if radios[index] != option.name_translations["zh_tw"]
-                option.update_attributes(name: radios[index])
-                break
-              end
-            end
-          end        
-        end
-      end
-      
-      @answer_model.save!
-
-    end #end row 
-
-    redirect_to panel_survey_back_end_surveys_url, :notice => :success
-  end
-
   def export
     @survey = ::Survey.find(params[:id])
     @chart_data, @survey_questions, @survey_answers = @survey.generate_chart_data

vendor/built_in_modules/survey/app/views/panel/survey/back_end/surveys/_survey.html.erb

@@ -13,8 +13,7 @@
           <li><%= link_to t('survey.duplicate_it'), duplicate_it_panel_survey_back_end_survey_path(survey, :page => params[:page]) %></li>
           <li><%= link_to t('survey.jump'), jump_panel_survey_back_end_survey_path(survey, :page => params[:page]) %></li>
           <li><%= link_to t('survey.set_answers'), set_answers_panel_survey_back_end_survey_path(survey, :page => params[:page]) %></li>
-          <li><%= link_to t('survey.export_csv'), export_panel_survey_back_end_survey_path(survey, :format => :csv) %></li>
-          <li><%= link_to t('survey.import_csv'), set_import_panel_survey_back_end_survey_path(survey) %></li>
+          <li><%= link_to t('survey.export_csv'), export_panel_survey_back_end_survey_path(survey, :format => :csv), :target => '_blank' %></li>
           <li><%= link_to t('survey.chart'), result_panel_survey_front_end_survey_path(survey, :force_chart => true, :standalone => true), :target => '_blank' %></li>
           <li><%= link_to t(:delete_), panel_survey_back_end_survey_path(survey), :confirm => t('sure?'), :method => :delete, :remote => true %></li>
         <% end -%>

vendor/built_in_modules/survey/app/views/panel/survey/back_end/surveys/set_import.html.erb

@@ -1,18 +0,0 @@
-<%= form_tag import_panel_survey_back_end_survey_path(@survey), multipart: true do %>
-<table class="table main-list">
-  <thead>
-    <tr>
-      <th class="span2"><%= t('survey.title') %></th>
-      <th class="span2"></th>
-      <th class="span2"></th>
-    </tr>
-  </thead>
-  <tbody id="tbody_surveys" class="sort-holder">
-    <tr>
-      <td><%= @survey.title %></td>
-      <td><%= file_field_tag :file %></td>
-      <td><%= submit_tag t("survey.import_csv"), :class => 'btn' %></td>
-    </tr>
-  </tbody>
-</table>
-<% end %>

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

@@ -24,7 +24,6 @@ en:
     answer_error: Unsuccessful answer
 
     answers_list: Answers List
-    import_csv: Import CSV
     export_csv: Export CSV
     chart: Chart
     set_answers: Set Answers

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

@@ -25,7 +25,6 @@ zh_tw:
     answer_error: 問卷填寫錯誤
 
     answers_list: 結果清單
-    import_csv: 匯入CSV
     export_csv: 匯出CSV
     chart: 結果圖表
     set_answers: 設定結果
@@ -81,4 +80,4 @@ zh_tw:
     have_not_chart: 此種類型問題不含結果圖表
 
     move_up: 上移
-    move_down: 下移
+    move_down: 下移

vendor/built_in_modules/survey/config/routes.rb

@@ -9,8 +9,6 @@ Rails.application.routes.draw do
           end
           member do
             get 'export'
-            get 'set_import'
-            post 'import'
             get 'set_answers'
             get 'jump'
             get 'duplicate_it'
@@ -32,4 +30,4 @@ Rails.application.routes.draw do
     end
   end
  match "/appfront/*path" => redirect("/panel/*path")
-end
+end