diff --git a/.github/workflows/gh-pages.yml b/.github/workflows/gh-pages.yml index f7b57597..a2ba2f16 100644 --- a/.github/workflows/gh-pages.yml +++ b/.github/workflows/gh-pages.yml @@ -10,16 +10,9 @@ on: jobs: deploy: - runs-on: ubuntu-20.04 + runs-on: ubuntu-22.04 steps: - - uses: actions/checkout@v2 - with: - submodules: 'recursive' - fetch-depth: 0 - - - name: Setup Yarn - uses: actions/setup-node@v2 - - run: yarn install + - uses: actions/checkout@v3 - name: Read .env hugo version id: hugo-version @@ -27,18 +20,27 @@ jobs: . ./.env echo "::set-output name=HUGO_VERSION::${HUGO_VERSION}" - - name: Setup Hugo + - name: Add hugo nodejs dependencies + uses: actions/setup-node@v3 + with: + node-version: "16" + + - name: Setup Hugo uses: peaceiris/actions-hugo@v2 with: - # sync versions with docker-compose .env ala + # sync versions with docker-compose .env ala # https://github.com/marketplace/actions/hugo-setup#%EF%B8%8F-read-hugo-version-from-file - hugo-version: '${{ steps.hugo-version.outputs.HUGO_VERSION }}' + hugo-version: "${{ steps.hugo-version.outputs.HUGO_VERSION }}" extended: true - - name: Build + - name: Build Hugo site env: HUGO_ENV: "production" - run: hugo --minify + run: | + yarn install + hugo mod init github.com/openmodelingfoundation/openmodelingfoundation.github.io + hugo mod get github.com/google/docsy@v0.4.0 + hugo --minify - name: Deploy if: github.event_name == 'push' diff --git a/.gitmodules b/.gitmodules index b76244d3..e69de29b 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +0,0 @@ -[submodule "themes/docsy"] - path = themes/docsy - url = https://github.com/google/docsy.git diff --git a/Dockerfile b/Dockerfile index 1f065f46..74fa74ef 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,11 +2,17 @@ ARG HUGO_VERSION=0.101.0 ARG DIST_TAG=-ext-ubuntu FROM klakegg/hugo:${HUGO_VERSION}${DIST_TAG} +ARG DOCSY_VERSION=v0.4.0 + LABEL maintainer="CoMSES Net " WORKDIR /src -COPY ./package.json ./yarn.lock /src/ +COPY config.toml package.json /src/ + +RUN git config --global --add safe.directory /src \ + && hugo mod init github.com/openmodelingfoundation/openmodelingfoundation.github.io \ + && hugo mod get github.com/google/docsy@${DOCSY_VERSION} -RUN yarn install +COPY . /src/ CMD ["server"] diff --git a/Makefile b/Makefile index 2583ed39..f1b313d3 100644 --- a/Makefile +++ b/Makefile @@ -18,7 +18,6 @@ commands : ## build : build files but do not run a server. build : - git submodule update --init --recursive docker-compose build --pull ## serve : start and run a local server. diff --git a/assets/scss/_sidebar-tree-with-links.scss b/assets/scss/_sidebar-tree-with-links.scss index 4747b9d8..d1dcbf4b 100644 --- a/assets/scss/_sidebar-tree-with-links.scss +++ b/assets/scss/_sidebar-tree-with-links.scss @@ -1,5 +1,4 @@ .td-sidebar-nav { - .td-page-meta { a { display: block; @@ -8,4 +7,4 @@ font-weight: $font-weight-medium; } } -} \ No newline at end of file +} diff --git a/assets/scss/main.scss b/assets/scss/main.scss index d329a7e7..a045090b 100644 --- a/assets/scss/main.scss +++ b/assets/scss/main.scss @@ -33,7 +33,16 @@ } footer { - min-height: 150px; + min-height: 160px; + + .logo { + max-width: 100%; + height: 60%; + } + + a { + color: orange !important; + } a:hover { color: white !important; @@ -63,4 +72,4 @@ footer { } } -@import "styles_project"; \ No newline at end of file +@import "styles_project"; diff --git a/config.toml b/config.toml index 44e365d7..d8e49c81 100644 --- a/config.toml +++ b/config.toml @@ -4,7 +4,8 @@ title = "The Open Modeling Foundation" enableRobotsTXT = true # Hugo allows theme composition (and inheritance). The precedence is from left to right. -theme = ["docsy"] +# NB: disabled in favor of module settings https://www.docsy.dev/docs/updating/convert-site-to-module/ +# theme = ["github.com/google/docsy", "github.com/google/docsy/dependencies"] # Will give values to .Lastmod etc. enableGitInfo = true @@ -33,6 +34,19 @@ pygmentsUseClassic = false # See https://help.farbox.com/pygments.html pygmentsStyle = "tango" +# module settings +[module] + proxy = "direct" + [module.hugoVersion] + extended = true + min = "0.101.0" + [[module.imports]] + path = "github.com/google/docsy" + disable = false + [[module.imports]] + path = "github.com/google/docsy/dependencies" + disable = false + # Configure how URLs look like per section. [permalinks] blog = "/:section/:year/:month/:day/:slug/" @@ -59,7 +73,7 @@ anchor = "smart" [languages] [languages.en] -title = "" +title = "The Open Modeling Foundation" description = "The Open Modeling Foundation is an alliance of modeling organizations that coordinates and administers a common, community developed body of standards and best practices among diverse communities of modeling scientists." languageName ="English" # Weight used for sorting. @@ -74,6 +88,9 @@ time_format_blog = "02.01.2006" # Everything below this are Site Params +[outputs] +section = [ "HTML", "RSS" ] + [params] working_group_request_form = "https://asu.questionpro.com/omf-wg-joinrequest" @@ -96,7 +113,7 @@ archived_version = false # The version number for the version of the docs represented in this doc set. # Used in the "version-banner" partial to display a version number for the # current doc set. -version = "0.1" +version = "0.4" # A link to latest version of the docs. Used in the "version-banner" partial to # point people to the main doc site. @@ -128,7 +145,7 @@ offlineSearch = true # User interface configuration [params.ui] # Enable to show the side bar menu in its compact state. -sidebar_menu_compact = false +sidebar_menu_compact = true # Set to true to disable breadcrumb navigation. breadcrumb_disable = false # Set to true to hide the sidebar search box (the top nav search box will still be displayed if search is enabled) diff --git a/content/en/_index.html b/content/en/_index.html index b613b010..1c269aa1 100644 --- a/content/en/_index.html +++ b/content/en/_index.html @@ -17,9 +17,11 @@

Enabling next generation modeling of hum }}"> Standards +
+ {{< blocks/link-down color="info" >}} +
-{{< blocks/link-down color="primary-light" >}} {{< /blocks/cover >}} diff --git a/content/en/about/_index.md b/content/en/about/_index.md index 13add73b..c04c1c18 100644 --- a/content/en/about/_index.md +++ b/content/en/about/_index.md @@ -1,6 +1,8 @@ --- title: About linkTitle: About +cascade: +- type: "docs" menu: main: weight: 20 diff --git a/content/en/contribute/_index.md b/content/en/contribute/_index.md index 21ba4889..cba63ff8 100644 --- a/content/en/contribute/_index.md +++ b/content/en/contribute/_index.md @@ -3,7 +3,8 @@ title: "How to Contribute" linkTitle: Contribute date: 2020-05-04T10:03:13-07:00 cascade: - github_issue_filter: label:"OMF site info" +- type: "docs" +- github_issue_filter: label:"OMF site info" menu: main: weight: 20 diff --git a/content/en/contribute/call-for-translators.md b/content/en/contribute/call-for-translators.md index c3db15b5..b408edae 100644 --- a/content/en/contribute/call-for-translators.md +++ b/content/en/contribute/call-for-translators.md @@ -4,4 +4,4 @@ linkTitle: "Call for Translators/Interpreters" date: 2020-05-07T10:34:28-07:00 --- -{{< include path="CALL_FOR_TRANSLATORS.md" >}} \ No newline at end of file +{{% readfile "/CALL_FOR_TRANSLATORS.md" %}} diff --git a/content/en/governance/_index.md b/content/en/governance/_index.md index 1fc37cba..4e25b635 100644 --- a/content/en/governance/_index.md +++ b/content/en/governance/_index.md @@ -2,10 +2,10 @@ title: Governance linkTitle: Governance cascade: - type: governance - github_issue_filter: "label:governance" - github_issue_template: governance.md - github_discuss_category: governance + - type: "docs" + - github_issue_filter: "label:governance" + - github_issue_template: governance.md + - github_discuss_category: governance menu: main: weight: 20 diff --git a/content/en/standards/_index.md b/content/en/standards/_index.md index 09001110..c2f4b80d 100644 --- a/content/en/standards/_index.md +++ b/content/en/standards/_index.md @@ -1,7 +1,8 @@ --- title: "Standards" linkTitle: "Standards" -type: site-wide +cascade: + - type: docs menu: main: weight: 20 diff --git a/content/en/standards/accessibility/_index.md b/content/en/standards/accessibility/_index.md index 9ae7d0c8..47e8822d 100644 --- a/content/en/standards/accessibility/_index.md +++ b/content/en/standards/accessibility/_index.md @@ -2,7 +2,6 @@ title: "Accessibility" linkTitle: "Accessibility" cascade: - type: accessibility github_issue_filter: "label:\"standards - accessibility\"" github_issue_template: accessibility.md github_discuss_category: "accessibility-standards" diff --git a/content/en/standards/documentation/_index.md b/content/en/standards/documentation/_index.md index 03e7f6ea..b08a8038 100644 --- a/content/en/standards/documentation/_index.md +++ b/content/en/standards/documentation/_index.md @@ -2,7 +2,7 @@ title: Documentation linkTitle: Documentation cascade: - type: documentation + type: docs github_issue_filter: "label:\"standards - documentation\"" github_issue_template: documentation.md github_discuss_category: "documentation-standards" diff --git a/content/en/standards/interoperability/_index.md b/content/en/standards/interoperability/_index.md index 6128cab1..bf0a0901 100644 --- a/content/en/standards/interoperability/_index.md +++ b/content/en/standards/interoperability/_index.md @@ -2,7 +2,6 @@ title: Interoperability linkTitle: Interoperability cascade: - type: interoperability github_issue_filter: "label:\"standards - interoperability\"" github_issue_template: interoperability.md github_discuss_category: "interoperability-standards" diff --git a/content/en/standards/reusability/_index.md b/content/en/standards/reusability/_index.md index b4ea2e57..42f2328b 100644 --- a/content/en/standards/reusability/_index.md +++ b/content/en/standards/reusability/_index.md @@ -2,7 +2,6 @@ title: Reusability linkTitle: Reusability cascade: - type: reusability github_issue_filter: "label:\"standards - reusability\"" github_issue_template: reusability.md github_discuss_category: "reusability-standards" diff --git a/docker-compose.yml b/docker-compose.yml index d3051f59..5032ebdc 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,7 +1,6 @@ -version: '3.8' services: hugo: - image: openmodelingfoundation/omf.io:latest + image: openmodelingfoundation/omf:latest build: context: . args: @@ -9,5 +8,13 @@ services: ports: - "127.0.0.1:1313:1313" volumes: - - .:/src + - ./archetypes:/src/archetypes + - ./assets:/src/assets + - ./content:/src/content + - ./i18n:/src/i18n + - ./layouts:/src/layouts + - ./resources:/src/resources + - ./static:/src/static + - ./.git:/src/.git + - /src/themes - /src/node_modules diff --git a/layouts/about/baseof.html b/layouts/about/baseof.html deleted file mode 100644 index af759849..00000000 --- a/layouts/about/baseof.html +++ /dev/null @@ -1,31 +0,0 @@ - - - - {{ partial "head.html" . }} - {{ if .IsHome }}{{ .Site.Title }}{{ else }}{{ with .Title }}{{ . }} | {{ end }}{{ .Site.Title }}{{ end }} - - -
- {{ partial "navbar.html" . }} -
-
-
-
-
- {{ partial "sidebar.html" . }} -
-
- {{ partial "toc.html" . }} -
-
- {{ partial "version-banner.html" . }} - {{ if not .Site.Params.ui.breadcrumb_disable }}{{ partial "breadcrumb.html" . }}{{ end }} - {{ block "main" . }}{{ end }} -
-
-
- {{ partial "footer.html" . }} -
- {{ partial "scripts.html" . }} - - \ No newline at end of file diff --git a/layouts/about/list.html b/layouts/about/list.html deleted file mode 100644 index 71224780..00000000 --- a/layouts/about/list.html +++ /dev/null @@ -1,17 +0,0 @@ -{{ define "main" }} -
-

{{ .Title }}

- {{ with .Params.description }}
{{ . | markdownify }}
{{ end }} - {{ .Content }} - {{ partial "section-index.html" . }} - {{ if (and (not .Params.hide_feedback) (.Site.Params.ui.feedback.enable) (.Site.GoogleAnalytics)) }} - {{ partial "feedback.html" .Site.Params.ui.feedback }} -
- {{ end }} - {{ if (.Site.DisqusShortname) }} -
- {{ partial "disqus-comment.html" . }} - {{ end }} -
{{ partial "page-meta-lastmod.html" . }}
-
-{{ end }} diff --git a/layouts/about/single.html b/layouts/about/single.html deleted file mode 100644 index 00cb3ab9..00000000 --- a/layouts/about/single.html +++ /dev/null @@ -1,3 +0,0 @@ -{{ define "main" }} -{{ .Render "content" }} -{{ end }} \ No newline at end of file diff --git a/layouts/contribute/baseof.html b/layouts/contribute/baseof.html deleted file mode 100644 index af759849..00000000 --- a/layouts/contribute/baseof.html +++ /dev/null @@ -1,31 +0,0 @@ - - - - {{ partial "head.html" . }} - {{ if .IsHome }}{{ .Site.Title }}{{ else }}{{ with .Title }}{{ . }} | {{ end }}{{ .Site.Title }}{{ end }} - - -
- {{ partial "navbar.html" . }} -
-
-
-
-
- {{ partial "sidebar.html" . }} -
-
- {{ partial "toc.html" . }} -
-
- {{ partial "version-banner.html" . }} - {{ if not .Site.Params.ui.breadcrumb_disable }}{{ partial "breadcrumb.html" . }}{{ end }} - {{ block "main" . }}{{ end }} -
-
-
- {{ partial "footer.html" . }} -
- {{ partial "scripts.html" . }} - - \ No newline at end of file diff --git a/layouts/contribute/list.html b/layouts/contribute/list.html deleted file mode 100644 index 71224780..00000000 --- a/layouts/contribute/list.html +++ /dev/null @@ -1,17 +0,0 @@ -{{ define "main" }} -
-

{{ .Title }}

- {{ with .Params.description }}
{{ . | markdownify }}
{{ end }} - {{ .Content }} - {{ partial "section-index.html" . }} - {{ if (and (not .Params.hide_feedback) (.Site.Params.ui.feedback.enable) (.Site.GoogleAnalytics)) }} - {{ partial "feedback.html" .Site.Params.ui.feedback }} -
- {{ end }} - {{ if (.Site.DisqusShortname) }} -
- {{ partial "disqus-comment.html" . }} - {{ end }} -
{{ partial "page-meta-lastmod.html" . }}
-
-{{ end }} diff --git a/layouts/contribute/single.html b/layouts/contribute/single.html deleted file mode 100644 index 00cb3ab9..00000000 --- a/layouts/contribute/single.html +++ /dev/null @@ -1,3 +0,0 @@ -{{ define "main" }} -{{ .Render "content" }} -{{ end }} \ No newline at end of file diff --git a/layouts/governance/baseof.html b/layouts/governance/baseof.html deleted file mode 100644 index af759849..00000000 --- a/layouts/governance/baseof.html +++ /dev/null @@ -1,31 +0,0 @@ - - - - {{ partial "head.html" . }} - {{ if .IsHome }}{{ .Site.Title }}{{ else }}{{ with .Title }}{{ . }} | {{ end }}{{ .Site.Title }}{{ end }} - - -
- {{ partial "navbar.html" . }} -
-
-
-
-
- {{ partial "sidebar.html" . }} -
-
- {{ partial "toc.html" . }} -
-
- {{ partial "version-banner.html" . }} - {{ if not .Site.Params.ui.breadcrumb_disable }}{{ partial "breadcrumb.html" . }}{{ end }} - {{ block "main" . }}{{ end }} -
-
-
- {{ partial "footer.html" . }} -
- {{ partial "scripts.html" . }} - - \ No newline at end of file diff --git a/layouts/governance/list.html b/layouts/governance/list.html deleted file mode 100644 index 71224780..00000000 --- a/layouts/governance/list.html +++ /dev/null @@ -1,17 +0,0 @@ -{{ define "main" }} -
-

{{ .Title }}

- {{ with .Params.description }}
{{ . | markdownify }}
{{ end }} - {{ .Content }} - {{ partial "section-index.html" . }} - {{ if (and (not .Params.hide_feedback) (.Site.Params.ui.feedback.enable) (.Site.GoogleAnalytics)) }} - {{ partial "feedback.html" .Site.Params.ui.feedback }} -
- {{ end }} - {{ if (.Site.DisqusShortname) }} -
- {{ partial "disqus-comment.html" . }} - {{ end }} -
{{ partial "page-meta-lastmod.html" . }}
-
-{{ end }} diff --git a/layouts/governance/single.html b/layouts/governance/single.html deleted file mode 100644 index 00cb3ab9..00000000 --- a/layouts/governance/single.html +++ /dev/null @@ -1,3 +0,0 @@ -{{ define "main" }} -{{ .Render "content" }} -{{ end }} \ No newline at end of file diff --git a/layouts/partials/footer.html b/layouts/partials/footer.html index 826f814c..6680c792 100644 --- a/layouts/partials/footer.html +++ b/layouts/partials/footer.html @@ -1,20 +1,17 @@ -