Skip to content

Commit 5b99691

Browse files
Dhruvi16Dhruvi16
committed
Resolve conflicts
2 parents 4fa8cac + d096112 commit 5b99691

File tree

11 files changed

+282
-143
lines changed

11 files changed

+282
-143
lines changed

‎content/internships/applicant-guide/contents.lr

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@ _template: page-with-toc.html
44
---
55
title: Open Source Internships: Applicant Guide
66
---
7+
description: Creative Commons participates in open source mentorship programs such as [Google Summer of Code](https://summerofcode.withgoogle.com/), [Google Season of Docs](https://developers.google.com/season-of-docs/), and [Outreachy](https://www.outreachy.org/). Details about specific programs and rounds are listed in the [Overview page](/internships); this page serves as a general guide to applicants.
8+
---
79
body:
810

9-
Creative Commons participates in open source mentorship programs such as [Google Summer of Code](https://summerofcode.withgoogle.com/), [Google Season of Docs](https://developers.google.com/season-of-docs/), and [Outreachy](https://www.outreachy.org/). Details about specific programs and rounds are listed in the [Overview page](/internships); this page serves as a general guide to applicants.
10-
1111
## Getting Started
1212

1313
If you are interested in applying to be an open source intern at CC, here's a few things that will help:

‎content/internships/contents.lr

+61-12
Original file line numberDiff line numberDiff line change
@@ -43,15 +43,64 @@ If you're interested in this program, please review the resources below and come
4343

4444
Here are our mentors for this round of internships:
4545

46-
| Name | Slack Username | About |
47-
| ----------------------------- | ----------------------- | -------------------------------------------------------------------------------- |
48-
| Alden Page | `@aldenpage` | [See CC Open Source Blog author page](/blog/authors/aldenpage/) |
49-
| Anna Tumadóttir | `@Anna` | [See CC staff bio](https://creativecommons.org/author/annacreativecommons-org/) |
50-
| Ari Madian | `@Ari` | [See CC Open Source Blog author page](/blog/authors/akmadian/) |
51-
| Brent Moran | `@Brent` | [See CC Open Source Blog author page](/blog/authors/mathemancer/) |
52-
| Dhruv Bhanushali | `@dhruvkb` | [See CC Open Source Blog author page](/blog/authors/dhruvkb/) |
53-
| Hugo Solar | `@hugo` | [See CC Open Source Blog author page](/blog/authors/hugosolar/) |
54-
| Kriti Godey | `@kriti` | [See CC Open Source Blog author page](/blog/authors/kgodey/) |
55-
| María Belén Guaranda Cabezas | `@Maria Belen Guaranda` | [See CC Open Source Blog author page](/blog/authors/soccerdroid/) |
56-
| Sarah Hinchcliff Pearson | `@shinchpearson` | [See CC staff bio](https://creativecommons.org/author/sarahcreativecommons-org/) |
57-
| Timid Robot Zehta | `@Timid Robot` | [See CC Open Source Blog author page](/blog/authors/TimidRobot/) |
46+
<div class="table-container padding-vertical-normal">
47+
<table class="table is-bordered is-striped">
48+
<thead>
49+
<tr>
50+
<th>Name</th>
51+
<th>Slack Username</th>
52+
<th>About</th>
53+
</tr>
54+
</thead>
55+
<tr>
56+
<td>Alden Page</td>
57+
<td><code>@aldenpage</code></td>
58+
<td><a href="/blog/authors/aldenpage/">See CC Open Source Blog author page</a></td>
59+
</tr>
60+
<tr>
61+
<td>Anna Tumadóttir</td>
62+
<td><code>@Anna</code></td>
63+
<td><a href="https://creativecommons.org/author/annacreativecommons-org/">See CC staff bio</a></td>
64+
</tr>
65+
<tr>
66+
<td>Ari Madian</td>
67+
<td><code>@Ari</code></td>
68+
<td><a href="/blog/authors/akmadian/">See CC Open Source Blog author page</a></td>
69+
</tr>
70+
<tr>
71+
<td>Brent Moran </td>
72+
<td><code>@Brent</code></td>
73+
<td><a href="/blog/authors/mathemancer/">See CC Open Source Blog author page</a></td>
74+
</tr>
75+
<tr>
76+
<td>Dhruv Bhanushali</td>
77+
<td><code>@dhruvkb</code></td>
78+
<td><a href="/blog/authors/dhruvkb/">See CC Open Source Blog author page</a></td>
79+
</tr>
80+
<tr>
81+
<td>Hugo Solar</td>
82+
<td><code>@hugo</code></td>
83+
<td><a href="/blog/authors/hugosolar/">See CC Open Source Blog author page</a></td>
84+
</tr>
85+
<tr>
86+
<td>Kriti Godey</td>
87+
<td><code>@kriti</code></td>
88+
<td><a href="/blog/authors/kgodey/">See CC Open Source Blog author page</a></td>
89+
</tr>
90+
<tr>
91+
<td>María Belén Guaranda Cabezas</td>
92+
<td><code>@Maria Belen Guaranda</code></td>
93+
<td><a href="/blog/authors/soccerdroid/">See CC Open Source Blog author page</a></td>
94+
</tr>
95+
<tr>
96+
<td>Sarah Hinchcliff Pearson</td>
97+
<td><code>@shinchpearsone</code></td>
98+
<td><a href="https://creativecommons.org/author/sarahcreativecommons-org/">See CC staff bio</a></td>
99+
</tr>
100+
<tr>
101+
<td>Timid Robot Zehta</td>
102+
<td><code>@Timid Robot</code></td>
103+
<td><a href="/blog/authors/TimidRobot/">See CC Open Source Blog author page</a></td>
104+
</tr>
105+
</table>
106+
</div>

‎content/internships/intern-guide/contents.lr

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@ _template: page-with-toc.html
44
---
55
title: Open Source Internships: Intern Guide
66
---
7+
description: Creative Commons participates in open source mentorship programs such as [Google Summer of Code](https://summerofcode.withgoogle.com/) and [Outreachy](https://www.outreachy.org/). Details about specific programs and rounds are listed in the [Overview page](/internships); this page serves as a general guide for accepted interns.
8+
---
79
body:
810

9-
Creative Commons participates in open source mentorship programs such as [Google Summer of Code](https://summerofcode.withgoogle.com/) and [Outreachy](https://www.outreachy.org/). Details about specific programs and rounds are listed in the [Overview page](/internships); this page serves as a general guide for accepted interns.
10-
1111
If you are an applicant, read our [Applicant Guide](/internships/applicant-guide).
1212

1313
## Post-Announcement

‎content/internships/mentor-guide/contents.lr

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@ _template: page-with-toc.html
44
---
55
title: Open Source Internships: Mentor Guide
66
---
7+
description: CC participates in open source mentorship programs such as [Google Summer of Code](https://summerofcode.withgoogle.com/) and [Outreachy](https://www.outreachy.org/). Both CC staff and community members are welcome to mentor projects. Details about specific programs and rounds are listed in the [Overview page](/internships); this page serves as a general mentorship guide.
8+
---
79
body:
810

9-
CC participates in open source mentorship programs such as [Google Summer of Code](https://summerofcode.withgoogle.com/) and [Outreachy](https://www.outreachy.org/). Both CC staff and community members are welcome to mentor projects. Details about specific programs and rounds are listed in the [Overview page](/internships); this page serves as a general mentorship guide.
10-
1111
## Considering Mentorship?
1212

1313
Mentorship is a serious commitment but a very rewarding experience. If you're trying to decide whether to be a mentor, please read the following documents:

‎themes/vocabulary_theme/templates/community_team_list.html

+48-40
Original file line numberDiff line numberDiff line change
@@ -1,44 +1,52 @@
11
{% extends "layout.html" %}
2-
{% block title %}{{ this.title }}{% endblock %}
2+
33
{% block body %}
4-
<p>This is a list of all CC Community Team members, and their roles and privileges.</p>
5-
<p>For more information about CC Community Team, please see <a href="/community/community-team/">the Community Team Page</a>.</p>
6-
<h2>Project Teams</h2>
7-
{% for project in bag('community_team_members.projects') %}
8-
<h3>{{ project.name }}</h3>
9-
<p>These team members have permissions in the <code>{{ project.repos }}</code> repo(s).</p>
10-
<table class="table table-striped" style="width: 75%;">
11-
<thead class="thead-dark">
12-
<tr>
13-
<th scope="col">Role</th>
14-
<th scope="col">Member Name</th>
15-
</tr>
16-
</thead>
17-
<tbody>
18-
{% for member in project.members %}
19-
<tr>
20-
<td scope="row">{{ member.role }}</td>
21-
<td scope="row">{{ member.name }}</td>
22-
</tr>
23-
{% endfor %}
24-
</tbody>
25-
</table>
26-
{% endfor %}
27-
<h2>Community Building Teams</h2>
28-
<table class="table table-striped" style="width: 75%;">
29-
<thead class="thead-dark">
30-
<tr>
31-
<th scope="col">Role</th>
32-
<th scope="col">Member Name</th>
33-
</tr>
34-
</thead>
35-
<tbody>
36-
{% for member in bag('community_team_members.community_builders') %}
37-
<tr>
38-
<td scope="row">{{ member.role }}</td>
39-
<td scope="row">{{ member.name }}</td>
40-
</tr>
4+
<div class="community-team-members">
5+
<div class="title">
6+
<div class="container">
7+
<h1>{{ this.title }}</h1>
8+
<p class="description column is-9">This is a list of all CC Community Team members, and their roles and privileges. For more information about CC Community Team, please see <a href="/community/community-team/">the Community Team Page</a>.</p>
9+
</div>
10+
</div>
11+
<div class="body container">
12+
<h2 class="padding-top-bigger">Project Teams</h2>
13+
{% for project in bag('community_team_members.projects') %}
14+
<h3 class="b-header padding-vertical-normal">{{ project.name }}</h3>
15+
<p class="padding-bottom-normal">These team members have permissions in the <code>{{ project.repos }}</code> repo(s).</p>
16+
<div class="table-container">
17+
<table class="table is-bordered is-striped">
18+
<thead>
19+
<tr>
20+
<th>Role</th>
21+
<th>Member Name</th>
22+
</tr>
23+
</thead>
24+
{% for member in project.members %}
25+
<tr>
26+
<td>{{ member.role }}</td>
27+
<td>{{ member.name }}</td>
28+
</tr>
29+
{% endfor %}
30+
</table>
31+
</div>
4132
{% endfor %}
42-
</tbody>
43-
</table>
33+
<h2 class="padding-vertical-bigger">Community Building Teams</h2>
34+
<div class="table-container">
35+
<table class="table is-bordered is-striped">
36+
<thead>
37+
<tr>
38+
<th>Role</th>
39+
<th>Member Name</th>
40+
</tr>
41+
</thead>
42+
{% for member in bag('community_team_members.community_builders') %}
43+
<tr>
44+
<td>{{ member.role }}</td>
45+
<td>{{ member.name }}</td>
46+
</tr>
47+
{% endfor %}
48+
</table>
49+
</div>
50+
</div>
51+
</div>
4452
{% endblock %}

‎themes/vocabulary_theme/templates/macros/pagination.html

+10-10
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
{% macro render_pagination(pagination) %}
22
<nav class="pagination" role="navigation" aria-label="pagination">
33
<ul class="pagination-list">
4-
<!-- {% if pagination.has_prev %}
5-
<li class="page-item"><a class="page-link" href="{{ pagination.prev|url }}">Previous</a></li>
6-
{% else %}
7-
<li class="page-item disabled"><a class="page-link">Previous</a></li>
8-
{% endif %} -->
4+
{% if pagination.has_prev %}
5+
<li class="inactive">
6+
<a class="pagination-link inactive-link" href="{{ pagination.prev|url }}" aria-label="Goto previous"><i class="icon chevron-left"></i></a>
7+
</li>
8+
{% endif %}
99
{% for p in range(pagination.pages) %}
1010
{% if pagination.current|url == pagination.for_page(p+1)|url %}
1111
<li class="common">
@@ -17,11 +17,11 @@
1717
</li>
1818
{% endif %}
1919
{% endfor %}
20-
<!-- {% if pagination.has_next %}
21-
<li class="page-item"><a class="page-link" href="{{ pagination.next|url }}">Next</a></li>
22-
{% else %}
23-
<li class="page-item disabled"><a class="page-link">Next</a></li>
24-
{% endif %} -->
20+
{% if pagination.has_next %}
21+
<li class="inactive">
22+
<a class="pagination-link inactive-link" href="{{ pagination.next|url }}" aria-label="Goto next"><i class="icon chevron-right"></i></a>
23+
</li>
24+
{% endif %}
2525
</ul>
2626
</nav>
2727
{% endmacro %}

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

+21
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,27 @@ <h1>{{ this.title }}</h1>
6262
</li>
6363
</ul>
6464
</aside>
65+
{% elif this.is_child_of('/internships') %}
66+
<aside class="menu sidebar-menu">
67+
<ul class="menu-list">
68+
<li>
69+
<a class="{% if this._path == '/internships' %} is-active {% endif%} link" href="{{ '/internships'|url }}">Overview</a>
70+
<ul>
71+
<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>
72+
<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>
73+
<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>
74+
</ul>
75+
</li>
76+
<hr class="divider">
77+
<li>
78+
<a class="{% if this._path == '/internships/project-ideas' %} is-active {% endif%} link" href="{{ '/internships/project-ideas'|url }}">Project Ideas</a>
79+
</li>
80+
<hr class="divider">
81+
<li>
82+
<a class="{% if this._path == '/internships/history' %} is-active {% endif%} link" href="{{ '/internships/history'|url }}">History</a>
83+
</li>
84+
</ul>
85+
</aside>
6586
{% endif %}
6687
</div>
6788
<div class="row">

0 commit comments

Comments
 (0)