Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Jérome Perrin
gitlab-ce
Commits
8e4aa6e3
Commit
8e4aa6e3
authored
Apr 15, 2016
by
Phil Hughes
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Mobile updates for search UI
parent
bb50edb1
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
44 additions
and
24 deletions
+44
-24
app/assets/stylesheets/pages/search.scss
app/assets/stylesheets/pages/search.scss
+35
-5
app/helpers/search_helper.rb
app/helpers/search_helper.rb
+1
-1
app/views/search/_filter.html.haml
app/views/search/_filter.html.haml
+6
-16
app/views/search/_form.html.haml
app/views/search/_form.html.haml
+2
-2
No files found.
app/assets/stylesheets/pages/search.scss
View file @
8e4aa6e3
...
...
@@ -154,16 +154,46 @@
}
.search-holder
{
display
:
-
webkit-flex
;
display
:
flex
;
@media
(
min-width
:
$screen-sm-min
)
{
display
:
-
webkit-flex
;
display
:
flex
;
}
.search-field-holder
{
position
:
relative
;
width
:
100%
;
margin-right
:
0
;
@media
(
min-width
:
$screen-sm-min
)
{
margin-right
:
5px
;
}
}
.dropdown-toggle
{
width
:
160px
;
text-align
:
left
;
.btn-search
{
width
:
100%
;
margin-top
:
5px
;
@media
(
min-width
:
$screen-sm-min
)
{
width
:
auto
;
margin-top
:
0
;
margin-left
:
5px
;
}
}
.dropdown
{
@media
(
min-width
:
$screen-sm-min
)
{
margin-left
:
5px
;
margin-right
:
5px
;
}
}
.dropdown-menu-toggle
{
width
:
100%
;
margin-top
:
5px
;
@media
(
min-width
:
$screen-sm-min
)
{
width
:
160px
;
margin-top
:
0
;
}
}
}
app/helpers/search_helper.rb
View file @
8e4aa6e3
...
...
@@ -25,7 +25,7 @@ module SearchHelper
to
=
collection
.
offset_value
+
collection
.
length
count
=
collection
.
count
"Showing
#{
from
}
-
#{
to
}
of
#{
count
}
results for
All projects:
\"
#{
@search_term
}
\"
"
"Showing
#{
from
}
-
#{
to
}
of
#{
count
}
results for
\"
#{
@search_term
}
\"
"
end
end
...
...
app/views/search/_filter.html.haml
View file @
8e4aa6e3
...
...
@@ -2,11 +2,11 @@
=
hidden_field_tag
:group_id
,
params
[
:group_id
]
-
if
params
[
:project_id
].
present?
=
hidden_field_tag
:project_id
,
params
[
:project_id
]
.dropdown
.append-right-5.prepend-left-5
%button
.dropdown-toggle.btn.js-search-group-dropdown
{
type:
"button"
,
data:
{
toggle:
"dropdown"
}
}
.dropdown
%button
.dropdown-
menu-
toggle.btn.js-search-group-dropdown
{
type:
"button"
,
data:
{
toggle:
"dropdown"
}
}
Group:
-
if
@group
.
present?
%strong
=
@group
.
name
=
@group
.
name
-
else
Any
%b
.caret
...
...
@@ -19,11 +19,11 @@
=
dropdown_content
=
dropdown_loading
.dropdown.project-filter
.append-right-5.prepend-left-5
%button
.dropdown-toggle.btn.js-search-project-dropdown
{
type:
"button"
,
data:
{
toggle:
"dropdown"
}
}
.dropdown.project-filter
%button
.dropdown-
menu-
toggle.btn.js-search-project-dropdown
{
type:
"button"
,
data:
{
toggle:
"dropdown"
}
}
Project:
-
if
@project
.
present?
%strong
=
@project
.
name_with_namespace
=
@project
.
name_with_namespace
-
else
Any
%b
.caret
...
...
@@ -35,13 +35,3 @@
=
dropdown_filter
(
"Search projects"
)
=
dropdown_content
=
dropdown_loading
-# .dropdown-content
-# %ul
-# %li
-# = link_to search_filter_path(project_id: nil), class: ("is-active" if !params[:project_id].present?) do
-# Any
-# %li.divider
-# - current_user.authorized_projects.sort_by(&:name_with_namespace).each do |project|
-# %li
-# = link_to search_filter_path(project_id: project.id, group_id: nil), class: ("is-active" if params[:project_id] == project.id.to_s) do
-# = project.name_with_namespace
app/views/search/_form.html.haml
View file @
8e4aa6e3
...
...
@@ -3,8 +3,8 @@
=
hidden_field_tag
:scope
,
params
[
:scope
]
.search-holder
.search-field-holder
.append-right-5
.search-field-holder
=
search_field_tag
:search
,
params
[
:search
],
placeholder:
"Search for projects, issues etc"
,
class:
"form-control search-text-input"
,
id:
"dashboard_search"
,
autofocus:
true
,
spellcheck:
false
-
unless
params
[
:snippets
].
eql?
'true'
=
render
'filter'
if
current_user
=
button_tag
'Search'
,
class:
"btn btn-success btn-search
prepend-left-5
"
=
button_tag
'Search'
,
class:
"btn btn-success btn-search"
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