diff --git a/src/assets/OBS_LICENSE.md b/src/assets/OBS_LICENSE.md deleted file mode 100644 index d03850f7e..000000000 --- a/src/assets/OBS_LICENSE.md +++ /dev/null @@ -1,42 +0,0 @@ -# unfoldingWord | Open Bible Stories - -## an unrestricted visual mini-Bible in any language - -http://openbiblestories.com - -unfoldingWord Open Bible Stories, v. 4 - -Created by Distant Shores Media (http://distantshores.org) and the Door43 world missions community (http://door43.org). - -# License -## Creative Commons Attribution-ShareAlike 4.0 International (CC BY-SA 4.0) - -This is a human-readable summary of (and not a substitute for) the full license found at http://creativecommons.org/licenses/by-sa/4.0/. - -### You are free to: - - * **Share** — copy and redistribute the material in any medium or format - * **Adapt** — remix, transform, and build upon the material - -for any purpose, even commercially. - -The licensor cannot revoke these freedoms as long as you follow the license terms. - -### Under the following conditions: - - * **Attribution** — You must attribute the work as follows: "Original work available at https://door43.org/." Attribution statements in derivative works should not in any way suggest that we endorse you or your use of this work. - * **ShareAlike** — If you remix, transform, or build upon the material, you must distribute your contributions under the same license as the original. - -**No additional restrictions** — You may not apply legal terms or technological measures that legally restrict others from doing anything the license permits. - -### Notices: - -You do not have to comply with the license for elements of the material in the public domain or where your use is permitted by an applicable exception or limitation. - -No warranties are given. The license may not give you all of the permissions necessary for your intended use. For example, other rights such as publicity, privacy, or moral rights may limit how you use the material. - -Use of trademarks: unfoldingWord is a trademark of Distant Shores Media and may not be included on any derivative works created from this content. Unaltered content from http://unfoldingword.org must include the unfoldingWord logo when distributed to others. But if you alter the content in any way, you must remove the unfoldingWord logo before distributing your work. - -Attribution of artwork: All images used in these stories are © Sweet Publishing (www.sweetpublishing.com) and are made available under a Creative Commons Attribution-Share Alike License (http://creativecommons.org/licenses/by-sa/3.0). - -This PDF was generated using Prince (https://www.princexml.com/). diff --git a/src/config/user-setting.json b/src/config/user-setting.json index 786fc3be0..7d0a5240d 100644 --- a/src/config/user-setting.json +++ b/src/config/user-setting.json @@ -126,14 +126,6 @@ "enabled": true, "visible": true }, - { - "name": "attribution", - "mainText": "Attribution", - "value": "", - "group": "legal", - "enabled": true, - "visible": true - }, { "name": "serversuite", "mainText": "Server Suite (e.g. WACS or DCS)", diff --git a/src/elements/ts-legal/ts-attribution.html b/src/elements/ts-legal/ts-attribution.html deleted file mode 100644 index 10defac27..000000000 --- a/src/elements/ts-legal/ts-attribution.html +++ /dev/null @@ -1,73 +0,0 @@ - - - - - - - - - - - - diff --git a/src/elements/ts-main/ts-dashboard.html b/src/elements/ts-main/ts-dashboard.html index 50a90b775..19f0e3fcb 100644 --- a/src/elements/ts-main/ts-dashboard.html +++ b/src/elements/ts-main/ts-dashboard.html @@ -27,7 +27,6 @@ - @@ -219,10 +218,6 @@ - - - - @@ -243,7 +238,6 @@ - @@ -327,14 +321,6 @@ }, 250); }, - openAttribution: function () { - var legal = this.$.attribution; - legal.open(); - setTimeout(function () { - legal.scrollTop = 0; - }, 250); - }, - updateUser: function (event, data) { App.configurator.setValue("userdata", data); this.checkUser(data); diff --git a/src/elements/ts-print/ts-print.html b/src/elements/ts-print/ts-print.html index 03164e09c..609bffca1 100644 --- a/src/elements/ts-print/ts-print.html +++ b/src/elements/ts-print/ts-print.html @@ -187,7 +187,7 @@

var imagePath = path.join(App.configurator.getValue('rootdir'), 'images', 'obs'); var chunks = this.currentproject.chunks; var options = this.currentproject.printoptions; - var filename = this.currentproject.projectmeta.project.id === "obs" ? "OBS_LICENSE.md" : "LICENSE.md"; + var filename = "LICENSE.md"; this.$.licenseholder.markdown = App.printManager.getLicense(filename); this.$.title.innerHTML = chunks[0].transcontent || chunks[0].srccontent; diff --git a/src/elements/ts-settings/ts-settings.html b/src/elements/ts-settings/ts-settings.html index dbd9d999c..16aa7782f 100644 --- a/src/elements/ts-settings/ts-settings.html +++ b/src/elements/ts-settings/ts-settings.html @@ -273,8 +273,6 @@ this.fire('iron-signal', {name: 'openstatement'}); } else if (name === "software") { this.fire('iron-signal', {name: 'opensoftware'}); - } else if (name === "attribution") { - this.fire('iron-signal', {name: 'openattribution'}); } else if (typeof value === 'boolean') { var path = 'settings.' + event.target.dataGroup + '.list.' + event.target.dataList + '.value'; this.set(path, !value); diff --git a/src/js/projects.js b/src/js/projects.js index e4b481b38..88b875a47 100644 --- a/src/js/projects.js +++ b/src/js/projects.js @@ -400,7 +400,7 @@ function ProjectsManager(dataManager, configurator, reporter, git, migrator) { var setLicense = function () { var srcDir = path.resolve(path.join(__dirname, '..')); - var file = meta.project.id === 'obs' ? 'OBS_LICENSE.md' : 'LICENSE.md'; + var file = 'LICENSE.md'; return read(path.join(srcDir, 'assets', file)) .then(function(data) { return write(paths.license, data);