Skip to content

Commit 2fc1423

Browse files
committed
Improved information organization of current pages.
1 parent 3354f95 commit 2fc1423

File tree

9 files changed

+19
-22
lines changed

9 files changed

+19
-22
lines changed

content/contents.lr

+1-1
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ So if you're looking to integrate CC licenses or CC licensed works into your app
4242
<div class="card-body" align="center">
4343
<p class="card-text text-center">Use CC-licensed works in your application or (coming soon!) use our WordPress plugin to license your content.</p>
4444
<a href="https://api.creativecommons.engineering/" class="btn btn-sm btn-outline-primary">Catalog API</a>
45-
<a href="/projects" class="btn btn-sm btn-outline-primary">All our projects</a>
45+
<a href="/contributing-code/projects" class="btn btn-sm btn-outline-primary">All our projects</a>
4646
</div>
4747
</div>
4848

content/contributing-code/contents.lr

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ _model: page
22
---
33
_template: page-with-toc.html
44
---
5-
title: Contributing Code
5+
title: Contribution Guidelines
66
---
77
body:
88

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
_model: page
2+
---
3+
_template: project_list.html
4+
---
5+
title: Open Source Projects

content/programs/outreachy/2019-12-start/contents.lr

+2
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@ title: Information for Potential Outreachy Applicants
66
---
77
body:
88

9+
<p class="lead text-danger"><strong>Applications for Outreachy's Dec 2019 round are now closed. The information below is preserved for historical purposes.</strong></p>
10+
911
Creative Commons is participating in Outreachy's round of internships running from **Dec 2019 to Mar 2020**. Please see **[the official Outreachy Creative Commons internship page](https://www.outreachy.org/december-2019-to-march-2020-internship-round/communities/creative-commons/)** for project-specific information. Some general information and tips are below.
1012

1113
## Getting Started

content/projects/contents.lr

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
_model: page
1+
_model: redirect
22
---
3-
_template: project_list.html
3+
target: /contributing-code/projects/
44
---
5-
title: Open Source Projects
5+
_discoverable: no

templates/layout.html

+7-16
Original file line numberDiff line numberDiff line change
@@ -31,29 +31,22 @@
3131

3232
<div class="collapse navbar-collapse" id="navbarSupportedContent">
3333
<ul class="navbar-nav">
34-
<li class="nav-item{% if this._path == '/' %} active{% endif%}">
35-
<a class="nav-link" href="{{ '/'|url }}">Home</a>
34+
<li class="nav-item{% if this.is_child_of('/blog') %} active{% endif%}">
35+
<a class="nav-link" href="{{ '/blog'|url }}">Blog</a>
3636
</li>
3737
<li class="nav-item dropdown {% if this.is_child_of('/contributing-code') %} active{% endif%}">
38-
<a class="nav-link" href="#" id="navbarContributingCodeDropdown" role="button">Contributing Code</a>
38+
<a class="nav-link" href="#" id="navbarContributingCodeDropdown" role="button">Contribute</a>
3939
<div class="dropdown-menu" aria-labelledby="navbarContributingCodeDropdown">
4040
{% for href, title in [
41-
['/contributing-code', 'Overview'],
41+
['/contributing-code', 'Contribution Guidelines'],
42+
['/contributing-code/projects', 'Project List'],
4243
['/contributing-code/pr-guidelines', 'Pull Request Guidelines'],
4344
['/contributing-code/github-repo-guidelines', 'GitHub Repo Guidelines'],
4445
] %}
4546
<a class="dropdown-item" href="{{ href|url }}">{{ title }}</a>
4647
{% endfor %}
4748
</div>
4849
</li>
49-
{% for href, title in [
50-
['/projects', 'Projects'],
51-
['/blog', 'Blog']
52-
] %}
53-
<li class="nav-item{% if this.is_child_of(href) %} active{% endif%}">
54-
<a class="nav-link" href="{{ href|url }}">{{ title }}</a>
55-
</li>
56-
{% endfor %}
5750
<li class="nav-item dropdown {% if this.is_child_of('/community') %} active{% endif%}">
5851
<a class="nav-link" href="#" id="navbarCommunityDropdown" role="button">Community</a>
5952
<div class="dropdown-menu" aria-labelledby="navbarCommunityDropdown">
@@ -67,13 +60,11 @@
6760
{% endfor %}
6861
</div>
6962
</li>
70-
<li class="nav-item{% if this.is_child_of('/programs/outreachy/') %} active{% endif%}">
71-
<a class="nav-link" href="{{ '/programs/outreachy/2019-12-start'|url }}">Outreachy</a>
72-
</li>
7363
<li class="nav-item dropdown {% if this.is_child_of('/archives') %} active{% endif%}">
7464
<a class="nav-link" href="#" id="navbarArchivesDropdown" role="button">Archives</a>
7565
<div class="dropdown-menu" aria-labelledby="navbarArchivesDropdown">
7666
{% for href, title in [
67+
['/programs/outreachy/2019-12-start', 'Outreachy (Dec 2019)'],
7768
['/gsoc-2019', 'GSoC 2019'],
7869
['/archives/old-tech-blog', 'CC Tech Blog (2007-2014)'],
7970
['https://lists.ibiblio.org/pipermail/cc-devel/', 'cc-devel mailing list (2005-2015)'],
@@ -83,7 +74,7 @@
8374
</div>
8475
</li>
8576
<li class="nav-item">
86-
<a class="nav-link" href="https://creativecommons.org" target="_blank">CC</a>
77+
<a class="nav-link" href="https://creativecommons.org" target="_blank">CC.org</a>
8778
</li>
8879
</ul>
8980
</nav>

webpack/sass/main.scss

-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@ $project-card-theme: $blue;
1818
body {
1919
font-family: 'Source Sans Pro', sans-serif;
2020
color: $text-color;
21-
text-align:justify;
2221
}
2322

2423
h2 {

0 commit comments

Comments
 (0)