Skip to content

Remove attribution (OBS) #53

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
AnonymousWalker wants to merge 2 commits into
base: develop
Choose a base branch
from
Open

Remove attribution (OBS) #53

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c06354e
remove attribution in setting
AnonymousWalker May 28, 2021
9d44fa5
remove obs license
AnonymousWalker Jun 1, 2021
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
42 changes: 0 additions & 42 deletions src/assets/OBS_LICENSE.md
View file
Open in desktop

This file was deleted.

8 changes: 0 additions & 8 deletions src/config/user-setting.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)",
Expand Down
73 changes: 0 additions & 73 deletions src/elements/ts-legal/ts-attribution.html
View file
Open in desktop

This file was deleted.

14 changes: 0 additions & 14 deletions src/elements/ts-main/ts-dashboard.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@
<link rel="import" href="../ts-legal/ts-statement.html">
<link rel="import" href="../ts-legal/ts-guidelines.html">
<link rel="import" href="../ts-legal/ts-software.html">
<link rel="import" href="../ts-legal/ts-attribution.html">

<dom-module id="ts-dashboard">

Expand Down Expand Up @@ -219,10 +218,6 @@
<ts-software></ts-software>
</paper-dialog>

<paper-dialog id="attribution" class="popup legal" modal="true" entry-animation="scale-up-animation" exit-animation="scale-down-animation">
<ts-attribution></ts-attribution>
</paper-dialog>

<paper-dialog id="conflict" class="popup" modal="true" entry-animation="scale-up-animation" exit-animation="scale-down-animation">
<ts-conflict currentproject="[[currentproject]]" importdata="{{importdata}}" currentuser="[[currentuser]]" on-startrepoimport="startRepoImport"></ts-conflict>
</paper-dialog>
Expand All @@ -243,7 +238,6 @@
<iron-signals on-iron-signal-openguidelines="openGuidelines"></iron-signals>
<iron-signals on-iron-signal-openstatement="openStatement"></iron-signals>
<iron-signals on-iron-signal-opensoftware="openSoftware"></iron-signals>
<iron-signals on-iron-signal-openattribution="openAttribution"></iron-signals>
<iron-signals on-iron-signal-changeproject="changeProject"></iron-signals>
<iron-signals on-iron-signal-deleteproject="deleteProject"></iron-signals>
<iron-signals on-iron-signal-openupdate="openUpdate"></iron-signals>
Expand Down Expand Up @@ -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);
Expand Down
2 changes: 1 addition & 1 deletion src/elements/ts-print/ts-print.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -187,7 +187,7 @@ <h1 id="title" class="break titles targetfont"></h1>
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;
Expand Down
2 changes: 0 additions & 2 deletions src/elements/ts-settings/ts-settings.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
2 changes: 1 addition & 1 deletion src/js/projects.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down