Commit b04d6c2e61daad01ecf1b4a45cab6f54eae705bb

Authored by Dmitriy Zaporozhets
2 parents e4418620 9697e532

Merge pull request #6098 from jeromedalbert/master

Rename "Website url" labels to "Website"
app/views/admin/users/_form.html.haml
@@ -81,7 +81,7 @@ @@ -81,7 +81,7 @@
81 = f.label :twitter, class: 'control-label' 81 = f.label :twitter, class: 'control-label'
82 .col-sm-10= f.text_field :twitter, class: 'form-control' 82 .col-sm-10= f.text_field :twitter, class: 'form-control'
83 .form-group 83 .form-group
84 - = f.label :website_url, class: 'control-label' 84 + = f.label :website_url, 'Website', class: 'control-label'
85 .col-sm-10= f.text_field :website_url, class: 'form-control' 85 .col-sm-10= f.text_field :website_url, class: 'form-control'
86 86
87 .form-actions 87 .form-actions
app/views/profiles/show.html.haml
@@ -47,7 +47,7 @@ @@ -47,7 +47,7 @@
47 = f.label :twitter, class: "control-label" 47 = f.label :twitter, class: "control-label"
48 .col-sm-10= f.text_field :twitter, class: "form-control" 48 .col-sm-10= f.text_field :twitter, class: "form-control"
49 .form-group 49 .form-group
50 - = f.label :website_url, class: "control-label" 50 + = f.label :website_url, 'Website', class: "control-label"
51 .col-sm-10= f.text_field :website_url, class: "form-control" 51 .col-sm-10= f.text_field :website_url, class: "form-control"
52 .form-group 52 .form-group
53 = f.label :bio, class: "control-label" 53 = f.label :bio, class: "control-label"
app/views/users/_profile.html.haml
@@ -19,7 +19,7 @@ @@ -19,7 +19,7 @@
19 %strong= link_to user.twitter, "http://www.twitter.com/#{user.twitter}" 19 %strong= link_to user.twitter, "http://www.twitter.com/#{user.twitter}"
20 - unless user.website_url.blank? 20 - unless user.website_url.blank?
21 %li 21 %li
22 - %span.light Website url: 22 + %span.light Website:
23 %strong= link_to user.short_website_url, user.full_website_url 23 %strong= link_to user.short_website_url, user.full_website_url
24 - unless user.bio.blank? 24 - unless user.bio.blank?
25 %li 25 %li