fixing permalinks

This commit is contained in:
tomjohnson1492
2016-07-06 17:45:00 -07:00
parent bce638b7ab
commit cce99619c0
108 changed files with 213 additions and 221 deletions

View File

@ -4,10 +4,10 @@
{% for entry in site.data.sidebars[sidebar].entries %}
{% for folder in entry.folders %}
{% for folderitem in folder.folderitems %}
[{{folderitem.url | remove: "/" }}]: {{folderitem.url | remove: "/" | append: ".html"}}
[{{folderitem.url | remove: "/" | remove: ".html"}}]: {{folderitem.url | remove: "/"}}
{% for subfolders in folderitem.subfolders %}
{% for subfolderitem in subfolders.subfolderitems %}
[{{subfolderitem.url | remove: "/" }}]: {{subfolderitem.url | remove: "/" | append: ".html"}}
[{{subfolderitem.url | remove: "/" | remove: ".html"}}]: {{subfolderitem.url | remove: "/"}}
{% endfor %}
{% endfor %}
{% endfor %}
@ -21,7 +21,7 @@
{% for entry in site.data.topnav.topnav %}
{% for item in entry.items %}
{% if item.external_url == null %}
[{{item.url | remove: "/" }}]: {{item.url | remove: "/" | append: ".html"}}
[{{item.url | remove: "/" | remove: ".html"}}]: {{item.url | remove: "/"}}
{% endif %}
{% endfor %}
{% endfor %}
@ -32,23 +32,9 @@
{% for folder in entry.folders %}
{% for folderitem in folder.folderitems %}
{% if folderitem.external_url == null %}
[{{folderitem.url | remove: "/" }}]: {{folderitem.url | remove: "/" | append: ".html"}}
[{{folderitem.url | remove: "/" | remove: ".html"}}]: {{folderitem.url | remove: "/"}}
{% endif %}
{% endfor %}
{% endfor %}
{% endfor %}
{% comment %}Get links for otherlinks.yml file {% endcomment %}
{% for entry in site.data.otherlinks.entries %}
{% for folder in entry.folders %}
{% for folderitem in folder.folderitems %}
[{{folderitem.ref}}]: {{folderitem.exact_url}}
{% for subfolders in folderitem.subfolders %}
{% for subfolderitem in subfolders.subfolderitems %}
[{{subfolderitem.ref}}]: {{subfolderitem.exact_url}}
{% endfor %}
{% endfor %}
{% endfor %}
{% endfor %}
{% endfor %}

View File

@ -13,9 +13,9 @@
{% if folderitem.external_url %}
<li><a href="{{folderitem.external_url}}" target="_blank">{{folderitem.title}}</a></li>
{% elsif page.url == folderitem.url %}
<li class="active"><a href="{{folderitem.url | remove: "/" | append: ".html"}}">{{folderitem.title}}</a></li>
<li class="active"><a href="{{folderitem.url | remove: "/"}}">{{folderitem.title}}</a></li>
{% else %}
<li><a href="{{folderitem.url | remove: "/" | append: ".html"}}">{{folderitem.title}}</a></li>
<li><a href="{{folderitem.url | remove: "/"}}">{{folderitem.title}}</a></li>
{% endif %}
{% for subfolders in folderitem.subfolders %}
{% if subfolders.output contains "web" %}
@ -27,9 +27,9 @@
{% if subfolderitem.external_url %}
<li><a href="{{subfolderitem.external_url}}" target="_blank">{{subfolderitem.title}}</a></li>
{% elsif page.url == subfolderitem.url %}
<li class="active"><a href="{{subfolderitem.url | remove: "/" | append: ".html"}}">{{subfolderitem.title}}</a></li>
<li class="active"><a href="{{subfolderitem.url | remove: "/"}}">{{subfolderitem.title}}</a></li>
{% else %}
<li><a href="{{subfolderitem.url | remove: "/" | append: ".html"}}">{{subfolderitem.title}}</a></li>
<li><a href="{{subfolderitem.url | remove: "/"}}">{{subfolderitem.title}}</a></li>
{% endif %}
{% endif %}
{% endfor %}

View File

@ -6,7 +6,7 @@
{% for tag in page.tags %}
{% if tag == thisTag %}
<tr><td><a href="{{ page.url | remove: "/" | append: ".html" }}">{{page.title}}</a></td>
<tr><td><a href="{{ page.url | remove: "/" }}">{{page.title}}</a></td>
<td><span class="label label-default">Page</span></td>
<td>{% if page.summary %} {{ page.summary | strip_html | strip_newlines | truncate: 160 }} {% else %} {{ page.content | truncatewords: 50 | strip_html }} {% endif %}</td>
</tr>
@ -19,7 +19,7 @@
{% for tag in post.tags %}
{% if tag == thisTag %}
<tr><td><a href="{{ post.url | remove: "/" | append: ".html" }}">{{post.title}}</a></td>
<tr><td><a href="{{ post.url | remove: "/" }}">{{post.title}}</a></td>
<td><span class="label label-primary">Post</span></td>
<td>{% if post.summary %} {{ post.summary | strip_html | strip_newlines | truncate: 160 }} {% else %} {{ post.content | truncatewords: 50 | strip_html }} {% endif %}</td>
</tr>

View File

@ -18,9 +18,9 @@
{% if item.external_url %}
<li><a href="{{item.external_url}}" target="_blank">{{item.title}}</a></li>
{% elsif page.url contains item.url %}
<li class="active"><a href="{{item.url | remove: "/" | append: ".html"}}">{{item.title}}</a></li>
<li class="active"><a href="{{item.url | remove: "/"}}">{{item.title}}</a></li>
{% else %}
<li><a href="{{item.url | remove: "/" | append: ".html"}}">{{item.title}}</a></li>
<li><a href="{{item.url | remove: "/"}}">{{item.title}}</a></li>
{% endif %}
{% endfor %}
{% endfor %}
@ -35,9 +35,9 @@
{% if folderitem.external_url %}
<li><a href="{{folderitem.external_url}}" target="_blank">{{folderitem.title}}</a></li>
{% elsif page.url contains folderitem.url %}
<li class="dropdownActive"><a href="{{folderitem.url | remove: "/" | append: ".html"}}">{{folderitem.title}}</a></li>
<li class="dropdownActive"><a href="{{folderitem.url | remove: "/"}}">{{folderitem.title}}</a></li>
{% else %}
<li><a href="{{folderitem.url | remove: "/" | append: ".html"}}">{{folderitem.title}}</a></li>
<li><a href="{{folderitem.url | remove: "/"}}">{{folderitem.title}}</a></li>
{% endif %}
{% endfor %}
</ul>