From 859af3e048bc31f66c0155d9d57129cb2fa3ffac Mon Sep 17 00:00:00 2001 From: Erin Schnabel Date: Thu, 14 Mar 2024 22:32:11 -0400 Subject: [PATCH] Website updates: main page (still draft) (#11) * unleash the robots * Rework header and menus * better main page text --- .editorconfig | 2 +- .github/lastmod.ts | 1 + _config.ts | 20 +- deno.lock | 105 +++++ site/_data/bylaws.yml | 2 +- site/_data/projects.json | 46 +++ site/_data/svg.yml | 1 + site/_includes/foundation.yml | 78 ++++ site/_includes/layouts/activityArchive.vto | 9 +- site/_includes/layouts/activityOverview.vto | 24 +- site/_includes/layouts/activitySidebar.vto | 14 +- .../layouts/{vote.vto => activityVote.vto} | 2 +- ...{voteIndex.vto => activityVoteArchive.vto} | 7 +- site/_includes/layouts/base.vto | 30 +- .../layouts/{index.vto => baseIndex.vto} | 0 site/_includes/layouts/bylaws.vto | 23 +- .../{aside-toc.vto => test-aside-toc.vto} | 3 +- .../scss/{colors.scss => _colors.scss} | 15 +- .../scss/{fonts.scss => _fonts.scss} | 24 +- site/_includes/scss/_index.scss | 34 +- site/_includes/scss/activity.scss | 40 +- site/_includes/scss/bylaws.scss | 72 +++- site/_includes/scss/fun.scss | 38 -- site/_includes/scss/layout.scss | 87 ++-- site/_includes/scss/navigation.scss | 382 +++++++++++------- site/_includes/scss/site-main.scss | 173 ++++++++ site/_includes/scss/text.scss | 41 +- site/about/codehaus.md | 13 + site/activity/100.md | 46 +-- site/activity/101.md | 56 +-- site/activity/102.md | 10 +- site/activity/103.md | 6 +- site/activity/54.md | 6 +- site/activity/69.md | 28 +- site/activity/77.md | 46 +-- site/activity/78.md | 14 +- site/activity/79.md | 8 +- site/activity/80.md | 8 +- site/activity/81.md | 12 +- site/activity/86.md | 64 +-- site/activity/87.md | 6 +- site/activity/88.md | 8 +- site/activity/89.md | 8 +- site/activity/90.md | 12 +- site/activity/94.md | 10 +- site/activity/95.md | 52 +-- site/activity/97.md | 2 +- site/assets/scroll-toggle.js | 1 + site/assets/site.scss | 1 + site/components.md | 2 +- site/landing.md | 96 +++++ ...rse.svg => cf_logo_horizontal_reverse.svg} | 0 site/static/images/hero_mainimage.jpg | Bin 0 -> 208530 bytes site/static/images/hero_mainimage.png | Bin 0 -> 696557 bytes site/static/images/hero_mainimage.webp | Bin 0 -> 64338 bytes site/static/images/home_access.svg | 33 ++ site/static/images/home_flexibility.svg | 30 ++ site/static/images/home_homeburst.svg | 36 ++ site/static/images/home_minimal.svg | 26 ++ site/static/images/home_tailored.svg | 31 ++ site/static/robots.txt | 8 +- site/votes/index.page.js | 6 +- 62 files changed, 1423 insertions(+), 535 deletions(-) create mode 100644 site/_data/projects.json rename site/_includes/layouts/{vote.vto => activityVote.vto} (96%) rename site/_includes/layouts/{voteIndex.vto => activityVoteArchive.vto} (93%) rename site/_includes/layouts/{index.vto => baseIndex.vto} (100%) rename site/_includes/layouts/{aside-toc.vto => test-aside-toc.vto} (94%) rename site/_includes/scss/{colors.scss => _colors.scss} (80%) rename site/_includes/scss/{fonts.scss => _fonts.scss} (63%) delete mode 100644 site/_includes/scss/fun.scss create mode 100644 site/_includes/scss/site-main.scss create mode 100644 site/about/codehaus.md create mode 100644 site/assets/scroll-toggle.js create mode 100644 site/landing.md rename site/static/images/{CF_logo_horizontal_reverse.svg => cf_logo_horizontal_reverse.svg} (100%) create mode 100644 site/static/images/hero_mainimage.jpg create mode 100644 site/static/images/hero_mainimage.png create mode 100644 site/static/images/hero_mainimage.webp create mode 100644 site/static/images/home_access.svg create mode 100644 site/static/images/home_flexibility.svg create mode 100644 site/static/images/home_homeburst.svg create mode 100644 site/static/images/home_minimal.svg create mode 100644 site/static/images/home_tailored.svg diff --git a/.editorconfig b/.editorconfig index 2f834712..de6ea971 100644 --- a/.editorconfig +++ b/.editorconfig @@ -14,5 +14,5 @@ trim_trailing_whitespace = false [*.{java,ts,js}] indent_size = 4 -[*.{yml,yaml,html,rb,css,xml,scss,vto}] +[*.{yml,yaml,html,json,rb,css,xml,scss,vto}] indent_size = 2 diff --git a/.github/lastmod.ts b/.github/lastmod.ts index 621c9f04..137429aa 100644 --- a/.github/lastmod.ts +++ b/.github/lastmod.ts @@ -56,6 +56,7 @@ async function readDir(path: string, relative: string) { struct.date = gitLastCommitDate(filePath); struct.layout = 'layouts/bylaws.vto'; + struct.cssclasses = ['bylaws', 'has-aside']; } else if (dirEntry.isDirectory && !ignore.includes(dirEntry.name)) { await readDir(`${path}/${dirEntry.name}`, `${relative}${dirEntry.name}/`); } diff --git a/_config.ts b/_config.ts index a2e928b2..00965690 100644 --- a/_config.ts +++ b/_config.ts @@ -13,6 +13,8 @@ import resolveUrls from "lume/plugins/resolve_urls.ts"; import sass from "lume/plugins/sass.ts"; import sitemap from "lume/plugins/sitemap.ts"; import slugify_urls from "lume/plugins/slugify_urls.ts"; +import svgo from "lume/plugins/svgo.ts"; + import toc from "https://deno.land/x/lume_markdown_plugins@v0.7.0/toc.ts"; import anchor from "npm:markdown-it-anchor"; @@ -61,6 +63,7 @@ site })) .use(toc()) .use(slugify_urls({ + extensions: [".html"], replace: { "&": "and", "@": "", @@ -152,6 +155,19 @@ function ignorePages(structure: Record, path: string) { }); } +// Fixup attributes at build time if necessary +site.preprocess(['.md'], (pages) => { + for (const page of pages) { + if (typeof page.data.content !== "string") { + continue; + } + if (/^\/activity\/\d/.test(page.src.path)) { + page.data.cssclasses = page.data.cssclasses || []; + page.data.cssclasses.push('activity', 'has-aside'); + } + } +}); + site.preprocess([".html"], (filteredPages, allPages) => { for (const page of filteredPages) { // For foundation pages: @@ -177,7 +193,7 @@ site.preprocess([".html"], (filteredPages, allPages) => { page.data.tags.push(keys[0]); } } else { - console.error(`No metadata for ${page.src.path}`); + // Skip any pages that don't have a corresponding entry in the foundation.yml file allPages.splice(allPages.indexOf(page), 1); } @@ -233,7 +249,7 @@ site.filter("postLock", (data: Record) => { if (data.lockReason) { result += `${svg.lock} `; } - return result ? `${result}` : ''; + return result ? `${result}` : `${svg.blank}`; }); site.filter("testLock", (page: Page) => { return ` diff --git a/deno.lock b/deno.lock index 0bf63057..37d950de 100644 --- a/deno.lock +++ b/deno.lock @@ -13,6 +13,7 @@ "npm:markdown-it@14.0.0": "npm:markdown-it@14.0.0", "npm:sass@1.69.5": "npm:sass@1.69.5", "npm:sharp@0.33.0": "npm:sharp@0.33.0", + "npm:svgo@3.0.5": "npm:svgo@3.0.5", "npm:unidecode@0.1.8": "npm:unidecode@0.1.8" }, "npm": { @@ -129,6 +130,10 @@ "tslib": "tslib@2.6.2" } }, + "@trysound/sax@0.2.0": { + "integrity": "sha512-L7z9BgrNEcYyUYtF+HaEfiS5ebkh9jXqbszz7pC0hRBPaatV0XjSD3+eHrpqFemQfgwiFF0QPIarnIihIDn7OA==", + "dependencies": {} + }, "@types/linkify-it@3.0.5": { "integrity": "sha512-yg6E+u0/+Zjva+buc3EIb+29XEg4wltq7cSmd4Uc2EE/1nUVmxyzpX6gUXD0V8jIrG0r7YeOGVIbYRkxeooCtw==", "dependencies": {} @@ -159,6 +164,10 @@ "integrity": "sha512-jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA==", "dependencies": {} }, + "boolbase@1.0.0": { + "integrity": "sha512-JZOSA7Mo9sNGB8+UjSgzdLtokWAky1zbztM3WRLCbZ70/3cTANmQmOdR7y2g+J0e2WXywy1yS468tY+IruqEww==", + "dependencies": {} + }, "braces@3.0.2": { "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==", "dependencies": { @@ -202,6 +211,44 @@ "color-string": "color-string@1.9.1" } }, + "commander@7.2.0": { + "integrity": "sha512-QrWXB+ZQSVPmIWIhtEO9H+gwHaMGYiF5ChvoJ+K9ZGHG/sVsa6yiesAD1GC/x46sET00Xlwo1u49RVVVzvcSkw==", + "dependencies": {} + }, + "css-select@5.1.0": { + "integrity": "sha512-nwoRF1rvRRnnCqqY7updORDsuqKzqYJ28+oSMaJMMgOauh3fvwHqMS7EZpIPqK8GL+g9mKxF1vP/ZjSeNjEVHg==", + "dependencies": { + "boolbase": "boolbase@1.0.0", + "css-what": "css-what@6.1.0", + "domhandler": "domhandler@5.0.3", + "domutils": "domutils@3.1.0", + "nth-check": "nth-check@2.1.1" + } + }, + "css-tree@2.2.1": { + "integrity": "sha512-OA0mILzGc1kCOCSJerOeqDxDQ4HOh+G8NbOJFOTgOCzpw7fCBubk0fEyxp8AgOL/jvLgYA/uV0cMbe43ElF1JA==", + "dependencies": { + "mdn-data": "mdn-data@2.0.28", + "source-map-js": "source-map-js@1.0.2" + } + }, + "css-tree@2.3.1": { + "integrity": "sha512-6Fv1DV/TYw//QF5IzQdqsNDjx/wc8TrMBZsqjL9eW01tWb7R7k/mq+/VXfJCl7SoD5emsJop9cOByJZfs8hYIw==", + "dependencies": { + "mdn-data": "mdn-data@2.0.30", + "source-map-js": "source-map-js@1.0.2" + } + }, + "css-what@6.1.0": { + "integrity": "sha512-HTUrgRJ7r4dsZKU6GjmpfRK1O76h97Z8MfS1G0FozR+oF2kG6Vfe8JE6zwrkbxigziPHinCJ+gCPjA9EaBDtRw==", + "dependencies": {} + }, + "csso@5.0.5": { + "integrity": "sha512-0LrrStPOdJj+SPCCrGhzryycLjwcgUSHBtxNA8aIDxf0GLsRh1cKYhB00Gd1lDOS4yGH69+SNn13+TWbVHETFQ==", + "dependencies": { + "css-tree": "css-tree@2.2.1" + } + }, "date-fns@2.30.0": { "integrity": "sha512-fnULvOpxnC5/Vg3NCiWelDsLiUc9bRwAPs/+LfTLNvetFCtCTN+yQz15C/fs4AwX1R9K5GLtLfn8QW+dWisaAw==", "dependencies": { @@ -212,6 +259,32 @@ "integrity": "sha512-UX6sGumvvqSaXgdKGUsgZWqcUyIXZ/vZTrlRT/iobiKhGL0zL4d3osHj3uqllWJK+i+sixDS/3COVEOFbupFyw==", "dependencies": {} }, + "dom-serializer@2.0.0": { + "integrity": "sha512-wIkAryiqt/nV5EQKqQpo3SToSOV9J0DnbJqwK7Wv/Trc92zIAYZ4FlMu+JPFW1DfGFt81ZTCGgDEabffXeLyJg==", + "dependencies": { + "domelementtype": "domelementtype@2.3.0", + "domhandler": "domhandler@5.0.3", + "entities": "entities@4.5.0" + } + }, + "domelementtype@2.3.0": { + "integrity": "sha512-OLETBj6w0OsagBwdXnPdN0cnMfF9opN69co+7ZrbfPGrdpPVNBUj02spi6B1N7wChLQiPn4CSH/zJvXw56gmHw==", + "dependencies": {} + }, + "domhandler@5.0.3": { + "integrity": "sha512-cgwlv/1iFQiFnU96XXgROh8xTeetsnJiDsTc7TYCLFd9+/WNkIqPTxiM/8pSd8VIrhXGTf1Ny1q1hquVqDJB5w==", + "dependencies": { + "domelementtype": "domelementtype@2.3.0" + } + }, + "domutils@3.1.0": { + "integrity": "sha512-H78uMmQtI2AhgDJjWeQmHwJJ2bLPD3GMmO7Zja/ZZh84wkm+4ut+IUnUdRa8uCGX88DiVx1j6FRe1XfxEgjEZA==", + "dependencies": { + "dom-serializer": "dom-serializer@2.0.0", + "domelementtype": "domelementtype@2.3.0", + "domhandler": "domhandler@5.0.3" + } + }, "entities@4.5.0": { "integrity": "sha512-V0hjH4dGPh9Ao5p0MoRY6BVqtwCjhz6vI5LT8AJ55H+4g9/4vbHx1I54fS0XuclLhDHArPQCiMjDxjaL8fPxhw==", "dependencies": {} @@ -318,6 +391,14 @@ "uc.micro": "uc.micro@2.0.0" } }, + "mdn-data@2.0.28": { + "integrity": "sha512-aylIc7Z9y4yzHYAJNuESG3hfhC+0Ibp/MAMiaOZgNv4pmEdFyfZhhhny4MNiAfWdBQ1RQ2mfDWmM1x8SvGyp8g==", + "dependencies": {} + }, + "mdn-data@2.0.30": { + "integrity": "sha512-GaqWWShW4kv/G9IEucWScBx9G1/vsFZZJUO+tD26M8J8z3Kw5RDQjaoZe03YAClgeS/SWPOcb4nkFBTEi5DUEA==", + "dependencies": {} + }, "mdurl@2.0.0": { "integrity": "sha512-Lf+9+2r+Tdp5wXDXC4PcIBjTDtq4UKjCPMQhKIuzpJNW0b96kVqSwW0bT7FhRSfmAiFYgP+SCRvdrDozfh0U5w==", "dependencies": {} @@ -326,6 +407,16 @@ "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==", "dependencies": {} }, + "nth-check@2.1.1": { + "integrity": "sha512-lqjrjmaOoAnWfMmBPL+XNnynZh2+swxiX3WUE0s4yEHI6m+AwrK2UZOimIRl3X/4QctVqS8AiZjFqyOGrMXb/w==", + "dependencies": { + "boolbase": "boolbase@1.0.0" + } + }, + "picocolors@1.0.0": { + "integrity": "sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ==", + "dependencies": {} + }, "picomatch@2.3.1": { "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==", "dependencies": {} @@ -395,6 +486,18 @@ "integrity": "sha512-R0XvVJ9WusLiqTCEiGCmICCMplcCkIwwR11mOSD9CR5u+IXYdiseeEuXCVAjS54zqwkLcPNnmU4OeJ6tUrWhDw==", "dependencies": {} }, + "svgo@3.0.5": { + "integrity": "sha512-HQKHEo73pMNOlDlBcLgZRcHW2+1wo7bFYayAXkGN0l/2+h68KjlfZyMRhdhaGvoHV2eApOovl12zoFz42sT6rQ==", + "dependencies": { + "@trysound/sax": "@trysound/sax@0.2.0", + "commander": "commander@7.2.0", + "css-select": "css-select@5.1.0", + "css-tree": "css-tree@2.3.1", + "css-what": "css-what@6.1.0", + "csso": "csso@5.0.5", + "picocolors": "picocolors@1.0.0" + } + }, "to-regex-range@5.0.1": { "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==", "dependencies": { @@ -963,6 +1066,7 @@ "https://deno.land/x/lume@v2.0.1/deps/path.ts": "a9811933c988951154424763c17e1c470ff2f7b3eb9aa8e58ce615939806f25f", "https://deno.land/x/lume@v2.0.1/deps/sass.ts": "59ba5aeb0b1b09c85f185c867ef7e8db69df352999c55ab2dd3a2fdee6427675", "https://deno.land/x/lume@v2.0.1/deps/sharp.ts": "c2ffe9679c65ac91717b453aa8383b06746a96e8e7d22b308ac3b40edce5d5bb", + "https://deno.land/x/lume@v2.0.1/deps/svgo.ts": "649a3a5497b522f26617cc2fbc09a2214e4eaf8dfa543a3c85be3ea61600463f", "https://deno.land/x/lume@v2.0.1/deps/temporal.ts": "1958b134c4186b0ab39316fa33ba19d1a4203e2ea445080429d60d296b91a552", "https://deno.land/x/lume@v2.0.1/deps/toml.ts": "ffae452ae0d847d98efac4a45867819330d4ecf6391ea9228654bbc2bacb4e12", "https://deno.land/x/lume@v2.0.1/deps/unidecode.ts": "7479d3695704320279c8c3468ec4801a70064a7471f9974e04c45852ca882769", @@ -992,6 +1096,7 @@ "https://deno.land/x/lume@v2.0.1/plugins/sitemap.ts": "147e8b80345bc149ed3738b7b0ee57eb5f9caba222ebd8bfc0343fb810b28333", "https://deno.land/x/lume@v2.0.1/plugins/slugify_urls.ts": "0b2d51aad42f298606fac772e2f9bd3e5992296906e068791423878624ab4dbd", "https://deno.land/x/lume@v2.0.1/plugins/source_maps.ts": "2fb5a23d22768a92e04c6feefe2c704dd8d970780a90d0e069f784353f5c545f", + "https://deno.land/x/lume@v2.0.1/plugins/svgo.ts": "573b05a56e9b4cdd9aae583eb38d6c8ba38761b7804a006b20d943951d9d5a21", "https://deno.land/x/lume@v2.0.1/plugins/toml.ts": "60191e1e8fd0922def0b3f0eaad13988217511571a54659481759db4b0ca4f82", "https://deno.land/x/lume@v2.0.1/plugins/url.ts": "3d298886cb16e1110d427d2f257de6c2ae0da3cd7076b6abcbbd41e7536ed094", "https://deno.land/x/lume@v2.0.1/plugins/vento.ts": "ee0d97841f723303f9b72abbedc31b5a7eb635b5e8198b24720dfdec4e0084cc", diff --git a/site/_data/bylaws.yml b/site/_data/bylaws.yml index b15ff62d..18fa1c20 100644 --- a/site/_data/bylaws.yml +++ b/site/_data/bylaws.yml @@ -23,6 +23,6 @@ nav: - title: Insurance, Indemnification, and Dissolution href: /bylaws/indemnification-dissolution.html ord: 8 -- title: Ammendments +- title: Amendments href: /bylaws/amendments.html ord: 9 \ No newline at end of file diff --git a/site/_data/projects.json b/site/_data/projects.json new file mode 100644 index 00000000..ae1778fd --- /dev/null +++ b/site/_data/projects.json @@ -0,0 +1,46 @@ +[ + { + "draft": true, + "name": "Hibernate", + "logo": "https://raw.githubusercontent.com/hibernate/hibernate.org/production/images/hibernate-logo.svg", + "wordmark": true, + "description": "A powerful ORM framework for Java. Hibernate abstracts complex database interactions, simplifying data management and persistence in enterprise Java applications.", + "link": "https://hibernate.org/" + }, + { + "name": "Jackson", + "logo": "https://avatars.githubusercontent.com/u/382692?s=200&v=4", + "wordmark": false, + "description": "The go-to library for JSON processing in Java. Jackson offers fast and flexible parsing/generation of JSON for Java applications, enabling seamless data interchange.", + "link": "https://github.com/FasterXML/jackson" + }, + { + "name": "J'Bang", + "logo": "https://www.jbang.dev/assets/images/logo.png", + "wordmark": true, + "description": "Unlock Java's scripting potential. JBang makes it easy to run Java applications as scripts without the need for a project setup or build configuration. Ideal for quick experiments, prototypes, or utility scripts.", + "link": "https://www.jbang.dev/" + }, + { + "name": "JReleaser", + "logo": "https://jreleaser.org/images/jreleaser-duke.png", + "wordmark": false, + "description": "Automate your Java project releases with ease. JReleaser streamlines packaging and distribution to multiple platforms, integrating with Maven, Gradle, and more. Simplify your release process, from changelogs to deployment.", + "link": "https://jreleaser.org/" + }, + { + "name": "Morphia", + "logo": "https://github.com/MorphiaOrg/morphia-docs/blob/229de82b949a8bc21fa4ecc17a617f2726eb6f33/supplemental-ui/img/logo.png?raw=true", + "wordmark": false, + "description": "Bridge the gap between Java and MongoDB. Morphia provides a lightweight type-safe mapping library to simplify working with MongoDB documents using Java.", + "link": "https://morphia.dev/" + }, + { + "draft": true, + "name": "OpenRewrite", + "logo": "https://avatars.githubusercontent.com/u/61478321?s=200&v=4", + "wordmark": false, + "description": "Automate the refactoring of your Java codebase. OpenRewrite offers scalable, safe, and idempotent code transformations to modernize and maintain your applications.", + "link": "https://www.openrewrite.org/" + } +] diff --git a/site/_data/svg.yml b/site/_data/svg.yml index 6f4cc8f2..119194df 100644 --- a/site/_data/svg.yml +++ b/site/_data/svg.yml @@ -1,5 +1,6 @@ activity: announcement: +blank: closed: communication: down: diff --git a/site/_includes/foundation.yml b/site/_includes/foundation.yml index eb75a092..f1214e5a 100644 --- a/site/_includes/foundation.yml +++ b/site/_includes/foundation.yml @@ -12,18 +12,27 @@ agreements: be followed during bootstrapping. date: 2024-02-28T18:32:52.000Z layout: layouts/bylaws.vto + cssclasses: + - bylaws + - has-aside CONTRIBUTING: url: /about/contributing.html metas: robots: false date: 2024-02-21T17:44:44.000Z layout: layouts/bylaws.vto + cssclasses: + - bylaws + - has-aside CODE_OF_CONDUCT: url: /about/code-of-conduct.html metas: robots: false date: 2024-02-21T13:47:53.000Z layout: layouts/bylaws.vto + cssclasses: + - bylaws + - has-aside COMMUNICATION: url: /community/ description: > @@ -36,6 +45,9 @@ COMMUNICATION: community. date: 2024-02-02T15:07:59.000Z layout: layouts/bylaws.vto + cssclasses: + - bylaws + - has-aside FAQ: url: /about/faq.html description: > @@ -44,12 +56,18 @@ FAQ: projects instead of other organizations. date: 2024-02-11T14:41:07.000Z layout: layouts/bylaws.vto + cssclasses: + - bylaws + - has-aside GOVERNANCE: url: /about/governance.html metas: robots: false date: 2024-03-12T14:23:52.000Z layout: layouts/bylaws.vto + cssclasses: + - bylaws + - has-aside README: url: /about/ description: > @@ -59,6 +77,9 @@ README: to get involved. date: 2024-03-12T14:23:52.000Z layout: layouts/bylaws.vto + cssclasses: + - bylaws + - has-aside TRADEMARKS: url: /about/trademarks.html description: > @@ -71,12 +92,18 @@ TRADEMARKS: and reporting of misuse. date: 2023-11-08T18:27:19.000Z layout: layouts/bylaws.vto + cssclasses: + - bylaws + - has-aside bylaws: 0-preface: description: | Overview of terms and concepts in the Commonhaus Foundation bylaws layout: layouts/bylaws.vto date: 2024-03-12T14:23:52.000Z + cssclasses: + - bylaws + - has-aside 1-purpose: description: > Discover the foundational purpose and non-profit status of the Commonhaus @@ -88,6 +115,9 @@ bylaws: activities and initiatives. date: 2024-02-14T00:35:35.000Z layout: layouts/bylaws.vto + cssclasses: + - bylaws + - has-aside 2-cf-membership: description: > Explore the membership structure of the Commonhaus Foundation in this @@ -100,6 +130,9 @@ bylaws: the foundation. date: 2024-02-24T14:12:10.000Z layout: layouts/bylaws.vto + cssclasses: + - bylaws + - has-aside 3-cf-council: description: > Dive into the workings of the Commonhaus Foundation Council, the central @@ -113,6 +146,9 @@ bylaws: within the foundation. date: 2024-03-12T14:23:52.000Z layout: layouts/bylaws.vto + cssclasses: + - bylaws + - has-aside 4-cf-advisory-board: description: > Learn about the Commonhaus Foundation Advisory Board, a key group @@ -126,6 +162,9 @@ bylaws: foundation's direction. date: 2024-03-12T14:23:52.000Z layout: layouts/bylaws.vto + cssclasses: + - bylaws + - has-aside 5-decision-making: description: > Navigate the decision-making, voting, and election processes of the @@ -138,6 +177,9 @@ bylaws: principles. date: 2024-02-14T00:35:35.000Z layout: layouts/bylaws.vto + cssclasses: + - bylaws + - has-aside 6-notice-records: description: > Understand the Commonhaus Foundation approach to notice and record-keeping @@ -150,6 +192,9 @@ bylaws: commitment to modern, streamlined, and transparent governance practices. date: 2024-02-24T14:12:10.000Z layout: layouts/bylaws.vto + cssclasses: + - bylaws + - has-aside 7-indemnification-dissolution: description: > Explore the Commonhaus Foundation's approach to liability, @@ -161,6 +206,9 @@ bylaws: distributed in a manner consistent with its mission and values. date: 2024-02-24T14:12:10.000Z layout: layouts/bylaws.vto + cssclasses: + - bylaws + - has-aside 8-amendments: description: > Navigate the modern, electronic process for amending the Commonhaus @@ -173,6 +221,9 @@ bylaws: governance of the foundation. date: 2024-02-24T14:12:10.000Z layout: layouts/bylaws.vto + cssclasses: + - bylaws + - has-aside README: description: > Access the essential index of the Commonhaus Foundation's bylaws, @@ -184,6 +235,9 @@ bylaws: understanding the framework for governance changes within the foundation. date: 2024-02-17T16:11:01.000Z layout: layouts/bylaws.vto + cssclasses: + - bylaws + - has-aside policies: code-of-conduct: url: /policies/code-of-conduct/ @@ -195,6 +249,9 @@ policies: along with procedures for reporting and resolving issues. date: 2024-03-12T14:23:52.000Z layout: layouts/bylaws.vto + cssclasses: + - bylaws + - has-aside conflict-of-interest: url: /policies/conflict-of-interest/ description: > @@ -205,6 +262,9 @@ policies: for addressing potential conflicts. date: 2024-03-12T14:23:52.000Z layout: layouts/bylaws.vto + cssclasses: + - bylaws + - has-aside ip-policy: url: /policies/ip-policy/ description: > @@ -215,6 +275,9 @@ policies: for addressing potential conflicts. date: 2024-03-12T14:23:52.000Z layout: layouts/bylaws.vto + cssclasses: + - bylaws + - has-aside README: description: > This document acts as a central index to the various policies of the @@ -229,6 +292,9 @@ policies: shape the foundation's activities and decisions. date: 2024-03-12T14:23:52.000Z layout: layouts/bylaws.vto + cssclasses: + - bylaws + - has-aside security-policy: url: /policies/security-policy/ description: > @@ -241,6 +307,9 @@ policies: community. date: 2024-02-02T15:07:59.000Z layout: layouts/bylaws.vto + cssclasses: + - bylaws + - has-aside succession-plan: url: /policies/succession-plan/ description: > @@ -255,6 +324,9 @@ policies: foundation's strategy for nurturing and preserving its projects. date: 2024-03-12T14:23:52.000Z layout: layouts/bylaws.vto + cssclasses: + - bylaws + - has-aside trademark-policy: url: /policies/trademark-policy/ description: > @@ -271,6 +343,9 @@ policies: legal and appropriate application. date: 2024-03-12T14:23:52.000Z layout: layouts/bylaws.vto + cssclasses: + - bylaws + - has-aside CLA: url: /policies/cla/ description: > @@ -282,3 +357,6 @@ policies: that their contributions are used in accordance with their intentions. date: 2024-02-16T18:24:37.000Z layout: layouts/bylaws.vto + cssclasses: + - bylaws + - has-aside diff --git a/site/_includes/layouts/activityArchive.vto b/site/_includes/layouts/activityArchive.vto index da5c7474..ca45b663 100644 --- a/site/_includes/layouts/activityArchive.vto +++ b/site/_includes/layouts/activityArchive.vto @@ -1,5 +1,5 @@ --- -layout: layouts/index.vto +layout: layouts/baseIndex.vto --- {{- set allPosts = search.pages(page.data.indexQuery, "date=desc") }} {{- set postsByYear = allPosts.reduce((acc, post) => { @@ -14,14 +14,15 @@ layout: layouts/index.vto
{{- for year of sortedYears }}
+ -
    +
      {{- set posts = postsByYear[year] }} {{- for post of posts }} -
    • +
    • {{ post |> postLock }} - {{ post.title }} +
      {{ post.title }}
      • {{- /for }}
    diff --git a/site/_includes/layouts/activityOverview.vto b/site/_includes/layouts/activityOverview.vto index 1020dc03..7cb6443d 100644 --- a/site/_includes/layouts/activityOverview.vto +++ b/site/_includes/layouts/activityOverview.vto @@ -1,5 +1,5 @@ --- -layout: layouts/index.vto +layout: layouts/baseIndex.vto --- {{ content }} @@ -9,25 +9,25 @@ layout: layouts/index.vto
      {{- for post of search.pages("post announcements !notice", "updated=desc", 5) }} -
    • +
    • {{ post |> postLock }} - {{ post.title }} +
      {{ post.title }}
      • {{- /for }}
-
+

- Notice + Consensus Building (Notice)

    {{- for post of search.pages("post notice", "updated=desc", 5) }} -
  • +
  • {{ post |> postLock }} - {{ post.title }} +
    {{ post.title }}
    • {{- /for }}
@@ -35,15 +35,17 @@ layout: layouts/index.vto

- Votes + Vote Results

    {{- for post of search.pages("vote", "updated=desc", 5) }} -
  • +
  • {{ post |> postLock }} - {{ post.voteItem }} - {{ post.itemTitle }} +
    + {{ post.itemTitle }} + {{ post.voteItem }} +
    • {{- /for }}
diff --git a/site/_includes/layouts/activitySidebar.vto b/site/_includes/layouts/activitySidebar.vto index 5efa2051..af566236 100644 --- a/site/_includes/layouts/activitySidebar.vto +++ b/site/_includes/layouts/activitySidebar.vto @@ -1,13 +1,14 @@ --- layout: layouts/base.vto --- -{{> const activityTitle = page.data.tags.includes("announcements") - ? 'Announcements' - : page.data.tags.includes("vote") ? 'Votes' : 'Consensus Building' }} -{{> const activityType = page.data.tags.includes("announcements") - ? 'post announcements' - : page.data.tags.includes("vote") ? 'vote' :'post reviews' }} +{{> const activityTitle = page.data.tags.includes("notice") + ? 'Notice' + : page.data.tags.includes("vote") ? 'Votes' : 'Announcement' }} +{{> const activityType = page.data.tags.includes("notice") + ? 'post notice' + : page.data.tags.includes("vote") ? 'vote' :'post announcements !notice' }} {{ content }} + diff --git a/site/_includes/layouts/aside-toc.vto b/site/_includes/layouts/test-aside-toc.vto similarity index 94% rename from site/_includes/layouts/aside-toc.vto rename to site/_includes/layouts/test-aside-toc.vto index ca0e83d0..08d86393 100644 --- a/site/_includes/layouts/aside-toc.vto +++ b/site/_includes/layouts/test-aside-toc.vto @@ -13,9 +13,10 @@ layout: layouts/base.vto Last updated +