Include base element in default themes.

Resolves #1922.
getnikola · Aug 6, 2015 · d329bff · d329bff
1 parent ea8239c
commit d329bff
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 12 deletions.
diff --git a/CHANGES.txt b/CHANGES.txt
@@ -11,6 +11,8 @@ Features
 Bugfixes
 --------
 
+* Set a base element to aid relative URL resolution, stripped on-the-fly
+  when using the auto or serve command to view site locally. (Issue #1922)
 * Rebuild archives when post slugs and titles change (Issue #1931)
 * Handle special characters in URLs in nikola auto (Issue #1925)
 * Avoid Broken Pipe error in nikola auto (Issue #1906)

diff --git a/nikola/data/themes/base-jinja/templates/base_helper.tmpl b/nikola/data/themes/base-jinja/templates/base_helper.tmpl
@@ -21,6 +21,7 @@ dir="rtl"
 lang="{{ lang }}">
 <head>
     <meta charset="utf-8">
+    <base href="{{ abs_link(permalink) }}">
     {% if description %}
     <meta name="description" content="{{ description }}">
     {% endif %}
@@ -29,9 +30,7 @@ lang="{{ lang }}">
 
     {{ html_stylesheets() }}
     {{ html_feedlinks() }}
-    {% if permalink %}
-      <link rel="canonical" href="{{ abs_link(permalink) }}">
-    {% endif %}
+    <link rel="canonical" href="{{ abs_link(permalink) }}">
 
     {% if favicons %}
         {% for name, file, size in favicons %}

diff --git a/nikola/data/themes/base/templates/base_helper.tmpl b/nikola/data/themes/base/templates/base_helper.tmpl
@@ -21,6 +21,7 @@ dir="rtl" \
 lang="${lang}">
 <head>
     <meta charset="utf-8">
+    <base href="${abs_link(permalink)}">
     %if description:
     <meta name="description" content="${description}">
     %endif
@@ -29,9 +30,7 @@ lang="${lang}">
 
     ${html_stylesheets()}
     ${html_feedlinks()}
-    %if permalink:
-      <link rel="canonical" href="${abs_link(permalink)}">
-    %endif
+    <link rel="canonical" href="${abs_link(permalink)}">
 
     %if favicons:
         %for name, file, size in favicons:

diff --git a/nikola/data/themes/bootstrap3-jinja/templates/base_helper.tmpl b/nikola/data/themes/bootstrap3-jinja/templates/base_helper.tmpl
@@ -26,6 +26,7 @@ dir="rtl"
 lang="{{ lang }}">
     <head>
     <meta charset="utf-8">
+    <base href="{{ abs_link(permalink) }}">
     {% if description %}
     <meta name="description" content="{{ description }}">
     {% endif %}
@@ -34,9 +35,7 @@ lang="{{ lang }}">
 
     {{ html_stylesheets() }}
     {{ html_feedlinks() }}
-    {% if permalink %}
-      <link rel="canonical" href="{{ abs_link(permalink) }}">
-    {% endif %}
+    <link rel="canonical" href="{{ abs_link(permalink) }}">
 
     {% if favicons %}
         {% for name, file, size in favicons %}

diff --git a/nikola/data/themes/bootstrap3/templates/base_helper.tmpl b/nikola/data/themes/bootstrap3/templates/base_helper.tmpl
@@ -26,6 +26,7 @@ dir="rtl" \
 lang="${lang}">
     <head>
     <meta charset="utf-8">
+    <base href="${abs_link(permalink)}">
     %if description:
     <meta name="description" content="${description}">
     %endif
@@ -34,9 +35,7 @@ lang="${lang}">
 
     ${html_stylesheets()}
     ${html_feedlinks()}
-    %if permalink:
-      <link rel="canonical" href="${abs_link(permalink)}">
-    %endif
+    <link rel="canonical" href="${abs_link(permalink)}">
 
     %if favicons:
         %for name, file, size in favicons: