Commit d112cc07 authored by Natalia Tepluhina's avatar Natalia Tepluhina

Merge branch...

Merge branch '32419-growth-conversion-experiment-test-new-admin-upgrade-design-copy-for-issue-weights-locked-feature' into 'master'

Upgrade design/copy for issue weights locked feature

See merge request gitlab-org/gitlab!17352
parents 13b66cee b628d324
...@@ -27,3 +27,4 @@ ...@@ -27,3 +27,4 @@
.border-style-solid { border-style: solid; } .border-style-solid { border-style: solid; }
.border-color-blue-300 { border-color: $blue-300; } .border-color-blue-300 { border-color: $blue-300; }
.border-color-default { border-color: $border-color; } .border-color-default { border-color: $border-color; }
.box-shadow-default { box-shadow: 0 2px 4px 0 $black-transparent; }
---
title: Upgrade design/copy for issue weights locked feature
merge_request: 17352
author:
type: changed
...@@ -8,23 +8,26 @@ ...@@ -8,23 +8,26 @@
%span No %span No
.title.hide-collapsed .title.hide-collapsed
= _('Weight') = _('Weight')
.dropdown .hide-collapsed.js-toggle-container.promotion-issue-weight-sidebar-message
.dropdown-menu.promotion-issue-sidebar-message = s_('Promotions|This feature is locked.')
.dropdown-title %a.btn-link.js-toggle-button.js-weight-sidebar-callout{ href: '#' }
%span = s_('Promotions|Learn more')
= _('Change Weight') = icon('chevron-down')
%button.dropdown-title-button.dropdown-menu-close{ "aria-label" => _('Close'), :type => "button" } .js-toggle-content{ style:'display: none' }
%i.fa.fa-times.dropdown-menu-close-icon{ "aria-hidden" => "true", "data-hidden" => "true" }
%div %div
%h4
= s_('Promotions|Weighting your issue')
%p
= image_tag('promotions/img-paid-feature-weight-sidebar.png', class: 'w-100 box-shadow-default')
%p
= s_('Promotions|When you have a lot of issues, it can be hard to get an overview. By adding a weight to your issues, you can get a better idea of the effort, cost, required time, or value of each, and so better manage them.')
%p %p
- if Gitlab::CurrentSettings.should_check_namespace_plan? - if Gitlab::CurrentSettings.should_check_namespace_plan?
= _('Upgrade your plan to activate Issue weight.') - subscription_link_url = "#{EE::SUBSCRIPTIONS_URL}/plans"
- subscription_link_start = '<a href="%{url}" target="_blank" class="btn-link>"'.html_safe % { url: subscription_link_url }
= s_("Promotions|See the other features in the %{subscription_link_start}bronze plan%{subscriptions_link_end}").html_safe % { subscription_link_start: subscription_link_start, subscription_link_end: '</a>'.html_safe }
- else - else
= _('Improve issues management with Issue weight and GitLab Enterprise Edition.') = _('Improve issues management with Issue weight and GitLab Enterprise Edition.')
= link_to _('Read more'), help_page_path('workflow/issue_weight.html'), class: 'btn-link', target: '_blank'
%div %div
= render 'shared/promotions/promotion_link_project', short_form: true = render 'shared/promotions/promotion_link_project', short_form: true, target_blank: true
= link_to s_("Promotions|Don't show me this again"), '#', class: ['btn', 'js-close', 'js-close-callout'] = link_to s_("Promotions|Don't show me this again"), '#', class: ['btn', 'js-close', 'js-close-callout']
.hide-collapsed
= s_('Promotions|This feature is locked.')
= link_to s_('Promotions|Upgrade plan') , '#', class: 'btn-link', data: { toggle: "dropdown", target: ".js-weight-sidebar-callout", display: 'static' }
- short_form = local_assigns.fetch :short_form, false - short_form = local_assigns.fetch :short_form, false
- target_blank = local_assigns.fetch :target_blank, false
- if Gitlab::CurrentSettings.should_check_namespace_plan? - if Gitlab::CurrentSettings.should_check_namespace_plan?
- namespace = @project&.namespace || @group - namespace = @project&.namespace || @group
- if can?(current_user, :admin_namespace, namespace) - if can?(current_user, :admin_namespace, namespace)
= link_to _('Upgrade your plan'), upgrade_plan_url, class: 'btn btn-primary btn-block' = link_to _('Upgrade your plan'), upgrade_plan_url, class: 'btn btn-primary btn-block', target: target_blank ? '_blank' : '_self'
- elsif namespace.is_a?(Group) - elsif namespace.is_a?(Group)
%p= _('Contact an owner of group %{namespace_name} to upgrade the plan.') % { namespace_name: namespace.name } %p= _('Contact an owner of group %{namespace_name} to upgrade the plan.') % { namespace_name: namespace.name }
- else - else
......
...@@ -319,16 +319,16 @@ describe 'Promotions', :js do ...@@ -319,16 +319,16 @@ describe 'Promotions', :js do
visit project_issue_path(project, issue) visit project_issue_path(project, issue)
wait_for_requests wait_for_requests
find('.js-weight-sidebar-callout .btn-link').click find('.btn-link.js-toggle-button.js-weight-sidebar-callout').click
expect(find('.promotion-issue-sidebar-message')).to have_content 'Improve issues management with Issue weight and GitLab Enterprise Edition' expect(find('.promotion-issue-weight-sidebar-message')).to have_content 'Improve issues management with Issue weight and GitLab Enterprise Edition'
end end
it 'is removed after dismissal' do it 'is removed after dismissal' do
visit project_issue_path(project, issue) visit project_issue_path(project, issue)
wait_for_requests wait_for_requests
find('.js-weight-sidebar-callout .btn-link').click find('.btn-link.js-toggle-button.js-weight-sidebar-callout').click
find('.js-weight-sidebar-callout .js-close-callout').click find('.js-weight-sidebar-callout .js-close-callout').click
expect(page).not_to have_selector('.js-weight-sidebar-callout') expect(page).not_to have_selector('.js-weight-sidebar-callout')
...@@ -338,7 +338,7 @@ describe 'Promotions', :js do ...@@ -338,7 +338,7 @@ describe 'Promotions', :js do
visit project_issue_path(project, issue) visit project_issue_path(project, issue)
wait_for_requests wait_for_requests
find('.js-weight-sidebar-callout .btn-link').click find('.btn-link.js-toggle-button.js-weight-sidebar-callout').click
find('.js-weight-sidebar-callout .js-close-callout').click find('.js-weight-sidebar-callout .js-close-callout').click
visit project_issue_path(project, issue) visit project_issue_path(project, issue)
...@@ -349,8 +349,8 @@ describe 'Promotions', :js do ...@@ -349,8 +349,8 @@ describe 'Promotions', :js do
visit project_issue_path(project, issue) visit project_issue_path(project, issue)
wait_for_requests wait_for_requests
find('.js-weight-sidebar-callout .btn-link').click find('.btn-link.js-toggle-button.js-weight-sidebar-callout').click
find('.js-weight-sidebar-callout .dropdown-menu-close').click find('.btn-link.js-toggle-button.js-weight-sidebar-callout').click
expect(page).to have_selector('.js-weight-sidebar-callout') expect(page).to have_selector('.js-weight-sidebar-callout')
expect(page).to have_selector('.promotion-issue-sidebar-message', visible: false) expect(page).to have_selector('.promotion-issue-sidebar-message', visible: false)
......
...@@ -2917,9 +2917,6 @@ msgstr "" ...@@ -2917,9 +2917,6 @@ msgstr ""
msgid "Certificate (PEM)" msgid "Certificate (PEM)"
msgstr "" msgstr ""
msgid "Change Weight"
msgstr ""
msgid "Change assignee" msgid "Change assignee"
msgstr "" msgstr ""
...@@ -13486,12 +13483,24 @@ msgstr "" ...@@ -13486,12 +13483,24 @@ msgstr ""
msgid "Promotions|Epics let you manage your portfolio of projects more efficiently and with less effort by tracking groups of issues that share a theme, across projects and milestones." msgid "Promotions|Epics let you manage your portfolio of projects more efficiently and with less effort by tracking groups of issues that share a theme, across projects and milestones."
msgstr "" msgstr ""
msgid "Promotions|Learn more"
msgstr ""
msgid "Promotions|See the other features in the %{subscription_link_start}bronze plan%{subscriptions_link_end}"
msgstr ""
msgid "Promotions|This feature is locked." msgid "Promotions|This feature is locked."
msgstr "" msgstr ""
msgid "Promotions|Upgrade plan" msgid "Promotions|Upgrade plan"
msgstr "" msgstr ""
msgid "Promotions|Weighting your issue"
msgstr ""
msgid "Promotions|When you have a lot of issues, it can be hard to get an overview. By adding a weight to your issues, you can get a better idea of the effort, cost, required time, or value of each, and so better manage them."
msgstr ""
msgid "Prompt users to upload SSH keys" msgid "Prompt users to upload SSH keys"
msgstr "" msgstr ""
...@@ -18230,9 +18239,6 @@ msgstr "" ...@@ -18230,9 +18239,6 @@ msgstr ""
msgid "Upgrade your plan to activate Group Webhooks." msgid "Upgrade your plan to activate Group Webhooks."
msgstr "" msgstr ""
msgid "Upgrade your plan to activate Issue weight."
msgstr ""
msgid "Upgrade your plan to improve Issue boards." msgid "Upgrade your plan to improve Issue boards."
msgstr "" msgstr ""
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment