Almost ... #3

Merged
bpoldrack merged 1 commit from test-pr2 into master 2025-08-19 08:44:08 +00:00
3 changed files with 16 additions and 16 deletions

View file

@ -8,7 +8,7 @@
<title>{{ SITENAME }}{% block title %}{% endblock %}</title> <title>{{ SITENAME }}{% block title %}{% endblock %}</title>
<link rel="license" hreflang="en" href="{{ SITEURL }}/copyright.html" /> <link rel="license" hreflang="en" href="{{ SITEURL }}/copyright.html" />
<link rel="stylesheet" type="text/css" href="/theme/css/style.css"> <link rel="stylesheet" type="text/css" href="{{ SITEURL }}/theme/css/style.css">
{% block extra_headers %}{% endblock %} {% block extra_headers %}{% endblock %}
</head> </head>
@ -18,7 +18,7 @@
<nav> <nav>
<ul> <ul>
{% for title, link in MENUITEMS %} {% for title, link in MENUITEMS %}
<li><a href="{{ link }}">{{ title }}</a></li> <li><a href="{{ SITEURL }}{{ link }}">{{ title }}</a></li>
{% endfor %} {% endfor %}
{% for p in pages %} {% for p in pages %}
@ -26,10 +26,10 @@
{% if p == page or page in p.children %} {% if p == page or page in p.children %}
<li> <li>
{% if p == page %} {% if p == page %}
<a class="active" href="/{{ p.url }}">{{ p.title }}</a> <a class="active" href="{{ SITEURL }}/{{ p.url }}">{{ p.title }}</a>
{% if page.toc %}{{ page.toc }}{% endif %} {% if page.toc %}{{ page.toc }}{% endif %}
{% else %} {% else %}
<a href="/{{ p.url }}">{{ p.title }}</a> <a href="{{ SITEURL }}/{{ p.url }}">{{ p.title }}</a>
{% endif %} {% endif %}
{% if p.children %}{# print any child pages #} {% if p.children %}{# print any child pages #}
@ -37,10 +37,10 @@
{% for c in p.children %} {% for c in p.children %}
<li> <li>
{% if c == page %} {% if c == page %}
<a class="active" href="/{{ c.url }}">{{ c.title }}</a> <a class="active" href="{{ SITEURL }}/{{ c.url }}">{{ c.title }}</a>
{% if page.toc %}{{ page.toc }}{% endif %} {% if page.toc %}{{ page.toc }}{% endif %}
{% else %} {% else %}
<a href="/{{ c.url }}">{{ c.title }}</a> <a href="{{ SITEURL }}/{{ c.url }}">{{ c.title }}</a>
{% endif %} {% endif %}
</li> </li>
{% endfor %} {% endfor %}
@ -48,13 +48,13 @@
{% endif %} {% endif %}
</li> </li>
{% else %} {% else %}
<li><a href="/{{ p.url }}">{{ p.title }}</a></li> <li><a href="{{ SITEURL }}/{{ p.url }}">{{ p.title }}</a></li>
{% endif %} {% endif %}
{% endif %} {% endif %}
{% endfor %} {% endfor %}
</ul> </ul>
</nav> </nav>
<form class="searchbox" action="/search.html"> <form class="searchbox" action="{{ SITEURL }}/search.html">
<input type="text" name="q" id="tipue_search_input" placeholder="Search"> <input type="text" name="q" id="tipue_search_input" placeholder="Search">
</form> </form>
</aside> </aside>
@ -68,7 +68,7 @@
<p><small> <p><small>
content licensed <a rel="license" href="https://creativecommons.org/licenses/by-sa/4.0/">cc-by-sa</a> content licensed <a rel="license" href="https://creativecommons.org/licenses/by-sa/4.0/">cc-by-sa</a>
<span class='break'></span> ©20172018 {{ AUTHOR }} <span class='break'></span> <span class='break'></span> ©20172018 {{ AUTHOR }} <span class='break'></span>
unless <a rel="license" href='/copyright.html'>indicated otherwise</a> unless <a rel="license" href='{{ SITEURL }}/copyright.html'>indicated otherwise</a>
</small></p> </small></p>
</footer> </footer>
</main> </main>

View file

@ -6,9 +6,9 @@
<header> <header>
<nav> <nav>
<ul class="breadcrumbs"> <ul class="breadcrumbs">
<li><a href="/">Home</a></li> <li><a href="{{ SITEURL }}/">Home</a></li>
{% for parent in page.parents %} {% for parent in page.parents %}
<li> > <a href="/{{ parent.url }}">{{ parent.title }}</a></li> <li> > <a href="{{ SITEURL }}/{{ parent.url }}">{{ parent.title }}</a></li>
{% endfor %} {% endfor %}
<li> > {{ page.title }}</li> <li> > {{ page.title }}</li>
</ul> </ul>

View file

@ -1,10 +1,10 @@
{% extends 'base.html' %} {% extends 'base.html' %}
{% block title %} &mdash; Search{% endblock %} {% block title %} &mdash; Search{% endblock %}
{% block extra_headers %} {% block extra_headers %}
<script src="/theme/ts/jquery-3.2.1.min.js"></script> <script src="{{ SITEURL }}/theme/ts/jquery-3.2.1.min.js"></script>
<script src="/tipuesearch_content.json"></script> <script src="{{ SITEURL }}/tipuesearch_content.json"></script>
<script src="/theme/ts/tipuesearch_set.js"></script> <script src="{{ SITEURL }}/theme/ts/tipuesearch_set.js"></script>
<script src="/theme/ts/tipuesearch.min.js"></script> <script src="{{ SITEURL }}/theme/ts/tipuesearch.min.js"></script>
<script> <script>
$(document).ready(function() { $(document).ready(function() {
$('#tipue_search_input').tipuesearch({ $('#tipue_search_input').tipuesearch({
@ -24,7 +24,7 @@
<header> <header>
<nav> <nav>
<ul class="breadcrumbs"> <ul class="breadcrumbs">
<li><a href="/">Home</a></li> <li><a href="{{ SITEURL }}/">Home</a></li>
<li> > Search</li> <li> > Search</li>
</ul> </ul>
</nav> </nav>