web/cryptpad
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'ui-integration' into staging2

Browse Source
This commit is contained in:
Caleb James DeLisle
2017-08-24 13:54:55 +02:00
parent 7bbea28831 49f7e0d63b
commit 35e7341f4d
5 changed files with 81 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

66
customize.dist/pages.js
View File

@@ -188,10 +188,10 @@ define([
h('h3', "Pierre Bondoerffer"),
h('hr'),
setHTML(h('div#bioPierre'), '<p>Resident CSS wizard and emoji extraordinaire, Pierre is passionate about anything related to technology. He loves to hack around computers and put parts together.<br/>He is currently studying at 42, where he learns about algorithms, networking, kernel programming and graphics.<br/>As a part of an internship, he joined XWiki SAS and worked on CryptPad to improve user experience. He also maintains the Spanish translation.</p>'),
h('a.cp-soc-media', { href : 'https://twitter.com/cjdelisle'}, [
h('a.cp-soc-media', { href : 'https://twitter.com/pbondoer'}, [
h('i.fa.fa-twitter')
]),
h('a.cp-soc-media', { href : 'https://github.com/cjdelisle'}, [
h('a.cp-soc-media', { href : 'https://github.com/pbondoer'}, [
h('i.fa.fa-github')
])
]),
@@ -291,32 +291,54 @@ define([
Pages['/what-is-cryptpad.html'] = function () {
return h('div#cp-main', [
infopageTopbar(),
h('div.container.cp-container', [
h('center', h('h1', Msg.whatis_title)),
setHTML(h('h2'), Msg.whatis_collaboration),
setHTML(h('p'), Msg.whatis_collaboration_p1),
h('img', { src: '/customize/images/pad_screenshot.png?' + urlArgs }),
setHTML(h('p'), Msg.whatis_collaboration_p2),
setHTML(h('p'), Msg.whatis_collaboration_p3),
setHTML(h('h2'), Msg.whatis_zeroknowledge),
h('div.row', [
h('div.col-md-4.align-self-center', [
h('img#zeroknowledge', { src: '/customize/images/zeroknowledge_small.png?' + urlArgs }),
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.col-md-8', [
]),
]),
h('div.container.cp-container', [
h('div.row.align-items-center', [
h('div.col-12.col-sm-12.col-md-12.col-lg-6', [
setHTML(h('h2'), Msg.whatis_collaboration),
setHTML(h('p'), Msg.whatis_collaboration_p1),
setHTML(h('p'), Msg.whatis_collaboration_p2),
setHTML(h('p'), Msg.whatis_collaboration_p3),
]),
h('div.col-12.col-sm-12.col-md-12.col-lg-6', [
h('img', { src: '/customize/images/pad_screenshot.png?' + urlArgs }),
]),
]),
h('div.row.align-items-center', [
h('div.col-12.col-sm-12.col-md-12.col-lg-6.push-lg-6', [
setHTML(h('h2'), Msg.whatis_zeroknowledge),
setHTML(h('p'), Msg.whatis_zeroknowledge_p1),
setHTML(h('p'), Msg.whatis_zeroknowledge_p2),
setHTML(h('p'), Msg.whatis_zeroknowledge_p3),
]),
h('div.col-12.col-sm-12.col-md-12.col-lg-6.pull-lg-6', [
h('img#zeroknowledge', { src: '/customize/images/zeroknowledge_small.png?' + urlArgs }),
]),
]),
h('div.row.align-items-center', [
h('div.col-12.col-sm-12.col-md-12.col-lg-6', [
setHTML(h('h2'), Msg.whatis_drive),
setHTML(h('p'), Msg.whatis_drive_p1),
setHTML(h('p'), Msg.whatis_drive_p2),
setHTML(h('p'), Msg.whatis_drive_p3),
]),
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.align-items-center', [
h('div.col-12', [
setHTML(h('h2.text-center'), Msg.whatis_business),
setHTML(h('p'), Msg.whatis_business_p1),
setHTML(h('p'), Msg.whatis_business_p2),
]),
]),
setHTML(h('h2'), Msg.whatis_drive),
setHTML(h('p'), Msg.whatis_drive_p1),
h('img', { src: '/customize/images/drive_screenshot.png?' + urlArgs }),
setHTML(h('p'), Msg.whatis_drive_p2),
setHTML(h('p'), Msg.whatis_drive_p3),
setHTML(h('h2'), Msg.whatis_business),
setHTML(h('p'), Msg.whatis_business_p1),
setHTML(h('p'), Msg.whatis_business_p2),
]),
infopageFooter(),
]);