Changes for sub_roles

Issues: update doesn't create new i18n_variables, role form has bugs
This commit is contained in:
chris2tof committed 2011-12-18 10:07:42 +08:00
1 parent d23cf152da
commit d27d7a623c
62 files changed
+508 -1142

No files matched your search

+1 -1
View File
@@ -26,7 +26,7 @@ module PrototypeR4
# Custom directories with classes and modules you want to be autoloadable.
# config.autoload_paths += %W(#{config.root}/extras)
config.autoload_paths += %W(#{config.root}/lib)
config.autoload_paths += %W( #{config.root}/app/models/ckeditor )
config.autoload_paths += %W(#{config.root}/app/models/ckeditor )
config.autoload_paths += %W(#{config.root}/app/models/design)
config.autoload_paths += %W(#{config.root}/app/models/purchase)
config.autoload_paths += %W(#{config.root}/app/models/user)
+9 -9
View File
@@ -55,8 +55,8 @@ en:
editing_link: Editing link
editing_page: Editing page
editing_snippet: Editing snippet
editing_user_info: Editing user information
editing_user_role: Editing user role
editing_info: Editing user information
editing_role: Editing user role
email: Email
enable_language: Enable language
file_name: Filename
@@ -78,8 +78,8 @@ en:
list_puchases: Purchases list
list_snippets: Snippets list
list_users: Users list
list_user_infos: User information list
list_user_roles: User roles list
list_infos: User information list
list_roles: User roles list
member: Member
move_down: Move down
move_up: Move up
@@ -97,8 +97,8 @@ en:
new_page: New page
new_snippet: New snippet
new_user: New user
new_user_info: New user information
new_user_role: New user role
new_info: New user information
new_role: New user role
non_multilingual: Non multilingual
options: Options
orig_upload_file: Original filename
@@ -126,8 +126,8 @@ en:
upload_design: Upload design
url: URL
user: User
user_info: User information
user_panel: User panel
user_role: User role
info: User information
panel: User panel
role: User role
panel:
+9 -9
View File
@@ -50,8 +50,8 @@ zh_tw:
editing_link: 編輯連結
editing_page: 編輯頁面
editing_snippet: 編輯片段
editing_user_info: 編輯用戶資料
editing_user_role: 編輯用戶角色
editing_info: 編輯用戶資料
editing_role: 編輯用戶角色
email: Email
enable_language: 啟用語言
file_name: 檔名
@@ -73,8 +73,8 @@ zh_tw:
list_layouts: 佈局列表
list_snippets: 斷片列表
list_users: 使用列表
list_user_infos: 用戶資料列表
list_user_roles: 用戶角色列表
list_infos: 用戶資料列表
list_roles: 用戶角色列表
member: 會員
move_down: 往下移
move_up: 往上移
@@ -92,8 +92,8 @@ zh_tw:
new_page: 新增頁面
new_snippet: 新增片段
new_user: 新增使用
new_user_info: 新增用戶資料
new_user_role: 新增用戶角色
new_info: 新增用戶資料
new_role: 新增用戶角色
non_multilingual: 非多種語言
options: 選項
orig_upload_file: 原上傳檔名
@@ -119,9 +119,9 @@ zh_tw:
upload_design: 上傳設計
url: URL
user: 用戶
user_info: 用戶資料
user_panel: 用戶面板
user_role: 用戶角色
info: 用戶資料
panel: 用戶面板
role: 用戶角色
panel:
+7 -2
View File
@@ -22,7 +22,9 @@ PrototypeR4::Application.routes.draw do
post 'edit_file' => 'designs#edit_file'
end
end
resources :infos
resources :infos do
get 'add_attribute_field'
end
resources :items
resources :links do
member do
@@ -44,7 +46,10 @@ PrototypeR4::Application.routes.draw do
get 'download'
end
end
resources :roles
resources :roles do
get 'add_sub_role'
get 'add_attribute_field'
end
resources :sites
resources :snippets
resources :translations