From e8f4f30627c07cbca26e7ce292cad7942ca76d0d Mon Sep 17 00:00:00 2001 From: Nur Rony Date: Wed, 25 Jan 2017 16:36:40 +0600 Subject: [PATCH 1/4] layout rearranged --- app/views/admin/projects/index.html.haml | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/app/views/admin/projects/index.html.haml b/app/views/admin/projects/index.html.haml index 2e6f03fcde0..5936312801b 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,9 @@ = 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 %ul.nav-links - opts = params[:visibility_level].present? ? {} : { page: admin_projects_path } @@ -56,11 +57,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 From 90114fea5f4ec410fd3a01892706ad6a066efa43 Mon Sep 17 00:00:00 2001 From: Nur Rony Date: Tue, 31 Jan 2017 17:00:53 +0600 Subject: [PATCH 2/4] hides search button --- app/views/admin/projects/index.html.haml | 1 + 1 file changed, 1 insertion(+) diff --git a/app/views/admin/projects/index.html.haml b/app/views/admin/projects/index.html.haml index 5936312801b..cf8d438670b 100644 --- a/app/views/admin/projects/index.html.haml +++ b/app/views/admin/projects/index.html.haml @@ -40,6 +40,7 @@ = 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 } From dcac161472d163d1c64555f62c15722c2ee01ec9 Mon Sep 17 00:00:00 2001 From: Nur Rony Date: Tue, 31 Jan 2017 17:04:23 +0600 Subject: [PATCH 3/4] adds changelog --- .../unreleased/redesign-searchbar-admin-project-26794.yml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 changelogs/unreleased/redesign-searchbar-admin-project-26794.yml 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: From a54a734f70273b99b2f34236ebf4abd83dad43dc Mon Sep 17 00:00:00 2001 From: Nur Rony Date: Tue, 31 Jan 2017 17:40:37 +0600 Subject: [PATCH 4/4] fixes mobile view --- app/views/shared/projects/_dropdown.html.haml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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