new ui member settings account data

config/locales/en.yml

@@ -11,7 +11,6 @@ en:
         not_sub_manager: Access Denied for you are not SubManager for this app
       not_admin: Access Denied for you are not Admin
       object: Access Denied for you don't have permission for this object
-  account_settings: Account settings  
   academic_info: Academic Info.
   action: Action
   ad:
@@ -487,12 +486,13 @@ en:
   users:
     admin_change_password: You cannot change your own password here!
     avatar: Profile Picture
-    change_passwd: Change password
+    change_passwd: Change Password
     email: Email
     first_name: First Name
     last_name: Last Name
     male: Male
     name: Name
+    valid_old_password: Current password doesn't match confirmation
     new_password: New password
     new_password_note: At least 6 characters
     new_password_confirmation: Confirm new password
@@ -508,6 +508,8 @@ en:
     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 
+    user_basic_id_form: Account Info.
+    user_basic_data: Personal Profile
   version: Version
   vertical: Vertical
   view: View

config/locales/zh_tw.yml

@@ -11,7 +11,6 @@ zh_tw:
         not_sub_manager: 拒絕存取，因你不是此應用程式次管理員
       not_admin: 拒絕存取，因你不是系統管理者
       object: 拒絕存取，因你沒有權限
-  account_settings: 帳號設定
   academic_info: 學術資訊
   action: 操作
   ad:
@@ -493,6 +492,7 @@ zh_tw:
     first_name: 名字
     male: 男性
     name: 姓名
+    valid_old_password: 目前的密碼不符合確認值
     new_password: 新密碼
     new_password_note: 至少6個字元
     new_password_confirmation: 確認新密碼
@@ -509,6 +509,8 @@ zh_tw:
     user_id_not_null: 使用者帳號不能是空值
     user_id_length: 使用者帳號至少需要3個字元
     user_id_error: 該使用者帳號已被使用
+    user_basic_id_form: 帳號資料
+    user_basic_data: 個人資料
   version: 版本
   vertical: 垂直的
   view: 檢視

config/routes.rb

@@ -221,6 +221,8 @@ Orbit::Application.routes.draw do
         post 'update_order_list'
       end
       match "edit_passwd" => "users_new_interface#edit_passwd" ,:as => :edit_passwd
+      match "edit_user_data" => "users_new_interface#edit_user_data" ,:as => :edit_user_data
+      match "setting_account" => "users_new_interface#setting_account" ,:as => :setting_account
     end
 
     resources :member_selects do