diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-08-20 21:42:06 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-08-20 21:42:06 +0300 |
commit | 6e4e1050d9dba2b7b2523fdd1768823ab85feef4 (patch) | |
tree | 78be5963ec075d80116a932011d695dd33910b4e /app/views/dashboard | |
parent | 1ce776de4ae122aba3f349c02c17cebeaa8ecf07 (diff) |
Add latest changes from gitlab-org/gitlab@13-3-stable-ee
Diffstat (limited to 'app/views/dashboard')
-rw-r--r-- | app/views/dashboard/_activities.html.haml | 4 | ||||
-rw-r--r-- | app/views/dashboard/_projects_head.html.haml | 1 | ||||
-rw-r--r-- | app/views/dashboard/projects/index.html.haml | 8 | ||||
-rw-r--r-- | app/views/dashboard/projects/shared/_common.html.haml | 13 | ||||
-rw-r--r-- | app/views/dashboard/projects/starred.html.haml | 15 |
5 files changed, 25 insertions, 16 deletions
diff --git a/app/views/dashboard/_activities.html.haml b/app/views/dashboard/_activities.html.haml index 2db3e35250f..d617ee0e4cc 100644 --- a/app/views/dashboard/_activities.html.haml +++ b/app/views/dashboard/_activities.html.haml @@ -1,8 +1,8 @@ .nav-block.activities = render 'shared/event_filter' .controls - = link_to dashboard_projects_path(rss_url_options), class: 'btn d-none d-sm-inline-block has-tooltip', title: 'Subscribe' do - %i.fa.fa-rss + = link_to dashboard_projects_path(rss_url_options), class: 'btn gl-button btn-default btn-icon d-none d-sm-inline-flex has-tooltip', title: 'Subscribe' do + = sprite_icon('rss', css_class: 'qa-rss-icon gl-icon') .content_list .loading diff --git a/app/views/dashboard/_projects_head.html.haml b/app/views/dashboard/_projects_head.html.haml index 5e78749fee2..fe91f9859f9 100644 --- a/app/views/dashboard/_projects_head.html.haml +++ b/app/views/dashboard/_projects_head.html.haml @@ -26,6 +26,7 @@ = nav_link(page: [explore_root_path, trending_explore_projects_path, starred_explore_projects_path, explore_projects_path]) do = link_to explore_root_path, data: {placement: 'right'} do = _("Explore projects") + = render_if_exists "dashboard/removed_projects_tab", removed_projects_count: @removed_projects_count - unless feature_project_list_filter_bar .nav-controls = render 'shared/projects/search_form' diff --git a/app/views/dashboard/projects/index.html.haml b/app/views/dashboard/projects/index.html.haml index 2e7eab87af3..54a5624c6dd 100644 --- a/app/views/dashboard/projects/index.html.haml +++ b/app/views/dashboard/projects/index.html.haml @@ -3,6 +3,14 @@ = content_for :meta_tags do = auto_discovery_link_tag(:atom, dashboard_projects_url(rss_url_options), title: "All activity") +- if show_customize_homepage_banner?(@customize_homepage) + = content_for :customize_homepage_banner do + .d-none.d-md-block{ class: "gl-pt-6! gl-pb-2! #{(container_class unless @no_container)} #{@content_class}" } + .js-customize-homepage-banner{ data: { svg_path: image_path('illustrations/monitoring/getting_started.svg'), + preferences_behavior_path: profile_preferences_path(anchor: 'behavior'), + callouts_path: user_callouts_path, + callouts_feature_id: UserCalloutsHelper::CUSTOMIZE_HOMEPAGE } } + = render_dashboard_gold_trial(current_user) - page_title _("Projects") diff --git a/app/views/dashboard/projects/shared/_common.html.haml b/app/views/dashboard/projects/shared/_common.html.haml new file mode 100644 index 00000000000..aa55f5a4e9c --- /dev/null +++ b/app/views/dashboard/projects/shared/_common.html.haml @@ -0,0 +1,13 @@ +- @hide_top_links = true +- breadcrumb_title _("Projects") +- header_title _("Projects"), dashboard_projects_path + += render_dashboard_gold_trial(current_user) + += render "projects/last_push" += render 'dashboard/projects_head', project_tab_filter: :starred + +- if params[:filter_projects] || any_projects?(@projects) + = render 'projects' +- else + = render empty_page diff --git a/app/views/dashboard/projects/starred.html.haml b/app/views/dashboard/projects/starred.html.haml index 2924918aa4f..f1e8f262eed 100644 --- a/app/views/dashboard/projects/starred.html.haml +++ b/app/views/dashboard/projects/starred.html.haml @@ -1,14 +1 @@ -- @hide_top_links = true -- breadcrumb_title _("Projects") -- page_title _("Starred Projects") -- header_title _("Projects"), dashboard_projects_path - -= render_dashboard_gold_trial(current_user) - -= render "projects/last_push" -= render 'dashboard/projects_head', project_tab_filter: :starred - -- if params[:filter_projects] || any_projects?(@projects) - = render 'projects' -- else - = render 'starred_empty_state' += render partial: 'dashboard/projects/shared/common', locals: {page_title: _('Starred Projects'), empty_page: 'starred_empty_state'} |