From 3b1080159de9bb36177351c343647b3194c515a8 Mon Sep 17 00:00:00 2001
From: JEFFREY-Bonson <jeffrey.bonson@ibm.com>
Date: Wed, 29 Nov 2023 14:54:25 +0530
Subject: [PATCH] Move service catalog description to another line in form and
 summary pages

---
 app/helpers/catalog_helper.rb                |  3 ++-
 app/views/catalog/_form_basic_info.html.haml | 14 +++++++++-----
 2 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/app/helpers/catalog_helper.rb b/app/helpers/catalog_helper.rb
index 0fdeaecfb94..9d36e23dcb5 100644
--- a/app/helpers/catalog_helper.rb
+++ b/app/helpers/catalog_helper.rb
@@ -101,7 +101,8 @@ def catalog_basic_information(record, sb_params, tenants_tree)
     prov_data = [prov_types[:template], prov_types[:ovf]].include?(record.prov_type) && catalog_provision?(record, :playbook) ? provisioning : nil
     data = {:title => _('Basic Information'), :mode => "miq_catalog_basic_information"}
     rows = []
-    rows.push(row_data(_('Name / Description'), "#{record.name} / #{record.description}"))
+    rows.push(row_data(_('Name'), record.name))
+    rows.push(row_data(_('Description'), record.description))
     rows.push(row_data(_('Display in Catalog'), {:input => "checkbox", :name => "display", :checked => record.display, :disabled => true, :label => ''}))
     rows.push(row_data(_('Catalog'), record.service_template_catalog ? record.service_template_catalog.name : _('Unassigned')))
     rows.push(row_data(_('Zone'), record.zone ? record.zone.name : '')) unless record.composite?
diff --git a/app/views/catalog/_form_basic_info.html.haml b/app/views/catalog/_form_basic_info.html.haml
index dae03777a59..fcd72f7009f 100644
--- a/app/views/catalog/_form_basic_info.html.haml
+++ b/app/views/catalog/_form_basic_info.html.haml
@@ -7,7 +7,7 @@
   .form-horizontal
     .form-group
       %label.col-md-2.control-label
-        = _('Name / Description')
+        = _('Name')
       .col-md-10.no-padding
         .col-md-3
           = text_field_tag("name",
@@ -15,14 +15,18 @@
                            :maxlength         => 40,
                            :class             => "form-control",
                            "data-miq_observe" => {:interval => '.5', :url => url}.to_json)
-        .col-md-9
-          .col-md-10.no-padding
-            = text_field_tag("description",
+            
+    = javascript_tag(javascript_focus('name'))
+    .form-group
+      %label.col-md-2.control-label
+        = _('Description')
+      .col-md-9.no-padding
+        .col-md-12
+          = text_field_tag("description",
                             @edit[:new][:description],
                             :maxlength         => 60,
                             :class             => "form-control long_text",
                             "data-miq_observe" => {:interval => '.5', :url => url}.to_json)
-    = javascript_tag(javascript_focus('name'))
     .form-group
       %label.col-md-2.control-label
         = _('Display in Catalog')