Merge commit 'fc702a6210d901cd3beea220e72f71a3b7f7d41e' into sidebar_config
Conflicts: app/controllers/admin/page_parts_controller.rb app/controllers/default_widget_controller.rb app/uploaders/gprs_uploader.rb app/uploaders/location_uploader.rb app/views/admin/page_parts/_module_widget.html.erb app/views/admin/page_parts/reload_widget_styles.js.erb app/views/admin/page_parts/reload_widgets.js.erb app/views/layouts/_side_bar_content.html.erb config/locales/zh_tw.yml lib/parsers/parser_front_end.rb vendor/built_in_modules/announcement/init.rb vendor/built_in_modules/gprs/app/assets/javascripts/panel/gprs/back_end/locations.js vendor/built_in_modules/gprs/app/assets/stylesheets/panel/gprs/back_end/locations.css vendor/built_in_modules/gprs/app/controllers/panel/gprs/back_end/locations_controller.rb vendor/built_in_modules/gprs/app/views/panel/gprs/back_end/locations/index.html.erb vendor/built_in_modules/gprs/test/functional/panel/gprs/back_end/locations_controller_test.rb vendor/built_in_modules/location/README.rdoc vendor/built_in_modules/location/app/assets/javascripts/panel/gprs/back_end/locations.js vendor/built_in_modules/location/app/assets/javascripts/panel/location/back_end/locations.js vendor/built_in_modules/location/app/assets/stylesheets/panel/gprs/back_end/locations.css vendor/built_in_modules/location/app/assets/stylesheets/panel/location/back_end/locations.css vendor/built_in_modules/location/app/controllers/panel/location/back_end/locations_controller.rb vendor/built_in_modules/location/app/controllers/panel/locations/back_end/locations_controller.rb vendor/built_in_modules/location/app/models/location.rb vendor/built_in_modules/location/app/uploaders/locations_uploader.rb vendor/built_in_modules/location/app/views/panel/location/back_end/locations/index.html.erb vendor/built_in_modules/location/app/views/panel/locations/back_end/locations/_form.html.erb vendor/built_in_modules/location/app/views/panel/locations/back_end/locations/edit.html.erb vendor/built_in_modules/location/app/views/panel/locations/back_end/locations/index.html.erb vendor/built_in_modules/location/app/views/panel/locations/back_end/locations/new.html.erb vendor/built_in_modules/location/config/routes.rb vendor/built_in_modules/location/lib/location.rb vendor/built_in_modules/location/location.gemspec vendor/built_in_modules/location/test/functional/panel/gprs/back_end/locations_controller_test.rb vendor/built_in_modules/location/test/functional/panel/location/back_end/locations_controller_test.rb
This commit is contained in:
Fu Matthew committed
commit
bfaa22052f
248 files changed
+6732
-2502
No files matched your search
@@ -0,0 +1,15 @@
|
||||
en:
|
||||
|
||||
ntu:
|
||||
site_names:
|
||||
"00": "Dean of General Affairs"
|
||||
"01": "Documentation Division"
|
||||
"02": "Cashier Division"
|
||||
"03": "General Service Division"
|
||||
"04": "General Affairs Division, College of Social Science"
|
||||
"05": "Property Management Division"
|
||||
"06": "Procurement Division"
|
||||
"07": "Facilities Service Division"
|
||||
"08": "General Service Division"
|
||||
"09": "Campus Security"
|
||||
"10": "Construction and Maintenance Division"
|
||||
@@ -0,0 +1,15 @@
|
||||
zh_tw:
|
||||
|
||||
ntu:
|
||||
site_names:
|
||||
"00": "總務處"
|
||||
"01": "文書組"
|
||||
"02": "出納組"
|
||||
"03": "事務組"
|
||||
"04": "社科院總務分處"
|
||||
"05": "保管組"
|
||||
"06": "採購組"
|
||||
"07": "經營管理組"
|
||||
"08": "事務組"
|
||||
"09": "駐警隊"
|
||||
"10": "營繕組"
|
||||
@@ -0,0 +1,14 @@
|
||||
en:
|
||||
|
||||
datetime_picker:
|
||||
date:
|
||||
label: Date
|
||||
placeholder: "YYYY-MM-DD"
|
||||
default:
|
||||
label: Date and time
|
||||
placeholder: "YYYY-MM-DD HH:MM"
|
||||
separated:
|
||||
label: Date and time
|
||||
time:
|
||||
label: Time
|
||||
placeholder: "HH:MM"
|
||||
@@ -0,0 +1,14 @@
|
||||
zh_tw:
|
||||
|
||||
datetime_picker:
|
||||
date:
|
||||
label: 日期
|
||||
placeholder: "YYYY-MM-DD"
|
||||
default:
|
||||
label: 日期和時間
|
||||
placeholder: "YYYY-MM-DD HH:MM"
|
||||
separated:
|
||||
label: 日期和時間
|
||||
time:
|
||||
label: 時間
|
||||
placeholder: "HH:MM"
|
||||
@@ -2,6 +2,11 @@ zh_tw:
|
||||
|
||||
_locale: 中文
|
||||
|
||||
front_page:
|
||||
select_app_url: 模組前台樣式
|
||||
is_published: 是否公開
|
||||
menu_enable_lang: 選單啓用語系
|
||||
link_enable_lang: 連結生效語系
|
||||
access:
|
||||
denied:
|
||||
app:
|
||||
@@ -106,6 +111,31 @@ zh_tw:
|
||||
default_css: 預設樣式表
|
||||
delete: 刪除
|
||||
delete_file: 刪除檔案
|
||||
default_widget:
|
||||
no_support_setting: 沒有可以使用的設定
|
||||
no_value: 不設定（全部）
|
||||
fields_: 前台輸出欄位
|
||||
fields_order: 輸出欄位順序
|
||||
fields_style: 輸出欄位樣式
|
||||
select_module_app: 套用模組
|
||||
select_widget_path: 外掛樣版選擇
|
||||
select_widget_style: 排版樣式
|
||||
widget_data_count: 顯示則數
|
||||
select_widget_ext_option: 模組延伸選項
|
||||
caption:
|
||||
typeA: 表格式排版，簡單明瞭呈現內容
|
||||
typeB_style2: 一圖一文式，輸出欄位水平排列
|
||||
typeB_style3: 一圖一文式，輸出欄位垂直排列，圖片在左方
|
||||
typeB_style4: 一圖一文式，輸出欄位垂直排列，圖片在右方
|
||||
typeC: 一圖多文式，輸出欄位垂直排列
|
||||
data_source:
|
||||
category: 資料來源：類別
|
||||
tag: 資料來源：標籤
|
||||
delete:
|
||||
file: 刪除檔案
|
||||
success:
|
||||
paper: Paper was successfully deleted.
|
||||
delete_: 刪除
|
||||
description: 描述
|
||||
desktop: 桌面
|
||||
disable: 關閉
|
||||
@@ -313,7 +343,7 @@ zh_tw:
|
||||
template: 樣版
|
||||
template_name: 樣版名稱
|
||||
text: 內文
|
||||
theme: 主題
|
||||
theme: 套用頁面樣式
|
||||
themes: 主題
|
||||
title: 標題
|
||||
top: 置頂
|
||||
@@ -350,6 +380,7 @@ zh_tw:
|
||||
visitors_today: 今日造訪人次
|
||||
yes_: "是"
|
||||
|
||||
|
||||
nccu:
|
||||
date: 起迄日期
|
||||
file: 附加檔案
|
||||
|
||||
+46
-24
@@ -1,4 +1,6 @@
|
||||
Orbit::Application.routes.draw do
|
||||
# get "robots.txt" => 'robots#index'
|
||||
|
||||
devise_for :users do
|
||||
match "/users_passwd" => "desktop/registrations#update", :as => :users_passwd, :via => :put
|
||||
end
|
||||
@@ -40,7 +42,6 @@ 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
|
||||
|
||||
@@ -51,6 +52,7 @@ Orbit::Application.routes.draw do
|
||||
end
|
||||
resources :ad_images ,:except => [:show,:index]
|
||||
end
|
||||
|
||||
resources :dashboards
|
||||
resources :designs do
|
||||
collection do
|
||||
@@ -64,22 +66,33 @@ Orbit::Application.routes.draw do
|
||||
post 'upload_image' => 'designs#upload_image'
|
||||
end
|
||||
end
|
||||
|
||||
resources :infos do
|
||||
get 'add_attribute_field'
|
||||
end
|
||||
|
||||
resources :items
|
||||
|
||||
match 'update_position' => 'items#update_position'
|
||||
resources :links do
|
||||
member do
|
||||
get 'delete'
|
||||
end
|
||||
end
|
||||
|
||||
resources :pages do
|
||||
collection do
|
||||
get 'reload_after_module_changed', :action=>'reload_frontend_pages'
|
||||
get 'reload_after_list_changed',:action=> 'reload_front_end_setting'
|
||||
end
|
||||
member do
|
||||
get 'delete'
|
||||
get 'reload_themes'
|
||||
get 'reload_after_module_changed',:action=>'reload_frontend_pages'
|
||||
get 'reload_after_list_changed',:action=> 'reload_front_end_setting'
|
||||
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
|
||||
@@ -96,16 +109,17 @@ Orbit::Application.routes.draw do
|
||||
|
||||
match 'remove_manager/:app_manager_id' ,:action=> 'remove_manager',:via => "delete",:as =>:remove_manager
|
||||
match 'remove_sub_manager/:app_sub_manager_id' ,:action=> 'remove_sub_manager',:via => "delete",:as =>:remove_sub_manager
|
||||
get 'reload_frontend_pages'
|
||||
end
|
||||
end
|
||||
|
||||
resources :page_parts do
|
||||
member do
|
||||
get 'reload_widgets'
|
||||
get 'reload_widget_styles'
|
||||
get 'reload_after_module_changed',:action=>'reload_widgets'
|
||||
get 'reload_after_list_changed',:action=> 'reload_widget_styles'
|
||||
get 'reload_r_tag_options'
|
||||
end
|
||||
end
|
||||
|
||||
resources :plugins
|
||||
resources :purchases do
|
||||
collection do
|
||||
@@ -116,10 +130,16 @@ Orbit::Application.routes.draw do
|
||||
get 'download'
|
||||
end
|
||||
end
|
||||
|
||||
resources :roles do
|
||||
get 'role_field'
|
||||
get 'sub_role_field'
|
||||
get 'sub_role'
|
||||
get 'add_sub_role'
|
||||
get 'edit_sub_role'
|
||||
get 'add_attribute_field'
|
||||
end
|
||||
|
||||
resources :sites do
|
||||
get 'mail_setting'
|
||||
get 'site_info'
|
||||
@@ -130,18 +150,20 @@ Orbit::Application.routes.draw do
|
||||
get 'ui_theme'
|
||||
get 'change_design'
|
||||
end
|
||||
|
||||
resources :tags
|
||||
resources :users
|
||||
|
||||
resources :users_new_interface do
|
||||
member 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
|
||||
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
|
||||
|
||||
match 'module_store' => 'module_store#index'
|
||||
match 'module_store/show' => 'module_store#show'
|
||||
@@ -181,16 +203,7 @@ Orbit::Application.routes.draw do
|
||||
match '/desktop/widget_layout' => 'desktop#widget_layout'
|
||||
match '/desktop/temp_func/'=>'desktop#temp_func'
|
||||
|
||||
namespace :desktop do
|
||||
match '/journal_pages/get_journals_json' => 'journal_pages#get_journals_json'
|
||||
resources :journal_pages, except: :show
|
||||
resources :journal_lists, only: :index
|
||||
resources :co_authors, except: :show
|
||||
resources :co_author_relations, except: :show
|
||||
end
|
||||
|
||||
# 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'
|
||||
@@ -231,14 +244,21 @@ Orbit::Application.routes.draw do
|
||||
#match '/desktop_orbit/eventajaxload' => 'desktop_publications#delete_journal'
|
||||
# match '/desktop_orbit/eventajaxload' => 'desktop_publications#update_journal'
|
||||
|
||||
def controller_paths(controller, actions)
|
||||
actions.each do |action|
|
||||
if action.eql? 'index'
|
||||
match "#{controller}" => "#{controller}##{action}", :as => "#{controller}"
|
||||
else
|
||||
match "#{controller}/#{action}(/:id)" => "#{controller}##{action}", :as => "#{controller}_#{action}"
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
scope '/front' do
|
||||
match 'show_banner/:id' => 'front#show_banner', :as => :front_show_banner
|
||||
match 'show_footer' => 'front#show_footer', :as => :front_show_footer
|
||||
match 'show_menu/:id' => 'front#show_menu', :as => :front_show_menu
|
||||
match 'show_page_sub_menu' => 'front#show_page_sub_menu', :as => :front_show_page_sub_menu
|
||||
match 'show_site_sub_menu' => 'front#show_site_sub_menu', :as => :front_show_site_sub_menu
|
||||
match 'show_sitemap' => 'front#show_sitemap', :as => :front_show_sitemap
|
||||
controller_paths :front, %w[show_banner show_footer show_menu show_page_sub_menu show_site_sub_menu show_sitemap]
|
||||
controller_paths :mobile, %w[index announcement announcement_content dialog_contact dialog_copyright dialog_language map page page_content]
|
||||
|
||||
scope 'app' do
|
||||
controller_paths :mobile, %w[index announcement announcement_content dialog_contact dialog_copyright dialog_language map page page_content]
|
||||
end
|
||||
|
||||
scope '/mobile' do
|
||||
@@ -280,4 +300,6 @@ Orbit::Application.routes.draw do
|
||||
|
||||
root :to => 'pages#index'
|
||||
|
||||
match '/panel/ad_banner/front_end/inner_page/:id' => 'front#show_inner_ad_image', :as => :front_show_inner_ad_image
|
||||
|
||||
end
|
||||
Reference in new issue
Block a user