foreman_theme_satellite 16.2.0 → 16.2.2

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (10) hide show
  1. checksums.yaml +4 -4
  2. data/app/assets/stylesheets/foreman_theme_satellite/theme.scss +6 -16
  3. data/app/controllers/concerns/documentation_controller_branding.rb +2 -1
  4. data/app/overrides/layouts/base/eol_banner.html.erb.deface +6 -6
  5. data/lib/foreman_theme_satellite/documentation.rb +1 -1
  6. data/lib/foreman_theme_satellite/version.rb +1 -1
  7. data/lib/tasks/foreman_theme_satellite_tasks.rake +4 -1
  8. data/package.json +1 -1
  9. metadata +1 -2
  10. data/app/helpers/theme_discovery_helper.rb +0 -10
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 163343ae67522de8d9cf9ae884a4ce4828aeb5e5118779094d7fd29077e18357
4
- data.tar.gz: 7d0e0710022784af3c3cc3137c1188df4920a8d7137749739c0b67b29329813b
3
+ metadata.gz: bb170b54611ff66c807f9a005cc4d79c809455d58c61b19eb0d6d4db4f7e032e
4
+ data.tar.gz: 9d743b450a38a85ea7f0d27ca6459c89aabfeb7f61f5a9326154a00776f0199d
5
5
  SHA512:
6
- metadata.gz: 99582773fe98527d78f30410320054e9f32614d1162ae8c6185a064b420d9cd30c8a4570fa81576f4131f316bdd5a19094cebce7dc95f57cae73cfb97b318763
7
- data.tar.gz: 68d956140e9ee904ce6f710612d34d30fd3b88a59f574132f91db2be5adc1fd2122b0ed2e20573b70ed17708575b4b93ba9eba158053e8d544839255b3f54f32
6
+ metadata.gz: 18531434b04e89d40931779aab1f90f67d67aa4e98b97eb45bd27948398f122a28a259ff946d61c7e9433fc608bfba32ca9b7016dcea3c914afb9da4b6387db2
7
+ data.tar.gz: 2a745ad5d456dabbf10963153d2a17dc5349f4c5fe65539be03ccbf513901fe23e971ef368d5dc6a33365003af7c8fa692617921ca28255297ab04d8ebf28c26
data/app/assets/stylesheets/foreman_theme_satellite/theme.scss CHANGED
@@ -17,20 +17,10 @@
17
17
  overflow-x: auto;
18
18
  }
19
19
 
20
- #rails-app-content {
21
- --header-height: 70px;
22
- top: var(--header-height);
23
- height: calc(100% - var(--header-height));
24
-
25
- &.eol-banner {
26
- --banner-height: calc(
27
- 2 * var(--pf-v5-global--spacer--xs) +
28
- 2 * (var(--pf-v5-global--LineHeight--md) * var(--pf-v5-global--FontSize--sm))
29
- ); // banner height is line height and a small padding
30
- top: calc(
31
- var(--header-height) + var(--banner-height)
32
- );
33
-
34
- height: calc(100% - var(--header-height) - var(--banner-height));
35
- }
20
+ body.eol-banner-present {
21
+ --eol-banner-height: calc(
22
+ 2 * var(--pf-v5-global--spacer--xs) + 2 *
23
+ (var(--pf-v5-global--LineHeight--md) * var(--pf-v5-global--FontSize--sm))
24
+ ); // banner height is line height and a small padding
25
+ --header-height: (70px + var(--eol-banner-height));
36
26
  }
data/app/controllers/concerns/documentation_controller_branding.rb CHANGED
@@ -22,7 +22,8 @@ module DocumentationControllerBranding
22
22
  end
23
23
 
24
24
  def plugin_documentation_url
25
- ForemanThemeSatellite::Documentation::PLUGINS_DOCUMENTATION[plugin_documentation_params[:name]] || super
25
+ branded_url = ForemanThemeSatellite::Documentation::PLUGINS_DOCUMENTATION[plugin_documentation_params[:name]]
26
+ branded_url ? "#{documentation_root}/#{branded_url}" : super
26
27
  end
27
28
 
28
29
  def wiki_url(section: '')
data/app/overrides/layouts/base/eol_banner.html.erb.deface CHANGED
@@ -38,9 +38,9 @@ end %>
38
38
  } else {
39
39
  window.onload = function(e) {
40
40
  // We have to do it from a callback because the element may not exist yet
41
- const railsContainer = document.getElementById('rails-app-content');
42
- if (railsContainer) {
43
- railsContainer.classList.add('eol-banner');
41
+ const body = document.body;
42
+ if (body) {
43
+ body.classList.add('eol-banner-present');
44
44
  }
45
45
  }
46
46
  }
@@ -48,9 +48,9 @@ end %>
48
48
  const dismissButton = document.getElementById('satellite-oel-banner-dismiss-button');
49
49
  dismissButton.addEventListener('click', () => {
50
50
  element.style.display = 'none';
51
- const railsContainer = document.getElementById('rails-app-content');
52
- if (railsContainer) {
53
- railsContainer.classList.remove('eol-banner');
51
+ const body = document.body
52
+ if (body) {
53
+ body.classList.remove('eol-banner-present');
54
54
  }
55
55
  localStorage.setItem('satellite-eol-banner-dismissed', level);
56
56
  const now = new Date();
data/lib/foreman_theme_satellite/documentation.rb CHANGED
@@ -54,7 +54,7 @@ module ForemanThemeSatellite
54
54
  'Auditing' => "overview_concepts_and_deployment_considerations/index#glossary-of-terms-used-in-satellite_planning",
55
55
 
56
56
  # Install
57
- 'HTTP(S)Proxy' => "installing_satellite_server_in_a_connected_network_environment/index#Configuring_Server_with_an_HTTP_Proxy_satellite",
57
+ 'HTTP(S)Proxy' => "installing_satellite_server_in_a_connected_network_environment/index#configuring-satellite-server-to-use-an-http-proxy",
58
58
 
59
59
  # Misc
60
60
  'GettingHelp' => "https://access.redhat.com/products/red-hat-satellite/#support",
data/lib/foreman_theme_satellite/version.rb CHANGED
@@ -1,3 +1,3 @@
1
1
  module ForemanThemeSatellite
2
- VERSION = '16.2.0'.freeze
2
+ VERSION = '16.2.2'.freeze
3
3
  end
data/lib/tasks/foreman_theme_satellite_tasks.rake CHANGED
@@ -31,7 +31,10 @@ namespace :foreman_theme_satellite do
31
31
  .merge(ForemanThemeSatellite::Documentation::PLUGINS_DOCUMENTATION)
32
32
  .merge(ForemanThemeSatellite::Documentation.flat_docs_guides_links)
33
33
 
34
- failed = all_links.filter { |_key, doc_address| doc_address.include?('/html-single/') && !checker.test_link(doc_address) }
34
+ # The links are either
35
+ # - path fragments - managing_hosts/index#data-control-settings
36
+ # - full URLs - https://access.redhat.com/products/red-hat-satellite/#support
37
+ failed = all_links.filter { |_key, doc_address| !doc_address.start_with?('http') && !checker.test_link(doc_address) }
35
38
 
36
39
  abort((failed.map { |key, doc_address| "FAILED: Cannot find #{doc_address} in TOC for entry: #{key}" } + ["Total failed: #{failed.count} entries"]).join("\n")) unless failed.empty?
37
40
 
data/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "foreman_theme_satellite",
3
- "version": "16.2.0",
3
+ "version": "16.2.2",
4
4
  "description": "Satellite theme =============",
5
5
  "main": "index.js",
6
6
  "scripts": {
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: foreman_theme_satellite
3
3
  version: !ruby/object:Gem::Version
4
- version: 16.2.0
4
+ version: 16.2.2
5
5
  platform: ruby
6
6
  authors:
7
7
  - Shimon Stein
@@ -107,7 +107,6 @@ files:
107
107
  - app/helpers/provisioning_templates_helper_branding.rb
108
108
  - app/helpers/theme_application_helper.rb
109
109
  - app/helpers/theme_css_class_helper.rb
110
- - app/helpers/theme_discovery_helper.rb
111
110
  - app/helpers/theme_external_logout_helper.rb
112
111
  - app/helpers/theme_layout_helper.rb
113
112
  - app/helpers/theme_login_helper.rb
data/app/helpers/theme_discovery_helper.rb DELETED
@@ -1,10 +0,0 @@
1
- # frozen_string_literal: true
2
-
3
- # Overrides for functions used in helpers.
4
- module ThemeDiscoveryHelper
5
- # This override should be deprecated once discovery moves to use external links controller.
6
- # Tracked upstream under https://projects.theforeman.org/issues/33231
7
- def discovery_doc_url
8
- ForemanThemeSatellite::Documentation::PLUGINS_DOCUMENTATION['foreman_discovery']
9
- end
10
- end