diff --git a/web/html/javascript/spacewalk-essentials.js b/web/html/javascript/spacewalk-essentials.js
index 1c8aa53d2ff4..ae02e3776401 100644
--- a/web/html/javascript/spacewalk-essentials.js
+++ b/web/html/javascript/spacewalk-essentials.js
@@ -20,16 +20,6 @@ function onDocumentReadyGeneral(){
scrollTopBehavior();
}
-function adaptFluidColLayout() {
- jQuery('.col-class-calc-width').each(function() {
- var totalWidth = jQuery(this).parent().width();
- jQuery(this).siblings('.col').each(function() {
- totalWidth = Math.floor(totalWidth - jQuery(this).outerWidth());
- });
- jQuery(this).css('width', totalWidth - 10);
- });
-}
-
/* Getting the screen size to create a fixed padding-bottom in the Section tag to make both columns the same size */
// On window load and resize
jQuery(window).on("load resize", alignContentDimensions);
@@ -69,7 +59,6 @@ function scrollTopBehavior() {
// A container function for what should be fired
// to set HTML tag dimensions
function alignContentDimensions() {
- adaptFluidColLayout();
sstStyle();
navbarToggleMobile();
}
diff --git a/web/html/src/branding/css/base/setup-wizard.less b/web/html/src/branding/css/base/setup-wizard.less
index a71d51bd4e82..d0599e3ced12 100644
--- a/web/html/src/branding/css/base/setup-wizard.less
+++ b/web/html/src/branding/css/base/setup-wizard.less
@@ -246,6 +246,10 @@ ul.product-list {
i {
margin: 0 auto;
}
+
+ &-description-width {
+ width: calc(100% - 29em);
+ }
}
}
li.list-row-odd {
diff --git a/web/html/src/branding/css/base/setup-wizard.scss b/web/html/src/branding/css/base/setup-wizard.scss
index 7a2bc51a6699..ff1abcc976b3 100644
--- a/web/html/src/branding/css/base/setup-wizard.scss
+++ b/web/html/src/branding/css/base/setup-wizard.scss
@@ -246,6 +246,10 @@ ul.product-list {
i {
margin: 0 auto;
}
+
+ &-description-width {
+ width: calc(100% - 29em);
+ }
}
}
li.list-row-odd {
diff --git a/web/html/src/manager/admin/setup/products/products.tsx b/web/html/src/manager/admin/setup/products/products.tsx
index a3fb61d08cb3..a8182c65d619 100644
--- a/web/html/src/manager/admin/setup/products/products.tsx
+++ b/web/html/src/manager/admin/setup/products/products.tsx
@@ -84,10 +84,11 @@ const _CHANNEL_STATUS = {
const _COLS = {
selector: { width: 2, um: "em" },
showSubList: { width: 2, um: "em" },
- description: { width: "auto", um: "" },
- arch: { width: 6, um: "em" },
+ description: { width: "", um: "" },
+ arch: { width: 5, um: "em" },
channels: { width: 7, um: "em" },
- mix: { width: 13, um: "em" },
+ recommended: { width: 9, um: "em" },
+ mix: { width: 4, um: "em" },
};
function loadMetadata() {
@@ -648,7 +649,7 @@ class CheckList extends React.Component {
um={this.props.bypassProps.cols.showSubList.um}
>
@@ -669,6 +670,13 @@ class CheckList extends React.Component {
>
{t("Channels")}
+
+ {t("Recommended")}
+
{
this.getNestedData(currentItem).some((i) => i.recommended)
) {
recommendedTogglerContent = (
-
+
);
}
@@ -1026,7 +1030,7 @@ class CheckListItem extends React.Component {
{showNestedDataIconContent}
@@ -1056,11 +1060,17 @@ class CheckListItem extends React.Component {
+ {recommendedTogglerContent}
+
+
- {recommendedTogglerContent}
{resyncActionContent}
diff --git a/web/spacewalk-web.changes.bisht-richa.fixed-alignment-issue-product-table b/web/spacewalk-web.changes.bisht-richa.fixed-alignment-issue-product-table
new file mode 100644
index 000000000000..94e431b6bcd9
--- /dev/null
+++ b/web/spacewalk-web.changes.bisht-richa.fixed-alignment-issue-product-table
@@ -0,0 +1,2 @@
+- Fixed alignment issue in the Product table
+- Added a title to Recommended column in the Products page
\ No newline at end of file