diff options
Diffstat (limited to 'templates')
| -rw-r--r-- | templates/macros/macros.html | 4 | ||||
| -rw-r--r-- | templates/page.html | 22 |
2 files changed, 11 insertions, 15 deletions
diff --git a/templates/macros/macros.html b/templates/macros/macros.html index fd551f4..54ace32 100644 --- a/templates/macros/macros.html +++ b/templates/macros/macros.html @@ -15,9 +15,9 @@ {%- set uglyurls = config.extra.uglyurls | default(value=false) -%} {%- if config.extra.search_library %}{%- if config.extra.search_library == "offline" %}{% set uglyurls = true %}{% endif %}{% endif %} {%- if inner.content == page.content %} - <li><a class="scur" href="{{ inner.permalink | safe }}{%- if uglyurls %}index.html{%- endif %}">{{ inner.title }}</a></li> + <a class="scur" href="{{ inner.permalink | safe }}{%- if uglyurls %}index.html{%- endif %}">{{ inner.title }}</a><br> {% else %} - <li><a href="{{ inner.permalink | safe }}{%- if uglyurls %}index.html{%- endif %}">{{ inner.title }}</a></li> + <a href="{{ inner.permalink | safe }}{%- if uglyurls %}index.html{%- endif %}">{{ inner.title }}</a><br> {%- endif %} {%- endmacro %} diff --git a/templates/page.html b/templates/page.html index 24c628a..cf8016b 100644 --- a/templates/page.html +++ b/templates/page.html @@ -60,17 +60,15 @@ <div class="block"> <div class="blockdiv"> - <a class="b s150" href="{{ tag.permalink | safe }}{%- if uglyurls %}index.html{%- endif %}">{{ tag.name }} ({{ parts_string }})</a> - <ol> + <a class="b s150" href="{{ tag.permalink | safe }}{%- if uglyurls %}index.html{%- endif %}">{{ tag.name }} ({{ parts_string }})</a><br> {%- for inner in tag.pages | sort(attribute="date") %} {%- if inner.content == page.content %} - <li><a class="scur" href="{{ inner.permalink | safe }}{%- if uglyurls %}index.html{%- endif %}">{{ inner.title }}</a></li> + <a class="scur" href="{{ inner.permalink | safe }}{%- if uglyurls %}index.html{%- endif %}">{{ inner.title }}</a><br> {%- set_global current_section_index = loop.index0 %} {# Finds the current section, needed for pagination logic later #} {% else %} - <li><a href="{{ inner.permalink | safe }}{%- if uglyurls %}index.html{%- endif %}">{{ inner.title }}</a></li> + <a href="{{ inner.permalink | safe }}{%- if uglyurls %}index.html{%- endif %}">{{ inner.title }}</a><br> {%- endif %} {%- endfor %} - </ol> </div> </div> {%- endif %} @@ -105,8 +103,7 @@ {%- if page.extra.series %} {%- set num_extra_pages = config.extra.series_items | default(value=9) %} <div class="blockdiv"> - <a class="b s150" href="{{ tag.permalink | safe }}{%- if uglyurls %}index.html{%- endif %}">{{ parts_string }}</a> - <ol> + <a class="b s150" href="{{ tag.permalink | safe }}{%- if uglyurls %}index.html{%- endif %}">{{ parts_string }}</a><br> {%- if tag.page_count > num_extra_pages and num_extra_pages > 0 %} {%- set sorted_array = tag.pages | sort(attribute="date") %} {%- set num_pages = tag.page_count %} @@ -121,7 +118,7 @@ </details> <div class="hidden_li"> {%- for inner in sorted_array | slice(start=1, end=(current_section_index - 2)) %} - <li><a href="{{ inner.permalink | safe }}{%- if uglyurls %}index.html{%- endif %}">{{ inner.title }}</a></li> + <a href="{{ inner.permalink | safe }}{%- if uglyurls %}index.html{%- endif %}">{{ inner.title }}</a><br> {%- endfor %} </div> {%- endif %} @@ -135,7 +132,7 @@ {# Shows two pages before current page #} {%- for inner in sorted_array | slice(start=num, end=current_section_index) %} - <li><a href="{{ inner.permalink | safe }}{%- if uglyurls %}index.html{%- endif %}">{{ inner.title }}</a></li> + <a href="{{ inner.permalink | safe }}{%- if uglyurls %}index.html{%- endif %}">{{ inner.title }}</a><br> {%- endfor %} {# Shows the current page #} @@ -151,8 +148,8 @@ {%- endif %} {%- for inner in sorted_array | slice(start=(current_section_index + 1), end=num ) %} - <li><a href="{{ inner.permalink | safe }}{%- if uglyurls %}index.html{%- endif %}">{{ inner.title }}</a></li> - {%- endfor %} + <a href="{{ inner.permalink | safe }}{%- if uglyurls %}index.html{%- endif %}">{{ inner.title }}</a><br> + {% endfor %} {%- if current_section_index < num_pages - 4 %} <details> @@ -160,7 +157,7 @@ </details> <div class="hidden_li"> {%- for inner in sorted_array | slice(start=(current_section_index + 3), end=(num_pages - 1)) %} - <li><a href="{{ inner.permalink | safe }}{%- if uglyurls %}index.html{%- endif %}">{{ inner.title }}</a></li> + <a href="{{ inner.permalink | safe }}{%- if uglyurls %}index.html{%- endif %}">{{ inner.title }}</a><br> {%- endfor %} </div> {%- endif %} @@ -174,7 +171,6 @@ {{ macros::series_link(inner=inner, page=page, config=config) }} {%- endfor %} {%- endif %} - </ol> </div> {%- endif %} |