Skip to content

Commit b1f709c

Browse files
committed
fix: Localize session and segment paths. Remove Part
1 parent cff4389 commit b1f709c

File tree

11 files changed

+22
-17
lines changed

11 files changed

+22
-17
lines changed

_data/course.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
session_tag: 'Session'
2+
session_path: 'session'
23

34
segments:
45
- week-01

_includes/course.html

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
11
{%- assign course = site.data.course -%}
2+
{%- assign sespath = course.session_path | default: "session" -%}
3+
{%- assign segpath = course.segment_path | default: "segment" -%}
24

35
<ul class="grid">
46
{%- for segment in course.segments -%}
@@ -12,7 +14,7 @@
1214
<div class="tab">{{ info.segment[1] }}</div>
1315
{%- endif -%}
1416
<div class="header">
15-
<a href="/segment/{{ segment }}">
17+
<a href="/{{ segpath }}/{{ segment }}">
1618
{%- include date_range.html info=info -%}
1719
</a>
1820
</div>
@@ -37,7 +39,7 @@ <h4>{{ info.desc }}</h4>
3739
<div class="middle-align">
3840
<span class="card-color {{ symbols }}">{{ session.icon }}</span>
3941
{%- if session.url -%}
40-
<a href="/session/{{ session.url }}" title="{{ session.title }}">
42+
<a href="/{{ sespath }}/{{ session.url }}" title="{{ session.title }}">
4143
<h3 class="card-color">{{ header }}</h3>
4244
</a>
4345
{%- else -%}
@@ -55,7 +57,7 @@ <h3 class="card-color">{{ header }}</h3>
5557
{%- endif -%}
5658

5759
{%- if header == nul && session.url %}
58-
<a class="card-color" href="/session/{{ session.url }}" title="{{ session.title }}">
60+
<a class="card-color" href="/{{ sespath }}/{{ session.url }}" title="{{ session.title }}">
5961
{{ session.title }}
6062
</a>
6163
{%- else %}
@@ -69,7 +71,7 @@ <h3 class="card-color">{{ header }}</h3>
6971
{%- endfor -%}
7072
</div>
7173
<div class="control">
72-
<a class="button" href="/segment/{{ segment }}">
74+
<a class="button" href="/{{ segpath }}/{{ segment }}">
7375
{{ info.title }}&nbsp;
7476
{%- if info['rocket-icon'] != 'none' %}
7577
<span data-date="{{ info.end }}"

_includes/logo_static.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
title="{{ site.title }}" />
1010
</a>
1111
</div>
12-
<a class="logo-name" href="/segment/{{ session_data.segment }}">{{ site.acc.short_name }}</a>
12+
<a class="logo-name" href="/{{ include.segpath }}/{{ session_data.segment }}">{{ site.acc.short_name }}</a>
1313
</div>
1414

1515
<script defer>

_includes/segment/header.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{% assign info = include.info %}
22
<section class="center-align">
33
<h1 class="special">{{ info.title }}</h1>
4-
{%- include date_range.html info=include.info -%}
4+
{%- include date_range.html info=info -%}
55
</section>

_includes/segment/index.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929

3030
<div class="body">
3131
{%- if session.url -%}
32-
<h3><a class="card-color" href="/session/{{ session.url }}">{{ session.title }}</a></h3>
32+
<h3><a class="card-color" href="/{{ site.data.course.session_path | default: "session" }}/{{ session.url }}">{{ session.title }}</a></h3>
3333
{%- else -%}
3434
<h3 class="card-color">{{ session.title }}</h3>
3535
{%- endif -%}

_includes/segment/nav.html

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,27 +10,28 @@
1010
{% assign n = segnum | plus: 1 %}
1111
{% if p != -1 %}{% assign prev = segs[p] %}{% endif %}
1212
{% assign next = segs[n] %}
13+
{%- assign segpath = course.segment_path | default: "segment" -%}
1314

1415
<section class="center-align">
1516
<div class="middle-align">
1617
{% if prev %}
1718
{% if include.icon %}
1819
{{ site.data.syllabus[prev].title }}
1920
{% endif %}
20-
<a href="/segment/{{ prev }}" class="{{ symbols }} md-48">navigate_before</a>
21+
<a href="/{{ segpath }}/{{ prev }}" class="{{ symbols }} md-48">navigate_before</a>
2122
{% else %}
2223
&nbsp;
2324
<span class="{{ symbols }} md-48 md-disabled">navigate_before</span>
2425
{% endif %}
2526

2627
{% if include.icon %}
27-
<a href="/segment/{{ include.segment }}" class="{{ symbols }}">calendar_today</a>
28+
<a href="/{{ segpath }}/{{ include.segment }}" class="{{ symbols }}">calendar_today</a>
2829
{% else %}
29-
<a href="/segment/{{ include.segment }}"><h3>{{ site.data.syllabus[include.segment].title }}</h3></a>
30+
<a href="/{{ segpath }}/{{ include.segment }}"><h3>{{ site.data.syllabus[include.segment].title }}</h3></a>
3031
{% endif %}
3132

3233
{% if next %}
33-
<a href="/segment/{{ next }}" class="{{ symbols }} md-48">navigate_next</a>
34+
<a href="/{{ segpath }}/{{ next }}" class="{{ symbols }} md-48">navigate_next</a>
3435
{% if include.icon %}
3536
{{ site.data.syllabus[next].title }}
3637
{% endif %}

_includes/session/header.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<h1 class="special">{{ session_data.title }}</h1>
77

88
{%- if session_data.part -%}
9-
<div>Part {{ session_data.part }}</div>
9+
<div>{{ session_data.part }}</div>
1010
{%- endif -%}
1111

1212
{%- include segment/nav.html segment=session_data.segment -%}
@@ -29,7 +29,7 @@ <h1 class="special">{{ session_data.title }}</h1>
2929
{{ _info.sequence | default: _info.icon }}
3030
</span>
3131
{%- elsif _info.url -%}
32-
<a class="lesson-number {{_mso}}" href="/session/{{ _info.url }}">
32+
<a class="lesson-number {{_mso}}" href="/{{ site.data.course.session_path | default: "session" }}/{{ _info.url }}">
3333
{{ _info.sequence | default: _info.icon }}
3434
</a>
3535
{%- else -%}

_includes/session/item.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
{% assign item = include.item %}
22
{{ item.header }}: {{ item.title }}
3-
{% if item.part %}Part: {{ item.part }}{% endif %}
3+
{% if item.part %}{{ item.part }}{% endif %}

_includes/session/next_prev.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
<span>{{ indicator }}</span>
1717
<span class="{{ symbols }}">navigate_{{ arrow }}</span>
1818
</div>
19-
<a href="/session/{{ _p.url }}">
19+
<a href="/{{ site.data.course.session_path | default: "session" }}/{{ _p.url }}">
2020
{%- if _p.header -%}
2121
{{ _p.header }} &bull;&nbsp;
2222
{%- endif -%}

_layouts/session.html

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
{%- assign session_id = page.id | split: '/' | last -%}
22
{%- assign session_data = site.data.sessions[session_id] -%}
33
{%- assign segment_data = site.data.syllabus[session_data.segment] -%}
4+
{%- assign segpath = site.data.course.segment_path -%}
45
{%- if session_data.width != 'max' -%}
56
{%- assign constraint = 'max-width' -%}
67
{%- endif -%}
@@ -12,7 +13,7 @@
1213
<html lang="en">
1314
{% include header.html %}
1415
<body>
15-
{%- include logo_static.html %}
16+
{%- include logo_static.html segpath=segpath %}
1617
{%- include session/header.html %}
1718

1819
<section class="center-align spacer content">

0 commit comments

Comments
 (0)