mozilla
/
popcorn-js
зеркало из https://github.com/mozilla/popcorn-js.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

[#255] attribution case fixes

This commit is contained in:
ScottDowne 2011-01-11 18:30:32 -05:00
Родитель caae52b080
Коммит ba7d9106bd
3 изменённых файлов: 15 добавлений и 15 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

4
plugins/attribution/popcorn.attribution.html
Просмотреть файл

@ -16,7 +16,7 @@
nameofwork: "A Shared Culture",
copyrightholder:"Jesse Dylan",
license: "CC-BY-N6",
licenseUrl: "http://creativecommons.org/licenses/by-nc/2.0/",
licenseurl: "http://creativecommons.org/licenses/by-nc/2.0/",
target: 'attribdiv'
} )
.attribution({
@ -26,7 +26,7 @@
nameofworkurl:"http://www.archive.org/details/CC1232_internet",
copyrightholder:"The Computer Chronicles",
license:"CC-BY-NC-ND",
licenseUrl: "http://creativecommons.org/licenses/by-nc-nd/2.0/",
licenseurl: "http://creativecommons.org/licenses/by-nc-nd/2.0/",
target: 'attribdiv'
} )

18
plugins/attribution/popcorn.attribution.js
Просмотреть файл

@ -50,9 +50,9 @@
nameofwork : {elem:'input', type:'text', label:'Name of Work'},
nameofworkurl : {elem:'input', type:'text', label:'Url of Work'},
copyrightholder : {elem:'input', type:'text', label:'Copyright Holder'},
copyrightHolderurl : {elem:'input', type:'text', label:'Copyright Holder Url'},
copyrightholderurl : {elem:'input', type:'text', label:'Copyright Holder Url'},
license : {elem:'input', type:'text', label:'License type'},
licenseUrl : {elem:'input', type:'text', label:'License URL'},
licenseurl : {elem:'input', type:'text', label:'License URL'},
target : 'attribution-container'
}
},
@ -71,13 +71,13 @@
if (options.nameofworkurl) {
attrib += "</a>";
}
if (options.copyrightHolderurl) {
attrib += "<a href='" + options.copyrightHolderurl + "' target='_blank'>";
if (options.copyrightholderurl) {
attrib += "<a href='" + options.copyrightholderurl + "' target='_blank'>";
}
if (options.copyrightholder) {
attrib += ", " + options.copyrightholder;
}
if (options.copyrightHolderurl) {
if (options.copyrightholderurl) {
attrib += "</a>";
}
@ -88,14 +88,14 @@
if (options.license) {
if (licenses[options.license.toLowerCase()]) {
if (options.licenseUrl) {
attrib = "<a href='" + options.licenseUrl + "' target='_blank'><img src='"+ licenses[options.license.toLowerCase()] +"' border='0'/></a> " + attrib;
if (options.licenseurl) {
attrib = "<a href='" + options.licenseurl + "' target='_blank'><img src='"+ licenses[options.license.toLowerCase()] +"' border='0'/></a> " + attrib;
} else {
attrib = "<img src='"+ licenses[options.license.toLowerCase()] +"' />" + attrib;
}
} else {
if (options.licenseUrl) {
attrib += ", license: <a href='" + options.licenseUrl + "' target='_blank'>" + options.license + "</a> ";
if (options.licenseurl) {
attrib += ", license: <a href='" + options.licenseurl + "' target='_blank'>" + options.license + "</a> ";
} else {
attrib += ", license: " + options.license;
}

8
plugins/attribution/popcorn.attribution.unit.js
Просмотреть файл

@ -30,8 +30,8 @@ test("Popcorn attribution Plugin", function () {
end: 5, // seconds
nameofwork: "A Shared Culture",
copyrightholder:"Jesse Dylan",
licenseType: "CC-BY-N6",
licenseUrl: "http://creativecommons.org/licenses/by-nc/2.0/",
license: "CC-BY-N6",
licenseurl: "http://creativecommons.org/licenses/by-nc/2.0/",
target: 'attribdiv'
} )
.attribution({
@ -40,8 +40,8 @@ test("Popcorn attribution Plugin", function () {
nameofwork: "Internet",
nameofworkurl:"http://www.archive.org/details/CC1232_internet",
copyrightholder:"The Computer Chronicles",
licenseType:"CC-BY-NC-ND",
licenseUrl: "http://creativecommons.org/licenses/by-nc-nd/2.0/",
license:"CC-BY-NC-ND",
licenseurl: "http://creativecommons.org/licenses/by-nc-nd/2.0/",
target: 'attribdiv'
} )
.volume(0)