Commit 6446debb authored by Doug Stull's avatar Doug Stull

Remove license summary from full license page

- not needed as it just links back to same page and provides
  info already present on the page.
parent 64b2f535
...@@ -10,6 +10,8 @@ ...@@ -10,6 +10,8 @@
= notice[:message].html_safe = notice[:message].html_safe
- if @license.present? && show_license_breakdown? - if @license.present? && show_license_breakdown?
.license-panel.gl-mt-5
= render_if_exists 'admin/licenses/summary'
= render_if_exists 'admin/licenses/breakdown' = render_if_exists 'admin/licenses/breakdown'
.admin-dashboard.gl-mt-3 .admin-dashboard.gl-mt-3
......
...@@ -17,26 +17,7 @@ ...@@ -17,26 +17,7 @@
- billable_users_link_start = '<a href="%{url}" target="_blank" rel="noopener noreferrer nofollow">'.html_safe % { url: billable_users_url } - billable_users_link_start = '<a href="%{url}" target="_blank" rel="noopener noreferrer nofollow">'.html_safe % { url: billable_users_url }
- link_end = '</a>'.html_safe - link_end = '</a>'.html_safe
.license-panel.gl-mt-5 .d-flex.gl-mb-5
.gl-mb-5.info-well.dark-well
.gl-display-flex.gl-justify-content-space-between.gl-align-items-center.gl-p-5
%div
%h4.gl-mt-0
= _('License overview')
%p.gl-mb-0
= sprite_icon('license', css_class: 'gl-fill-gray-700')
%span.gl-ml-3
= _('Plan:')
%strong= @license.plan.capitalize
%span.gl-ml-5
= render 'admin/licenses/license_status'
%span.gl-ml-5
= _('Licensed to:')
%strong= @license.licensee['Name']
= "(#{@license.licensee['Email']})"
%div
= link_to 'View details', admin_license_path, class: "gl-button btn btn-secondary"
.d-flex.gl-mb-5
.col-sm-6.d-flex.pl-0 .col-sm-6.d-flex.pl-0
.info-well.dark-well.gl-mb-0 .info-well.dark-well.gl-mb-0
.well-segment.well-centered .well-segment.well-centered
...@@ -60,7 +41,7 @@ ...@@ -60,7 +41,7 @@
%hr %hr
%p %p
= _('This is the number of %{billable_users_link_start}billable users%{link_end} on your installation, and this is the minimum number you need to purchase when you renew your license.').html_safe % { billable_users_link_start: billable_users_link_start, link_end: link_end } = _('This is the number of %{billable_users_link_start}billable users%{link_end} on your installation, and this is the minimum number you need to purchase when you renew your license.').html_safe % { billable_users_link_start: billable_users_link_start, link_end: link_end }
.d-flex.gl-pb-5 .d-flex.gl-pb-5
.col-sm-6.d-flex.pl-0 .col-sm-6.d-flex.pl-0
.info-well.dark-well.flex-fill.gl-mb-0 .info-well.dark-well.flex-fill.gl-mb-0
.well-segment.well-centered .well-segment.well-centered
......
.gl-mb-5.info-well.dark-well
.gl-display-flex.gl-justify-content-space-between.gl-align-items-center.gl-p-5
%div
%h4.gl-mt-0
= _('License overview')
%p.gl-mb-0
= sprite_icon('license', css_class: 'gl-fill-gray-700')
%span.gl-ml-3
= _('Plan:')
%strong= @license.plan.capitalize
%span.gl-ml-5
= render 'admin/licenses/license_status'
%span.gl-ml-5
= _('Licensed to:')
%strong= @license.licensee['Name']
= "(#{@license.licensee['Email']})"
%div
= link_to 'View details', admin_license_path, class: "gl-button btn btn-secondary"
...@@ -18,6 +18,7 @@ ...@@ -18,6 +18,7 @@
- if @license.present? - if @license.present?
= render 'info' = render 'info'
.license-panel.gl-mt-5
= render 'breakdown' = render 'breakdown'
- if @licenses.present? - if @licenses.present?
......
---
title: Remove admin/license page duplicate summary
merge_request: 46827
author:
type: changed
...@@ -15,6 +15,7 @@ RSpec.describe 'admin/licenses/show.html.haml' do ...@@ -15,6 +15,7 @@ RSpec.describe 'admin/licenses/show.html.haml' do
render render
expect(rendered).to have_content('Buy License') expect(rendered).to have_content('Buy License')
expect(rendered).not_to have_content('License overview')
end end
end end
......
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