Skip to content

Commit e2b87a8

Browse files
code-n-chillcode-n-chill
committed
resolving conflict
1 parent 85b478d commit e2b87a8

File tree

16 files changed

+244
-331
lines changed

16 files changed

+244
-331
lines changed

‎.github/CODEOWNERS

+8
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
# These owners will be the default owners for everything in
2+
# the repo. Unless a later match takes precedence, they will
3+
# be requested for review when someone opens a pull request.
4+
* @creativecommons/internal-tech
5+
6+
# These users own any files in the specified directory and
7+
# any of its subdirectories.
8+
/webpack/ @creativecommons/frontend-engineers

‎.github/issue_template.md

-21
This file was deleted.

‎.github/pull_request_template.md

-52
This file was deleted.

‎CODE_OF_CONDUCT.md

+1-3
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
# Contributor Code of Conduct
22

3-
The Creative Commons team is committed to fostering a welcoming community.
4-
5-
**Our Code of Conduct can be found here**: [https://creativecommons.github.io/community/code-of-conduct/](https://creativecommons.github.io/community/code-of-conduct/)
3+
The Creative Commons team is committed to fostering a welcoming community. This project and all other Creative Commons open source projects are governed by our [Code of Conduct](https://creativecommons.github.io/community/code-of-conduct/). Please report unacceptable behavior to [conduct@creativecommons.org](mailto:conduct@creativecommons.org) per our [reporting guidelines](https://creativecommons.github.io/community/code-of-conduct/enforcement/).
64

75
For a history of updates, see the [page history here](https://github.com/creativecommons/creativecommons.github.io-source/commits/master/content/community/code-of-conduct/contents.lr).

‎CONTRIBUTING.md

+26
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
# Contributing to CC Open Source
2+
3+
Thank you for your interest in contributing to CC Open Source! This document is a set of guidelines to help you contribute to this project.
4+
5+
## Code of Conduct
6+
7+
By participating in this project, you are expected to uphold our [Code of Conduct](https://creativecommons.github.io/community/code-of-conduct/).
8+
9+
## Project Documentation
10+
11+
The `README` contains details about how to install and build this project and a high-level overview of the code.
12+
13+
## How to Contribute
14+
15+
Please follow the processes in our general [Contributing Code](https://creativecommons.github.io/contributing-code/) guidelines on the Creative Common Open Source website.
16+
17+
You do not have to follow the steps under "Check for contribution readiness", this project is accepting contributions.
18+
19+
## Style Guide
20+
21+
- Make sure that there are newlines at the end of every file.
22+
- We use 2 spaces as the standard indentation in our HTML files.
23+
24+
## Questions or Thoughts?
25+
26+
Talk to us on [our developer mailing list or Slack community](https://creativecommons.github.io/community/).

‎assets/static/gen/style.css

+119
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,119 @@
1+
body {
2+
font-family: 'Source Sans Pro', sans-serif;
3+
color: #333333; }
4+
5+
h2 {
6+
font-weight: 600;
7+
padding-bottom: 0.5rem; }
8+
9+
.page-content {
10+
position: relative;
11+
min-height: calc(100vh - 21vh);
12+
padding-bottom: 3rem; }
13+
14+
.main-header {
15+
background-color: #EE5B32; }
16+
.main-header .navbar-brand {
17+
margin-right: 2rem; }
18+
.main-header .navbar-brand img {
19+
width: 250px; }
20+
.main-header .navbar-brand .legend {
21+
display: block;
22+
font-size: .9rem;
23+
letter-spacing: .15rem; }
24+
25+
.footer {
26+
bottom: 0; }
27+
28+
.card-columns {
29+
-webkit-column-count: 2;
30+
column-count: 2; }
31+
32+
.navbar {
33+
background-image: linear-gradient(90deg, #EE5B32, #FB7928, #EE5B32);
34+
background-size: 100% 130px;
35+
background-position-y: bottom; }
36+
37+
.page-title {
38+
background-color: #fff;
39+
border-bottom-style: solid;
40+
border-color: #EE5B32;
41+
border-width: 10px;
42+
padding-left: 0px;
43+
font-weight: 600;
44+
color: #333333; }
45+
46+
.featured-project-card {
47+
background-color: #fff;
48+
border-left-color: #00b5da !important;
49+
border-left-width: 10px;
50+
padding-left: 0px;
51+
min-width: 20rem;
52+
max-width: 20rem; }
53+
54+
.project-idea-header {
55+
background-color: #fff;
56+
border-left-color: #00b5da !important;
57+
border-left-width: 10px;
58+
padding-left: 0px;
59+
font-size: 1.5em; }
60+
61+
.badge-featured-project {
62+
background-color: #00b5da;
63+
color: #fff;
64+
font-size: 0.8rem; }
65+
66+
#back-to-top {
67+
cursor: pointer;
68+
position: fixed;
69+
bottom: 20px;
70+
right: 20px;
71+
display: none;
72+
background-color: #00b5da;
73+
border: none; }
74+
75+
.dropdown-item {
76+
font-size: 1.2em;
77+
text-align: center; }
78+
79+
.dropdown:hover:hover .dropdown-menu {
80+
display: block; }
81+
82+
.dropdown-menu {
83+
margin-top: 0px; }
84+
85+
.navbar-dark .navbar-nav .nav-item.active .nav-link {
86+
background: #e15803 !important; }
87+
88+
.navbar-dark .navbar-nav .nav-item {
89+
font-size: 1.2em;
90+
text-align: center; }
91+
.navbar-dark .navbar-nav .nav-item:hover {
92+
background: #e15803 !important; }
93+
.navbar-dark .navbar-nav .nav-item .nav-link {
94+
color: #fff;
95+
line-height: 1rem;
96+
border-left: 1px solid rgba(255, 255, 255, 0.6); }
97+
98+
.navbar-dark .navbar-toggler {
99+
border-color: #fff; }
100+
101+
@media only screen and (max-width: 1200px) {
102+
.navbar-dark .navbar-nav .nav-item .nav-link {
103+
border: None;
104+
text-align: center; } }
105+
106+
.toc-card {
107+
width: 18rem;
108+
margin-bottom: 1rem;
109+
float: right;
110+
margin: 1rem; }
111+
112+
.toc {
113+
margin-bottom: 0; }
114+
115+
.main-footer .footer small {
116+
display: flex;
117+
align-items: center; }
118+
.main-footer .footer small .text-muted {
119+
margin-left: 2rem; }

‎content/community/contents.lr

+7-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
_model: page
22
---
3+
_template: page-with-toc.html
4+
---
35
title: Join the CC Developer Community
46
---
57
body:
@@ -15,7 +17,7 @@ For information regarding joining a channel on Slack, [look here](https://get.sl
1517

1618
Note that channels like `#general` on Slack consist of a fair amount of users. While it is a channel for general-purpose discussions, please take into consideration that a post on such a channel will notify thousands of users. 😄
1719

18-
If you're looking to talk to someone on CC's tech team, we are all in the Americas and someone is usually around on Slack between 11:00 and 23:00 UTC on weekdays.
20+
If you're looking to talk to someone on CC's tech team, we are all in the Americas and someone is usually around on Slack between 11:00 and 23:00 UTC on weekdays. See the [Resources](#resources) section below for best practices for asking technical questions.
1921

2022
## Mailing List
2123

@@ -27,3 +29,7 @@ The archives of our [previous mailing list are here](https://lists.ibiblio.org/p
2729
We have two channels on [Freenode](https://freenode.net/).
2830
- `#creativecommons-dev` – for technical discussion
2931
- `#creativecommons` – for general discussion (this is mirrored to the `#general` channel on Slack, use only if you want to reach 4000+ people)
32+
33+
## Resources
34+
35+
* [Getting Answers](https://www.mikeash.com/getting_answers.html): A guide to asking good technical questions.

‎content/contributing-code/contents.lr

+32-25
Original file line numberDiff line numberDiff line change
@@ -6,43 +6,51 @@ title: Contributing Code
66
---
77
body:
88

9-
## Existing projects
9+
We do all of our development on GitHub and are generally open to pull requests and proposals for new community-maintained projects. We would especially like help with reviving projects that CC's engineering team does not have the time to actively work on (such as [our WordPress plugin](https://github.com/creativecommons/creativecommons-wordpress-plugin) and [license chooser widget](https://github.com/creativecommons/LicenseChooser.js)).
1010

11-
Here's a list of [all our current projects](/projects). We do all of our development on GitHub and are generally open to pull requests. We would especially like help with reviving projects that CC's engineering team does not have the time to actively work on (such as [our WordPress plugin](https://github.com/creativecommons/creativecommons-wordpress-plugin) and [license chooser widget](https://github.com/creativecommons/LicenseChooser.js)). We're also looking to improve our documentation and increase our automated test coverage across pretty much all our projects.
11+
We're also looking to improve our documentation and increase our automated test coverage across pretty much all our projects, so help with that would be greatly appreciated.
1212

13-
We are working on making sure all of our projects are documented, licensed, and have self-contained contribution guidelines. Until we finish that work, follow the guidelines below before writing any code.
13+
## Working on an existing project
1414

15-
### Check for contribution readiness
15+
Here's a list of [all our current projects](/projects).
1616

17-
We do not accept contributions to projects without licenses. We're working on adding licenses to all our repositories but we will prioritize ones in which there is an active interest in contribution. If the repository you want to contribute to has no license file (or is missing other infrastructure such as basic documentation), please create a GitHub issue attached to that repository asking us to set those up.
17+
We are actively working on documenting and licensing them and adding self-contained contribution guidelines but we still have a lot of work ahead of us. We're open to contributions on any of our public projects, as long as they have a license. The license for a project is located in a file named `LICENSE` in the root directory of the repository. If the repository you want to contribute to has no license file, please create a GitHub issue attached to that repository and we'll prioritize setting those up.
1818

19-
### Working on open GitHub issues
19+
You may also create GitHub issues for any other missing infrastructure such as a `README` file.
2020

21-
We track all our work via the GitHub issues associated with each repository and they are a good way to find things to work on. The first step is to check the labels on the issue and follow the appropriate steps below.
21+
### Working on open issues
2222

23-
**If the issue is labeled "help wanted" or "good first issue"**, comment on it to indicate that you're working on it (so that no one else does) and submit a pull request when you're ready. No other steps are needed.
24-
* Here's a list of [all issues labeled "good first issue"](https://github.com/search?q=org%3Acreativecommons+is%3Aissue+is%3Aopen+label%3A%22good+first+issue%22)
25-
* Here's a list of [all issues labeled "help wanted"](https://github.com/search?q=org%3Acreativecommons+is%3Aissue+is%3Aopen+label%3A%22help+wanted%22)
23+
We track all our work via the GitHub issues associated with a repository and that's where you can find things to work on. First, check the labels on the issue you're interested in:
24+
* Issues labeled **"in progress"** are generally not available, but may be available if there has been no activity on the issue or related PR for over a week.
25+
* Issues labeled **"help wanted"** or **"good first issue"** have been identified as available for community contribution.
26+
* Here's a list of [all issues labeled "good first issue"](https://github.com/search?q=org%3Acreativecommons+is%3Aissue+is%3Aopen+label%3A%22good+first+issue%22)
27+
* Here's a list of [all issues labeled "help wanted"](https://github.com/search?q=org%3Acreativecommons+is%3Aissue+is%3Aopen+label%3A%22help+wanted%22)
28+
* If the issue does not have either of those labels, it may still be open for contribution.
2629

27-
**If it does not have either of those labels**, comment on it to ask if help is desired. If you receive a response that tells you to go ahead and work on it, comment on it to indicate that you're working on it (so that no one else does) and submit a pull request when you're ready.
30+
Once you have identified an issue you'd like to work on, follow these steps:
2831

29-
### Proposing something new
32+
1. Comment on it and say you'd like to work on that issue.
33+
2. Wait for someone to confirm that you may work on the issue before writing any code. The person who confirms will add an "in progress" label to the issue to indicate that the issue has been assigned.
34+
3. Once the issue has been updated to "in progress", write your code and submit your pull request (be sure to read and follow the **[Pull request guidelines](#pull-request-guidelines)** guide below!)
35+
4. Wait for code review and address any issues raised as soon as you can.
36+
37+
Even if you're not done with the issue, create a [draft pull request](https://help.github.com/en/articles/about-pull-requests#draft-pull-requests) and push your code [early and often](https://www.worklytics.co/blog/commit-early-push-often/). If we haven't heard from you in over a week and someone else expresses interest in that issue, we may assign it to the new person.
38+
39+
### Proposing a new issue
3040

3141
If you want to work on something that there is no GitHub issue for, then propose the change in [one of our community forums](/community) or create a a new GitHub issue associated with the relevant repository amd propose your change there. Be sure to include implementation details and the rationale for the proposed change.
3242

3343
If the project has a roadmap documented in the README, checking the roadmap to see if the feature is already in our pipeline would be a good first step.
3444

3545
When in doubt, ask a question on [one of our community forums](/community).
3646

37-
## New projects
38-
39-
We are also open to working on or hosting projects that are related to the Creative Commons licenses or general mission. Our [Google Summer of Code project ideas](/gsoc-2019/project-ideas) list is a good place to find ideas we'd like implemented. If you're interested in working on one of them, please propose it in one of our [community forums](/community) (you don't need to be a student, anyone is welcome to work on those ideas) and work out implementation details with CC staff members before you write any code. If you want to suggest a new project idea, follow the same process.
40-
41-
In general, we'd like any new projects to use Python, WordPress/PHP, and/or JavaScript (our framework of choice is Vue.js) so that our team can help review and maintain the project.
42-
43-
## General best practices
47+
## Pull request guidelines
4448

45-
No matter what kind of project you're working on, these are good guidelines to follow
49+
* Read and follow the contributing guidelines and code of conduct for the project. Here are screenshots of where to find them for [first time contributors](first-time-contributor-resources.png) and [previous contributors](previous-contributor-resources.png).
50+
* Use the format specified in pull request template for the repository if one exists.
51+
* Describe your change in detail. Too much detail is better than too little.
52+
* Describe how you tested your change.
53+
* If a reviewer is not assigned automatically, manually [request a review](https://help.github.com/en/articles/requesting-a-pull-request-review) from either the repository maintainer (if you have that information) or `@creativecommons/engineering`.
4654

4755
### Code
4856

@@ -52,9 +60,8 @@ No matter what kind of project you're working on, these are good guidelines to f
5260
* Document your code thoroughly.
5361
* Make sure all the existing tests pass.
5462

55-
### Pull requests
63+
## New projects
5664

57-
* Use the format specified in pull request template for the repository if there is one.
58-
* Describe your change in detail. Too much detail is better than too little.
59-
* Describe how you tested your change.
60-
* Request a review from either the repository maintainer (if you have that information) or `@creativecommons/engineering`.
65+
We are also open to working on or hosting projects that are related to the Creative Commons licenses or general mission. Our [Google Summer of Code project ideas](/gsoc-2019/project-ideas) list is a good place to find ideas we'd like implemented. If you're interested in working on one of them, please propose it in one of our [community forums](/community) (you don't need to be a student, anyone is welcome to work on those ideas) and work out implementation details with CC staff members before you write any code. If you want to suggest a new project idea, follow the same process.
66+
67+
In general, we'd like any new projects to use Python, WordPress/PHP, and/or JavaScript (our framework of choice is Vue.js) so that our team can help review and maintain the project.

‎content/contributing-code/first-time-contributor-resources.png

183 KB
Loading

‎content/contributing-code/previous-contributor-resources.png

131 KB
Loading

‎content/gsoc-2019/project-ideas-collection/automated-link-checking/contents.lr

+1
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ error result broken links, the community suffers and development is slowed.
1515
resources:
1616
- License source files: [docroot/legalcode - creativecommons/creativecommons.org](https://github.com/creativecommons/creativecommons.org/tree/master/docroot/legalcode)
1717
- Example Open Source link checking software: [wummel/linkchecker: check links in web documents or full websites](https://github.com/wummel/linkchecker) (just an example--not a requirement)
18+
- [Current list of open issues related to license URL issues](https://github.com/creativecommons/creativecommons.org/issues?q=is%3Aissue+is%3Aopen+label%3A%22License+Link+Translation+or+URL+Problem%22) (these are the kinds of issues we're trying to preempt).
1819
---
1920
expected_result:
2021
Public release of Python software that ingests the license source files and

‎content/gsoc-2019/project-ideas-collection/search-by-use-case/contents.lr

+5-5
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ title: CC Search: search by use case
66
---
77
description:
88

9-
Prototype in CC Search a way to search for specific materials to use for specific types of projects e.g. CC music for videos or podcasts.
9+
Prototype in CC Search a way to search for specific materials to use for specific types of projects. For example: search images for slide presentations (stock photos), for printed and/or digital magazines (which might require high resolution), for educational material (use content from GLAM providers), etc..
1010
---
1111
rationale:
1212

@@ -23,12 +23,12 @@ expected_result:
2323

2424
A new feature or set of new features added to CC Search to support searching CC-licensed content for a specific purpose. You can decide what use cases you'd like to focus on.
2525
---
26-
skills_recommended: JavaScript, potentially Python
26+
skills_recommended: Python and Javascript
2727
---
28-
primary_mentor: Breno Ferreira
28+
primary_mentor: Alden Page
2929
---
30-
backup_mentor: Alden Page
30+
backup_mentor: Breno Ferreira
3131
---
32-
difficulty: Easy
32+
difficulty: Medium
3333
---
3434
proposal_tag: Search

0 commit comments

Comments
 (0)