Merge branch 'various_bugs' into nccu_master

Conflicts:
	Gemfile.lock
	app/assets/javascripts/ajax_form.js.erb
	app/assets/stylesheets/style.css.erb
	app/controllers/application_controller.rb
	app/controllers/sessions_controller.rb
	app/helpers/admin/web_link_helper.rb
	app/views/admin/attributes/_attribute_field.html.erb
	app/views/admin/designs/_form.html.erb
	app/views/admin/pages/_form.html.erb
	app/views/admin/sites/_side_bar.html.erb
	app/views/layouts/_orbit_bar.html.erb
	app/views/layouts/_side_bar.html.erb
	config/locales/en.yml
	config/locales/zh_tw.yml
	config/mongoid.yml
	vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/bulletins_controller.rb
	vendor/built_in_modules/announcement/app/controllers/panel/announcement/front_end/bulletins_controller.rb
	vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_bulletin.html.erb
	vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_filter.html.erb
	vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/index.html.erb
	vendor/built_in_modules/announcement/app/views/panel/announcement/widget/bulletins/_index.html.erb
	vendor/built_in_modules/news/app/views/panel/news/back_end/news_bulletins/_filter.html.erb
	vendor/built_in_modules/news/app/views/panel/news/back_end/news_bulletins/_filter_status.html.erb
	vendor/built_in_modules/news/app/views/panel/news/back_end/news_bulletins/_news_bulletin.html.erb
	vendor/built_in_modules/news/app/views/panel/news/back_end/news_bulletins/index.html.erb
	vendor/built_in_modules/web_resource/app/views/panel/web_resource/back_end/web_links/index.html.erb

config/application.rb

@@ -34,6 +34,10 @@ module Orbit
     config.autoload_paths += %W(#{config.root}/app/models/purchase)
     config.autoload_paths += %W(#{config.root}/app/models/user)
 
+    # Include all helpers
+    # 'helper :all' must be removed in ApplicationController
+    config.action_controller.include_all_helpers = false
+
     # Only load the plugins named here, in the order given (default is alphabetical).
     # :all can be used as a placeholder for all plugins not explicitly named.
     # config.plugins = [ :exception_notification, :ssl_requirement, :all ]
@@ -67,3 +71,5 @@ module Orbit
 end
 Orbit_Apps = []
 VALID_LOCALES = ["en", "zh_tw"]
+
+

config/initializers/devise.rb

@@ -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.

config/list.yml

@@ -3,9 +3,34 @@ forbidden_item_names:
   - panel
   - appfront
 
+#NO_MULTI_TAG = ["select","date","radio_button","checkbox","date_durnation"]
+
 markups:
-  - text_field
-  - select
+  text_field:
+    muti_lang_input_supprt: true
+    ext_support: true
+  select:
+    muti_lang_input_supprt: false
+    ext_support: false
+  date:
+    muti_lang_input_supprt: false
+    ext_support: false
+  text_area:
+    muti_lang_input_supprt: true
+    ext_support: false
+  radio_button:
+    muti_lang_input_supprt: false
+    ext_support: false
+  checkbox:
+    muti_lang_input_supprt: false
+    ext_support: false
+  # date_durnation:
+  #   muti_lang_input_supprt: false
+  #   ext_support: false
+  # address:
+  #   muti_lang_input_supprt: true
+  #   ext_support: true
+
   
 public_r_tags:
   - ad_banner
@@ -15,4 +40,27 @@ public_r_tags:
 page_part_kinds:
   - text
   - public_r_tag
-  - module_widget
+  - module_widget
+  
+widget_field:
+  - title
+  - category
+  - image
+  - date
+  - subtitle
+  - content
+  - link
+  - file
+  
+widget_field_type:
+  - title
+  - category
+  - img
+  - date
+  - text
+  - link
+  - file
+  - status
+  - tag
+  - viewcount
+  - poster

config/locales/devise.en.yml

@@ -30,6 +30,7 @@ en:
       signed_up: 'You have signed up successfully. If enabled, a confirmation was sent to your e-mail.'
       updated: 'You updated your account successfully.'
       destroyed: 'Bye! Your account was successfully cancelled. We hope to see you again soon.'
+      email_not_unique: 'Your email address has been registed'
     unlocks:
       send_instructions: 'You will receive an email with instructions about how to unlock your account in a few minutes.'
       unlocked: 'Your account was successfully unlocked. You are now signed in.'

config/locales/devise.zh_tw.yml

@@ -30,6 +30,7 @@ zh_tw:
       signed_up: '您已經成功的登錄，確認信件已送至您的 Email 信箱。'
       updated: '您已經成功的更新帳號資訊。'
       destroyed: '再會！您的帳號已被取消。有緣再會。'
+      email_not_unique: '已被註冊'
     unlocks:
       send_instructions: '您將在幾分鐘後收到一封電子郵件，內有將帳號解除鎖定的步驟說明。'
       unlocked: '您的帳號已被解鎖，現在您已成功登入。'

config/locales/en.yml

@@ -214,12 +214,40 @@ en:
     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
+  show: Show
+  submit: Submit
+  sure?: Are you sure?
+  update: Update
+  update_failed: Update failed
+  view: View
+  view_count: View count
+  yes_: "Yes"
+  addthis_tools:
+    add_to_bookmark: Add this to bookmark
+  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
+>>>>>>> various_bugs
   quantity: Quantity
   quick_edit: Quick edit
   recent_update: Recent Update
@@ -319,6 +347,7 @@ en:
   visitors_today: Today's visitors
   yes_: "Yes"
 
+<<<<<<< HEAD
   nccu:
     date: Date
     file: File
@@ -327,5 +356,233 @@ en:
     link_name: Name
     picture: Picture
     selected_file: File
+=======
+  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: GPRS
+    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
+<<<<<<< HEAD
+=======
+    user: User
+    user_new_interface: 
+      sys_basic_form: User system info
+      password: Password
+      password_confirmation: Password Confirmation
+      email: User account
+    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
+  sys:
+    not_previewable: "Preview not support"
+    limit_of_upload_file_size: "Upload file must be less than: %{best_size}"
+    preview_only_for_img: "Preview only supprt with file type:jpg,png,gif,bmp"
+    can_not_display_due_to_no_context: "Can not display due to no context for English"
+    module_page_lang_not_support: "We are sorry, this page is not available for English"
+  search:
+    not_found: "NOT FOUND"
+    domains: Google Search Domains
+    site_search: Site Search
+    sitesearch: Google Site Search
+    site_setting_help: Please Enter the search argument for Google search.
+    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

config/locales/zh_tw.yml

@@ -230,6 +230,7 @@ zh_tw:
   rejected_reason: '拒絕原因:'
   rejected_reason_empty:  "拒絕核准, 沒有參考資訊" 
   related_links: 相關連結
+  remember_me: 記住我
   role: 角色
   Roles: 角色
   ruling_site: 銳綸網站
@@ -240,10 +241,12 @@ zh_tw:
     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: 網站頁尾
@@ -335,6 +338,272 @@ zh_tw:
 
 
 
+<<<<<<< HEAD
+=======
+  errors:
+    at_least_one: 必須至少有一個值
+    
+  admin:
+    access:
+      denied:
+        app:
+          not_sub_manager: 拒絕存取因你不是此應用程式次管理員
+          not_manager: 拒絕存取因你不是此應用程式管理員
+          not_authed_user: 拒絕存取因你不是此應用程式授權使用者
+        not_admin: 拒絕存取因你不是此應用程式次管理員
+        object: 拒絕存取因你不是網站管理者
+    action: 操作
+    ad_banner: 廣告輪播
+    orbit_gallery: 活動花絮
+    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: 網站管理者
+    all_articles: 列表
+    always_display_title: 永遠顯示於標題列
+    announcement: 公告管理
+    asset: 資產
+    assets:
+        file: 檔案
+        album: 相簿
+        video: 影片
+        book: 書籍
+    attributes: 屬性
+    author: 作者
+    calendar: 行事曆
+    cant_delete_self: 您不可以刪除自己。
+    cant_revoke_self_admin: 您不可以撤銷自己的管理身份。
+    category: 類別
+    choose_file: 請選擇一個文件...
+    class: 階級
+    content: 內容
+    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:  版型管理
+    disable_language: 禁用語言
+    edit: 編輯
+    editing_home: 編輯首頁
+    editing_layout: 編輯樣板
+    editing_link: 編輯連結
+    editing_page: 編輯頁面
+    editing_snippet: 編輯片段
+    editing_info: 編輯用戶資料
+    editing_role: 編輯用戶身份
+    email: Email
+    enable_language: 啟用語言
+    enabled_for: 啟用
+    file_name: 檔名
+    file_size: 檔案大小
+    file_upload: 文件上載
+    format: 格式
+    home: 首頁
+    id: ID
+    info: 資料
+    intro: 簡介
+    is_published: 被出版
+    item: 網站架構
+    key: 關鍵
+    keywords: 關鍵字
+    language: 語言
+    layout: 佈局
+    layout_name: 佈局名字
+    link: 連結管理
+    links: 網路資源
+    list_assets: 資產列表
+    list_designs: 設計列表
+    list_items: 項目列表
+    list_puchases: 購買清單
+    list_snippets: 斷片列表
+    list_users: 使用列表
+    list_infos: 用戶資料列表
+    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: 多種語言
+    my_avatar: 我的頭像
+    no_home_page: 您沒有首頁
+    no_layout: 您沒有佈局
+    name: 名稱
+    new_admin:
+      side_bar: 
+        all_user: 所有使用者
+        add_user: 新增使用者
+        user_roles: 角色
+        user_info: 使用者資訊
+      user: 會員
+      users:
+        all_plugin_summary: 全部
+        profile: 基本資料
+        roles:
+          staff: 職員資料
+          student: 學生資料
+          teacher: 教師資料
+      action:
+        add: 新增
+        edit: 編輯
+        delete: 刪除
+        quick_edit: 快速編輯
+        next: 下一頁
+        prev: 上一頁
+      attributes:
+        roles: 角色
+        name: 名稱
+        publications: 出版數
+        courses: 開課數
+        followers: 被關注數
+      show_mode:
+        index: 清單
+        summary: 摘要
+        thumbnail: 縮圖
+      table_header:
+        status: 狀態
+        category: 分類
+        tags: 標籤
+        clear_filter: 重置
+    new_asset: 新增資產
+    new_component: 新增元件
+    new_design: 新設計
+    new_home: 新增首頁
+    new_layout: 新增樣板
+    new_link: 新增連結
+    new_page: 新增頁面
+    new_snippet: 新增片段
+    new_user: 新增使用
+    new_info: 新增用戶資料
+    new_role: 新增用戶身份
+    news: 新聞
+    non_multilingual: 
+    object_auth:
+      list_title_of_users: 授權清單-%{auth_title}
+      update_done: 更新完成，結果顯示於清單
+      update_failed: 更新失敗
+    options: 選項
+    orig_upload_file: 原上傳檔名
+    page: 頁面管理
+    page_context:
+      edit: 編輯
+      ob_auth:
+        edit: 分類授權
+    page_part_kinds:
+      text: 文字區塊
+      public_r_tag: 系統模塊
+      module_widget: 外掛模塊
+    position: 位置
+    published?: 發布?
+    purchase: 購買
+    role: 身份
+    roles: 身份
+    site_description: 網站描述
+    site_footer: 網站頁尾
+    site_settings: 基本設定
+    site_sub_menu: 網站次選單
+    site_title: 網站標題
+    setup_member: 成員設置
+    setup_translations: 語系設定
+    setup_designs: 版型設定
+    site: 網站
+    site_setting: 網站設定
+    super_pages: 可編頁面
+    structure: 網站結構
+    tags: 標籤
+    title: 標題
+    translation: 翻譯
+    type: 類型
+    up_to_date: 最新版本
+    update_error_link: 更新鏈接時出現錯誤。
+    update_error_page: 更新頁面時出現錯誤。
+    update_success_content: 內容已成功更新。
+    update_success_home: 首頁已成功更新。
+    update_success_layout: 樣板已成功更新。
+    update_success_link: 連結已成功更新。
+    update_success_page: 頁面已成功更新。
+    update_success_snippet: 片段已成功更新。
+    update_success_user: 用戶已成功更新
+    upload_design: 上傳設計
+    url: URL
+    user: 用戶
+    user_new_interface: 
+      sys_basic_form: 系統基本資料表
+      password: 密碼
+      password_confirmation: 確認密碼
+      email: 使用者帳號信箱
+    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: 用戶身份
+    
+  dashboard:
+    bulletin: 公告
+    news_bulletin: 新聞
+    page_context: 頁面
+    web_link: 鏈接
+  
+  panel:
+    
+    
+    
+>>>>>>> various_bugs
 # Chinese (Taiwan) translations for Ruby on Rails
 # by tsechingho (http://github.com/tsechingho)
   date:
@@ -549,6 +818,7 @@ zh_tw:
           other: "有 %{count} 個錯誤發生使得「%{model}」無法被儲存。"
         body: "以下欄位發生問題："
 
+<<<<<<< HEAD
   mongoid:
     models:
       news_bulletin: 新聞
@@ -565,3 +835,25 @@ zh_tw:
       web_link:
         title: 名稱
         url: 路徑
+=======
+  helpers:
+    select:
+      prompt: "請選擇"
+    submit:
+      create: "新增%{model}"
+      update: "更新%{model}"
+      submit: "儲存%{model}"
+  modal:
+    save_and_close: "儲存並關閉"
+    close: "關閉"
+    preview: "預覽"
+  sys:
+    not_previewable: "不支援預覽"
+    limit_of_upload_file_size: "上傳檔案大小限制: %{best_size}"
+    preview_only_for_img: "預覽僅支援：jpg,png,gif,bmp...等圖片格式"
+    can_not_display_due_to_no_context: "因為沒有中文版本，所以無法顯示"
+    module_page_lang_not_support: "很抱歉，本頁沒有開放中文版本"
+  object_disable:
+    change_to_true: "設為停用"
+    change_to_false: "重新啓用"
+>>>>>>> various_bugs

config/mongoid.yml

@@ -8,11 +8,10 @@ defaults: &defaults
 
 development:
   <<: *defaults
-  database: prototype_r4_ldap0229
-
+  database: demo_site_development
 test:
   <<: *defaults
-  database: prototype_r4_ldap0229
+  database: demo_site_test
 
 # set these environment variables on your prod server
 production:
@@ -22,5 +21,4 @@ production:
   # password: <%= ENV['MONGOID_PASSWORD'] %>
   # database: <%= ENV['MONGOID_DATABASE'] %>
   <<: *defaults
-  database: prototype_r4_ldap0229
-  slave_ok: true
+  database: demo_site_production

config/routes.rb

@@ -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
@@ -58,6 +58,8 @@ Orbit::Application.routes.draw do
       end
       member do
         post 'edit_file'  => 'designs#edit_file'
+        post 'update_file' => 'designs#update_file'
+        post 'upload_image' => 'designs#upload_image'
       end
     end
     resources :infos do
@@ -98,9 +100,11 @@ Orbit::Application.routes.draw do
     resources :page_parts do
       member do
         get 'reload_widgets'
+        get 'reload_widget_styles'
         get 'reload_r_tag_options'
       end
     end
+    resources :plugins
     resources :purchases do
       collection do
         get 'install_app'
@@ -124,14 +128,113 @@ Orbit::Application.routes.draw do
     end
     resources :tags
     resources :users
+    resources :users_new_interface do
+      member do
+        get 'temp_edit'
+      end
+    end
+
   end
   # end admin
   
   namespace :panel do
     resources :users
   end
+
+  match '/desktop/'=>'desktop#index'
+
+  # Sinatra Routes start
+
+  # 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/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
+
+  # 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
   
-  match '/panel/:app_name/front_end/:app_action/:id' => 'pages#show_from_link', :constraints => lambda { |request|
+  # 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/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 '/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 '/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 '/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 '/desktop/twitter/'=>'otheraccounts#twitter'
+  match '/desktop/forgmail/'=>'otheraccounts#gmail'
+  match '/desktop/getaccounts'=>'otheraccounts#getaccounts'
+  match '/desktop/save_account_info/'=>'otheraccounts#saveaccountinfo'
+
+  match '/desktop_appstore/appstore'=>'desktop_appstore#appstore'
+  match '/desktop_appstore/widgets'=>'desktop_appstore#widgets'
+  match '/desktop_appstore/getuserwidgets'=>'desktop_appstore#getuserwidgets'
+  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/gettimelinespan' => 'desktop_orbit#gettimelinespan'
+
+   #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")
   }