Revert <base> tag.

This reverts commits: 37f2829 465fa43
getnikola · Aug 2, 2015 · d2e3b02 · d2e3b02
1 parent 37f2829
commit d2e3b02
Show file tree

Hide file tree

Showing 6 changed files with 5 additions and 14 deletions.
diff --git a/CHANGES.txt b/CHANGES.txt
@@ -10,7 +10,6 @@ Bugfixes
 --------
 
 * "nikola auto" serving implicit index.html with wrong mime type (Issue #1921)
-* <base href> resolve common relative resource loading issues
 * Handle non-integer shutter speeds and other variables in WordPress
   importer (Issue #1917)
 

diff --git a/nikola/data/themes/base-jinja/templates/base_helper.tmpl b/nikola/data/themes/base-jinja/templates/base_helper.tmpl
@@ -21,12 +21,10 @@ dir="rtl"
 lang="{{ lang }}">
 <head>
     <meta charset="utf-8">
-    <meta name="viewport" content="width=device-width">
-    <base href="{{ abs_link(permalink) }}">
-
     {% if description %}
     <meta name="description" content="{{ description }}">
     {% endif %}
+    <meta name="viewport" content="width=device-width">
     <title>{{ title|e }} | {{ blog_title|e }}</title>
 
     {{ html_stylesheets() }}

diff --git a/nikola/data/themes/base/templates/base_helper.tmpl b/nikola/data/themes/base/templates/base_helper.tmpl
@@ -21,12 +21,10 @@ dir="rtl" \
 lang="${lang}">
 <head>
     <meta charset="utf-8">
-    <meta name="viewport" content="width=device-width">
-    <base href="{{ abs_link(permalink) }}">
-
     %if description:
     <meta name="description" content="${description}">
     %endif
+    <meta name="viewport" content="width=device-width">
     <title>${title|striphtml} | ${blog_title|striphtml}</title>
 
     ${html_stylesheets()}

diff --git a/nikola/data/themes/bootstrap3-jinja/templates/base_helper.tmpl b/nikola/data/themes/bootstrap3-jinja/templates/base_helper.tmpl
@@ -26,12 +26,10 @@ dir="rtl"
 lang="{{ lang }}">
     <head>
     <meta charset="utf-8">
-    <meta name="viewport" content="width=device-width, initial-scale=1">
-    <base href="{{ abs_link(permalink) }}">
-
     {% if description %}
     <meta name="description" content="{{ description }}">
     {% endif %}
+    <meta name="viewport" content="width=device-width, initial-scale=1">
     <title>{{ title|e }} | {{ blog_title|e }}</title>
 
     {{ html_stylesheets() }}

diff --git a/nikola/data/themes/bootstrap3/templates/base_helper.tmpl b/nikola/data/themes/bootstrap3/templates/base_helper.tmpl
@@ -26,12 +26,10 @@ dir="rtl" \
 lang="${lang}">
     <head>
     <meta charset="utf-8">
-    <meta name="viewport" content="width=device-width, initial-scale=1">
-    <base href="${abs_link(permalink)}">
-
     %if description:
     <meta name="description" content="${description}">
     %endif
+    <meta name="viewport" content="width=device-width, initial-scale=1">
     <title>${title|striphtml} | ${blog_title|striphtml}</title>
 
     ${html_stylesheets()}

diff --git a/nikola/nikola.py b/nikola/nikola.py
@@ -1017,7 +1017,7 @@ def render_template(self, template_name, output_name, context):
         utils.makedirs(os.path.dirname(output_name))
         parser = lxml.html.HTMLParser(remove_blank_text=True)
         doc = lxml.html.document_fromstring(data, parser)
-        doc.rewrite_links(lambda dst: self.url_replacer(src, dst, context['lang']), resolve_base_href=False)
+        doc.rewrite_links(lambda dst: self.url_replacer(src, dst, context['lang']))
         data = b'<!DOCTYPE html>\n' + lxml.html.tostring(doc, encoding='utf8', method='html', pretty_print=True)
         with open(output_name, "wb+") as post_file:
             post_file.write(data)