user id set & user fields set & role set & member frontend list & user translation & create new member bug fix

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 = [ :email ]
+  config.authentication_keys = [ :user_id ]
   
 
   # Tell if authentication through request.params is enabled. True by default.

config/locales/en.yml

@@ -53,7 +53,7 @@ en:
     zip: ZIP
   addthis_tools:
     add_to_bookmark: Add this to bookmark
-  admin: Admin
+  admin: Super Admin
   all: All
   all_content: All Content
   all_file: All File
@@ -347,6 +347,7 @@ en:
   related_links: Related Links
   role: Role
   role_field: Role Field
+  role_info: " Role Info."
   roles: Roles
   ruling_site: Ruling Site
   rulingcom:
@@ -427,7 +428,8 @@ en:
     module_page_lang_not_support: "We are sorry, this page is not available for English"
     not_previewable: "Preview not support"
     preview_only_for_img: "Preview only supprt with file type: jpg, png, gif, bmp"
-  sys_basic_form: User system info
+  sys_basic_form: System Default Basic Field
+  sys_basic_id_form: System Account Info.
   system_info: System information
   tag_cloud: Tag cloud
   tags: Tags
@@ -462,6 +464,30 @@ en:
   url: URL
   use_status: Use Statue
   user: User
+  users:
+    admin_change_password: You cannot change your own password here!
+    avatar: Profile Picture
+    change_passwd: Change password
+    email: Email
+    first_name: First Name
+    last_name: Last Name
+    male: Male
+    name: Name
+    new_password: New password
+    new_password_note: At least 6 characters
+    new_password_confirmation: Confirm new password
+    female: Female
+    unknown: Information Not Available 
+    office_tel: Office Tel No.
+    office_tel_note: Public available
+    sid: ID No.
+    sid_note: Faculty ID No. or Student ID No.
+    sex: Gender
+    user_id: User Account
+    user_id_note: Should be more than 3 characters and less than 50 characters
+    user_id_not_null: User account cannot be null 
+    user_id_length: User account should be more than 3 characters 
+    user_id_error: Someone already use that user account 
   version: Version
   vertical: Vertical
   view: View

config/locales/zh_tw.yml

@@ -53,7 +53,7 @@ zh_tw:
     zip: 郵遞區號
   addthis_tools:
     add_to_bookmark: 加入書籤
-  admin: 管理員
+  admin: 系統管理者
   all: 全部
   all_content: 所有內容
   all_file: 所有檔案
@@ -347,6 +347,7 @@ zh_tw:
   related_links: 相關連結
   role: 身份
   role_field: 身份欄位
+  role_info: 身份資料
   Roles: 身份
   ruling_site: 銳綸網站
   rulingcom:
@@ -427,7 +428,8 @@ zh_tw:
     module_page_lang_not_support: "很抱歉，此頁面沒有開放中文版本"
     not_previewable: "不支援預覽"
     preview_only_for_img: "預覽僅支援：jpg,png,gif,bmp等圖片格式"
-  sys_basic_form: 系統使用者資訊
+  sys_basic_form: 系統預設基本欄位
+  sys_basic_id_form: 系統帳號資料
   system_info: 系統資訊
   tag_cloud: 標籤雲
   tags: 標籤
@@ -462,6 +464,30 @@ zh_tw:
   url: 網址
   use_status: 使用狀態
   user: 使用者
+  users:
+    admin_change_password: 您不能在此處修改自己的密碼！
+    avatar: 大頭貼照
+    change_passwd: 變更密碼
+    email: 電子郵件
+    first_name: 名字
+    male: 男性
+    name: 姓名
+    new_password: 新密碼
+    new_password_note: 至少6個字元
+    new_password_confirmation: 確認新密碼
+    female: 女性
+    unknown: 未知
+    last_name: 姓氏
+    office_tel: 辦公室電話 
+    office_tel_note: 將公開於網頁
+    sid: 編號
+    sid_note: 教職員工編號或學生學號
+    sex: 性別
+    user_id: 使用者帳號
+    user_id_note: 需介於3個字元至50個字元之間
+    user_id_not_null: 使用者帳號不能是空值
+    user_id_length: 使用者帳號至少需要3個字元
+    user_id_error: 該使用者帳號已被使用
   version: 版本
   vertical: 垂直的
   view: 檢視

config/routes.rb

@@ -135,12 +135,18 @@ Orbit::Application.routes.draw do
     resources :roles do
       get 'role_field'
       get 'sub_role_field'
+      get 'role_status'
+      get 'role_category'
       get 'sub_role'
       get 'add_sub_role'
       get 'edit_sub_role'
       get 'add_attribute_field'
     end
 
+    resources :role_filters
+    resources :role_statuses
+    resources :role_categorys
+
     resources :sites do
       get 'mail_setting'
       get 'site_info'
@@ -159,6 +165,7 @@ Orbit::Application.routes.draw do
       member do
         get 'temp_edit'
       end
+      match "edit_passwd" => "users_new_interface#edit_passwd" ,:as => :edit_passwd
     end
 
     resources :member_selects do