diff options
author | Kushal Pandya <kushalspandya@gmail.com> | 2019-09-03 09:03:38 +0000 |
---|---|---|
committer | Kushal Pandya <kushalspandya@gmail.com> | 2019-09-03 09:03:38 +0000 |
commit | a86aa988ab3da8de0f74a99f345215589aad0172 (patch) | |
tree | 90c67bb90414724df6559cf1d2e6f22d4b3aa035 /app/views/admin/groups/index.html.haml | |
parent | af5f2424cace62f8712dbabfd60bb0f1c36f1590 (diff) | |
parent | 3741402a241df2ad6ab28e4b76edafe5083ce733 (diff) | |
download | gitlab-ce-a86aa988ab3da8de0f74a99f345215589aad0172.tar.gz |
Merge branch '36765-flash-notification' into 'master'
Make error flash notification sticky
See merge request gitlab-org/gitlab-ce!30141
Diffstat (limited to 'app/views/admin/groups/index.html.haml')
-rw-r--r-- | app/views/admin/groups/index.html.haml | 32 |
1 files changed, 15 insertions, 17 deletions
diff --git a/app/views/admin/groups/index.html.haml b/app/views/admin/groups/index.html.haml index cb833ffd9ac..434b6e3a37e 100644 --- a/app/views/admin/groups/index.html.haml +++ b/app/views/admin/groups/index.html.haml @@ -1,20 +1,18 @@ -- @no_container = true - page_title _("Groups") -%div{ class: container_class } - .top-area - .prepend-top-default.append-bottom-default - = form_tag admin_groups_path, method: :get, class: 'js-search-form' do |f| - = hidden_field_tag :sort, @sort - .search-holder - - project_name = params[:name].present? ? params[:name] : nil - .search-field-holder - = search_field_tag :name, project_name, class: "form-control search-text-input js-search-input", autofocus: true, spellcheck: false, placeholder: 'Search by name' - = icon("search", class: "search-icon") - = render "shared/groups/dropdown", options_hash: admin_groups_sort_options_hash - = link_to new_admin_group_path, class: "btn btn-success" do - = _('New group') - %ul.content-list - = render @groups +.top-area + .prepend-top-default.append-bottom-default + = form_tag admin_groups_path, method: :get, class: 'js-search-form' do |f| + = hidden_field_tag :sort, @sort + .search-holder + - project_name = params[:name].present? ? params[:name] : nil + .search-field-holder + = search_field_tag :name, project_name, class: "form-control search-text-input js-search-input", autofocus: true, spellcheck: false, placeholder: 'Search by name' + = icon("search", class: "search-icon") + = render "shared/groups/dropdown", options_hash: admin_groups_sort_options_hash + = link_to new_admin_group_path, class: "btn btn-success" do + = _('New group') +%ul.content-list + = render @groups - = paginate @groups, theme: "gitlab" += paginate @groups, theme: "gitlab" |