Merge for new timeline updates and font updates

config/application.rb

@@ -63,6 +63,8 @@ module Orbit
 
     # Enable the asset pipeline
      config.assets.enabled = true
+     #config.time_zone = 'Taipei'  
+     ENV['TZ'] = 'Asia/Taipei'  
   end
 end
 Orbit_Apps = []

config/environments/development.rb

@@ -24,6 +24,9 @@ Orbit::Application.configure do
   config.action_dispatch.best_standards_support = :builtin  
 
 
+  config.assets.debug = true
+
+
   # config.middleware.use ExceptionNotifier,
   #   :email_prefix => "[R4_error]",
   #   :sender_address => %{"notifier" <redmine@rulingcom.com>},
@@ -39,6 +42,6 @@ Orbit::Application.configure do
   #   :authentication => "plain",
   #   :user_name => "redmine@rulingcom.com",
   #   :password => "rulingredmine" }
-
+    
 end
 

config/initializers/impression.rb

@@ -0,0 +1,6 @@
+# Use this hook to configure impressionist parameters
+Impressionist.setup do |config|
+  # Define ORM. Could be :active_record (default) and :mongo_mapper
+  # config.orm = :active_record
+  config.orm = :mongoid
+end

config/initializers/resque.rb

@@ -0,0 +1,20 @@
+require 'resque_scheduler'
+# require 'resque_scheduler/server'
+# require 'yaml'
+
+Resque.redis = 'localhost:6379'
+#Resque.redis.namespace = "resque:SchedulerExample"
+
+# If you want to be able to dynamically change the schedule,
+# uncomment this line.  A dynamic schedule can be updated via the
+# Resque::Scheduler.set_schedule (and remove_schedule) methods.
+# When dynamic is set to true, the scheduler process looks for
+# schedule changes and applies them on the fly.
+# Note: This feature is only available in >=2.0.0.
+#Resque::Scheduler.dynamic = true
+
+Dir["#{Rails.root}/app/jobs/*.rb"].each { |file| require file }
+
+# The schedule doesn't need to be stored in a YAML, it just needs to
+# be a hash.  YAML is usually the easiest.
+Resque.schedule = YAML.load_file(Rails.root.join('config', 'resque_schedule.yml'))

config/list.yml

@@ -9,6 +9,7 @@ markups:
   
 public_r_tags:
   - ad_banner
+  - sub_menu
   
 page_part_kinds:
   - text

config/locales/en.yml

@@ -9,7 +9,9 @@ en:
   account_settings: Account settings
   add: Add
   back: Back
+  browse: Browse
   cancel: Cancel
+  create_fail: Creation failed
   create: Create
   delete: Delete
   desktop: Desktop
@@ -28,6 +30,9 @@ en:
   logout: Logout
   no_: "No"
   nothing: Nothing
+  nccu: NCCU
+  nccu_c:
+    nccu_ldap_uid: NCCU LDAP Account
   or_lower: or
   password: Password
   register: Register
@@ -37,17 +42,74 @@ en:
   submit: Submit
   sure?: Are you sure?
   update: Update
+  update_failed: Update failed
+  view: View
+  view_count: View count
   yes_: "Yes"
-  
+
+  all_content: All Content
+  all_file: All File
+  all_member: All Member
+  content: Content
+  data: Data
+  file: File
+  file_type: File Type
+  hits: Hits
+  item: Item
+  member: Member
+  module: Module
+  most_visited_page: Most Visited Page
+  quantity: Quantity
+  recent_update: Recent Update
+  referral_in_links: Referral in Links
+  role: Role
+  site_info: Site Info
+  site_name: Site Name
+  statistics: Statistics
+  title: Title
+  total_visitors: Total Visitors
+  traffic: Traffic
+
+  visitors_today: Today's visitors
+  visitors_this_week: This week's visitors
+  visitors_this_month: This month's visitors
+  visitors_this_year: This year's visitors
+
   admin:
+    access:
+      denied:
+        app:
+          not_sub_manager: Access Denied for you are not SubManager for this app
+          not_manager: Access Denied for you are not SubManager for this app
+          not_authed_user: Access Denied for you are not User for this app
+        not_admin: Access Denied for you are not Admin
+        object: "Access Denied for you don't have permission for this object"
     action: Action
     ad_banner: AD Banner
+    ad:
+      sec_place_holder: Enter 3 if 3 sec
+      ab_fx: FX
+      all_banners: AdBanner list
+      banner_best_size: Banner Best Size
+      best_size: Best size
+      new_banner: New banner
+      new_image: New image
+      showing: Showing
+      not_showing: NotShowing
+      picture_list: Picture List
+      title: Title
+      transition_sec: Transition time
+      trans_unit_sec: sec
+      update_banner: Update Banner
+      widget_info_for_ad_image_size: "Best size with: %{best_size}"
     add: Add
     add_item: Add item
     add_language: Add language
     add_drop_down_item: +Add Menu Item
     admin: Admin
     action: Action
+    all_articles: List
+    always_display_title: Always displayed in the title bar
     announcement: Announcement
     asset: Asset
     assets:
@@ -60,6 +122,7 @@ en:
     calendar: Calendar
     cant_delete_self: You can not delete yourself.
     cant_revoke_self_admin: You can not revoke your admin role yourself.
+    category: Category
     choose_file: Choose a file...
     class: Class
     content: Content
@@ -75,7 +138,7 @@ en:
     dashboard: Dashboard
     delete_language: Delete language
     description: Description
-    design: Design
+    design: Template
     disable_language: Disable language
     editing_home: Editing homepage
     editing_layout: Editing layout
@@ -86,8 +149,10 @@ en:
     editing_role: Editing user role
     email: Email
     enable_language: Enable language
+    enabled_for: Enabled for
     file_name: Filename
     file_size: File size
+    file_upload: File upload
     format: Format
     home: Home
     id: ID
@@ -96,10 +161,12 @@ en:
     is_published: Is published
     item: Item
     key: Key
+    keywords: Keywords
     language: Language
     layout: Layout
     layout_name: Layout name
     links: Links
+    link: Links
     list_assets: Assets list
     list_designs: Designs list
     list_items: Items list
@@ -108,7 +175,18 @@ en:
     list_users: Users list
     list_infos: User information list
     list_roles: User roles list
+    mail_address: Address
+    mail_port: Port
+    mail_domain: Domain
+    mail_authentication: Authentication
+    mail_user_name: User Name
+    mail_password: Password
+    mail_tls: TLS
+    mail_enable_starttls_auto: Enable Start TLS Auto
     member: Member
+    menu_enabled_for: Menu enabled for
+    module:
+      authorization: Module Authorization
     move_down: Move down
     move_up: Move up
     multilingual: Multilingual
@@ -117,6 +195,8 @@ en:
     no_layout: You don't have a layout
     name: Name
     nccu: NCCU Custom
+    nccu_c:
+      nccu_ldap_uid: NCCU LDAP Account
     new_asset: New asset
     new_component: New component
     new_design: New design
@@ -128,10 +208,23 @@ en:
     new_user: New user
     new_info: New user information
     new_role: New user role
+    news: News
     non_multilingual: Non multilingual
+    object_auth:
+      list_title_of_users: %{auth_title} Auth List
+      update_done: Update done,reulst showing in list
+      update_failed: Update failed
     options: Options
     orig_upload_file: Original filename
     page: Page
+    page_context:
+      edit: Edit
+      ob_auth:
+        edit: Category authorization
+    page_part_kinds:
+      text: Text Area
+      public_r_tag: System Widget
+      module_widget: Plug-in Module Widget
     position: Position
     published?: Published?
     purchase: Purchase
@@ -142,9 +235,14 @@ en:
     setup_translations: Translations setup
     setup_designs: Designs setup
     site: Site
-    site_setting: Site Setting
+    site_description: Site description
+    site_footer: Site footer
+    site_settings: Site Setting
+    site_sub_menu: Site sub-menu
+    site_title: Site title
     super_pages: Super pages
     structure: Structure
+    tags: Tags
     title: Title
     translation: Translation
     type: Type
@@ -161,8 +259,33 @@ en:
     upload_design: Upload design
     url: URL
     user: User
+    user_role:
+      auth:
+        all_member: All Member
+        manager: Manager
+        sub_mamanger: SubManager
+        by_role: By Role
+        by_sub_role: By SubRole
+        block_list: Block List
+        privilege_list: Privilege List
+        add_manager: Add Manager
+        add_sub_manager: Add SubManager
+        add_to_block_list: Add to block List
+        add_to_privilege_list: Add to privilege List
+        auth_by: -AuthBy %{user_display_name}
     info: User information
     panel: User panel
     role: User role
-    
+  
+  dashboard:
+    bulletin: Announcement
+    news_bulletin: News
+    page_context: Page
+    web_link: Link
+
   panel:
+    
+  modal:
+    close: Close
+    preview: Preview
+    

config/locales/zh_tw.yml

@@ -6,13 +6,15 @@ zh_tw:
   account_settings: 帳號設定
   add: 新增
   back: 回上一步
+  browse: 選擇檔案
   cancel: 取消
-  create: 創建
+  create: 新增
+  create_fail: 創建失敗
   delete: 刪除
   desktop: 桌面
   disable: 禁用
   dots: …
-  downloaded: 已經下載
+  downloaded: 已下載
   download: 下載
   edit: 編輯
   email: 電子郵件
@@ -34,25 +36,76 @@ zh_tw:
   submit: 送出
   sure?: 您肯定嗎?
   update: 更新
+  update_failed: 更新失敗
+  view: 檢視
+  view_count: 查看次數
   yes_: "Yes"
-  
+
+  all_content: 全部內容有
+  all_file: 全部檔案有
+  all_member: 成員總數
+  content: 內容
+  data: 數據
+  file: 檔案
+  file_type: 檔案類型
+  hits: 點擊率
+  item: 項目
+  member: 會員
+  module: 模組
+  most_visited_page: 熱門頁面
+  quantity: 數量
+  recent_update: 近期更新
+  referral_in_links: 外部推薦連結
+  role: 角色
+  site_info: 網站資訊
+  site_name: 網站名稱
+  statistics: 統計
+  title: 標題
+  total_visitors: 造訪次數
+  traffic: 流量
+
+  visitors_today: 今日造訪
+  visitors_this_week: 本星期造訪
+  visitors_this_month: 本月造訪
+  visitors_this_year: 今年造訪
+
   admin:
+    access:
+      denied:
+        app:
+          not_sub_manager: 拒絕存取因你不是此應用程式次管理員
+          not_manager: 拒絕存取因你不是此應用程式管理員
+          not_authed_user: 拒絕存取因你不是此應用程式授權使用者
+        not_admin: 拒絕存取因你不是此應用程式次管理員
+        object: 拒絕存取因你不是網站管理者
     action: 操作
     ad_banner: 廣告輪播
     ad:
+      sec_place_holder: 3秒請輸入3
       ab_fx: 轉場特效
       all_banners: 輪播清單
+      banner_best_size: Banner 尺寸
+      best_size: 最佳尺寸
+      cate_auth: 分類授權
+      delete_banner: 刪除整組輪播
       new_banner: 新增輪播
       new_image: 新增橫幅
+      showing: 顯示中
+      not_showing: 沒有顯示
+      picture_list: 圖片列表
       title: 標題
       transition_sec: 轉場單位時間
       trans_unit_sec: 秒
+      update_banner: 更新輪播
+      widget_info_for_ad_image_size: "此區塊圖片尺寸請使用 %{best_size}"
     add: 新增
     add_item: 新增項目
     add_language: 新增語言
     add_drop_down_item: ＋增加Orbit選單
-    admin: 管理
-    announcement: 公告系統
+    admin: 網站管理者
+    all_articles: 列表
+    always_display_title: 永遠顯示於標題列
+    announcement: 公告管理
     asset: 資產
     assets:
         file: 檔案
@@ -63,27 +116,31 @@ zh_tw:
     author: 作者
     calendar: 行事曆
     cant_delete_self: 您不可以刪除自己。
-    cant_revoke_self_admin: 您不可以撤銷自己的管理作用。
+    cant_revoke_self_admin: 您不可以撤銷自己的管理身份。
+    category: 類別
     choose_file: 請選擇一個文件...
     class: 階級
     content: 內容
-    create_error_link: 創建連接時出錯。
-    create_error_page: 創建頁面時出錯。
-    create_success_home: 首頁已成功創建。
-    create_success_layout: 樣板已成功創建。
-    create_success_link: 連結已成功創建。
-    create_success_page: 頁面已成功創建。
-    create_success_home: 首頁已成功創建。
-    create_success_layout: 佈局已成功創建。
-    create_success_link: 連結已成功創建。
-    create_success_page: 頁面已成功創建。
-    create_success_snippet: 片段已成功創建。
-    create_success_user: 用戶已成功創建。。
+    contenteditable:
+      update_done: 更新完成
+      update_failed: 更新失敗
+    create_error_link: 新增連接時出錯。
+    create_error_page: 新增頁面時出錯。
+    create_success_home: 首頁已成功新增。
+    create_success_layout: 樣板已成功新增。
+    create_success_link: 連結已成功新增。
+    create_success_page: 頁面已成功新增。
+    create_success_home: 首頁已成功新增。
+    create_success_layout: 佈局已成功新增。
+    create_success_link: 連結已成功新增。
+    create_success_page: 頁面已成功新增。
+    create_success_snippet: 片段已成功新增。
+    create_success_user: 用戶已成功新增。。
     dashboard: 儀表板
     data: 資料數據
     delete_language: 刪除語言
     description: 描述
-    design:  網站版型
+    design:  版型管理
     disable_language: 禁用語言
     editing_home: 編輯首頁
     editing_layout: 編輯樣板
@@ -91,11 +148,13 @@ zh_tw:
     editing_page: 編輯頁面
     editing_snippet: 編輯片段
     editing_info: 編輯用戶資料
-    editing_role: 編輯用戶角色
+    editing_role: 編輯用戶身份
     email: Email
     enable_language: 啟用語言
+    enabled_for: 啟用
     file_name: 檔名
     file_size: 檔案大小
+    file_upload: 文件上載
     format: 格式
     home: 首頁
     id: ID
@@ -104,9 +163,11 @@ zh_tw:
     is_published: 被出版
     item: 網站架構
     key: 關鍵
+    keywords: 關鍵字
     language: 語言
     layout: 佈局
     layout_name: 佈局名字
+    link: 連結管理
     links: 網路資源
     list_assets: 資產列表
     list_designs: 設計列表
@@ -115,8 +176,19 @@ zh_tw:
     list_snippets: 斷片列表
     list_users: 使用列表
     list_infos: 用戶資料列表
-    list_roles: 用戶角色列表
+    list_roles: 用戶身份列表
+    mail_address: 郵件地址
+    mail_port: 傳輸埠
+    mail_domain: 網域名稱
+    mail_authentication: 認證
+    mail_user_name: 帳號
+    mail_password: 密碼
+    mail_tls: TLS
+    mail_enable_starttls_auto: Enable Start TLS Auto
     member: 會員
+    menu_enabled_for: 選單啟用
+    module:
+      authorization: 模組授權
     move_down: 往下移
     move_up: 往上移
     multilingual: 多種語言
@@ -135,16 +207,34 @@ zh_tw:
     new_snippet: 新增片段
     new_user: 新增使用
     new_info: 新增用戶資料
-    new_role: 新增用戶角色
-    non_multilingual: 非多種語言
+    new_role: 新增用戶身份
+    news: 新聞
+    non_multilingual: 
+    object_auth:
+      list_title_of_users: 授權清單-%{auth_title}
+      update_done: 更新完成，結果顯示於清單
+      update_failed: 更新失敗
     options: 選項
     orig_upload_file: 原上傳檔名
-    page: Page
+    page: 頁面管理
+    page_context:
+      edit: 編輯
+      ob_auth:
+        edit: 分類授權
+    page_part_kinds:
+      text: 文字區塊
+      public_r_tag: 系統模塊
+      module_widget: 外掛模塊
     position: 位置
     published?: 發布?
     purchase: 購買
-    role: 角色
-    roles: 角色
+    role: 身份
+    roles: 身份
+    site_description: 網站描述
+    site_footer: 網站頁尾
+    site_settings: 基本設定
+    site_sub_menu: 網站次選單
+    site_title: 網站標題
     setup_member: 成員設置
     setup_translations: 語系設定
     setup_designs: 版型設定
@@ -152,6 +242,7 @@ zh_tw:
     site_setting: 網站設定
     super_pages: 可編頁面
     structure: 網站結構
+    tags: 標籤
     title: 標題
     translation: 翻譯
     type: 類型
@@ -168,10 +259,30 @@ zh_tw:
     upload_design: 上傳設計
     url: URL
     user: 用戶
+    user_role:
+      auth:
+        all_member: 所有會員
+        manager: 管理員
+        sub_manager: 次管理員
+        by_role: 根據身份
+        by_sub_role: 根據次身份
+        block_list: 封鎖名單
+        add_manager: 增加到管理員
+        add_sub_manager: 增加到次管理員
+        add_to_block_list: 封鎖名單
+        add_to_privilege_list: 特許名單
+        auth_by: -由%{user_display_name}授權
+        user: 使用會員
     info: 用戶資料
     panel: 用戶面板
-    role: 用戶角色
+    role: 用戶身份
     
+  dashboard:
+    bulletin: 公告
+    news_bulletin: 新聞
+    page_context: 頁面
+    web_link: 鏈接
+  
   panel:
     
     
@@ -386,3 +497,6 @@ zh_tw:
       create: "新增%{model}"
       update: "更新%{model}"
       submit: "儲存%{model}"
+  modal:
+    close: "關閉"
+    preview: "預覽"

config/mongoid.yml

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

config/resque.god

@@ -0,0 +1,55 @@
+rails_env   =  'development' #ENV['RAILS_ENV']  || "production"
+rails_root  = ENV['RAILS_ROOT'] || "/Users/kaito/Documents/MyWorkspeace/orbit/orbit"
+num_workers = rails_env == 'production' ? 5 : 2
+
+num_workers.times do |num|
+  God.watch do |w|
+    w.dir      = "#{rails_root}"
+    w.name     = "resque-#{num}"
+    w.group    = 'resque'
+    w.interval = 30.seconds
+    p "/usr/bin/rake -f #{rails_root}/Rakefile resque:work  QUEUE=* RAILS_ENV=#{rails_env}"
+#    w.env      = {"QUEUE"=>"critical,high,low", "RAILS_ENV"=>rails_env}
+    w.start    = "rake -f #{rails_root}/Rakefile resque:work  QUEUE=* RAILS_ENV=#{rails_env}"
+
+    w.uid = 'kaito'
+    w.gid = 'staff'
+
+    # restart if memory gets too high
+    w.transition(:up, :restart) do |on|
+      on.condition(:memory_usage) do |c|
+        c.above = 350.megabytes
+        c.times = 2
+      end
+    end
+
+    # determine the state on startup
+    w.transition(:init, { true => :up, false => :start }) do |on|
+      on.condition(:process_running) do |c|
+        c.running = true
+      end
+    end
+
+    # determine when process has finished starting
+    w.transition([:start, :restart], :up) do |on|
+      on.condition(:process_running) do |c|
+        c.running = true
+        c.interval = 5.seconds
+      end
+
+      # failsafe
+      on.condition(:tries) do |c|
+        c.times = 5
+        c.transition = :start
+        c.interval = 5.seconds
+      end
+    end
+
+    # start if process is not running
+    w.transition(:up, :start) do |on|
+      on.condition(:process_running) do |c|
+        c.running = false
+      end
+    end
+  end
+end

config/resque_schedule.yml

@@ -0,0 +1,23 @@
+# do_mail_matt:
+#   every: 10s
+#   class: FetchTime
+#   args: 
+#   description: Runs the perform method in FetchTime
+
+nccu_daily_ldap_sync:
+  cron: * * [0,12] * * *
+  class: SyncDb
+  args:
+  description: Sync NCCU middle site with Orbit for LDAP data
+
+nccu_daily_restart:
+  cron: * * */3 * * *
+  class: RestartServer
+  args:
+  description: Restart NCCU  site
+
+nccu_claender_sync:
+  cron: * * [0,12] * * *
+  class: NccuCalendar
+  args:
+  description: Sync NCCU calendar RSS Feeds

config/routes.rb

@@ -1,5 +1,5 @@
 Orbit::Application.routes.draw do
-
+  mount Resque::Server, :at => "/admin/resque"
   devise_for :users
   
   # routes for sinatra app
@@ -12,9 +12,22 @@ Orbit::Application.routes.draw do
 
   # routes for admin
   namespace :admin do
-    resources :assets
+    mount Resque::Server.new, :at => "/resque"
+    resources :assets do   
+      collection do
+        get 'file_upload'
+        post 'delete'
+      end
+    end
+    resources :asset_categories
+    resources :asset_tags
     resources :app_auths 
     resources :object_auths  do
+      match 'new_interface/:ob_type/:title/new' => "object_auths_new_interface#new" ,:as => :init_ob_auth,:via => :get
+      match 'new_interface' => "object_auths_new_interface#setting" ,:as => :ob_auth,:via => :get
+      match 'new_interface' => "object_auths_new_interface#update_setting" ,:as => :ob_auth,:via => :post
+      match 'new_interface' => "object_auths_new_interface#user_list" ,:as => :ob_auth_show,:via => :put
+      
       collection do
         match 'new/:type/:obj_id',:action => 'new',:via => "get",:as => :init
       end
@@ -24,7 +37,10 @@ Orbit::Application.routes.draw do
       end
     end
 
-    
+
+    match 'ad_banners/:id/preview' => 'ad_banners#realtime_preview',:as => :realtime_preview_ad_banner,:via => :put
+    match 'ad_banners/:id/rename' => 'ad_banners#rename',:as => :rename_ad_banner,:via => :post
+
     resources :ad_banners do 
         collection do
           match 'new_ad_image' => 'ad_images#new',:as => :new_ad_image,:via => :get
@@ -36,6 +52,7 @@ Orbit::Application.routes.draw do
     resources :designs do
       collection do
         get 'upload_package'
+        post 'delete'
         post 'upload_package'
       end
       member do
@@ -46,6 +63,7 @@ Orbit::Application.routes.draw do
       get 'add_attribute_field'
     end
     resources :items
+    match 'update_position' => 'items#update_position'
     resources :links do
       member do
         get 'delete'
@@ -58,6 +76,9 @@ Orbit::Application.routes.draw do
       end
     end
     resources :module_apps do
+      match 'manager_auth_proc' => "module_apps_new_interface#setting" ,:as => :manager_auth_proc,:via => :get
+      match 'manager_auth_proc' => "module_apps_new_interface#update_setting" ,:as => :manager_auth_proc,:via => :post
+      match 'manager_auth_proc' => "module_apps_new_interface#user_list" ,:as => :manager_auth_show,:via => :put
       resources :app_auths do
         member do
           match 'remove/:type/:target_id' ,:action=> 'remove',:via => "delete",:as =>:remove
@@ -76,6 +97,7 @@ Orbit::Application.routes.draw do
     resources :page_parts do
       member do
         get 'reload_widgets'
+        get 'reload_r_tag_options'
       end
     end
     resources :purchases do
@@ -90,7 +112,13 @@ Orbit::Application.routes.draw do
       get 'add_sub_role'
       get 'add_attribute_field'
     end
-    resources :sites
+    resources :sites do
+      get 'site_info'
+      get 'system_info'
+      get 'language'
+      get 'mail_setting'
+      get 'ui_theme'
+    end
     resources :snippets
     resources :tags
     resources :translations
@@ -172,9 +200,14 @@ Orbit::Application.routes.draw do
   match '/desktop_appstore/widgets_settings'=>'desktop_appstore#widgets_settings'
 
   match '/desktop_orbit/orbit' => 'desktop_orbit#orbit'
+  match '/desktop_orbit/eventajaxload'=> 'desktop_orbit#eventajaxload'
   match '/desktop_orbit/getevents' => 'desktop_orbit#getevents'
-   #match '/desktop_orbit/getevents' => 'desktop_publications#create_journal'
-    
+
+   #match '/desktop_orbit/eventajaxload' => 'desktop_publications#create_journal'
+  #match '/desktop_orbit/eventajaxload' => 'desktop_publications#delete_journal'
+  # match '/desktop_orbit/eventajaxload' => 'desktop_publications#update_journal'
+
+
   match '/desktop/temp_func/'=>'desktop#temp_func'
   
   match '/panel/:app_name/front_end/:app_action/:id' => 'pages#show_from_link', :constraints => lambda { |request|
@@ -197,4 +230,4 @@ Orbit::Application.routes.draw do
   
   root :to => 'pages#index'
   
-end
+end