BigW Consortium Gitlab
Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
G
gitlab-ce
Project
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Open sidebar
Forest Godfrey
gitlab-ce
Commits
e438b30a
Commit
e438b30a
authored
Feb 06, 2017
by
Jacob Schatz
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'redesign-searchbar-admin-project-26794' into 'master'
Modify the search bar area on admin/projects page Closes #26794 See merge request !8776
parents
178626ed
a54a734f
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
10 additions
and
9 deletions
+10
-9
index.html.haml
app/views/admin/projects/index.html.haml
+5
-8
_dropdown.html.haml
app/views/shared/projects/_dropdown.html.haml
+1
-1
redesign-searchbar-admin-project-26794.yml
...ogs/unreleased/redesign-searchbar-admin-project-26794.yml
+4
-0
No files found.
app/views/admin/projects/index.html.haml
View file @
e438b30a
...
...
@@ -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
...
...
app/views/shared/projects/_dropdown.html.haml
View file @
e438b30a
...
...
@@ -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
...
...
changelogs/unreleased/redesign-searchbar-admin-project-26794.yml
0 → 100644
View file @
e438b30a
---
title
:
Redesign searchbar in admin project list
merge_request
:
8776
author
:
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment