diff options
| -rw-r--r-- | .gitmodules | 3 | ||||
| m--------- | eevee | 0 | ||||
| -rw-r--r-- | pelican-bootstrap3/README.md | 7 | ||||
| -rw-r--r-- | pelican-bootstrap3/templates/base.html | 4 | ||||
| -rw-r--r-- | pelican-bootstrap3/templates/includes/sidebar-images.html | 3 | ||||
| -rw-r--r-- | pelican-bootstrap3/templates/page.html | 2 | ||||
| m--------- | yapeme | 0 |
7 files changed, 18 insertions, 1 deletions
diff --git a/.gitmodules b/.gitmodules index b75df44..ecd1494 100644 --- a/.gitmodules +++ b/.gitmodules @@ -217,3 +217,6 @@ [submodule "lab"] path = lab url = https://github.com/mothsART/pelican-lab +[submodule "eevee"] + path = eevee + url = https://github.com/kura/eevee.git diff --git a/eevee b/eevee new file mode 160000 +Subproject a7b708192462387b5087ff200df5b4c768ddb19 diff --git a/pelican-bootstrap3/README.md b/pelican-bootstrap3/README.md index 6e2bf4d..b1525c4 100644 --- a/pelican-bootstrap3/README.md +++ b/pelican-bootstrap3/README.md @@ -293,10 +293,15 @@ The footer will display a copyright message using the AUTHOR variable and the ye ### Sidebar Images -Include a series of images in the sidebar. +Include a series of images in the sidebar, with an optional header: +SIDEBAR_IMAGES_HEADER = 'My Images' SIDEBAR_IMAGES = ["/path/to/image1.png", "/path/to/image2.png"] +Originally developed for including certification marks in your sidebar. E.g., + +http://dmark.github.io + ## Live example [This is the website of the original author](http://dandydev.net) diff --git a/pelican-bootstrap3/templates/base.html b/pelican-bootstrap3/templates/base.html index 610d050..1ad6611 100644 --- a/pelican-bootstrap3/templates/base.html +++ b/pelican-bootstrap3/templates/base.html @@ -105,12 +105,14 @@ <div class="navbar {% if BOOTSTRAP_NAVBAR_INVERSE %}navbar-inverse{% else %}navbar-default{% endif %} navbar-fixed-top" role="navigation"> <div class="container{% if BOOTSTRAP_FLUID %}-fluid{% endif %}"> <div class="navbar-header"> + {% if MENUITEMS or (PAGES and DISPLAY_PAGES_ON_MENU) or (categories and DISPLAY_CATEGORIES_ON_MENU) %} <button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-ex1-collapse"> <span class="sr-only">Toggle navigation</span> <span class="icon-bar"></span> <span class="icon-bar"></span> <span class="icon-bar"></span> </button> + {% endif %} <a href="{{ SITEURL }}/" class="navbar-brand"> {% if SITELOGO %}<img src="{{ SITEURL }}/{{ SITELOGO }}" width="{{ SITELOGO_SIZE }}"/> {% endif %} {% if not HIDE_SITENAME %}{{ SITENAME }}{% endif %} @@ -144,7 +146,9 @@ </form></span> </li> {% endif %} + {% if ARCHIVES_SAVE_AS %} <li><a href="{{ SITEURL }}/{{ ARCHIVES_URL | default('archives.html') }}"><i class="fa fa-th-list"></i><span class="icon-label">Archives</span></a></li> + {% endif %} </ul> </div> <!-- /.navbar-collapse --> diff --git a/pelican-bootstrap3/templates/includes/sidebar-images.html b/pelican-bootstrap3/templates/includes/sidebar-images.html index 59282ab..4bc7499 100644 --- a/pelican-bootstrap3/templates/includes/sidebar-images.html +++ b/pelican-bootstrap3/templates/includes/sidebar-images.html @@ -1,4 +1,7 @@ {% if SIDEBAR_IMAGES %} + {% if SIDEBAR_IMAGES_HEADER %} + <li class="list-group-item"><h4><i class="fa fa-external-link-square fa-lg"></i><span class="icon-label">{{ SIDEBAR_IMAGES_HEADER }}</span></h4> + {% endif %} <li class="list-group-item"> <ul class="list-group" id="links"> {% for image in SIDEBAR_IMAGES %} diff --git a/pelican-bootstrap3/templates/page.html b/pelican-bootstrap3/templates/page.html index f8757fa..c4d35ee 100644 --- a/pelican-bootstrap3/templates/page.html +++ b/pelican-bootstrap3/templates/page.html @@ -46,7 +46,9 @@ {% block content %} <section id="content" class="body"> + {% if page.title %} <h1 class="entry-title">{{ page.title }}</h1> + {% endif %} {% import 'includes/translations.html' as translations with context %} {{ translations.translations_for(page) }} {% if PDF_PROCESSOR %} diff --git a/yapeme b/yapeme -Subproject a3b634fcf099c04c7d39d590eab3d5111c4cca3 +Subproject 02c10b6ebb6bc1d93c2834cde9a67f3493a77ba |