From 7d0d8352bff28cfb44e9e17808d8779fc92aee82 Mon Sep 17 00:00:00 2001 From: yflory Date: Mon, 15 Oct 2018 17:36:03 +0200 Subject: [PATCH] Add more info on the home page --- customize.dist/images/agplv3.svg | 27 ++++++++++++++++ customize.dist/pages.js | 32 +++++++++++++++---- .../src/less2/pages/page-index.less | 30 +++++++++++++++-- customize.dist/translations/messages.fr.js | 8 ++--- customize.dist/translations/messages.js | 5 ++- 5 files changed, 88 insertions(+), 14 deletions(-) create mode 100644 customize.dist/images/agplv3.svg diff --git a/customize.dist/images/agplv3.svg b/customize.dist/images/agplv3.svg new file mode 100644 index 000000000..98439bc7c --- /dev/null +++ b/customize.dist/images/agplv3.svg @@ -0,0 +1,27 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/customize.dist/pages.js b/customize.dist/pages.js index 9f170e9e5..0aec56e08 100644 --- a/customize.dist/pages.js +++ b/customize.dist/pages.js @@ -642,16 +642,35 @@ define([ }); var crowdFunding = AppConfig.disableCrowdfundingMessages ? undefined : h('button', [ - Msg.crowdfunding_home1, - h('br'), - Msg.crowdfunding_home2, - _link + Msg.crowdfunding_button ]); $(crowdFunding).click(function () { _link.click(); }); + var blocks = h('div.container',[ + h('div.row.justify-content-sm-center',[ + h('div.col-12.col-sm-4.cp-index-block.cp-index-block-host', h('div', [ + setHTML(h('span'), Msg.home_host), + h('img', { + src: "/customize/images/agplv3.svg" + }) + ])), + h('div.col-12.col-sm-4.cp-index-block.cp-index-block-product', h('div', [ + Msg.home_product + ])), + h('div.col-12.col-sm-4.cp-index-block.cp-index-block-help', h('div', [ + Msg.crowdfunding_home1, + h('br'), + Msg.crowdfunding_home2, + h('br'), + crowdFunding, + _link + ])), + ]) + ]); + return [ h('div#cp-main', [ infopageTopbar(), @@ -667,11 +686,12 @@ define([ more ]) ]), - h('div.row', [ + blocks, + /*h('div.row', [ h('div.cp-crowdfunding', [ crowdFunding ]) - ]) + ])*/ ]), ]), infopageFooter(), diff --git a/customize.dist/src/less2/pages/page-index.less b/customize.dist/src/less2/pages/page-index.less index a97485f31..fb24451a1 100644 --- a/customize.dist/src/less2/pages/page-index.less +++ b/customize.dist/src/less2/pages/page-index.less @@ -21,6 +21,13 @@ margin-top: 6em; } } + & > .cp-container { + flex: 1; + display: flex; + flex-flow: column; + justify-content: space-around; + justify-content: space-evenly; + } } body { font-family: "Open Sans", Helvetica; @@ -181,9 +188,7 @@ } } - .cp-crowdfunding { - width: 100%; - text-align: center; + .cp-index-block-help { button { outline: none; background-color: @colortheme_logo-2; @@ -198,6 +203,25 @@ } } + .cp-index-block { + min-height: 100%; + & > div { + background: rgba(0,0,0,0.5); + margin: 0 5px; + padding: 15px 10px; + height: 100%; + display: flex; + flex-flow: column; + justify-content: space-evenly; + } + img { + margin: auto; + max-width: 70%; + background: white; + padding: 5px; + } + } + @media (min-width: 576px) and (max-width: 767px) { .container { padding-left: 0; diff --git a/customize.dist/translations/messages.fr.js b/customize.dist/translations/messages.fr.js index 1165ffd1b..1b8149596 100644 --- a/customize.dist/translations/messages.fr.js +++ b/customize.dist/translations/messages.fr.js @@ -714,13 +714,13 @@ define(function () { out.main_poll = 'Sondages'; out.main_drive = 'CryptDrive'; - out.main_richTextPad = 'Pad de Texte Riche'; - out.main_codePad = 'Pad de Code'; - out.main_slidePad = 'Présentation Markdown'; + out.main_richTextPad = 'Éditeur de Texte Riche'; + out.main_codePad = 'Éditeur de Code'; + out.main_slidePad = 'Éditeur de Présentations'; out.main_pollPad = 'Sondage ou Planning'; out.main_whiteboardPad = 'Tableau blanc'; out.main_kanbanPad = 'Kanban'; - out.main_localPads = 'Pads Locaux'; + out.main_localPads = 'Pads récents'; out.main_yourCryptDrive = 'Votre CryptDrive'; out.main_footerText = "Avec CryptPad, vous pouvez créer des documents collaboratifs rapidement pour prendre des notes à plusieurs."; diff --git a/customize.dist/translations/messages.js b/customize.dist/translations/messages.js index d19c140c9..81f5be8ac 100644 --- a/customize.dist/translations/messages.js +++ b/customize.dist/translations/messages.js @@ -703,6 +703,8 @@ define(function () { // index.html + out.home_product = "CryptPad is an open-source and private-by-design alternative to popular office tools and cloud services. All the content stored on CryptPad is encrypted before being sent, which means nobody can access your data unless you give them the keys."; + out.home_host = "This is a community-hosted instance of CryptPad. The source code is available on Github."; //about.html out.about_intro = 'CryptPad is created inside of the Research Team at XWiki SAS, a small business located in Paris France and Iasi Romania. There are 3 core team members working on CryptPad plus a number of contributors both inside and outside of XWiki SAS.'; @@ -1312,7 +1314,8 @@ define(function () { // Crowdfunding messages out.crowdfunding_home1 = "CryptPad needs your help!"; - out.crowdfunding_home2 = "Click to learn about our crowdfunding campaign."; + out.crowdfunding_home2 = "Click on the button to learn about our crowdfunding campaign."; + out.crowdfunding_button = "Support CryptPad"; out.crowdfunding_popup_text = "

We need your help!

" + "To ensure that CryptPad is actively developed, consider supporting the project via the " +