Commit 76872b50 authored by Marcus M. Scheunemann's avatar Marcus M. Scheunemann

show pages on top (not collapsed for now)

parent c07d3537
......@@ -92,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">
......@@ -119,10 +117,12 @@
</li>
</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>
......@@ -149,38 +149,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">
......@@ -210,25 +178,6 @@
</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>
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 %}
{% for title, link, icon in MENUITEMS %}
{% if loop.first%}
<li class="nav-divider"></li>
......@@ -249,7 +198,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 }}">
......@@ -259,6 +208,38 @@
</li>
{% 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>
......@@ -302,6 +283,25 @@
</li>
{% 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>
......
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