Commit 602e2e68 authored by Henry Smith's avatar Henry Smith

Lots of wording improvements for the project settings area

Summary:

 - Mostly very small things involving use of "a", "the" etc.
 - "post-receive" hooks are usually written with the hyphen in the name .
 - I changed the Web Hooks page to have a title consistent with all the other
   pages in the settings area.
 - More consistent usage of full-stops in lists.
parent 0b432493
.alert.alert-info .alert.alert-info
%span %span
Post receive hooks for binding events. Post-receive hooks for binding events.
%br %br
Read more about system hooks Read more about system hooks
%strong #{link_to "here", help_system_hooks_path, class: "vlink"} %strong #{link_to "here", help_system_hooks_path, class: "vlink"}
......
...@@ -13,7 +13,7 @@ ...@@ -13,7 +13,7 @@
= f.label :key = f.label :key
.controls .controls
%p.light %p.light
Paste a machine public key here. Read more about how generate it Paste a machine public key here. Read more about how to generate it
= link_to "here", help_ssh_path = link_to "here", help_ssh_path
= f.text_area :key, class: "input-xxlarge thin_area" = f.text_area :key, class: "input-xxlarge thin_area"
......
%h3.page-title %h3.page-title
Deploy keys allow read-only access to repository Deploy keys allow read-only access to the repository
= link_to new_project_deploy_key_path(@project), class: "btn btn-new pull-right", title: "New Deploy Key" do = link_to new_project_deploy_key_path(@project), class: "btn btn-new pull-right", title: "New Deploy Key" do
%i.icon-plus %i.icon-plus
New Deploy Key New Deploy Key
%p.light %p.light
They can be used for CI, staging or production servers. Deploy keys can be used for CI, staging or production servers.
You can create a deploy key or add existing one You can create a deploy key or add an existing one
%hr.clearfix %hr.clearfix
...@@ -20,13 +20,13 @@ ...@@ -20,13 +20,13 @@
= render @enabled_keys = render @enabled_keys
- if @enabled_keys.blank? - if @enabled_keys.blank?
.light-well .light-well
%p.nothing_here_message Create #{link_to 'new deploy key', new_project_deploy_key_path(@project)} or add existing one %p.nothing_here_message Create a #{link_to 'new deploy key', new_project_deploy_key_path(@project)} or add an existing one
.span5.available-keys .span5.available-keys
%h5 %h5
%strong Deploy keys %strong Deploy keys
from projects available for you from projects available to you
%ul.bordered-list %ul.bordered-list
= render @available_keys = render @available_keys
- if @available_keys.blank? - if @available_keys.blank?
.light-well .light-well
%p.nothing_here_message All deploy keys created in projects you participate will be displayed here %p.nothing_here_message Deploy keys from projects you have access to will be displayed here
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
%div %div
%h3.page-title %h3.page-title
Project settings: Project settings:
%p.light Some settings like transferring project are hidden inside danger area below %p.light Some settings, such as "Transfer Project", are hidden inside the danger area below
%hr %hr
.form-holder .form-holder
= form_for(@project, remote: true) do |f| = form_for(@project, remote: true) do |f|
...@@ -126,13 +126,13 @@ ...@@ -126,13 +126,13 @@
.control-group .control-group
= f.select :namespace_id, namespaces_options(@project.namespace_id), {prompt: 'Choose a project namespace'}, {class: 'chosen'} = f.select :namespace_id, namespaces_options(@project.namespace_id), {prompt: 'Choose a project namespace'}, {class: 'chosen'}
%ul %ul
%li Be careful. Changing project namespace can have unintended side effects %li Be careful. Changing the project's namespace can have unintended side effects.
%li You can transfer project only to namespaces you can manage %li You can only transfer the project to namespaces you manage.
%li You will need to update your local repositories to point to the new location. %li You will need to update your local repositories to point to the new location.
.form-actions .form-actions
= f.submit 'Transfer', class: "btn btn-remove" = f.submit 'Transfer', class: "btn btn-remove"
- else - else
%p.nothing_here_message Only project owner can transfer a project %p.nothing_here_message Only the project owner can transfer a project
.ui-box.ui-box-danger .ui-box.ui-box-danger
.title Rename repository .title Rename repository
...@@ -146,7 +146,7 @@ ...@@ -146,7 +146,7 @@
.control-group .control-group
= f.text_field :path = f.text_field :path
%ul %ul
%li Be careful. Rename of project repo can have unintended side effects %li Be careful. Renaming a project's repository can have unintended side effects.
%li You will need to update your local repositories to point to the new location. %li You will need to update your local repositories to point to the new location.
.form-actions .form-actions
= f.submit 'Rename', class: "btn btn-remove" = f.submit 'Rename', class: "btn btn-remove"
...@@ -156,9 +156,9 @@ ...@@ -156,9 +156,9 @@
.title Remove project .title Remove project
.ui-box-body .ui-box-body
%p %p
Remove of project will cause removing repository and all related resources like issues, merge requests etc. Removing the project will delete its repository and all related resources including issues, merge requests etc.
%br %br
%strong Removed project can not be restored! %strong Removed projects cannot be restored!
= link_to 'Remove project', @project, confirm: remove_project_message(@project), method: :delete, class: "btn btn-remove" = link_to 'Remove project', @project, confirm: remove_project_message(@project), method: :delete, class: "btn btn-remove"
- else - else
......
- if can? current_user, :admin_project, @project %h3.page-title
.alert.alert-info Post-receive hooks
%span
Post receive hooks for binding events when someone push to repository. %p.light
%br #{link_to "Post-receive hooks ", help_web_hooks_path, class: "vlink"} can be
Read more about web hooks used for binding events when someone pushes to the repository.
%strong #{link_to "here", help_web_hooks_path, class: "vlink"}
%hr.clearfix
= form_for [@project, @hook], as: :hook, url: project_hooks_path(@project), html: { class: 'form-inline' } do |f| = form_for [@project, @hook], as: :hook, url: project_hooks_path(@project), html: { class: 'form-inline' } do |f|
-if @hook.errors.any? -if @hook.errors.any?
......
%h3.page-title Services %h3.page-title Services
%p.light Service allows you to integrate GitLab with other applications %p.light Services allow you to integrate GitLab with other applications
%hr %hr
%ul.bordered-list %ul.bordered-list
......
%h3.page-title %h3.page-title
= "Import members from another project" = "Import members from another project"
%p.light %p.light
Only project members will be improted. Group members will be skipped. Only project members will be imported. Group members will be skipped.
%hr %hr
= form_tag apply_import_project_team_members_path(@project), method: 'post' do = form_tag apply_import_project_team_members_path(@project), method: 'post' do
.padded .padded
......
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