Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
28d6705
Open Copyright Waiver text from CC website in a modal
obulat Dec 14, 2020
62a11f6
Linting fixes
obulat Dec 14, 2020
82755a0
Remove the CCO waiver text
obulat Dec 14, 2020
c091d69
Remove font-awesome packages to reduce size
obulat Dec 16, 2020
ff80bdf
Adjust icon styles
obulat Dec 16, 2020
824b831
Improve scrolling
obulat Dec 17, 2020
9248538
Add waits for scrolling to fix testing
obulat Dec 17, 2020
6f09c17
Add Vocabulary Select implementation instead of buefy select
obulat Dec 17, 2020
11b58a4
Revert "Add Vocabulary Select implementation instead of buefy select"
obulat Dec 17, 2020
aaafd9b
Merge branch 'master' of https://github.com/creativecommons/chooser i…
obulat Dec 18, 2020
6e93d30
Merge branch 'improve_scrolling' into waiver_modal
obulat Dec 19, 2020
313a2ac
Merge branch 'master' into waiver_modal
obulat Dec 19, 2020
2138227
Adjust CopyrightWaiverStep tests and fix linting error
obulat Dec 19, 2020
886b517
Add CopyrightWaiverStep link string
obulat Dec 19, 2020
8c7dc32
Remove bulma/buefy style imports from App.vue
obulat Dec 19, 2020
0a6b8bc
Fix padding issues in navigation and license deed link button
obulat Dec 19, 2020
09c168f
Fix CopyrightWaiverStep test and dependencies
obulat Dec 19, 2020
354020d
Make the Stepper accessible for keyboard users
obulat Dec 19, 2020
e6d90b3
Merge branch 'remove_fa' into waiver_modal
obulat Dec 19, 2020
722f52c
Fix tests
obulat Dec 19, 2020
aa3f11b
Fix google analytics event
obulat Dec 19, 2020
b9ce699
Revert converting step content into form because it interferes with s…
obulat Dec 19, 2020
2e9d06a
build site
obulat Dec 20, 2020
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
Open Copyright Waiver text from CC website in a modal
  • Loading branch information
obulat committed Dec 14, 2020
commit 28d67056f8a67b54cfc3514a405f15d615f2c7da
90 changes: 79 additions & 11 deletions src/components/CopyrightWaiverStep.vue
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,35 @@
<v-checkbox v-model="copyrightWaiverAgreed">
{{ $t('stepper.CW.copyright-waive-agreement') }}
</v-checkbox>
<textarea
:value="this.$t('cc0-waiver.text')"
:class="'waiver-textarea'"
/>
<v-checkbox v-model="copyrightWaiverConfirmed">
{{ $t("stepper.CW.copyright-waive-confirmation") }}
<i18n
path="stepper.CW.copyright-waive-confirmation"
tag="span"
>
<a
slot="link"
href="#0"
@click="openModal=true"
>
{{ $t('stepper.CW.link-label') }}
</a>
</i18n>
</v-checkbox>
<app-modal
v-if="openModal"
title="CC0 1.0"
@close="closeModal"
>
<div class="modal-container">
<iframe
id="iframe"
width="100%"
height="100%"
allowtransparency="true"
src="https://creativecommons.org/publicdomain/zero/1.0/legalcode"
/>
</div>
</app-modal>
</div>
</template>
<script>
Expand All @@ -29,7 +51,8 @@ export default {
data() {
return {
agreed: false,
confirmed: false
confirmed: false,
openModal: false
}
},
computed: {
Expand Down Expand Up @@ -63,19 +86,64 @@ export default {
this.$emit('change', payload)
}
}
},
watch: {
async openModal(newValue, oldValue) {
if (newValue) {
await this.$nextTick()
const deedIframe = document.querySelector('#iframe')
console.log('Deed iframe: ', deedIframe)
const doc = deedIframe.contentDocument
console.log(doc)
doc.body.innerHTML = doc.body.innerHTML + '<style>body {padding-left: 1rem;padding-right:1rem;}</style>'
console.log(deedIframe, oldValue)
}
}
},
methods: {
closeModal() {
this.openModal = false
}
}
}
</script>
<style lang="scss">
.waiver-textarea {
width: 100%;
min-height: 100px;
margin: 1rem 0;
}
.step-actions .control-label {
color: #333333;
}
input[type='checkbox'] {
transform: translateY(3px);
}
.modal-container {
width: 85vw;
height: 85vh;
overflow: hidden;
}
.deed-main {
padding-right: 2rem;
}
.v-checkbox {
margin-bottom: 1.5rem;
}

.overlay.app-modal {
.close-button {
margin-left: 0;
}
.modal {
display: block;
overflow: hidden;
}
.modal-header {
display: flex;
flex-direction: row;
justify-content: space-between;
align-items: center;
padding: 0.4rem!important;
h3 {
flex: 1;
text-align: center;
}
}
}
</style>
43 changes: 26 additions & 17 deletions src/locales/en.json
Original file line number Diff line number Diff line change
Expand Up @@ -54,8 +54,9 @@
"heading": "Copyright Waiver",
"question": "Waive Your Copyright",
"selected": "I waived copyright",
"link-label": "the terms and intended legal effect of CC0",
"copyright-waive-agreement": "I hereby waive all copyright and related or neighboring rights together with all associated claims and causes of action with respect to this work to the extent possible under the law.",
"copyright-waive-confirmation": "I have read and understand the terms and intended legal effect of CC0, and hereby voluntarily elect to apply it to this work."
"copyright-waive-confirmation": "I have read and understand {link}, and hereby voluntarily elect to apply it to this work."
},
"DD": {
"heading": "Creative Commons License",
Expand Down Expand Up @@ -137,68 +138,76 @@
"heading": "CONFUSED? NEED HELP?",
"what-are-cc-licenses": {
"heading": "What Are Creative Commons Licenses?",
"text": "<p class='help-text'>Creative Commons legal tools give everyone from individual creators to large companies a simple, standardized way to grant copyright permissions to their creative work. They are designed to forge a balance inside the traditional \"all rights reserved\" setting that copyright law creates.</p>",
"footer": "For more information, please see <a id='license_link' href='https://creativecommons.org/licenses/' target='blank_'>About the Licenses</a>"
"text": "Creative Commons legal tools give everyone from individual creators to large companies a simple, standardized way to grant copyright permissions to their creative work. They are designed to forge a balance inside the traditional \"all rights reserved\" setting that copyright law creates.",
"footer": "For more information, please see [About the Licenses](https://creativecommons.org/licenses/)."
},
"how-licenses-work": {
"heading": "How do the Licenses Work?",
"text": "<p class='help-text'>There are six different Creative Commons licenses, as well as one public domain dedication tool. Creators choose the option that is right for them, and then apply that license to their copyrighted work. Anyone who wants to reuse the work of the creator in a manner that requires permission under copyright must comply with the terms of the license.</p>",
"footer": "<p>For more information, please see <a id='license_link_2' href='https://creativecommons.org/licenses/' target='blank_'>About the Licenses</a></p>"
"text": "There are six different Creative Commons licenses, as well as one public domain dedication tool. Creators choose the option that is right for them, and then apply that license to their copyrighted work. Anyone who wants to reuse the work of the creator in a manner that requires permission under copyright must comply with the terms of the license.",
"footer": "For more information, please see [About the Licenses](https://creativecommons.org/licenses/)"
},
"what-icons-mean": {
"heading": "What do the Icons Mean?",
"text": "<p class='help-text'>The icons represent key features of the different CC license options:</p>",
"text": "The icons represent key features of the different CC license options:",
"BY": {
"text": "Credit must be given to you, the creator.",
"long-name": "Attribution Required",
"icon-alt-text": "Attribution Required Icon",
"short-name": "(BY)"
},
"ND": {
"text": "No derivatives or adaptations of your work are permitted.",
"long-name": "Modifying Not Allowed",
"icon-alt-text": "Modifying Not Allowed Icon",
"short-name": "(ND/ NoDerivatives)"
},
"NC": {
"text": "Only noncommercial use of your work is permitted.</p>",
"text": "Only noncommercial use of your work is permitted.",
"long-name": "Commercial Use Not Allowed",
"icon-alt-text": "Commercial Use Not Allowed Icon",
"short-name": "(NC/ NonCommercial)"
},
"SA": {
"text": "Adaptations must be shared under the same terms.",
"long-name": "Distributed on Same Terms",
"icon-alt-text": "Distributed on Same Terms Icon",
"short-name": "(SA/ ShareAlike)"
}
},
"footer": ""
},
"how-licenses-communicated": {
"heading": "How are Licenses Communicated?",
"text": "Creative Commons licenses can be represented by their names, their associated icons, or both. For example, a CC BY-NC license, which requires attribution, and prohibits commercial use could be represented by its:",
"full-name": "Full Name",
"short-name": "Short Name",
"license-icons": "Icons",
"CC-BY-NC": "Attribution-NonCommercial 4.0 International"
"CC-BY-NC": "Attribution-NonCommercial 4.0 International",
"footer": ""
},
"considerations-before-licensing": {
"heading": "Considerations Before Licensing",
"text": "<p> There are a number of things you should consider before you apply a Creative Commons license to your work, or before using Creative Commons-licenced material.</p> <p><a id='licensors_link' href='https://wiki.creativecommons.org/wiki/Considerations_for_licensors_and_licensees#Considerations_for_licensors' target='blank_'>Considerations for Licensors</a> - If you are licensing your own work</p> <p><a id='licensees_link' href='https://wiki.creativecommons.org/wiki/Considerations_for_licensors_and_licensees#Considerations_for_licensees' target='blank_'>Considerations for Licensees</a> - If you are using someone else's licensed work</p>",
"footer": "For more information, please see <a id='wiki_link' href='https://wiki.creativecommons.org/wiki/Before_Licensing' target='blank_'>the CC wiki's page on Considerations for Licensors and Licensees.</a>"
"text": "There are a number of things you should consider before you apply a Creative Commons license to your work, or before using Creative Commons-licenced material.\n[Considerations for Licensors](https://wiki.creativecommons.org/wiki/Considerations_for_licensors_and_licensees#Considerations_for_licensors) - If you are licensing your own work\n[Considerations for Licensees](https://wiki.creativecommons.org/wiki/Considerations_for_licensors_and_licensees#Considerations_for_licensees) - someone else's licensed work",
"footer": "For more information, please see [the CC wiki's page on Considerations for Licensors and Licensees](https://wiki.creativecommons.org/wiki/Before_Licensing)."
},
"how-formally-license": {
"heading": "How do I Formally License my Work?",
"text": "<p class='help-text'>Licensing your work is as simple as marking it under the specific license you choose. This marking can be as simple as a bit of text stating the license in a copyright notice, or as complex as embedding the license information on your website using the HTML code associated with the particular license. We strongly recommend at least including a link to the applicable license.</p>"
"text": "Licensing your work is as simple as marking it under the specific license you choose. This marking can be as simple as a bit of text stating the license in a copyright notice, or as complex as embedding the license information on your website using the HTML code associated with the particular license. We strongly recommend at least including a link to the applicable license.",
"footer": ""
},
"six-cc-licenses": {
"heading": "The Six Creative Commons Licenses",
"text": "<p class='help-text'>There are six main licenses that Creative Commons offers.</p> <p class='help-text'>In the diagram to the right, you can see the six main licenses and the public domain CC0 license, and how restrictive they are, with licenses at the top being the least restrictive, and licenses at the bottom being the most restrictive.</p> <p class='help-text'>If you are unsure about which one is right for you and your work, please select <strong>\"I need help selecting a license\"</strong> on the first question of this page.</p>",
"footer": "For more information, please read more about <a id='licensing_examples_link' href='https://creativecommons.org/share-your-work/licensing-types-examples/' target='_blank'>CC Licenses and Examples.</a>"
"text": "There are six main licenses that Creative Commons offers.\nIn the diagram to the right, you can see the six main licenses and the public domain CC0 license, and how restrictive they are, with licenses at the top being the least restrictive, and licenses at the bottom being the most restrictive.\nIf you are unsure about which one is right for you and your work, please select **I need help selecting a license** on the first question of this page.",
"footer": "For more information, please read more about [CC Licenses and Examples](https://creativecommons.org/share-your-work/licensing-types-examples/)."
},
"what-free-culture-license": {
"heading": "What is a Free Culture License?",
"text": "<p class='help-text'>CC uses the definition of free cultural works at <a href='https://freedomdefined.org/Definition' target='_blank'>Freedom Defined</a> to categorize certain CC licenses as Free Culture Licenses. Freedom Defined is an open organization of free culture advocates and researchers; the definition was developed by its community as a parallel to efforts such as the Free Software Definition, to have a standard for defining Free Culture. Using that definition, material licensed under CC BY or BY-SA is a free cultural work, as is anything in the worldwide public domain marked with CC0 or the Public Domain Mark.",
"footer": "Read more about <a href='https://creativecommons.org/share-your-work/public-domain/freeworks' target='_blank'>Understanding Free Cultural Works</a></p>"
"text": "CC uses the definition of free cultural works at [Freedom Defined](https://freedomdefined.org/Definition) to categorize certain CC licenses as Free Culture Licenses. Freedom Defined is an open organization of free culture advocates and researchers; the definition was developed by its community as a parallel to efforts such as the Free Software Definition, to have a standard for defining Free Culture. Using that definition, material licensed under CC BY or BY-SA is a free cultural work, as is anything in the worldwide public domain marked with CC0 or the Public Domain Mark.",
"footer": "Read more about [Understanding Free Cultural Works](https://creativecommons.org/share-your-work/public-domain/freeworks)"
},
"look-earlier-license-ver": {
"heading": "Looking for Earlier License Versions, including Ports?",
"text": "<p class='help-text'>The most recent license version is 4.0, which can be used internationally. Earlier versions of licenses, including 3.0 international and ports localized to particular jurisdictions, can still be used on the legacy version of the <a href='https://creativecommons.org/choose/' target='_blank'>License Chooser</a>.</p><p class='help-text'>Click on the link at the top of the page <strong>\"Looking for earlier license versions, including ports?\"</strong> and follow the prompts to use earlier license versions.</p>"
"text": "The most recent license version is 4.0, which can be used internationally. Earlier versions of licenses, including 3.0 international and ports localized to particular jurisdictions, can still be used on the legacy version of the [License Chooser](https://creativecommons.org/choose/)\nClick on the link at the top of the page **\"Looking for earlier license versions, including ports?\"** and follow the prompts to use earlier license versions.",
"footer": ""
}
},
"alt": {
Expand Down