From a8e6fe199836cebe0ae489b6206eb061be1ed331 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Benqu=C3=A9?= Date: Fri, 6 Nov 2020 16:11:30 +0000 Subject: [PATCH] Remove links to FAQ --- www/common/common-ui-elements.js | 10 +++++++--- www/common/drive-ui.js | 12 +++++++----- www/common/inner/share.js | 2 +- www/common/sframe-common-file.js | 4 ++-- 4 files changed, 17 insertions(+), 11 deletions(-) diff --git a/www/common/common-ui-elements.js b/www/common/common-ui-elements.js index 8c9aa58aa..aeef5c1b6 100644 --- a/www/common/common-ui-elements.js +++ b/www/common/common-ui-elements.js @@ -364,7 +364,7 @@ define([ h('div.cp-teams-invite-block', [ h('span', Messages.team_inviteLinkSetPassword), h('a.cp-teams-help.fa.fa-question-circle', { - href: origin + '/faq.html#security-pad_password', + href: origin + 'https://docs.cryptpad.fr/en/user_guide/security.html#passwords-for-documents-and-folders', target: "_blank", 'data-tippy-placement': "right" }) @@ -2168,12 +2168,16 @@ define([ // Owned pads // Default is Owned pad + // XXX Remove creation_owned1 and creation_owned2 keys var owned = h('div.cp-creation-owned', [ UI.createCheckbox('cp-creation-owned', Messages.creation_owned, true), - createHelper('/faq.html#keywords-owned', Messages.creation_owned1) + createHelper('https://docs.cryptpad.fr/en/user_guide/share_and_access.html#owners', Messages.creation_owned1) ]); // Life time + + // XXX rewrite "creation_expire2": "An expiring pad has a set lifetime, after which it will be automatically removed from the server and other users' CryptDrives." + var expire = h('div.cp-creation-expire', [ UI.createCheckbox('cp-creation-expire', Messages.creation_expire, false), h('span.cp-creation-expire-picker.cp-creation-slider', [ @@ -2192,7 +2196,7 @@ define([ }, Messages.creation_expireMonths) ]) ]), - createHelper('/faq.html#keywords-expiring', Messages.creation_expire2), + createHelper('https://docs.cryptpad.fr/en/user_guide/apps/general.html#new-document', Messages.creation_expire2), ]); // Password diff --git a/www/common/drive-ui.js b/www/common/drive-ui.js index 86ea33339..7cb3bf0ff 100644 --- a/www/common/drive-ui.js +++ b/www/common/drive-ui.js @@ -2472,9 +2472,8 @@ define([ // Get the upload options var addSharedFolderModal = function (cb) { - var createHelper = function (href, text) { - return UI.createHelper(APP.origin + href, text); - }; + + var docsHref = common.getBounceURL("https://docs.cryptpad.fr/en/user_guide/share_and_access.html#owners"); // Ask for name, password and owner var content = h('div', [ @@ -2487,7 +2486,7 @@ define([ style: 'display:flex;align-items:center;justify-content:space-between' }, [ UI.createCheckbox('cp-app-drive-sf-owned', Messages.sharedFolders_create_owned, true), - createHelper('/faq.html#keywords-owned', Messages.creation_owned1) // TODO + UI.createHelper(docsHref, Messages.creation_owned1) // TODO ]), ]); @@ -4344,6 +4343,9 @@ define([ return void UI.warn(Messages.error); } // if folder does not contains SF + + // XXX rewrite "creation_owned1": "An owned pad can be deleted from the server whenever the owner wants. Deleting an owned pad removes it from other users' CryptDrives." + // tipy used in dialog to create a shared folder else { var convertContent = h('div', [ h('p', Messages.convertFolderToSF_confirm), @@ -4356,7 +4358,7 @@ define([ style: 'display:flex;align-items:center;justify-content:space-between' }, [ UI.createCheckbox('cp-upload-owned', Messages.sharedFolders_create_owned, true), - UI.createHelper(APP.origin + '/faq.html#keywords-owned', Messages.creation_owned1) + UI.createHelper('https://docs.cryptpad.fr/en/user_guide/share_and_access.html#owners', Messages.creation_owned1) ]), ]); return void UI.confirm(convertContent, function(res) { diff --git a/www/common/inner/share.js b/www/common/inner/share.js index f3ca53f75..88a5cb04f 100644 --- a/www/common/inner/share.js +++ b/www/common/inner/share.js @@ -252,7 +252,7 @@ define([ h('a', {href: '#'}, Messages.passwordFaqLink) ]); $(link).click(function () { - opts.common.openURL(opts.origin + "/faq.html#security-pad_password"); + opts.common.openUnsafeURL("https://docs.cryptpad.fr/en/user_guide/security.html#passwords-for-documents-and-folders"); }); return link; }; diff --git a/www/common/sframe-common-file.js b/www/common/sframe-common-file.js index c9e2eeacd..a150a4acf 100644 --- a/www/common/sframe-common-file.js +++ b/www/common/sframe-common-file.js @@ -315,7 +315,7 @@ define([ style: 'display:flex;align-items:center;justify-content:space-between' }, [ UI.createCheckbox('cp-upload-owned', Messages.upload_modal_owner, modalState.owned), - createHelper('/faq.html#keywords-owned', Messages.creation_owned1) + createHelper('https://docs.cryptpad.fr/en/user_guide/share_and_access.html#owners', Messages.creation_owned1) ]), manualStore ]); @@ -370,7 +370,7 @@ define([ style: 'display:flex;align-items:center;justify-content:space-between' }, [ UI.createCheckbox('cp-upload-owned', Messages.uploadFolder_modal_owner, modalState.owned), - createHelper('/faq.html#keywords-owned', Messages.creation_owned1) + createHelper('https://docs.cryptpad.fr/en/user_guide/share_and_access.html#owners', Messages.creation_owned1) ]), manualStore ]);