From 6b024dcd45cb48f3c1ddb05f865d2b90ef3479c8 Mon Sep 17 00:00:00 2001 From: Steffen van Bergerem Date: Wed, 1 Apr 2015 13:34:56 +0200 Subject: [PATCH] Fix missing button styles in donate and admin sections --- app/views/admins/user_search.html.haml | 16 ++++++++-------- app/views/profiles/edit.haml | 11 +++++------ app/views/shared/_donatepod.html.haml | 4 ++-- 3 files changed, 15 insertions(+), 16 deletions(-) diff --git a/app/views/admins/user_search.html.haml b/app/views/admins/user_search.html.haml index e83ff6d6a..1db5ea218 100644 --- a/app/views/admins/user_search.html.haml +++ b/app/views/admins/user_search.html.haml @@ -25,18 +25,18 @@ %div.controls = f.label :under13 do = f.check_box :under13 - = t('.under_13') - = submit_tag t('admins.stats.go') + = t(".under_13") + = submit_tag t("admins.stats.go"), class: "btn btn-primary" %div.more_invites.span3 - %h3= t('shared.invitations.invites') + %h3= t("shared.invitations.invites") - != t('.you_currently', :count => current_user.invitation_code.count, :link => link_to(t(".add_invites"), add_invites_path(current_user.invitation_code))) + != t(".you_currently", count: current_user.invitation_code.count, link: link_to(t(".add_invites"), add_invites_path(current_user.invitation_code))) - = form_tag 'admin_inviter', method: :get do - = t('.email_to') - = text_field_tag 'identifier' - = submit_tag t('services.remote_friend.invite') + = form_tag "admin_inviter", method: :get do + = t(".email_to") + = text_field_tag "identifier" + = submit_tag t("services.remote_friend.invite"), class: "btn btn-default" %div.row %div.span12 diff --git a/app/views/profiles/edit.haml b/app/views/profiles/edit.haml index fb2733bd4..4dc0bc846 100644 --- a/app/views/profiles/edit.haml +++ b/app/views/profiles/edit.haml @@ -7,17 +7,16 @@ .span12 #section_header %h2 - = t('settings') - = render 'shared/settings_nav' + = t("settings") + = render "shared/settings_nav" .container .row-fluid .span3 .span6 - content_for :submit_block do - = link_to t('cancel'), local_or_remote_person_path(current_user.person), :class => "btn" - = submit_tag t('.update_profile'), :class => "creation", :id => "update_profile", :class => "btn" - = render :partial => 'edit', :locals => {:person => @person, - :profile => @profile, :aspect => @aspect, :step => @step} + = link_to t("cancel"), local_or_remote_person_path(current_user.person), :class => "btn" + = submit_tag t(".update_profile"), class: "btn creation", id: "update_profile" + = render partial: "edit", locals: {person: @person, profile: @profile, aspect: @aspect, step: @step} .span3 diff --git a/app/views/shared/_donatepod.html.haml b/app/views/shared/_donatepod.html.haml index 7bc4fe4de..430525e6f 100644 --- a/app/views/shared/_donatepod.html.haml +++ b/app/views/shared/_donatepod.html.haml @@ -7,8 +7,8 @@ -if AppConfig.settings.paypal_donations.paypal_unhosted_button_encrypted.present? %input{name: "encrypted", type: "hidden", value: AppConfig.settings.paypal_donations.paypal_unhosted_button_encrypted} %input{name: "currency_code", type: "hidden", value: AppConfig.settings.paypal_donations.currency} - %input{name: "submit", type: "submit", value: t('aspects.index.donate')} - + %input{name: "submit", type: "submit", value: t("aspects.index.donate"), class: "btn btn-default"} + - if AppConfig.bitcoin_donation_address Bitcoin: %input{type: "text", id: "bitcoin_address", value: AppConfig.bitcoin_donation_address, readonly: true}