Commit 846f8317 authored by Sabba Petri's avatar Sabba Petri

Fixes grammatical consistency and small changes

This commit adds consistency to small things like periods, commas,
etc. Also gives additional information to buttons and headers.
Fixes #2002, #2005, #2003
parent bb235837
%h3.page-title %h3.page-title
Account settings Account Settings
%p.light %p.light
You can change your username and private token here. You can change your username and private token here.
- if current_user.ldap_user? - if current_user.ldap_user?
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
.account-page .account-page
%fieldset.update-token %fieldset.update-token
%legend %legend
Private token Reset Private token
%div %div
= form_for @user, url: reset_private_token_profile_path, method: :put do |f| = form_for @user, url: reset_private_token_profile_path, method: :put do |f|
.data .data
...@@ -25,7 +25,7 @@ ...@@ -25,7 +25,7 @@
- if current_user.private_token - if current_user.private_token
= text_field_tag "token", current_user.private_token, class: "form-control" = text_field_tag "token", current_user.private_token, class: "form-control"
%div %div
= f.submit 'Reset', data: { confirm: "Are you sure?" }, class: "btn btn-primary btn-build-token" = f.submit 'Reset private token', data: { confirm: "Are you sure?" }, class: "btn btn-primary btn-build-token"
- else - else
%span You don`t have one yet. Click generate to fix it. %span You don`t have one yet. Click generate to fix it.
= f.submit 'Generate', class: "btn success btn-build-token" = f.submit 'Generate', class: "btn success btn-build-token"
...@@ -43,7 +43,7 @@ ...@@ -43,7 +43,7 @@
- if show_profile_username_tab? - if show_profile_username_tab?
%fieldset.update-username %fieldset.update-username
%legend %legend
Username Change Username
= form_for @user, url: update_username_profile_path, method: :put, remote: true do |f| = form_for @user, url: update_username_profile_path, method: :put, remote: true do |f|
%p %p
Changing your username will change path to all personal projects! Changing your username will change path to all personal projects!
......
%h3.page-title %h3.page-title
OAuth2 Application Settings
%p.light
OAuth2 protocol settings below.
%fieldset.oauth-applications %fieldset.oauth-applications
%legend Your applications %legend Your applications
......
%h3.page-title %h3.page-title
My appearance settings Design Settings
%p.light %p.light
Appearance settings saved to your profile and available across all devices Appearance settings will be saved to your profile and made available across all devices.
%hr %hr
= form_for @user, url: profile_path, remote: true, method: :put do |f| = form_for @user, url: profile_path, remote: true, method: :put do |f|
......
%h3.page-title %h3.page-title
My email addresses Email Settings
%p.light %p.light
Your Your
%b Primary Email %b Primary Email
...@@ -34,4 +34,4 @@ ...@@ -34,4 +34,4 @@
.col-sm-10 .col-sm-10
= f.text_field :email, class: 'form-control' = f.text_field :email, class: 'form-control'
.form-actions .form-actions
= f.submit 'Add', class: 'btn btn-create' = f.submit 'Add email address', class: 'btn btn-create'
%h3.page-title %h3.page-title
Group membership Group Membership
- if current_user.can_create_group? - if current_user.can_create_group?
%span.pull-right %span.pull-right
= link_to new_group_path, class: "btn btn-new" do = link_to new_group_path, class: "btn btn-new" do
%i.fa.fa-plus %i.fa.fa-plus
New Group New Group
%p.light %p.light
Group members have access to all a group's projects Group members have access to all group projects.
%hr %hr
.panel.panel-default .panel.panel-default
.panel-heading .panel-heading
......
%h3.page-title %h3.page-title
Account history My Account History
%p.light %p.light
All events created by your account are listed here All events created by your account are listed below.
%hr %hr
.profile_history .profile_history
= render @events = render @events
......
%h3.page-title %h3.page-title
My SSH keys (#{@keys.count}) SSH Keys Settings
.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
SSH keys allow you to establish a secure connection between your computer and GitLab My SSH keys: #{@keys.count}
%br %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
= render 'key_table' = render 'key_table'
%h3.page-title %h3.page-title
Notifications settings Notifications Settings
%p.light %p.light
These are your global notification settings. These are your global notification settings.
%hr %hr
= form_for @user, url: profile_notifications_path, method: :put, html: { class: 'update-notifications form-horizontal global-notifications-form' } do |f| = form_for @user, url: profile_notifications_path, method: :put, html: { class: 'update-notifications form-horizontal global-notifications-form' } do |f|
-if @user.errors.any? -if @user.errors.any?
%div.alert.alert-danger %div.alert.alert-danger
...@@ -60,7 +59,7 @@ ...@@ -60,7 +59,7 @@
%p %p
You can also specify notification level per group or per project. You can also specify notification level per group or per project.
%br %br
By default all projects and groups uses notification level set above. By default, all projects and groups will use the notification level set above.
%h4 Groups: %h4 Groups:
%ul.bordered-list %ul.bordered-list
- @group_members.each do |users_group| - @group_members.each do |users_group|
...@@ -69,7 +68,7 @@ ...@@ -69,7 +68,7 @@
.col-md-6 .col-md-6
%p %p
To specify notification level per project of a group you belong to, To specify the notification level per project of a group you belong to,
%br %br
you need to be a member of the project itself, not only its group. you need to be a member of the project itself, not only its group.
%h4 Projects: %h4 Projects:
......
%h3.page-title Password %h3.page-title Password Settings
%p.light %p.light
- if @user.password_automatically_set? - if @user.password_automatically_set?
Set your password. Set your password.
...@@ -12,7 +12,7 @@ ...@@ -12,7 +12,7 @@
- unless @user.password_automatically_set? - unless @user.password_automatically_set?
You must provide current password in order to change it. You must provide current password in order to change it.
%br %br
After a successful password update you will be redirected to login page where you should login with your new password After a successful password update, you will be redirected to the login page where you can log in with your new password.
-if @user.errors.any? -if @user.errors.any?
.alert.alert-danger .alert.alert-danger
%ul %ul
......
%h3.page-title %h3.page-title
Profile settings Profile Settings
%p.light %p.light
This information appears on your profile. This information will appear on your profile.
- if current_user.ldap_user? - if current_user.ldap_user?
Some options are unavailable for LDAP accounts Some options are unavailable for LDAP accounts
%hr %hr
......
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