Merge pull request #57 from zachlasiuk/main

updated categories, alternative package display, and support caveot display
ArmDeveloperEcosystem · Feb 5, 2024 · 3cc2244 · 3cc2244
2 parents 714145e + 7c1341a
commit 3cc2244
Show file tree

Hide file tree

Showing 5 changed files with 56 additions and 14 deletions.
diff --git a/category_parser.py b/category_parser.py
@@ -13,11 +13,17 @@
         # OBTAIN CATEGORY FROM FILE
         cat = None
         with open(os.path.join(content_dir, content_file), 'r') as f:
-            content_all = f.read()
-            start = content_all.find('---')
-            end = content_all.find('---', start + 3)
-            content_metadata = content_all[start+3:end].strip()
-            cat = yaml.safe_load(content_metadata).get('category')
+            for line in f:
+                if 'category:' in line:
+                    print(line.replace('category:','').strip())
+                    cat = line.replace('category:','').strip()
+                    break
+
+            #content_all = f.read()
+            #start = content_all.find('---')
+            #end = content_all.find('---', start + 3)
+            #content_metadata = content_all[start+3:end].strip()
+            #cat = yaml.safe_load(content_metadata).get('category')
         # ADD TO ACTIVE_CATS LIST IF NOT ALREADY PRESENT
         if cat in all_cats:
             if cat not in active_cats:

diff --git a/data/active_categories.yml b/data/active_categories.yml
@@ -1,10 +1,22 @@
+- CI/CD
+- Data-format
+- Databases - noSQL
+- Storage
 - Containers and Orchestration
 - Runtimes
-- Databases - noSQL
+- Networking
 - Compilers/Tools
 - Monitoring/Observability
+- Messaging/Comms
 - Databases - Big-data
+- Service Mesh
+- Video
+- E-commerce platforms
+- Crypto
+- Web Server
+- Languages and Frameworks
+- AI/ML
 - Distros
-- Storage
+- Compression
 - Operating System
-- Networking
+- Content mgmt platforms
diff --git a/themes/arm-design-system-hugo-theme/layouts/index.html b/themes/arm-design-system-hugo-theme/layouts/index.html
@@ -123,19 +123,25 @@
                                             <section class="u-flex sw-information">
                                                 <div class="field">Versions supported</div>                               
                                                 <div class="description">
-                                                    Minimum version effective on Arm servers: <span class="version-number">{{.Params.supported_minimum_version.version_number}}</span>+ <br>
+                                                    <span class="version-number">{{.Params.supported_minimum_version.version_number}}</span>+ is the minimum version effective on Arm servers. <br>
 
                                                     {{if .Params.optional_info.arm_recommended_minimum_version.version_number}}
                                                         For best performance and security, Arm recommends version <span class="version-number">{{.Params.optional_info.arm_recommended_minimum_version.version_number}}</span>+.
                                                     {{else}}
                                                         For best performance and security, always use the lastest version when possible.
                                                     {{end}}
-                                                    {{if .Params.optional_info.support_caveats}}
-                                                        <br>
-                                                        *Support Notes: {{.Params.optional_info.support_caveats }}
-                                                    {{end}}
+
+                                                </div>
+                                            </section>
+
+                                            {{if .Params.optional_info.support_caveats}}
+                                            <section class="u-flex sw-information">
+                                                <div class="field">Support Notes:</div>                               
+                                                <div class="description">
+                                                    {{.Params.optional_info.support_caveats | markdownify  }}
                                                 </div>
                                             </section>
+                                            {{end}}
 
                                             <section class="u-flex sw-information">
                                                 <div class="field">Download link</div>                               
@@ -177,7 +183,7 @@
                                                         {{.Params.optional_info.alternative_options }}
 
                                                     {{else}}
-                                                        No alternatives identified...yet. <a>Suggest an alternative here.</a>
+                                                        {{partial "eco-dashboard/github-alternative-suggestion.html" .  }}
                                                     {{end}}
                                                 </div>
                                             </section>

diff --git a/...m-design-system-hugo-theme/layouts/partials/eco-dashboard/active-filter-and-sort-bar.html b/...m-design-system-hugo-theme/layouts/partials/eco-dashboard/active-filter-and-sort-bar.html
@@ -36,9 +36,11 @@
     </div>
 
     <!-- Sorting display -->
+    {{/* 
     {{- if ne .page_type "tools" -}}
         <div id="sorting-bar">
             <span class="sorting-criteria active">Date</span>
         </div>
     {{- end -}}
+    */}}
 </div>
diff --git a/...esign-system-hugo-theme/layouts/partials/eco-dashboard/github-alternative-suggestion.html b/...esign-system-hugo-theme/layouts/partials/eco-dashboard/github-alternative-suggestion.html
@@ -0,0 +1,16 @@
+<!-- GitHub links calculated from GitHub repo, defined in config.toml -->
+{{ $pathFormatted := replace .File.Path "\\" "/" -}}
+{{ $gh_repo := ($.Param "github_repo") -}}
+{{ $gh_branch := (default "main" ($.Param "github_branch")) -}}
+{{ $gh_repo_path := printf "%s/content/%s" $gh_branch $pathFormatted -}}
+
+{{ $editURL := printf "%s/edit/%s" $gh_repo $gh_repo_path -}}
+
+<!-- Display github elements -->
+
+No alternatives identified...yet. 
+<a href="{{ $editURL }}" target="_blank" style="text-decoration: none;">
+    Suggest an alternative here.
+</a>
+
+