Skip to content

Commit c6d52ef

Browse files
committed
feat: support non-root baseurl
This adds support for hosting on a nont-root sub-path (with `--baseurl` flag), such as when deploying on a GitHub fork Signed-off-by: Rifa Achrinza <25147899+achrinza@users.noreply.github.com>
1 parent c200517 commit c6d52ef

6 files changed

Lines changed: 17 additions & 14 deletions

File tree

_data/topnav.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ topnav_dropdowns:
1111
- title: View
1212
folderitems:
1313
- title: LoopBack Overview
14-
url: /
14+
url: /doc/
1515
- title: LoopBack 4
1616
url: /doc/en/lb4/
1717
- title: LoopBack 3.x

_includes/footer.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
{% if page.last_updated %}<p>Page last updated:</span> {{page.last_updated}}<br/>{% endif %} Site last generated: {{ site.time | date: "%b %-d, %Y" }}
66
</div>
77
<div class="col-md-6 footer-right">
8-
<p><img src="{{site.url}}/images/company_logo.png" alt="Company logo"/></p>
8+
<p><img src="{{site.baseurl | prepend: site.url}}/images/company_logo.png" alt="Company logo"/></p>
99
</div>
1010
</div>
1111
</footer>

_includes/head.html

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
1-
{% if jekyll.environment == "production" %}
2-
{% assign base = site.url %}
3-
{% endif %}
1+
{% assign base = site.baseurl | prepend: site.url %}
42

53
<meta charset="utf-8">
64
<meta http-equiv="X-UA-Compatible" content="IE=edge">

_includes/sidebar_menu_list_items.liquid

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,15 +5,20 @@
55
<li class="{% if item.children.size > 0 %} {% if item.expand == 'true' %} tree-parent-expand {%else%} tree-parent {% endif %} {%else%} leaf-node {% endif %} {% if pageurl.last == item.url %}active{% endif %}">
66
{% if item.children.size > 0 %} <a class="show-hide" href="#"></span> {% endif %}
77
{% if item.url %}
8-
<a class="page-link" href="{{item.url}}">{{ item.title }}</a>
8+
{% assign itemUrl = item.url %}
9+
{% assign itemUrlFirstChar = item.url | slice: 0 == '/' %}
10+
{% if itemUrlFirstChar == "/" "%}
11+
{% assign itemUrl = itemUrl | prepend: site.baseurl %}
12+
{% endif %}
13+
<a class="page-link" href="{{itemUrl}}">{{ item.title }}</a>
914
{% else %}
1015
<a class="section-name" href="#">{{ item.title }}</a>
1116
{% endif %}
12-
{% if item.children.size > 0 %}
13-
<ul class="nav-list">
14-
{% include sidebar_menu_list_items.liquid menuitems=item.children %}
15-
</ul>
16-
{% endif %}
17+
{% if item.children.size > 0 %}
18+
<ul class="nav-list">
19+
{% include sidebar_menu_list_items.liquid menuitems=item.children %}
20+
</ul>
21+
{% endif %}
1722
</li>
1823
{% endif %}{% comment %} /"if web" {% endcomment %}
1924

_includes/topnav.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,9 +40,9 @@
4040
{% if folderitem.external_url %}
4141
<li><a href="{{folderitem.external_url}}" target="_blank">{{folderitem.title}}</a></li>
4242
{% elsif page.url contains folderitem.url and folderitem.title != 'LoopBack Overview' %}
43-
<li class="dropdownActive"><a href="{{folderitem.url }}">{{folderitem.title}}</a></li>
43+
<li class="dropdownActive"><a href="{{folderitem.url | prepend: site.baseurl}}">{{folderitem.title}}</a></li>
4444
{% else %}
45-
<li><a href="{{folderitem.url }}">{{folderitem.title}}</a></li>
45+
<li><a href="{{folderitem.url | prepend: site.baseurl}}">{{folderitem.title}}</a></li>
4646
{% endif %}
4747
{% endfor %}
4848
</ul>

index.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -438,7 +438,7 @@ <h3 style="color:white">Ready to build amazing things?
438438
<div id="footer-template"></div>
439439
</footer>
440440

441-
<script src="/dist/jquery/jquery-3.4.1.min.js" crossorigin="anonymous"></script>
441+
<script src="dist/jquery/jquery-3.4.1.min.js" crossorigin="anonymous"></script>
442442
<script src="dist/popper/1.14.0/umd/popper.min.js"></script>
443443
<!-- Bootstrap core JavaScript -->
444444
<script src="dist/bootstrap/js/bootstrap.min.js"></script>

0 commit comments

Comments
 (0)