Commit 66e39992 authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets

Merge branch 'your' into 'master'

Update views to single form of address. Change "my" to "your"

Part of user experience. Every software (twitter, facebook etc) talks to you like "change your password" but not "change my password".

cc @sytse @job

See merge request !1736
parents bc4e2518 9e554a52
...@@ -23,9 +23,9 @@ module SearchHelper ...@@ -23,9 +23,9 @@ module SearchHelper
# Autocomplete results for various settings pages # Autocomplete results for various settings pages
def default_autocomplete def default_autocomplete
[ [
{ label: "My Profile settings", url: profile_path }, { label: "Profile settings", url: profile_path },
{ label: "My SSH Keys", url: profile_keys_path }, { label: "SSH Keys", url: profile_keys_path },
{ label: "My Dashboard", url: root_path }, { label: "Dashboard", url: root_path },
{ label: "Admin Section", url: admin_root_path }, { label: "Admin Section", url: admin_root_path },
] ]
end end
......
...@@ -6,4 +6,4 @@ ...@@ -6,4 +6,4 @@
<p>You can confirm your account through the link below:</p> <p>You can confirm your account through the link below:</p>
<% end %> <% end %>
<p><%= link_to 'Confirm my account', confirmation_url(@resource, confirmation_token: @token) %></p> <p><%= link_to 'Confirm your account', confirmation_url(@resource, confirmation_token: @token) %></p>
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
<p>Someone has requested a link to change your password, and you can do this through the link below.</p> <p>Someone has requested a link to change your password, and you can do this through the link below.</p>
<p><%= link_to 'Change my password', edit_password_url(@resource, reset_password_token: @token) %></p> <p><%= link_to 'Change your password', edit_password_url(@resource, reset_password_token: @token) %></p>
<p>If you didn't request this, please ignore this email.</p> <p>If you didn't request this, please ignore this email.</p>
<p>Your password won't change until you access the link above and create a new one.</p> <p>Your password won't change until you access the link above and create a new one.</p>
...@@ -4,4 +4,4 @@ ...@@ -4,4 +4,4 @@
<p>Click the link below to unlock your account:</p> <p>Click the link below to unlock your account:</p>
<p><%= link_to 'Unlock my account', unlock_url(@resource, unlock_token: @token) %></p> <p><%= link_to 'Unlock your account', unlock_url(@resource, unlock_token: @token) %></p>
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
%div %div
= f.password_field :password_confirmation, class: "form-control bottom", placeholder: "Confirm new password", required: true = f.password_field :password_confirmation, class: "form-control bottom", placeholder: "Confirm new password", required: true
.clearfix .clearfix
= f.submit "Change my password", class: "btn btn-primary" = f.submit "Change your password", class: "btn btn-primary"
.clearfix.prepend-top-20 .clearfix.prepend-top-20
%p %p
......
...@@ -21,8 +21,8 @@ ...@@ -21,8 +21,8 @@
<div><%= f.submit "Update", class: "input_button" %></div> <div><%= f.submit "Update", class: "input_button" %></div>
<% end %> <% end %>
<h3>Cancel my account</h3> <h3>Cancel your account</h3>
<p>Unhappy? <%= link_to "Cancel my account", registration_path(resource_name), data: { confirm: "Are you sure?" }, method: :delete %>.</p> <p>Unhappy? <%= link_to "Cancel your account", registration_path(resource_name), data: { confirm: "Are you sure?" }, method: :delete %>.</p>
<%= link_to "Back", :back %> <%= link_to "Back", :back %>
...@@ -53,7 +53,7 @@ ...@@ -53,7 +53,7 @@
%code .panel .well-list %code .panel .well-list
.panel.panel-default .panel.panel-default
.panel-heading My list .panel-heading Your list
%ul.well-list %ul.well-list
%li %li
One item One item
......
...@@ -25,7 +25,7 @@ ...@@ -25,7 +25,7 @@
= link_to explore_root_path, title: "Explore", class: 'has_bottom_tooltip', 'data-original-title' => 'Public area' do = link_to explore_root_path, title: "Explore", class: 'has_bottom_tooltip', 'data-original-title' => 'Public area' do
%i.fa.fa-globe %i.fa.fa-globe
%li %li
= link_to user_snippets_path(current_user), title: "My snippets", class: 'has_bottom_tooltip', 'data-original-title' => 'My snippets' do = link_to user_snippets_path(current_user), title: "Your snippets", class: 'has_bottom_tooltip', 'data-original-title' => 'Your snippets' do
%i.fa.fa-clipboard %i.fa.fa-clipboard
- if current_user.is_admin? - if current_user.is_admin?
%li %li
......
%h3.page-title %h3.page-title
My Account History Your Account History
%p.light %p.light
All events created by your account are listed below. All events created by your account are listed below.
%hr %hr
......
...@@ -3,8 +3,6 @@ ...@@ -3,8 +3,6 @@
.pull-right .pull-right
= link_to "Add SSH Key", new_profile_key_path, class: "btn btn-new" = link_to "Add SSH Key", new_profile_key_path, class: "btn btn-new"
%p.light %p.light
My SSH keys: #{@keys.count}
%br
Before you can add an SSH key you need to Before you can add an SSH key you need to
= link_to "generate it.", help_page_path("ssh", "README") = link_to "generate it.", help_page_path("ssh", "README")
%hr %hr
......
...@@ -19,7 +19,7 @@ ...@@ -19,7 +19,7 @@
.fork-buttons .fork-buttons
- if current_user && can?(current_user, :fork_project, @project) && @project.namespace != current_user.namespace - if current_user && can?(current_user, :fork_project, @project) && @project.namespace != current_user.namespace
- if current_user.already_forked?(@project) && current_user.manageable_namespaces.size < 2 - if current_user.already_forked?(@project) && current_user.manageable_namespaces.size < 2
= link_to namespace_project_path(current_user, current_user.fork_of(@project)), title: 'Go to my fork' do = link_to namespace_project_path(current_user, current_user.fork_of(@project)), title: 'Go to your fork' do
= link_to_toggle_fork = link_to_toggle_fork
- else - else
= link_to new_namespace_project_fork_path(@project.namespace, @project), title: "Fork project" do = link_to new_namespace_project_fork_path(@project.namespace, @project), title: "Fork project" do
......
%h3.page-title %h3.page-title
My Snippets Your Snippets
.pull-right .pull-right
= link_to new_snippet_path, class: "btn btn-new btn-grouped", title: "New Snippet" do = link_to new_snippet_path, class: "btn btn-new btn-grouped", title: "New Snippet" do
Add new snippet Add new snippet
......
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
= link_to new_snippet_path, class: "btn btn-new btn-grouped", title: "New Snippet" do = link_to new_snippet_path, class: "btn btn-new btn-grouped", title: "New Snippet" do
Add new snippet Add new snippet
= link_to user_snippets_path(current_user), class: "btn btn-grouped" do = link_to user_snippets_path(current_user), class: "btn btn-grouped" do
My snippets Your snippets
%p.light %p.light
Public snippets created by you and other users are listed here Public snippets created by you and other users are listed here
......
...@@ -23,7 +23,7 @@ ...@@ -23,7 +23,7 @@
.back-link .back-link
- if @snippet.author == current_user - if @snippet.author == current_user
= link_to user_snippets_path(current_user) do = link_to user_snippets_path(current_user) do
&larr; my snippets &larr; your snippets
- else - else
= link_to snippets_path do = link_to snippets_path do
&larr; discover snippets &larr; discover snippets
......
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