[spalenque] - #14539 * changes on software page

Author: santipalenque

software/code/infrastructure/active_records/OpenStackComponentCategory.php

@@ -21,6 +21,7 @@ class OpenStackComponentCategory extends DataObject implements IOpenStackCompone
     static $db = array
     (
         'Name'              => 'Varchar(255)',
+        'Label'             => 'Varchar(255)',
         'Description'       => 'Text',
         'Slug'              => 'Varchar(255)',
         'Order'             => 'Int',
@@ -62,6 +63,10 @@ protected function onBeforeWrite()
             $this->Slug = $checkSlug;
         }
 
+        if (empty($this->Label)) {
+            $this->Label = $this->Name;
+        }
+
         // if removed from a collection of subcategories we disable the category
         if (!$this->ParentCategoryID && $this->isChanged('ParentCategoryID')) {
             $this->Enabled = 0;

software/code/tasks/IngestOpenStackComponentsDataCronTask.php

@@ -303,25 +303,30 @@ private function processComponentsAndCategories()
 
                 foreach($categoryYaml['tabs'] as $tab) {
                     $subcatName = $tab['name'];
-                    //echo sprintf("- cat %s ", $subcatName).PHP_EOL;
+                    $subcatDesc = $tab['prelude'];
+                    //echo sprintf("- cat %s - %s ", $subcatName, $subcatDesc).PHP_EOL;
 
                     // one level categories will have a tab with same name as category, so we skip the level
                     if ($subcatName == $categoryName) {
                         $subcat = $category;
+                        $subcat->Description = $subcatDesc;
+                        $subcat->write();
                     } else {
                         $subcat = OpenStackComponentCategory::get()->filter('Name', $subcatName)->first();
                         if (!$subcat) {
                             $subcat = new OpenStackComponentCategory();
                             $subcat->Name = $subcatName;
                         }
                         $subcat->Enabled = 1;
+                        $subcat->Description = $subcatDesc;
                         $subcat->ParentCategoryID = $category->ID;
                         $subcat->Order = $subCatOrder;
                         $subcat->write();
 
                         $subCatOrder++;
                     }
 
+
                     $subSubCatOrder = 1;
                     foreach($tab['categories'] as $subcategory) {
                         // DEBUG

software/code/ui/admin/OpenStackComponentCategoryAdminUI.php

@@ -17,6 +17,7 @@ final class OpenStackComponentCategoryAdminUI extends DataExtension
 
     private static $summary_fields = [
         'Name'          => 'Name',
+        'Label'         => 'Label',
         'Description'   => 'Description',
         'Enabled'       => 'Enabled'
     ];
@@ -34,6 +35,7 @@ public function updateCMSFields(FieldList $fields)
         $fields->push(new LiteralField("Title", "<h2>OpenStack Component Category</h2>"));
         $fields->push(new CheckboxField("Enabled", "Enabled"));
         $fields->push(new TextField("Name", "Name"));
+        $fields->push(new TextField("Label", "Label"));
         $fields->push(new TextField("Slug", "Slug"));
         $fields->push(new TextField("Description", "Description"));
 

software/templates/Layout/Includes/SoftwareHomePage_MainNavMenu.ss

@@ -4,7 +4,7 @@
         <ul class="nav nav-tabs project-tabs">
             <li <% if Active == 'overview' %>class="active"<% end_if %>><a href="$Top.Link"><%t Software.OVERVIEW 'Overview' %></a></li>
             <% loop $Top.getParentComponentCategories() %>
-                <li <% if Active == $ID %>class="active"<% end_if %>><a href="$Top.Link('project-navigator')/{$Slug}">$Name</a></li>
+                <li <% if Active == $ID %>class="active"<% end_if %>><a href="$Top.Link('project-navigator')/{$Slug}">$Label</a></li>
             <% end_loop %>
             <% if $Top.HasAvailableSampleConfigTypes %>
                 <li <% if Active == 'sample-configs' %>class="active"<% end_if %>><a href="$Top.Link(sample-configs)"><%t Software.SAMPLE_CONFIGURATIONS 'Sample Configurations' %></a></li>
@@ -24,7 +24,7 @@
         <ul class="dropdown-menu">
             <li <% if Active == 'overview' %>class="active"<% end_if %>><a href="$Top.Link"><%t Software.OVERVIEW 'Overview' %></a></li>
             <% loop $Top.getParentComponentCategories() %>
-                <li <% if Active == $ID %>class="active"<% end_if %>><a href="$Top.Link('project-navigator')/{$Slug}">$Name</a></li>
+                <li <% if Active == $ID %>class="active"<% end_if %>><a href="$Top.Link('project-navigator')/{$Slug}">$Label</a></li>
             <% end_loop %>
             <% if $Top.HasAvailableSampleConfigTypes %>
                 <li <% if Active == 'sample-configs' %>class="active"<% end_if %>><a href="$Top.Link(sample-configs)"><%t Software.SAMPLE_CONFIGURATIONS 'Sample Configurations' %></a></li>

software/ui/source/js/openstack-category-nav.tag

@@ -18,7 +18,7 @@
                 </button>
                 <ul class="dropdown-menu">
                     <li class="category-item" each={ categories } >
-                        <a id="{ 'category_' + ID }" data-slug={ Slug } href="#" data-id="{ ID }" onclick={ selectedCategory }>{ Name }</a>
+                        <a id="{ 'category_' + ID }" data-slug={ Slug } href="#" data-id="{ ID }" onclick={ selectedCategory }>{ Label }</a>
                     </li>
                 </ul>
             </div>

software/ui/source/js/service-group.tag

@@ -5,7 +5,7 @@ require('./t.tag');
 <service-group>
     <div class="row">
         <div class="col-sm-12 all-projects-wrapper">
-            <h3><t entity="Software.SERVICES_SECTION_TITLE" text={ category.Name } /></h3>
+            <h3><t entity="Software.SERVICES_SECTION_TITLE" text={ category.Label } /></h3>
             <p><t entity="Software.SERVICES_SECTION_DESCRIPTION" text={ category.Description } /></p>
             <p></p>
         </div>
@@ -16,7 +16,7 @@ require('./t.tag');
                 <div class="col-sm-12">
                     <p class="service-section-title">
                         <strong>
-                            <t entity="Software.SERVICES_SECTION_TITLE" text={ subcategory.category.Name } />
+                            <t entity="Software.SERVICES_SECTION_TITLE" text={ subcategory.category.Label } />
                         </strong>
                     </p>
                 </div>