[spalenque] - #14400 * add space between links

OpenStackweb · Oct 26, 2018 · ba67762 · ba67762
1 parent 69fca46
commit ba67762
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/software/code/tasks/IngestOpenStackComponentsDataCronTask.php b/software/code/tasks/IngestOpenStackComponentsDataCronTask.php
@@ -385,6 +385,7 @@ private function processComponentsAndCategories()
 
                             if (isset($component['links'])) {
                                 foreach ($component['links'] as $linkArray) {
+                                    if (!is_array($linkArray)) continue;
                                     foreach ($linkArray as $label => $link) {
                                         $linkObj = OpenStackComponentLink::get()->filter(['Label' => $label, 'URL' => $link])->First();
 

diff --git a/software/templates/Layout/SoftwareHomePage_getComponent.ss b/software/templates/Layout/SoftwareHomePage_getComponent.ss
@@ -18,16 +18,16 @@
                     <% if $Component.DocsLink().Exists() %>
                     <p>
                         <a href="{$Component.DocsLink().URL}" target="_blank">
-                            <i class="fa fa-book" aria-hidden="true"></i>
-                            {$Component.DocsLink().Label}
+                            <%-- do not separate icon from label --%>
+                            <i class="fa fa-book" aria-hidden="true" style="margin-right: 8px"></i><span>{$Component.DocsLink().Label}</span>
                         </a>
                     </p>
                     <% end_if %>
                     <% if $Component.DownloadLink().Exists() %>
                         <p>
                             <a href="{$Component.DownloadLink().URL}" target="_blank">
-                                <i class="fa fa-cloud-download" aria-hidden="true"></i>
-                                {$Component.DownloadLink().Label}
+                                <%-- do not separate icon from label --%>
+                                <i class="fa fa-cloud-download" aria-hidden="true" style="margin-right: 8px"></i><span>{$Component.DownloadLink().Label}</span>
                             </a>
                         </p>
                     <% end_if %>
@@ -58,6 +58,7 @@
                         <div class="col-sm-12">
                             <% loop $Component.Links() %>
                                 <a class="component-link" href="{$URL}">{$Label}</a>
+                                <% if not $Last %><span style="margin-right:10px">|</span><% end_if %>
                             <% end_loop %>
                         </div>
                     </div>