Merge pull request #16 from SEACrowd/mychiffonn/social

Mychiffonn/social

Author: holylovenia

.github/workflows/pages.yml

@@ -2,13 +2,13 @@ name: Build and deploy Jekyll site to GitHub Pages
 
 on:
   push:
-    branches: ["main"]         # Run on pushes to main
-  workflow_dispatch:           # Allow manual runs from Actions tab
+    branches: ["main"] # Run on pushes to main
+  workflow_dispatch: # Allow manual runs from Actions tab
 
 permissions:
-  contents: read               # Read repo contents
-  pages: write                 # Deploy to Pages
-  id-token: write              # Verify the deployment
+  contents: read # Read repo contents
+  pages: write # Deploy to Pages
+  id-token: write # Verify the deployment
 
 concurrency:
   group: "pages"
@@ -25,7 +25,7 @@ jobs:
       - name: Setup Ruby
         uses: ruby/setup-ruby@v1
         with:
-          ruby-version: '3.2'
+          ruby-version: "3.2"
           bundler-cache: true
 
       - name: Install dependencies

_data/navbar.yml

@@ -1,20 +1,22 @@
+- name: "About"
+  href: "/about"
+- name: "Apprenticeship"
+  href: "/apprenticeship"
+- name: "Projects"
+  href: "/projects/"
 - name: "Research"
   children:
-    - name: "Projects"
-      href: "/projects/"
     - name: "Publications"
       href: "/publications"
     - name: "Resources"
       href: "/resources/"
-- name: "Events"
-  href: "/events/"
+
 - name: "Blog"
   href: "/posts/"
-- name: "Apprenticeship"
-  href: "/apprenticeship"
-- name: "Volunteer"
+
+- name: "Get Involved"
   href: "/contribute"
-- name: "Support Us"
+
+- name: "Donate"
   href: "/donate"
-- name: "About"
-  href: "/about"
+  cta: true

_data/ways_to_contribute.yml

@@ -24,44 +24,79 @@
     <div class="collapse navbar-collapse" id="navbarNav">
       <ul class="navbar-nav ms-auto">
         {% for nav in site.data.navbar %}
+          {% assign is_active = false %}
+          {% if nav.href %}
+            {% assign clean_nav_href = nav.href
+              | remove: '.html'
+              | remove: '/'
+            %}
+            {% if page.url == nav.href
+              or page.permalink == nav.href
+              or clean_page_url == clean_nav_href
+              or page.url contains nav.href
+            %}
+              {% assign is_active = true %}
+            {% endif %}
+          {% endif %}
+
           {% if nav.children %}
+            {% comment %} Check if any child is active {% endcomment %}
+            {% for child in nav.children %}
+              {% assign clean_child_href = child.href
+                | remove: '.html'
+                | remove: '/'
+              %}
+              {% if page.url == child.href
+                or page.permalink == child.href
+                or clean_page_url == clean_child_href
+                or page.url contains child.href
+              %}
+                {% assign is_active = true %}
+              {% endif %}
+            {% endfor %}
             <li class="nav-item dropdown">
               <a
-                class="nav-link dropdown-toggle"
+                class="nav-link dropdown-toggle {% if is_active %}active{% endif %}"
                 href="#"
-                id="dropdown{{ forloop.index }}"
                 role="button"
                 data-bs-toggle="dropdown"
                 aria-expanded="false"
               >
                 {{ nav.name }}
               </a>
-              <ul
-                class="dropdown-menu"
-                aria-labelledby="dropdown{{ forloop.index }}"
-              >
+              <ul class="dropdown-menu">
                 {% for child in nav.children %}
+                  {% assign clean_child_href = child.href
+                    | remove: '.html'
+                    | remove: '/'
+                  %}
                   <li>
                     <a
-                      class="dropdown-item {% assign clean_child_href = child.href | remove: '.html' | remove: '/' %}{% if page.url == child.href or page.permalink == child.href or clean_page_url == clean_child_href or page.url contains child.href %}active{% endif %}"
+                      class="dropdown-item {% if page.url == child.href or page.permalink == child.href or clean_page_url == clean_child_href or page.url contains child.href %}active{% endif %}"
                       href="{{ child.href }}"
                     >
                       {{ child.name }}
-                      {% if child.href == '/apprenticeship.html' %}
-                        {% include apprenticeship-badge.html %}
-                      {% endif %}
+                      {% if child.href == '/apprenticeship' -%}
+                        {%- include apprenticeship-badge.html -%}
+                      {%- endif %}
                     </a>
                   </li>
                 {% endfor %}
               </ul>
             </li>
+          {% elsif nav.cta %}
+            <li class="nav-item ms-lg-2">
+              <a class="btn btn-primary btn-sm px-3" href="{{ nav.href }}">
+                {{- nav.name -}}
+              </a>
+            </li>
           {% else %}
             <li class="nav-item">
               <a
-                class="nav-link {% assign clean_nav_href = nav.href | remove: '.html' | remove: '/' %}{% if page.url == nav.href or page.permalink == nav.href or clean_page_url == clean_nav_href or page.url contains nav.href %}active{% endif %}"
+                class="nav-link {% if is_active %}active{% endif %}"
                 href="{{ nav.href }}"
               >
-                {{ nav.name }}
+                {{- nav.name -}}
               </a>
             </li>
           {% endif %}

_includes/contribution-cards.html

@@ -150,26 +150,6 @@
   >
     {% include navbar.html %}
 
-    <div
-      id="donation-banner"
-      class="position-fixed w-100 bg-secondary py-2 d-flex align-items-center justify-content-center"
-      style="top: 55px; z-index: 1020; font-size: 0.8rem"
-    >
-      <div class="d-flex align-items-center justify-content-center">
-        <i class="fas fa-heart me-2 text-white"></i>
-        <a href="/donate" class="text-white text-decoration-underline">
-          Support our research and programs by making a donation!
-        </a>
-      </div>
-      <button
-        type="button"
-        class="btn-close position-absolute end-0 me-2 ms-2"
-        data-bs-theme="dark"
-        onclick="document.getElementById('donation-banner').remove()"
-        aria-label="Close"
-      ></button>
-    </div>
-
     <main class="flex-grow-1">
       <div class="my-2">{{ content }}</div>
     </main>

_includes/navbar.html

@@ -23,7 +23,7 @@ <h1 class="page-title">{{ page.title }}</h1>
           {%- when 'completed' -%}
             {%- assign badge_class = 'bg-dark text-white' -%}
           {%- else -%}
-            {%- assign badge_class = 'bg-secondary text-dark' -%}
+            {%- assign badge_class = 'bg-secondary text-white' -%}
         {%- endcase -%}
         <span class="badge {{ badge_class }} me-1">
           {{- page.status | capitalize -}}

_layouts/default.html

@@ -1,4 +1,4 @@
 ---
 ---
 
-Our [2026 apprentice program](/apprenticeship) is closed. Thank you to all applicants! Stay tuned for announcements.
+Our [2026 apprentice program](/apprenticeship) is closed. Thank you to all applicants! Watch your emails from [{{ site.social.email }}](mailto:{{ site.social.email }}) for updates on the selection process.

_layouts/project.html

@@ -5,7 +5,11 @@ form: https://forms.gle/GCv3cyCRqzj4PqfA9
 thumbnail: apprenticeship.png
 ---
 
-**The application was closed on Dec 17, 2025 at 23:59 (UTC-12). Announcements will be made through emails. Next cohort applications will open in late 2026. Stay tuned!**
+**The application was closed on Dec 17, 2025 at 23:59 (UTC-12). Updates will be sent to applicants from our email [{{ site.social.email }}](mailto:{{site.social.email}}).**
+
+If you would like to be notified of future apprentice batches, please join our [Google Group]({{ site.social.google_group }}) or follow us on [X/Twitter]({{ site.social.twitter }}), [Facebook]({{ site.social.facebook }}), or [LinkedIn]({{ site.social.linkedin }}).
+
+---
 
 SEACrowd Apprentice Program is a **remote research program** (Feb 1 - Jun 30, 2026) that pairs experienced researchers with early-career researchers across Southeast Asia to build models, datasets, and publishable research. Small, mentored teams work on scoped projects with structured milestones and community support, creating a clear path toward PhD admissions, jobs, and stronger SEA regional capacity.
 
@@ -60,12 +64,14 @@ Check out [previous batch publications](/apprenticeship#past-apprentice-research
 
 ## Application Process
 
-- **[General Application](https://forms.gle/GCv3cyCRqzj4PqfA9):** Nov 17 - Dec 17, 2025 (23:59 UTC-12)
+- **General Application:** Nov 17 - Dec 17, 2025 (23:59 UTC-12).
 - **Selection:** mid-Dec 2025 - Jan 19, 2026
   - Round 1: Application screening
   - Round 2: Online interview
 - **Team announcement:** mid-Jan 2026
 
+[Apply Here]({{ page.form }}){: .btn .btn-outline-primary .disabled}
+
 ## Program Schedule
 
 - **Kickoff:** Feb 1, 2026