Skip to content

Commit

Permalink
Merge pull request #95 from RSE-Sheffield/bugfix_ampersand
Browse files Browse the repository at this point in the history
Bugfix: Avoid double html escaping of lesson title.
  • Loading branch information
zkamvar authored Oct 9, 2023
2 parents 8b93052 + 3eb9471 commit 1072832
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 4 deletions.
5 changes: 5 additions & 0 deletions DESCRIPTION
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,11 @@ Authors@R: c(
family = "Michonneau",
role = c("ctb"),
email = "[email protected]"),
person(given = "Robert",
family = "Chisholm",
role = c("ctb"),
email = "[email protected]",
comment = c(ORCID = "0000-0003-3379-9042")),
person()
)
Description: This package does nothing but contain template HTML CSS and JS files.
Expand Down
2 changes: 1 addition & 1 deletion inst/pkgdown/templates/head.html
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<meta charset="utf-8">
<title>{{#site}}{{title}}{{/site}}{{#pagetitle}}: {{&pagetitle}}{{/pagetitle}}</title>
<title>{{#site}}{{&title}}{{/site}}{{#pagetitle}}: {{&pagetitle}}{{/pagetitle}}</title>
<meta name="viewport" content="width=device-width, initial-scale=1">
<link rel="stylesheet" type="text/css" href="{{#site}}{{root}}{{/site}}assets/styles.css">
<script src="{{#site}}{{root}}{{/site}}assets/scripts.js" type="text/javascript"></script>
Expand Down
6 changes: 3 additions & 3 deletions inst/pkgdown/templates/header.html
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@
<img class="small-logo" alt="{{#yaml}}{{carpentry_name}}{{/yaml}}" src="{{#site}}{{root}}{{/site}}assets/images/{{#yaml}}{{carpentry_icon}}-logo-sm.svg{{/yaml}}">
</div>
<div class="lesson-title-md">
{{#site}}{{title}}{{/site}}
{{#site}}{{&title}}{{/site}}
</div>
<div class="search-icon-sm">
<!-- TODO: do not show until we have search
Expand All @@ -119,7 +119,7 @@
<ul class="navbar-nav me-auto mb-2 mb-lg-0">
<li class="nav-item">
<span class="lesson-title">
{{#site}}{{title}}{{/site}}
{{#site}}{{&title}}{{/site}}
</span>
</li>
{{#overview}}
Expand Down Expand Up @@ -181,7 +181,7 @@
</nav>

<div class="col-md-12 mobile-title">
{{#site}}{{title}}{{/site}}
{{#site}}{{&title}}{{/site}}
</div>

{{^overview}}
Expand Down

0 comments on commit 1072832

Please sign in to comment.