Merge with sub_roles

config/application.rb

@@ -15,10 +15,11 @@ Bundler.require *Rails.groups(:assets) if defined?(Bundler)
 module PrototypeR4
   class Application < Rails::Application
 
-#    config.paths.vendor.plugins.instance_variable_set("@paths", config.paths.vendor.plugins.instance_variable_get("@paths") + ["#{config.root}/vendor/built_in_modules"])
- #   config.paths.vendor.plugins.instance_variable_set("@paths", config.paths.vendor.plugins.instance_variable_get("@paths") + ["#{config.root}/vendor/downloaded_modules"])
-  #  config.paths.vendor.plugins.instance_variable_set("@paths", config.paths.vendor.plugins.instance_variable_get("@paths") + ["#{config.root}/vendor/radius"])
-
+    # Add directories for plugins
+    config.paths["vendor/plugins"] += %W(#{config.root}/vendor/built_in_modules)
+    config.paths["vendor/plugins"] += %W(#{config.root}/vendor/downloaded_modules)
+    
+    
     # Settings in config/environments/* take precedence over those specified here.
     # Application configuration should go into files in config/initializers
     # -- all .rb files in that directory are automatically loaded.
@@ -26,7 +27,8 @@ 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}/lib/parsers)
+    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)

config/initializers/fix_using_obj_id.rb

@@ -0,0 +1,5 @@
+Module.instance_eval do
+  def using_object_ids?
+    false
+  end
+end

config/list.yml

@@ -1,6 +1,7 @@
 forbidden_item_names:
   - admin
   - panel
+  - appfront
 
 markups:
   - text_field

config/locales/en.yml

@@ -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
@@ -128,8 +128,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:

config/locales/zh_tw.yml

@@ -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: 原上傳檔名
@@ -121,9 +121,9 @@ zh_tw:
     upload_design: 上傳設計
     url: URL
     user: 用戶
-    user_info: 用戶資料
-    user_panel: 用戶面板
-    user_role: 用戶角色
+    info: 用戶資料
+    panel: 用戶面板
+    role: 用戶角色
     
   panel:
     

config/routes.rb

@@ -7,12 +7,13 @@ PrototypeR4::Application.routes.draw do
   match '/site/public_key', :to => CentralServerExchangeApp 
   match '/site/update', :to => GithubApp
   match '/purchase/:type', :to => CentralServerExchangeApp
-  match "/panel/:app_name/frontend/:action" => redirect {|params| "/panel/#{params[:app_name]}/#{params[:action]}" }
-
+  
 
   # routes for admin
   namespace :admin do
     resources :assets
+    resources :app_auths
+
     resources :designs do
       collection do
         get 'upload_package'
@@ -22,6 +23,9 @@ PrototypeR4::Application.routes.draw do
         post 'edit_file'  => 'designs#edit_file'
       end
     end
+    resources :infos do
+      get 'add_attribute_field'
+    end
     resources :items
     resources :links do
       member do
@@ -34,6 +38,11 @@ PrototypeR4::Application.routes.draw do
         get 'reload_themes'
       end
     end
+    resources :module_apps do
+      member do
+        get 'reload_frontend_pages'
+      end
+    end
     resources :page_parts
     resources :purchases do
       collection do
@@ -43,18 +52,24 @@ PrototypeR4::Application.routes.draw do
         get 'download'
       end
     end
+    resources :roles do
+      get 'add_sub_role'
+      get 'add_attribute_field'
+    end
     resources :sites
     resources :snippets
     resources :translations
     resources :users
-    resources :user_info_models
-    resources :user_role_models
   end
   # end admin
   
   namespace :panel do
     resources :users
   end
+
+  match '/panel/:app_name/front_end/*page_name' => 'pages#appfront', :via => "get",:constraints => lambda { |request|
+    !request.query_string.include?("inner=true")
+      }
   
   # routes for gridfs files
   match "/gridfs/*path" => "gridfs#serve"