Skip to content

Commit

Permalink
Added privay link to main screen for issue #57
Browse files Browse the repository at this point in the history
  • Loading branch information
rooey committed Jun 10, 2020
1 parent 4e6d090 commit 62e001d
Show file tree
Hide file tree
Showing 7 changed files with 85 additions and 11 deletions.
12 changes: 12 additions & 0 deletions src/_locales/en/messages.json
Expand Up @@ -39,6 +39,10 @@
"message": "Opened files limit",
"description": "Files limit configuration option."
},
"bugConfigText": {
"message": "Automatic Bug Reporting",
"description": "Manage your data collection preferences."
},
"mountHeader": {
"message": "Mount your OneDrive",
"description": "Header describing the server mount form."
Expand All @@ -58,5 +62,13 @@
"mountFail": {
"message": "Failed to mount.",
"description": "Popup notifcation that informs the user that the system failed to mount a new instance with the credentials they provided."
},
"privacyLink": {
"message": "Privacy policy.",
"description": "How we manage your data, privacy and keep you secure."
},
"privacyLinkText": {
"message": "Enable or disabable automatic bug reporting",
"description": "Privacy options to enable and disable automatic bug reporting."
}
}
4 changes: 2 additions & 2 deletions src/manifest.json
Expand Up @@ -3,8 +3,8 @@
"name": "__MSG_appName__",
"short_name": "__MSG_shortName__",
"description": "__MSG_appDescription__",
"version": "3.0.0.36070",
"version_name": "3.0.0 Beta 2 - Build 36070",
"version": "3.0.0.36113",
"version_name": "3.0.0 Beta 2 - Build 36113",
"default_locale": "en",
"permissions": [
"identity",
Expand Down
2 changes: 1 addition & 1 deletion src/scripts/background.js
Expand Up @@ -17,7 +17,7 @@ const background = () => {
chrome.app.window.create('window.html', {
outerBounds: {
width: 600,
height: 350
height: 420
},
resizable: false
});
Expand Down
5 changes: 3 additions & 2 deletions src/scripts/http_fetcher.js
Expand Up @@ -82,7 +82,7 @@ class HttpFetcher {
}

sendMessageToSentry(message, error, textStatus, errorThrown) {
if (Raven.isSetup()) {
/*if (Raven.isSetup()) {
Raven.captureMessage(new Error(message), {
extra: {
error: error,
Expand All @@ -94,7 +94,8 @@ class HttpFetcher {
'app.version': chrome.runtime.getManifest().version
}
});
}
}*/
console.log('sentrylognotsent:', message, error, textStatus, errorThrown);
}

};
Expand Down
5 changes: 3 additions & 2 deletions src/scripts/onedrive_fs.js
Expand Up @@ -477,14 +477,15 @@ class OneDriveFS {
};

sendMessageToSentry(message, extra) {
if (Raven.isSetup()) {
/*if (Raven.isSetup()) {
Raven.captureMessage(new Error(message), {
extra: extra,
tags: {
'app.version': chrome.runtime.getManifest().version
}
});
}
}*/
console.log('sentrylognotsent:', message, extra);
};

getWatchers(fileSystemId) {
Expand Down
25 changes: 25 additions & 0 deletions src/styles/style.css
Expand Up @@ -46,6 +46,12 @@ div.container-fluid {
position: absolute;
}

div.formBox {
float: left;
text-align: left;
font-size: 14px;
}

.footer div {
color: white;
font-size: 32px;
Expand All @@ -54,6 +60,25 @@ div.container-fluid {
cursor: pointer;
}

.footer div.box1 {
float: left;
text-align: right;
font-size: 14px;
}

.footer div.box2 {
float: right;
margin-right: 10px;
text-align: right;
font-size: 14px;
align-self: flex-end;
}

.footer div.privacyLink {
text-align: right;
font-size: 14px;
}

img.season {
position: absolute;
}
43 changes: 39 additions & 4 deletions src/window.html
Expand Up @@ -34,7 +34,14 @@ <h2><div data-message="appTitle"></div></h2>
<button id="btnMount" class="btn btn-primary" data-message="mount"></button>
</div>
<div class="footer">
<div class="box1">
<div id="btnSettings" class="glyphicon glyphicon-cog" aria-hidden="true"></div>
</div>
<div class="box2">
<label>
<a href="https://github.com/rooey/chromeos-filesystem-onedrive/blob/master/docs/privacy.md" target="_blank"><div class="box2" data-message="privacyLink"></div></a>
</label>
</div>
</div>
</div>

Expand Down Expand Up @@ -72,20 +79,48 @@ <h2><div data-message="appTitle"></div></h2>
</div>
</div>
<div class="form-group">
<div class="formBox">
<label class="col-sm-2 control-label"><div data-message="bugLinkTitle"></div></label>
<div class="col-sm-10">
<label class="checkbox-inline">
<a href="https://github.com/rooey/chromeos-filesystem-onedrive/issues" target="_blank"><div data-message="bugLinkText"></div></a>
<a href="https://github.com/rooey/chromeos-filesystem-onedrive/issues" target="_blank"><div data-message="bugLinkText"></div></a>
</label>
</div>
<div class="form-group"></div>
</div>
</div>
<div class="formBox">
<div>
<label class="col-sm-2 control-label"><div data-message="configManageSectionText"></div></label>
<div class="col-sm-10">
<label class="checkbox-inline">
<a href="https://account.live.com/consent/Manage" target="_blank"><div data-message="configManageLinkText"></div></a>
<a href="https://account.live.com/consent/Manage" target="_blank"><div data-message="configManageLinkText"></div></a>
</label>
</div>
</div>
</div>
</div>
<div class="form-group">
<div class="formBox">
<label class="col-sm-2 control-label"><div data-message="bugConfigText"></div></label>
<div class="col-sm-10">
<label class="checkbox-inline">
<input type="radio" id="useSentryOn" name="useSentry" value="0"> On
</label>
<label class="checkbox-inline">
<input type="radio" id="useSentryOff" name="useSentry" value="1"> Off
</label>
</div>
</div>
<div class="formBox">
<label class="col-sm-2 control-label"><div data-message=""></div></label>
<div class="col-sm-10">
<label class="checkbox-inline">
<div data-message="privacyLinkText"></div>
<a href="https://github.com/rooey/chromeos-filesystem-onedrive/blob/master/docs/privacy.md" target="_blank"><div data-message="privacyLink"></div></a>
</label>
</div>
</div>
</div>
</div>
</form>
<div class="modal-footer">
<button type="button" class="btn btn-default" data-dismiss="modal">Close</button>
Expand Down

0 comments on commit 62e001d

Please sign in to comment.