Commit 8238058c authored by Marcus M. Scheunemann's avatar Marcus M. Scheunemann

Merge branch 'adapt-theme'

parents 696adbc8 859e6ada
Pipeline #41695853 passed with stages
in 5 minutes and 46 seconds
......@@ -149,7 +149,7 @@ PUBLICATIONS_UNTAGGED_TITLE = 'Others'
THEME = 'themes/pelican-twitchy'
HIDE_SITENAME = 'True'
SHARE= 'True'
#SHARE= 'True'
BOOTSTRAP_THEME = 'sandstone'
COOKIE_CONSENT = 'True'
OPEN_GRAPH = 'True'
......
......@@ -22,6 +22,8 @@
{%- set iconattributes = 'fab fa-' ~ name_sanitized -%}
{%- elif name_sanitized == 'google-scholar' -%}
{%- set iconattributes = 'fab fa-google' -%}
{%- elif name_sanitized == 'orcid' -%}
{%- set iconattributes = 'fab fa-user' -%}
{%- else -%}
{%- set iconattributes = 'fab fa-' ~ name_sanitized ~ '-square' -%}
{%- endif -%}
......@@ -90,8 +92,6 @@
<div id="sidebar-wrapper-small" class="twitchy-background">
<ul id="accordion-small" class="sidebar-nav sidebar-nav-small">
{{ nav_small_li(SITEURL, SITENAME, '<span class="fas fa-home"></span>') }}
<li class="nav-divider"></li>
{{ nav_small_li(SITEURL + '/' + ARCHIVES_URL | default('archives.html'), 'Recent Articles', '<span class="fas fa-th-list"></span>') }}
{% if SHARE %}
<li class="nav-divider"></li>
<li id="share-small">
......@@ -117,15 +117,34 @@
</li>
</ul></li>
{% endif %}
{% if DISPLAY_PAGES_ON_MENU %}
<li class="nav-divider"></li>
<li>
<a data-toggle="collapse" data-parent="#accordion-small" href="#collapse-pages-small" title="Pages" class="collapsed">
<i class="fas fa-folder-open padding-small"></i>
</a>
</li>
<li class="panel anti-panel"><ul id="collapse-pages-small" class="collapse {% block collapse_pages_small %}{% endblock %}">
{% for p in pages %}
<li{% if p == page %} class="active"{% endif %}>
<a href="{{ SITEURL }}/{{ p.url }}" title=" {{ p.menulabel|default(p.title) }}">
<i class="fas fa-{{ p.menuicon|default('file.alt') }} padding-small"></i>
</a>
</li>
{% endfor %}
</ul></li>
{% endif %}
<li class="nav-divider"></li>
{{ nav_small_li(SITEURL + '/' + ARCHIVES_URL | default('archives.html'), 'Recent Articles', '<span class="fas fa-th-list"></span>') }}
{% if SOCIAL %}
<li class="nav-divider"></li>
<li>
<a data-toggle="collapse" data-parent="#accordion-small" href="#collapse-social-small" title="Social" class="collapsed">
<a data-toggle="collapse" data-parent="#accordion-small" href="#collapse-social-small" title="Profiles" class="collapsed">
<i class="fas fa-users padding-small"></i>
</a>
</li>
<li class="panel anti-panel"><ul id="collapse-social-small" class="collapse {% block collapse_social_small %}{% endblock %}">
{% for name, link in SOCIAL|sort(attribute='0') %}
{% for name, link in SOCIAL %}
<li>
<a href="{{ link }}" title="{{name}}"><i class="{{get_icon_attributes(name|striptags|trim)}} padding-small"></i></a>
</li>
......@@ -147,38 +166,6 @@
{% endif %}
</a>
</li>
{% if DISPLAY_RECENT_POSTS_ON_MENU %}
<li class="nav-divider"></li>
<li>
<a data-toggle="collapse" data-parent="#accordion" href="#collapse-latest">
<span class="fas fa-th-list padding-small"></span>
Recent Articles
</a>
</li>
<li class="panel anti-panel"><ul id="collapse-latest" class="sidebar_submenu collapse {% block collapse_latest %}{% endblock %}">
{% for a in (all_articles if all_articles else articles)[:RECENT_POST_COUNT] %}
<li class="{% if a == article %}active{% endif %}">
<a class="hide-overflow" href="{{ SITEURL }}/{{ a.url }}" title="{{ a.title|striptags|trim }}">
<i class="fas fa-file-alt padding-small"></i>
{{ a.title | striptags | trim }}
</a>
</li>
{% endfor %}
<li>
<a href="{{ SITEURL }}/{{ ARCHIVES_URL | default('archives.html') }}">
<i class="fas fa-arrow-right padding-small"></i>
More
</a>
</li>
</ul></li>
{% else %}
<li>
<a href="{{ SITEURL }}/{{ ARCHIVES_URL | default('archives.html') }}">
<span class="fas fa-th-list padding-small"></span>
Recent Articles
</a>
</li>
{% endif %}
{% if SHARE %}
<li class="nav-divider"></li>
<li id="share">
......@@ -208,37 +195,17 @@
</li>
</ul></li>
{% endif %}
{% if SOCIAL %}
<li class="nav-divider"></li>
<li>
<a data-toggle="collapse" data-parent="#accordion" href="#collapse-social">
<i class="fas fa-users padding-small"></i>
Contact
</a>
</li>
<li class="panel anti-panel"><ul id="collapse-social" class="sidebar_submenu collapse {% block collapse_social %}{% endblock %}">
{% for name, link in SOCIAL|sort(attribute='0') %}
<li>
<a href="{{ link }}" title="{{name|striptags|trim}}">
<i class="{{get_icon_attributes(name|striptags|trim)}} padding-small"></i>
{{ name }}
</a>
</li>
{% endfor %}
</ul></li>
{% endif %}
{% for title, link, icon in MENUITEMS %}
{% if loop.first%}
<li class="nav-divider"></li>
{% endif %}
<li>
<a href="{{ link }}">
<i class="fas fa-{{ icon }} padding-small"></i>
<i class="fas fa-{{ icon }} padding-small"></i>
{{ title }}
</a>
</li>
{% endfor %}
{% if DISPLAY_PAGES_ON_MENU %}
<li class="nav-divider"></li>
<li>
......@@ -247,7 +214,7 @@
Pages
</a>
</li>
<li class="panel anti-panel"><ul id="collapse-pages" class="sidebar_submenu collapse {% block collapse_pages %}{% endblock %}">
<li class="panel anti-panel"><ul id="collapse-pages" class="sidebar_submenu">
{% for p in pages %}
<li{% if p == page %} class="active"{% endif %}>
<a href="{{ SITEURL }}/{{ p.url }}">
......@@ -258,6 +225,38 @@
{% endfor %}
</ul></li>
{% endif %}
{% if DISPLAY_RECENT_POSTS_ON_MENU %}
<li class="nav-divider"></li>
<li>
<a data-toggle="collapse" data-parent="#accordion" href="#collapse-latest">
<span class="fas fa-th-list padding-small"></span>
Recent Articles
</a>
</li>
<li class="panel anti-panel"><ul id="collapse-latest" class="sidebar_submenu collapse {% block collapse_latest %}{% endblock %}">
{% for a in (all_articles if all_articles else articles)[:RECENT_POST_COUNT] %}
<li class="{% if a == article %}active{% endif %}">
<a class="hide-overflow" href="{{ SITEURL }}/{{ a.url }}" title="{{ a.title|striptags|trim }}">
<i class="fas fa-file-alt padding-small"></i>
{{ a.title | striptags | trim }}
</a>
</li>
{% endfor %}
<li>
<a href="{{ SITEURL }}/{{ ARCHIVES_URL | default('archives.html') }}">
<i class="fas fa-arrow-right padding-small"></i>
More
</a>
</li>
</ul></li>
{% else %}
<li>
<a href="{{ SITEURL }}/{{ ARCHIVES_URL | default('archives.html') }}">
<span class="fas fa-th-list padding-small"></span>
Recent Articles
</a>
</li>
{% endif %}
{% if DISPLAY_CATEGORIES_ON_MENU %}
<li class="nav-divider"></li>
<li>
......@@ -301,6 +300,25 @@
{% endfor %}
</ul></li>
{% endif %}
{% if SOCIAL %}
<li class="nav-divider"></li>
<li>
<a data-toggle="collapse" data-parent="#accordion" href="#collapse-social">
<i class="fas fa-users padding-small"></i>
Profiles
</a>
</li>
<li class="panel anti-panel"><ul id="collapse-social" class="sidebar_submenu collapse {% block collapse_social %}{% endblock %}">
{% for name, link in SOCIAL %}
<li>
<a href="{{ link }}" title="{{name|striptags|trim}}">
<i class="{{get_icon_attributes(name|striptags|trim)}} padding-small"></i>
{{ name }}
</a>
</li>
{% endfor %}
</ul></li>
{% endif %}
</ul>
</div>
<!-- /#sidebar-wrapper -->
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment