diff options
| author | Peter Fraenkel <pnf@podsnap.com> | 2014-08-21 12:53:41 -0400 |
|---|---|---|
| committer | Peter Fraenkel <pnf@podsnap.com> | 2014-08-21 12:53:41 -0400 |
| commit | cfa5f40283668540cda45794200809640f251acd (patch) | |
| tree | cf2bd8ffbea3ed4c01b5690ffd8ae2702976b583 /built-texts/templates/base.html | |
| parent | 1cd742a84a81f135234be021cf4fe7b8ff2c13ff (diff) | |
| parent | a928687830876af8c919606bae47195af65bc82d (diff) | |
| download | pelican-themes-cfa5f40283668540cda45794200809640f251acd.tar.gz | |
Merge remote-tracking branch 'upstream/master'
Keep the latex and tag-specific feeds in bootstrap3
Conflicts:
pelican-bootstrap3/templates/base.html
Diffstat (limited to 'built-texts/templates/base.html')
| -rw-r--r-- | built-texts/templates/base.html | 23 |
1 files changed, 18 insertions, 5 deletions
diff --git a/built-texts/templates/base.html b/built-texts/templates/base.html index c081927..397cda3 100644 --- a/built-texts/templates/base.html +++ b/built-texts/templates/base.html @@ -1,8 +1,10 @@ <!DOCTYPE html> -<html lang="en"> +<html lang="{{ DEFAULT_LANG }}"> <head> + {% block head %} + <meta charset="utf-8"> - <title>{% block windowtitle %}{{ SITENAME }}{% endblock %}</title> + <title>{% block title %}{{ SITENAME }}{% endblock title %}</title> <meta name="description" content=""> <meta name="author" content="{{ AUTHOR }}"> <meta name="viewport" content="width=device-width, initial-scale=1.0"> @@ -11,12 +13,21 @@ <script src="{{ SITEURL }}/theme/html5.js"></script> <![endif]--> + {% if FEED_RSS %} + <link href="{{ FEED_DOMAIN }}/{{ FEED_RSS }}" type="application/rss+xml" rel="alternate" title="{{ SITENAME }} RSS Feed" /> + {% endif %} + {% if FEED_ATOM %} + <link href="{{ FEED_DOMAIN }}/{{ FEED_ATOM }}" type="application/atom+xml" rel="alternate" title="{{ SITENAME }} Atom Feed" /> + {% endif %} + <!-- Le styles --> <link href="//netdna.bootstrapcdn.com/twitter-bootstrap/2.1.1/css/bootstrap.no-icons.min.css" rel="stylesheet"> <link href="{{ SITEURL }}/theme/local.css" rel="stylesheet"> <link href="{{ SITEURL }}/theme/pygments.css" rel="stylesheet"> <link href="{{ SITEURL }}/theme/font-awesome.css" rel="stylesheet"> <link href='http://fonts.googleapis.com/css?family=Gudea:400,400italic|Alegreya+SC' rel='stylesheet' type='text/css'> + + {% endblock head %} </head> <body> @@ -105,13 +116,15 @@ </i>Tags</a></li> {% if FEED_RSS %} - <li> <a href="{{ SITEURL }}/{{ FEED_RSS }}" rel="alternate"> + <li> <a href="{{ FEED_DOMAIN }}/{{ FEED_RSS }}" rel="alternate"> <i class="icon-rss" style="color: #1f334b"></i> RSS Feed</a></li> {% endif %} - <li><a href="{{ SITEURL }}/{{ FEED }}" rel="alternate"> - <i class="icon-rss-sign" style="color: #1f334b"></i> + {% if FEED_ATOM %} + <li> <a href="{{ FEED_DOMAIN }}/{{ FEED_ATOM }}" rel="alternate"> + <i class="icon-rss" style="color: #1f334b"></i> Atom Feed</a></li> + {% endif %} </ul> </div> |