Sync templates (#826)

Signed-off-by: John Mertic <jmertic@linuxfoundation.org>
AcademySoftwareFoundation · Aug 30, 2024 · ceb54ae · ceb54ae
1 parent 11a33f6
commit ceb54ae
Show file tree

Hide file tree

Showing 16 changed files with 50 additions and 46 deletions.
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -3,9 +3,9 @@ updates:
   - package-ecosystem: github-actions
     directory: /
     schedule:
-      interval: daily
+      interval: weekly
 
   - package-ecosystem: bundler
     directory: /
     schedule:
-      interval: daily
+      interval: weekly
diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md
diff --git a/_config.yml b/_config.yml
@@ -12,6 +12,7 @@ exclude: [
   "Gemfile.lock", 
   "package.json", 
   "package-lock.json",
+  "CODE_OF_CONDUCT.md",
   "LICENSE",
   "vendor"
 ]
@@ -25,6 +26,7 @@ gh_edit_repository: "https://github.com/AcademySoftwareFoundation/tac" # the git
 gh_edit_branch: "main" # the branch that your docs is served from
 gh_edit_view_mode: "tree"
 
+# Various URLs used across the site
 landscape_url: 'https://landscape.aswf.io'
 calendar_url: 'https://zoom-lfx.platform.linuxfoundation.org/meetings/aswf'
 slack_url: 'https://slack.aswf.io'
@@ -35,11 +37,13 @@ tac_mailing_list_url: "https://lists.aswf.io/g/tac"
 website_url: "https://aswf.io"
 blog_url: "https://aswf.io/blog"
 tac_lfx_meeting_url: "https://zoom-lfx.platform.linuxfoundation.org/meeting/97880950229?password=81d2940e-c055-43b9-9b5a-6cd7d7090feb" 
+lfscanning_repo_url: https://github.com/lfscanning/spdx-aswf
 
 # Foundation Settings
-vote_of_tac_committee_title: "Industry Representative"
 foundation_name: "Academy Software Foundation"
 clotributor_name: aswf
+membership_top_tier: 'Premier'
+vote_of_tac_committee_title: "Industry Representatives"
 
 aux_links:
   "Need help or have a question? Contact us here":
@@ -52,6 +56,9 @@ ga_tracking: 360578303
 ga_tracking_anonymize_ip: true
 
 kramdown:
+  input: GFM
+  extensions:
+    - autolink
   parse_block_html: true
   toc_levels: 2..6
 

diff --git a/_data/meeting-agenda-items.csv b/_data/meeting-agenda-items.csv
@@ -3,7 +3,7 @@ D&I Working Group,https://github.com/AcademySoftwareFoundation/tac/issues/473,47
 OpenColorIO,https://github.com/AcademySoftwareFoundation/tac/issues/474,474,2024-11-05,Future Meeting Agenda Items,2-annual-review
 OpenTimelineIO,https://github.com/AcademySoftwareFoundation/tac/issues/477,477,2024-12-11,Future Meeting Agenda Items,2-annual-review
 OpenEXR,https://github.com/AcademySoftwareFoundation/tac/issues/483,483,2025-04-16,Future Meeting Agenda Items,2-annual-review
-Working Group for Rust Bindings,https://github.com/AcademySoftwareFoundation/tac/issues/489,489,2025-03-19,Future Meeting Agenda Items,2-annual-review
+ASWF Language Interop Project,https://github.com/AcademySoftwareFoundation/tac/issues/489,489,2025-03-19,Future Meeting Agenda Items,2-annual-review
 MaterialX,https://github.com/AcademySoftwareFoundation/tac/issues/486,486,2025-02-05,Future Meeting Agenda Items,2-annual-review
 Rez,https://github.com/AcademySoftwareFoundation/tac/issues/492,492,2025-04-02,Future Meeting Agenda Items,2-annual-review
 OpenCue,https://github.com/AcademySoftwareFoundation/tac/issues/495,495,2025-05-28,Future Meeting Agenda Items,2-annual-review
@@ -29,3 +29,7 @@ Open Shading Language,https://github.com/AcademySoftwareFoundation/tac/issues/43
 Open Review Initiative,https://github.com/AcademySoftwareFoundation/tac/issues/436,436,2024-08-21,In Voting,2-annual-review
 Update on Atlassian Cloud Migration,https://github.com/AcademySoftwareFoundation/tac/issues/755,755,,Upcoming Meeting Agenda Items,4-tac-meeting-short
 Dev Days 2024,https://github.com/AcademySoftwareFoundation/tac/issues/662,662,,Upcoming Meeting Agenda Items,4-tac-meeting-short
+Project Leads Office Hours,https://github.com/AcademySoftwareFoundation/tac/issues/760,760,,Upcoming Meeting Agenda Items,4-tac-meeting-short
+Change to public calendar for Academy Software Foundation,https://github.com/AcademySoftwareFoundation/tac/issues/782,782,,Upcoming Meeting Agenda Items,4-tac-meeting-short
+Evolving our working groups program,https://github.com/AcademySoftwareFoundation/tac/issues/798,798,,Next Meeting Agenda Items,3-tac-meeting-long
+DPEL,https://github.com/AcademySoftwareFoundation/tac/issues/472,472,2024-09-18,Next Meeting Agenda Items,2-annual-review
diff --git a/_data/projects.csv b/_data/projects.csv
@@ -13,7 +13,7 @@ rawtoaces,incubating,https://landscape.aswf.io/logos/rawtoaces.svg,rawtoaces,"AS
 Rez,incubating,https://landscape.aswf.io/logos/rez.svg,rez,"ASWF Projects / All,Assets and Workflow / Software Foundation and System Administration",https://rez-project.io/,"Jean-Christophe Morin, Stephen Mackenzie",,https://rez.readthedocs.io/,https://zoom-lfx.platform.linuxfoundation.org/meetings/rez,https://artwork.aswf.io/projects/rez/,https://webcal.prod.itx.linuxfoundation.org/lfx/a092M00001LkM0JQAV,https://insights.lfx.linuxfoundation.org/foundation/aswf/overview?project=rez,2022-03-08,2024-04-17,2025-04-02,,https://lists.aswf.io/g/rez-discussion,,8389,https://github.com/AcademySoftwareFoundation/rez,Allan Johns
 Open Review Initiative,sandbox,https://landscape.aswf.io/logos/open-review-initiative.svg,open-review-initiative,"ASWF Projects / All,Imaging and Color / Display and Review",https://openreviewinitiative.org/,Erik Strauss,,,https://zoom-lfx.platform.linuxfoundation.org/meetings/open-review-initiative,https://artwork.aswf.io/projects/open-review-initiative/,https://webcal.prod.itx.linuxfoundation.org/lfx/a092M00001L1EL3QAN,https://insights.lfx.linuxfoundation.org/foundation/aswf/overview?project=open-review-initiative,2022-09-07,2023-08-23,2024-08-21,,https://lists.aswf.io/g/open-review-initiative-discussion,,False,https://github.com/AcademySoftwareFoundation/ori-shared-platform,Academy Software Foundation
 OpenAssetIO,sandbox,https://landscape.aswf.io/logos/open-asset-io.svg,open-asset-io,"ASWF Projects / All,Assets and Workflow / Pipelines and Frameworks",https://openassetio.org/,David Feltell,,https://docs.openassetio.org,https://zoom-lfx.platform.linuxfoundation.org/meetings/openassetio,https://artwork.aswf.io/projects/openassetio/,https://webcal.prod.itx.linuxfoundation.org/lfx/a092M00001L17vCQAR,https://insights.lfx.linuxfoundation.org/foundation/aswf/overview?project=openassetio,2022-11-01,2023-07-12,2024-08-21,,https://lists.aswf.io/g/openassetio-discussion,https://github.com/OpenAssetIO,6046,https://github.com/OpenAssetIO/OpenAssetIO,Foundry
+ASWF Language Interop Project,working-group,https://landscape.aswf.io/logos/aswf-language-interop-project.svg,aswf-language-interop-project,"ASWF Projects / All,Math and Simulation / Math Foundations",https://github.com/vfx-rs,Scott Wilson,,,https://zoom-lfx.platform.linuxfoundation.org/meetings/working-group-for-rust-bindings,https://artwork.aswf.io/projects/working-group-for-rust-bindings/,https://webcal.prod.itx.linuxfoundation.org/lfx/lfv8NMKI8tcp96N5tb,https://insights.lfx.linuxfoundation.org/foundation/aswf/overview?project=working-group-for-rust-bindings,2023-10-20,2024-03-20,2025-03-19,,https://lists.aswf.io/g/wg-rust,https://github.com/vfx-rs,False,https://github.com/vfx-rs/organization,Scott Wilson
 Continuous Integration Working Group,working-group,https://landscape.aswf.io/logos/continuous-integration-working-group.svg,continuous-integration-working-group,ASWF Projects / All,https://wiki.aswf.io/display/CIWG,Jean-Francois Panisset,,,https://zoom-lfx.platform.linuxfoundation.org/meetings/aswf-continuous-integration-wg,https://artwork.aswf.io/projects/aswf-continuous-integration-wg/,https://webcal.prod.itx.linuxfoundation.org/lfx/a092M00001KWjDLQA1,https://insights.lfx.linuxfoundation.org/foundation/aswf/overview?project=aswf-continuous-integration-wg,2018-11-01,2023-05-17,2024-05-15,,https://lists.aswf.io/g/tac,,False,https://github.com/AcademySoftwareFoundation/wg-ci,Academy Software Foundation
 Diversity & Inclusion Working Group,working-group,https://landscape.aswf.io/logos/diversity-inclusion-working-group.svg,diversity-inclusion-working-group,ASWF Projects / All,https://lists.aswf.io/g/diversity,"Rachel Rose, Carol Payne",,,https://zoom-lfx.platform.linuxfoundation.org/meetings/aswf-diversity-inclusion-wg,https://artwork.aswf.io/projects/aswf-diversity-inclusion-wg/,https://webcal.prod.itx.linuxfoundation.org/lfx/a092M00001KWjDZQA1,https://insights.lfx.linuxfoundation.org/foundation/aswf/overview?project=aswf-diversity-inclusion-wg,2020-06-11,2023-10-04,2024-10-16,,https://lists.aswf.io/g/diversity,,False,https://github.com/chaoss/wg-diversity-inclusion,Academy Software Foundation
 Universal Scene Description Working Group,working-group,https://landscape.aswf.io/logos/universal-scene-description-working-group.svg,universal-scene-description-working-group,"ASWF Projects / All,Assets and Workflow / Scenes and Geometry",https://wiki.aswf.io/display/WGUSD/USD+Working+Group?src=breadcrumbs-parent,,,,https://zoom-lfx.platform.linuxfoundation.org/meetings/aswf-usd-wg,https://artwork.aswf.io/projects/aswf-usd-wg/,https://webcal.prod.itx.linuxfoundation.org/lfx/a092M00001KWjDUQA1,https://insights.lfx.linuxfoundation.org/foundation/aswf/overview?project=aswf-usd-wg,2020-03-04,2024-05-01,2025-04-30,,https://lists.aswf.io/g/wg-usd,,False,https://github.com/AcademySoftwareFoundation/wg-usd,Pixar
-Working Group for RUST Bindings,working-group,https://landscape.aswf.io/logos/working-group-for-rust-bindings.svg,working-group-for-rust-bindings,"ASWF Projects / All,Math and Simulation / Math Foundations",https://github.com/vfx-rs,Scott Wilson,,,https://zoom-lfx.platform.linuxfoundation.org/meetings/working-group-for-rust-bindings,https://artwork.aswf.io/projects/working-group-for-rust-bindings/,https://webcal.prod.itx.linuxfoundation.org/lfx/lfv8NMKI8tcp96N5tb,https://insights.lfx.linuxfoundation.org/foundation/aswf/overview?project=working-group-for-rust-bindings,2023-10-20,2024-03-20,2025-03-19,,https://lists.aswf.io/g/wg-rust,https://github.com/vfx-rs,False,https://github.com/vfx-rs/organization,Scott Wilson
diff --git a/_includes/tacmembers.html b/_includes/tacmembers.html
@@ -25,9 +25,9 @@
         <td>{{ member["Full Name"] }}</td>
         <td>
         {%- for project in site.data.projects -%}
-        {%- if project["TAC Representative"] == member["Full Name"] -%}
+        {%- if project["TAC Representative"] contains member["Full Name"] -%}
         {{ project["Name"] }} Representative
-        {%- elsif project["Chair"] == member["Full Name"] -%}
+        {%- elsif project["Chair"] contains member["Full Name"] -%}
         {{ project["Name"] }} Representative
         {%- endif -%}
         {%- endfor -%}

diff --git a/code_of_conduct.md b/code_of_conduct.md
@@ -0,0 +1,11 @@
+---
+nav_order: 999
+---
+
+# Code of Conduct
+
+{{ site.foundation_name }} aims to foster a collaborative, inclusive, and safe environment for all participants. {{ site.foundation_name }} and each hosted project have established Codes of Conduct to help provide guidelines on appropriate conduct and how to report violations.
+
+For all hosted projects, refer to the CODE_OF_CONDUCT.md file in the each code repository that points to policy in use.
+
+For all other activities and events that are sanctioned by {{ site.foundation_name }}, refer to the [LF Events Code of Conduct](https://events.linuxfoundation.org/about/code-of-conduct/).
diff --git a/engagement/README.md b/engagement/README.md
@@ -1,7 +1,7 @@
 ---
 title: Getting Involved
 has_children: false
-nav_order: 2
+nav_order: 10
 ---
 
 # Getting Involved in Projects

diff --git a/meetings/README.md b/meetings/README.md
@@ -1,7 +1,7 @@
 ---
 has_children: true
 child_nav_order: reversed
-nav_order: 4
+nav_order: 30 
 ---
 
 # Meetings 

diff --git a/meetings/template.md b/meetings/template.md
@@ -1,6 +1,7 @@
 ---
 parent: Meetings
 title: "Meeting Template"
+layout: minimal
 nav_exclude: true
 ---
 
@@ -11,13 +12,15 @@ parent: Meetings
 title: "{{ "now" | date: "%Y-%m-%d" }}"
 ---
 
-# Academy Software Foundation - Technical Advisory Council (TAC) Meeting - {{ "now" | date: "%B %e, %Y" }}
+# {{ site.foundation_name }} Technical Advisory Council (TAC) Meeting - {{ "now" | date: "%B %e, %Y" }}
 
+{%- if site.tac_lfx_meeting_url -%}
 Join the meeting at [{{ site.tac_lfx_meeting_url }}]({{ site.tac_lfx_meeting_url }})
+{%- endif -%}
 
 ## Voting Representative Attendees
 
-### Premier Member Representatives
+### {{ site.membership_top_tier }} Member Representatives
 {% for member in site.data.tacmembers -%}
 {% if member["Appointed By"] == "Membership Entitlement" %}
 - [ ] {{ member["Full Name"] }} - {{ member["Account Name: Account Name"] }}
@@ -39,12 +42,14 @@ Join the meeting at [{{ site.tac_lfx_meeting_url }}]({{ site.tac_lfx_meeting_url
 {%- endif -%}
 {% endfor %}
 
-### Industry Representatives
+{%- if site.vote_of_tac_committee_title -%}
+### {{ site.vote_of_tac_committee_title }}
 {% for member in site.data.tacmembers -%}
 {% if member["Appointed By"] == "Vote of TAC Committee" %}
 - [ ] {{ member["Full Name"] }} - {{ member["Account Name: Account Name"] }}
 {%- endif -%}
 {% endfor %}
+{%- endif -%}
 
 ## Non-Voting Attendees
 
@@ -112,6 +117,6 @@ the Linux Foundation.
 {{ agenda }}
 </pre>
 
-<a href="https://github.com/AcademySoftwareFoundation/tac/new/main/meetings?filename={{ "now" | date: "%Y-%m-%d" }}.md&value={{ agenda | url_encode }}">Create Pull Request</a> | 
+<a href="{{ site.gh_edit_repository }}/new/main/meetings?filename={{ "now" | date: "%Y-%m-%d" }}.md&value={{ agenda | url_encode }}">Create Pull Request</a> | 
 
 
diff --git a/process/README.md b/process/README.md
@@ -1,11 +1,11 @@
 ---
 has_children: true
-nav_order: 3
+nav_order: 20
 ---
 
 # Processes
 
-These are the various processes and policies adopted by the ASWF TAC. Any new proposed policies, or changes to existing policies, should be done via PR and merged only after the TAC has formally approved.
+These are the various processes and policies adopted by the {{ site.foundation_name }} TAC. Any new proposed policies, or changes to existing policies, should be done via PR and merged only after the TAC has formally approved.
 
 When adding new files in this directory, be sure to add the following metadata at the top of the file...
 

diff --git a/process/contributing.md b/process/contributing.md
@@ -2,8 +2,7 @@
 parent: Processes
 has_children: true
 ---
-
-# Contribution Guidelines
+# Contribution Guidelines for hosted projects
 
 * TOC
 {:toc}

diff --git a/process/tsc_faq.md b/process/tsc_faq.md
@@ -96,9 +96,9 @@ The TSC Chairperson should share an agenda at least 24 hours before the meeting
 
 ## FAQs about TSCs
 
-### Q: Is a TSC member required to have their employer be a member of the Academy Software Foundation?
+### Q: Is a TSC member required to have their employer be a member of the {{ site.foundation_name }}?
 
-A: No - All technical community work, such as projects and working groups, is open to anyone to participate and not bound by membership in the Academy Software Foundation. 
+A: No - All technical community work, such as projects and working groups, is open to anyone to participate and not bound by membership in the {{ site.foundation_name }}. 
 
 ### Q: Does a person lose their membership in a TSC if they leave or change employers?
 

diff --git a/programs/README.md b/programs/README.md
@@ -1,7 +1,7 @@
 ---
 title: Programs
 has_children: true
-nav_order: 5
+nav_order: 40
 ---
 
-The Academy Software Foundation supports a number of programs that are driven by the requirements and oversight of the TAC and technical communities, with the operational components supported by the project staff. Read more about them below.
+The {{ site.foundation_name }} supports a number of programs that are driven by the requirements and oversight of the TAC and technical communities, with the operational components supported by the project staff. Read more about them below.
diff --git a/programs/license_scanning.md b/programs/license_scanning.md
@@ -9,8 +9,6 @@ parent: Programs
 {:toc}
 ## Support plan summary
 
-Support to be provided by: Jeff Shapiro &lt;<jshapiro@linuxfoundation.org>&gt;
-
 For the projects described below, the following actions will be
 performed:
 
@@ -21,9 +19,9 @@ performed:
     contained in the project codebases
 
 3.  Publish SPDX documents with the license conclusions and copyright
-    statements at <https://github.com/lfscanning/spdx-aswf>, for broader community use in their own compliance
+    statements at <{{ site.lfscanning_repo_url }}>, for broader community use in their own compliance
     processes
-    
+
 4.  Produce summary reports for project leads / maintainers, with
     limited public visibility (or optionally public at the project’s
     discretion) with the following:
@@ -118,16 +116,6 @@ continued development of the scanning workflow automation.
     managed by LF IT (none presently anticipated for current projects /
     scan types)
 
-## Covered projects and schedule of scans
-
-### January, April, July, October
-
--   All Projects
-
-Anticipate up to approximately 3 new projects to come in during 2021.
-Will perform pre-intake scans and allocate to cycles based on project
-sizing.
-
 ## Exhibits
 
 1.  Screenshots from example SPDX document

diff --git a/tools/mailing_lists.md b/tools/mailing_lists.md
@@ -51,4 +51,4 @@ Being a moderator is as much a privilege as it is a duty. As part of volunteerin
 - Contact the list moderators if there are concerns about the [Code of Conduct][].
 
 [Code of Conduct]: /code_of_conduct
-[TAC Mailing List]: {{ site.tac_mailinglist_url }}
+[TAC Mailing List]: {{ site.tac_mailing_list_url }}