diff options
| author | Justin Mayer <entroP@gmail.com> | 2016-04-29 09:23:44 -0700 |
|---|---|---|
| committer | Justin Mayer <entroP@gmail.com> | 2016-04-29 09:23:44 -0700 |
| commit | 5c5fe8dcaf0ec34aac37cf18e5b55ea21f9d8f77 (patch) | |
| tree | 927539b1d77514d31a1dde5268a9bd048b019762 /pelican-bootstrap3/templates/base.html | |
| parent | 2cd39ad5c0c03818900611ddee699b2a6acc2453 (diff) | |
| parent | 22e33297f8484d0c531120db0dcc3b76f6c2a1b8 (diff) | |
| download | pelican-themes-5c5fe8dcaf0ec34aac37cf18e5b55ea21f9d8f77.tar.gz | |
Merge pull request #383 from DandyDev/update-pelican-bootstrap3
Update pelican-bootstrap3 to newest version; donate to Pelican community
Diffstat (limited to 'pelican-bootstrap3/templates/base.html')
| -rw-r--r-- | pelican-bootstrap3/templates/base.html | 51 |
1 files changed, 29 insertions, 22 deletions
diff --git a/pelican-bootstrap3/templates/base.html b/pelican-bootstrap3/templates/base.html index 112c249..610d050 100644 --- a/pelican-bootstrap3/templates/base.html +++ b/pelican-bootstrap3/templates/base.html @@ -1,8 +1,8 @@ <!DOCTYPE html> -<html lang="{% block html_lang %}{{ DEFAULT_LANG }}{% endblock %}" - {% if USE_OPEN_GRAPH %} - xmlns:og="http://ogp.me/ns#" - xmlns:fb="https://www.facebook.com/2008/fbml"{% endif %}> +{% if USE_OPEN_GRAPH is not defined %} + {% set USE_OPEN_GRAPH = True %} +{% endif %} +<html lang="{% block html_lang %}{{ DEFAULT_LANG }}{% endblock %}"{% if USE_OPEN_GRAPH %} prefix="og: http://ogp.me/ns# fb: https://www.facebook.com/2008/fbml"{% endif %}> <head> <title>{% block title %}{{ SITENAME }}{% endblock %}</title> <!-- Using the latest rendering mode for IE --> @@ -32,9 +32,6 @@ {% endblock %} {# Open Graph tags #} - {% if USE_OPEN_GRAPH is not defined %} - {% set USE_OPEN_GRAPH = True %} - {% endif %} {% if USE_OPEN_GRAPH %} {% block opengraph %} <!-- Open Graph tags --> @@ -58,39 +55,50 @@ <!-- Bootstrap --> {% if BOOTSTRAP_THEME %} - <link rel="stylesheet" href="{{ SITEURL }}/theme/css/bootstrap.{{ BOOTSTRAP_THEME }}.min.css" type="text/css"/> + <link rel="stylesheet" href="{{ SITEURL }}/{{ THEME_STATIC_DIR }}/css/bootstrap.{{ BOOTSTRAP_THEME }}.min.css" type="text/css"/> {% else %} - <link rel="stylesheet" href="{{ SITEURL }}/theme/css/bootstrap.min.css" type="text/css"/> + <link rel="stylesheet" href="{{ SITEURL }}/{{ THEME_STATIC_DIR }}/css/bootstrap.min.css" type="text/css"/> {% endif %} - <link href="{{ SITEURL }}/theme/css/font-awesome.min.css" rel="stylesheet"> + <link href="{{ SITEURL }}/{{ THEME_STATIC_DIR }}/css/font-awesome.min.css" rel="stylesheet"> - <link href="{{ SITEURL }}/theme/css/pygments/{{ PYGMENTS_STYLE|default('native') }}.css" rel="stylesheet"> + <link href="{{ SITEURL }}/{{ THEME_STATIC_DIR }}/css/pygments/{{ PYGMENTS_STYLE|default('native') }}.css" rel="stylesheet"> {% if 'tipue_search' in PLUGINS %} - <link href="{{ SITEURL}}/theme/tipuesearch/tipuesearch.css" rel="stylesheet"> + <link href="{{ SITEURL}}/{{ THEME_STATIC_DIR }}/tipuesearch/tipuesearch.css" rel="stylesheet"> {% endif %} {% if DOCUTIL_CSS %} - <link href="{{ SITEURL }}/theme/css/html4css1.css" rel="stylesheet"> + <link href="{{ SITEURL }}/{{ THEME_STATIC_DIR }}/css/html4css1.css" rel="stylesheet"> {% endif %} {% if TYPOGRIFY %} - <link href="{{ SITEURL }}/theme/css/typogrify.css" rel="stylesheet"> + <link href="{{ SITEURL }}/{{ THEME_STATIC_DIR }}/css/typogrify.css" rel="stylesheet"> {% endif %} - <link rel="stylesheet" href="{{ SITEURL }}/theme/css/style.css" type="text/css"/> + <link rel="stylesheet" href="{{ SITEURL }}/{{ THEME_STATIC_DIR }}/css/style.css" type="text/css"/> {% if CUSTOM_CSS %} <link href="{{ SITEURL }}/{{ CUSTOM_CSS }}" rel="stylesheet"> {% endif %} {% if SHARIFF %} - <link href="{{ SITEURL }}/theme/css/shariff/shariff.min.css" rel="stylesheet"> + <link href="{{ SITEURL }}/{{ THEME_STATIC_DIR }}/css/shariff/shariff.min.css" rel="stylesheet"> {% endif %} {% if FEED_ALL_ATOM %} <link href="{{ SITEURL }}/{{ FEED_ALL_ATOM }}" type="application/atom+xml" rel="alternate" title="{{ SITENAME }} ATOM Feed"/> {% endif %} + {% if FEED_ALL_RSS %} <link href="{{ SITEURL }}/{{ FEED_ALL_RSS }}" type="application/rss+xml" rel="alternate" title="{{ SITENAME }} RSS Feed"/> {% endif %} + {% if tag and TAG_FEED_ATOM %} + <link href="{{ SITEURL }}/{{ TAG_FEED_ATOM|format(tag.slug) }}" type="application/atom+xml" rel="alternate" + title="{{ SITENAME }} {{ tag }} ATOM Feed"/> + {% endif %} + + {% if category and CATEGORY_FEED_ATOM %} + <link href="{{ SITEURL }}/{{ CATEGORY_FEED_ATOM|format(category.slug) }}" type="application/atom+xml" rel="alternate" + title="{{ SITENAME }} {{ category }} ATOM Feed"/> + {% endif %} + </head> <body> @@ -131,7 +139,7 @@ <ul class="nav navbar-nav navbar-right"> {% if 'tipue_search' in PLUGINS %} <li><span> - <form class="navbar-search" action="/search"> + <form class="navbar-search" action="{{ SEARCH_URL | default('/search.html') }}"> <input type="text" class="search-query" placeholder="Search" name="q" id="tipue_search_input" required> </form></span> </li> @@ -158,7 +166,6 @@ {% endif %} {% block breadcrumbs %} {% endblock %} - {% block content %} {% endblock %} </div> @@ -178,16 +185,16 @@ </div> {% include 'includes/footer.html' %} -<script src="{{ SITEURL }}/theme/js/jquery.min.js"></script> +<script src="{{ SITEURL }}/{{ THEME_STATIC_DIR }}/js/jquery.min.js"></script> <!-- Include all compiled plugins (below), or include individual files as needed --> -<script src="{{ SITEURL }}/theme/js/bootstrap.min.js"></script> +<script src="{{ SITEURL }}/{{ THEME_STATIC_DIR }}/js/bootstrap.min.js"></script> <!-- Enable responsive features in IE8 with Respond.js (https://github.com/scottjehl/Respond) --> -<script src="{{ SITEURL }}/theme/js/respond.min.js"></script> +<script src="{{ SITEURL }}/{{ THEME_STATIC_DIR }}/js/respond.min.js"></script> {% if BANNER %} - <script src="{{ SITEURL }}/theme/js/bodypadding.js"></script> + <script src="{{ SITEURL }}/{{ THEME_STATIC_DIR }}/js/bodypadding.js"></script> {% endif %} {% include 'includes/github-js.html' %} {% include 'includes/disqus_script.html' %} |