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
1
Merge Requests
1
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
nexedi
gitlab-ce
Commits
a32941ae
Commit
a32941ae
authored
Mar 29, 2018
by
Winnie Hellmann
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Display illustration and message if no filter is selected
parent
c1b71e2f
Changes
5
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
22 additions
and
5 deletions
+22
-5
app/assets/stylesheets/framework/images.scss
app/assets/stylesheets/framework/images.scss
+1
-1
app/views/dashboard/issues.html.haml
app/views/dashboard/issues.html.haml
+5
-1
app/views/dashboard/merge_requests.html.haml
app/views/dashboard/merge_requests.html.haml
+5
-1
app/views/shared/dashboard/_no_filter_selected.html.haml
app/views/shared/dashboard/_no_filter_selected.html.haml
+8
-0
app/views/shared/issuable/_filter.html.haml
app/views/shared/issuable/_filter.html.haml
+3
-2
No files found.
app/assets/stylesheets/framework/images.scss
View file @
a32941ae
...
@@ -20,7 +20,7 @@
...
@@ -20,7 +20,7 @@
width
:
100%
;
width
:
100%
;
}
}
$image-widths
:
80
250
306
394
430
;
$image-widths
:
80
130
250
306
394
430
;
@each
$width
in
$image-widths
{
@each
$width
in
$image-widths
{
&
.svg-
#{
$width
}
{
&
.svg-
#{
$width
}
{
img
,
img
,
...
...
app/views/dashboard/issues.html.haml
View file @
a32941ae
...
@@ -12,4 +12,8 @@
...
@@ -12,4 +12,8 @@
=
render
'shared/new_project_item_select'
,
path:
'issues/new'
,
label:
"New issue"
,
with_feature_enabled:
'issues'
,
type: :issues
=
render
'shared/new_project_item_select'
,
path:
'issues/new'
,
label:
"New issue"
,
with_feature_enabled:
'issues'
,
type: :issues
=
render
'shared/issuable/filter'
,
type: :issues
=
render
'shared/issuable/filter'
,
type: :issues
=
render
'shared/issues'
-
if
current_user
&&
@no_filters_set
=
render
'shared/dashboard/no_filter_selected'
-
else
=
render
'shared/issues'
app/views/dashboard/merge_requests.html.haml
View file @
a32941ae
...
@@ -8,4 +8,8 @@
...
@@ -8,4 +8,8 @@
=
render
'shared/new_project_item_select'
,
path:
'merge_requests/new'
,
label:
"New merge request"
,
with_feature_enabled:
'merge_requests'
,
type: :merge_requests
=
render
'shared/new_project_item_select'
,
path:
'merge_requests/new'
,
label:
"New merge request"
,
with_feature_enabled:
'merge_requests'
,
type: :merge_requests
=
render
'shared/issuable/filter'
,
type: :merge_requests
=
render
'shared/issuable/filter'
,
type: :merge_requests
=
render
'shared/merge_requests'
-
if
current_user
&&
@no_filters_set
=
render
'shared/dashboard/no_filter_selected'
-
else
=
render
'shared/merge_requests'
app/views/shared/dashboard/_no_filter_selected.html.haml
0 → 100644
View file @
a32941ae
.row.empty-state.text-center
.col-xs-12
.svg-130
=
image_tag
'illustrations/issue-dashboard_results-without-filter.svg'
.col-xs-12
.text-content
%h4
=
_
(
"Please select at least one filter to see results"
)
app/views/shared/issuable/_filter.html.haml
View file @
a32941ae
...
@@ -24,6 +24,7 @@
...
@@ -24,6 +24,7 @@
.filter-item.inline.labels-filter
.filter-item.inline.labels-filter
=
render
"shared/issuable/label_dropdown"
,
selected:
selected_labels
,
use_id:
false
,
selected_toggle:
params
[
:label_name
],
data_options:
{
field_name:
"label_name[]"
}
=
render
"shared/issuable/label_dropdown"
,
selected:
selected_labels
,
use_id:
false
,
selected_toggle:
params
[
:label_name
],
data_options:
{
field_name:
"label_name[]"
}
-
if
!
@no_filters_set
.pull-right
.pull-right
=
render
'shared/sort_dropdown'
=
render
'shared/sort_dropdown'
...
...
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