Merge pull request #259 from creativecommons/reorg-resources

Merge PR#146 with conflicts resolved
creativecommons · Apr 8, 2024 · 8995ff3 · 8995ff3
2 parents bdaf8c0 + 1527bc9
commit 8995ff3
Show file tree

Hide file tree

Showing 25 changed files with 11 additions and 0 deletions.
diff --git a/docs/_config.yml b/docs/_config.yml
@@ -1,3 +1,14 @@
 title: CC Resource Archive
 
 repository: creativecommons/cc-resource-archive
+
+include:
+  - _resources
+
+defaults:
+  - scope:
+      path: '_resources'
+      type: 'pages'
+    values:
+      # make URL of pages in the folder _resources as on the root.
+      permalink: /:basename/
diff --git a/docs/a-shared-culture.html → docs/_resources/a-shared-culture.html b/docs/a-shared-culture.html → docs/_resources/a-shared-culture.html
diff --git a/...ig-buck-bunny-loves-creative-commons.html → ...ig-buck-bunny-loves-creative-commons.html b/...ig-buck-bunny-loves-creative-commons.html → ...ig-buck-bunny-loves-creative-commons.html
diff --git a/docs/building-on-the-past.md → docs/_resources/building-on-the-past.md b/docs/building-on-the-past.md → docs/_resources/building-on-the-past.md
diff --git a/docs/cash-music-creative-commons-portal.html → ...s/cash-music-creative-commons-portal.html b/docs/cash-music-creative-commons-portal.html → ...s/cash-music-creative-commons-portal.html
diff --git a/docs/cc-licenses-poster.html → docs/_resources/cc-licenses-poster.html b/docs/cc-licenses-poster.html → docs/_resources/cc-licenses-poster.html
diff --git a/docs/cc-sweden-poster.html → docs/_resources/cc-sweden-poster.html b/docs/cc-sweden-poster.html → docs/_resources/cc-sweden-poster.html
diff --git a/docs/cc-version-40-for-education.md → ..._resources/cc-version-40-for-education.md b/docs/cc-version-40-for-education.md → ..._resources/cc-version-40-for-education.md
diff --git a/docs/copyright-4-educators.html → docs/_resources/copyright-4-educators.html b/docs/copyright-4-educators.html → docs/_resources/copyright-4-educators.html
diff --git a/docs/creative-commons-kiwi.md → docs/_resources/creative-commons-kiwi.md b/docs/creative-commons-kiwi.md → docs/_resources/creative-commons-kiwi.md
diff --git a/...licenses-for-nonprofit-organizations.html → ...licenses-for-nonprofit-organizations.html b/...licenses-for-nonprofit-organizations.html → ...licenses-for-nonprofit-organizations.html
diff --git a/docs/get-cc-savvy.html → docs/_resources/get-cc-savvy.html b/docs/get-cc-savvy.html → docs/_resources/get-cc-savvy.html
diff --git a/docs/guide-to-using-public-domain-tools.html → ...s/guide-to-using-public-domain-tools.html b/docs/guide-to-using-public-domain-tools.html → ...s/guide-to-using-public-domain-tools.html
diff --git a/...to-attribute-creative-commons-photos.html → ...to-attribute-creative-commons-photos.html b/...to-attribute-creative-commons-photos.html → ...to-attribute-creative-commons-photos.html
diff --git a/.../learn-creative-commons-in-3-minutes.html → .../learn-creative-commons-in-3-minutes.html b/.../learn-creative-commons-in-3-minutes.html → .../learn-creative-commons-in-3-minutes.html
diff --git a/docs/les-licences-creative-commons.md → ...esources/les-licences-creative-commons.md b/docs/les-licences-creative-commons.md → ...esources/les-licences-creative-commons.md
diff --git a/docs/oer-whats-in-it-for-me.md → docs/_resources/oer-whats-in-it-for-me.md b/docs/oer-whats-in-it-for-me.md → docs/_resources/oer-whats-in-it-for-me.md
diff --git a/...open-content-licensing-for-educators.html → ...open-content-licensing-for-educators.html b/...open-content-licensing-for-educators.html → ...open-content-licensing-for-educators.html
diff --git a/docs/open-data-handbook.html → docs/_resources/open-data-handbook.html b/docs/open-data-handbook.html → docs/_resources/open-data-handbook.html
diff --git a/docs/open-policy-network.html → docs/_resources/open-policy-network.html b/docs/open-policy-network.html → docs/_resources/open-policy-network.html
diff --git a/docs/open-science-an-introduction.html → ...sources/open-science-an-introduction.html b/docs/open-science-an-introduction.html → ...sources/open-science-an-introduction.html
diff --git a/docs/six-licenses-for-sharing-your-work.html → ...s/six-licenses-for-sharing-your-work.html b/docs/six-licenses-for-sharing-your-work.html → ...s/six-licenses-for-sharing-your-work.html
diff --git a/docs/wanna-work-together.html → docs/_resources/wanna-work-together.html b/docs/wanna-work-together.html → docs/_resources/wanna-work-together.html
diff --git a/docs/what-does-creative-commons-mean.md → ...ources/what-does-creative-commons-mean.md b/docs/what-does-creative-commons-mean.md → ...ources/what-does-creative-commons-mean.md
diff --git a/docs/why-open-education-matters.md → .../_resources/why-open-education-matters.md b/docs/why-open-education-matters.md → .../_resources/why-open-education-matters.md