Clean up XXX notes

pull/1/head
David Benqué 4 years ago
parent f9f23fc464
commit ddf464ceab

@ -62,12 +62,10 @@ define([
var imprintUrl = AppConfig.imprint && (typeof(AppConfig.imprint) === "boolean" ? var imprintUrl = AppConfig.imprint && (typeof(AppConfig.imprint) === "boolean" ?
'/imprint.html' : AppConfig.imprint); '/imprint.html' : AppConfig.imprint);
// XXX // XXX translations
Msg.docs_link = "Documentation"; Msg.docs_link = "Documentation";
// XXX Remove FAQ from translations Msg.footer_team = "Contributors";
// XXX Add FAQ to docs Msg.footer_tos = "Terms of Service";
Msg.footer_team = "Contributors"; // XXX existing key
Msg.footer_tos = "Terms of Service"; // XXX existing key
Pages.versionString = "v3.25.0 (ZyzomysPedunculatus)"; Pages.versionString = "v3.25.0 (ZyzomysPedunculatus)";

@ -6,7 +6,7 @@ define([
'/common/outer/local-store.js' '/common/outer/local-store.js'
], function (Config, h, Msg, Pages, LocalStore) { ], function (Config, h, Msg, Pages, LocalStore) {
// XXX // XXX translations
Msg.contact_adminHint = "For any issues related to your account, storage limit, or availability of the service."; // existing key Msg.contact_adminHint = "For any issues related to your account, storage limit, or availability of the service."; // existing key
@ -38,7 +38,7 @@ define([
) )
) )
) : undefined, ) : undefined,
(adminMailbox && LocalStore.isLoggedIn()) ? h('div.col-12.col-sm-6.col-md-3.col-lg-3', // XXX show "disabled" support if not logged in (adminMailbox && LocalStore.isLoggedIn()) ? h('div.col-12.col-sm-6.col-md-3.col-lg-3',
h('a.card', {href : "/support/"}, h('a.card', {href : "/support/"},
h('div.card-body', h('div.card-body',
h('p', [ h('p', [

@ -13,10 +13,10 @@ define([
upgradeURL: AppConfig.upgradeURL || 'https://accounts.cryptpad.fr/#/?on=' + origin, upgradeURL: AppConfig.upgradeURL || 'https://accounts.cryptpad.fr/#/?on=' + origin,
}; };
Msg.features_title = "Features"; // XXX existing key // XXX translations
Msg.features_title = "Features";
return function () { return function () {
// XXX ALL are existing keys
// Non-registered column // Non-registered column
Msg.features_anon = "Non-registered"; Msg.features_anon = "Non-registered";
Msg.features_f_apps = "Access to all the applications"; Msg.features_f_apps = "Access to all the applications";
@ -36,13 +36,13 @@ define([
Msg.features_f_social = "Social Features"; Msg.features_f_social = "Social Features";
Msg.features_f_social_note = "Add contacts for secure collaboration, create a profile, fine-grained access controls"; Msg.features_f_social_note = "Add contacts for secure collaboration, create a profile, fine-grained access controls";
// Msg.features_f_file1 = ""; // Msg.features_f_file1 = "";
// XXX hard coding file limit in keys? // XXX add instance limit
Msg.features_f_file1_note = "Store files in your CryptDrive: images, PDFs, videos, and more. Share them with your contacts or embed them in your documents. (up to 25MB)"; Msg.features_f_file1_note = "Store files in your CryptDrive: images, PDFs, videos, and more. Share them with your contacts or embed them in your documents. (up to 25MB)";
// Msg.features_f_cryptdrive1 = ""; // Msg.features_f_cryptdrive1 = "";
// Msg.features_f_cryptdrive1_note = ""; // Msg.features_f_cryptdrive1_note = "";
// Msg.features_f_devices = ""; // Msg.features_f_devices = "";
// Msg.features_f_devices_note = ""; // Msg.features_f_devices_note = "";
// XXX hard coding storage limit in keys? // XXX add instance limit
Msg.features_f_storage1 = "Permanent Storage (1GB)"; Msg.features_f_storage1 = "Permanent Storage (1GB)";
Msg.features_f_storage1_note = "Documents stored in your CryptDrive are never deleted for inactivity"; Msg.features_f_storage1_note = "Documents stored in your CryptDrive are never deleted for inactivity";
// Premium column // Premium column
@ -120,7 +120,6 @@ define([
href: '/register/' href: '/register/'
}, h('button.cp-features-register-button', Msg.features_f_register)) }, h('button.cp-features-register-button', Msg.features_f_register))
]), ]),
// XXX remove Msg.features_f_register_note
]), ]),
]), ]),
]); ]);

@ -72,29 +72,6 @@ define([
}); });
UI.addTooltips(); UI.addTooltips();
/* // XXX remove this commented code?
var more = icons.length < 4? undefined: h('div.bs-callout.cp-callout-more', [
h('div.cp-callout-more-lessmsg.cp-hidden', [
"see less ",
h('i.fa.fa-caret-up')
]),
h('div.cp-callout-more-moremsg', [
"see more ",
h('i.fa.fa-caret-down')
]),
{
onclick: function () {
if (showingMore) {
$('.cp-more, .cp-callout-more-lessmsg').addClass('cp-hidden');
$('.cp-callout-more-moremsg').removeClass('cp-hidden');
} else {
$('.cp-more, .cp-callout-more-lessmsg').removeClass('cp-hidden');
$('.cp-callout-more-moremsg').addClass('cp-hidden');
}
showingMore = !showingMore;
}
}
]);*/
// XXX move this button to pages.js to make it available to other pages // XXX move this button to pages.js to make it available to other pages
var _link = h('a', { var _link = h('a', {
@ -112,7 +89,7 @@ define([
Feedback.send('HOME_SUPPORT_CRYPTPAD'); Feedback.send('HOME_SUPPORT_CRYPTPAD');
}); });
// XXX // XXX translations
Msg.home_privacy_title = "Private by design"; Msg.home_privacy_title = "Private by design";
Msg.home_privacy_text = "CryptPad is built to enable collaboration while keeping data private. All information including documents, chats, and files is encrypted and decrypted by your browser. This means nothing is readable outside of the session where you are logged in. Even the service administrators do not have access to your information."; Msg.home_privacy_text = "CryptPad is built to enable collaboration while keeping data private. All information including documents, chats, and files is encrypted and decrypted by your browser. This means nothing is readable outside of the session where you are logged in. Even the service administrators do not have access to your information.";
Msg.home_host_title = "About this instance"; Msg.home_host_title = "About this instance";
@ -159,7 +136,8 @@ define([
]) ])
]; ];
Msg.main_catch_phrase = "Collaboration suite,<br>encrypted and open-source"; // XXX existing key // XXX translation
Msg.main_catch_phrase = "Collaboration suite,<br>encrypted and open-source";
return [ return [
h('div#cp-main', [ h('div#cp-main', [
Pages.infopageTopbar(), Pages.infopageTopbar(),
@ -176,17 +154,9 @@ define([
]), ]),
h('div.col-md-5.cp-app-grid', [ h('div.col-md-5.cp-app-grid', [
icons, icons,
// XXX remove this commented code?
//more
]) ])
]), ]),
blocks, blocks,
// XXX remove this commented code?
/*h('div.row', [
h('div.cp-crowdfunding', [
crowdFunding
])
])*/
]), ]),
]), ]),
Pages.infopageFooter(), Pages.infopageFooter(),

@ -9,12 +9,11 @@ define([
return function () { return function () {
var urlArgs = Config.requireConf.urlArgs; var urlArgs = Config.requireConf.urlArgs;
// XXX // XXX translations
Msg.register_header = "Register"; // existing key Msg.register_header = "Register"; // existing key
Msg.register_notes_title = "Important notes"; Msg.register_notes_title = "Important notes";
Msg.register_notes = '<ul class="cp-notes-list"><li>Your password is your secret key which encrypts all of your pads. <span class="red">If you lose it there is no way we can recover your data.</span></li><li>If you are using a shared computer, <span class="red">remember to log out</span> when you are done. Only closing the browser window leaves your documents exposed. </li><li>To keep the documents you created and/or stored without being logged in, tick "Import documents from your anonymous session". </li></ul>'; Msg.register_notes = '<ul class="cp-notes-list"><li>Your password is your secret key which encrypts all of your pads. <span class="red">If you lose it there is no way we can recover your data.</span></li><li>If you are using a shared computer, <span class="red">remember to log out</span> when you are done. Only closing the browser window leaves your documents exposed. </li><li>To keep the documents you created and/or stored without being logged in, tick "Import documents from your anonymous session". </li></ul>';
Msg.register_importRecent = "Import documents from your anonymous session"; // existing key Msg.register_importRecent = "Import documents from your anonymous session"; // existing key
// XXX remove Msg.register_explanation
return [h('div#cp-main', [ return [h('div#cp-main', [
Pages.infopageTopbar(), Pages.infopageTopbar(),

@ -6,20 +6,16 @@ define([
], function (Config, h, Msg, Pages) { ], function (Config, h, Msg, Pages) {
var urlArgs = Config.requireConf.urlArgs; var urlArgs = Config.requireConf.urlArgs;
// XXX // XXX translations
Msg.whatis_collaboration = "Private Collaboration"; // existing key Msg.whatis_collaboration = "Private Collaboration"; // existing key
Msg.whatis_collaboration_info = '<p>CryptPad is built to enable collaboration, synchronizing in real time between users editing the same document, but has no access to the content of the document or data about users. Because all data is encrypted, the service and its administrators have no way of seeing the content being edited and stored.</p><p>Collaborating in real time on online documents is now a common thing. A range of well known internet platforms offer this service. In order to enable collaboration, these services synchronize changes between all users. In the process they gain access to the content of the document and to data about the behaviour of users. While these services are often advertised as "free", platforms monetise user data by using it to profile users and selling advertising.</p>'; Msg.whatis_collaboration_info = '<p>CryptPad is built to enable collaboration, synchronizing in real time between users editing the same document, but has no access to the content of the document or data about users. Because all data is encrypted, the service and its administrators have no way of seeing the content being edited and stored.</p><p>Collaborating in real time on online documents is now a common thing. A range of well known internet platforms offer this service. In order to enable collaboration, these services synchronize changes between all users. In the process they gain access to the content of the document and to data about the behaviour of users. While these services are often advertised as "free", platforms monetise user data by using it to profile users and selling advertising.</p>';
// XXX remove whatis_collaboration_p1, p2, p3
Msg.whatis_apps = "A full suite of applications"; Msg.whatis_apps = "A full suite of applications";
Msg.whatis_apps_info = "<p>CryptPad provides a full-fledged office suite, with all the tools necessary for productive collaboration. Applications include: Rich Text, Spreadsheets, Code/Markdown, Kanban, Slides, Whiteboard and Polls.</p><p> A secure chat is available in each document for secure communication, [continue ...]</p>"; Msg.whatis_apps_info = "<p>CryptPad provides a full-fledged office suite, with all the tools necessary for productive collaboration. Applications include: Rich Text, Spreadsheets, Code/Markdown, Kanban, Slides, Whiteboard and Polls.</p><p> A secure chat is available in each document for secure communication, [continue ...]</p>";
// XXX remove all whatis_zeroknowledge keys
Msg.whatis_drive_info = "<p>Manage documents with CryptDrive. Create folders, shared folders, tags, [continue ...]</p>"; Msg.whatis_drive_info = "<p>Manage documents with CryptDrive. Create folders, shared folders, tags, [continue ...]</p>";
// XXX remove whatis_drive_p1, p2, p3
Msg.whatis_model = "Business model"; Msg.whatis_model = "Business model";
Msg.whatis_model_info = "<p>CryptPad is open source [continue ...]</p><p>CryptPad does not profit from its users data. This is because being fully encrypted it does not gather any useful data that could be sold to profile users. This lack of data is a feature, not a bug, it is part of a vision for online services that respect users privacy. Instead of pretending to be \"free\" like the big platforms CryptPad aims to build a financially sustainable model: funded willingly by users instead of profiting form personal information.</p><p>Since 2016, CryptPad is supported by French and European research grants such as BPI France, NLNet Foundation, NGI Trust, Mozilla Open Source Support, as well as donations and subscriptions to the service. Now that the feasibility of the project has been established, the next goal is to make financially sustainable through user funding. If you would like to support CryptPad and help make it a sustainable alternative to the big platforms, please consider making a donation.</p>"; Msg.whatis_model_info = "<p>CryptPad is open source [continue ...]</p><p>CryptPad does not profit from its users data. This is because being fully encrypted it does not gather any useful data that could be sold to profile users. This lack of data is a feature, not a bug, it is part of a vision for online services that respect users privacy. Instead of pretending to be \"free\" like the big platforms CryptPad aims to build a financially sustainable model: funded willingly by users instead of profiting form personal information.</p><p>Since 2016, CryptPad is supported by French and European research grants such as BPI France, NLNet Foundation, NGI Trust, Mozilla Open Source Support, as well as donations and subscriptions to the service. Now that the feasibility of the project has been established, the next goal is to make financially sustainable through user funding. If you would like to support CryptPad and help make it a sustainable alternative to the big platforms, please consider making a donation.</p>";
Msg.whatis_xwiki = "Made at XWiki"; Msg.whatis_xwiki = "Made at XWiki";
Msg.whatis_xwiki_info = "<p>CryptPad is made at XWiki, a company based in Paris that has been making open-source software for over 15 years. [continue ...]</p>"; Msg.whatis_xwiki_info = "<p>CryptPad is made at XWiki, a company based in Paris that has been making open-source software for over 15 years. [continue ...]</p>";
// XXX remove all whatis_business keys
return function () { return function () {
return h('div#cp-main', [ return h('div#cp-main', [
Pages.infopageTopbar(), Pages.infopageTopbar(),

@ -4,7 +4,7 @@
@colortheme_app-font: @colortheme_app-font-size @colortheme_font; @colortheme_app-font: @colortheme_app-font-size @colortheme_font;
@colortheme_logo-1: #326599; @colortheme_logo-1: #326599;
@colortheme_logo-2: #0087FF; // XXX Testing if this color works @colortheme_logo-2: #0087FF;
@colortheme_logo_2_light: lighten(@colortheme_logo-2, 40%); @colortheme_logo_2_light: lighten(@colortheme_logo-2, 40%);
@colortheme_loading_bg: #E7E7E7; @colortheme_loading_bg: #E7E7E7;

@ -117,7 +117,7 @@ body {
} }
} }
footer { footer {
@footer-color: #d9d9d9; // XXX move this @footer-color: #d9d9d9; // XXX use/make variable
background-color: @footer-color; background-color: @footer-color;
padding-top: 20px; padding-top: 20px;

@ -1530,7 +1530,7 @@ define([
var legalLine = template(Messages.info_imprintFlavour, Pages.imprintLink); var legalLine = template(Messages.info_imprintFlavour, Pages.imprintLink);
var privacyLine = template(Messages.info_privacyFlavour, Pages.privacyLink); var privacyLine = template(Messages.info_privacyFlavour, Pages.privacyLink);
// XXX existing key // XXX translation
Messages.help.generic.more = "Learn more about how CryptPad can work for you by reading our <a href=\"https://docs.cryptpad.fr\" target=\"_blank\">Documentation</a>."; Messages.help.generic.more = "Learn more about how CryptPad can work for you by reading our <a href=\"https://docs.cryptpad.fr\" target=\"_blank\">Documentation</a>.";
var faqLine = template(Messages.help.generic.more, Pages.docsLink); var faqLine = template(Messages.help.generic.more, Pages.docsLink);
@ -1684,7 +1684,7 @@ define([
'href': 'https://docs.cryptpad.fr', 'href': 'https://docs.cryptpad.fr',
'class': 'fa fa-book' 'class': 'fa fa-book'
}, },
content: h('span', Messages.docs_link) // XXX content: h('span', Messages.docs_link)
}); });
if (padType !== 'support' && accountName && Config.supportMailbox) { if (padType !== 'support' && accountName && Config.supportMailbox) {
options.push({ options.push({
@ -2115,7 +2115,8 @@ define([
//$creation.append(h('h2.cp-creation-title', Messages.newButtonTitle)); //$creation.append(h('h2.cp-creation-title', Messages.newButtonTitle));
var newPadH3Title = Messages['button_new' + type]; var newPadH3Title = Messages['button_new' + type];
Messages.creation_helperText = "Learn more..."; // XXX // XXX translation
Messages.creation_helperText = "Learn more...";
var title = h('div.cp-creation-title', [ var title = h('div.cp-creation-title', [
UI.getFileIcon({type: type})[0], UI.getFileIcon({type: type})[0],
h('div.cp-creation-title-text', [ h('div.cp-creation-title-text', [
@ -2185,18 +2186,15 @@ define([
// Owned pads // Owned pads
// Default is Owned pad // Default is Owned pad
// XXX Remove creation_owned1 and creation_owned2 keys
var owned = h('div.cp-creation-owned', [ var owned = h('div.cp-creation-owned', [
UI.createCheckbox('cp-creation-owned', Messages.creation_owned, true), UI.createCheckbox('cp-creation-owned', Messages.creation_owned, true),
]); ]);
// Life time // Life time
// XXX rewrite "creation_expire2": "An <b>expiring</b> pad has a set lifetime, after which it will be automatically removed from the server and other users' CryptDrives." // XXX translations
Messages.creation_expiration = "Expiration date";
Messages.creation_expiresIn = "Expires in";
Messages.creation_expiration = "Expiration date"; // XXX
Messages.creation_expiresIn = "Expires in"; // XXX
var expire = h('div.cp-creation-expire', [ var expire = h('div.cp-creation-expire', [
UI.createCheckbox('cp-creation-expire', Messages.creation_expiration, false, { UI.createCheckbox('cp-creation-expire', Messages.creation_expiration, false, {
labelAlt: Messages.creation_expiresIn labelAlt: Messages.creation_expiresIn
@ -2220,7 +2218,8 @@ define([
]); ]);
// Password // Password
Messages.creation_password = "Password"; // XXX // XXX translation
Messages.creation_password = "Password";
var password = h('div.cp-creation-password', [ var password = h('div.cp-creation-password', [
UI.createCheckbox('cp-creation-password', Messages.creation_password, false), UI.createCheckbox('cp-creation-password', Messages.creation_password, false),
h('span.cp-creation-password-picker.cp-creation-slider', [ h('span.cp-creation-password-picker.cp-creation-slider', [

@ -4377,8 +4377,6 @@ define([
} }
// if folder does not contains SF // if folder does not contains SF
// XXX rewrite "creation_owned1": "An <b>owned</b> 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 { else {
var convertContent = h('div', [ var convertContent = h('div', [
h('p', Messages.convertFolderToSF_confirm), h('p', Messages.convertFolderToSF_confirm),

@ -99,7 +99,7 @@ define([
return void UI.alert(Messages.register_mustAcceptTerms); return void UI.alert(Messages.register_mustAcceptTerms);
} }
// XXX // XXX translations
Messages.register_warning = "<i class='fa fa-warning'></i> Warning"; // existing key Messages.register_warning = "<i class='fa fa-warning'></i> Warning"; // existing key
Messages.register_warning_note = "Due to the encrypted nature of CrytpPad even the the service administrators will not be able to recover data in case the username and/or password are forgotten. Please save them in a safe place."; Messages.register_warning_note = "Due to the encrypted nature of CrytpPad even the the service administrators will not be able to recover data in case the username and/or password are forgotten. Please save them in a safe place.";
Messages.register_cancel = "Cancel"; // existing key Messages.register_cancel = "Cancel"; // existing key

Loading…
Cancel
Save