Skip to content
代码片段 群组 项目
未验证 提交 0aa1b4a7 编辑于 作者: Peter Hegman's avatar Peter Hegman 提交者: GitLab
浏览文件

Merge branch 'update-productivity-analytics-illustrations' into 'master'

Update Productivity Analytics empty state illustrations

See merge request https://gitlab.com/gitlab-org/gitlab/-/merge_requests/167684



Merged-by: default avatarPeter Hegman <phegman@gitlab.com>
Approved-by: default avatarSascha Eggenberger <seggenberger@gitlab.com>
Approved-by: default avatarJack Chapman <jachapman@gitlab.com>
Approved-by: default avatarGrzegorz Bizon <grzegorz@gitlab.com>
Approved-by: default avatarPeter Hegman <phegman@gitlab.com>
Co-authored-by: default avatarJulia Miocene <jmiocene@gitlab.com>
No related branches found
No related tags found
无相关合并请求
...@@ -171,7 +171,6 @@ export default { ...@@ -171,7 +171,6 @@ export default {
__('Productivity analytics can help identify the problems that are delaying your team') __('Productivity analytics can help identify the problems that are delaying your team')
" "
:svg-path="emptyStateSvgPath" :svg-path="emptyStateSvgPath"
:svg-height="null"
:description=" :description="
__( __(
'Start by choosing a group to start exploring the merge requests in that group. You can then proceed to filter by projects, labels, milestones and authors.', 'Start by choosing a group to start exploring the merge requests in that group. You can then proceed to filter by projects, labels, milestones and authors.',
...@@ -183,7 +182,6 @@ export default { ...@@ -183,7 +182,6 @@ export default {
class="js-empty-state" class="js-empty-state"
:title="__('You don’t have access to Productivity Analytics in this group')" :title="__('You don’t have access to Productivity Analytics in this group')"
:svg-path="noAccessSvgPath" :svg-path="noAccessSvgPath"
:svg-height="null"
:description=" :description="
__( __(
'Only ‘Reporter’ roles and above on tiers Premium and above can see Productivity Analytics.', 'Only ‘Reporter’ roles and above on tiers Premium and above can see Productivity Analytics.',
......
...@@ -3,12 +3,10 @@ ...@@ -3,12 +3,10 @@
- data_attributes = @request_params.valid? ? @request_params.to_data_attributes : @request_params.to_default_data_attributes - data_attributes = @request_params.valid? ? @request_params.to_data_attributes : @request_params.to_default_data_attributes
#js-productivity-analytics{ data: data_attributes.merge(hide_group_drop_down: 'true') } #js-productivity-analytics{ data: data_attributes.merge(hide_group_drop_down: 'true') }
.mb-3 = render ::Layouts::PageHeadingComponent.new(_('Productivity Analytics'))
%h3
= _('Productivity Analytics')
.row-content-block.second-block.gl-flex.flex-column.flex-lg-row.mt-3.py-2.px-3 .row-content-block.second-block.gl-flex.flex-column.flex-lg-row.mt-3.py-2.px-3
.js-group-project-select-container .js-group-project-select-container
.js-search-bar.filter-container.hide.gl-mr-0.mr-lg-3 .js-search-bar.filter-container.hide.gl-mr-0.mr-lg-3
= render 'shared/issuable/search_bar', type: :productivity_analytics, placeholder: _('Filter results...') = render 'shared/issuable/search_bar', type: :productivity_analytics, placeholder: _('Filter results...')
.js-timeframe-container{ data: { start_date: ProductivityAnalytics.start_date } } .js-timeframe-container{ data: { start_date: ProductivityAnalytics.start_date } }
.js-productivity-analytics-app-container{ data: { endpoint: group_analytics_productivity_analytics_path(@group), empty_state_svg_path: image_path('illustrations/productivity-analytics-empty-state.svg'), no_access_svg_path: image_path('illustrations/analytics/no-access.svg') } } .js-productivity-analytics-app-container{ data: { endpoint: group_analytics_productivity_analytics_path(@group), empty_state_svg_path: image_path('illustrations/empty-state/empty-dashboard-md.svg'), no_access_svg_path: image_path('illustrations/status/status-fail-md.svg') } }
0% 加载中 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册