Commit b04d6c2e authored by Dmytro Zaporozhets's avatar Dmytro Zaporozhets

Merge pull request #6098 from jeromedalbert/master

Rename "Website url" labels to "Website"
parents e4418620 9697e532
...@@ -81,7 +81,7 @@ ...@@ -81,7 +81,7 @@
= f.label :twitter, class: 'control-label' = f.label :twitter, class: 'control-label'
.col-sm-10= f.text_field :twitter, class: 'form-control' .col-sm-10= f.text_field :twitter, class: 'form-control'
.form-group .form-group
= f.label :website_url, class: 'control-label' = f.label :website_url, 'Website', class: 'control-label'
.col-sm-10= f.text_field :website_url, class: 'form-control' .col-sm-10= f.text_field :website_url, class: 'form-control'
.form-actions .form-actions
......
...@@ -47,7 +47,7 @@ ...@@ -47,7 +47,7 @@
= f.label :twitter, class: "control-label" = f.label :twitter, class: "control-label"
.col-sm-10= f.text_field :twitter, class: "form-control" .col-sm-10= f.text_field :twitter, class: "form-control"
.form-group .form-group
= f.label :website_url, class: "control-label" = f.label :website_url, 'Website', class: "control-label"
.col-sm-10= f.text_field :website_url, class: "form-control" .col-sm-10= f.text_field :website_url, class: "form-control"
.form-group .form-group
= f.label :bio, class: "control-label" = f.label :bio, class: "control-label"
......
...@@ -19,7 +19,7 @@ ...@@ -19,7 +19,7 @@
%strong= link_to user.twitter, "http://www.twitter.com/#{user.twitter}" %strong= link_to user.twitter, "http://www.twitter.com/#{user.twitter}"
- unless user.website_url.blank? - unless user.website_url.blank?
%li %li
%span.light Website url: %span.light Website:
%strong= link_to user.short_website_url, user.full_website_url %strong= link_to user.short_website_url, user.full_website_url
- unless user.bio.blank? - unless user.bio.blank?
%li %li
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment