diff --git a/.github/DISCUSSION_TEMPLATE/general.yaml b/.github/DISCUSSION_TEMPLATE/general.yaml new file mode 100644 index 0000000000..66b2c499f0 --- /dev/null +++ b/.github/DISCUSSION_TEMPLATE/general.yaml @@ -0,0 +1,35 @@ +body: + - type: checkboxes + attributes: + label: Checks + options: + - label: I have searched **[the docs](https://greene-lab.gitbook.io/lab-website-template-docs)**, [existing issues](https://github.com/greenelab/lab-website-template/issues), and [existing discussions](https://github.com/greenelab/lab-website-template/discussions) for answers first. + required: true + + - type: input + id: repo + attributes: + label: Link to your website repo + description: "In almost all cases, **we cannot help you if you don't provide this**." + placeholder: ex. https://github.com/greenelab/greenelab.com + validations: + required: true + + - type: input + id: version + attributes: + label: Version of Lab Website Template you are using + description: See your `CITATION.cff` file. + placeholder: ex. 1.0.0 + validations: + required: true + + - type: textarea + id: description + attributes: + label: Description + description: | + Describe your issue in as much detail as possible. For example: What happened? What did you expect to happen? How can we reproduce the problem? What browser are you seeing the problem in? + placeholder: Description + validations: + required: true diff --git a/.github/DISCUSSION_TEMPLATE/q-a.yaml b/.github/DISCUSSION_TEMPLATE/q-a.yaml new file mode 100644 index 0000000000..66b2c499f0 --- /dev/null +++ b/.github/DISCUSSION_TEMPLATE/q-a.yaml @@ -0,0 +1,35 @@ +body: + - type: checkboxes + attributes: + label: Checks + options: + - label: I have searched **[the docs](https://greene-lab.gitbook.io/lab-website-template-docs)**, [existing issues](https://github.com/greenelab/lab-website-template/issues), and [existing discussions](https://github.com/greenelab/lab-website-template/discussions) for answers first. + required: true + + - type: input + id: repo + attributes: + label: Link to your website repo + description: "In almost all cases, **we cannot help you if you don't provide this**." + placeholder: ex. https://github.com/greenelab/greenelab.com + validations: + required: true + + - type: input + id: version + attributes: + label: Version of Lab Website Template you are using + description: See your `CITATION.cff` file. + placeholder: ex. 1.0.0 + validations: + required: true + + - type: textarea + id: description + attributes: + label: Description + description: | + Describe your issue in as much detail as possible. For example: What happened? What did you expect to happen? How can we reproduce the problem? What browser are you seeing the problem in? + placeholder: Description + validations: + required: true diff --git a/.github/ISSUE_TEMPLATE/issue.yaml b/.github/ISSUE_TEMPLATE/issue.yaml index 4d09efb61a..d812555039 100644 --- a/.github/ISSUE_TEMPLATE/issue.yaml +++ b/.github/ISSUE_TEMPLATE/issue.yaml @@ -13,8 +13,10 @@ body: id: repo attributes: label: Link to your website repo - description: "**Strongly recommended** so we can help troubleshoot your issue." + description: "In almost all cases, **we cannot help you if you don't provide this**." placeholder: ex. https://github.com/greenelab/greenelab.com + validations: + required: true - type: input id: version @@ -22,6 +24,8 @@ body: label: Version of Lab Website Template you are using description: See your `CITATION.cff` file. placeholder: ex. 1.0.0 + validations: + required: true - type: textarea id: description diff --git a/.github/workflows/build-preview.yaml b/.github/workflows/build-preview.yaml index 52842860fe..3ef0404422 100644 --- a/.github/workflows/build-preview.yaml +++ b/.github/workflows/build-preview.yaml @@ -22,28 +22,29 @@ jobs: steps: # for debugging - - name: Print contexts - uses: crazy-max/ghaction-dump-context@v1 + - uses: crazy-max/ghaction-dump-context@v2 - name: Checkout branch contents - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: repository: ${{ github.event.pull_request.head.repo.full_name }} ref: ${{ github.head_ref }} - name: Install Ruby packages if: github.event.action != 'closed' - uses: ruby/setup-ruby@v1 + uses: ruby/setup-ruby@v1.172.0 with: - ruby-version: "3.0" + ruby-version: "3.1" bundler-cache: true - name: Get Pages url if: github.event.action != 'closed' id: pages - uses: actions/configure-pages@v2 - with: - enablement: false + uses: actions/configure-pages@v4 + + # for debugging + - if: runner.debug == '1' + uses: mxschmitt/action-tmate@v3 - name: Build preview version of site if: github.event.action != 'closed' @@ -51,7 +52,7 @@ jobs: JEKYLL_ENV=production bundle exec jekyll build --baseurl "${{ steps.pages.outputs.base_path || '' }}/${{ env.PREVIEWS_FOLDER }}/pr-${{ github.event.number }}" - name: Commit preview to Pages branch - uses: rossjrw/pr-preview-action@v1 + uses: rossjrw/pr-preview-action@v1.4.7 with: source-dir: _site umbrella-dir: ${{ env.PREVIEWS_FOLDER }} diff --git a/.github/workflows/build-site.yaml b/.github/workflows/build-site.yaml index 9b71767f07..6aa3e5a489 100644 --- a/.github/workflows/build-site.yaml +++ b/.github/workflows/build-site.yaml @@ -21,30 +21,35 @@ jobs: steps: # for debugging - - name: Print contexts - uses: crazy-max/ghaction-dump-context@v1 + - uses: crazy-max/ghaction-dump-context@v2 - name: Checkout branch contents - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Install Ruby packages - uses: ruby/setup-ruby@v1 + uses: ruby/setup-ruby@v1.172.0 with: - ruby-version: "3.0" + ruby-version: "3.1" bundler-cache: true - name: Get Pages url id: pages - uses: actions/configure-pages@v2 - with: - enablement: false + uses: actions/configure-pages@v4 + + # for debugging + - if: runner.debug == '1' + uses: mxschmitt/action-tmate@v3 + + - name: Set root url + run: | + echo "\n\nurl: ${{ steps.pages.outputs.origin }}" >> _config.yaml - name: Build live version of site run: | JEKYLL_ENV=production bundle exec jekyll build --baseurl "${{ steps.pages.outputs.base_path || '' }}" - name: Commit live site to Pages branch - uses: JamesIves/github-pages-deploy-action@v4 + uses: JamesIves/github-pages-deploy-action@v4.5.0 with: folder: _site clean-exclude: ${{ env.PREVIEWS_FOLDER }} diff --git a/.github/workflows/first-time-setup.yaml b/.github/workflows/first-time-setup.yaml index bf227f7da4..51d3273b0a 100644 --- a/.github/workflows/first-time-setup.yaml +++ b/.github/workflows/first-time-setup.yaml @@ -14,21 +14,24 @@ jobs: steps: # for debugging - - name: Print contexts - uses: crazy-max/ghaction-dump-context@v1 + - uses: crazy-max/ghaction-dump-context@v2 - name: Create Pages branch - uses: peterjgrainger/action-create-branch@v2.4.0 + uses: peterjgrainger/action-create-branch@v3.0.0 env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} with: branch: "gh-pages" - name: Checkout Pages branch - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: ref: gh-pages + # for debugging + - if: runner.debug == '1' + uses: mxschmitt/action-tmate@v3 + # clean slate, as if starting from orphan branch - name: Clear Pages branch run: rm -rf * .github .docker .gitignore @@ -41,13 +44,13 @@ jobs: run: echo "Placeholder homepage" > index.html - name: Commit changes to Pages branch - uses: stefanzweifel/git-auto-commit-action@v4 + uses: stefanzweifel/git-auto-commit-action@v5 with: branch: gh-pages commit_message: "Clear branch" - name: Checkout main branch - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Remove files user doesn't need run: | @@ -55,12 +58,13 @@ jobs: CHANGELOG.md \ testbed.md \ .github/ISSUE_TEMPLATE \ + .github/DISCUSSION_TEMPLATE \ .github/workflows/versioning.yaml \ .github/pull_request_template.md \ - + - name: Rename files run: | - mv .github/user_pull_request_template.md .github/pull_request_template.md + mv -f .github/user_pull_request_template.md .github/pull_request_template.md - name: Set vars for personalization run: | @@ -80,7 +84,7 @@ jobs: " > README.md - name: Personalize Jekyll config for user - uses: actions/github-script@v6 + uses: actions/github-script@v7 with: script: | const { readFileSync, writeFileSync } = require("fs"); @@ -97,7 +101,7 @@ jobs: writeFileSync(file, contents); - name: Personalize homepage for user - uses: actions/github-script@v6 + uses: actions/github-script@v7 with: script: | const { readFileSync, writeFileSync } = require("fs"); @@ -109,6 +113,6 @@ jobs: writeFileSync(file, contents); - name: Commit changed files - uses: stefanzweifel/git-auto-commit-action@v4 + uses: stefanzweifel/git-auto-commit-action@v5 with: commit_message: "Setup repo" diff --git a/.github/workflows/update-citations.yaml b/.github/workflows/update-citations.yaml index 2bafb55257..f6ff6ec23a 100644 --- a/.github/workflows/update-citations.yaml +++ b/.github/workflows/update-citations.yaml @@ -29,17 +29,16 @@ jobs: steps: # for debugging - - name: Print contexts - uses: crazy-max/ghaction-dump-context@v1 + - uses: crazy-max/ghaction-dump-context@v2 - name: Checkout branch contents - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: repository: ${{ github.event.pull_request.head.repo.full_name }} ref: ${{ github.head_ref }} - name: Setup Python - uses: actions/setup-python@v4 + uses: actions/setup-python@v5 with: python-version: "3.11" cache: "pip" @@ -49,13 +48,17 @@ jobs: run: | python -m pip install --upgrade --requirement ./_cite/requirements.txt + # for debugging + - if: runner.debug == '1' + uses: mxschmitt/action-tmate@v3 + - name: Build updated citations run: python _cite/cite.py timeout-minutes: 15 - name: Check if citations changed id: changed - uses: tj-actions/verify-changed-files@v13 + uses: tj-actions/verify-changed-files@v18 with: files: | _data/citations.yaml @@ -64,7 +67,7 @@ jobs: if: | steps.changed.outputs.files_changed == 'true' && inputs.open-pr != true - uses: stefanzweifel/git-auto-commit-action@v4 + uses: stefanzweifel/git-auto-commit-action@v5 with: commit_message: "Update citations" @@ -72,7 +75,7 @@ jobs: if: | steps.changed.outputs.files_changed == 'true' && inputs.open-pr == true - uses: peter-evans/create-pull-request@v4 + uses: peter-evans/create-pull-request@v6 with: branch: citation-update title: Periodic citation update diff --git a/.github/workflows/update-url.yaml b/.github/workflows/update-url.yaml index 9ccd9a3eb4..b3573a547b 100644 --- a/.github/workflows/update-url.yaml +++ b/.github/workflows/update-url.yaml @@ -20,21 +20,22 @@ jobs: steps: # for debugging - - name: Print contexts - uses: crazy-max/ghaction-dump-context@v1 + - uses: crazy-max/ghaction-dump-context@v2 - name: Get Pages url id: pages - uses: actions/configure-pages@v2 - with: - enablement: false + uses: actions/configure-pages@v4 - name: Checkout branch contents - uses: actions/checkout@v3 + uses: actions/checkout@v4 + + # for debugging + - if: runner.debug == '1' + uses: mxschmitt/action-tmate@v3 # update link to site in readme - name: Update readme - uses: actions/github-script@v6 + uses: actions/github-script@v7 with: script: | const { readFileSync, writeFileSync } = require("fs"); @@ -53,14 +54,14 @@ jobs: - name: Check if readme changed id: changed - uses: tj-actions/verify-changed-files@v13 + uses: tj-actions/verify-changed-files@v18 with: files: | README.md - name: Commit changed files if: steps.changed.outputs.files_changed == 'true' - uses: stefanzweifel/git-auto-commit-action@v4 + uses: stefanzweifel/git-auto-commit-action@v5 with: commit_message: "Update url" diff --git a/.github/workflows/versioning.yaml b/.github/workflows/versioning.yaml index cc2655f650..e148f366b7 100644 --- a/.github/workflows/versioning.yaml +++ b/.github/workflows/versioning.yaml @@ -21,25 +21,26 @@ jobs: runs-on: ubuntu-latest steps: # for debugging - - name: Print contexts - uses: crazy-max/ghaction-dump-context@v1 + - uses: crazy-max/ghaction-dump-context@v2 + - if: runner.debug == '1' + uses: mxschmitt/action-tmate@v3 - name: Checkout base branch contents - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: ref: main path: base - name: Checkout pr branch contents - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: path: pr - name: Install packages - run: yarn add yaml semver + run: npm install yaml semver - name: Check version, date, changelog - uses: actions/github-script@v6 + uses: actions/github-script@v7 with: script: | const { readFileSync } = require("fs"); @@ -85,18 +86,21 @@ jobs: runs-on: ubuntu-latest steps: # for debugging - - name: Print contexts - uses: crazy-max/ghaction-dump-context@v1 + - uses: crazy-max/ghaction-dump-context@v2 - name: Checkout branch contents - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Install packages - run: yarn add yaml semver + run: npm install yaml semver + + # for debugging + - if: runner.debug == '1' + uses: mxschmitt/action-tmate@v3 - name: Get version and body id: version - uses: actions/github-script@v6 + uses: actions/github-script@v7 with: script: | const { readFileSync } = require("fs"); @@ -123,7 +127,7 @@ jobs: return { version, body }; - name: Create GitHub release - uses: ncipollo/release-action@v1 + uses: ncipollo/release-action@v1.14.0 with: commit: ${{ github.ref }} tag: v${{ fromJson(steps.version.outputs.result).version }} diff --git a/CHANGELOG.md b/CHANGELOG.md index 4b25f89cd5..d702c3e8e1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,13 +2,33 @@ Reference: common-changelog.org +## 1.2.0 - 2024-03-08 + +### Changed + +- Update all GitHub Actions to fix "Node v16 deprecated" warnings. +- Sources that Manubot doesn't know how to cite (e.g. wosuid:12345) are now ignored by default if they're from metasources. +- Fix bug where passing tags to tags component manually doesn't work. +- Fix bug in citation (and other) components when `lookup` is blank. +- Fix nested tables bug. +- Dark mode tweaks. +- Various CSS tweaks and fixes. + +### Added + +- Add `image` param to support blog post thumbnails. +- Add `html-proofer` plugin that checks for broken images/links/etc. +- Add `remove` flag to remove a source from a metasource. + ## 1.1.6 - 2023-10-06 +### Changed + - Use latest minor versions of Python packages in auto-cite script. ## 1.1.5 - 2023-05-19 -### Changes +### Changed - Fix ORCID plugin bug and other cite process tweaks. diff --git a/CITATION.cff b/CITATION.cff index 22d406cee3..dcb59dc43f 100644 --- a/CITATION.cff +++ b/CITATION.cff @@ -1,8 +1,8 @@ # citation metadata for the template itself title: "Lab Website Template" -version: 1.1.6 -date-released: 2023-10-06 +version: 1.2.0 +date-released: 2024-03-08 url: "https://github.com/greenelab/lab-website-template" authors: - family-names: "Rubinetti" diff --git a/Gemfile b/Gemfile index b39f041e80..cbdd53f220 100644 --- a/Gemfile +++ b/Gemfile @@ -4,6 +4,8 @@ source "https://rubygems.org" gem "jekyll", "~> 4.3" gem "webrick", "~> 1.7" +gem "html-proofer", "~> 5.0" + # plugins group :jekyll_plugins do gem "jekyll-spaceship" diff --git a/Gemfile.lock b/Gemfile.lock index d719aa93fe..ee2cb12165 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,23 +1,50 @@ GEM remote: https://rubygems.org/ specs: + Ascii85 (1.1.0) addressable (2.8.1) public_suffix (>= 2.0.2, < 6.0) + afm (0.2.2) + async (2.8.1) + console (~> 1.10) + fiber-annotation + io-event (~> 1.1) + timers (~> 4.1) colorator (1.1.0) concurrent-ruby (1.2.2) + console (1.23.4) + fiber-annotation + fiber-local + json em-websocket (0.5.3) eventmachine (>= 0.12.9) http_parser.rb (~> 0) + ethon (0.16.0) + ffi (>= 1.15.0) eventmachine (1.2.7) ffi (1.15.5) ffi (1.15.5-x64-mingw-ucrt) + fiber-annotation (0.2.0) + fiber-local (1.0.0) forwardable-extended (2.6.0) gemoji (3.0.1) + google-protobuf (3.22.0) google-protobuf (3.22.0-arm64-darwin) google-protobuf (3.22.0-x64-mingw-ucrt) + hashery (2.1.2) + html-proofer (5.0.8) + addressable (~> 2.3) + async (~> 2.1) + nokogiri (~> 1.13) + pdf-reader (~> 2.11) + rainbow (~> 3.0) + typhoeus (~> 1.3) + yell (~> 2.0) + zeitwerk (~> 2.5) http_parser.rb (0.8.0) i18n (1.12.0) concurrent-ruby (~> 1.0) + io-event (1.4.4) jekyll (4.3.2) addressable (~> 2.4) colorator (~> 1.0) @@ -52,6 +79,7 @@ GEM rainbow (~> 3.0) jekyll-watch (2.2.1) listen (~> 3.0) + json (2.7.1) kramdown (2.4.0) rexml kramdown-parser-gfm (1.1.0) @@ -69,24 +97,41 @@ GEM racc (~> 1.4) pathutil (0.16.2) forwardable-extended (~> 2.6) + pdf-reader (2.12.0) + Ascii85 (~> 1.0) + afm (~> 0.2.1) + hashery (~> 2.0) + ruby-rc4 + ttfunk posix-spawn (0.3.15) public_suffix (5.0.1) racc (1.6.2) rainbow (3.1.1) + rake (13.1.0) rb-fsevent (0.11.2) rb-inotify (0.10.1) ffi (~> 1.0) rexml (3.2.5) rouge (3.30.0) + ruby-rc4 (0.1.5) safe_yaml (1.0.5) + sass-embedded (1.58.3) + google-protobuf (~> 3.21) + rake (>= 10.0.0) sass-embedded (1.58.3-arm64-darwin) google-protobuf (~> 3.21) sass-embedded (1.58.3-x64-mingw-ucrt) google-protobuf (~> 3.21) terminal-table (3.0.2) unicode-display_width (>= 1.1.1, < 3) + timers (4.3.5) + ttfunk (1.7.0) + typhoeus (1.4.1) + ethon (>= 0.9.0) unicode-display_width (2.4.2) webrick (1.8.1) + yell (2.2.2) + zeitwerk (2.6.13) PLATFORMS aarch64-linux @@ -99,6 +144,7 @@ PLATFORMS x86_64-linux DEPENDENCIES + html-proofer (~> 5.0) jekyll (~> 4.3) jekyll-feed jekyll-last-modified-at @@ -108,4 +154,4 @@ DEPENDENCIES webrick (~> 1.7) BUNDLED WITH - 2.4.7 + 2.5.6 diff --git a/_cite/.cache/cache.db b/_cite/.cache/cache.db index 4bbcc12b9f..2ca6d98078 100644 Binary files a/_cite/.cache/cache.db and b/_cite/.cache/cache.db differ diff --git a/_cite/cite.py b/_cite/cite.py index 5f8d135a94..6cd5befcd6 100644 --- a/_cite/cite.py +++ b/_cite/cite.py @@ -124,6 +124,10 @@ for index, source in enumerate(sources): log(f"Processing source {index + 1} of {len(sources)}, {label(source)}") + # if explicitly flagged, remove/ignore entry + if get_safe(source, "remove", False) == True: + continue + # new citation data for source citation = {} @@ -148,7 +152,7 @@ else: log(e, 3, "WARNING") # discard source from citations - # continue + continue # preserve fields from input source, overriding existing fields citation.update(source) diff --git a/_config.yaml b/_config.yaml index 050986828a..1c6b790bda 100644 --- a/_config.yaml +++ b/_config.yaml @@ -4,6 +4,7 @@ subtitle: by the Greene Lab description: An easy-to-use, flexible website template for labs, with automatic citations, GitHub tag imports, pre-built components, and more. header: images/background.jpg footer: images/background.jpg +proofer: false # site social media and other links links: diff --git a/_data/citations.yaml b/_data/citations.yaml index 0cc985a539..db4e4b0036 100644 --- a/_data/citations.yaml +++ b/_data/citations.yaml @@ -1,5 +1,75 @@ # DO NOT EDIT, GENERATED AUTOMATICALLY +- id: doi:10.1093/nar/gkad1082 + title: "The Monarch Initiative in 2024: an analytic platform integrating phenotypes,\ + \ genes\_and diseases across species" + authors: + - Tim E Putman + - Kevin Schaper + - Nicolas Matentzoglu + - "Vincent\_P Rubinetti" + - "Faisal\_S Alquaddoomi" + - Corey Cox + - J Harry Caufield + - Glass Elsarboukh + - Sarah Gehrke + - Harshad Hegde + - "Justin\_T Reese" + - Ian Braun + - "Richard\_M Bruskiewich" + - Luca Cappelletti + - Seth Carbon + - "Anita\_R Caron" + - "Lauren\_E Chan" + - "Christopher\_G Chute" + - "Katherina\_G Cortes" + - "Vin\xEDcius De\_Souza" + - Tommaso Fontana + - "Nomi\_L Harris" + - "Emily\_L Hartley" + - Eric Hurwitz + - "Julius\_O B Jacobsen" + - Madan Krishnamurthy + - "Bryan\_J Laraway" + - "James\_A McLaughlin" + - "Julie\_A McMurry" + - "Sierra\_A T Moxon" + - "Kathleen\_R Mullen" + - "Shawn\_T O\u2019Neil" + - "Kent\_A Shefchek" + - Ray Stefancsik + - Sabrina Toro + - "Nicole\_A Vasilevsky" + - "Ramona\_L Walls" + - "Patricia\_L Whetzel" + - David Osumi-Sutherland + - Damian Smedley + - "Peter\_N Robinson" + - "Christopher\_J Mungall" + - "Melissa\_A Haendel" + - "Monica\_C Munoz-Torres" + publisher: Nucleic Acids Research + date: '2023-11-24' + link: https://doi.org/gs6kmr + orcid: 0000-0002-4655-3773 + plugin: orcid.py + file: orcid.yaml +- id: doi:10.1101/2023.10.11.560955 + title: Integration of 168,000 samples reveals global patterns of the human gut microbiome + authors: + - Richard J. Abdill + - Samantha P. Graham + - Vincent Rubinetti + - Frank W. Albert + - Casey S. Greene + - Sean Davis + - Ran Blekhman + publisher: Cold Spring Harbor Laboratory + date: '2023-10-11' + link: https://doi.org/gsvf5z + orcid: 0000-0002-4655-3773 + plugin: orcid.py + file: orcid.yaml - id: doi:10.1093/nar/gkad289 title: 'MyGeneset.info: an interactive and programmatic platform for community-curated and user-created collections of genes' @@ -64,6 +134,28 @@ orcid: 0000-0002-4655-3773 plugin: orcid.py file: orcid.yaml +- id: doi:10.1101/2022.02.18.461833 + title: 'MolEvolvR: A web-app for characterizing proteins using molecular evolution + and phylogeny' + authors: + - Jacob D Krol + - Joseph T Burke + - Samuel Z Chen + - Lo Sosinski + - Faisal S Alquaddoomi + - Evan P Brenner + - Ethan P Wolfe + - Vince P Rubinetti + - Shaddai Amolitos + - Kellen M Reason + - John B Johnston + - Janani Ravi + publisher: Cold Spring Harbor Laboratory + date: '2022-02-22' + link: https://doi.org/gstx7j + orcid: 0000-0002-4655-3773 + plugin: orcid.py + file: orcid.yaml - id: doi:10.1186/s13059-020-02021-3 title: Compressing gene expression data using multiple latent space dimensionalities learns complementary biological representations diff --git a/_includes/card.html b/_includes/card.html index feb325cb94..600cc9714a 100644 --- a/_includes/card.html +++ b/_includes/card.html @@ -35,7 +35,9 @@ {% endif %} {% if include.description %} - {{ include.description | markdownify }} +
+ {{ include.description | markdownify | remove: "
" | remove: "
" }} + {% endif %} {% if include.tags or include.repo %} diff --git a/_includes/citation.html b/_includes/citation.html index ea62b17ed3..3eb8b2b46d 100644 --- a/_includes/citation.html +++ b/_includes/citation.html @@ -1,96 +1,109 @@ -{% assign citation = site.data.citations - | where_exp: "citation", - "citation.id == include.lookup or citation.title contains include.lookup" - | first - | default: include -%} +{% if include.lookup %} + {% assign citation = site.data.citations + | where_exp: "citation", + "citation.id == include.lookup or citation.title contains include.lookup" + | first + %} +{% else %} + {% assign citation = include %} +{% endif %} -" - | remove: "
" - }} -" + | remove: "
" + }} +- {{ excerpt }} -
++ {{ excerpt }} +
+