Skip to content

Commit caaafb8

Browse files
Dhruvi16Dhruvi16
committed
Resolve conflicts
2 parents 3f9463c + ac2f087 commit caaafb8

20 files changed

+488
-140
lines changed

‎content/comments-solid.png

-5.16 KB
Binary file not shown.

‎content/contents.lr

+68-91
Original file line numberDiff line numberDiff line change
@@ -1,95 +1,72 @@
1-
_model: page
1+
_model: home
22
---
3-
title: Open Source at CC
3+
_template: home.html
44
---
5-
body:
6-
7-
**[Creative Commons](https://creativecommons.org/)** has been building free software for over a decade to support our mission of maximizing digital creativity, sharing, and innovation. We work on products that, among other things, make applying CC licenses to content easier, help users find CC licensed content easily, promote and educate users about CC licenses and copyright, and connect the global CC community. Our projects come in all sizes and shapes, from several simple static websites to making the 1.6 billion+ Creative Commons works currently available on the internet [searchable](https://search.creativecommons.org/).
8-
9-
## Get Involved
10-
11-
So if you're looking to integrate CC licenses or CC licensed works into your application or you'd like to help us build our products, you're in the right place! We really appreciate community contributions and feedback (we're a small team and spread thin) and we especially love seeing what you build using CC's tools.
12-
13-
<div class="card-deck">
14-
<div class="card get-involved-card border-dark mb-4">
15-
<h5 class="card-title text-center"><strong>Join the Community</strong></h5>
16-
<div class="card-img-top">
17-
<img class="mx-auto d-block" src="/comments-solid.png" alt="Community icon"/>
18-
</div>
19-
<div class="card-body" align="center">
20-
<p class="card-text text-center">Join the CC developer chat and mailing list communities to connect with other developers working with CC tools.</p>
21-
<a href="/community" class="btn btn-sm btn-outline-primary">See how to join</a>
22-
</div>
23-
</div>
24-
25-
<div class="card get-involved-card border-dark mb-4">
26-
<h5 class="card-title text-center"><strong>Contribute Code</strong></h5>
27-
<div class="card-img-top">
28-
<img class="mx-auto d-block" src="/laptop-code-solid.png" alt="Code icon"/>
29-
</div>
30-
<div class="card-body" align="center">
31-
<p class="card-text text-center">Fix one of our open issues or work on something new that you'd like to use. All skill levels are welcome.</p>
32-
<a href="/contributing-code" class="btn btn-sm btn-outline-primary">Guidelines</a>
33-
<a href="https://github.com/search?q=org%3Acreativecommons+is%3Aopen+label%3A%22help+wanted%22" class="btn btn-sm btn-outline-primary">"Help Wanted" issues</a>
34-
</div>
35-
</div>
36-
37-
<div class="card get-involved-card border-dark mb-4">
38-
<h5 class="card-title text-center"><strong>Integrate with CC Tools</strong></h5>
39-
<div class="card-img-top">
40-
<img class="mx-auto d-block" src="/creative-commons-remix-brands.png" alt="CC remix icon"/>
41-
</div>
42-
<div class="card-body" align="center">
43-
<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>
44-
<a href="https://api.creativecommons.engineering/" class="btn btn-sm btn-outline-primary">Catalog API</a>
45-
<a href="/contributing-code/projects" class="btn btn-sm btn-outline-primary">All our projects</a>
46-
</div>
47-
</div>
48-
49-
<div class="card get-involved-card border-dark mb-4">
50-
<h5 class="card-title text-center"><strong>Show Off Your Work</strong></h5>
51-
<div class="card-img-top">
52-
<img class="mx-auto d-block" src="/keyboard-solid.png" alt="Keyboard icon icon"/>
53-
</div>
54-
<div class="card-body" align="center">
55-
<p class="card-text text-center">If you've worked on software that uses CC licenses or tools, tell the community about it on <a href="/blog">our tech blog</a>.</p>
56-
<a href="/community/write-a-blog-post/" class="btn btn-sm btn-outline-primary">Write a blog post</a>
57-
</div>
58-
</div>
59-
60-
<div class="card get-involved-card border-dark mb-4">
61-
<h5 class="card-title text-center"><strong>Usability Testing</strong></h5>
62-
<div class="card-img-top">
63-
<img class="mx-auto d-block" src="/vials-solid.png" alt="Test tubes icon"/>
64-
</div>
65-
<div class="card-body" align="center">
66-
<p class="card-text text-center">Participate in one of our regular usability tests for CC tools that we're actively working on (we'll give you a gift card!)</p>
67-
<a href="/community/#mailing-lists" class="btn btn-sm btn-outline-primary">Sign up to test</a>
68-
<a href="https://github.com/creativecommons/creativecommons.org/issues/new/choose" class="btn btn-sm btn-outline-primary">File an issue</a>
69-
</div>
70-
</div>
71-
72-
<div class="card get-involved-card border-dark mb-4">
73-
<h5 class="card-title text-center"><strong>Translate our Content</strong></h5>
74-
<div class="card-img-top">
75-
<img class="mx-auto d-block" src="/language-solid.png" alt="Translation icon"/>
76-
</div>
77-
<div class="card-body" align="center">
78-
<p class="card-text text-center">Translate our content into your language. Contact us if you'd like to write code to make this process easier for new tools.</p>
79-
<a href="https://wiki.creativecommons.org/wiki/Translate" class="btn btn-sm btn-outline-primary">Translation information</a>
80-
</div>
81-
</div>
82-
83-
<div class="card get-involved-card border-dark mb-4">
84-
<h5 class="card-title text-center"><strong>Contribute Design</strong></h5>
85-
<div class="card-img-top">
86-
<img class="mx-auto d-block" src="/pencil-ruler-solid.png" alt="Pencil and ruler icon"/>
87-
</div>
88-
<div class="card-body" align="center">
89-
<p class="card-text text-center">Contribute to our brand new set of standard UI components and help us apply it to all existing projects.</p>
90-
<a href="https://github.com/creativecommons/cc-vocabulary" class="btn btn-sm btn-outline-primary">CC Vocabulary</a>
91-
</div>
92-
</div>
5+
block_content:
6+
7+
#### hero ####
8+
title:
9+
10+
We have been building <span class="has-text-forest-green">free software</span> at <span class="has-text-gold">Creative Commons</span> for over a decade.
11+
----
12+
description:
13+
14+
We work on code and products that support digital creativity and sharing, from usability of our legal tools to enabling discovery of CC-licensed content.
15+
----
16+
links:
17+
18+
<div class="hero-links">
19+
<a class="button small is-info row" href="/community">Join the Developer Community</a>
20+
<a class="button small row" href="https://twitter.com/creativecommons"><i class="icon twitter"></i>Follow us on twitter</a>
9321
</div>
9422

95-
<p class="small muted"><em>All icons are from <a href="https://fontawesome.com/">Font Awesome</a>, licensed under a <a href="https://creativecommons.org/licenses/by/4.0/">Creative Commons Attribution 4.0 International License</a>.</em></p>
23+
#### get-involved ####
24+
title:
25+
26+
<h2>Get Involved</h2>
27+
<p class="get-involved-description">Help CC’s mission by contributing to our products, integrating our tools into your project, or using our plugins. We have a small team and really appreciate your involvement!</p>
28+
----
29+
links_product:
30+
31+
<img src="./product.svg">
32+
33+
<h4 class="heading">Help us build our products</h4>
34+
35+
<div class="list">
36+
<h5 class="link-heading"><a href="https://opensource.creativecommons.org/contributing-code/" class="has-text-forest-green">Contribution Guidelines</a></h5>
37+
<p class="link-caption">Learn how to contribute and then get started.</p>
38+
39+
<h5 class="link-heading"><a href="https://opensource.creativecommons.org/community/community-team/" class="has-text-forest-green">Community Team</a></h5>
40+
<p class="link-caption">Become a member of our community volunteer team.</p>
41+
42+
<h5 class="link-heading"><a href="https://opensource.creativecommons.org/contributing-code/projects/" class="has-text-forest-green">All Available Projects</a></h5>
43+
<p class="link-caption">See all of our open source projects in one place.</p>
44+
</div>
45+
----
46+
links_integrate:
47+
48+
<img src="./integrate.svg">
49+
50+
<h4 class="heading">Integrate CC licenses into your project</h4>
51+
52+
<div class="list">
53+
<h5 class="link-heading"><a href="https://api.creativecommons.engineering/v1/" class="has-text-forest-green">CC Catalog API</a></h5>
54+
<p class="link-caption">Build CC-licensed content into your application.</p>
55+
56+
<h5 class="link-heading"><a href="https://creativecommons.org/platform/toolkit/" class="has-text-forest-green">Platform Toolkit</a></h5>
57+
<p class="link-caption">Give users the option to openly license their content.</p>
58+
</div>
59+
----
60+
links_plugins:
61+
62+
<img src="./plugins.svg">
63+
64+
<h4 class="heading">Use Our Plugins</h4>
65+
66+
<div class="list">
67+
<h5 class="link-heading"><a href="https://wordpress.org/plugins/creative-commons/" class="has-text-forest-green">Wordpress Plugin</a></h5>
68+
<p class="link-caption">Mark your work with a CC license from within WordPress.</p>
69+
70+
<h5 class="link-heading"><a href="https://opensource.creativecommons.org/ccsearch-browser-extension/" class="has-text-forest-green">CC Search Browser Extension</a></h5>
71+
<p class="link-caption">Search the Catalog using our Extension.</p>
72+
</div>

‎content/creative-commons-remix-brands.png

-7.03 KB
Binary file not shown.

‎content/github.svg

+47
Loading

‎content/integrate.svg

+15
Loading

‎content/keyboard-solid.png

-2.84 KB
Binary file not shown.

‎content/language-solid.png

-5.98 KB
Binary file not shown.

‎content/laptop-code-solid.png

-3.61 KB
Binary file not shown.

‎content/pencil-ruler-solid.png

-4.83 KB
Binary file not shown.

‎content/plugins.svg

+16
Loading

‎content/product.svg

+10
Loading

‎content/vials-solid.png

-2.94 KB
Binary file not shown.

‎flowblocks/get-involved.ini

+19
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
[block]
2+
name = Get Involved
3+
label = {{ this.title }}
4+
5+
[fields.title]
6+
label = Title
7+
type = html
8+
9+
[fields.links_product]
10+
label = Links Product
11+
type = html
12+
13+
[fields.links_integrate]
14+
label = Links Integrate
15+
type = html
16+
17+
[fields.links_plugins]
18+
label = Links Plugins
19+
type = html

‎flowblocks/hero.ini

+14
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
[block]
2+
name = Hero
3+
4+
[fields.title]
5+
label = Title
6+
type = html
7+
8+
[fields.description]
9+
label = Description
10+
type = text
11+
12+
[fields.links]
13+
label = Links
14+
type = html

‎models/home.ini

+12
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
[model]
2+
name = Home
3+
label = {{ this.title }}
4+
5+
[fields.title]
6+
label = Title
7+
type = string
8+
9+
[fields.block_content]
10+
label = Block Content
11+
type = flow
12+
flow_blocks = hero, get-involved

‎themes/vocabulary_theme/templates/blocks/get-involved.html

+19
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
<section class="get-involved">
2+
<div class="container">
3+
<div class="column is-9 is-paddingless">
4+
{{ this.title }}
5+
</div>
6+
7+
<div class="columns get-involved-links">
8+
<div class="column is-one-third">
9+
{{ this.links_product }}
10+
</div>
11+
<div class="column is-one-third">
12+
{{ this.links_integrate }}
13+
</div>
14+
<div class="column is-one-third">
15+
{{ this.links_plugins }}
16+
</div>
17+
</div>
18+
</div>
19+
</section>

‎themes/vocabulary_theme/templates/blocks/hero.html

+18
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
<section class="container hero">
2+
<div class="hero-title column is-9 is-paddingless">
3+
<h1>
4+
{{ this.title }}
5+
</h1>
6+
</div>
7+
<div class="columns">
8+
<div class="column is-one-third">
9+
<p class="hero-description">
10+
{{ this.description }}
11+
</p>
12+
{{ this.links }}
13+
</div>
14+
<div class="column">
15+
<img src="./github.svg" />
16+
</div>
17+
</div>
18+
</section>

0 commit comments

Comments
 (0)