diff options
| -rw-r--r-- | .gitmodules | 3 | ||||
| m--------- | Flex | 0 | ||||
| m--------- | bulrush | 0 | ||||
| m--------- | genus | 0 | ||||
| -rw-r--r-- | pelican-bootstrap3/templates/base.html | 6 | ||||
| -rw-r--r-- | pelican-bootstrap3/templates/includes/aboutme.html | 4 | ||||
| -rw-r--r-- | pelican-bootstrap3/templates/includes/pagination.html | 2 | ||||
| -rw-r--r-- | pelican-bootstrap3/templates/includes/sidebar.html | 2 |
8 files changed, 11 insertions, 6 deletions
diff --git a/.gitmodules b/.gitmodules index 21e7060..dfe3d6e 100644 --- a/.gitmodules +++ b/.gitmodules @@ -223,3 +223,6 @@ [submodule "genus"] path = genus url = https://github.com/vaiski/genus.git +[submodule "bulrush"] + path = bulrush + url = https://github.com/textbook/bulrush.git diff --git a/Flex b/Flex -Subproject 46318f9281a90a1c38620a2e0d212f1d65adc96 +Subproject 5bc235cf579cb03bcc8f54b6029ff74493a0cb4 diff --git a/bulrush b/bulrush new file mode 160000 +Subproject 7f5d7913594f492fad8b47dcc6e2e8b80552b63 diff --git a/genus b/genus -Subproject 5defe62ab86976b640b9d3042cb4c2896b32a75 +Subproject 0549c1998b5b812e518f61bb188cd6956a6127d 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..3dc1c1c 100644 --- a/pelican-bootstrap3/templates/includes/aboutme.html +++ b/pelican-bootstrap3/templates/includes/aboutme.html @@ -1,11 +1,13 @@ <div id="aboutme"> {% if AVATAR %} <p> - <img width="100%" class="img-thumbnail" src="{{ AVATAR }}"/> + <img width="100%" class="img-thumbnail" src="{{ SITEURL }}/{{ AVATAR }}"/> </p> {% endif %} + {% if ABOUT_ME %} <p> <strong>About {{ AUTHOR }}</strong><br/> {{ ABOUT_ME }} </p> + {% endif %} </div>
\ No newline at end of file diff --git a/pelican-bootstrap3/templates/includes/pagination.html b/pelican-bootstrap3/templates/includes/pagination.html index 9ae4285..e74cdba 100644 --- a/pelican-bootstrap3/templates/includes/pagination.html +++ b/pelican-bootstrap3/templates/includes/pagination.html @@ -24,7 +24,7 @@ {% endif %} {% for num in range( 1, 1 + articles_paginator.num_pages ) %} <li class="{{ 'active' if num == articles_page.number else '' }}"><a - href="{{ SITEURL }}/{{ page_name }}{{ num if num > 1 else '' }}.html">{{ num }}</a></li> + href="{{ SITEURL }}/{{ articles_paginator.page(num).url if num > 1 else articles_paginator.page(1).url }}">{{ num }}</a></li> {% endfor %} {% if articles_page.has_next() %} <li class="next"><a diff --git a/pelican-bootstrap3/templates/includes/sidebar.html b/pelican-bootstrap3/templates/includes/sidebar.html index 79d3931..4d7e6bb 100644 --- a/pelican-bootstrap3/templates/includes/sidebar.html +++ b/pelican-bootstrap3/templates/includes/sidebar.html @@ -13,7 +13,7 @@ {% else %} {% set name_sanitized = s[0]|lower|replace('+','-plus')|replace(' ','-') %} {% endif %} - {% if name_sanitized in ['flickr', 'slideshare', 'spotify', 'stack-overflow', 'weibo', 'line-chart'] %} + {% if name_sanitized in ['flickr', 'slideshare', 'spotify', 'stack-overflow', 'weibo', 'line-chart', 'home', 'user', 'users', 'envelope', 'envelope-o', 'stack-exchange', 'hacker-news'] %} {% set iconattributes = '"fa fa-' ~ name_sanitized ~ ' fa-lg"' %} {% else %} {% set iconattributes = '"fa fa-' ~ name_sanitized ~ '-square fa-lg"' %} |