diff options
| author | Justin Mayer <entroP@gmail.com> | 2016-12-04 17:11:34 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-12-04 17:11:34 -0800 |
| commit | 7cbd5f02154fec208f3a2bba5736bf065c4a2803 (patch) | |
| tree | 55bff805d6a76699d4926dc9e39f4202239c22c8 | |
| parent | 42b54a2cfa11a1a9e42f2867911cd2cec5cc4acb (diff) | |
| parent | 0053e1bbc25b06f24df50199e6593b5e2d2133fd (diff) | |
| download | pelican-themes-7cbd5f02154fec208f3a2bba5736bf065c4a2803.tar.gz | |
Merge pull request #458 from terryboon/topic-about-me-display
pelican-bootstrap3: Fix display of "About Me"
| -rw-r--r-- | pelican-bootstrap3/templates/base.html | 6 | ||||
| -rw-r--r-- | pelican-bootstrap3/templates/includes/aboutme.html | 2 |
2 files changed, 5 insertions, 3 deletions
diff --git a/pelican-bootstrap3/templates/base.html b/pelican-bootstrap3/templates/base.html index 6362e21..a33496c 100644 --- a/pelican-bootstrap3/templates/base.html +++ b/pelican-bootstrap3/templates/base.html @@ -168,7 +168,7 @@ <!-- End Banner --> <div class="container{% if BOOTSTRAP_FLUID %}-fluid{% endif %}"> <div class="row"> - {% if not HIDE_SIDEBAR or ABOUT_ME %} + {% if not HIDE_SIDEBAR or ABOUT_ME or AVATAR %} <div class="col-sm-9"> {% else %} <div class="col-lg-12"> @@ -178,10 +178,10 @@ {% block content %} {% endblock %} </div> - {% if not HIDE_SIDEBAR or ABOUT_ME %} + {% if not HIDE_SIDEBAR or ABOUT_ME or AVATAR %} <div class="col-sm-3" id="sidebar"> <aside> - {% if ABOUT_ME %} + {% if ABOUT_ME or AVATAR %} {% include 'includes/aboutme.html' %} {% endif %} {% if not HIDE_SIDEBAR %} diff --git a/pelican-bootstrap3/templates/includes/aboutme.html b/pelican-bootstrap3/templates/includes/aboutme.html index f38f0bc..fefc6eb 100644 --- a/pelican-bootstrap3/templates/includes/aboutme.html +++ b/pelican-bootstrap3/templates/includes/aboutme.html @@ -4,8 +4,10 @@ <img width="100%" class="img-thumbnail" src="{{ AVATAR }}"/> </p> {% endif %} + {% if ABOUT_ME %} <p> <strong>About {{ AUTHOR }}</strong><br/> {{ ABOUT_ME }} </p> + {% endif %} </div>
\ No newline at end of file |