Skip to content

Commit e5d58a0

Browse files
authored
Handling external links gracefully (Phlow#245)
You are setting `_baseurl` but then using `site.baseurl`.
1 parent 3a7ab3d commit e5d58a0

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

_includes/_navigation.html

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -43,14 +43,14 @@ <h1 class="hide-for-large-up"><a href="{{ site.url }}{{ site.baseurl }}" class="
4343

4444
{% comment %} If left side WITHOUT dropdown menu do {% endcomment %}
4545
{% if link.dropdown == nil %}
46-
<li{% if link.url == page.url %} class="active"{% elsif page.homepage == true and link.url == '/' %} class="active"{% endif %}><a {% if link.class %}class="{{link.class}}"{% endif %} href="{{ domain }}{{ site.baseurl }}{{ link.url }}"{% if link.url contains 'http' %} target="_blank"{% endif %}>{{ link.title | escape }}</a></li>
46+
<li{% if link.url == page.url %} class="active"{% elsif page.homepage == true and link.url == '/' %} class="active"{% endif %}><a {% if link.class %}class="{{link.class}}"{% endif %} href="{{ domain }}{{ _baseurl }}{{ link.url }}"{% if link.url contains 'http' %} target="_blank"{% endif %}>{{ link.title | escape }}</a></li>
4747
<li class="divider"></li>
4848

4949
{% comment %} If left side WITH dropdown menu do {% endcomment %}
5050
{% else %}
5151

5252
<li class="has-dropdown{% if link.url == page.url %} active{% endif %}">
53-
<a {% if link.class %}class="{{link.class}}"{% endif %} href="{{ domain }}{{ site.baseurl }}{{ link.url }}"{% if link.url contains 'http' %} target="_blank"{% endif %}>{{ link.title | escape }}</a>
53+
<a {% if link.class %}class="{{link.class}}"{% endif %} href="{{ domain }}{{ _baseurl }}{{ link.url }}"{% if link.url contains 'http' %} target="_blank"{% endif %}>{{ link.title | escape }}</a>
5454

5555
<ul class="dropdown">
5656
{% for dropdown_link in link.dropdown %}
@@ -61,7 +61,7 @@ <h1 class="hide-for-large-up"><a href="{{ site.url }}{{ site.baseurl }}" class="
6161
{% assign domain = site.url %}
6262
{% endif %}
6363

64-
<li><a {% if dropdown_link.class %}class="{{dropdown_link.class}}"{% endif %} href="{{ domain }}{{ site.baseurl }}{{ dropdown_link.url }}"{% if dropdown_link.url contains 'http' %} target="_blank"{% endif %}>{{ dropdown_link.title | escape }}</a></li>
64+
<li><a {% if dropdown_link.class %}class="{{dropdown_link.class}}"{% endif %} href="{{ domain }}{{ _baseurl }}{{ dropdown_link.url }}"{% if dropdown_link.url contains 'http' %} target="_blank"{% endif %}>{{ dropdown_link.title | escape }}</a></li>
6565
{% endfor %}
6666
</ul>
6767

@@ -105,14 +105,14 @@ <h1 class="hide-for-large-up"><a href="{{ site.url }}{{ site.baseurl }}" class="
105105
{% comment %} If right side WITHOUT dropdown menu do {% endcomment %}
106106
{% if link.dropdown == nil %}
107107
<li class="divider"></li>
108-
<li{% if link.url == page.url %} class="active"{% elsif page.homepage == true and link.url == '/' %} class="active"{% endif %}><a {% if link.class %}class="{{link.class}}"{% endif %} href="{{ domain }}{{ site.baseurl }}{{ link.url }}"{% if link.url contains 'http' %} target="_blank"{% endif %}>{{ link.title | escape }}</a></li>
108+
<li{% if link.url == page.url %} class="active"{% elsif page.homepage == true and link.url == '/' %} class="active"{% endif %}><a {% if link.class %}class="{{link.class}}"{% endif %} href="{{ domain }}{{ _baseurl }}{{ link.url }}"{% if link.url contains 'http' %} target="_blank"{% endif %}>{{ link.title | escape }}</a></li>
109109

110110
{% comment %} If right side WITH dropdown menu do {% endcomment %}
111111
{% else %}
112112

113113
<li class="divider"></li>
114114
<li class="has-dropdown{% if link.url == page.url %} active{% endif %}">
115-
<a {% if link.class %}class="{{link.class}}"{% endif %} href="{{ domain }}{{ site.baseurl }}{{ link.url }}"{% if link.url contains 'http' %} target="_blank"{% endif %}>{{ link.title | escape }}</a>
115+
<a {% if link.class %}class="{{link.class}}"{% endif %} href="{{ domain }}{{ _baseurl }}{{ link.url }}"{% if link.url contains 'http' %} target="_blank"{% endif %}>{{ link.title | escape }}</a>
116116

117117
<ul class="dropdown">
118118
{% for dropdown_link in link.dropdown %}
@@ -123,7 +123,7 @@ <h1 class="hide-for-large-up"><a href="{{ site.url }}{{ site.baseurl }}" class="
123123
{% assign domain = site.url %}
124124
{% endif %}
125125

126-
<li><a {% if dropdown_link.class %}class="{{dropdown_link.class}}"{% endif %} href="{{ domain }}{{ site.baseurl }}{{ dropdown_link.url }}"{% if dropdown_link.url contains 'http' %} target="_blank"{% endif %}>{{ dropdown_link.title | escape }}</a></li>
126+
<li><a {% if dropdown_link.class %}class="{{dropdown_link.class}}"{% endif %} href="{{ domain }}{{ _baseurl }}{{ dropdown_link.url }}"{% if dropdown_link.url contains 'http' %} target="_blank"{% endif %}>{{ dropdown_link.title | escape }}</a></li>
127127
{% endfor %}
128128
</ul>
129129

0 commit comments

Comments
 (0)