From ad4aca4e5f62940ac02af28d3787f41c1e246237 Mon Sep 17 00:00:00 2001 From: Pierre Bondoerffer Date: Wed, 2 Aug 2017 11:22:52 +0200 Subject: [PATCH] actually do the changes intended in previous commit --- config.example.js | 1 + customize.dist/pages.js | 84 ++++++++++++++++++++++++++--------------- 2 files changed, 54 insertions(+), 31 deletions(-) diff --git a/config.example.js b/config.example.js index 081f2a04b..f8c1499ae 100644 --- a/config.example.js +++ b/config.example.js @@ -119,6 +119,7 @@ module.exports = { 'terms', 'about', 'contact', + 'what-is-cryptpad' ], /* Limits, Donations, Subscriptions and Contact diff --git a/customize.dist/pages.js b/customize.dist/pages.js index f28f790ae..80aa28d29 100644 --- a/customize.dist/pages.js +++ b/customize.dist/pages.js @@ -143,51 +143,61 @@ define([ }; Pages['/about.html'] = function () { - return h('div#main_other', [ - h('center', [ - h('h1', Msg.about) + return h('div#cp-main.cp-page-privacy', [ + infopageTopbar(), + h('div.container.cp-container', [ + h('center', [ + h('h1', Msg.about) + ]), + setHTML(h('p'), Msg.main_p2), + h('h2', Msg.main_howitworks), + setHTML(h('p'), Msg.main_howitworks_p1) ]), - setHTML(h('p'), Msg.main_p2), - h('h2', Msg.main_howitworks), - setHTML(h('p'), Msg.main_howitworks_p1) + infopageFooter() ].concat(indexContent())); }; Pages['/privacy.html'] = function () { - return h('div#main_other', [ - h('center', h('h1', Msg.policy_title)), - h('h2', Msg.policy_whatweknow), - h('p', Msg.policywhatweknow_p1), - - h('h2', Msg.policy_howweuse), - h('p', Msg.policy_howweuse_p1), - h('p', Msg.policy_howweuse_p2), + return h('div#cp-main.cp-page-privacy', [ + infopageTopbar(), + h('div.container.cp-container', [ + h('center', h('h1', Msg.policy_title)), + h('h2', Msg.policy_whatweknow), + h('p', Msg.policywhatweknow_p1), - h('h2', Msg.policy_whatwetell), - h('p', Msg.policy_whatwetell_p1), + h('h2', Msg.policy_howweuse), + h('p', Msg.policy_howweuse_p1), + h('p', Msg.policy_howweuse_p2), - h('h2', Msg.policy_links), - h('p', Msg.policy_links_p1), + h('h2', Msg.policy_whatwetell), + h('p', Msg.policy_whatwetell_p1), - h('h2', Msg.policy_ads), - h('p', Msg.policy_ads_p1), + h('h2', Msg.policy_links), + h('p', Msg.policy_links_p1), - h('h2', Msg.policy_choices), - h('p', Msg.policy_choices_open), - setHTML(h('p'), Msg.policy_choices_vpn), + h('h2', Msg.policy_ads), + h('p', Msg.policy_ads_p1), - h('br') + h('h2', Msg.policy_choices), + h('p', Msg.policy_choices_open), + setHTML(h('p'), Msg.policy_choices_vpn), + ]), + infopageFooter() ]); }; Pages['/terms.html'] = function () { - return h('div#main_other', [ - h('center', h('h1', Msg.tos_title)), - h('p', Msg.tos_legal), - h('p', Msg.tos_availability), - h('p', Msg.tos_e2ee), - h('p', Msg.tos_logs), - h('p', Msg.tos_3rdparties), + return h('div#cp-main.cp-page-terms', [ + infopageTopbar(), + h('div.container.cp-container', [ + h('center', h('h1', Msg.tos_title)), + h('p', Msg.tos_legal), + h('p', Msg.tos_availability), + h('p', Msg.tos_e2ee), + h('p', Msg.tos_logs), + h('p', Msg.tos_3rdparties), + ]), + infopageFooter() ]); }; @@ -202,6 +212,18 @@ define([ ]); }; + Pages['/what-is-cryptpad.html'] = function () { + return h('div#cp-main.cp-page-what-is-cryptpad', [ + infopageTopbar(), + h('div.container.cp-container', [ + h('center', h('h1', 'What is Cryptpad')), //TODO: add translation + setHTML(h('p'), Msg.main_about_p2) + ]), + infopageFooter(), + ]); + }; + + var userForm = function () { return h('div#userForm.form-group.hidden', [ h('input#name.form-control', {