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 /pelican-bootstrap3/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 'pelican-bootstrap3/templates/base.html')
-rw-r--r-- | pelican-bootstrap3/templates/base.html | 80 |
1 files changed, 55 insertions, 25 deletions
diff --git a/pelican-bootstrap3/templates/base.html b/pelican-bootstrap3/templates/base.html index cc41e02..200a9b0 100644 --- a/pelican-bootstrap3/templates/base.html +++ b/pelican-bootstrap3/templates/base.html @@ -8,6 +8,10 @@ <meta http-equiv="X-UA-Compatible" content="IE=edge"> <meta charset="utf-8"> <meta name="viewport" content="width=device-width, initial-scale=1.0"> + + {% if FAVICON %} + <link href="{{ SITEURL }}/{{ FAVICON }}" rel="icon"> + {% endif %} <!-- Enable latex plugin --> {% if article and article.latex %} @@ -17,18 +21,19 @@ {{ page.latex }} {% endif %} - <!-- Open Graph tags --> + + {# Open Graph tags #} {% if USE_OPEN_GRAPH is not defined %} {% set USE_OPEN_GRAPH = True %} {% endif %} - {% if USE_OPEN_GRAPH %} + <!-- Open Graph tags --> {% if OPEN_GRAPH_FB_APP_ID %} <meta property="fb:app_id" content="{{ OPEN_GRAPH_FB_APP_ID }}"/> {% endif %} {% if article %} <meta property="og:type" content="article"/> - <meta property="og:title" content="{{ article.title }}"/> + <meta property="og:title" content="{{ article.title|striptags }}"/> <meta property="og:url" content="{{ SITEURL }}/{{ article.url }}"/> <meta property="og:description" content="{{ article.summary|striptags }}"/> {% elif page %} @@ -43,10 +48,10 @@ {% if OPEN_GRAPH_IMAGE %} <meta property="og:image" content="{{ SITEURL }}/static/{{ OPEN_GRAPH_IMAGE }}"/> + {% endif %} {% endif %} - {% endif %} - {% endif %} + <!-- Bootstrap --> {% if BOOTSTRAP_THEME %} <link rel="stylesheet" href="{{ SITEURL }}/theme/css/bootstrap.{{ BOOTSTRAP_THEME }}.min.css" type="text/css"/> @@ -54,13 +59,19 @@ <link rel="stylesheet" href="{{ SITEURL }}/theme/css/bootstrap.min.css" type="text/css"/> {% endif %} <link href="{{ SITEURL }}/theme/css/font-awesome.min.css" rel="stylesheet"> - <link href="{{ SITEURL }}/theme/css/bootstrap-glyphicons.css" rel="stylesheet"> - <link href="{{ SITEURL }}/theme/css/pygments.css" rel="stylesheet"> + + <link href="{{ SITEURL }}/theme/css/pygments/{{ PYGMENTS_STYLE|default('native') }}.css" rel="stylesheet"> + {% if DOCUTIL_CSS %} + <link href="{{ SITEURL }}/theme/css/html4css1.css" rel="stylesheet"> + {% endif %} + {% if TYPOGRIFY %} + <link href="{{ SITEURL }}/theme/css/typogrify.css" rel="stylesheet"> + {% endif %} <link rel="stylesheet" href="{{ SITEURL }}/theme/css/style.css" type="text/css"/> - <!-- JavaScript plugins (requires jQuery) --> - <script src="http://code.jquery.com/jquery.js"></script> + {% if CUSTOM_CSS %} + <link href="{{ SITEURL }}/{{ CUSTOM_CSS }}" rel="stylesheet"> + {% endif %} - {% if page_name == "index" %} {% if FEED_ALL_ATOM %} <link href="{{ SITEURL }}/{{ FEED_ALL_ATOM }}" type="application/atom+xml" rel="alternate" title="{{ SITENAME }} ATOM Feed"/> @@ -69,7 +80,6 @@ <link href="{{ SITEURL }}/{{ FEED_ALL_RSS }}" type="application/atom+xml" rel="alternate" title="{{ SITENAME }} RSS Feed"/> {% endif %} - {% endif %} {% if tag and TAG_FEED_ATOM %} <link href="{{ SITEURL }}/{{ TAG_FEED_ATOM|format(tag) }}" type="application/atom+xml" rel="alternate" @@ -81,10 +91,10 @@ title="{{ SITENAME }} {{ category }} ATOM Feed"/> {% endif %} - {% include 'includes/ga.html' %} </head> <body> -<nav class="navbar navbar-default navbar-fixed-top" role="navigation"> + +<div class="navbar {% if BOOTSTRAP_NAVBAR_INVERSE %}navbar-inverse{% else %}navbar-default{% endif %} navbar-fixed-top" role="navigation"> <div class="container"> <div class="navbar-header"> <button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-ex1-collapse"> @@ -93,7 +103,10 @@ <span class="icon-bar"></span> <span class="icon-bar"></span> </button> - <a href="{{ SITEURL }}" class="navbar-brand">{{ SITENAME }}</a> + <a href="{{ SITEURL }}/" class="navbar-brand"> + {% if SITELOGO %}<img src="{{ SITEURL }}/{{ SITELOGO }}" width="{{ SITELOGO_SIZE }}"/> {% endif %} + {% if not HIDE_SITENAME %}{{ SITENAME }}{% endif %} + </a> </div> <div class="collapse navbar-collapse navbar-ex1-collapse"> <ul class="nav navbar-nav"> @@ -101,37 +114,51 @@ <li><a href="{{ link }}">{{ title }}</a></li> {% endfor %} {% if DISPLAY_PAGES_ON_MENU %} - {% for page in PAGES %} - <li><a href="{{ SITEURL }}/{{ page.url }}">{{ page.title }}</a></li> - {% endfor %} + {% for p in PAGES %} + <li{% if p == page %} class="active"{% endif %}><a href="{{ SITEURL }}/{{ p.url }}"> + {{ p.title }} + </a></li> + {% endfor %} {% endif %} {% if DISPLAY_CATEGORIES_ON_MENU %} {% for cat, null in categories %} <li {% if cat == category %}class="active"{% endif %}> - <a href="{{ SITEURL }}/{{ cat.url }}">{{ cat }}</a> + <a href="{{ SITEURL }}/{{ cat.url }}">{{ cat | capitalize }}</a> </li> {% endfor %} {% endif %} </ul> <ul class="nav navbar-nav navbar-right"> - <li><a href="{{ SITEURL }}/archives.html"><i class="icon-th-list"></i>Archives</a></li> + <li><a href="{{ SITEURL }}/{{ ARCHIVES_URL | default('archives.html') }}"><i class="fa fa-th-list"></i><span class="icon-label">Archives</span></a></li> </ul> </div> <!-- /.navbar-collapse --> </div> -</nav> -<!-- /.navbar --> +</div> <!-- /.navbar --> + <div class="container"> <div class="row"> - <div class="col-lg-9"> - {% block content %} - {% endblock %} + {% if not HIDE_SIDEBAR %} + <div class="col-sm-9"> + {% else %} + <div class="col-lg-12"> + {% endif %} + {% block breadcrumbs %} + {% endblock %} + + {% block content %} + {% endblock %} </div> - <div class="col-lg-3 well well-sm" id="sidebar"> + {% if not HIDE_SIDEBAR %} + <div class="col-sm-3 well well-sm" id="sidebar"> {% include 'includes/sidebar.html' %} </div> + {% endif %} </div> </div> +{% include 'includes/footer.html' %} + +<script src="//code.jquery.com/jquery.js"></script> <!-- Include all compiled plugins (below), or include individual files as needed --> <script src="{{ SITEURL }}/theme/js/bootstrap.min.js"></script> @@ -139,6 +166,9 @@ <!-- Enable responsive features in IE8 with Respond.js (https://github.com/scottjehl/Respond) --> <script src="{{ SITEURL }}/theme/js/respond.min.js"></script> +{% include 'includes/github-js.html' %} {% include 'includes/disqus_script.html' %} +{% include 'includes/ga.html' %} +{% include 'includes/piwik.html' %} </body> </html> |