diff options
Diffstat (limited to 'app/views/admin/projects')
-rw-r--r-- | app/views/admin/projects/_projects.html.haml | 4 | ||||
-rw-r--r-- | app/views/admin/projects/index.html.haml | 4 | ||||
-rw-r--r-- | app/views/admin/projects/show.html.haml | 5 |
3 files changed, 6 insertions, 7 deletions
diff --git a/app/views/admin/projects/_projects.html.haml b/app/views/admin/projects/_projects.html.haml index c7c30673d74..cf1bd2a8022 100644 --- a/app/views/admin/projects/_projects.html.haml +++ b/app/views/admin/projects/_projects.html.haml @@ -25,8 +25,8 @@ .controls.gl-flex-shrink-0.gl-ml-5 = render Pajamas::ButtonComponent.new(href: edit_project_path(project), button_options: { id: dom_id(project, :edit) }) do - = s_('Edit') - = render Pajamas::ButtonComponent.new(variant: :danger, button_options: { class: 'delete-project-button', data: { delete_project_url: admin_project_path(project), project_name: project.name } } ) do + = _('Edit') + = render Pajamas::ButtonComponent.new(variant: :danger, button_options: { class: 'delete-project-button', data: { delete_project_url: admin_project_path(project), project_name: project.name } }) do = s_('AdminProjects|Delete') = paginate @projects, theme: 'gitlab' diff --git a/app/views/admin/projects/index.html.haml b/app/views/admin/projects/index.html.haml index f23a688dd48..18cd3400c60 100644 --- a/app/views/admin/projects/index.html.haml +++ b/app/views/admin/projects/index.html.haml @@ -1,4 +1,5 @@ - page_title _('Projects') +- add_page_specific_style 'page_bundles/search' - params[:visibility_level] ||= [] .top-area @@ -20,10 +21,9 @@ - namespace = Namespace.find(params[:namespace_id]) - current_namespace = "#{namespace.kind}: #{namespace.full_path}" %button.dropdown-menu-toggle.btn.btn-default.btn-md.gl-button.js-namespace-select{ data: { show_any: 'true', field_name: 'namespace_id', placeholder: current_namespace, update_location: 'true' }, type: 'button' } - %span.gl-new-dropdown-button-text + %span.gl-dropdown-button-text = current_namespace - = render 'shared/projects/dropdown' = link_to new_project_path, class: 'gl-button btn btn-confirm' do = _('New Project') diff --git a/app/views/admin/projects/show.html.haml b/app/views/admin/projects/show.html.haml index a60c3996cf2..829e9f508e0 100644 --- a/app/views/admin/projects/show.html.haml +++ b/app/views/admin/projects/show.html.haml @@ -6,8 +6,7 @@ %h1.page-title.gl-font-size-h-display = _('Project: %{name}') % { name: @project.full_name } - = link_to edit_project_path(@project), class: "btn btn-default gl-button float-right" do - = sprite_icon('pencil', css_class: 'gl-icon gl-mr-2') + = render Pajamas::ButtonComponent.new(href: edit_project_path(@project), icon: 'pencil', button_options: { class: 'gl-float-right' }) do = _('Edit') %hr - if @project.last_repository_check_failed? @@ -143,7 +142,7 @@ .col-sm-9 - placeholder = _('Search for Namespace') %button.dropdown-menu-toggle.btn.btn-default.btn-md.gl-button.js-namespace-select{ data: { field_name: 'new_namespace_id', placeholder: placeholder }, type: 'button' } - %span.gl-new-dropdown-button-text + %span.gl-dropdown-button-text = placeholder .form-group.row |