Skip to content

Commit 0cdeb00

Browse files
committed
conflict
1 parent 4a39634 commit 0cdeb00

File tree

1 file changed

+42
-29
lines changed

1 file changed

+42
-29
lines changed

themes/vocabulary_theme/templates/page-with-toc.html

+42-29
Original file line numberDiff line numberDiff line change
@@ -19,22 +19,27 @@ <h1>{{ this.title }}</h1>
1919
{% if this.is_child_of('/contributing-code') %}
2020
<aside class="menu sidebar-menu">
2121
<ul class="menu-list">
22-
<li>
23-
<a class="{% if this.path == '/contributing-code/projects' %} is-active {% endif%} link" href="{{ '/contributing-code/projects'|url }}">Project List</a>
24-
</li>
25-
<hr class="divider">
26-
<li>
27-
<a class="{% if this.path == '/contributing-code/issue-finder' %} is-active {% endif%} link" href="{{ '/contributing-code/issue-finder'|url }}">Issue Finder</a>
28-
</li>
29-
<hr class="divider">
22+
{% for href, title in [
23+
['/contributing-code/projects', 'Project List'],
24+
['/contributing-code/issue-finder', 'Issue Finder'],
25+
] %}
26+
<li>
27+
<a class="{% if this.path == {{ href }} %} is-active {% endif%} link" href="{{ href|url }}">{{ title }}</a>
28+
</li>
29+
<hr class="divider">
30+
{% endfor %}
3031
<li>
3132
<a class="{% if this.path == '/contributing-code' %} is-active {% endif%} link" href="{{ '/contributing-code'|url }}">Contribution Guidelines</a>
3233
<ul>
33-
<li><a class="{% if this.path == '/contributing-code/pr-guidelines' %} is-active {% endif%} link" href="{{ '/contributing-code/pr-guidelines'|url }}"><i class="icon circle-filled"></i>Pull Request Guidelines</a></li>
34-
<li><a class="{% if this.path == '/contributing-code/github-repo-guidelines' %} is-active {% endif%} link" href="{{ '/contributing-code/github-repo-guidelines'|url }}"><i class="icon circle-filled"></i>Github Repo Guidelines</a></li>
35-
<li><a class="{% if this.path == '/contributing-code/repo-labels' %} is-active {% endif%} link" href="{{ '/contributing-code/repo-labels'|url }}"><i class="icon circle-filled"></i>Repository Labels</a></li>
36-
<li><a class="{% if this.path == '/contributing-code/python-guidelines' %} is-active {% endif%} link" href="{{ '/contributing-code/python-guidelines'|url }}"><i class="icon circle-filled"></i>Python Guidelines</a></li>
37-
<li><a class="{% if this.path == '/contributing-code/translation-guide' %} is-active {% endif%} link" href="{{ '/contributing-code/translation-guide'|url }}"><i class="icon circle-filled"></i>Translation Guide</a></li>
34+
{% for href, title in [
35+
['/contributing-code/pr-guidelines', 'Pull Request Guidelines'],
36+
['/contributing-code/github-repo-guidelines', 'GitHub Repo Guidelines'],
37+
['/contributing-code/repo-labels', 'Repository Labels'],
38+
['/contributing-code/python-guidelines', 'Python Guidelines'],
39+
['/contributing-code/translation-guide', 'Translation Guide'],
40+
] %}
41+
<li><a class="{% if this.path == {{ href }} %} is-active {% endif%} link" href="{{ href|url }}"><i class="icon circle-filled"></i>{{ title }}</a></li>
42+
{% endfor %}
3843
</ul>
3944
</li>
4045
<hr class="divider">
@@ -53,10 +58,14 @@ <h1>{{ this.title }}</h1>
5358
<li>
5459
<a class="{% if this._path == '/community/community-team' %} is-active {% endif%} link" href="{{ '/community/community-team'|url }}">Community Team</a>
5560
<ul>
56-
<li><a class="{% if this._path == '/community/community-team/members' %} is-active {% endif%} link" href="{{ '/community/community-team/members'|url }}"><i class="icon circle-filled"></i>Community Team Members</a></li>
57-
<li><a class="{% if this._path == '/community/community-team/project-roles' %} is-active {% endif%} link" href="{{ '/community/community-team/project-roles'|url }}"><i class="icon circle-filled"></i>Project Roles</a></li>
58-
<li><a class="{% if this._path == '/community/community-team/community-building-roles' %} is-active {% endif%} link" href="{{ '/community/community-team/community-building-roles'|url }}"><i class="icon circle-filled"></i>Community Building Roles</a></li>
59-
<li><a class="{% if this._path == '/community/community-team/engagement-channels' %} is-active {% endif%} link" href="{{ '/community/community-team/engagement-channels'|url }}"><i class="icon circle-filled"></i>Engagement Channels</a></li>
61+
{% for href, title in [
62+
['/community/community-team/members', 'Community Team Members'],
63+
['/community/community-team/project-roles', 'Project Roles'],
64+
['/community/community-team/community-building-roles', 'Community Building Roles'],
65+
['/community/community-team/engagement-channels', 'Engagement Channels'],
66+
] %}
67+
<li><a class="{% if this.path == {{ href }} %} is-active {% endif%} link" href="{{ href|url }}"><i class="icon circle-filled"></i>{{ title }}</a></li>
68+
{% endfor %}
6069
</ul>
6170
</li>
6271
<hr class="divider">
@@ -78,19 +87,23 @@ <h1>{{ this.title }}</h1>
7887
<li>
7988
<a class="{% if this._path == '/internships' %} is-active {% endif%} link" href="{{ '/internships'|url }}">Overview</a>
8089
<ul>
81-
<li><a class="{% if this._path == '/internships/applicant-guide' %} is-active {% endif%} link" href="{{ '/internships/applicant-guide'|url }}"><i class="icon circle-filled"></i>Applicant Guide</a></li>
82-
<li><a class="{% if this._path == '/internships/intern-guide' %} is-active {% endif%} link" href="{{ '/internships/intern-guide'|url }}"><i class="icon circle-filled"></i>Intern Guide</a></li>
83-
<li><a class="{% if this._path == '/internships/mentor-guide' %} is-active {% endif%} link" href="{{ '/internships/mentor-guide'|url }}"><i class="icon circle-filled"></i>Mentor Guide</a></li>
90+
{% for href, title in [
91+
['/internships/applicant-guide', 'Applicant Guide'],
92+
['/internships/intern-guide', 'Intern Guide'],
93+
['/internships/mentor-guide', 'Mentor Guide'],
94+
] %}
95+
<li><a class="{% if this.path == {{ href }} %} is-active {% endif%} link" href="{{ href|url }}"><i class="icon circle-filled"></i>{{ title }}</a></li>
96+
{% endfor %}
8497
</ul>
85-
</li>
86-
<hr class="divider">
87-
<li>
88-
<a class="{% if this._path == '/internships/project-ideas' %} is-active {% endif%} link" href="{{ '/internships/project-ideas'|url }}">Project Ideas</a>
89-
</li>
90-
<hr class="divider">
91-
<li>
92-
<a class="{% if this._path == '/internships/history' %} is-active {% endif%} link" href="{{ '/internships/history'|url }}">History</a>
93-
</li>
98+
{% for href, title in [
99+
['/internships/project-ideas', 'Project Ideas'],
100+
['/internships/history', 'History'],
101+
] %}
102+
<hr class="divider">
103+
<li>
104+
<a class="{% if this.path == {{ href }} %} is-active {% endif%} link" href="{{ href|url }}">{{ title }}</a>
105+
</li>
106+
{% endfor %}
94107
</ul>
95108
</aside>
96109
{% endif %}

0 commit comments

Comments
 (0)