diff options
Diffstat (limited to 'app/views/groups')
| -rw-r--r-- | app/views/groups/_delete_project_button.html.haml | 3 | ||||
| -rw-r--r-- | app/views/groups/_group_admin_settings.html.haml | 2 | ||||
| -rw-r--r-- | app/views/groups/_home_panel.html.haml | 17 | ||||
| -rw-r--r-- | app/views/groups/_import_group_from_another_instance_panel.html.haml | 8 | ||||
| -rw-r--r-- | app/views/groups/new.html.haml | 5 | ||||
| -rw-r--r-- | app/views/groups/settings/repository/show.html.haml | 2 |
6 files changed, 19 insertions, 18 deletions
diff --git a/app/views/groups/_delete_project_button.html.haml b/app/views/groups/_delete_project_button.html.haml index 54a99319418..8321e86c44f 100644 --- a/app/views/groups/_delete_project_button.html.haml +++ b/app/views/groups/_delete_project_button.html.haml @@ -1 +1,2 @@ -= link_to _('Delete'), project, data: { confirm: remove_project_message(project) }, method: :delete, class: "btn gl-button btn-danger" += render Pajamas::ButtonComponent.new(href: project, variant: :danger, method: :delete, button_options: { data: { confirm: remove_project_message(project) } }) do + = _('Delete') diff --git a/app/views/groups/_group_admin_settings.html.haml b/app/views/groups/_group_admin_settings.html.haml index 0b26db64ffa..8547795b4b7 100644 --- a/app/views/groups/_group_admin_settings.html.haml +++ b/app/views/groups/_group_admin_settings.html.haml @@ -36,4 +36,4 @@ = f.gitlab_ui_checkbox_component :runner_registration_enabled, s_('Runners|New group runners can be registered'), checkbox_options: { checked: @group.runner_registration_enabled && !parent_disabled, disabled: parent_disabled }, - help_text: s_('Runners|Existing runners are not affected. To permit runner registration for all groups, enable this setting in the Admin Area in Settings > CI/CD.').html_safe + help_text: s_('Runners|Existing runners are not affected. To permit runner registration for all groups, enable this setting in the Admin Area in Settings > CI/CD.').html_safe diff --git a/app/views/groups/_home_panel.html.haml b/app/views/groups/_home_panel.html.haml index 1494990e427..fac0fd3d2a4 100644 --- a/app/views/groups/_home_panel.html.haml +++ b/app/views/groups/_home_panel.html.haml @@ -12,6 +12,7 @@ = @group.name %span.visibility-icon.gl-text-secondary.has-tooltip.gl-ml-2{ data: { container: 'body' }, title: visibility_icon_description(@group) } = visibility_level_icon(@group.visibility_level, options: {class: 'icon'}) + = render_if_exists 'shared/tier_badge', source: @group, source_type: 'Group' .home-panel-metadata.gl-text-secondary.gl-font-base.gl-font-weight-normal.gl-line-height-normal{ data: { qa_selector: 'group_id_content' }, itemprop: 'identifier' } - if can?(current_user, :read_group, @group) %span.gl-display-inline-block.gl-vertical-align-middle @@ -24,25 +25,23 @@ - if current_user .home-panel-buttons.gl-display-flex.gl-justify-content-md-end.gl-align-items-center.gl-flex-wrap.gl-gap-3{ data: { testid: 'group-buttons' } } - if current_user.admin? - = link_to [:admin, @group], class: 'btn btn-default gl-button btn-icon', title: _('View group in admin area'), - data: {toggle: 'tooltip', placement: 'bottom', container: 'body'} do - = sprite_icon('admin') + = render Pajamas::ButtonComponent.new(href: [:admin, @group], icon: 'admin', button_options: { title: _('View group in admin area'), data: { toggle: 'tooltip', placement: 'bottom', container: 'body' } }) - if @notification_setting .js-vue-notification-dropdown{ data: { disabled: emails_disabled.to_s, dropdown_items: notification_dropdown_items(@notification_setting).to_json, notification_level: @notification_setting.level, help_page_path: help_page_path('user/profile/notifications'), group_id: @group.id, container_class: 'gl-vertical-align-top', no_flip: 'true' } } - if can_create_subgroups .gl-sm-w-auto.gl-w-full - = link_to _("New subgroup"), - new_group_path(parent_id: @group.id, anchor: 'create-group-pane'), - class: "btn btn-default gl-button gl-sm-w-auto gl-w-full", - data: { qa_selector: 'new_subgroup_button' } + = render Pajamas::ButtonComponent.new(href: new_group_path(parent_id: @group.id, anchor: 'create-group-pane'), button_options: { data: { qa_selector: 'new_subgroup_button' }, class: 'gl-sm-w-auto gl-w-full'}) do + = _("New subgroup") + - if can_create_projects .gl-sm-w-auto.gl-w-full - = link_to _("New project"), new_project_path(namespace_id: @group.id), class: "btn btn-confirm gl-button gl-sm-w-auto gl-w-full", data: { qa_selector: 'new_project_button' } + = render Pajamas::ButtonComponent.new(href: new_project_path(namespace_id: @group.id), variant: :confirm, button_options: { data: { qa_selector: 'new_project_button' }, class: 'gl-sm-w-auto gl-w-full' }) do + = _('New project') - if @group.description.present? .group-home-desc.mt-1 .home-panel-description .home-panel-description-markdown.read-more-container{ itemprop: 'description' } = markdown_field(@group, :description) - %button.gl-button.btn.btn-link.js-read-more-trigger.d-lg-none{ type: "button" } + = render Pajamas::ButtonComponent.new(variant: :link, button_options: { class: 'js-read-more-trigger gl-lg-display-none' }) do = _("Read more") diff --git a/app/views/groups/_import_group_from_another_instance_panel.html.haml b/app/views/groups/_import_group_from_another_instance_panel.html.haml index 4a4bdfc6714..24ba060a89a 100644 --- a/app/views/groups/_import_group_from_another_instance_panel.html.haml +++ b/app/views/groups/_import_group_from_another_instance_panel.html.haml @@ -4,7 +4,7 @@ .gl-border-l-solid.gl-border-r-solid.gl-border-t-solid.gl-border-gray-100.gl-border-1.gl-p-5.gl-mt-4 .gl-display-flex.gl-align-items-center %h4.gl-display-flex - = s_('GroupsNew|Import groups from another instance of GitLab') + = s_('GroupsNew|Import groups by direct transfer') = link_to _('History'), history_import_bulk_imports_path, class: 'gl-link gl-ml-auto' - if bulk_imports_disabled @@ -30,12 +30,12 @@ = s_('GroupsNew|Not all related objects are migrated. %{docs_link_start}More info%{docs_link_end}.').html_safe % { docs_link_start: docs_link_start, docs_link_end: docs_link_end } %p.gl-mt-3 - = s_('GroupsNew|Provide credentials for another instance of GitLab to import your groups directly.') + = s_('GroupsNew|Provide credentials for the source instance to import from. You can provide this instance as a source to move groups in this instance.') .form-group.gl-display-flex.gl-flex-direction-column - = f.label :bulk_import_gitlab_url, s_('GroupsNew|GitLab source URL'), for: 'import_gitlab_url' + = f.label :bulk_import_gitlab_url, s_('GroupsNew|GitLab source instance URL'), for: 'import_gitlab_url' = f.text_field :bulk_import_gitlab_url, disabled: bulk_imports_disabled, placeholder: 'https://gitlab.example.com', class: 'gl-form-input col-xs-12 col-sm-8', required: true, - title: s_('GroupsNew|Please fill in GitLab source URL.'), + title: s_('GroupsNew|Enter the URL for the source instance.'), id: 'import_gitlab_url', data: { qa_selector: 'import_gitlab_url' } .form-group.gl-display-flex.gl-flex-direction-column diff --git a/app/views/groups/new.html.haml b/app/views/groups/new.html.haml index 657a582bdc5..b75fda2f344 100644 --- a/app/views/groups/new.html.haml +++ b/app/views/groups/new.html.haml @@ -16,9 +16,8 @@ #import-group-pane.tab-pane - if import_sources_enabled? - - if BulkImports::Features.enabled? - = render 'import_group_from_another_instance_panel' - .gl-mt-7.gl-border-b-solid.gl-border-gray-100.gl-border-1 + = render 'import_group_from_another_instance_panel' + .gl-mt-7.gl-border-b-solid.gl-border-gray-100.gl-border-1 = render 'import_group_from_file_panel' - else .nothing-here-block diff --git a/app/views/groups/settings/repository/show.html.haml b/app/views/groups/settings/repository/show.html.haml index a15652b3179..c6bf2d66683 100644 --- a/app/views/groups/settings/repository/show.html.haml +++ b/app/views/groups/settings/repository/show.html.haml @@ -8,5 +8,7 @@ = render "shared/deploy_tokens/index", group_or_project: @group, description: deploy_token_description = render "default_branch", group: @group += render_if_exists "protected_branches/protected_branches", protected_branch_entity: @group + - if can?(current_user, :change_push_rules, @group) = render "push_rules" |