diff options
| -rw-r--r-- | app/views/emails/_email.html.haml | 2 | ||||
| -rw-r--r-- | app/views/errors/not_found.html.haml | 2 | ||||
| -rw-r--r-- | app/views/errors/server_error.html.haml | 2 | ||||
| -rw-r--r-- | app/views/users/_destroy_account.html.haml | 8 | ||||
| -rw-r--r-- | app/views/users/show.html.haml | 4 | ||||
| -rw-r--r-- | config/locales/en/users.en.yml | 1 |
6 files changed, 11 insertions, 8 deletions
diff --git a/app/views/emails/_email.html.haml b/app/views/emails/_email.html.haml index ea59cec..0a50ff8 100644 --- a/app/views/emails/_email.html.haml +++ b/app/views/emails/_email.html.haml @@ -2,5 +2,5 @@ = email - if local_assigns[:with].try(:include?, :delete) = link_to(user_email_alias_path(@user, email), :method => :delete) do - %i.icon-remove + =icon :remove diff --git a/app/views/errors/not_found.html.haml b/app/views/errors/not_found.html.haml index c7fec22..bf015d4 100644 --- a/app/views/errors/not_found.html.haml +++ b/app/views/errors/not_found.html.haml @@ -3,5 +3,5 @@ %h2=t 'errors.subtitle.page_not_found', default: '' %p.lead=t 'errors.text.page_not_found', default: '' %a.btn.btn-primary.btn-large{href:'/'} - %i.icon-home.icon-white + =icon :home =t :home diff --git a/app/views/errors/server_error.html.haml b/app/views/errors/server_error.html.haml index a4133da..d9e8635 100644 --- a/app/views/errors/server_error.html.haml +++ b/app/views/errors/server_error.html.haml @@ -3,5 +3,5 @@ %h2=t 'errors.subtitle.server_error', default: '' %p.lead=t 'errors.text.server_error', default: '' %a.btn.btn-primary.btn-large{href:'/'} - %i.icon-home.icon-white + =icon :home =t :home diff --git a/app/views/users/_destroy_account.html.haml b/app/views/users/_destroy_account.html.haml index 66a7dc2..de1fd64 100644 --- a/app/views/users/_destroy_account.html.haml +++ b/app/views/users/_destroy_account.html.haml @@ -10,19 +10,21 @@ = label_tag do = check_box_tag 'block_username', 1, true = t(:keep_username_blocked) - = submit_tag destroy_account_text, class: "btn btn-danger" + = button_tag class: "btn btn-danger" do + = icon(:remove) + = @user == current_user ? destroy_account_text : t(:destroy) - if @user != current_user and @user.enabled? %legend = t(:deactivate_account, :username => @user.login) %p= t(:deactivate_description) = btn deactivate_user_path(@user), :method => :post, :type => "warning" do - %i.icon-pause.icon-white + = icon :pause = t(:deactivate) - elsif @user != current_user and !@user.enabled? %legend = t(:enable_account, :username => @user.login) %p= t(:enable_description) = btn enable_user_path(@user), :method => :post, :type => "warning" do - %i.icon-ok.icon-white + = icon :ok = t(:enable) diff --git a/app/views/users/show.html.haml b/app/views/users/show.html.haml index 3bdf952..e016728 100644 --- a/app/views/users/show.html.haml +++ b/app/views/users/show.html.haml @@ -2,6 +2,6 @@ .container-fluid .row %h4 To use bitmask services: - = btn client_download_url, type: "primary" do - %i.icon-arrow-down.icon-white + = btn client_download_url, type: "primary", class: "download" do + = icon :download = t(:download_bitmask) diff --git a/config/locales/en/users.en.yml b/config/locales/en/users.en.yml index d3dab30..94df16c 100644 --- a/config/locales/en/users.en.yml +++ b/config/locales/en/users.en.yml @@ -17,6 +17,7 @@ en: 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" destroy_my_account: "Destroy my account" + destroy: "Destroy" 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}" keep_username_blocked: "Keep the username blocked from reuse for a while" |