Skip to content

Commit

Permalink
Fixing paths, should now work properly locally
Browse files Browse the repository at this point in the history
  • Loading branch information
talbring committed Nov 13, 2019
1 parent 23d21c4 commit b60046a
Show file tree
Hide file tree
Showing 9 changed files with 25 additions and 25 deletions.
2 changes: 1 addition & 1 deletion _config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ bootwatch: yeti
# Build settings
markdown: kramdown
highlighter: rouge
gems:
plugins:
- jekyll-feed
- jekyll-redirect-from
- jekyll-seo-tag
Expand Down
2 changes: 1 addition & 1 deletion _includes/docs_nav.html
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ <h4 class="panel-title">
{% for item in section.docs %}
{% assign item_url = item | prepend:"/docs/" | append:"/" %}
{% assign p = site.docs | where:"url", item_url | first %}
<a class="list-group-item {% if item_url == page.url %}active{% endif %}" href="{{ p.url | prepend: site.baseurl }}">{{ p.title }}</a>
<a class="list-group-item {% if item_url == page.url %}active{% endif %}" href="{{ p.url | relative_url }}">{{ p.title }}</a>
{% endfor %}
</ul>
</div>
Expand Down
2 changes: 1 addition & 1 deletion _includes/docs_v7_nav.html
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ <h4 class="panel-title">
{% for item in section.docs_v7 %}
{% assign item_url = item | prepend:"/docs_v7/" | append:"/" %}
{% assign p = site.docs_v7 | where:"url", item_url | first %}
<a class="list-group-item {% if item_url == page.url %}active{% endif %}" href="{{ p.url | prepend: site.baseurl }}">{{ p.title }}</a>
<a class="list-group-item {% if item_url == page.url %}active{% endif %}" href="{{ p.url | relative_url }}">{{ p.title }}</a>
{% endfor %}
</ul>
</div>
Expand Down
10 changes: 5 additions & 5 deletions _includes/head.html
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,11 @@
<meta name="description" content="{% if page.excerpt %}{{ page.excerpt | strip_html | strip_newlines | truncate: 160 }}{% else %}{{ site.description }}{% endif %}">


<link rel="stylesheet" href="{{ "/css/main.css" | prepend: site.baseurl }}">
<link rel="stylesheet" href="{{ "/css/font-awesome.min.css" | prepend: site.baseurl }}">
<link rel="stylesheet" href="{{ "/css/main.css" | relative_url}}">
<link rel="stylesheet" href="{{ "/css/font-awesome.min.css" | relative_url }}">

<link rel="shortcut icon" href="{{ "/favicon.ico?1" | prepend: site.baseurl }}">
<link rel="shortcut icon" href="{{ "/favicon.ico?1" | relative_url }}">

<link rel="canonical" href="{{ page.url | replace:'index.html','' | prepend: site.baseurl | prepend: site.url }}">
<link rel="alternate" type="application/rss+xml" title="{{ site.title }}" href="{{ "/feed.xml" | prepend: site.baseurl | prepend: site.url }}" />
<link rel="canonical" href="{{ page.url | replace:'index.html','' | relative_url }}">
<link rel="alternate" type="application/rss+xml" title="{{ site.title }}" href="{{ "/feed.xml" | relative_url }}" />
</head>
6 changes: 3 additions & 3 deletions _includes/js_files.html
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
var baseurl = '{{ site.baseurl }}'
</script>
<script src="//code.jquery.com/jquery-1.10.2.min.js"></script>
<script src="{{ "/js/bootstrap.min.js" | prepend: site.baseurl }} "></script>
<script src="{{ "/js/typeahead.bundle.min.js" | prepend: site.baseurl }} "></script>
<script src="{{ "/js/bootstrap.min.js" | relative_url }} "></script>
<script src="{{ "/js/typeahead.bundle.min.js" | relative_url }} "></script>

<script src="{{ "/js/main.js" | prepend: site.baseurl }} "></script>
<script src="{{ "/js/main.js" | relative_url }} "></script>
4 changes: 2 additions & 2 deletions _includes/section_docs_v7_nav.html
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
{% assign previous = forloop.index0 | minus: 1 %}
{% assign previous_page = docs_v7[previous] | prepend:"/docs_v7/" | append:"/" %}
<li class="previous">
<a href="{{ previous_page | prepend: site.baseurl }}">
<a href="{{ previous_page | relative_url }}">
<span aria-hidden="true">&larr;</span> Previous
</a>
</li>
Expand All @@ -40,7 +40,7 @@
{% assign next = forloop.index0 | plus: 1 %}
{% assign next_page = docs_v7[next] | prepend:"/docsv_7/" | append:"/" %}
<li class="next">
<a href="{{ next_page | prepend: site.baseurl }}">
<a href="{{ next_page | relative_url }}">
Next <span aria-hidden="true">&rarr;</span>
</a>
</li>
Expand Down
4 changes: 2 additions & 2 deletions _includes/section_nav.html
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
{% assign previous = forloop.index0 | minus: 1 %}
{% assign previous_page = docs[previous] | prepend:"/docs/" | append:"/" %}
<li class="previous">
<a href="{{ previous_page | prepend: site.baseurl }}">
<a href="{{ previous_page | relative_url }}">
<span aria-hidden="true">&larr;</span> Previous
</a>
</li>
Expand All @@ -40,7 +40,7 @@
{% assign next = forloop.index0 | plus: 1 %}
{% assign next_page = docs[next] | prepend:"/docs/" | append:"/" %}
<li class="next">
<a href="{{ next_page | prepend: site.baseurl }}">
<a href="{{ next_page | relative_url }}">
Next <span aria-hidden="true">&rarr;</span>
</a>
</li>
Expand Down
18 changes: 9 additions & 9 deletions _includes/topnav.html
Original file line number Diff line number Diff line change
Expand Up @@ -7,19 +7,19 @@
<span class="icon-bar"></span>
<span class="icon-bar"></span>
</button>
<a class="navbar-brand" href="{{ site.baseurl }}/">
<span><img src="{{site.baseurl}}/img/logonav.png"></span>
<a class="navbar-brand" href="{{ / | relative_url }}/">
<span><img src="{{ "/img/logonav.png" | relative_url}}"></span>
</a>
</div>
<div id="navbar" class="collapse navbar-collapse">
<ul class="nav navbar-nav">
<li {% if page.sectionid=='download' %} class="active" {% endif %}><a href="{{ "/download.html" | prepend: site.baseurl }}">Download</a></li>
<li {% if page.sectionid=='docs' %} class="active" {% endif %}><a href="{{ "/publications.html" | prepend: site.baseurl }}">Publications</a></li>
<li {% if page.sectionid=='docs' %} class="active" {% endif %}><a href="{{ "/docs/home/" | prepend: site.baseurl }}">Docs</a></li>
<li {% if page.sectionid=='tutorials' %} class="active" {% endif %}><a href="{{ "/tutorials/home/" | prepend: site.baseurl }}">Tutorials</a></li>
<li {% if page.sectionid=='vandv' %} class="active" {% endif %}><a href="{{ "/vandv/home/" | prepend: site.baseurl }}">V&V</a></li>
<li {% if page.sectionid=='forum' %} class="active" {% endif %}><a href="{{ "https://www.cfd-online.com/Forums/su2/" | prepend: site.baseurl }}">Forum</a></li>
<li {% if page.sectionid=='develop' %} class="active" {% endif %}><a href="{{ "/develop.html" | prepend: site.baseurl }}">Develop</a></li>
<li {% if page.sectionid=='download' %} class="active" {% endif %}><a href="{{ "/download.html" | relative_url }}">Download</a></li>
<li {% if page.sectionid=='publications' %} class="active" {% endif %}><a href="{{ "/publications.html" | relative_url }}">Publications</a></li>
<li {% if page.sectionid=='docs' %} class="active" {% endif %}><a href="{{ "/docs/home/" | relative_url }}">Docs</a></li>
<li {% if page.sectionid=='tutorials' %} class="active" {% endif %}><a href="{{ "/tutorials/home/" | relative_url }}">Tutorials</a></li>
<li {% if page.sectionid=='vandv' %} class="active" {% endif %}><a href="{{ "/vandv/home/" | relative_url }}">V&V</a></li>
<li {% if page.sectionid=='forum' %} class="active" {% endif %}><a href="{{ "https://www.cfd-online.com/Forums/su2/" }}">Forum</a></li>
<li {% if page.sectionid=='develop' %} class="active" {% endif %}><a href="{{ "/develop.html" relative_url }}">Develop</a></li>
</ul>
<div class="navbar-right">
<ul class="nav navbar-nav">
Expand Down
2 changes: 1 addition & 1 deletion allposts.html
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<div class="inner-content">
<h1>All Posts</h1> {% for page in site.posts %}
<p>
<strong><a href="{{ page.url | prepend: site.baseurl }}">{{ page.title }}</a></strong>
<strong><a href="{{ page.url | relative_url }}">{{ page.title }}</a></strong>
<span>on {{ page.date | date: "%B %e, %Y" }} {% if page.author %} by {{ page.author }}{% endif %}</span>
</p>
{% endfor %}
Expand Down

0 comments on commit b60046a

Please sign in to comment.