From 41a36e2e1877b4a2ab6751c011e80582f8ccbcf2 Mon Sep 17 00:00:00 2001 From: Sheogorath Date: Wed, 23 May 2018 01:14:52 +0200 Subject: Add privacy and ToS links To be GDPR compliant we need to provide privacy statement. These should be linked on the index page. So as soon as a document exist under `public/docs/privacy.md` the link will show up. Since we already add legal links, we also add Terms of Use, which will show up as soon as `public/docs/terms-of-use.md` exists. This should allow everyone to provide the legal documents they need for GDPR and other privacy and business laws. Signed-off-by: Sheogorath --- public/views/index/body.ejs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'public/views') diff --git a/public/views/index/body.ejs b/public/views/index/body.ejs index d8766fec..e3a3a85c 100644 --- a/public/views/index/body.ejs +++ b/public/views/index/body.ejs @@ -147,7 +147,7 @@

- © 2018 HackMD | <%= __('Releases') %> + © 2018 HackMD | <%= __('Releases') %><% if(privacyStatement) { %> | <%= __('Privacy') %><% } %><% if(termsOfUse) { %> | <%= __('Terms of Use') %><% } %>

<%- __('Follow us on %s and %s.', ' GitHub, Twitter', ' Facebook') %> -- cgit v1.3.1 From 9fd09a8dfb8c59a44e9b2b51658e9e638a855635 Mon Sep 17 00:00:00 2001 From: Sheogorath Date: Fri, 25 May 2018 17:03:35 +0200 Subject: Add delete user UI This provides the UI for the delete user feature introduced in 4229084c6211db3d22cd9abec99b957725650b9e Placing of the user delete button is not perfect, but can be moved to an own user tab later on. Signed-off-by: Sheogorath --- locales/en.json | 7 +++++-- public/js/cover.js | 20 ++++++++++++-------- public/views/index/body.ejs | 33 +++++++++++++++++++++++++++------ 3 files changed, 44 insertions(+), 16 deletions(-) (limited to 'public/views') diff --git a/locales/en.json b/locales/en.json index b19089e4..8b2574a7 100644 --- a/locales/en.json +++ b/locales/en.json @@ -107,5 +107,8 @@ "Night Theme": "Night Theme", "Follow us on %s and %s.": "Follow us on %s, and %s.", "Privacy": "Privacy", - "Terms of Use": "Terms of Use" -} \ No newline at end of file + "Terms of Use": "Terms of Use", + "Do you really want to delete your user account?": "Do you really want to delete your user account?", + "This will delete your account, all notes that are owned by you and remove all references to your account from other notes.": "This will delete your account, all notes that are owned by you and remove all references to your account from other notes.", + "Delete user": "Delete user" +} diff --git a/public/js/cover.js b/public/js/cover.js index c9c2b6cb..2a09b4c3 100644 --- a/public/js/cover.js +++ b/public/js/cover.js @@ -39,7 +39,7 @@ const options = { '' + '
' + '
' + - '
' + + '
' + '
' + '

' + '

' + @@ -208,8 +208,8 @@ function historyCloseClick (e) { e.preventDefault() const id = $(this).closest('a').siblings('span').html() const value = historyList.get('id', id)[0]._values - $('.ui-delete-modal-msg').text('Do you really want to delete below history?') - $('.ui-delete-modal-item').html(` ${value.text}
${value.time}`) + $('.ui-delete-history-modal-msg').text('Do you really want to delete below history?') + $('.ui-delete-history-modal-item').html(` ${value.text}
${value.time}`) clearHistory = false deleteId = id } @@ -277,7 +277,7 @@ function deleteHistory () { checkHistoryList() } } - $('.delete-modal').modal('hide') + $('.delete-history-modal').modal('hide') deleteId = null clearHistory = false }) @@ -297,12 +297,12 @@ function deleteHistory () { deleteId = null }) } - $('.delete-modal').modal('hide') + $('.delete-history-modal').modal('hide') clearHistory = false }) } -$('.ui-delete-modal-confirm').click(() => { +$('.ui-delete-history-modal-confirm').click(() => { deleteHistory() }) @@ -342,8 +342,8 @@ $('.ui-open-history').bind('change', e => { }) $('.ui-clear-history').click(() => { - $('.ui-delete-modal-msg').text('Do you really want to clear all history?') - $('.ui-delete-modal-item').html('There is no turning back.') + $('.ui-delete-history-modal-msg').text('Do you really want to clear all history?') + $('.ui-delete-history-modal-item').html('There is no turning back.') clearHistory = true deleteId = null }) @@ -371,6 +371,10 @@ $('.ui-refresh-history').click(() => { }) }) +$('.ui-delete-user-modal-cancel').click(() => { + $('.ui-delete-user').parent().removeClass('active') +}) + $('.ui-logout').click(() => { clearLoginState() location.href = `${serverurl}/logout` diff --git a/public/views/index/body.ejs b/public/views/index/body.ejs index e3a3a85c..d4350540 100644 --- a/public/views/index/body.ejs +++ b/public/views/index/body.ejs @@ -27,6 +27,7 @@

@@ -108,7 +109,7 @@ - + @@ -157,8 +158,8 @@
- - -- cgit v1.3.1 From 75f28ca7f3600ab6483f38ad47a0c8430858f5c3 Mon Sep 17 00:00:00 2001 From: Sheogorath Date: Sat, 26 May 2018 03:19:10 +0200 Subject: Add export data UI This adds the UI for the export feature introduced in bcbb8c67c9f8092643c318140f6613324f306bd2 It allows to download all notes from the main page in the default user submenu. Signed-off-by: Sheogorath --- locales/en.json | 3 ++- public/views/index/body.ejs | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) (limited to 'public/views') diff --git a/locales/en.json b/locales/en.json index 8b2574a7..f9c29b53 100644 --- a/locales/en.json +++ b/locales/en.json @@ -110,5 +110,6 @@ "Terms of Use": "Terms of Use", "Do you really want to delete your user account?": "Do you really want to delete your user account?", "This will delete your account, all notes that are owned by you and remove all references to your account from other notes.": "This will delete your account, all notes that are owned by you and remove all references to your account from other notes.", - "Delete user": "Delete user" + "Delete user": "Delete user", + "Export user data": "Export user data" } diff --git a/public/views/index/body.ejs b/public/views/index/body.ejs index f28ab11d..a7c5a0b8 100644 --- a/public/views/index/body.ejs +++ b/public/views/index/body.ejs @@ -27,6 +27,7 @@ -- cgit v1.3.1