diff options
| author | Winnie Hellmann <winnie@gitlab.com> | 2018-03-29 13:43:53 +0200 |
|---|---|---|
| committer | Winnie Hellmann <winnie@gitlab.com> | 2018-04-03 20:19:09 +0200 |
| commit | a32941aee32ddfd7b114011f951741e06a53be5d (patch) | |
| tree | 42d22c93a3dae27c93f6c9b63d09137d8de132ad | |
| parent | c1b71e2fa1e49da82b15ee7f12148a372face09c (diff) | |
| download | gitlab-ce-a32941aee32ddfd7b114011f951741e06a53be5d.tar.gz | |
Display illustration and message if no filter is selected
| -rw-r--r-- | app/assets/stylesheets/framework/images.scss | 2 | ||||
| -rw-r--r-- | app/views/dashboard/issues.html.haml | 6 | ||||
| -rw-r--r-- | app/views/dashboard/merge_requests.html.haml | 6 | ||||
| -rw-r--r-- | app/views/shared/dashboard/_no_filter_selected.html.haml | 8 | ||||
| -rw-r--r-- | app/views/shared/issuable/_filter.html.haml | 5 |
5 files changed, 22 insertions, 5 deletions
diff --git a/app/assets/stylesheets/framework/images.scss b/app/assets/stylesheets/framework/images.scss index df1cafc9f8e..62a0fba3da3 100644 --- a/app/assets/stylesheets/framework/images.scss +++ b/app/assets/stylesheets/framework/images.scss @@ -20,7 +20,7 @@ width: 100%; } - $image-widths: 80 250 306 394 430; + $image-widths: 80 130 250 306 394 430; @each $width in $image-widths { &.svg-#{$width} { img, diff --git a/app/views/dashboard/issues.html.haml b/app/views/dashboard/issues.html.haml index 24d69b56c20..35bf92a0d07 100644 --- a/app/views/dashboard/issues.html.haml +++ b/app/views/dashboard/issues.html.haml @@ -12,4 +12,8 @@ = 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/issues' + +- if current_user && @no_filters_set + = render 'shared/dashboard/no_filter_selected' +- else + = render 'shared/issues' diff --git a/app/views/dashboard/merge_requests.html.haml b/app/views/dashboard/merge_requests.html.haml index fb57ec7835c..7b69a6f5d0f 100644 --- a/app/views/dashboard/merge_requests.html.haml +++ b/app/views/dashboard/merge_requests.html.haml @@ -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/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' diff --git a/app/views/shared/dashboard/_no_filter_selected.html.haml b/app/views/shared/dashboard/_no_filter_selected.html.haml new file mode 100644 index 00000000000..e5c2f5b2346 --- /dev/null +++ b/app/views/shared/dashboard/_no_filter_selected.html.haml @@ -0,0 +1,8 @@ +.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") diff --git a/app/views/shared/issuable/_filter.html.haml b/app/views/shared/issuable/_filter.html.haml index 58b37290cd5..994198e2f69 100644 --- a/app/views/shared/issuable/_filter.html.haml +++ b/app/views/shared/issuable/_filter.html.haml @@ -24,8 +24,9 @@ .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[]" } - .pull-right - = render 'shared/sort_dropdown' + - if !@no_filters_set + .pull-right + = render 'shared/sort_dropdown' - has_labels = @labels && @labels.any? .row-content-block.second-block.filtered-labels{ class: ("hidden" unless has_labels) } |