Merge branch 'master' into various_bugs

Conflicts:
	config/locales/en.yml
	config/locales/zh_tw.yml
	vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_bulletin.html.erb
	vendor/built_in_modules/personal_patent/app - %BDƻs/views/panel/personal_patent/back_end/writing_patents/_form.html.erb
	vendor/built_in_modules/personal_patent/app - %BDƻs/views/panel/personal_patent/plugin/writing_patents/_form.html.erb

config/application.rb

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

config/list.yml

@@ -9,21 +9,27 @@ markups:
   text_field:
     muti_lang_input_supprt: true
     ext_support: true
+    panel: typeA
   select:
     muti_lang_input_supprt: false
     ext_support: false
+    panel: typeB
   date:
     muti_lang_input_supprt: false
     ext_support: false
+    panel: typeC
   text_area:
     muti_lang_input_supprt: true
     ext_support: false
+    panel: typeD
   radio_button:
     muti_lang_input_supprt: false
     ext_support: false
+    panel: typeE
   checkbox:
     muti_lang_input_supprt: false
     ext_support: false
+    panel: typeE
   # date_durnation:
   #   muti_lang_input_supprt: false
   #   ext_support: false

config/locales/en.yml

@@ -158,6 +158,14 @@ en:
     user: Users list
   list_: List
   list_lower: list
+  lists:
+    markups:
+      text_field: Text Field
+      select: Select
+      date: Date
+      text_area: Text Area
+      radio_button: Radio button
+      checkbox: Checkbox
   login: Login
   logout: Logout
   mail:
@@ -407,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

config/locales/zh_tw.yml

@@ -158,6 +158,14 @@ zh_tw:
     user: 使用者列表
   list_: 列表
   list_lower: 列表
+  lists:
+    markups:
+      text_field: 文字輸入框
+      select: 下拉選單
+      date: 日期
+      text_area: 文字輸入方塊
+      radio_button: 單選
+      checkbox: 多選
   login: 登入
   logout: 登出
   mail:
@@ -342,8 +350,30 @@ zh_tw:
 # : =======
   errors:
     at_least_one: 必須至少有一個值
-    
   admin:
+    infos:
+      add_attribute_field: 新增
+      save: 儲存
+      initial: 起始值
+      markup: 輸入模式
+      item_name: 資料表名稱
+      name: 名稱
+      options: 選項
+      multilingual: 多語言輸入
+      add_more: 使用者可自行延伸欄位
+      add: 新增
+      placeholder: 輸入協助
+      type: 類型
+      placeholder: 提示內容
+      list: 自定選單
+      is_range: 是
+      not_range: 否
+      date:
+        claendar: 紀年法
+        range: 本欄為時間區段
+        format: 格式
+        tw_claendar: 民國
+        west_claendar: 西元
     access:
       denied:
         app:

config/routes.rb

@@ -141,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
 
@@ -176,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'
@@ -226,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")