kotovalexarian-likes-gitlab/gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Merge pull request #687 from fixe/label-typo

Browse source 
Fixed typo in label
This commit is contained in:
Dmitriy Zaporozhets 2012-04-17 23:33:15 -07:00
commit ea818346a9
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
app/views/admin/users/_form.html.haml
View file

@ -12,12 +12,12 @@
= f.label :name = f.label :name
.input .input
= f.text_field :name = f.text_field :name
%span.help-inline * requried %span.help-inline * required
.clearfix .clearfix
= f.label :email = f.label :email
.input .input
= f.text_field :email = f.text_field :email
%span.help-inline * requried %span.help-inline * required
.clearfix .clearfix
= f.label :password = f.label :password
.input= f.password_field :password .input= f.password_field :password
@ -42,10 +42,10 @@
.alert .alert
.clearfix .clearfix
%p Give user ability to manage application. %p Give user ability to manage application.
= f.label :admin, :class => "checkbox" do = f.label :admin, :class => "checkbox" do
= f.check_box :admin = f.check_box :admin
%span Administrator %span Administrator
- unless @admin_user.new_record? - unless @admin_user.new_record?
.alert.alert-error .alert.alert-error
- if @admin_user.blocked - if @admin_user.blocked
%span %span
@ -57,7 +57,7 @@
Blocked user will removed from all projects & will not be able to login to GitLab. Blocked user will removed from all projects & will not be able to login to GitLab.
.actions .actions
= f.submit 'Save', :class => "btn primary" = f.submit 'Save', :class => "btn primary"
- if @admin_user.new_record? - if @admin_user.new_record?
= link_to 'Cancel', admin_users_path, :class => "btn" = link_to 'Cancel', admin_users_path, :class => "btn"
- else - else
= link_to 'Cancel', admin_user_path(@admin_user), :class => "btn" = link_to 'Cancel', admin_user_path(@admin_user), :class => "btn"