Merge pull request #4786 from quarto-dev/bugfix/templates

Bugfix/templates

Author: dragonstyle

src/command/render/codetools.ts

@@ -140,14 +140,24 @@ export function codeToolsPostprocessor(format: Format) {
         const codeTools = resolveCodeTools(format, doc);
         if (codeTools.source || codeTools.toggle) {
           const title = doc.querySelector("#title-block-header h1");
-          if (title) {
-            const header = (title as Element).parentElement;
+          const header = title !== null
+            ? (title as Element).parentElement
+            : doc.querySelector("main.content");
+
+          if (header) {
             const titleDiv = doc.createElement("div");
             titleDiv.classList.add("quarto-title-block");
             const layoutDiv = doc.createElement("div");
             titleDiv.appendChild(layoutDiv);
-            header?.replaceChild(titleDiv, title);
-            layoutDiv.appendChild(title);
+            if (title) {
+              header?.replaceChild(titleDiv, title);
+              layoutDiv.appendChild(title);
+            } else {
+              // create an empty title
+              const h1El = doc.createElement("h1");
+              layoutDiv.appendChild(h1El);
+              layoutDiv.classList.add("quarto-title-tools-only");
+            }
             const button = doc.createElement("button");
             button.setAttribute("type", "button");
             button.classList.add("btn");
@@ -159,7 +169,13 @@ export function codeToolsPostprocessor(format: Format) {
               button.appendChild(doc.createTextNode(" " + codeTools.caption));
             }
             layoutDiv.appendChild(button);
-            header!.appendChild(titleDiv);
+
+            if (title) {
+              header!.appendChild(titleDiv);
+            } else {
+              header!.prepend(titleDiv);
+            }
+
             if (codeTools.toggle) {
               button.setAttribute("id", kCodeToolsMenuButtonId);
               button.classList.add("dropdown-toggle");

src/project/types/website/website-meta.ts

@@ -301,6 +301,7 @@ function resolveImageMetadata(
   const siteMeta = format.metadata[kWebsite] as Metadata;
   if (metadata[kImage] && siteMeta && siteMeta[kSiteUrl] !== undefined) {
     // Resolve any relative urls and figure out image size
+    const inputRelImg = metadata[kImage];
     const imgMeta = imageMetadata(
       metadata[kImage] as string,
       siteMeta[kSiteUrl] as string,
@@ -318,7 +319,7 @@ function resolveImageMetadata(
       metadata[kImageAlt] = altText;
     }
 
-    return imgMeta.path;
+    return inputRelImg as string;
   }
 }
 

src/resources/formats/html/pandoc/template.html

@@ -34,6 +34,8 @@
 
 $if(title)$
 $title-block.html()$
+$elseif(subtitle)$
+$title-block.html()$
 $endif$
 
 $if(toc)$

src/resources/formats/html/pandoc/title-block.html

@@ -1,8 +1,7 @@
 <header id="title-block-header">
-<h1 class="title">$title$</h1>
+$if(title)$<h1 class="title">$title$</h1>$endif$
 $if(subtitle)$
 <p class="subtitle">$subtitle$</p>
-
 $endif$
 $for(author)$
 <p class="author">$author$</p>

src/resources/formats/html/templates/banner/title-block.html

@@ -2,7 +2,7 @@
 <header id="title-block-header" class="quarto-title-block default$if(quarto-template-params.banner-header-class)$ $quarto-template-params.banner-header-class$$endif$">
   <div class="quarto-title-banner">
     <div class="quarto-title column-body">
-      <h1 class="title">$title$</h1>
+      $if(title)$<h1 class="title">$title$</h1>$endif$
       $if(subtitle)$
       <p class="subtitle lead">$subtitle$</p>
       $endif$

src/resources/formats/html/templates/quarto-html.ejs

@@ -596,8 +596,10 @@ window.document.addEventListener("DOMContentLoaded", function (event) {
 
   <% if (linkExternalIcon || linkExternalNewwindow) { %>
     var localhostRegex = new RegExp(/^(?:http|https):\/\/localhost\:?[0-9]*\//);
-    <% if (linkExternalFilter) { %>
+    <% if (linkExternalFilter && linkExternalFilter.match(/\\\\/)) { %>
       <%- `var filterRegex = new RegExp(/${linkExternalFilter}/);` %>
+    <% } else if (linkExternalFilter) { %>
+      <%= `var filterRegex = new RegExp("${linkExternalFilter}");` %>
     <% } else { %>
       var filterRegex = new RegExp('/' + window.location.host + '/');
     <% } %>

src/resources/formats/html/templates/title-block.scss

@@ -188,3 +188,8 @@ main.quarto-banner-title-block > section:first-child > h4 {
     grid-template-columns: 1fr 1fr;
   }
 }
+
+.quarto-title-tools-only {
+  display: flex;
+  justify-content: right;
+}