From 7660ad4d8fe75fb1aa4ee5175920784bce100e41 Mon Sep 17 00:00:00 2001 From: Azul Date: Mon, 3 Apr 2017 11:27:27 +0200 Subject: fix: icons that were using the bootstrap 2 syntax --- app/views/users/_destroy_account.html.haml | 8 +++++--- app/views/users/show.html.haml | 4 ++-- 2 files changed, 7 insertions(+), 5 deletions(-) (limited to 'app/views/users') 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) -- cgit v1.2.3