diff --git a/customize.dist/bg14.jpg b/customize.dist/bg14.jpg deleted file mode 100644 index 7f5211229..000000000 Binary files a/customize.dist/bg14.jpg and /dev/null differ diff --git a/customize.dist/bkwhat.jpg b/customize.dist/bkwhat.jpg deleted file mode 100644 index 90a2841e3..000000000 Binary files a/customize.dist/bkwhat.jpg and /dev/null differ diff --git a/customize.dist/images/apps-preview.png b/customize.dist/images/apps-preview.png new file mode 100644 index 000000000..83e4f701c Binary files /dev/null and b/customize.dist/images/apps-preview.png differ diff --git a/customize.dist/images/collaboration.png b/customize.dist/images/collaboration.png new file mode 100644 index 000000000..16e5dc77b Binary files /dev/null and b/customize.dist/images/collaboration.png differ diff --git a/customize.dist/images/drive-grid.png b/customize.dist/images/drive-grid.png new file mode 100644 index 000000000..8c9833662 Binary files /dev/null and b/customize.dist/images/drive-grid.png differ diff --git a/customize.dist/images/drive_screenshot.png b/customize.dist/images/drive_screenshot.png deleted file mode 100644 index 74f89c06d..000000000 Binary files a/customize.dist/images/drive_screenshot.png and /dev/null differ diff --git a/customize.dist/images/AGPLv3_Logo.svg b/customize.dist/images/logo_AGPLv3.svg similarity index 100% rename from customize.dist/images/AGPLv3_Logo.svg rename to customize.dist/images/logo_AGPLv3.svg diff --git a/customize.dist/images/logo_XWiki.svg b/customize.dist/images/logo_XWiki.svg new file mode 100644 index 000000000..270d03e63 --- /dev/null +++ b/customize.dist/images/logo_XWiki.svg @@ -0,0 +1,85 @@ + + diff --git a/customize.dist/images/logo_bpifrance.svg b/customize.dist/images/logo_bpifrance.svg new file mode 100644 index 000000000..4ea9e36a8 --- /dev/null +++ b/customize.dist/images/logo_bpifrance.svg @@ -0,0 +1,12 @@ + + \ No newline at end of file diff --git a/customize.dist/images/logo_moss.jpg b/customize.dist/images/logo_moss.jpg new file mode 100644 index 000000000..06c3a06dd Binary files /dev/null and b/customize.dist/images/logo_moss.jpg differ diff --git a/customize.dist/images/ngi.png b/customize.dist/images/logo_ngi.png similarity index 100% rename from customize.dist/images/ngi.png rename to customize.dist/images/logo_ngi.png diff --git a/customize.dist/images/logo_nlnet.svg b/customize.dist/images/logo_nlnet.svg new file mode 100644 index 000000000..1d1be5ecf --- /dev/null +++ b/customize.dist/images/logo_nlnet.svg @@ -0,0 +1,75 @@ + + + diff --git a/customize.dist/images/pad_screenshot.png b/customize.dist/images/pad_screenshot.png deleted file mode 100644 index cbb155697..000000000 Binary files a/customize.dist/images/pad_screenshot.png and /dev/null differ diff --git a/customize.dist/images/zeroknowledge_small.png b/customize.dist/images/zeroknowledge_small.png deleted file mode 100644 index dcef74f22..000000000 Binary files a/customize.dist/images/zeroknowledge_small.png and /dev/null differ diff --git a/customize.dist/pages/index.js b/customize.dist/pages/index.js index f2a5db4c9..e63230bba 100644 --- a/customize.dist/pages/index.js +++ b/customize.dist/pages/index.js @@ -94,6 +94,7 @@ define([ } ]);*/ + // XXX move this button to pages.js to make it available to other pages var _link = h('a', { href: "https://opencollective.com/cryptpad/", target: '_blank', @@ -142,7 +143,7 @@ define([ h('h2', Msg.home_opensource_title), Pages.setHTML(h('p'), Msg.home_opensource), h('img.small-logo', { - src: '/customize/images/AGPLv3_Logo.svg', + src: '/customize/images/logo_AGPLv3.svg', alt: 'APGL3 License Logo' }) ]), diff --git a/customize.dist/pages/what-is-cryptpad.js b/customize.dist/pages/what-is-cryptpad.js index 4eca50480..a5437bf92 100644 --- a/customize.dist/pages/what-is-cryptpad.js +++ b/customize.dist/pages/what-is-cryptpad.js @@ -5,55 +5,97 @@ define([ '/customize/pages.js' ], function (Config, h, Msg, Pages) { var urlArgs = Config.requireConf.urlArgs; + + Msg.whatis_collaboration = "Private Collaboration"; // XXX existing key + Msg.whatis_collaboration_info = '
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.
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.
'; // XXX + // XXX remove whatis_collaboration_p1, p2, p3 + + Msg.whatis_apps = "A full suite of applications"; // XXX + Msg.whatis_apps_info = "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.
A secure chat is available in each document for secure communication, [continue ...]
"; // XXX + // XXX remove all whatis_zeroknowledge keys + + Msg.whatis_drive_info = "Manage documents with CryptDrive. Create folders, shared folders, tags, [continue ...]
" // XXX + // XXX remove whatis_drive_p1, p2, p3 + + Msg.whatis_model = "Business model"; // XXX + Msg.whatis_model_info = "CryptPad is open source...
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.
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.
" // XXX + + Msg.whatis_xwiki = "Made at XWiki"; // XXX + Msg.whatis_xwiki_info = "CryptPad is made at XWiki, a company based in Paris that has been making open-source software for over 15 years. [continue ...]
" return function () { return h('div#cp-main', [ Pages.infopageTopbar(), - h('div.container-fluid.cp-what-is',[ - h('div.container',[ - h('div.row',[ - h('div.col-12.text-center', h('h1', Msg.whatis_title)), - ]), - ]), - ]), h('div.container.cp-container', [ - h('div.row.align-items-center', [ - h('div.col-12.col-sm-12.col-md-12.col-lg-6', [ + h('div.row.cp-page-title',[ + h('div.col-12.text-center', h('h1', Msg.whatis_title)), + ]), + h('div.row.cp-page-section', [ + h('div.col-md-6', [ Pages.setHTML(h('h2'), Msg.whatis_collaboration), - Pages.setHTML(h('p'), Msg.whatis_collaboration_p1), - Pages.setHTML(h('p'), Msg.whatis_collaboration_p2), - Pages.setHTML(h('p'), Msg.whatis_collaboration_p3), + Pages.setHTML(h('span'), Msg.whatis_collaboration_info), ]), - h('div.col-12.col-sm-12.col-md-12.col-lg-6', [ - h('img', { src: '/customize/images/pad_screenshot.png?' + urlArgs }), + h('div.col-md-6', [ + h('img', { + src: '/customize/images/collaboration.png?' + urlArgs + }), ]), ]), - h('div.row.align-items-center', [ - h('div.col-12.col-sm-12.col-md-12.col-lg-6.order-2', [ - Pages.setHTML(h('h2'), Msg.whatis_zeroknowledge), - Pages.setHTML(h('p'), Msg.whatis_zeroknowledge_p1), - Pages.setHTML(h('p'), Msg.whatis_zeroknowledge_p2), - Pages.setHTML(h('p'), Msg.whatis_zeroknowledge_p3), + h('div.row.cp-page-section', [ + h('div.col-md-6.order-md-2', [ + Pages.setHTML(h('h2'), Msg.whatis_apps), + Pages.setHTML(h('span'), Msg.whatis_apps_info), ]), - h('div.col-12.col-sm-12.col-md-12.col-lg-6.order-1', [ - h('img#zeroknowledge', { src: '/customize/images/zeroknowledge_small.png?' + urlArgs }), + h('div.col-md-6.order-md-1', [ + h('img', { + src: '/customize/images/apps-preview.png?' + urlArgs + }), ]), ]), - h('div.row.align-items-center', [ - h('div.col-12.col-sm-12.col-md-12.col-lg-6', [ + h('div.row.cp-page-section', [ + h('div.col-md-6', [ Pages.setHTML(h('h2'), Msg.whatis_drive), - Pages.setHTML(h('p'), Msg.whatis_drive_p1), - Pages.setHTML(h('p'), Msg.whatis_drive_p2), - Pages.setHTML(h('p'), Msg.whatis_drive_p3), + Pages.setHTML(h('spam'), Msg.whatis_drive_info), + ]), + h('div.col-md-6', [ + h('img.cp-shadow', { + src: '/customize/images/drive-grid.png?' + urlArgs + }), ]), - h('div.col-12.col-sm-12.col-md-12.col-lg-6', [ - h('img', { src: '/customize/images/drive_screenshot.png?' + urlArgs }), + ]), + h('div.row.cp-page-section', [ + h('div.col-md-6.order-md-2', [ + Pages.setHTML(h('h2'), Msg.whatis_model), + Pages.setHTML(h('span'), Msg.whatis_model_info), + h('button', [ + Msg.crowdfunding_button // XXX not functional + ]) + // XXX add link to subscription here on cryptpad.fr + ]), + h('div.col-md-6.order-md-1.small-logos', [ + h('img', { + src: '/customize/images/logo_ngi.png?' + urlArgs + }), + h('img', { + src: '/customize/images/logo_nlnet.svg?' + urlArgs + }), + h('img', { + src: '/customize/images/logo_bpifrance.svg?' + urlArgs + }), + h('img', { + src: '/customize/images/logo_moss.jpg?' + urlArgs + }), ]), ]), - h('div.row.align-items-center', [ - h('div.col-12', [ - Pages.setHTML(h('h2.text-center'), Msg.whatis_business), - Pages.setHTML(h('p'), Msg.whatis_business_p1), - Pages.setHTML(h('p'), Msg.whatis_business_p2), + // XXX XWiki info + h('div.row.cp-page-section', [ + h('div.col-md-6', [ + Pages.setHTML(h('h2'), Msg.whatis_xwiki), + Pages.setHTML(h('spam'), Msg.whatis_xwiki_info), + ]), + h('div.col-md-6.small-logos', [ + h('img', { + src: '/customize/images/logo_XWiki.svg?' + urlArgs + }), ]), ]), ]), diff --git a/customize.dist/src/less2/include/infopages.less b/customize.dist/src/less2/include/infopages.less index 28598640b..c507ed217 100644 --- a/customize.dist/src/less2/include/infopages.less +++ b/customize.dist/src/less2/include/infopages.less @@ -44,8 +44,8 @@ body { margin-bottom: 0.5em; } h2 { - font-size: 2em; - margin-top: 1em; + font-size: 1.8em; + margin-top: 0px; margin-bottom: 0.5em; } h3 { @@ -59,6 +59,33 @@ body { } max-width: 100%; } + .cp-page-title { + h1 { + font-family: "IBM Plex Mono"; + color: @colortheme_logo-2; + margin: 50px auto; + } + } + .row.cp-page-section { + margin: 50px 0px; + } + img.cp-shadow { + box-shadow: 0px 0px 25px 0px rgba(0, 0, 0, 0.34); + } + + button { + outline: none; + background-color: @colortheme_logo-2; + color: @colortheme_base; + border: none; + padding: 10px 20px; + border-radius: 0px; + cursor: pointer; + &:hover { + background-color: lighten(@colortheme_logo-2, 3%); + } + } + .form-group { & > * { margin-top: 0.5em; diff --git a/customize.dist/src/less2/pages/page-index.less b/customize.dist/src/less2/pages/page-index.less index 2b797c8b1..3ab26e369 100644 --- a/customize.dist/src/less2/pages/page-index.less +++ b/customize.dist/src/less2/pages/page-index.less @@ -205,18 +205,6 @@ .small-logo { max-width: 40%; } - button { - outline: none; - background-color: @colortheme_logo-2; - color: @colortheme_base; - border: none; - padding: 10px 20px; - border-radius: 0px; - cursor: pointer; - &:hover { - background-color: lighten(@colortheme_logo-2, 3%); - } - } } } } diff --git a/customize.dist/src/less2/pages/page-what-is-cryptpad.less b/customize.dist/src/less2/pages/page-what-is-cryptpad.less index f26188fe7..b00e7fd4f 100644 --- a/customize.dist/src/less2/pages/page-what-is-cryptpad.less +++ b/customize.dist/src/less2/pages/page-what-is-cryptpad.less @@ -4,42 +4,34 @@ &.cp-page-what-is-cryptpad { .infopages_main(); - .cp-what-is { - padding-top: 3em; - padding-bottom: 3em; - background-image: url(/customize/bkwhat.jpg); - background-size: cover; - background-repeat: no-repeat; - background-position: center; - color: #fff; - h1 { - font-weight: 700; - } - } - #cp-main { - background: #fff; - } - .cp-container { - padding-top: 3em; - padding-bottom: 3em; - h2 { - margin-top: 0; - font-weight: 700; - color: @cryptpad_header_col; - } - p { - color: @cryptpad_text_col; - } - #zeroknowledge { - width: 65%; - } - .row { - margin-bottom: 1.5em; - } + .small-logos { img { - display: block; - margin: 0 auto; + max-width: 40%; + padding: 10px; } } + + // .cp-container { + // padding-top: 3em; + // padding-bottom: 3em; + // h2 { + // margin-top: 0; + // font-weight: 700; + // color: @cryptpad_header_col; + // } + // p { + // color: @cryptpad_text_col; + // } + // #zeroknowledge { + // width: 65%; + // } + // .row { + // margin-bottom: 1.5em; + // } + // img { + // display: block; + // margin: 0 auto; + // } + // } }