Merge branch 'new_member' of github.com:Rulingcom/orbit into new_member

Conflicts: app/helpers/attribute_fields_helper.rb app/views/admin/infos/_form.html.erb config/locales/zh_tw.yml
2012-11-16 15:42:39 +08:00
commit b4a2737407
@@ -33,6 +33,7 @@ module Orbit
    config.autoload_paths += %W(#{config.root}/app/models/meta)
    config.autoload_paths += %W(#{config.root}/app/models/purchase)
    config.autoload_paths += %W(#{config.root}/app/models/user)
+    config.autoload_paths += %W(#{config.root}/app/models/desktop)

    # Include all helpers
    # 'helper :all' must be removed in ApplicationController
@@ -21,7 +21,7 @@ Devise.setup do |config|
  # parameters are used only when authenticating and not when retrieving from
  # session. If you need permissions, you should implement that in a before filter.
  # config.authentication_keys = [ :email ]
-  config.authentication_keys = [ :nccu_ldap_uid ]
+  config.authentication_keys = [ :email ]
  

  # Tell if authentication through request.params is enabled. True by default.
@@ -1,9 +1,9 @@
 require 'resque_scheduler'
-# require 'resque_scheduler/server'
+require 'resque_scheduler/server'
 # require 'yaml'

 Resque.redis = 'localhost:6379'
-#Resque.redis.namespace = "resque:SchedulerExample"
+Resque.redis.namespace = "resque"

 # If you want to be able to dynamically change the schedule,
 # uncomment this line.  A dynamic schedule can be updated via the
@@ -4,8 +4,8 @@ defaults: &defaults
  
 development:
    <<: *defaults
-    host:  '127.0.0.1'
-    port: 8001
+    host:  '140.119.166.23'
+    port: 389
 production:
    <<: *defaults
    host:  '140.119.166.23'
@@ -1,35 +1,163 @@
-# Sample localization file for English. Add more files in this directory for other locales.
-# See http://github.com/svenfuchs/rails-i18n/tree/master/rails%2Flocale for starting points.
-
 en:
-  
+
  _locale: English
-  
-  me: Me
+
+  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
+      object: Access Denied for you don't have permission for this object
+      not_admin: Access Denied for you are not Admin
  account_settings: Account settings
+  action: Action
+  ad:
+    ab_fx: FX
+    banner_best_size: Banner Best Size
+    best_size: Best size
+    new_image: New image
+    not_showing: Not showing
+    picture_list: Picture List
+    sec_place_holder: Enter 3 if 3 sec
+    showing: Showing
+    success_destroy_ad_image: Image successfully destroyed
+    trans_unit_sec: sec
+    transition_sec: Transition time
+    update_banner: Update Banner
+    widget_info_for_ad_image_size: "Best size with: %{best_size}"
+  ad_banner: AD Banner
  add: Add
+  add_item: Add item
+  addthis_tools:
+    add_to_bookmark: Add this to bookmark
+  admin: Admin
+  all_content: All Content
+  all_file: All File
+  all_member: All Member
+  always_display_title: Always displayed in the title bar
+  app_auth:
+    list_setting_result: Authorization List
+    assigning_manager:
+      add_manager_fail: Manager successfully added
+      add_manager_ok: Adding manager failed
+    assigning_sub_manager:
+      add_sub_manager_fail: Sub-manager successfully added
+      add_sub_manager_ok: Adding sub-manager failed
+    can_not_add_this_user: This user cannot be added
+    delete_manager:
+      fail: Removal of manager failed
+      success: Manager successfully removed
+    delete_sub_manager:
+      fail: Removal of sub-manager failed
+      success: Sub-manager successfully removed
+    failed_no_user: Failed, no user
+  approval:
+    not_pass: Not pass
+    not_pass_reason: Not pass reason
+    pass: Pass
+    setting: Approval setting
+    stat: Approval status
+    user_list: Unit
+  approval_: Approval
+  asset: Asset
+  auth:
+    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
+    all_member: All Member
+    auth_by: - Authorized by %{user_display_name}
+    by_role: By Role
+    by_sub_role: By SubRole
+  author: Author
  back: Back
+  basic: Basic
  browse: Browse
  cancel: Cancel
+  cant_delete_self: You can not delete yourself.
  cant_empty_star: Cannot be empty (*)
-  create_fail: Creation failed
-  create: Create
+  cant_revoke_self_admin: You can not revoke your admin role yourself.
+  categories: Categories
+  category: Category
+  category_auth: Category Authorization
+  clear: Clear
+  content: Content
+  create:
+    error:
+      link: Error when creating link.
+      page: Error when creating page.
+    fail: Creation failed
+    success:
+      asset_category: Asset category was successfully created.
+      link: Link was successfully created.
+      page: Page was successfully created.
+      user: User was successfully created.
+  create_: Create
+  data: Data
+  dashboard:
+    bulletin: Announcement
+    news_bulletin: News
+    page_context: Page
+    web_link: Link
+  dashboard_: Dashboard
+  deadline: Deadline
+  default_css: Default CSS
  delete: Delete
+  delete_file: Delete file
+  description: Description
  desktop: Desktop
  disable: Disable
  dots: ●●●●●●
-  downloaded: Downloaded
  download: Download
+  downloaded: Downloaded
  edit: Edit
+  editing:
+    asset: Editing asset
+    design: Editing design
+    link: Editing link
+    page: Editing page
  email: Email
  enable: Enable
+  enabled_for: Enabled for
+  end: End
+  end_date: End date
+  errors:
+    at_least_one: must at least have one value
+  file: 
+    size: File size
+    type: File type
+    upload: File upload
+  file_: File
+  file_type: File Type
  forgot_password: Forgot your password?
+  frequency: Frequency
  help: Help
+  hidden: Hidden
  hide: Hide
+  hits: Hits
  homepage: Homepage
-  langs:
-    zh_tw: Traditional Chinese
-    en: English
+  horizontal: Horizontal
+  hot: Hot
+  image: Image
+  info: Information
+  intro: Introduction
+  is_published: Is published
+  item: Item
+  key: Key
+  last_modified: Last modified
+  layout: Layout
+  link: Link
+  list:
+    ad_banner: AdBanner list
+    asset: Asset list
+    info: User information list
+    link: Link list
+    purchase: Purchases list
+    role: User roles list
+    user: Users list
+  list_: List
+  list_lower: list
  lists:
    markups:
      text_field: Text Field
@@ -40,15 +168,68 @@ en:
      checkbox: Checkbox
  login: Login
  logout: Logout
-  no_: "No"
-  nothing: Nothing
-  nccu: NCCU
+  mail:
+    address: Address
+    authentication: Authentication
+    domain: Domain
+    enable_starttls_auto: Enable Start TLS Auto
+    password: Password
+    port: Port
+    setting: Mail settings
+    tls: TLS
+    user_name: User Name
+    manager: Manager
+  manager: Manager
+  me: Me
+  member: Member
+  menu_enabled_for: Menu enabled for
+  modal:
+    close: Close
+    preview: Preview
+  module: Module
+  module_authorization: Module Authorization
+  more_plus: more+
+  most_visited_page: Most Visited Page
+  multilingual: Multilingual
+  name: Name
  nccu_c:
    nccu_ldap_uid: NCCU LDAP Account
+  new:
+    asset: New asset
+    banner: New banner
+    design: New design
+    link: New link
+    page: New page
+    user: New user
+    info: New user information
+    role: New user role
+  news: News
+  no_: "No"
+  no_deadline: No deadline
+  object_auth:
+    a_object_must_have_only_one_object_auth_profile_for_each_action: ''
+    list_title_of_users: authorization list
+    new_object_auth: New authorization
  off_upcase: "OFF"
  on_upcase: "ON"
+  options: Options
  or_lower: or
+  organization: Organization
+  page: Page
+  page_part_kinds:
+    module_widget: Plug-in Module Widget
+    public_r_tag: System Widget
+    text: Text Area
+  passed: Approved
  password: Password
+# : <<<<<<< HEAD
+  pending: Pending
+  picture: Picture
+  postdate: Postdate
+  posted_by: Posted by
+  preview: Preview
+  purchase: Purchase
+# : =======
  register: Register
  remember_me: Remember me
  search_google: Search Google
@@ -74,23 +255,116 @@ en:
  member: Member
  module: Module
  most_visited_page: Most Visited Page
+# : >>>>>>> various_bugs
  quantity: Quantity
+  quick_edit: Quick edit
  recent_update: Recent Update
  referral_in_links: Referral in Links
+  register: Register
+  registered: Registered
+  rejected: Rejected
+  rejected_reason: 'Reason:'
+  rejected_reason_empty:  "Approval rejected, no referencable information" 
+  related_links: Related Links
  role: Role
+  Roles: Roles
+  ruling_site: Ruling Site
+  search:
+    domains: Google Search Domains
+    not_found: "NOT FOUND"
+    result_get: "Searched about '  %{search_word}  ' Found %{item_num} items"
+    sitesearch: Google Site Search
+    too_many: "Search about ' %{search_word} 'resulted more than %{exceed_num} items maybe try to search with more specific terms?"
+    unit_get: "Listed items created by :%{unit_name}  Found %{item_num} items"
+  search_nccu: Search NCCU
+  setup_member: Member setup
+  show: Show
+  site:
+    description: Site description
+    description_help: ''
+    footer: Site footer
+    footer_help: ''
+    info: Site information
+    keywords: Site keywords
+    keywords_help: ''
+    language: Site language
+    search: Site Search
+    search_help: Please Enter the search argument for Google search.
+    settings: Site setting
+    sub_menu: Site sub-menu
+    title: Site title
+    title_help: ''
+  site_: Site
  site_info: Site Info
-  site_name: Site Name
  sitemap: Sitemap
+  site_name: Site Name
+  start: Start
+  start_date: Start date
  statistics: Statistics
+  status: Status
+  structure: Structure
+  sub_manager: SubManager
+  subtitle: Subtitle
+  submit: Submit
+  submit_approval: Submit approval
+  submit_user_list: Submit user list
+  sure?: "Are you sure?"
+  sys:
+    can_not_display_due_to_no_context: "Can not display due to no context for English"
+    limit_of_upload_file_size: "Upload file must be less than: %{best_size}"
+    module_page_lang_not_support: "We are sorry, this page is not available for English"
+    not_previewable: "Preview not support"
+    preview_only_for_img: "Preview only supprt with file type: jpg, png, gif, bmp"
+  system_info: System information
+  tag_cloud: Tag cloud
+  tags: Tags
+  template: Template
+  template_name: Template name
+  text: Text
+  theme: Theme
+  themes: Themes
  title: Title
+  top: Top
  total_visitors: Total Visitors
  traffic: Traffic
-
-  visitors_today: Today's visitors
-  visitors_this_week: This week's visitors
+  type: Type
+  unit_name: Unit name
+  up_to_date: Up-to-date
+  update:
+    error:
+      link: Error when updating link.
+    fail: Update failed
+    success:
+      content: Content was successfully updated.
+      link: Link was successfully updated.
+      page: Page was successfully updated.
+      user: User was successfully updated.
+    success_: Successfully updated
+  update_: Update
+  update_at: Update at
+  url: URL
+  use_status: ''
+  user: User
+  version: Version
+  vertical: Vertical
+  view: View
+  view_count: View count
  visitors_this_month: This month's visitors
+  visitors_this_week: This week's visitors
  visitors_this_year: This year's visitors
+  visitors_today: Today's visitors
+  yes_: "Yes"

+# : <<<<<<< HEAD
+  nccu:
+    date: Date
+    file: File
+    file_description: Description
+    file_name: Name
+    link_name: Name
+    picture: Picture
+    selected_file: File
+# : =======
  errors:
    at_least_one: must at least have one value

@@ -141,7 +415,7 @@ en:
    attributes: Attributes
    author: Author
    calendar: Calendar
-    gprs: GPRS
+    gprs: GPS
    cant_delete_self: You can not delete yourself.
    cant_revoke_self_admin: You can not revoke your admin role yourself.
    category: Category
@@ -264,22 +538,11 @@ en:
    site_title: Site title
    super_pages: Super pages
    structure: Structure
+# : >>>>>>> various_bugs
    tags: Tags
-    title: Title
-    translation: Translation
-    type: Type
-    up_to_date: Up-to-date
-    update_error_link: Error when updating link.
-    update_error_page: Error when updating page.
-    update_success_content: Content was successfully updated.
-    update_success_home: Homepage was successfully updated.
-    update_success_layout: Layout was successfully updated.
-    update_success_link: Link was successfully updated.
-    update_success_page: Page was successfully updated.
-    update_success_snippet: Snippet was successfully updated.
-    update_success_user: User was successfully updated.
-    upload_design: Upload design
    url: URL
+# : <<<<<<< HEAD
+# : =======
    user: User
    user_new_interface: 
      sys_basic_form: User system info
@@ -330,3 +593,4 @@ en:
    result_get: "Searched about '  %{search_word}  ' Found %{item_num} items"
    too_many: "Search about ' %{search_word} 'resulted more than %{exceed_num} items maybe try to search with more specific terms?"
    unit_get: "Listed items created by :%{unit_name}  Found %{item_num} items"
+# : >>>>>>> various_bugs
@@ -1,42 +1,165 @@
 zh_tw:
-  
+
  _locale: 中文
-  
-  me: 我
+
+  access: 
+    denied: 
+      app: 
+        not_sub_manager: 拒絕存取，因你不是此應用程式次管理員
+        not_manager: 拒絕存取，因你不是此應用程式管理員
+        not_authed_user: 拒絕存取，因你不是此應用程式授權使用者
+      object: 拒絕存取，因你沒有權限
+      not_admin: 拒絕存取，因你不是此應用程式管理員
  account_settings: 帳號設定
+  action: 操作
+  ad:
+    ab_fx: 轉場效果
+    banner_best_size: 輪播圖片尺寸
+    best_size: 最佳尺寸
+    new_image: 新增輪播圖片
+    not_showing: 沒有顯示
+    picture_list: 圖片列表
+    sec_place_holder: 每張輪播圖片顯示秒數(3秒就請輸入3)
+    showing: 顯示中
+    success_destroy_ad_image: 刪除圖片成功
+    trans_unit_sec: 秒
+    transition_sec: 轉場單位時間
+    update_banner: 更新輪播
+    widget_info_for_ad_image_size: "此區塊圖片尺寸使用: %{best_size}"
+  ad_banner: 廣告輪播
  add: 新增
+  add_item: 新增項目
+  addthis_tools:
+    add_to_bookmark: 加入書籤
+  admin: 管理員
+  all_content: 所有內容
+  all_file: 所有檔案
+  all_member: 所有會員
+  always_display_title: 永遠顯示標題
+  app_auth:
+    list_setting_result: 授權列表
+    assigning_manager:
+      add_manager_fail: 新增管理員失敗
+      add_manager_ok:  新增管理員成功
+    assigning_sub_manager:
+      add_sub_manager_fail: 新增次管理員失敗
+      add_sub_manager_ok: 新增次管理員成功
+    can_not_add_this_user: 不能新增這個使用員
+    delete_manager:
+      fail: 刪除管理員失敗
+      success: 刪除管理員成功
+    delete_sub_manager:
+      fail: 刪除次管理員失敗
+      success: 刪除次管理員成功
+    failed_no_user: 失敗，不是使用者
+  approval: 
+    not_pass: 拒絕
+    not_pass_reason: 拒絕原因
+    pass: 已認可
+    setting: 審核設定
+    stat: 審核狀態
+    user_list: 使用者列表
+  approval_: 審核
+  asset: 資產
+  auth:
+    add_manager: 新增管理員
+    add_sub_manager: 新增次管理員
+    add_to_block_list: 增加到封鎖名單
+    add_to_privilege_list: 增加到特許名單
+    all_member: 所有會員
+    auth_by: -由%{user_display_name}授權
+    by_role: 用戶狀態
+    by_sub_role: 次用戶狀態
+  author: 作者
  back: 回上一步
-  browse: 選擇檔案
+  basic: 基本
+  browse: 瀏覽
  cancel: 取消
-  cant_empty_star: 不能為空 (*)
-  create: 新增
-  create_fail: 創建失敗
+  cant_delete_self: 不可以刪除自己
+  cant_empty_star: 不能為空白 (*)
+  cant_revoke_self_admin: 不可以撤銷自己的管理狀態
+  categories: 類別
+  category: 類別
+  category_auth: 類別授權
+  clear: 清除
+  content: 內容
+  create:
+    error:
+      link: 建立連結時出錯
+      page: 建立頁面時出錯
+    fail: 建立失敗
+    success:
+      asset_category: 資產類別已成功建立
+      link: 連結已成功建立
+      page: 頁面已成功建立
+      user: 使用者已成功建立
+  create_: 建立
+  data: 資料
+  dashboard:
+    bulletin: 公告
+    news_bulletin: 新聞
+    page_context: 頁面內容
+    web_link: 連結
+  dashboard_: 儀表版
+  deadline: 最後期限
+  default_css: 預設樣式表
  delete: 刪除
+  delete_file: 刪除檔案
+  description: 描述
  desktop: 桌面
-  disable: 禁用
-  dots: …
-  downloaded: 已下載
+  disable: 關閉
+  dots: ●●●●●●
  download: 下載
+  downloaded: 已下載
  edit: 編輯
+  editing:
+    asset: 編輯資產
+    design: 編輯設計
+    link: 編輯連結
+    page: 編輯頁面
  email: 電子郵件
-  enable: 啟用
+  enable: 開啟
+  enabled_for: 啟用
+  end: 結束
+  end_date: 結束日期
+  errors:
+    at_least_one: 至少擁有一個值
+  file: 
+    size: 檔案大小
+    type: 檔案類型
+    upload: 上傳檔案
+  file_: 檔案
+  file_type: 檔案類型
  forgot_password: 忘記密碼?
-  help: 協助
+  frequency: 頻率
+  help: 幫助
+  hidden: 隱藏的
  hide: 隱藏
+  hits: 點擊次數
  homepage: 首頁
-  address_modal:
-    default_title: 地址
-    street_address: 街道地址
-    city: 城市
-    county: 縣市
-    zip: 郵遞區號
-    country: 國家/地區
-  langs:
-    zh_tw: 中文
-    en: 英文
+  horizontal: 水平的
+  hot: 熱門
+  image: 圖片
+  info: 信息
+  intro: 簡介
+  is_published: 已發佈
+  item: 項目
+  key: 索引
+  last_modified: 最後修改者
+  layout: 範本
+  link: 連結
+  list:
+    ad_banner: 廣告輪播列表
+    asset: 資產列表
+    info: 使用者資訊列表
+    link: 連結列表
+    purchase: 已購買項目列表
+    role: 使用者角色列表
+    user: 使用者列表
+  list_: 列表
+  list_lower: 列表
  lists:
    markups:
-      address: 地址欄位
      text_field: 文字輸入框
      select: 下拉選單
      date: 日期
@@ -45,58 +168,186 @@ zh_tw:
      checkbox: 多選
  login: 登入
  logout: 登出
-  nccu: 政大
+  mail:
+    address: 電子郵件地址
+    authentication: 電子郵件認證
+    domain: 電子郵件網域名稱
+    enable_starttls_auto: 啟用安全通訊
+    password: 密碼
+    port: 電子郵件傳輸埠
+    setting: 電子郵件設定
+    tls: 電子郵件TLS
+    user_name: 電子郵件帳號
+    manager: 管理者
+  manager: 管理者
+  me: 我
+  member: 會員
+  menu_enabled_for: 選單啟用
+  modal:
+    close: 關閉
+    preview: 預覽
+  module: 模組
+  module_authorization: 模組授權
+  more_plus: 更多+
+  most_visited_page: 最多瀏覽頁面
+  multilingual: 多語系
+  name: 名稱
  nccu_c:
-    nccu_ldap_uid: iNCCU帳號
-  no_: "No"
-  nothing: 無
-  off_upcase: "OFF"
-  on_upcase: "ON"
+    nccu_ldap_uid: 政治大學LDAP帳號
+  new:
+    asset: 新增資產
+    banner: 新增橫幅
+    design: 新增設計
+    link: 新增連結
+    page: 新增頁面
+    user: 新增使用者
+    info: 新增使用者資訊
+    role: 新增使用者角色
+  news: 新聞
+  no_: "不是"
+  no_deadline: 沒有期限
+  object_auth:
+    a_object_must_have_only_one_object_auth_profile_for_each_action: ''
+    list_title_of_users: 授權列表
+    new_object_auth: 新增授權
+  off_upcase: "開啟"
+  on_upcase: "關閉"
+  options: 選項
  or_lower: 或
+  organization: 組織
+  page: 頁面
+  page_part_kinds:
+    module_widget: 外掛模塊
+    public_r_tag: 系統模塊
+    text: 文字區域
+  passed: 通過審核
  password: 密碼
+  pending: 待審核
+  picture: 圖片
+  postdate: 張貼日期
+  posted_by: 張貼人
+  preview: 預覽
+  purchase: 購買
+  quantity: 數量
+  quick_edit: 快速編輯
+  recent_update: 近期更新
+  referral_in_links: 參考連結
  register: 註冊
+  registered: 已註冊
+  rejected: 拒絕
+  rejected_reason: '拒絕原因:'
+  rejected_reason_empty:  "拒絕核准, 沒有參考資訊" 
+  related_links: 相關連結
  remember_me: 記住我
+  role: 角色
+  Roles: 角色
+  ruling_site: 銳綸網站
+  search:
+    domains: Google Search Domains
+    not_found: "沒有搜尋結果"
+    result_get: "搜尋標題有關 '  %{search_word}  ' 共搜尋到%{item_num}筆資料"
+    sitesearch: 全站搜尋
+    too_many: "搜尋有關 ' %{search_word} '尋找到超過 %{exceed_num} 筆資料，請嘗試加入更多關鍵字縮小搜尋範圍，以作更精確的搜尋?"
+    unit_get: "列出由 :%{unit_name}發佈的資料，共有%{item_num}筆"
  search_google: 搜尋Google
+  search_nccu: 搜尋政治大學
+  setup_member: 會員設定
  show: 顯示
+  site:
+    default_image: 預設圖像
+    description: 網站描述
+    description_help: ''
+    footer: 網站頁尾
+    footer_help: ''
+    info: 網站資訊
+    keywords: 搜尋關鍵字
+    keywords_help: ''
+    language: 網站語言
+    search: 網站搜尋
+    search_help: 請輸入送交Google搜尋的參數
+    settings: 基本設定
+    sub_menu: 次選單
+    title: 網站標題
+    title_help: ''
+  site_: 網站
+  site_info: 網站資訊
+  sitemap: 網站地圖
+  site_name: 網站名稱
+  start: 開始
+  start_date: 開始日期
+  statistics: 統計資訊
+  status: 狀態
+  structure: 結構
+  sub_manager: 次管理員
+  subtitle: 副標題
  submit: 送出
-  sure?: 您肯定嗎?
-  update: 更新
-  update_failed: 更新失敗
+  submit_approval: 送出已核准
+  submit_user_list: 送出使用者列表
+  sure?: "您確定嗎?"
+  sys:
+    can_not_display_due_to_no_context: "因為沒有中文版本，所以無法顯示"
+    limit_of_upload_file_size: "上傳檔案大小限制: %{best_size}"
+    module_page_lang_not_support: "很抱歉，此頁面沒有開放中文版本"
+    not_previewable: "不支援預覽"
+    preview_only_for_img: "預覽僅支援：jpg,png,gif,bmp等圖片格式"
+  system_info: 系統資訊
+  tag_cloud: 標籤雲
+  tags: 標籤
+  template: 樣版
+  template_name: 樣版名稱
+  text: 內文
+  theme: 主題
+  themes: 主題
+  title: 標題
+  top: 置頂
+  total_visitors: 總計造訪人次
+  traffic: 流量
+  type: 類型
+  unit_name: 單位名稱
+  up_to_date: 最新版本
+  update:
+    error:
+      link: 更新連接時出錯
+    fail: 更新消息
+    success:
+      content: 內容已更新成功
+      link: 連結已更新成功
+      page: 頁面已更新成功
+      user: 使用者已更新成功
+    success_: 更新成功
+  update_: 更新
+  update_at: 最後更新時間
+  url: 網址
+  use_status: ''
+  user: 使用者
+  version: 版本
+  vertical: 垂直的
  view: 檢視
  view_count: 查看次數
-  yes_: "Yes"
+  visitors_this_month: 本月造訪人次
+  visitors_this_week: 本星期造訪人次
+  visitors_this_year: 今年造訪人次
+  visitors_today: 今日造訪人次
+  yes_: "是"

-  addthis_tools:
-    add_to_bookmark: 加入書籤
-  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: 網站名稱
-  sitemap: 網站地圖
-  statistics: 統計
-  title: 標題
-  total_visitors: 造訪次數
-  traffic: 流量
+  nccu:
+    date: 起迄日期
+    file: 附加檔案
+    file_description: 檔案描述
+    file_name: 檔案名稱
+    link_name: 連結名稱
+    picture: 刊頭圖片
+    selected_file: 選擇檔案
+    tags: 頁籤
+    url: 連結位置

-  visitors_today: 今日造訪
-  visitors_this_week: 本星期造訪
-  visitors_this_month: 本月造訪
-  visitors_this_year: 今年造訪

+
+
+
+
+# : <<<<<<< HEAD
+# : =======
  errors:
    at_least_one: 必須至少有一個值
  admin:
@@ -108,7 +359,7 @@ zh_tw:
      item_name: 資料表名稱
      name: 名稱
      options: 選項
-      :cross_lang: 跨語言輸入
+      multilingual: 多語言輸入
      add_more: 使用者可自行延伸欄位
      add: 新增
      placeholder: 輸入協助
@@ -122,12 +373,6 @@ zh_tw:
        range: 本欄為時間區段
        format: 格式
        tw_claendar: 民國
-        minguo_calendar: 
-          after: 民國
-          before: 民前
-          first_year: 民國元年
-          year: 年
-          month: 月
        west_claendar: 西元
    access:
      denied:
@@ -388,6 +633,7 @@ zh_tw:
    
    
    
+# : >>>>>>> various_bugs
 # Chinese (Taiwan) translations for Ruby on Rails
 # by tsechingho (http://github.com/tsechingho)
  date:
@@ -602,6 +848,24 @@ zh_tw:
          other: "有 %{count} 個錯誤發生使得「%{model}」無法被儲存。"
        body: "以下欄位發生問題："

+# : <<<<<<< HEAD
+  mongoid:
+    models:
+      news_bulletin: 新聞
+      bulletin: 公告
+      ad_banner: 廣告輪播
+      web_link: 連結管理
+    attributes:
+      news_bulletin:
+        title: 新聞標題
+      bulletin:
+        title: 公告標題
+      ad_banner:
+        title: 標題
+      web_link:
+        title: 名稱
+        url: 路徑
+# : =======
  helpers:
    select:
      prompt: "請選擇"
@@ -621,4 +885,5 @@ zh_tw:
    module_page_lang_not_support: "很抱歉，本頁沒有開放中文版本"
  object_disable:
    change_to_true: "設為停用"
-    change_to_false: "重新啓用"
+    change_to_false: "重新啓用"
+# : >>>>>>> various_bugs
@@ -3,7 +3,7 @@ defaults: &defaults
  port: 37017
  # slaves:
  #   - host: slave1.local
-  #     port: 27018
+  port: 27017
  #   - host: slave2.local
  #     port: 27019

@@ -1,5 +1,5 @@
 #developer pls change here
-rails_root  = "/home/nccu/NCCU/"  #keep this blank when development
+rails_root  = "/home/nccu/stage/NCCU"  #keep this blank when development

 development_uid = 'kaito' #when dev
 development_gid = 'staff' #when dev
@@ -16,7 +16,7 @@ num_workers.times do |num|

    w.dir        = rails_root
    w.name    = "resque-#{num}"
-    w.group   = 'resque'
+    w.group   = 'resque-stage'

    w.interval = 30.seconds
    w.env       = {"QUEUE"=>"critical,high,low", "RAILS_ENV"=>rails_env}
@@ -25,7 +25,7 @@ num_workers.times do |num|
    w.uid = (rails_env == 'production' )? "root" : development_uid
    w.gid = (rails_env == 'production' )? "root" : development_gid
  
-     w.log = (rails_env == 'production' )? "/var/log/#{w.name}.log":"#{rails_root}/log/#{w.name}.log"
+     w.log = (rails_env == 'production' )? "/var/log/#{w.name}-stage.log":"#{rails_root}/log/#{w.name}.log"

    # restart if memory gets too high
    w.transition(:up, :restart) do |on|
@@ -1,6 +1,6 @@
 Orbit::Application.routes.draw do

-  devise_for :users,:controllers => {:sessions => 'sessions'}
+  devise_for :users
  mount Resque::Server, :at => "/admin/resque"
  
  # routes for sinatra app
@@ -126,9 +126,7 @@ Orbit::Application.routes.draw do
      get 'system_info'
      get 'ui_theme'
    end
-    resources :snippets
    resources :tags
-    resources :translations
    resources :users
    resources :users_new_interface do
      member do
@@ -143,7 +141,17 @@ Orbit::Application.routes.draw do
    resources :users
  end

-  match '/desktop/'=>'desktop#index'
+  resources :desktop_widgets do
+    collection do
+        get 'upload'
+        get 'delete'
+        post 'upload'
+    end
+  end
+
+namespace :desktop do
+  
+  match "/"=>"desktop#index"

  # Sinatra Routes start

@@ -178,46 +186,50 @@ Orbit::Application.routes.draw do
  
  # Sinatra Routes end
  
-  match '/desktop/desktop'=>'desktop#desktop'
-  match '/desktop/app_manager'=>'desktop#app_manager'
-  match '/desktop/sections'=>'desktop#sections'
-  match '/desktop/settings'=>'desktop#settings'
-  match '/desktop/get_desktop_settings/'=>'desktop#get_desktop_settings'
-  match '/desktop/save_desktop_settings/'=>'desktop#save_desktop_settings'
-  match '/desktop/getgroups/'=>'desktop#getgroups'
-  match '/desktop/getsectionlist/'=>'desktop#getsectionlist'
-  match '/desktop/settingthemes/'=>'desktop#settingthemes'
-  match '/desktop/settingsections/'=>'desktop#settingsections'
-  match '/desktop/getapplist/'=>'desktop#getapplist'
-  match '/desktop/newpositions/'=>'desktop#newpositions'
-  match '/desktop/settingconnection/'=>'desktop#settingconnection'
+  match '/desktop'=>'desktop#desktop'
+  match '/app_manager'=>'desktop#app_manager'
+  match '/sections'=>'desktop#sections'
+  match '/settings'=>'desktop#settings'
+  match '/get_desktop_settings/'=>'desktop#get_desktop_settings'
+  match '/save_desktop_settings/'=>'desktop#save_desktop_settings'
+  match '/getgroups/'=>'desktop#getgroups'
+  match '/getsectionlist/'=>'desktop#getsectionlist'
+  match '/settingthemes/'=>'desktop#settingthemes'
+  match '/settingsections/'=>'desktop#settingsections'
+  match '/getapplist/'=>'desktop#getapplist'
+  match '/newpositions/'=>'desktop#newpositions'
+  match '/settingconnection/'=>'desktop#settingconnection'
+  match '/widget_layout' => 'desktop#widget_layout'


-  match '/desktop/journal_p/'=>'desktop_publications#journal_p'
-  match '/desktop/journal_p_list/'=>'desktop_publications#journal_p_list'
-  match '/desktop/journal_p_add/'=>'desktop_publications#journal_p_add'
-  match '/desktop_publications/getjournals' => 'desktop_publications#getjournals'
-  match '/desktop/books' => 'desktop_publications#books'
-  match '/desktop/books_list/'=>'desktop_publications#books_list'
-  match '/desktop/books_add/'=>'desktop_publications#books_add'
+  match '/journal_p/'=>'desktop_publications#journal_p'
+  match '/journal_p_list/'=>'desktop_publications#journal_p_list'
+  match '/journal_p_add/'=>'desktop_publications#journal_p_add'
+  match '/books' => 'desktop_publications#books'
+  match '/books_list/'=>'desktop_publications#books_list'
+  match '/books_add/'=>'desktop_publications#books_add'

-  match '/desktop/seminar_p' => 'desktop_publications#seminar_p'
-  match '/desktop/seminar_p_list/'=>'desktop_publications#seminar_p_list'
-  match '/desktop/seminar_p_add/'=>'desktop_publications#seminar_p_add'
+  match '/seminar_p' => 'desktop_publications#seminar_p'
+  match '/seminar_p_list/'=>'desktop_publications#seminar_p_list'
+  match '/seminar_p_add/'=>'desktop_publications#seminar_p_add'

-  match '/desktop/research_d' => 'desktop_research#research_d'
-  match '/desktop/research_d_list/' => 'desktop_research#research_d_list'
-  match '/desktop/research_d_add' => 'desktop_research#research_d_add'
+  match '/research_d' => 'desktop_research#research_d'
+  match '/research_d_list/' => 'desktop_research#research_d_list'
+  match '/research_d_add' => 'desktop_research#research_d_add'

-  match '/desktop/research_p' => 'desktop_research#research_p'
-  match '/desktop/research_p_list/' => 'desktop_research#research_p_list'
-  match '/desktop/research_p_add' => 'desktop_research#research_p_add'
+  match '/research_p' => 'desktop_research#research_p'
+  match '/research_p_list/' => 'desktop_research#research_p_list'
+  match '/research_p_add' => 'desktop_research#research_p_add'


-  match '/desktop/twitter/'=>'otheraccounts#twitter'
-  match '/desktop/forgmail/'=>'otheraccounts#gmail'
-  match '/desktop/getaccounts'=>'otheraccounts#getaccounts'
-  match '/desktop/save_account_info/'=>'otheraccounts#saveaccountinfo'
+
+  match '/temp_func/'=>'desktop#temp_func'
+end
+
+  match '/twitter/'=>'otheraccounts#twitter'
+  match '/forgmail/'=>'otheraccounts#gmail'
+  match '/getaccounts'=>'otheraccounts#getaccounts'
+  match '/save_account_info/'=>'otheraccounts#saveaccountinfo'

  match '/desktop_appstore/appstore'=>'desktop_appstore#appstore'
  match '/desktop_appstore/widgets'=>'desktop_appstore#widgets'
@@ -228,13 +240,14 @@ Orbit::Application.routes.draw do

  match '/desktop_orbit/eventajaxload'=> 'desktop_orbit#eventajaxload'
  match '/desktop_orbit/gettimelinespan' => 'desktop_orbit#gettimelinespan'
+  match '/desktop_publications/getjournals' => 'desktop_publications#getjournals'

   #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(/:controller_action)' => 'pages#show_from_link', :constraints => lambda { |request|
    !request.query_string.include?("inner=true")
@@ -1,7 +1,7 @@
 production:
  solr:
    hostname: localhost
-    port: 8983
+    port: 8982
    log_level: WARNING

 development:
@@ -14,4 +14,4 @@ test:
  solr:
    hostname: localhost
    port: 8981
-    log_level: WARNING
+    log_level: WARNING