From 1740002e69fa0011ab41144ea26028c9fab0b98a Mon Sep 17 00:00:00 2001
From: Pablo Vazquez <pablo@blender.org>
Date: Fri, 24 May 2024 19:05:39 +0200
Subject: [PATCH] Projects Card: Update ongoing projects

Use a table instead of a the <ul> with links to the blog posts.
---
 .../blender_components/card_projects.tmpl     | 105 ++++++++++++++----
 templates/custom/header.tmpl                  |   8 ++
 2 files changed, 92 insertions(+), 21 deletions(-)

diff --git a/templates/blender_components/card_projects.tmpl b/templates/blender_components/card_projects.tmpl
index 7d5daa8..8bbb625 100644
--- a/templates/blender_components/card_projects.tmpl
+++ b/templates/blender_components/card_projects.tmpl
@@ -1,27 +1,90 @@
 <div class="ui fluid card" style="width: 100%;">
   <div class="content">
-    <h3>Ongoing Projects</h3>
-    <p>Focused activities to advance Blender.</p>
-
-    <div class="description">
-      <ul>
-        <li>
-          <a href="https://code.blender.org/2022/11/the-future-of-character-animation-rigging/">
-            The Future of Character Animation
+    <div class="ui grid">
+      <div class="eight wide column">
+        <h3>Ongoing Projects</h3>
+      </div>
+      <div class="eight wide column right" style="text-align: right">
+        <h3>
+          <a href="{{AppSubUrl}}/blender/blender/">
+            <svg data-v-9113ce96="" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16" width="16" height="16" aria-hidden="true"
+              class="svg octicon-repo repo-list-icon" style="margin-top: .333rem;">
+              <path
+                d="M2 2.5A2.5 2.5 0 0 1 4.5 0h8.75a.75.75 0 0 1 .75.75v12.5a.75.75 0 0 1-.75.75h-2.5a.75.75 0 0 1 0-1.5h1.75v-2h-8a1 1 0 0 0-.714 1.7.75.75 0 1 1-1.072 1.05A2.5 2.5 0 0 1 2 11.5Zm10.5-1h-8a1 1 0 0 0-1 1v6.708A2.5 2.5 0 0 1 4.5 9h8ZM5 12.25a.25.25 0 0 1 .25-.25h3.5a.25.25 0 0 1 .25.25v3.25a.25.25 0 0 1-.4.2l-1.45-1.087a.25.25 0 0 0-.3 0L5.4 15.7a.25.25 0 0 1-.4-.2Z">
+              </path>
+            </svg>
+            blender/blender
           </a>
-        <li>
-          <a href="https://code.blender.org/2022/12/brush-assets-workflow/">
-            Brush Assets
-          </a>
-        </li>
-      </ul>
+        </h3>
+      </div>
     </div>
-  </div>
-  <div class="extra content">
-    <span class="right floated">
-      <a href="https://code.blender.org">
-        See all articles {{svg "octicon-chevron-right" 18}}
-      </a>
-    </span>
+
+    <table class="ui celled striped table">
+      <thead>
+        <tr><th>Project</th>
+        <th>Modules</th>
+        <th>Status</th>
+      </tr></thead>
+      <tbody>
+        <tr>
+          <td>
+            <a href="{{AppSubUrl}}/blender/blender/projects/30">Brush Assets</a>
+          </td>
+          <td>
+            <a href="{{AppSubUrl}}/blender/blender/wiki/Module: Pipeline, Assets & I/O" class="ui label is-module">Pipeline, Assets & I/O</a>,
+            <a href="{{AppSubUrl}}/blender/blender/wiki/Module: Core" class="ui label is-module">Core</a>,
+            <a href="{{AppSubUrl}}/blender/blender/wiki/Module: User Interface" class="ui label is-module">User Interface</a>
+          </td>
+          <td>
+            <a href="https://projects.blender.org/blender/blender/issues/116337">Under Development</a>
+          </td>
+        </tr>
+        <tr>
+          <td>
+            <a href="{{AppSubUrl}}/blender/blender/issues/93220">EEVEE Next</a>
+          </td>
+          <td>
+            <a href="{{AppSubUrl}}/blender/blender/wiki/Module: EEVEE & Viewport" class="ui label is-module">EEVEE & Viewport</a>
+          </td>
+          <td>
+            <a href="https://devtalk.blender.org/t/blender-4-2-eevee-next-feedback/31813/1">Feedback Wanted</a>
+          </td>
+        </tr>
+        <tr>
+          <td>
+            <a href="https://code.blender.org/2024/05/extensions-platform-beta-release/">Extensions</a>
+          </td>
+          <td>
+            <a href="{{AppSubUrl}}/blender/blender/wiki/Module: Core" class="ui label is-module">Core</a>,
+            <a href="{{AppSubUrl}}/blender/blender/wiki/Module: User Interface" class="ui label is-module">User Interface</a>
+          </td>
+          <td>
+            <a href="https://devtalk.blender.org/t/extensions-platform/34663/1">Feedback Wanted</a>
+          </td>
+        </tr>
+        <tr>
+          <td>
+            <a href="https://projects.blender.org/blender/blender/projects/6">Grease Pencil v3</a>
+          </td>
+          <td>
+            <a href="{{AppSubUrl}}/blender/blender/wiki/Module: Grease Pencil" class="ui label is-module">Grease Pencil</a>
+          </td>
+          <td>
+            <a href="https://projects.blender.org/blender/blender/projects/6">Under Development</a>
+          </td>
+        </tr>
+        <tr>
+          <td>
+            <a href="https://developer.blender.org/docs/features/animation/animation_system/baklava/">Layered Animation</a>
+          </td>
+          <td>
+            <a href="{{AppSubUrl}}/blender/blender/wiki/Module: Animation & Rigging" class="ui label is-module">Animation & Rigging</a>
+          </td>
+          <td>
+            <a href="https://devtalk.blender.org/tag/animation-rigging">Under Development</a>
+          </td>
+        </tr>
+      </tbody>
+    </table>
   </div>
 </div>
diff --git a/templates/custom/header.tmpl b/templates/custom/header.tmpl
index 82c9971..1658704 100644
--- a/templates/custom/header.tmpl
+++ b/templates/custom/header.tmpl
@@ -231,6 +231,14 @@
     top: 2px;
   }
 
+  /* Labels (badges) */
+  /* Hardcoded label color to make it look like a module,
+   * so it can be used in other contexts (e.g. static homepage content). */
+  .ui.label.is-module {
+    background-color: #514b3c !important;
+    color: #eee !important;
+  }
+
   /* Footer. */
   footer {
     color: var(--color-footer-text);