HPCE/gitea-pages
0
0
Fork 0
Code Issues 2 Pull Requests Actions Packages Projects Activity

Also removing relative_url filters to work around incorrect baseurl

Browse Source 
This could also be reverted if baseurl is correctly deployed.
This commit is contained in:
Spencer Bliven
2019-06-17 14:23:31 +02:00
parent 6b84e38c6e
commit 3654238eb0
3 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
_includes/sidebar.html
View File

@ -16,12 +16,12 @@
{% if folderitem.external_url %}
<li><a title="{{folderitem.title}}" href="{{folderitem.external_url}}" target="_blank" rel="noopener">{{folderitem.title}}</a></li>
{% elsif page.url contains folderitem.url %}
<li class="active"><a title="{{folderitem.title}}" href="{{folderitem.url | relative_url}}">{{folderitem.title}}</a></li>
<li class="active"><a title="{{folderitem.title}}" href="{{folderitem.url}}">{{folderitem.title}}</a></li>
{% elsif folderitem.type == "empty" %}
<li><a title="{{folderitem.title}}" href="{{folderitem.url | relative_url}}">{{folderitem.title}}</a></li>
<li><a title="{{folderitem.title}}" href="{{folderitem.url}}">{{folderitem.title}}</a></li>
{% else %}
<li><a title="{{folderitem.title}}" href="{{folderitem.url | relative_url}}">{{folderitem.title}}</a></li>
<li><a title="{{folderitem.title}}" href="{{folderitem.url}}">{{folderitem.title}}</a></li>
{% endif %}
{% for subfolders in folderitem.subfolders %}
{% if subfolders.output == nil or subfolders.output contains "web" %}
@ -33,9 +33,9 @@
{% if subfolderitem.external_url %}
<li><a title="{{subfolderitem.title}}" href="{{subfolderitem.external_url}}" target="_blank" rel="noopener">{{subfolderitem.title}}</a></li>
{% elsif page.url == subfolderitem.url %}
<li class="active"><a title="{{subfolderitem.title}}" href="{{subfolderitem.url | relative_url}}">{{subfolderitem.title}}</a></li>
<li class="active"><a title="{{subfolderitem.title}}" href="{{subfolderitem.url}}">{{subfolderitem.title}}</a></li>
{% else %}
<li><a title="{{subfolderitem.title}}" href="{{subfolderitem.url | relative_url }}">{{subfolderitem.title}}</a></li>
<li><a title="{{subfolderitem.title}}" href="{{subfolderitem.url }}">{{subfolderitem.title}}</a></li>
{% endif %}
{% endif %}
{% endfor %}

10
_includes/topnav.html
View File

@ -8,7 +8,7 @@
<span class="icon-bar"></span>
<span class="icon-bar"></span>
</button>
<a class="fa fa-home fa-lg navbar-brand" href="{{ "/index.html" | relative_url }}">&nbsp;<span class="projectTitle"> {{site.topnav_title}}</span></a>
<a class="fa fa-home fa-lg navbar-brand" href="{{ "/index.html" }}">&nbsp;<span class="projectTitle"> {{site.topnav_title}}</span></a>
</div>
<div class="collapse navbar-collapse" id="bs-example-navbar-collapse-1">
<ul class="nav navbar-nav navbar-right">
@ -24,9 +24,9 @@
{% if item.external_url %}
<li><a href="{{item.external_url}}" target="_blank" rel="noopener">{{item.title}}</a></li>
{% elsif page.url contains item.url %}
<li class="active"><a href="{{item.url | relative_url }}">{{item.title}}</a></li>
<li class="active"><a href="{{item.url }}">{{item.title}}</a></li>
{% else %}
<li><a href="{{item.url | relative_url}}">{{item.title}}</a></li>
<li><a href="{{item.url}}">{{item.title}}</a></li>
{% endif %}
{% endfor %}
{% endfor %}
@ -41,9 +41,9 @@
{% if folderitem.external_url %}
<li><a href="{{folderitem.external_url}}" target="_blank" rel="noopener">{{folderitem.title}}</a></li>
{% elsif page.url contains folderitem.url %}
<li class="dropdownActive"><a href="{{folderitem.url | relative_url}}">{{folderitem.title}}</a></li>
<li class="dropdownActive"><a href="{{folderitem.url}}">{{folderitem.title}}</a></li>
{% else %}
<li><a href="{{folderitem.url | relative_url }}">{{folderitem.title}}</a></li>
<li><a href="{{folderitem.url }}">{{folderitem.title}}</a></li>
{% endif %}
{% endfor %}
</ul>

2
pages/merlin6/introduction.md
View File

@ -25,4 +25,4 @@ of GPU-based resources which are mostly used by the BIO experiments.
## Merlin6
![Merlin6 Architecture]({{ "/images/merlinschema3.png" | relative_url }})
![Merlin6 Architecture]({{ "/images/merlinschema3.png" }})