From e58fd0550b4a29fac9d52dc8a78d04333ccc8c06 Mon Sep 17 00:00:00 2001 From: elijah Date: Mon, 17 Jun 2013 01:27:55 -0700 Subject: new ui - initial user changes --- users/config/locales/en.yml | 17 +++++++++++------ users/config/routes.rb | 3 +++ 2 files changed, 14 insertions(+), 6 deletions(-) (limited to 'users/config') diff --git a/users/config/locales/en.yml b/users/config/locales/en.yml index 32d183b..3c42b55 100644 --- a/users/config/locales/en.yml +++ b/users/config/locales/en.yml @@ -1,9 +1,14 @@ en: - none: "None." - signup: "Sign up" + email_settings: "Email Settings" + account_settings: "Account Settings" + logout: "Logout" + none: "None" + signup: "Sign Up" signup_message: "Please create an account." cancel: "Cancel" - login: "Login" + login: "Log In" + username: "Username" + password: "Password" login_message: "Please login with your account." invalid_user_pass: "Not a valid username/password combination" all_strategies_failed: "Could not understand your login attempt. Please first send your login and a SRP ephemeral value A and then send the client_auth in the same session (using cookies)." @@ -20,7 +25,7 @@ en: user_updated_successfully: "Settings have been updated successfully." user_created_successfully: "Successfully created your account." email_alias_destroyed_successfully: "Successfully removed the alias '%{alias}'." - use_ascii_key: "Use ASCII-armored PGP key" + use_ascii_key: "Use ASCII-armored OpenPGP key" can_retype_old_password: "Retype your old password if you would like to keep that" associated_email: "The associated email address is" cookie_disabled_warning: "You have cookies disabled. You will not be able to login until you enable cookies." @@ -28,7 +33,7 @@ en: activemodel: models: - user: + user: one: User other: "%{count} Users" simple_form: @@ -42,4 +47,4 @@ en: placeholders: user: email_forward: "my_other_email@domain.net" - + diff --git a/users/config/routes.rb b/users/config/routes.rb index 9a9a40e..d07cda9 100644 --- a/users/config/routes.rb +++ b/users/config/routes.rb @@ -14,6 +14,9 @@ Rails.application.routes.draw do get "signup" => "users#new", :as => "signup" resources :users do + resource :overview, :only => [:show] + resource :email_settings, :only => [:edit, :update] + resource :account_settings, :only => [:edit, :update] resources :email_aliases, :only => [:destroy], :id => /.*/ end -- cgit v1.2.3 From fa7b7425e7c53282472c1c9ce1cdc7272f55cfd4 Mon Sep 17 00:00:00 2001 From: elijah Date: Tue, 2 Jul 2013 23:17:44 -0700 Subject: users engine changes - rewrite of the views, separate email settings to a separate controller, make users_controller html only and v1/users_controller json only. --- users/config/locales/en.yml | 35 +++++++++++++++++------------------ users/config/routes.rb | 3 +-- 2 files changed, 18 insertions(+), 20 deletions(-) (limited to 'users/config') diff --git a/users/config/locales/en.yml b/users/config/locales/en.yml index 3c42b55..63ac692 100644 --- a/users/config/locales/en.yml +++ b/users/config/locales/en.yml @@ -9,28 +9,26 @@ en: login: "Log In" username: "Username" password: "Password" - login_message: "Please login with your account." + change_password: "Change Password" + login_message: "Please log in with your account." invalid_user_pass: "Not a valid username/password combination" all_strategies_failed: "Could not understand your login attempt. Please first send your login and a SRP ephemeral value A and then send the client_auth in the same session (using cookies)." update_login_and_password: "Update Login and Password" - cancel_account: "Cancel your account" - remove_account: "Remove Account" - admin_cancel_account: "Cancel the account %{username}" + destroy_my_account: "Destroy my account" + destroy_account_info: "This will permanently destroy your account and all the data associated with it. Proceed with caution!" + admin_destroy_account: "Destroy the account %{username}" set_email_address: "Set email address" - forward_email: "Forward email" - email_aliases: "Email aliases" + forward_email: "Forward Email" + email_aliases: "Email Aliases" public_key: "Public Key" - add_email_alias: "Add email alias" - confirm_question: "Are you sure?" + add_email_alias: "Add Email Alias" user_updated_successfully: "Settings have been updated successfully." user_created_successfully: "Successfully created your account." - email_alias_destroyed_successfully: "Successfully removed the alias '%{alias}'." - use_ascii_key: "Use ASCII-armored OpenPGP key" - can_retype_old_password: "Retype your old password if you would like to keep that" - associated_email: "The associated email address is" - cookie_disabled_warning: "You have cookies disabled. You will not be able to login until you enable cookies." - js_required: "We are sorry, but this doesn't work without javascript enabled. This is for security reasons." - + email_alias_destroyed_successfully: "Removed email alias %{alias}." + use_ascii_key: "OpenPGP public key. Do not change this value unless you know what you are doing." + advanced_options: "Advanced Options" + not_authorized: "Sorry, but you are not authorized to perform that action." + not_authorized_login: "Please log in to perform that action." activemodel: models: user: @@ -39,11 +37,12 @@ en: simple_form: labels: user: - email_forward: "Email forward" + email_forward: "Email Forward" hints: user: - email_forward: "Forward all emails to this address" - email: "Your leap web email address" + email_forward: > + Forward all email messages to this address. Messages will be encrypted before being forwarded. + This is an option for advanced users who are familar with OpenPGP. placeholders: user: email_forward: "my_other_email@domain.net" diff --git a/users/config/routes.rb b/users/config/routes.rb index d07cda9..9eff2a1 100644 --- a/users/config/routes.rb +++ b/users/config/routes.rb @@ -5,7 +5,7 @@ Rails.application.routes.draw do defaults: {format: 'json'} } do resources :sessions, :only => [:new, :create, :update] delete "logout" => "sessions#destroy", :as => "logout" - resources :users, :only => [:create, :update] + resources :users, :only => [:create, :update, :destroy] end get "login" => "sessions#new", :as => "login" @@ -16,7 +16,6 @@ Rails.application.routes.draw do resources :users do resource :overview, :only => [:show] resource :email_settings, :only => [:edit, :update] - resource :account_settings, :only => [:edit, :update] resources :email_aliases, :only => [:destroy], :id => /.*/ end -- cgit v1.2.3 From 89ad6bd802f9e57c687e8cdb8593c3984e2fbd1b Mon Sep 17 00:00:00 2001 From: elijah Date: Thu, 4 Jul 2013 01:33:09 -0700 Subject: fix user typeahead --- users/config/routes.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'users/config') diff --git a/users/config/routes.rb b/users/config/routes.rb index 9eff2a1..693ae7a 100644 --- a/users/config/routes.rb +++ b/users/config/routes.rb @@ -5,7 +5,7 @@ Rails.application.routes.draw do defaults: {format: 'json'} } do resources :sessions, :only => [:new, :create, :update] delete "logout" => "sessions#destroy", :as => "logout" - resources :users, :only => [:create, :update, :destroy] + resources :users, :only => [:create, :update, :destroy, :index] end get "login" => "sessions#new", :as => "login" -- cgit v1.2.3 From 03fc85ad20e91964267dfcdaab9e3036c5702689 Mon Sep 17 00:00:00 2001 From: elijah Date: Thu, 4 Jul 2013 01:34:06 -0700 Subject: users - make a nice overview page (well, nice enough) and better users index/search. --- users/config/locales/en.yml | 14 ++++++++++++++ 1 file changed, 14 insertions(+) (limited to 'users/config') diff --git a/users/config/locales/en.yml b/users/config/locales/en.yml index 63ac692..b880887 100644 --- a/users/config/locales/en.yml +++ b/users/config/locales/en.yml @@ -29,6 +29,20 @@ en: advanced_options: "Advanced Options" not_authorized: "Sorry, but you are not authorized to perform that action." not_authorized_login: "Please log in to perform that action." + search: "Search" + + # + # overview + # + overview_welcome: "Welcome %{username}." + overview_intro: "From this user control panel, you can:" + overview_tickets: "Create and check support tickets." + overview_email: "Modify email settings." + overview_account: "Change your password or delete your account." + + # + # rails + # activemodel: models: user: -- cgit v1.2.3 From 64bacc45ea1a023b154b07ec0790f762a79d20d5 Mon Sep 17 00:00:00 2001 From: elijah Date: Thu, 4 Jul 2013 02:44:11 -0700 Subject: user tests -- user update has been moved entirely to api controller, so fix tests to reflect this. --- users/config/routes.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'users/config') diff --git a/users/config/routes.rb b/users/config/routes.rb index 693ae7a..b6d583e 100644 --- a/users/config/routes.rb +++ b/users/config/routes.rb @@ -13,7 +13,7 @@ Rails.application.routes.draw do resources :sessions, :only => [:new, :create, :update] get "signup" => "users#new", :as => "signup" - resources :users do + resources :users, :except => [:create, :update] do resource :overview, :only => [:show] resource :email_settings, :only => [:edit, :update] resources :email_aliases, :only => [:destroy], :id => /.*/ -- cgit v1.2.3