diff options
| author | Jacob Schatz <jschatz@gitlab.com> | 2017-02-06 14:29:28 +0000 |
|---|---|---|
| committer | Jacob Schatz <jschatz@gitlab.com> | 2017-02-06 14:29:28 +0000 |
| commit | e438b30a315e092e03afa9d84f8a9e57ded3b0a2 (patch) | |
| tree | 5ec0c8ad4a756a36746a1f88cbadcbcfc43554af | |
| parent | 178626ed6114055d756c7d4a13d5f5eec8fa2a85 (diff) | |
| parent | a54a734f70273b99b2f34236ebf4abd83dad43dc (diff) | |
| download | gitlab-ce-e438b30a315e092e03afa9d84f8a9e57ded3b0a2.tar.gz | |
Merge branch 'redesign-searchbar-admin-project-26794' into 'master'
Modify the search bar area on admin/projects page
Closes #26794
See merge request !8776
| -rw-r--r-- | app/views/admin/projects/index.html.haml | 13 | ||||
| -rw-r--r-- | app/views/shared/projects/_dropdown.html.haml | 2 | ||||
| -rw-r--r-- | changelogs/unreleased/redesign-searchbar-admin-project-26794.yml | 4 |
3 files changed, 10 insertions, 9 deletions
diff --git a/app/views/admin/projects/index.html.haml b/app/views/admin/projects/index.html.haml index 2e6f03fcde0..cf8d438670b 100644 --- a/app/views/admin/projects/index.html.haml +++ b/app/views/admin/projects/index.html.haml @@ -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 diff --git a/app/views/shared/projects/_dropdown.html.haml b/app/views/shared/projects/_dropdown.html.haml index b7f8551153b..ac028f18e50 100644 --- a/app/views/shared/projects/_dropdown.html.haml +++ b/app/views/shared/projects/_dropdown.html.haml @@ -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 diff --git a/changelogs/unreleased/redesign-searchbar-admin-project-26794.yml b/changelogs/unreleased/redesign-searchbar-admin-project-26794.yml new file mode 100644 index 00000000000..547a7c6755c --- /dev/null +++ b/changelogs/unreleased/redesign-searchbar-admin-project-26794.yml @@ -0,0 +1,4 @@ +--- +title: Redesign searchbar in admin project list +merge_request: 8776 +author: |