Merge branch 'redesign-searchbar-admin-project-26794' into 'master'
Modify the search bar area on admin/projects page Closes #26794 See merge request !8776
This commit is contained in:
commit
e438b30a31
3 changed files with 10 additions and 9 deletions
|
@ -27,7 +27,7 @@
|
|||
= icon("search", class: "search-icon")
|
||||
|
||||
.dropdown
|
||||
- toggle_text = 'Search for Namespace'
|
||||
- toggle_text = 'Namespace'
|
||||
- if params[:namespace_id].present?
|
||||
- namespace = Namespace.find(params[:namespace_id])
|
||||
- toggle_text = "#{namespace.kind}: #{namespace.path}"
|
||||
|
@ -37,8 +37,10 @@
|
|||
= dropdown_filter("Search for Namespace")
|
||||
= dropdown_content
|
||||
= dropdown_loading
|
||||
|
||||
= button_tag "Search", class: "btn btn-primary btn-search"
|
||||
= render 'shared/projects/dropdown'
|
||||
= link_to new_project_path, class: 'btn btn-new' do
|
||||
New Project
|
||||
= button_tag "Search", class: "btn btn-primary btn-search hide"
|
||||
|
||||
%ul.nav-links
|
||||
- opts = params[:visibility_level].present? ? {} : { page: admin_projects_path }
|
||||
|
@ -56,11 +58,6 @@
|
|||
= link_to admin_projects_path(visibility_level: Gitlab::VisibilityLevel::PUBLIC) do
|
||||
Public
|
||||
|
||||
.nav-controls
|
||||
= render 'shared/projects/dropdown'
|
||||
= link_to new_project_path, class: 'btn btn-new' do
|
||||
New Project
|
||||
|
||||
.projects-list-holder
|
||||
- if @projects.any?
|
||||
%ul.projects-list.content-list
|
||||
|
|
|
@ -2,7 +2,7 @@
|
|||
- personal = params[:personal]
|
||||
- archived = params[:archived]
|
||||
- namespace_id = params[:namespace_id]
|
||||
.dropdown.inline
|
||||
.dropdown
|
||||
- toggle_text = projects_sort_options_hash[@sort]
|
||||
= dropdown_toggle(toggle_text, { toggle: 'dropdown' }, { id: 'sort-projects-dropdown' })
|
||||
%ul.dropdown-menu.dropdown-menu-align-right.dropdown-menu-selectable
|
||||
|
|
|
@ -0,0 +1,4 @@
|
|||
---
|
||||
title: Redesign searchbar in admin project list
|
||||
merge_request: 8776
|
||||
author:
|
Loading…
Reference in a new issue