Merge branch '1017_ntu_ga_rss' of https://github.com/Rulingcom/orbit into 1017_ntu_ga_rss

Conflicts:

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

Gemfile

@@ -29,6 +29,9 @@ gem 'mongoid-tree', :require => 'mongoid/tree'
 gem "mongo_session_store-rails3", '3.0.6'
 gem 'nokogiri'
 
+# import csv
+gem 'roo'
+
 gem 'fb_graph'
 gem 'rack-gridfs'
 gem 'radius'

app/assets/stylesheets/style.css.erb

@@ -2,6 +2,14 @@
 * {
 	outline: none;
 }
+@font-face{ 
+	font-family: 'WebSymbolsRegular';
+	src: url(<%= asset_path 'websymbols-regular-webfont.eot' %>);
+	src: url(<%= asset_path 'websymbols-regular-webfont.eot?#iefix' %>) format('embedded-opentype'),
+	     url(<%= asset_path 'websymbols-regular-webfont.woff' %>) format('woff'),
+	     url(<%= asset_path 'websymbols-regular-webfont.ttf' %>) format('truetype'),
+	     url(<%= asset_path 'websymbols-regular-webfont.svg#WebSymbolsRegular' %>) format('svg');
+}
 .login-logo {
 	text-indent: -9999px;
 	background: url(<%= asset_path 'sign-in-logo.png' %>) no-repeat center 40px;
@@ -706,4 +714,4 @@
 
 #category_id, #module_app_id {
 	width: auto;
-}
+}

app/controllers/saml_logins_controller.rb

@@ -21,6 +21,8 @@ class SamlLoginsController < ApplicationController
     @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)

app/jobs/get_announcement_from_ntu_ga_rss.rb

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

app/models/object_auth.rb

@@ -15,8 +15,13 @@ class ObjectAuth  < PrototypeAuth
   end
 
   def check_user_has_can_access_app
-    sub_managing_users = auth_obj.module_app.sub_managing_users rescue []
-    module_app =  auth_obj.module_app
+    if auth_obj["_type"] == "PageContext"
+      module_app = ModuleApp.where(:key=>'page_content').first
+      sub_managing_users = module_app.sub_managing_users rescue []
+    else
+      sub_managing_users = auth_obj.module_app.sub_managing_users rescue []
+      module_app =  auth_obj.module_app
+    end
     self.auth_users.each do |auth_user|
       if !sub_managing_users.include? auth_user && !auth_user.admin?
          module_app.assign_sub_manager(auth_user,User.current)

app/models/prototype_auth.rb

@@ -55,6 +55,16 @@ class PrototypeAuth
     if (self.send item).include? obj.id
        (self.send item).delete obj.id
       self.save!
+
+      if auth_obj["_type"] == "PageContext"
+        module_app = ModuleApp.where(:key=>'page_content').first
+      else
+        module_app =  auth_obj.module_app
+      end
+
+      module_app.remove_sub_manager(obj)
+      module_app.save
+
     else
       false #should put error message for user not existed in list
     end    

config/initializers/mime_types.rb

@@ -5,5 +5,3 @@
 # Mime::Type.register_alias "text/html", :iphone
 
 Mime::Type.register_alias "text/html", :mobile
-
-Mime::Type.register 'application/vnd.ms-excel',:xls

config/list.yml

@@ -79,48 +79,3 @@ default_widget_style:
   - style3
   - style4
   - style5
-
-sites:
-  www:
-    url: www.ga.ntu.edu.tw
-    key: "-----BEGIN PUBLIC KEY-----\nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAx3fDAM40XvEiM5oG7YbA\nKnhc5Dyv/ZhVDzyrg95QB0ylBPtSs6g5xgkSSQMnIpAUCzdVIMrUd/A6DuH6f+T5\nccshgh3aDj3wISfgYZc9e7WY1csOItq9lOr6YG4HEABSyjVCcX/RrB8kCuuIGcvR\nRnvu/4fFb93vsVYHwGuivTYRJ+8VM8fOtIFCvbCxZsFj6r5cMl4qI4g4vaIn3xf2\ndXUCICebvdIBfMAdW29yaCScEap1oawEfdXtKCD5vYvAaRZ85jLY/FV5dYhbe1dz\n9G7+B1HI7VBm5bKV0MI1ZH2MTRczaqjLGf6ZF0FbMmcMYLx8iEGL1z0/hgOTcNT6\nrQIDAQAB\n-----END PUBLIC KEY-----\n"
-  ga:
-    url: www.ga.ntu.edu.tw
-    key: "-----BEGIN PUBLIC KEY-----\nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAx3fDAM40XvEiM5oG7YbA\nKnhc5Dyv/ZhVDzyrg95QB0ylBPtSs6g5xgkSSQMnIpAUCzdVIMrUd/A6DuH6f+T5\nccshgh3aDj3wISfgYZc9e7WY1csOItq9lOr6YG4HEABSyjVCcX/RrB8kCuuIGcvR\nRnvu/4fFb93vsVYHwGuivTYRJ+8VM8fOtIFCvbCxZsFj6r5cMl4qI4g4vaIn3xf2\ndXUCICebvdIBfMAdW29yaCScEap1oawEfdXtKCD5vYvAaRZ85jLY/FV5dYhbe1dz\n9G7+B1HI7VBm5bKV0MI1ZH2MTRczaqjLGf6ZF0FbMmcMYLx8iEGL1z0/hgOTcNT6\nrQIDAQAB\n-----END PUBLIC KEY-----\n"
-  doc:
-    url: doc.ga.ntu.edu.tw
-    key: "-----BEGIN PUBLIC KEY-----\nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA4aE7R0/49UBf5v4rbNiA\nnaXjPZ9rio9fjkaAZeow62yaZtoGurqf44BVj/cjQVUmLnMU4WDcZMI0osLa15+H\ndXSGCP8Upmvi+eA2UqhhBZts1IQ33rPMAjePAbpSGbNRxous0VpH7cc9BxMffQwh\nsygcbghUCEE3dVWdTFGokvgxkBzaKKTNbiqhmbuc8QIuzOvFFGkZHgqlxFHcaNYZ\n7KZJxqvuKSXsJcxIsQKzDiAPI11J3zgRdIf/CFVQv5g15gl1ieQgFdGc3jplsBcd\nrdLApPZ39+BWr9a/Gj9lgP6Ll5G/cM4Uq18a7TCWJIC9PNGw8bBDJTjnUEqmOu3R\nZQIDAQAB\n-----END PUBLIC KEY-----\n"
-  cashier:
-    url: cashier.ga.ntu.edu.tw
-    key: "-----BEGIN PUBLIC KEY-----\nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA9wliL8gFsRn0DVZusd2h\nSoj6aQWkKq1UU6fj3vzcrb1adMy8RnKogTW6z1W9wxrcrI/GfyRz9Wop0+9+XNYx\nDH+QQ+/1po/O/MkPBGZ6WxXpH2BSCncdJdYZ9qLvlJHHRhFtczcSQki693MCDUCy\nMrMDvmL4YOowHExD7A5qrCIaYnbNcUCYMKluSLxR52AUeAuYjCwZbkgEwIQRdZ+M\n3JMgTD/9GFsvZ4c5x6n1cUnKCJNyyUIvI8jThtOnySCU8ZN17nWfKb1Cxavt17Vp\nGSdyIIL2SO9+rjOFW3PrAyX5P3xEgPYoDxA1QsYLYbj189qA0sT17xf9H7KcNzyP\n7wIDAQAB\n-----END PUBLIC KEY-----\n"
-  general:
-    url: general.ga.ntu.edu.tw
-    key: "-----BEGIN PUBLIC KEY-----\nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAvyFUUFyaEJgsR+bYhTXx\nOA60kw82ohyHCDzkoHDT/k2xS520RZR0AzxT449qD3XfRr0+7F0c6rMx/2pBG7hS\nlHjgrTX7eQ70wV8H4OApriDIp1UDemm4+fKxcPZ6vhWqzp+3ijPdhJXe7OC9D89I\n9QKdlHPBxKFnUrBJiqn3cHGLpRrYTsKpI/Nl7VW4UJJh0k7R7P1Jqry0e+HalOLB\nBu5kl5z6iYBPy1gJ4psDHWuoNboxIgIsVR1SSLM7Mooebwx2qjm3W4VQuc7eQk0g\nh7KH4B8CrK4bC+K6lAS3ZzmTlA6M1WZPtIKv3XqEYCkyomMnkdTNZQYKbCKKlLBo\ntQIDAQAB\n-----END PUBLIC KEY-----\n"
-  social:
-    url: social.ga.ntu.edu.tw
-    key: "-----BEGIN PUBLIC KEY-----\nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAqB8htGdGzDPs3GA76REG\nyjM0eEYdXV6ugi4hPZEViCOBg3POC5RZslA5oTCYYWfTVui8jHC2CPD3AYQLG67Z\n79g2miLHEEyDzG7dp//dc85qp0FYR2JII1y26fJutMVCgn0hth6OpfjPB2QhkgZf\nat+Ico5ppDYIx+4jX8xQr4qqRlUIAmECMAE5ATiAUqfv117GJG/fR3AsKZPYm2U1\nFhSpKT2mvC0AiqstZzxYEm4srl1ZjpJPJ7uU+ewvi/EhRyLWFGPmygP6fvg4IaKS\nG00dx7FGedyLVcSaxJCoCX5Z98hIYEStanCSzuR3FQEL0JaB8ZKKWY8dsB+U1v46\nQwIDAQAB\n-----END PUBLIC KEY-----\n"
-  property:
-    url: property.ga.ntu.edu.tw
-    key: "-----BEGIN PUBLIC KEY-----\nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA1bmnJSRmxcehehuKBwSQ\nXiuYhAxzUOmptIk0sgciB1hK8++anXMaHXf3QA6UiXWjNyU+g2ZL1nVfVl0Qd3Ps\nxM2+hSeZRus2sw0g7CQea7NkAqLGQrpicnZ8Fgcb+0qwgClk0RVBXwJzfTDu6V+5\nL9lLEKWnSdHmoGkxkZTPMAtJpXYx9SMLtljPYGkMWKY2C1cBqPdMOl/rKTUZ9dYp\n2eJ13NTXDJJgDJOhDFHevzK/I6kwxdJbetNo4IO1dhQdbPionR5SNkkCNZvfy3k3\n68+xopPKH3xECCIuxorcePx0hyoeXS8vdmJ09VKHVUz08LBYGq2S/36V5LIc1P/6\nSQIDAQAB\n-----END PUBLIC KEY-----\n"
-  procurement:
-    url: procurement.ga.ntu.edu.tw
-    key: "-----BEGIN PUBLIC KEY-----\nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAze/Yr3vrpRBpeu7ohyEP\nboPvZ476dtANbvW+rMuDyKeGD5FfoZYwzF+AbMIK6KfleWizObnMM8ABC0LdBuag\nQ0Brk4FMxyKz0aXlSgG3OZiZXJaaWm2/+gqghgpBLpAPMRFnEmK2y11b/EgCxurV\nl+RZ/MgrIviRGipnU7GXfG4O7Ai21oD4lzKt3WbvuWgBdgtEsYpZMIyddWrhkUki\noM39Vm72mCyKPkysCVYCnYaMwDXVx/SKuTRHiVQZ4GNIv74rwp7BOCkfDZ8HrNLH\nr3ObCB8X0Bh9GqUUj7gYu3cFmx8lXer7qkGtGUq2wNUM0CBc01EODVO9e9RQnulA\n3wIDAQAB\n-----END PUBLIC KEY-----\n"
-  fss:
-    url: fss.ga.ntu.edu.tw
-    key: "-----BEGIN PUBLIC KEY-----\nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAzsvi4FfIQokfP2QmiRTs\nzuxjPg7oPK7pLHNQC/AyY35H0vmkXGTc74pVvLbfSuaprLO10WVzE4bGGQmhmls1\nDqeY7EyHg1vs7GHQm1932n+Va+qDToSx7S+Zs1ZOglYAdEzBI3dyhefIcDtNUfty\n0i64RGiEzDH4yV5lecilXo5Q4/7W/HNdtw8Oe//LopOZ2Mj+Eq7Tk70WkGFDV73Z\n/jIBLBn51g2P9nrsid63OLe1X8u0l9+xSGff0fR1VlqbElBRACCrAmPvs9ceOW7H\n+yLw71elR4nMDm+/dx/zimeYUj0WaY2A3/O8xucPhSP22YCRiO1jEsAEvMXkCU9p\n8wIDAQAB\n-----END PUBLIC KEY-----\n"
-  medicine:
-    url: medicine.ga.ntu.edu.tw
-    key: "-----BEGIN PUBLIC KEY-----\nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAwx7zQLnde6Azy/03bIxg\nkp5rM0DsKKkBbX8C5vhUADxaC2zVmVJuF0NnTGCWutNSSYsKWRKzFwEoZdzJ+8XS\nr8f9kRdEB0yu3Akv+EhZyHA7yVGyFvNAhPGVuekSmpDlpFFKanAqlhBzrhByku5A\nTqp2fXi3zHMoP6WX8QXb6SpG/y4CBpjXCI1qLCAJRw0Fkt7yMXkJnjO2q7zCKAnU\nnv6DVz5yDuBiZPfYlW09KHVWxSehgk5fvLu9Jb/s1XklPwEw1m5BPhIA1YG0QelR\nXk9Pdvwb7aM59LZx1xQZYcku0KGSqLo9rCDTD8YT47226v921yeM36Az8t8e4egU\nzwIDAQAB\n-----END PUBLIC KEY-----\n"
-  police:
-    url: police.ga.ntu.edu.tw
-    key: "-----BEGIN PUBLIC KEY-----\nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAzKawlFWAMzA/uV/kcewd\nmtj8PcqxosmnSh7ZzJ0DumG2ieeP9oDBicqbqIEaeJVvrRzYJD2a+u8x5KKMKB8J\nHbMUpCBFlIpkDMjU/oZVMcYT9pcH51QWNvCgHG7prVykSGFz1JRvjSP6cwuZKBFd\nFFneOViETqoMIO1DbRLXsGfPvMOJY9C1xDwv1dLv0Wbj7M9N6eNz06a50bu3I4gl\nMumxWnZUabXL3G62S/Si4NM7J2jOUnkEOxJWOhcAX/iiqS9T8AHu84um2+mLQpfB\nJJFFIWCIAtU78VnIN5JSWwjFU5TsiSyCFYpGXKxUFD25cFmt3SfG0gwmrFis5Pdn\nhwIDAQAB\n-----END PUBLIC KEY-----\n"
-  construction:
-    url: construction.ga.ntu.edu.tw
-    key: "-----BEGIN PUBLIC KEY-----\nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAvxJcKnPUDaNNyhdGpedL\n+h2OI9RDDZUTkHcvX1UvBNvlX2+dvok6sHQh2AhZoNyCUFZTbp2CRSNfIM5jXigD\nfHA3KzpN7cmGG7W7nIdBBkZU/ly4HFvkD7mGoEymB0JYgZkz59CXBx+3Zg6KLSYY\nZDoOw6wikrl643So2zFZvwHJpDkRkmX5oWWYqXOZxaZnkgbhvA3KdcH9+C1aEBYY\npY2K2MJt86k0ahW/CJfVRDb9CWSxAGir1RAPu9bRV9y9WWKKGWekH0/IqhhJPT8q\nl3v6PB1Oc6ltbOyYkS2xHbmvRxjORzGen0Xcbjzo4N8HBEoPe0Uc5iP0Y50GDjEL\nEQIDAQAB\n-----END PUBLIC KEY-----\n"
-  sec:
-    url: sec.ga.ntu.edu.tw
-    key: "-----BEGIN PUBLIC KEY-----\nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEApsVKJ8Cvr/A0dmHR+vDS\nAYjVzGqMNJ/4pO7GwMzUZMNSkpq3b9CIjrIGg/QKj7woTHnKM39vczu5gxPXJGYN\nIo+PnWsibMDjcz2Vm8s11XXIPho/Ce+hQkWpWGzxpaH7Z/qLKSwiwHdHhlgN3fWw\njR8jYhreQYfohkRGR70h8A9TTU4YkFY/+8yIdwGns61+5tK981kMbVkm+pcgL0cP\nMN08I7MM+c87COY6IO27jVb/ALPAYpo+QUdAfEp5hlI7BQW95nB7LHOnxAm7lLTD\nhbdETUssieQUicwgDpGa2aD769nH+V3UCp0nA4yPDWyJJyKEWsD5EEK24VAcotql\nkwIDAQAB\n-----END PUBLIC KEY-----\n"
-  info:
-    url: info.ga.ntu.edu.tw
-    key: "-----BEGIN PUBLIC KEY-----\nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA5MLcsMcedzVWjw7pd/lr\nf8GdrzV6rubsJgEBJbC2OdrloHc+7uxEwWiYNTfg4j46nY/zCuTqzV/Wcfni5pY8\n0yuOmZdH9LjK0PW5BgXYJwe/bZkQmQcIQhkoSPghR8o+kZlI0a3+3gs4eAkpxB21\nPR5Rg2fvzDkaO3WcHf13HymayIk9wn4i0NdLUXgKSWcz5XNJtVBh6jtMkDq7ioOH\nQZT9OAODFw5CW/TvXBJaAvSEdDHsCNTE4vgJO1h6qowC27mErgjilA7TM81JFp40\nwexOW/gXHc4gCsj9BY39tDTqa56QIbJjKdqx7iyHUr1jMFmII1osS1ZVATco9RrM\naQIDAQAB\n-----END PUBLIC KEY-----\n"
-

config/mongoid.yml

@@ -8,10 +8,10 @@ defaults: &defaults
 
 development:
   <<: *defaults
-  database: test_site
+  database: production_0
 test:
   <<: *defaults
-  database: test_site
+  database: production_0
 # set these environment variables on your prod server
 production:
   # host: <%= ENV['MONGOID_HOST'] %>

config/resque_schedule.yml

@@ -20,16 +20,22 @@ generate_system_summary:
   cron: 0 0 12 * * *
   class: GenerateSystemSummary
   args:
-  description: Generate the system status such as disk free space,package version list for showing at site tab
+  description: "Generate the system status such as disk free space, package version list for showing at site tab"
 
 email_cron:
-  cron: 0 0 [10,16,22] * * *
+  cron: "0 0 10,16,22 * * *"
   class: EmailCron
   args:
   description: EmailCron
 
 get_announcement_from_rss:
-  cron: 0 0 [2,12] * * *
+  cron: "0 0 2,12 * * *"
   class: GetAnnouncementFromRss
   args:
   description: Loop through the announcement RSS until 24h ago
+
+get_announcement_from_ntu_ga_rss:
+  cron: "30 * * * * *"
+  class: GetAnnouncementFromNtuGaRss 
+  args: 
+  description: "Update announcement RSS to primary NTU_GA site"

lib/ntu_archive.rb

@@ -1,71 +0,0 @@
-# encoding: utf-8
-
-# =================================================================
-# move archives from main site to other sites depending on category
-# =================================================================
-
-
-require 'mongo'
-include Mongo
-
-DB_BASE_NAME = "production"
-
-CATEGORIES = { 'TNR' => 3, 'DOC' => 1, 'PROPERTY' => 5, 'CASHIER' => 2, 'CON' => 10 }
-
-main_db = MongoClient.new("localhost", 27017).db("#{DB_BASE_NAME}_#{0}")
-main_categories = main_db["archive_file_categories"]
-main_archive_files = main_db["archive_files"]
-main_archive_file_multiples = main_db["archive_file_multiples"]
-
-CATEGORIES.each do |key, number|
-  # set the target DB
-  target_db = MongoClient.new("localhost", 27017).db("#{DB_BASE_NAME}_#{number}")
-  target_categories = target_db["archive_file_categories"]
-  target_archive_files = target_db["archive_files"]
-  target_archive_file_multiples = target_db["archive_file_multiples"]
-
-  if main_cat = main_categories.find_one(key: key)
-    # get or create category
-    category_id = \
-    if cat = target_categories.find_one(key: main_cat['key'])
-      cat['_id']
-    else
-      copy_category = main_cat.clone
-      copy_category['_id'] = BSON::ObjectId.new
-      copy_category['create_user_id'] = nil
-      copy_category['update_user_id'] = nil
-      target_categories.save copy_category
-    end
-
-    main_archive_files.find(archive_file_category_id: main_cat['_id']).each do |archive_file|
-      # copy archive_file
-      copy_archive_file = archive_file.clone
-      copy_archive_file['_id'] = BSON::ObjectId.new
-      copy_archive_file['create_user_id'] = nil
-      copy_archive_file['update_user_id'] = nil
-      copy_archive_file['tagged_ids'] = []
-      copy_archive_file['user_ids'] = nil
-      copy_archive_file['archive_file_category_id'] = category_id
-      target_archive_files.save copy_archive_file
-
-      main_archive_file_multiples.find(archive_file_id: archive_file['_id']).each do |archive_file_multiple|
-        # copy archive_file_multiples
-        copy_archive_file_multiple = archive_file_multiple.clone
-        copy_archive_file_multiple['_id'] = BSON::ObjectId.new
-        copy_archive_file_multiple['create_user_id'] = nil
-        copy_archive_file_multiple['update_user_id'] = nil
-        copy_archive_file_multiple['archive_file_id'] = copy_archive_file['_id']
-
-        # copy gridfs file
-        main_grid = Mongo::GridFileSystem.new(main_db)
-        file = main_grid.open("assets/archive_file_multiple/file/#{archive_file_multiple['_id']}/#{archive_file_multiple['file']}", 'r')
-        target_grid = Mongo::GridFileSystem.new(target_db)
-        target_grid.open("assets/archive_file_multiple/file/#{copy_archive_file_multiple['_id']}/#{copy_archive_file_multiple['file']}", 'w') do |f|
-          f.write file
-        end
-
-        target_archive_file_multiples.save copy_archive_file_multiple
-      end
-    end
-  end
-end

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

@@ -67,7 +67,7 @@ class Panel::Announcement::FrontEnd::BulletinsController < OrbitWidgetController
         end
       end
     end
-
+    
   end
 
   def show

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

@@ -42,6 +42,7 @@ class Bulletin
   
   field :public, :type => Boolean, :default => true
   field :rss_link
+  field :rss_source
   
   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) }

vendor/built_in_modules/announcement/app/views/panel/announcement/front_end/bulletins/index.rss.builder

@@ -11,6 +11,7 @@ xml.rss :version => "2.0" do
     for bulletin in @bulletins
       xml.item do
         xml.title bulletin.title_translations[I18n.locale.to_s]
+        xml.category bulletin.bulletin_category.title
         xml.pubDate bulletin.postdate.to_s(:rfc822)
         xml.description bulletin.text_translations[I18n.locale.to_s]
         xml.link url_for(:action=>"show", :controller=>"panel/announcement/front_end/bulletins", :id=>bulletin ,:only_path=>false)

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

@@ -39,7 +39,11 @@
 	<% end %>
 	<% unless @bulletin.rss_link.blank? %>
 		<div>
-			<%= link_to t('ntu.rss_origin'), @bulletin.rss_link %>
+			<%= link_to t('announcement.rss_origin'), @bulletin.rss_link %>
+			<% unless @bulletin.rss_source.blank? %>
+				<br />
+				<%= t('announcement.source') %>: <%= @bulletin.rss_source %>
+			<% end %>
 		</div>
 	<% end %>
 </div>

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

@@ -1,6 +1,8 @@
 zh_tw:
 
   announcement:
+    rss_origin: 回臺大校園公告
+    source: 單位來源
     add_new: 新建
     all_articles: 文章列表
     announcement: 公告

vendor/built_in_modules/announcement/lib/rss_ntu_ga_aggregate.rb

@@ -0,0 +1,97 @@
+# encoding: utf-8
+
+require 'rss'
+require 'mongo'
+
+SITES = { "總務長室暨總務處秘書室" => "sec.ga.ntu.edu.tw",
+          "總務處文書組" => "doc.ga.ntu.edu.tw",
+          "總務處事務組" => "general.ga.ntu.edu.tw",
+          "總務處保管組" => "property.ga.ntu.edu.tw",
+          "總務處營繕組" => "construction.ga.ntu.edu.tw",
+          "總務處出納組" => "cashier.ga.ntu.edu.tw",
+          "總務處採購組" => "procurement.ga.ntu.edu.tw",
+          "總務處經營管理組" => "fss.ga.ntu.edu.tw",
+          "總務處駐衛警察隊" => "police.ga.ntu.edu.tw",
+          "社會科學院總務分處" => "social.ga.ntu.edu.tw",
+          "醫學院總務分處" => "medicine.ga.ntu.edu.tw" }
+DB_BASE_NAME = "production_0"
+
+yesterday = Time.now - 86400
+two_weeks_ago = Time.new - 60 * 60 * 24 * 14
+
+recent_feed = {}
+
+SITES.each do |name, url|
+  open("http://#{url}/panel/announcement/front_end/bulletins.rss?inner=true") do |rss|
+
+    # Giving false parameter is for skipping irregular format of the RSS
+    feed = RSS::Parser.parse(rss, false)
+
+    feed.items.each do |item|
+      category = item.category.to_s.gsub(/\<(\/)*category\>/, '')
+
+      if item.pubDate > yesterday
+        recent_feed[item.title.strip] = { date: item.pubDate, description: item.description.gsub("\r\n", '<br/>').strip,
+          link: item.link, category: category, source: name }
+      end
+
+    end
+  end
+end
+
+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
+
+def get_mongo_and_categories
+  db = Mongo::Connection.new("localhost", 27017).db("#{DB_BASE_NAME}")
+  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
+
+recent_feed.each do |title, bulletin|
+
+  categories, coll_bulletin, coll_cat = get_mongo_and_categories
+  category_id, categories = get_category_id(bulletin[:category], categories, coll_cat)
+
+  unless coll_bulletin.find_one(rss_link: bulletin[:link]) 
+    bulletin = {  _type: "Bulletin",
+                  postdate: bulletin[:date],
+                  created_at: bulletin[:date],
+                  updated_at: bulletin[:date],
+                  is_checked: true,
+                  is_pending: false,
+                  is_rejected: false,
+                  bulletin_category_id: category_id,
+                  title: {:zh_tw => title},
+                  text: {:zh_tw => bulletin[:description]},
+                  available_for_zh_tw: true,
+                  rss_link: bulletin[:link],
+                  rss_source: bulletin[:source],
+                  is_top: false,
+                  is_hot: false,
+                  is_hidden: false }
+
+    coll_bulletin.save(bulletin) 
+  end
+end

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

@@ -31,18 +31,29 @@ class Panel::Archive::FrontEnd::ArchiveFilesController < OrbitWidgetController
     @archive_file_categorys = ArchiveFileCategory.all
     # @archive_files = ArchiveFile.where( :is_hidden => false ).desc(:is_top).page(params[:page]).per(@page_num)
 
+    # if !params[:category_id].blank? && !params[:tag_id].blank?
+    #   @archive_files = @archive_files.default_sort(params[:sort]).can_display.where(:archive_file_category_id.in => params[:category_id], :tagged_ids.in => params[:tag_id]).desc( :is_top ).page( params[:page_main] ).per(@page_num)
+
+    #     @current_category = ArchiveFileCategory.from_id(params[:category_id]) rescue nil
+
+    # elsif !params[:category_id].blank?
+    #   @archive_files = ArchiveFile.default_sort(params[:sort]).can_display.where(:archive_file_category_id.in => params[:category_id]).desc( :is_top ).page( params[:page_main] ).per(@page_num)
+    #   @current_category = ArchiveFileCategory.from_id(params[:category_id]) rescue nil
+    # elsif !params[:tag_id].blank?
+    #   @archive_files = ArchiveFile.default_sort(params[:sort]).can_display.where(:tagged_ids.in => params[:tag_id]).desc( :is_top ).page( params[:page_main] ).per(@page_num)
+    # else
+    #   @archive_files = ArchiveFile.default_sort(params[:sort]).can_display.desc( :is_top ).page( params[:page_main] ).per(@page_num)
+    # end
     if !params[:category_id].blank? && !params[:tag_id].blank?
-      @archive_files = @archive_files.default_sort(params[:sort]).can_display.where(:archive_file_category_id.in => params[:category_id], :tagged_ids.in => params[:tag_id]).desc( :is_top ).page( params[:page_main] ).per(@page_num)
-
-        @current_category = ArchiveFileCategory.from_id(params[:category_id]) rescue nil
-
-    elsif !params[:category_id].blank?
-      @archive_files = ArchiveFile.default_sort(params[:sort]).can_display.where(:archive_file_category_id.in => params[:category_id]).desc( :is_top ).page( params[:page_main] ).per(@page_num)
-      @current_category = ArchiveFileCategory.from_id(params[:category_id]) rescue nil
+      @archive_files = ArchiveFile.default_sort(params[:sort]).all.can_display.where(:tagged_ids.in => params[:tag_id]).any_in(:archive_file_category_id => params[:category_id]).merge(ArchiveFileCategory.excludes('disable' => true)).desc( :is_top ).page( params[:page_main] ).per(@page_num)
+      @current_category = ArchiveFileCategory.any_in(:_id => params[:category_id]).excludes('disable' => true)
+    elsif !params[:category_id].blank? 
+      @archive_files = ArchiveFile.default_sort(params[:sort]).all.can_display.any_in(:archive_file_category_id => params[:category_id]).merge(ArchiveFileCategory.excludes('disable' => true)).desc( :is_top ).page( params[:page_main] ).per(@page_num)
+      @current_category = ArchiveFileCategory.any_in(:_id => params[:category_id]).excludes('disable' => true)
     elsif !params[:tag_id].blank?
-      @archive_files = ArchiveFile.default_sort(params[:sort]).can_display.where(:tagged_ids.in => params[:tag_id]).desc( :is_top ).page( params[:page_main] ).per(@page_num)
+      @archive_files = ArchiveFile.default_sort(params[:sort]).all.can_display.any_in(:tagged_ids => params[:tag_id]).merge(ArchiveFileCategory.excludes('disable' => true)).desc( :is_top ).page( params[:page_main] ).per(@page_num)
     else
-      @archive_files = ArchiveFile.default_sort(params[:sort]).can_display.desc( :is_top ).page( params[:page_main] ).per(@page_num)
+      @archive_files = ArchiveFile.default_sort(params[:sort]).all.can_display.merge(ArchiveFileCategory.excludes('disable' => true)).desc( :is_top).page( params[:page_main] ).per(@page_num)
     end
       
 

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

@@ -27,8 +27,10 @@ class Panel::Archive::Widget::ArchiveFilesController < OrbitWidgetController
 	  @category_id = @part.category
 
     date_now = Time.now
-
-    if !params[:category_id].blank?
+    if !params[:category_id].blank? && !params[:tag_id].blank?
+      @archive_files = ArchiveFile.default_sort(params[:sort]).all.can_display.where(:tagged_ids.in => params[:tag_id]).any_in(:archive_file_category_id => params[:category_id]).merge(ArchiveFileCategory.excludes('disable' => true)).desc( :is_top ).page( params[:page_main] ).per(@page_num)
+      @archive_file_categorys = ArchiveFileCategory.any_in(:_id => params[:category_id]).excludes('disable' => true)
+    elsif !params[:category_id].blank? 
       @archive_files = ArchiveFile.default_sort(params[:sort]).all.can_display.any_in(:archive_file_category_id => params[:category_id]).merge(ArchiveFileCategory.excludes('disable' => true)).desc( :is_top ).page( params[:page_main] ).per(@page_num)
       @archive_file_categorys = ArchiveFileCategory.any_in(:_id => params[:category_id]).excludes('disable' => true)
     elsif !params[:tag_id].blank?

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

@@ -1,6 +1,9 @@
 <script type="text/javascript">
 
 var local_host = "<%= request.host %>";
+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() {
@@ -80,21 +83,22 @@ $(document).ready(function() {
       <tr>
         <td colspan="5" class="dept_options">
           <div class="dept_options">
-          <%= check_box("school", "depts", {:multiple => true}, 'ntu_ga_test_p.tp.rulingcom.com', nil) %><%= label_tag("ntu_ga_test_p.tp.rulingcom.com", "測試站總務處 (ntu_ga_test_p)") %>
-          <%= check_box("school", "depts", {:multiple => true}, 'ntu_ga_test.tp.rulingcom.com', nil) %><%= label_tag("ntu_ga_test.tp.rulingcom.com", "測試站總務處經管組 (ntu_ga_test)") %>
+<!-- Example <%= check_box("school", "depts", {:multiple => true}, 'ntu_ga_test_p.tp.rulingcom.com', nil) %><%= label_tag("ntu_ga_test_p.tp.rulingcom.com", "測試站總務處 (ntu_ga_test_p)") %>
+          <%= check_box("school", "depts", {:multiple => true}, 'ntu_ga_test.tp.rulingcom.com', nil) %><%= label_tag("ntu_ga_test.tp.rulingcom.com", "測試站總務處經管組 (ntu_ga_test)") %> -->
 <!--      <%= 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("school", "depts", {:multiple => true}, "", nil) %><%= label_tag(:dep1, "總務長室暨總務處秘書室") %>
-          <%= check_box("school", "depts", {:multiple => true}, "文書組", nil) %><%= label_tag(:dep2, "文書組") %>
-          <%= check_box("school", "depts", {:multiple => true}, "事務組", nil) %><%= label_tag(:dep3, "事務組") %>
-          <%= check_box("school", "depts", {:multiple => true}, "保管組", nil) %><%= label_tag(:dep4, "保管組") %>
-          <%= check_box("school", "depts", {:multiple => true}, "營繕組", nil) %><%= label_tag(:dep5, "營繕組") %>
-          <%= check_box("school", "depts", {:multiple => true}, "出納組", nil) %><%= label_tag(:dep6, "出納組") %>
-          <%= check_box("school", "depts", {:multiple => true}, "採購組", nil) %><%= label_tag(:dep7, "採購組") %>
-          <%= check_box("school", "depts", {:multiple => true}, "經營管理組", nil) %><%= label_tag(:dep8, "經營管理組") %>
-          <%= check_box("school", "depts", {:multiple => true}, "駐警隊", nil) %><%= label_tag(:dep9, "駐警隊") %>
-          <%= check_box("school", "depts", {:multiple => true}, "社科院總務分處", nil) %><%= label_tag(:dep10, "社科院總務分處") %>
-          <%= check_box("school", "depts", {:multiple => true}, "醫學院總務分處", nil) %><%= label_tag(:dep11, "醫學院總務分處") %>
+          <%= check_box("school", "depts", {:multiple => true}, "www.ga.ntu.edu.tw", nil) %><%= label_tag("www.ga.ntu.edu.tw", "總務處") %>
+          <%= check_box("school", "depts", {:multiple => true}, "sec.ga.ntu.edu.tw", nil) %><%= label_tag("sec.ga.ntu.edu.tw", "總務長室暨總務處秘書室") %>
+          <%= check_box("school", "depts", {:multiple => true}, "doc.ga.ntu.edu.tw", nil) %><%= label_tag("doc.ga.ntu.edu.tw", "文書組") %>
+          <%= check_box("school", "depts", {:multiple => true}, "general.ga.ntu.edu.tw", nil) %><%= label_tag("general.ga.ntu.edu.tw", "事務組") %>
+          <%= check_box("school", "depts", {:multiple => true}, "property.ga.ntu.edu.tw", nil) %><%= label_tag("property.ga.ntu.edu.tw", "保管組") %>
+          <%= check_box("school", "depts", {:multiple => true}, "construction.ga.ntu.edu.tw", nil) %><%= label_tag("construction.ga.ntu.edu.tw", "營繕組") %>
+          <%= check_box("school", "depts", {:multiple => true}, "cashier.ga.ntu.edu.tw", nil) %><%= label_tag("cashier.ga.ntu.edu.tw", "出納組") %>
+          <%= check_box("school", "depts", {:multiple => true}, "procurement.ga.ntu.edu.tw", nil) %><%= label_tag("procurement.ga.ntu.edu.tw", "採購組") %>
+          <%= check_box("school", "depts", {:multiple => true}, "fss.ga.ntu.edu.tw", nil) %><%= label_tag("fss.ga.ntu.edu.tw", "經營管理組") %>
+          <%= check_box("school", "depts", {:multiple => true}, "police.ga.ntu.edu.tw", nil) %><%= label_tag("police.ga.ntu.edu.tw", "駐警隊") %>
+          <%= check_box("school", "depts", {:multiple => true}, "social.ga.ntu.edu.tw", nil) %><%= label_tag("social.ga.ntu.edu.tw", "社科院總務分處") %>
+          <%= check_box("school", "depts", {:multiple => true}, "medicine.ga.ntu.edu.tw", nil) %><%= label_tag("medicine.ga.ntu.edu.tw", "醫學院總務分處") %>
           </div>
         </td>
       </tr>  

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

@@ -85,7 +85,9 @@ $(document).ready(function(){
       </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_new/config/locales/en.yml

@@ -18,6 +18,8 @@ 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_new/config/locales/zh_tw.yml

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

vendor/built_in_modules/feed/.gitignore

@@ -3,5 +3,4 @@ log/*.log
 pkg/
 test/dummy/db/*.sqlite3
 test/dummy/log/*.log
-test/dummy/tmp/
-test/dummy/.sass-cache
+test/dummy/tmp/

vendor/built_in_modules/feed/Gemfile

@@ -1,6 +1,6 @@
 source "http://rubygems.org"
 
-# Declare your gem's dependencies in survey_b.gemspec.
+# Declare your gem's dependencies in location.gemspec.
 # Bundler will treat runtime dependencies like base dependencies, and
 # development dependencies will be added by default to the :development group.
 gemspec
@@ -14,4 +14,4 @@ gem "jquery-rails"
 # your gem to rubygems.org.
 
 # To use debugger
-# gem 'debugger'
+# gem 'ruby-debug19', :require => 'ruby-debug'

vendor/built_in_modules/feed/MIT-LICENSE

@@ -1,4 +1,4 @@
-Copyright 2013 YOURNAME
+Copyright 2012 YOURNAME
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

vendor/built_in_modules/feed/README.rdoc

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

vendor/built_in_modules/feed/Rakefile

@@ -14,13 +14,14 @@ end
 
 RDoc::Task.new(:rdoc) do |rdoc|
   rdoc.rdoc_dir = 'rdoc'
-  rdoc.title    = 'SurveyB'
+  rdoc.title    = 'Location'
   rdoc.options << '--line-numbers'
   rdoc.rdoc_files.include('README.rdoc')
   rdoc.rdoc_files.include('lib/**/*.rb')
 end
 
-
+APP_RAKEFILE = File.expand_path("../test/dummy/Rakefile", __FILE__)
+load 'rails/tasks/engine.rake'
 
 
 Bundler::GemHelper.install_tasks

vendor/built_in_modules/feed/app/assets/javascripts/panel/gprs/back_end/locations.js

@@ -0,0 +1,2 @@
+// Place all the behaviors and hooks related to the matching controller here.
+// All this logic will automatically be available in application.js.

vendor/built_in_modules/feed/app/assets/javascripts/panel/location/back_end/locations.js

@@ -0,0 +1,2 @@
+// Place all the behaviors and hooks related to the matching controller here.
+// All this logic will automatically be available in application.js.

vendor/built_in_modules/feed/app/assets/stylesheets/panel/gprs/back_end/locations.css

@@ -0,0 +1,4 @@
+/*
+  Place all the styles related to the matching controller here.
+  They will automatically be included in application.css.
+*/

vendor/built_in_modules/feed/app/assets/stylesheets/panel/location/back_end/locations.css

@@ -0,0 +1,4 @@
+/*
+  Place all the styles related to the matching controller here.
+  They will automatically be included in application.css.
+*/

vendor/built_in_modules/feed/app/controllers/panel/feed/back_end/feeds_controller.rb

@@ -0,0 +1,49 @@
+class Panel::Feed::BackEnd::FeedsController < OrbitBackendController
+  before_filter :force_order_for_visitor,:only => [:index, :new, :edit, :delete]
+  before_filter :force_order_for_user,:except => [:index]
+
+  def index
+    @feeds = AnnouncementFeed.all   
+
+    respond_to do |format|
+      format.html 
+    end
+  end
+
+  def new
+    @feed = AnnouncementFeed.new
+  end
+
+  def edit
+    @feed = AnnouncementFeed.find(params[:id])
+    @categories = @feed.categories
+  end
+
+  def create
+    @feed = AnnouncementFeed.new(params[:announcement_feed])
+    
+    if @feed.save
+      redirect_to panel_feed_back_end_feeds_url
+    else
+      render 'new'
+    end
+  end
+
+  def update
+    @feed = AnnouncementFeed.find(params[:id])
+
+    if @feed.update_attributes(params[:announcement_feed])
+      redirect_to panel_feed_back_end_feeds_url
+    else
+      render 'edit'
+    end
+  end
+
+  def destroy
+    @feed = AnnouncementFeed.find(params[:id])
+    @feed.destroy
+    
+    redirect_to panel_feed_back_end_feeds_url
+  end
+
+end

vendor/built_in_modules/feed/app/models/announcement_feed.rb

@@ -0,0 +1,8 @@
+class AnnouncementFeed
+  include Mongoid::Document
+  include Mongoid::Timestamps
+
+  field :link, type: String
+  field :name, type: String
+
+end

vendor/built_in_modules/feed/app/uploaders/locations_uploader.rb

@@ -0,0 +1,61 @@
+class LocationsUploader < CarrierWave::Uploader::Base
+
+  # Include RMagick or ImageScience support:
+  # include CarrierWave::RMagick
+  # include CarrierWave::ImageScience
+    include CarrierWave::MiniMagick
+
+  # Choose what kind of storage to use for this uploader:
+  # storage :file
+  # storage :s3
+
+  # Override the directory where uploaded files will be stored.
+  # This is a sensible default for uploaders that are meant to be mounted:
+  def store_dir
+    "location/#{model.class.to_s.underscore}/#{mounted_as}/#{model.id}"
+  end
+
+  # Provide a default URL as a default if there hasn't been a file uploaded:
+  # def default_url
+  #   "/images/fallback/" + [version_name, "default.png"].compact.join('_')
+  # end
+
+  # Process files as they are uploaded:
+  # process :scale => [200, 300]
+  #
+  # def scale(width, height)
+  #   # do something
+  # end
+
+  # Create different versions of your uploaded files:
+  # version :thumb do
+  #   process :scale => [50, 50]
+  # end
+  
+  version :thumb do
+    process :resize_to_fill => [150, 120]
+  end
+
+  # Add a white list of extensions which are allowed to be uploaded.
+  # For images you might use something like this:
+  # def extension_white_list
+  #   %w(jpg jpeg gif png)
+  # end
+
+  # Override the filename of the uploaded files:
+  # def filename
+  #   "something.jpg" if original_filename
+  # end
+  
+#  def manipulate!
+#    raise current_path.inspect
+#    image = ::MiniMagick::Image.open(current_path)
+#    image = yield(image)
+#    image.write(current_path)
+#    ::MiniMagick::Image.open(current_path)
+#  rescue ::MiniMagick::Error, ::MiniMagick::Invalid => e
+#    raise CarrierWave::ProcessingError.new("Failed to manipulate with MiniMagick, maybe it is not an image? Original Error: #{e}")
+#  end
+
+end
+

vendor/built_in_modules/feed/app/views/panel/feed/back_end/feeds/_form.html.erb

@@ -0,0 +1,84 @@
+<legend><h3 style="margin-left: 10px;"><%= t('feed.channel') %></h3></legend>
+<fieldset style="margin-left: -25px;">
+  <div class="control-group">
+    <label class="control-label" for="inputName"><%= t('feed.enter') + " RSS " + t('feed.name')%>:</label>
+    <div class="controls">
+        <%= f.text_field :name, :class => 'span4', :placeholder => 'RSS ' + t('feed.name'), :id => "inputName" %>
+    </div>
+  </div>
+
+  <div class="control-group">
+    <label class="control-label" for="inputURL"><%= t('feed.enter') + " RSS URL" %>:</label>
+    <div class="controls">
+        <%= f.text_field :link, :class => 'span4', :placeholder => 'RSS URL', :id => "inputURL" %>
+    </div>
+  </div>
+
+  <div class="control-group">
+    <label class="control-label" for="inputURL"><%= t('feed.choose') %>:</label>
+    <div class="controls">
+        <%= content_tag :label,:class => "checkbox inline" do -%>
+          <%= check_box("announcement_feed", "categories", {:multiple => true}, "全部", nil) %>
+          <%= label_tag "全部" %>
+        <% end -%>
+        <%= content_tag :label,:class => "checkbox inline" do -%>
+          <%= check_box("announcement_feed", "categories", {:multiple => true}, "緊急", nil) %>
+          <%= label_tag "緊急" %>
+        <% end -%>
+        <%= content_tag :label,:class => "checkbox inline" do -%>
+          <%= check_box("announcement_feed", "categories", {:multiple => true}, "一般", nil) %>
+          <%= label_tag "一般" %>
+        <% end -%>
+        <%= content_tag :label,:class => "checkbox inline" do -%>
+          <%= check_box("announcement_feed", "categories", {:multiple => true}, "研討會", nil) %>
+          <%= label_tag "研討會" %>
+        <% end -%>
+        <%= content_tag :label,:class => "checkbox inline" do -%>
+          <%= check_box("announcement_feed", "categories", {:multiple => true}, "演講", nil) %>
+          <%= label_tag "演講" %>
+        <% end -%>
+        <%= content_tag :label,:class => "checkbox inline" do -%>
+          <%= check_box("announcement_feed", "categories", {:multiple => true}, "活動", nil) %>
+          <%= label_tag "活動" %>
+        <% end -%>
+        <%= content_tag :label,:class => "checkbox inline" do -%>
+          <%= check_box("announcement_feed", "categories", {:multiple => true}, "徵才", nil) %>
+          <%= label_tag "徵才" %>
+        <% end -%>
+        <%= content_tag :label,:class => "checkbox inline" do -%>
+          <%= check_box("announcement_feed", "categories", {:multiple => true}, "招標", nil) %>
+          <%= label_tag "招標" %>
+        <% end -%>
+        <%= content_tag :label,:class => "checkbox inline" do -%>
+          <%= check_box("announcement_feed", "categories", {:multiple => true}, "拖吊", nil) %>
+          <%= label_tag "拖吊" %>
+        <% end -%>
+        <%= content_tag :label,:class => "checkbox inline" do -%>
+          <%= check_box("announcement_feed", "categories", {:multiple => true}, "校外", nil) %>
+          <%= label_tag "校外" %>
+        <% end -%>
+        <%= content_tag :label,:class => "checkbox inline" do -%>
+          <%= check_box("announcement_feed", "categories", {:multiple => true}, "過期", nil) %>
+          <%= label_tag "過期" %>
+        <% end -%>
+        <%= content_tag :label,:class => "checkbox inline" do -%>
+          <%= check_box("announcement_feed", "categories", {:multiple => true}, "H1N1", nil) %>
+          <%= label_tag "H1N1" %>
+        <% end -%>
+        <%= content_tag :label,:class => "checkbox inline" do -%>
+          <%= check_box("announcement_feed", "categories", {:multiple => true}, "失物招領", nil) %>
+          <%= label_tag "失物招領" %>
+        <% end -%>
+        <%= content_tag :label,:class => "checkbox inline" do -%>
+          <%= check_box("announcement_feed", "categories", {:multiple => true}, "近期", nil) %>
+          <%= label_tag "近期" %>
+        <% end -%>
+    </div>
+  </div>
+
+  <div class="control-group">
+    <div class="controls">
+      <%= f.submit t("submit"), :class => "btn btn-primary" %>
+    </div>
+  </div>
+</fieldset>

vendor/built_in_modules/feed/app/views/panel/feed/back_end/feeds/edit.html.erb

@@ -0,0 +1,38 @@
+<%= form_for @feed, :url => panel_feed_back_end_feed_path, :method => :put, :html => {:class => "form-horizontal"} do |f| %>
+  <%= render :partial => 'form', :locals => {:f => f}  %>
+<% end  %>
+<script type="text/javascript">
+
+var $checkboxes = $('.checkbox input');
+
+$(document).ready(function() {
+  var categories = <%= @categories.to_json.html_safe %>;
+
+  for (var i = 0; i < $checkboxes.length; i++) {
+
+    if ($.inArray($checkboxes[i].value, categories) != -1) {
+      $checkboxes[i].checked = true;
+    } else {
+      continue;
+    }
+  }
+
+});
+
+$('#announcement_feed_categories_').on('click', function() {
+  if ($checkboxes[0].checked == true) {
+    for (var i = 1; i < $checkboxes.length; i++) {
+      $checkboxes[i].checked = false;
+    }
+  }
+});
+
+$checkboxes.on('click', function() {
+  for (var i = 1; i < $checkboxes.length; i++) {
+    if ($checkboxes[i].checked == true) {
+      $checkboxes[0].checked = false
+    }
+  } 
+});
+
+</script>

vendor/built_in_modules/feed/app/views/panel/feed/back_end/feeds/index.html.erb

@@ -0,0 +1,27 @@
+<table class="table main-list">
+  <thead>
+    <tr><th><h3><%= t('feed.channel') %></h3></th></tr>
+    <tr>
+     <th class="span4"><%= t('RSS') %></th>
+      <%if is_manager? %>
+        <th class="span4"><%= t('feed.edit') %></th>
+        <th class="span4"><%= t('feed.delete') %></th>
+      <% end %>
+    </tr>
+  </thead>
+  <tbody id="tbody_locations" class="sort-holder">
+    <% @feeds.each do |feed| %> 
+      <tr class="with_action">
+        <td><%= feed.name %></td>
+        <%if is_manager? %>
+          <td><%= link_to t('feed.edit'), edit_panel_feed_back_end_feed_path(feed) %></td>
+          <td><%= link_to t('feed.cancel'), panel_feed_back_end_feed_path(feed), method: :delete, confirm: t(:sure?) %></td> 
+      <% end %> 
+      </tr>
+    <% end %>
+  </tbody>
+</table>
+<%if is_manager? %>
+  <br />
+  <%= link_to t('feed.new'), new_panel_feed_back_end_feed_path, :class => "btn btn-primary pull-right", :id => "create_event_btn", :ref => "add-btn" %>
+<% end %>

vendor/built_in_modules/feed/app/views/panel/feed/back_end/feeds/new.html.erb

@@ -0,0 +1,3 @@
+<%= form_for @feed, :url => panel_feed_back_end_feeds_path, :html => { :class=>"form-horizontal"} do |f| %>
+  <%= render :partial => 'form', :locals => {:f => f} %>
+<% end  %>

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

@@ -0,0 +1,12 @@
+en:
+  feed:
+    all: All
+    choose: Choose a Category
+    feed:  RSS
+    channel: Announcement Rss
+    new: New
+    edit: Edit
+    delete: Delete
+    cancel: Cancel RSS
+    enter: Enter
+    name: Name

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

@@ -0,0 +1,12 @@
+zh_tw:
+  feed:
+    all: 全部
+    choose: 選擇訂閱類別
+    feed: RSS
+    channel: 公告RSS訂閱
+    new: 新增
+    edit: 編輯
+    delete: 刪除
+    cancel: 取消訂閱
+    enter: 輸入
+    name: 名稱

vendor/built_in_modules/feed/config/routes.rb

@@ -0,0 +1,9 @@
+Rails.application.routes.draw do
+  namespace :panel do
+    namespace :feed do
+      namespace :back_end do 
+        resources :feeds
+      end
+    end
+  end
+end

vendor/built_in_modules/feed/feed.gemspec

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

vendor/built_in_modules/feed/init.rb

@@ -0,0 +1,24 @@
+module Feeds
+  OrbitApp.registration "Feed",:type=> 'ModuleApp' do
+    module_label 'feed.feed'
+    base_url File.expand_path File.dirname(__FILE__)    
+    # personal_plugin :enable => true,:path=>"panel/location/plugin/profile",:i18n=>'admin.location'
+    
+     version "0.1"
+     organization "Rulingcom"
+     author "RD dep"
+     intro "I am intro"
+     update_info 'some update_info'
+     #enable_frontend true
+   
+    
+     side_bar do
+       head_label_i18n  'feed.channel', :icon_class=>"icon-plus"
+       available_for [:admin,:guest,:manager,:sub_manager]
+       active_for_controllers ({:private=>['feeds']})
+
+       head_link_path "panel_feed_back_end_feeds_path"
+
+    end
+  end
+end

vendor/built_in_modules/feed/lib/rss_dynamic.rb

@@ -0,0 +1,91 @@
+# encoding: utf-8
+require 'rss'
+require 'mongo'
+
+# Change this according to local DB
+DB_NAME = "production_0" 
+
+# Create a hash rss site list from mongodb
+db = Mongo::Connection.new("localhost", 27017).db("#{DB_NAME}")
+SITES = Hash[ db["announcement_feeds"].find().entries.collect {|f| [ f["name"], f["link"] ] } ]
+CATEGORIES = Array(db["announcement_feeds"].find().entries.collect {|f| f["categories"]  })
+
+yesterday = Time.now - 86400
+two_weeks_ago = Time.new - 60 * 60 * 24 * 14
+
+recent_feed = {}
+
+SITES.each_with_index do |(name, url), i|
+  open("http://#{url}/panel/announcement/front_end/bulletins.rss?inner=true") do |rss|
+
+    # Giving 'false' parameter is for skipping irregular format of the RSS
+    feed = RSS::Parser.parse(rss, false)
+
+    feed.items.each do |item|
+      category = item.category.to_s.gsub(/\<(\/)*category\>/, '')
+
+      if item.pubDate > yesterday && CATEGORIES[i].include?(category) 
+        recent_feed[item.title.strip] = { date: item.pubDate, description: item.description.gsub("\r\n", '<br/>').strip,
+          link: item.link, category: category, source: name }
+      end
+
+    end
+  end
+end
+
+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
+
+def get_mongo_and_categories
+  db = Mongo::Connection.new("localhost", 27017).db("#{DB_NAME}")
+  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
+
+recent_feed.each do |title, bulletin|
+
+  categories, coll_bulletin, coll_cat = get_mongo_and_categories
+  category_id, categories = get_category_id(bulletin[:category], categories, coll_cat)
+
+  unless coll_bulletin.find_one(rss_link: bulletin[:link]) 
+    bulletin = {  _type: "Bulletin",
+                  postdate: bulletin[:date],
+                  created_at: bulletin[:date],
+                  updated_at: bulletin[:date],
+                  is_checked: true,
+                  is_pending: false,
+                  is_rejected: false,
+                  bulletin_category_id: category_id,
+                  title: {:zh_tw => title},
+                  text: {:zh_tw => bulletin[:description]},
+                  available_for_zh_tw: true,
+                  rss_link: bulletin[:link],
+                  rss_source: bulletin[:source],
+                  is_top: false,
+                  is_hot: false,
+                  is_hidden: false }
+
+    coll_bulletin.save(bulletin) 
+  end
+end

vendor/built_in_modules/feed/lib/tasks/location_tasks.rake

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

vendor/built_in_modules/feed/script/rails

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

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

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

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

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

vendor/built_in_modules/feed/test/dummy/app/views/layouts/application.html.erb

@@ -2,7 +2,7 @@
 <html>
 <head>
   <title>Dummy</title>
-  <%= stylesheet_link_tag    "application", :media => "all" %>
+  <%= stylesheet_link_tag    "application" %>
   <%= javascript_include_tag "application" %>
   <%= csrf_meta_tags %>
 </head>

vendor/built_in_modules/feed/test/dummy/config/application.rb

@@ -3,7 +3,7 @@ require File.expand_path('../boot', __FILE__)
 require 'rails/all'
 
 Bundler.require
-require "survey_b"
+require "location"
 
 module Dummy
   class Application < Rails::Application
@@ -35,20 +35,6 @@ module Dummy
     # Configure sensitive parameters which will be filtered from the log file.
     config.filter_parameters += [:password]
 
-    # Enable escaping HTML in JSON.
-    config.active_support.escape_html_entities_in_json = true
-
-    # Use SQL instead of Active Record's schema dumper when creating the database.
-    # This is necessary if your schema can't be completely dumped by the schema dumper,
-    # like if you have constraints or database-specific column types
-    # config.active_record.schema_format = :sql
-
-    # Enforce whitelist mode for mass assignment.
-    # This will create an empty whitelist of attributes available for mass-assignment for all models
-    # in your app. As such, your models will need to explicitly whitelist or blacklist accessible
-    # parameters by using an attr_accessible or attr_protected declaration.
-    config.active_record.whitelist_attributes = true
-
     # Enable the asset pipeline
     config.assets.enabled = true
 

vendor/built_in_modules/feed/test/dummy/config/environments/development.rb

@@ -2,7 +2,7 @@ Dummy::Application.configure do
   # Settings specified here will take precedence over those in config/application.rb
 
   # In the development environment your application's code is reloaded on
-  # every request. This slows down response time but is perfect for development
+  # every request.  This slows down response time but is perfect for development
   # since you don't have to restart the web server when you make code changes.
   config.cache_classes = false
 
@@ -22,13 +22,6 @@ Dummy::Application.configure do
   # Only use best-standards-support built into browsers
   config.action_dispatch.best_standards_support = :builtin
 
-  # Raise exception on mass assignment protection for Active Record models
-  config.active_record.mass_assignment_sanitizer = :strict
-
-  # Log the query plan for queries taking more than this (works
-  # with SQLite, MySQL, and PostgreSQL)
-  config.active_record.auto_explain_threshold_in_seconds = 0.5
-
   # Do not compress assets
   config.assets.compress = false
 

vendor/built_in_modules/feed/test/dummy/config/environments/production.rb

@@ -20,7 +20,7 @@ Dummy::Application.configure do
   # Generate digests for assets URLs
   config.assets.digest = true
 
-  # Defaults to nil and saved in location specified by config.assets.prefix
+  # Defaults to Rails.root.join("public/assets")
   # config.assets.manifest = YOUR_PATH
 
   # Specifies the header that your server uses for sending files
@@ -33,11 +33,8 @@ Dummy::Application.configure do
   # See everything in the log (default is :info)
   # config.log_level = :debug
 
-  # Prepend all log lines with the following tags
-  # config.log_tags = [ :subdomain, :uuid ]
-
   # Use a different logger for distributed setups
-  # config.logger = ActiveSupport::TaggedLogging.new(SyslogLogger.new)
+  # config.logger = SyslogLogger.new
 
   # Use a different cache store in production
   # config.cache_store = :mem_cache_store
@@ -60,8 +57,4 @@ Dummy::Application.configure do
 
   # Send deprecation notices to registered listeners
   config.active_support.deprecation = :notify
-
-  # Log the query plan for queries taking more than this (works
-  # with SQLite, MySQL, and PostgreSQL)
-  # config.active_record.auto_explain_threshold_in_seconds = 0.5
 end

vendor/built_in_modules/feed/test/dummy/config/environments/test.rb

@@ -2,9 +2,9 @@ Dummy::Application.configure do
   # Settings specified here will take precedence over those in config/application.rb
 
   # The test environment is used exclusively to run your application's
-  # test suite. You never need to work with it otherwise. Remember that
+  # test suite.  You never need to work with it otherwise.  Remember that
   # your test database is "scratch space" for the test suite and is wiped
-  # and recreated between test runs. Don't rely on the data there!
+  # and recreated between test runs.  Don't rely on the data there!
   config.cache_classes = true
 
   # Configure static asset server for tests with Cache-Control for performance
@@ -29,8 +29,10 @@ Dummy::Application.configure do
   # ActionMailer::Base.deliveries array.
   config.action_mailer.delivery_method = :test
 
-  # Raise exception on mass assignment protection for Active Record models
-  config.active_record.mass_assignment_sanitizer = :strict
+  # Use SQL instead of Active Record's schema dumper when creating the test database.
+  # This is necessary if your schema can't be completely dumped by the schema dumper,
+  # like if you have constraints or database-specific column types
+  # config.active_record.schema_format = :sql
 
   # Print deprecation notices to the stderr
   config.active_support.deprecation = :stderr

vendor/built_in_modules/feed/test/dummy/config/initializers/inflections.rb

@@ -8,8 +8,3 @@
 #   inflect.irregular 'person', 'people'
 #   inflect.uncountable %w( fish sheep )
 # end
-#
-# These inflection rules are supported but not enabled by default:
-# ActiveSupport::Inflector.inflections do |inflect|
-#   inflect.acronym 'RESTful'
-# end

vendor/built_in_modules/feed/test/dummy/config/initializers/secret_token.rb

@@ -4,4 +4,4 @@
 # If you change this key, all old signed cookies will become invalid!
 # Make sure the secret is at least 30 characters and all random,
 # no regular words or you'll be exposed to dictionary attacks.
-Dummy::Application.config.secret_token = 'd7805d46c934ccf6140641370f099c8cabadbfcf7dbafc17f06c1b4750b9bc1ef733a96efba7389aa14ecfb942607d142a4a979e76040ce0df9a06944d45fb70'
+Dummy::Application.config.secret_token = '181584334acb820e1d0e0e53b71c0985251f4e5bfd188a962d5f9acfeeb0e46dfd6ca68784528cab00d8e6e8da087cce2bf7d060fe2b2c742a814c23689ff6af'

vendor/built_in_modules/feed/test/dummy/config/routes.rb

@@ -54,5 +54,5 @@ Dummy::Application.routes.draw do
 
   # This is a legacy wild controller route that's not recommended for RESTful applications.
   # Note: This route will make all actions in every controller accessible via GET requests.
-  # match ':controller(/:action(/:id))(.:format)'
+  # match ':controller(/:action(/:id(.:format)))'
 end

vendor/built_in_modules/feed/test/dummy/public/500.html

@@ -20,6 +20,7 @@
   <!-- This file lives in public/500.html -->
   <div class="dialog">
     <h1>We're sorry, but something went wrong.</h1>
+    <p>We've been notified about this issue and we'll take a look at it shortly.</p>
   </div>
 </body>
 </html>

vendor/built_in_modules/feed/test/functional/panel/gprs/back_end/locations_controller_test.rb

@@ -0,0 +1,14 @@
+require 'test_helper'
+
+class Panel::Location::BackEnd::LocationsControllerTest < ActionController::TestCase
+  test "should get index" do
+    get :index
+    assert_response :success
+  end
+
+  test "should get edit" do
+    get :edit
+    assert_response :success
+  end
+
+end

vendor/built_in_modules/feed/test/functional/panel/location/back_end/locations_controller_test.rb

@@ -0,0 +1,14 @@
+require 'test_helper'
+
+class Panel::Location::BackEnd::LocationsControllerTest < ActionController::TestCase
+  test "should get index" do
+    get :index
+    assert_response :success
+  end
+
+  test "should get edit" do
+    get :edit
+    assert_response :success
+  end
+
+end

vendor/built_in_modules/feed/test/integration/navigation_test.rb

@@ -0,0 +1,10 @@
+require 'test_helper'
+
+class NavigationTest < ActionDispatch::IntegrationTest
+  fixtures :all
+
+  # test "the truth" do
+  #   assert true
+  # end
+end
+

vendor/built_in_modules/feed/test/location_test.rb

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

vendor/built_in_modules/feed/test/test_helper.rb

@@ -8,8 +8,3 @@ Rails.backtrace_cleaner.remove_silencers!
 
 # Load support files
 Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each { |f| require f }
-
-# Load fixtures from the engine
-if ActiveSupport::TestCase.method_defined?(:fixture_path=)
-  ActiveSupport::TestCase.fixture_path = File.expand_path("../fixtures", __FILE__)
-end

vendor/built_in_modules/feed/test/unit/helpers/panel/gprs/back_end/locations_helper_test.rb

@@ -0,0 +1,4 @@
+require 'test_helper'
+
+class Panel::Location::BackEnd::LocationsHelperTest < ActionView::TestCase
+end

vendor/built_in_modules/feed/test/unit/helpers/panel/location/back_end/locations_helper_test.rb

@@ -0,0 +1,4 @@
+require 'test_helper'
+
+class Panel::Location::BackEnd::LocationsHelperTest < ActionView::TestCase
+end

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

@@ -2,7 +2,7 @@ class Panel::PageContent::BackEnd::PageContextsController < OrbitBackendControll
   before_filter :force_order_for_visitor,:only=>[:index]
   before_filter :force_order_for_user,:except => [:index]
   
-  before_filter :for_app_manager,:except => [:index]
+  # before_filter :for_app_manager,:except => [:index]
   before_filter :for_app_sub_manager,:except => [:index]
    
   #before_filter :is_admin?

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

@@ -4,7 +4,7 @@
 		<%= page_context.page.title %>
 		<div class="quick-edit">
 			<ul class="nav nav-pills hide">
-				<%if is_manager? || is_admin? ||  page_context.authed_users(:edit).include?(current_user)%>
+				<%if is_manager? || is_admin? ||  page_context.authed_users("Edit").include?(current_user)%>
 				<li><%= link_to t(:edit), edit_panel_page_content_back_end_page_context_path(page_context, page: params[:page], sort: params[:sort], direction: params[:direction], sort_options: params[:sort_options]) %></li>
 				<%if (is_manager? || is_admin?) %>
 					<li><%=show_page_context_edit_auth_link page_context%></li>

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

@@ -1,4 +1,8 @@
 require 'csv'
+require 'iconv'
+require 'roo'
+
+# encoding: UTF-8
 
 class Panel::Survey::BackEnd::SurveysController < OrbitBackendController
 
@@ -85,11 +89,152 @@ 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
 
-    csv = CSV.generate do |csv|
+    head = 'EF BB BF'.split(' ').map{|a|a.hex.chr}.join()
+
+    csv = CSV.generate(csv = head) do |csv|
       row = []
       @survey_questions.each do |question|
         row << question.title
@@ -134,7 +279,7 @@ class Panel::Survey::BackEnd::SurveysController < OrbitBackendController
         @survey_questions.each do |question|
           if question.type == ::SurveyQuestion::Radiogroup
             options = Hash[question.survey_question_options.collect{|o| [ o.id.to_s, o.name ] }]
-            row << Hash[answer[question.id.to_s].map {|o, g| [options[o], g]}]
+            row << Hash[answer[question.id.to_s].map {|o, g| [options[o], g]}] if !answer[question.id.to_s].blank?
           else
             row << answer[question.id.to_s]
           end
@@ -146,11 +291,16 @@ class Panel::Survey::BackEnd::SurveysController < OrbitBackendController
     end
 
     respond_to do |format|
-      format.csv do
-        response.headers["Content-Type"] = "text/csv; charset=big5"
-        render :text => csv.encode('Big5')
-      end
+      format.html
+      format.csv { send_data csv }
     end
+
+    # respond_to do |format|
+    #   format.csv do
+    #     response.headers["Content-Type"] = "text/csv; charset=big5"
+    #     render :text => csv.encode('Big5')
+    #   end
+    # end
   end
 
   def set_answers

vendor/built_in_modules/survey/app/models/survey_question.rb

@@ -44,5 +44,4 @@ class SurveyQuestion
   def get_jump_tos
     Hash[survey_question_options.select{ |o| !o.jump_to.blank? }.collect{ |o| [o.id.to_s, o.jump_to] }]
   end
-
 end