diff options
Diffstat (limited to 'app/views/shared/deploy_keys')
-rw-r--r-- | app/views/shared/deploy_keys/_form.html.haml | 12 | ||||
-rw-r--r-- | app/views/shared/deploy_keys/_index.html.haml | 6 | ||||
-rw-r--r-- | app/views/shared/deploy_keys/_project_group_form.html.haml | 12 |
3 files changed, 15 insertions, 15 deletions
diff --git a/app/views/shared/deploy_keys/_form.html.haml b/app/views/shared/deploy_keys/_form.html.haml index 94742d96af7..37a56057268 100644 --- a/app/views/shared/deploy_keys/_form.html.haml +++ b/app/views/shared/deploy_keys/_form.html.haml @@ -6,7 +6,7 @@ .form-group = form.label :title, class: 'col-form-label col-sm-2' - .col-sm-10= form.text_field :title, class: 'form-control', readonly: ('readonly' unless can?(current_user, :update_deploy_key, deploy_key)) + .col-sm-10= form.text_field :title, class: 'form-control gl-form-input', readonly: ('readonly' unless can?(current_user, :update_deploy_key, deploy_key)) .form-group - if deploy_key.new_record? @@ -15,12 +15,12 @@ %p.light - link_start = "<a href='#{help_page_path('ssh/README')}' target='_blank' rel='noreferrer noopener'>".html_safe - link_end = '</a>' - = _('Paste a machine public key here. Read more about how to generate it %{link_start}here%{link_end}').html_safe % { link_start: link_start, link_end: link_end.html_safe } - = form.text_area :key, class: 'form-control thin_area', rows: 5 + = _('Paste a public key here. %{link_start}How do I generate it?%{link_end}').html_safe % { link_start: link_start, link_end: link_end.html_safe } + = form.text_area :key, class: 'form-control gl-form-input thin_area', rows: 5 - else = form.label :fingerprint, class: 'col-form-label col-sm-2' .col-sm-10 - = form.text_field :fingerprint, class: 'form-control', readonly: 'readonly' + = form.text_field :fingerprint, class: 'form-control gl-form-input', readonly: 'readonly' - if deploy_keys_project.present? = form.fields_for :deploy_keys_projects, deploy_keys_project do |deploy_keys_project_form| @@ -29,6 +29,6 @@ .col-sm-10 = deploy_keys_project_form.label :can_push do = deploy_keys_project_form.check_box :can_push - %strong= _('Write access allowed') + %strong= _('Grant write permissions to this key') %p.light.gl-mb-0 - = _('Allow this key to push to repository as well? (Default only allows pull access.)') + = _('Allow this key to push to this repository') diff --git a/app/views/shared/deploy_keys/_index.html.haml b/app/views/shared/deploy_keys/_index.html.haml index f2f577383f8..5d9c2cd25b4 100644 --- a/app/views/shared/deploy_keys/_index.html.haml +++ b/app/views/shared/deploy_keys/_index.html.haml @@ -1,14 +1,14 @@ - expanded = expanded_by_default? %section.qa-deploy-keys-settings.settings.no-animate#js-deploy-keys-settings{ class: ('expanded' if expanded), data: { qa_selector: 'deploy_keys_settings_content' } } .settings-header - %h4= _('Deploy Keys') + %h4= _('Deploy keys') %button.btn.js-settings-toggle{ type: 'button' } = expanded ? 'Collapse' : 'Expand' %p - = _('Deploy keys allow read-only or read-write (if enabled) access to your repository. Deploy keys can be used for CI, staging or production servers. You can create a deploy key or add an existing one.') + - link_start = '<a href="%{url}" target="_blank" rel="noopener noreferrer">'.html_safe % { url: help_page_path('user/project/deploy_keys/index') } + = _("Add deploy keys to grant read/write access to this repository. %{link_start}What are deploy keys?%{link_end}").html_safe % { link_start: link_start, link_end: '</a>'.html_safe } .settings-content %h5.gl-mt-0 - = _('Create a new deploy key for this project') = render @deploy_keys.form_partial_path %hr #js-deploy-keys{ data: { endpoint: project_deploy_keys_path(@project), project_id: @project.id } } diff --git a/app/views/shared/deploy_keys/_project_group_form.html.haml b/app/views/shared/deploy_keys/_project_group_form.html.haml index 179ec33ee65..bad25086d9f 100644 --- a/app/views/shared/deploy_keys/_project_group_form.html.haml +++ b/app/views/shared/deploy_keys/_project_group_form.html.haml @@ -2,23 +2,23 @@ = form_errors(@deploy_keys.new_key) .form-group.row = f.label :title, class: "label-bold" - = f.text_field :title, class: 'form-control', required: true + = f.text_field :title, class: 'form-control gl-form-input', required: true .form-group.row = f.label :key, class: "label-bold" - = f.text_area :key, class: "form-control", rows: 5, required: true + = f.text_area :key, class: 'form-control gl-form-input', rows: 5, required: true .form-group.row %p.light.gl-mb-0 - = _('Paste a machine public key here. Read more about how to generate it') - = link_to "here", help_page_path("ssh/README") + = _('Paste a public key here.') + = link_to _('How do I generate it?'), help_page_path("ssh/README") = f.fields_for :deploy_keys_projects do |deploy_keys_project_form| .form-group.row = deploy_keys_project_form.label :can_push do = deploy_keys_project_form.check_box :can_push - %strong= _('Write access allowed') + %strong= _('Grant write permissions to this key') .form-group.row %p.light.gl-mb-0 - = _('Allow this key to push to repository as well? (Default only allows pull access.)') + = _('Allow this key to push to this repository') .form-group.row = f.submit _("Add key"), class: "btn-success btn" |