Merge commit '6b248a949b44b6e4dc908f29f4f08c3a821210cd' into sidebar_config

Conflicts:
	app/models/user/attribute_value.rb
	app/views/layouts/_side_bar_content.html.erb
	vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/bulletin_categorys_controller.rb

config/initializers/middle_site_connection.rb

@@ -1,21 +0,0 @@
-#encoding: utf-8
-require 'mysql2'
-
-$mid_site_connection
-
-module  MiddleSiteConnection
-
-  @mid_host = { 
-    :host => 'mruling.nccu.edu.tw',  #mruling.nccu.edu.tw or 127.0.0.1
-    :port => 3306, #3306 or 8005
-    :username => "rulingcom",
-    :password => "5w3iJQ9OJQMGhJibKP6YQje8",
-    :database => "RSS23_NCCU_MIDDLE",
-    :encoding => "UTF8"
-  }
-
-  def self.establish
-    $mid_site_connection = Mysql2::Client.new(@mid_host)
-  end
-
-end

config/locales/en.yml

@@ -368,176 +368,176 @@ en:
   errors:
     at_least_one: must at least have one value
 
-  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
-    orbit_gallery: Gallery
-    calendar: Calendar
-    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:
-        file: File
-        album: Album
-        video: Video
-        book: Book
-    attributes: Attributes
-    author: Author
-    calendar: Calendar
-    gprs: GPS
-    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
-    create_error_link: Error when creating link.
-    create_error_page: Error when creating page.
-    create_success_home: Homepage was successfully created.
-    create_success_layout: Layout was successfully created.
-    create_success_link: Link was successfully created.
-    create_success_page: Page was successfully created.
-    create_success_snippet: Snippet was successfully created.
-    create_success_user: User was successfully created.
-    data: Data
-    dashboard: Dashboard
-    delete_language: Delete language
-    description: Description
-    design: Template
-    disable_language: Disable language
-    editing_home: Editing homepage
-    editing_layout: Editing layout
-    editing_link: Editing link
-    editing_page: Editing page
-    editing_snippet: Editing snippet
-    editing_info: Editing user information
-    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
-    info: Information
-    intro: Introduction
-    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
-    list_puchases: Purchases list
-    list_snippets: Snippets list
-    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
-    my_avatar: My Avatar
-    no_home_page: You don't have a homepage
-    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
-    new_home: New homepage
-    new_layout: New layout
-    new_link: New link
-    new_page: New page
-    new_snippet: New snippet
-    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
-    registered: Registered
-    role: Role
-    roles: Roles
-    setup_member: Member setup
-    setup_translations: Translations setup
-    setup_designs: Designs setup
-    site: Site
-    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
+  # 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
+  #   orbit_gallery: Gallery
+  #   calendar: Calendar
+  #   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:
+  #       file: File
+  #       album: Album
+  #       video: Video
+  #       book: Book
+  #   attributes: Attributes
+  #   author: Author
+  #   calendar: Calendar
+  #   gprs: GPS
+  #   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
+  #   create_error_link: Error when creating link.
+  #   create_error_page: Error when creating page.
+  #   create_success_home: Homepage was successfully created.
+  #   create_success_layout: Layout was successfully created.
+  #   create_success_link: Link was successfully created.
+  #   create_success_page: Page was successfully created.
+  #   create_success_snippet: Snippet was successfully created.
+  #   create_success_user: User was successfully created.
+  #   data: Data
+  #   dashboard: Dashboard
+  #   delete_language: Delete language
+  #   description: Description
+  #   design: Template
+  #   disable_language: Disable language
+  #   editing_home: Editing homepage
+  #   editing_layout: Editing layout
+  #   editing_link: Editing link
+  #   editing_page: Editing page
+  #   editing_snippet: Editing snippet
+  #   editing_info: Editing user information
+  #   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
+  #   info: Information
+  #   intro: Introduction
+  #   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
+  #   list_puchases: Purchases list
+  #   list_snippets: Snippets list
+  #   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
+  #   my_avatar: My Avatar
+  #   no_home_page: You don't have a homepage
+  #   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
+  #   new_home: New homepage
+  #   new_layout: New layout
+  #   new_link: New link
+  #   new_page: New page
+  #   new_snippet: New snippet
+  #   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
+  #   registered: Registered
+  #   role: Role
+  #   roles: Roles
+  #   setup_member: Member setup
+  #   setup_translations: Translations setup
+  #   setup_designs: Designs setup
+  #   site: Site
+  #   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
 # : >>>>>>> various_bugs
     tags: Tags
     url: URL

config/locales/zh_tw.yml

@@ -158,8 +158,19 @@ zh_tw:
     user: 使用者列表
   list_: 列表
   list_lower: 列表
+  address_modal:
+    default_title: 地址
+    street_address: 街道地址
+    city: 城市
+    county: 縣市
+    zip: 郵遞區號
+    country: 國家/地區
+  langs:
+    zh_tw: 中文
+    en: 英文
   lists:
     markups:
+      address: 地址欄位
       text_field: 文字輸入框
       select: 下拉選單
       date: 日期
@@ -359,7 +370,7 @@ zh_tw:
       item_name: 資料表名稱
       name: 名稱
       options: 選項
-      multilingual: 多語言輸入
+      :cross_lang: 跨語言輸入
       add_more: 使用者可自行延伸欄位
       add: 新增
       placeholder: 輸入協助
@@ -373,6 +384,12 @@ zh_tw:
         range: 本欄為時間區段
         format: 格式
         tw_claendar: 民國
+        minguo_calendar: 
+          after: 民國
+          before: 民前
+          first_year: 民國元年
+          year: 年
+          month: 月
         west_claendar: 西元
     access:
       denied:

config/routes.rb

@@ -1,8 +1,7 @@
 Orbit::Application.routes.draw do
-
   devise_for :users
   mount Resque::Server, :at => "/admin/resque"
-  
+
   # routes for sinatra app
   match '/site/set_registered', :to => CentralServerExchangeApp  
   match '/site/public_key', :to => CentralServerExchangeApp 
@@ -28,7 +27,7 @@ Orbit::Application.routes.draw do
       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
@@ -43,11 +42,11 @@ Orbit::Application.routes.draw do
     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
-          match 'new_ad_image' => 'ad_images#create',:as => :create_ad_image,:via => :post
-        end
-        resources :ad_images ,:except => [:show,:index]
+      collection do
+        match 'new_ad_image' => 'ad_images#new',:as => :new_ad_image,:via => :get
+        match 'new_ad_image' => 'ad_images#create',:as => :create_ad_image,:via => :post
+      end
+      resources :ad_images ,:except => [:show,:index]
     end
     resources :dashboards
     resources :designs do
@@ -87,7 +86,7 @@ Orbit::Application.routes.draw do
           match 'remove/:type/:target_id' ,:action=> 'remove',:via => "delete",:as =>:remove
         end
       end
-      
+
       member do
         match 'assign_manager' ,:action=> 'assign_manager',:via => "post",:as =>:assign_manager
         match 'assign_sub_manager' ,:action=> 'assign_sub_manager',:via => "post",:as =>:assign_sub_manager
@@ -133,105 +132,79 @@ Orbit::Application.routes.draw do
         get 'temp_edit'
       end
     end
+	
+    resources :member_selects do
+	  match 'member_select_search' => "member_selects#member_select_search" ,:as => :member_select_search,:via => "post"
+	  match 'member_select_add' => "member_selects#member_select_add" ,:as => :member_select_add,:via => "post"
+	end
 
   end
   # end admin
-  
+
   namespace :panel do
     resources :users
   end
 
   resources :desktop_widgets do
     collection do
-        get 'upload'
-        get 'delete'
-        post 'upload'
+      get 'upload'
+      get 'delete'
+      post 'upload'
     end
   end
+ match "desktop" =>  "desktop#index"
+  namespace :desktop do
+   match "desktop" => "desktop#desktop"
+    match '/journal_pages/get_journals_json' => 'journal_pages#get_journals_json'
+    match '/co_authors/get_co_authors_json' => 'co_authors#get_co_authors_json'
+    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 '/themes/'=>'desktop#themes'
+    match '/sections/'=>'desktop#sections'
+    match '/getapplist/'=>'desktop#getapplist'
+    match '/newpositions/'=>'desktop#newpositions'
+    match '/connections/'=>'desktop#connections'
+    match '/widget_layout' => 'desktop#widget_layout'
+    match '/temp_func/'=>'desktop#temp_func'
 
-namespace :desktop do
-  
-  match "/"=>"desktop#index"
+    resources :journal_pages
+    resources :co_authors
+  end
 
-  # Sinatra Routes start
+  # namespace :desktop_publications do
+  match 'desktop_publications/journal_p'=>'desktop_publications#journal_p'
+  match 'desktop_publications/books' => 'desktop_publications#books'
+  match 'desktop_publications/books_list'=>'desktop_publications#books_list'
+  match 'desktop_publications/books_add'=>'desktop_publications#books_add'
 
-  # match '/desktop/desktop', :to => Desktopapp::DesktopApp 
-  # match '/desktop/app_manager', :to => Desktopapp::DesktopApp
-  # match '/desktop/sections', :to => Desktopapp::DesktopApp
-  # match '/desktop/settings', :to => Desktopapp::DesktopApp
-  # match '/desktop/get_desktop_settings/', :to => Desktopapp::DesktopApp
-  # match '/desktop/save_desktop_settings/', :to => Desktopapp::DesktopApp
-  # match '/desktop/getgroups/', :to => Desktopapp::DesktopApp
-  # match '/desktop/getsectionlist/', :to => Desktopapp::DesktopApp
-  # match '/desktop/settingthemes/', :to => Desktopapp::DesktopApp
-  # match '/desktop/settingsections/', :to => Desktopapp::DesktopApp
-  # match '/desktop/getapplist/', :to => Desktopapp::DesktopApp
-  # match '/desktop/newpositions/', :to => Desktopapp::DesktopApp
-  # match '/desktop/settingconnection/', :to => Desktopapp::DesktopApp
+  match 'desktop_publications/seminar_p' => 'desktop_publications#seminar_p'
+  match 'desktop_publications/seminar_p_list/'=>'desktop_publications#seminar_p_list'
+  match 'desktop_publications/seminar_p_add/'=>'desktop_publications#seminar_p_add'
+  # end
 
-  # match '/desktop/journal_p/', :to => Desktopapp::DesktopAppPublications
-  # match '/desktop/journal_p_list/', :to => Desktopapp::DesktopAppPublications
-  # match '/desktop/journal_p_add/', :to => Desktopapp::DesktopAppPublications
-  # match '/desktop_publications/getjournals', :to => Desktopapp::DesktopAppPublications
+  # namespace :desktop_research do
+  match 'desktop_research/research_d' => 'desktop_research#research_d'
+  match 'desktop_research/research_d_list/' => 'desktop_research#research_d_list'
+  match 'desktop_research/research_d_add' => 'desktop_research#research_d_add'
 
-  # match '/desktop/twitter/', :to => Desktopapp::Otheraccounts
-  # match '/desktop/forgmail/', :to => Desktopapp::Otheraccounts
-  # match '/desktop/getaccounts', :to => Desktopapp::Otheraccounts
-  # match '/desktop/save_account_info/', :to => Desktopapp::Otheraccounts
-
-  # match '/desktop_appstore/appstore', :to => Desktopapp::DesktopAppAppstore
-  # match '/desktop_appstore/widgets', :to => Desktopapp::DesktopAppAppstore
-  # match '/desktop_appstore/getuserwidgets', :to => Desktopapp::DesktopAppAppstore
-  # match '/desktop_appstore/widgets_settings', :to => Desktopapp::DesktopAppAppstore
-  
-  # Sinatra Routes end
-  
-  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 '/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 '/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 '/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 '/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 '/temp_func/'=>'desktop#temp_func'
-end
+  match 'desktop_research/research_p' => 'desktop_research#research_p'
+  match 'desktop_research/research_p_list/' => 'desktop_research#research_p_list'
+  match 'desktop_research/research_p_add' => 'desktop_research#research_p_add'
+  # end
 
   match '/twitter/'=>'otheraccounts#twitter'
   match '/forgmail/'=>'otheraccounts#gmail'
-  match '/getaccounts'=>'otheraccounts#getaccounts'
+  match '/otheraccounts/getaccounts'=>'otheraccounts#getaccounts'
   match '/save_account_info/'=>'otheraccounts#saveaccountinfo'
 
   match '/desktop_appstore/appstore'=>'desktop_appstore#appstore'
+  match '/desktop_appstore/onlinestore'=>'desktop_appstore#onlinestore'
   match '/desktop_appstore/widgets'=>'desktop_appstore#widgets'
   match '/desktop_appstore/getuserwidgets'=>'desktop_appstore#getuserwidgets'
   match '/desktop_appstore/widgets_settings'=>'desktop_appstore#widgets_settings'
@@ -240,36 +213,36 @@ end
 
   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#create_journal'
   #match '/desktop_orbit/eventajaxload' => 'desktop_publications#delete_journal'
   # match '/desktop_orbit/eventajaxload' => 'desktop_publications#update_journal'
 
 
-  
-  
+
+
   match '/panel/:app_name/front_end/:app_action/:id(/:controller_action)' => 'pages#show_from_link', :constraints => lambda { |request|
     !request.query_string.include?("inner=true")
   }
-  
+
   match '/panel/:app_name/front_end/:app_action' => 'pages#index_from_link', :constraints => lambda { |request|
     !request.query_string.include?("inner=true")
   }
 
   match '/share/:model/:id' => 'application#render_share'
-  
+
   # routes for gridfs files
   match "/gridfs/*path" => "gridfs#serve" 
 
   # match "/images/*path" => "gridfs#serve_images"
   # match "/admin/pages/images/*path" => "gridfs#serve_images"
-  
+
   # routes for pages to generate
   match '*page_name' => 'pages#show', :as => :page, :constraints => lambda{|request|
     !request.path.starts_with?("/panel")
   }
-  
+
   root :to => 'pages#index'
-  
+
 end