Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: wrong object used in EJS to get logo-alt for sidebar #10254

Open
wants to merge 11 commits into
base: main
Choose a base branch
from
+37 −2
Open

fix: wrong object used in EJS to get logo-alt for sidebar #10254

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
3753d67
fix: logo-alt broken when logo-href provided
mcanouil Jul 8, 2024
52c9de0
revert: rm eof new line
mcanouil Jul 9, 2024
70b90aa
chore: keep only one new line
mcanouil Jul 9, 2024
dd805e1
test: add unit test for logo-alt in navbar/sidebar
mcanouil Jul 9, 2024
1ef3ef2
Merge branch 'main' into fix/issue10251
mcanouil Jul 9, 2024
7d542ab
chore: clarify sidebar in changelog
mcanouil Jul 9, 2024
a815047
Merge branch 'main' into fix/issue10251
mcanouil Jan 27, 2025
8b4ac5c
Merge branch 'main' into fix/issue10251
mcanouil Jan 31, 2025
0e91f0d
revert: changelog update
mcanouil Jan 31, 2025
565771e
chore: add changelog entry to 1.7 changelog
mcanouil Jan 31, 2025
5c5db1b
Merge branch 'fix/issue10251' of https://github.com/mcanouil/quarto-c…
mcanouil Jan 31, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions news/changelog-1.7.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ All changes included in 1.7:
## YAML validation

- ([#11654](https://github.com/quarto-dev/quarto-cli/issues/11654)): Allow `page-inset` as value in `column` key for code cells.
- ([#10251](https://github.com/quarto-dev/quarto-cli/issues/10251)): EJS template for website now uses proper object to get alt text for logo in sidebar.

## Website projects

Expand Down
4 changes: 2 additions & 2 deletions src/resources/projects/website/templates/sidebar.ejs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
<div class="pt-lg-2 mt-2 <%= alignCss %> sidebar-header<%= sidebar.logo && sidebar.title ? ' sidebar-header-stacked' : '' %>">
<% if (sidebar.logo) { %>
<a href="<%- sidebar['logo-href'] || '/index.html' %>" class="sidebar-logo-link">
<img src="<%- sidebar.logo %>" alt="<%- navbar['logo-alt'] || '' %>" class="sidebar-logo py-0 d-lg-inline d-none"/>
<img src="<%- sidebar.logo %>" alt="<%- sidebar['logo-alt'] || '' %>" class="sidebar-logo py-0 d-lg-inline d-none"/>
</a>
<% } %>
<% if (needsTools && toolsLocation === "logo") { %>
Expand Down Expand Up @@ -92,4 +92,4 @@
<% } %>

</nav>
<div id="quarto-sidebar-glass" class="quarto-sidebar-collapse-item" data-bs-toggle="collapse" data-bs-target=".quarto-sidebar-collapse-item" ></div>
<div id="quarto-sidebar-glass" class="quarto-sidebar-collapse-item" data-bs-toggle="collapse" data-bs-target=".quarto-sidebar-collapse-item" ></div>
19 changes: 19 additions & 0 deletions tests/docs/smoke-all/2024/07/09/issue-10251/_quarto.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
project:
type: website

website:
title: "issue-10251"
navbar:
logo: "https://quarto.org/quarto.png"
logo-alt: "this is the alt text that for the logo in the navbar"
left:
- href: index.qmd
text: Home
sidebar:
logo: "https://quarto.org/quarto.png"
logo-alt: "this is the alt text that for the logo in the sidebar"

format:
html:
theme: cosmo
toc: true
15 changes: 15 additions & 0 deletions tests/docs/smoke-all/2024/07/09/issue-10251/index.qmd
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
---
title: "issue-10251"
_quarto:
tests:
html:
ensureFileRegexMatches:
- [
'<img src="https://quarto.org/quarto.png" alt="this is the alt text that for the logo in the sidebar" class="sidebar-logo py-0 d-lg-inline d-none">',
'<img src="https://quarto.org/quarto.png" alt="this is the alt text that for the logo in the navbar" class="navbar-logo">'
]
---

This is a Quarto website.

To learn more about Quarto websites visit <https://quarto.org/docs/websites>.
Loading