Skip to content

Commit a8138b9

Browse files
neeraj-2neeraj-2
authored
Merge pull request #9 from creativecommons/master
Pull_changes
2 parents 98e68bf + ae6fe89 commit a8138b9

27 files changed

+7468
-7803
lines changed

‎docs/css/app.613bf7ff.css‎ renamed to ‎docs/css/app.b95a476b.css‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎docs/index.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
<!DOCTYPE html><html lang="en"><head><meta charset="utf-8"><meta http-equiv="X-UA-Compatible" content="IE=edge"><meta name="viewport" content="width=device-width,initial-scale=1"><meta name="description" content="Want to license your work with Creative Commons, but not sure where to start, or which license is right for you? Use our license chooser!"><link rel="icon" href="/favicon.ico"><link rel="icon" type="image/png" href="https://d15omoko64skxi.cloudfront.net/wp-content/uploads/2016/05/cc-site-icon-300x300.png" sizes="192x192"><link rel="apple-touch-icon-precomposed" href="https://d15omoko64skxi.cloudfront.net/wp-content/uploads/2016/05/cc-site-icon-300x300.png"><meta name="twitter:card" content="summary"><meta name="twitter:site" content="@creativecommons"><meta name="twitter:creator" content="@creativecommons"><meta property="og:url" content="https://beta-chooser.creativecommons.org"><meta property="og:title" content="Choose a License"><meta property="og:type" content="website"><meta property="og:description" content="Want to license your work with Creative Commons, but not sure where to start, or which license is right for you? Use our license chooser!"><meta property="og:image" content="https://mirrors.creativecommons.org/presskit/logos/cc.logo.large.png"><meta property="og:locale" content="en_US"><meta property="og:locale:alternate" content="ru_RU"><title>Choose a License</title><link href="/css/app.613bf7ff.css" rel="preload" as="style"><link href="/js/app.2e8e2f0f.js" rel="preload" as="script"><link href="/js/chunk-vendors.fa662221.js" rel="preload" as="script"><link href="/css/app.613bf7ff.css" rel="stylesheet"></head><body><noscript><strong>We're sorry but License Chooser doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id="app"></div><script src="/js/chunk-vendors.fa662221.js"></script><script src="/js/app.2e8e2f0f.js"></script></body></html>
1+
<!DOCTYPE html><html lang="en"><head><meta charset="utf-8"><meta http-equiv="X-UA-Compatible" content="IE=edge"><meta name="viewport" content="width=device-width,initial-scale=1"><meta name="description" content="Want to license your work with Creative Commons, but not sure where to start, or which license is right for you? Use our license chooser!"><link rel="icon" href="/favicon.ico"><link rel="icon" type="image/png" href="https://d15omoko64skxi.cloudfront.net/wp-content/uploads/2016/05/cc-site-icon-300x300.png" sizes="192x192"><link rel="apple-touch-icon-precomposed" href="https://d15omoko64skxi.cloudfront.net/wp-content/uploads/2016/05/cc-site-icon-300x300.png"><meta name="twitter:card" content="summary"><meta name="twitter:site" content="@creativecommons"><meta name="twitter:creator" content="@creativecommons"><meta property="og:url" content="https://beta-chooser.creativecommons.org"><meta property="og:title" content="Choose a License"><meta property="og:type" content="website"><meta property="og:description" content="Want to license your work with Creative Commons, but not sure where to start, or which license is right for you? Use our license chooser!"><meta property="og:image" content="https://mirrors.creativecommons.org/presskit/logos/cc.logo.large.png"><meta property="og:locale" content="en_US"><meta property="og:locale:alternate" content="ru_RU"><title>Choose a License</title><link href="/css/app.b95a476b.css" rel="preload" as="style"><link href="/js/app.2a9b9da0.js" rel="preload" as="script"><link href="/js/chunk-vendors.fa662221.js" rel="preload" as="script"><link href="/css/app.b95a476b.css" rel="stylesheet"></head><body><noscript><strong>We're sorry but License Chooser doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id="app"></div><script src="/js/chunk-vendors.fa662221.js"></script><script src="/js/app.2a9b9da0.js"></script></body></html>

‎docs/js/app.2a9b9da0.js‎

Lines changed: 2 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎docs/js/app.2a9b9da0.js.map‎

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎docs/js/app.2e8e2f0f.js‎

Lines changed: 0 additions & 2 deletions
This file was deleted.

‎docs/js/app.2e8e2f0f.js.map‎

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎package-lock.json‎

Lines changed: 7147 additions & 7531 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@
4646
"@vue/cli-plugin-unit-jest": "^4.4.6",
4747
"@vue/cli-service": "^4.4.6",
4848
"@vue/eslint-config-standard": "^5.1.2",
49-
"@vue/test-utils": "1.0.0-beta.29",
49+
"@vue/test-utils": "^1.1.2",
5050
"babel-eslint": "^10.1.0",
5151
"chromedriver": "^87.0.0",
5252
"clipboardy": "^2.3.0",

‎src/App.vue‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,7 @@
1010
aria-label="breadcrumbs"
1111
>
1212
<ul>
13-
<li><a href="#">Home</a></li>
14-
<li><a href="#">Child Page</a></li>
13+
<li><a href="https://creativecommons.org/">Home</a></li>
1514
<li class="is-active">
1615
<a
1716
href="#"

‎src/components/LicenseHTML.vue‎

Lines changed: 16 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,18 +20,30 @@ export default {
2020
...mapState(['attributionDetails', 'attributionType']),
2121
2222
htmlLicenseParagraph() {
23-
const isFull = this.attributionType === 'full'
24-
const { work, creator, license, paragraph } = generateHTML(this.attributionDetails, this.shortName, isFull)
23+
const useFullName = this.attributionType === 'full'
24+
25+
const { workTitle } = this.attributionDetails
26+
const isTitleDefault = !workTitle
27+
28+
const attributionDetails = {
29+
...this.attributionDetails,
30+
workTitle: workTitle || this.$t('license-use.richtext.workTitle')
31+
}
32+
const { work, creator, license } = generateHTML(attributionDetails, this.shortName, useFullName, isTitleDefault)
33+
2534
const licenseCodeSpan = this.$t('license-use.richtext.full-text', {
26-
workTitle: work || this.$t('license-use.richtext.workTitle'),
35+
workTitle: work,
2736
creator: creator,
2837
license: license,
2938
by: creator ? this.$t('license-use.richtext.by') : '',
3039
licenseMark: this.shortName === LICENSES.CC0.SHORT
3140
? this.$t('license-use.richtext.marked-text')
3241
: this.$t('license-use.richtext.licensed-text')
3342
})
34-
return `${paragraph}${licenseCodeSpan}</p>`
43+
const metadata = `xmlns:cc="http://creativecommons.org/ns#" ${isTitleDefault
44+
? ''
45+
: 'xmlns:dct="http://purl.org/dc/terms/"'}`
46+
return `<p ${metadata}>${licenseCodeSpan}</p>`
3547
}
3648
}
3749
}

0 commit comments

Comments
 (0)