Commit fac94fb7 authored by Christoph Groth's avatar Christoph Groth
Browse files

Use the latest version in /doc for authors, cite, license

Also, remove "authors" from the navigation bar in favor of the footer (that
should be enough).

Together with the modifications to /install this fixes !5.
parent 6c1981ea
Pipeline #222 passed with stage
......@@ -131,9 +131,7 @@ NAVIGATION_LINKS = {
"<span class='hidden-xs'>community</span>"),
("/contribute.html", "<i class='glyphicon glyphicon-wrench visible-xs-inline-block'></i>"
"<span class='hidden-xs'>contribute</span>"),
("/authors.html", "<i class='glyphicon glyphicon-user visible-xs-inline-block'></i>"
"<span class='hidden-xs'>authors</span>"),
("/cite.html", "<i class='glyphicon glyphicon-edit visible-xs-inline-block'></i>"
("/cite", "<i class='glyphicon glyphicon-edit visible-xs-inline-block'></i>"
"<span class='hidden-xs'>cite</span>")
),
}
......@@ -661,7 +659,7 @@ LICENSE = ""
# A small copyright notice for the page footer (in HTML).
# (translatable)
CONTENT_FOOTER = 'Contents &copy; 2013-{date} <a href="mailto:{email}">{author}</a> {license}'
CONTENT_FOOTER = 'Contents &copy; 2013-{date} <a href="{url}">{author}</a> {license}'
# Things that will be passed to CONTENT_FOOTER.format(). This is done
# for translatability, as dicts are not formattable. Nikola will
......@@ -678,7 +676,7 @@ CONTENT_FOOTER_FORMATS = {
DEFAULT_LANG: (
(),
{
"email": BLOG_EMAIL,
"url": "/authors",
"author": BLOG_AUTHOR,
"date": time.gmtime().tm_year,
"license": LICENSE
......
......@@ -30,6 +30,9 @@ RewriteRule ^(.*[^/])$ /$1.html [L]
RewriteCond %{REQUEST_FILENAME} !-d
RewriteRule ^(.*)/$ /$1 [R=301,L]
Redirect 302 /contact /authors
Redirect 302 /citing /cite
Redirect 302 /contact /doc/latest/pre/authors
Redirect 302 /authors /doc/latest/pre/authors
Redirect 302 /citing /doc/latest/pre/citing
Redirect 302 /cite /doc/latest/pre/citing
Redirect 302 /license /doc/latest/pre/license
Redirect 302 /download /install
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment