From b79adf4177122c8672ff8e6a7923562804d37fec Mon Sep 17 00:00:00 2001 From: ansuz Date: Fri, 4 Aug 2017 14:35:47 +0200 Subject: [PATCH 01/14] redirect to drive if logged in --- customize.dist/main.js | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/customize.dist/main.js b/customize.dist/main.js index 633f4c573..b25186e05 100644 --- a/customize.dist/main.js +++ b/customize.dist/main.js @@ -25,6 +25,10 @@ define([ $main.find('#data').removeClass('hidden'); if (Cryptpad.isLoggedIn()) { + if (window.location.pathname === '/') { + window.location = '/drive/'; + } + var name = localStorage[Cryptpad.userNameKey] || sessionStorage[Cryptpad.userNameKey]; var $loggedInBlock = $main.find('#loggedIn'); var $hello = $loggedInBlock.find('#loggedInHello'); From 96b12d55fb15fae1081099222f4f51cf326bd150 Mon Sep 17 00:00:00 2001 From: ansuz Date: Fri, 4 Aug 2017 14:37:21 +0200 Subject: [PATCH 02/14] add a return --- customize.dist/main.js | 1 + 1 file changed, 1 insertion(+) diff --git a/customize.dist/main.js b/customize.dist/main.js index b25186e05..2cf0ae61f 100644 --- a/customize.dist/main.js +++ b/customize.dist/main.js @@ -27,6 +27,7 @@ define([ if (Cryptpad.isLoggedIn()) { if (window.location.pathname === '/') { window.location = '/drive/'; + return; } var name = localStorage[Cryptpad.userNameKey] || sessionStorage[Cryptpad.userNameKey]; From 6614f3f0e6f006e0457e476915a708dd16c422dc Mon Sep 17 00:00:00 2001 From: Pierre Bondoerffer Date: Fri, 4 Aug 2017 14:50:35 +0200 Subject: [PATCH 03/14] put the page class on html element --- customize.dist/src/less2/main.less | 16 ++++++++-------- customize.dist/src/less2/pages/page-index.less | 2 +- customize.dist/template.js | 9 +++++++++ 3 files changed, 18 insertions(+), 9 deletions(-) diff --git a/customize.dist/src/less2/main.less b/customize.dist/src/less2/main.less index 068db5c7e..ecbe75cf2 100644 --- a/customize.dist/src/less2/main.less +++ b/customize.dist/src/less2/main.less @@ -2,11 +2,11 @@ font-family: Neuropolitical; src: url(./customize/fonts/neuropolitical.ttf) } -div#cp-main.cp-page-index { @import "./pages/page-index.less"; } -div#cp-main.cp-page-contact { @import "./pages/page-contact.less"; } -div#cp-main.cp-page-login { @import "./pages/page-login.less"; } -div#cp-main.cp-page-register { @import "./pages/page-register.less"; } -div#cp-main.cp-page-what-is-cryptpad { @import "./pages/page-what-is-cryptpad.less"; } -div#cp-main.cp-page-about { @import "./pages/page-about.less"; } -div#cp-main.cp-page-privacy { @import "./pages/page-privacy.less"; } -div#cp-main.cp-page-terms { @import "./pages/page-terms.less"; } +body.cp-page-index { @import "./pages/page-index.less"; } +body.cp-page-contact { @import "./pages/page-contact.less"; } +body.cp-page-login { @import "./pages/page-login.less"; } +body.cp-page-register { @import "./pages/page-register.less"; } +body.cp-page-what-is-cryptpad { @import "./pages/page-what-is-cryptpad.less"; } +body.cp-page-about { @import "./pages/page-about.less"; } +body.cp-page-privacy { @import "./pages/page-privacy.less"; } +body.cp-page-terms { @import "./pages/page-terms.less"; } diff --git a/customize.dist/src/less2/pages/page-index.less b/customize.dist/src/less2/pages/page-index.less index 82832f792..98963a70f 100644 --- a/customize.dist/src/less2/pages/page-index.less +++ b/customize.dist/src/less2/pages/page-index.less @@ -9,7 +9,7 @@ @background_lighter: rgba(0,0,0,0.1); @background_darker: rgba(0,0,0,0.4); -&#cp-main { +#cp-main { color: #FFF; background: linear-gradient( @background_darker, @background_lighter ), url('/customize/bg14.jpg'); background-size: cover; diff --git a/customize.dist/template.js b/customize.dist/template.js index e8d7db2fe..7dc666ec4 100644 --- a/customize.dist/template.js +++ b/customize.dist/template.js @@ -78,6 +78,15 @@ $(function () { return; } + } else { + // add class on info-pages + var css = location.pathname.replace(/(\/$|^\/|.html$)/gm, "") + .replace(/[^a-zA-Z]/gi, "-"); + if (css === '') + { + css = 'index'; + } + $('body').addClass('cp-page-' + css); } require([ From c953e71a1891e14c97b08551e2e2828c580bde27 Mon Sep 17 00:00:00 2001 From: Pierre Bondoerffer Date: Fri, 4 Aug 2017 15:06:58 +0200 Subject: [PATCH 04/14] better class generation and remove duplicate class --- customize.dist/pages.js | 16 ++++++++-------- customize.dist/template.js | 5 +++-- 2 files changed, 11 insertions(+), 10 deletions(-) diff --git a/customize.dist/pages.js b/customize.dist/pages.js index d3b512f65..27a114c16 100644 --- a/customize.dist/pages.js +++ b/customize.dist/pages.js @@ -94,7 +94,7 @@ define([ }; Pages['/about.html'] = function () { - return h('div#cp-main.cp-page-about', [ + return h('div#cp-main', [ infopageTopbar(), h('div.container.cp-container', [ h('center', [ @@ -143,7 +143,7 @@ define([ }; Pages['/privacy.html'] = function () { - return h('div#cp-main.cp-page-privacy', [ + return h('div#cp-main', [ infopageTopbar(), h('div.container.cp-container', [ h('center', h('h1', Msg.policy_title)), @@ -172,7 +172,7 @@ define([ }; Pages['/terms.html'] = function () { - return h('div#cp-main.cp-page-terms', [ + return h('div#cp-main', [ infopageTopbar(), h('div.container.cp-container', [ h('center', h('h1', Msg.tos_title)), @@ -187,7 +187,7 @@ define([ }; Pages['/contact.html'] = function () { - return h('div#cp-main.cp-page-contact', [ + return h('div#cp-main', [ infopageTopbar(), h('div.container.cp-container', [ h('center', h('h1', Msg.contact)), @@ -198,7 +198,7 @@ define([ }; Pages['/what-is-cryptpad.html'] = function () { - return h('div#cp-main.cp-page-what-is-cryptpad', [ + return h('div#cp-main', [ infopageTopbar(), h('div.container.cp-container', [ h('center', h('h1', Msg.whatis_title)), @@ -234,7 +234,7 @@ define([ Pages['/'] = Pages['/index.html'] = function () { var showingMore = false; return [ - h('div#cp-main.cp-page-index', [ + h('div#cp-main', [ infopageTopbar(), h('div.container.cp-container', [ h('div.row', [ @@ -310,7 +310,7 @@ define([ }; Pages['/register/'] = Pages['/register/index.html'] = function () { - return [h('div#cp-main.cp-page-register', [ + return [h('div#cp-main', [ infopageTopbar(), h('div.container.cp-container', [ h('div.row.align-items-center', [ @@ -362,7 +362,7 @@ define([ }; Pages['/login/'] = Pages['/login/index.html'] = function () { - return [h('div#cp-main.cp-page-login', [ + return [h('div#cp-main', [ infopageTopbar(), h('div.container.cp-container', [ h('div.row.align-items-center', [ diff --git a/customize.dist/template.js b/customize.dist/template.js index 7dc666ec4..a9067f35f 100644 --- a/customize.dist/template.js +++ b/customize.dist/template.js @@ -80,8 +80,9 @@ $(function () { } } else { // add class on info-pages - var css = location.pathname.replace(/(\/$|^\/|.html$)/gm, "") - .replace(/[^a-zA-Z]/gi, "-"); + var css = location.pathname.replace(/(index)?\.html$/gi, "") // .html + .replace(/[^a-zA-Z]+/gi, '-') // any non-alpha character + .replace(/^-|-$/g, ''); // starting/trailing dashes if (css === '') { css = 'index'; From 5c21a9048ebab456777fc2aab44144b48a5273c3 Mon Sep 17 00:00:00 2001 From: Pierre Bondoerffer Date: Fri, 4 Aug 2017 15:13:03 +0200 Subject: [PATCH 05/14] fix styles --- customize.dist/src/less2/include/infopages.less | 2 +- customize.dist/src/less2/pages/page-index.less | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/customize.dist/src/less2/include/infopages.less b/customize.dist/src/less2/include/infopages.less index dfc4108ba..ca37fc9bd 100644 --- a/customize.dist/src/less2/include/infopages.less +++ b/customize.dist/src/less2/include/infopages.less @@ -21,7 +21,7 @@ padding: 0; margin: 0; - font-size: 14px; + font-size: 16px; font-family: 'Open Sans', 'Helvetica Neue', sans-serif; .cp-container { diff --git a/customize.dist/src/less2/pages/page-index.less b/customize.dist/src/less2/pages/page-index.less index 425182475..4301f562b 100644 --- a/customize.dist/src/less2/pages/page-index.less +++ b/customize.dist/src/less2/pages/page-index.less @@ -64,7 +64,6 @@ } .navbar { width: 100%; - margin-top: -1em; @media only screen and (max-device-width: 991px) { margin-top: 0; } From addd91cc72a230c62120fde8e9ab677577dd7644 Mon Sep 17 00:00:00 2001 From: Pierre Bondoerffer Date: Fri, 4 Aug 2017 15:16:48 +0200 Subject: [PATCH 06/14] fix styles (again) copyright cjd 2017 --- customize.dist/src/less2/pages/page-index.less | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/customize.dist/src/less2/pages/page-index.less b/customize.dist/src/less2/pages/page-index.less index 4301f562b..962a174f1 100644 --- a/customize.dist/src/less2/pages/page-index.less +++ b/customize.dist/src/less2/pages/page-index.less @@ -16,7 +16,7 @@ min-height: 100vh; display: flex; flex-direction: column; - justify-content: space-around; + justify-content: space-between; align-items: center; .container { @media only screen and (max-device-width : 576px) { From 7310960f464a13823244589620e6f634450690ce Mon Sep 17 00:00:00 2001 From: Pierre Bondoerffer Date: Fri, 4 Aug 2017 15:19:59 +0200 Subject: [PATCH 07/14] remove the hack around the hack to fix the hack --- customize.dist/pages.js | 2 -- 1 file changed, 2 deletions(-) diff --git a/customize.dist/pages.js b/customize.dist/pages.js index 27a114c16..7c1548119 100644 --- a/customize.dist/pages.js +++ b/customize.dist/pages.js @@ -274,11 +274,9 @@ define([ if (showingMore) { $('.cp-more, .cp-callout-more-lessmsg').addClass('cp-hidden'); $('.cp-callout-more-moremsg').removeClass('cp-hidden'); - if ( $( window ).width() >991 ) $('.navbar').css('margin-top','-1em'); } else { $('.cp-more, .cp-callout-more-lessmsg').removeClass('cp-hidden'); $('.cp-callout-more-moremsg').addClass('cp-hidden'); - $('.navbar').css('margin-top','0'); } showingMore = !showingMore; } From ecc766eb7b71224ba740cc7a67353ec1699f47c4 Mon Sep 17 00:00:00 2001 From: Pierre Bondoerffer Date: Fri, 4 Aug 2017 15:24:58 +0200 Subject: [PATCH 08/14] remove useless margin --- customize.dist/src/less2/include/infopages.less | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/customize.dist/src/less2/include/infopages.less b/customize.dist/src/less2/include/infopages.less index ca37fc9bd..73b68b40a 100644 --- a/customize.dist/src/less2/include/infopages.less +++ b/customize.dist/src/less2/include/infopages.less @@ -21,12 +21,11 @@ padding: 0; margin: 0; - font-size: 16px; + font-size: 16pxt:; font-family: 'Open Sans', 'Helvetica Neue', sans-serif; .cp-container { font-size: 16px; - margin-top: @infopages_infobar-height; padding-top: @infopages_padding; padding-bottom: @infopages_padding; min-height: 75vh; From dd6a057962612426ca0f9df496804ee3a0b45498 Mon Sep 17 00:00:00 2001 From: ansuz Date: Fri, 4 Aug 2017 15:45:30 +0200 Subject: [PATCH 09/14] add 'msg' class for pierre --- www/register/main.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/www/register/main.js b/www/register/main.js index 6c8891d2a..6bd299188 100644 --- a/www/register/main.js +++ b/www/register/main.js @@ -121,7 +121,7 @@ define([ } setTimeout(function () { - Cryptpad.confirm("

" + Messages.register_warning + "

", + Cryptpad.confirm("

" + Messages.register_warning + "

", function (yes) { if (!yes) { return; } From 1bd42f0b3e493d2f9064d10dee29d7db2673e04a Mon Sep 17 00:00:00 2001 From: Pierre Bondoerffer Date: Fri, 4 Aug 2017 16:02:35 +0200 Subject: [PATCH 10/14] make alertify darker --- .../src/less2/include/alertify.less | 25 +++++++++---------- .../src/less2/pages/page-register.less | 7 ++++++ 2 files changed, 19 insertions(+), 13 deletions(-) diff --git a/customize.dist/src/less2/include/alertify.less b/customize.dist/src/less2/include/alertify.less index cb3fd3621..dcd9cf6d0 100644 --- a/customize.dist/src/less2/include/alertify.less +++ b/customize.dist/src/less2/include/alertify.less @@ -5,15 +5,15 @@ @alertify-fore: @colortheme_old-fore; @alertify-base: @colortheme_old-base; - @alertify-dialog-bg: #444; + @alertify-dialog-bg: #222; @alertify-dialog-fg: @colortheme_old-fore; @alertify-btn-fg: @colortheme_old-fore; - @alertify-btn-bg: rgba(200, 200, 200, 0.05); - @alertify-btn-bg-hover: rgba(200, 200, 200, .15); + @alertify-btn-bg: rgba(200, 200, 200, 0.1); + @alertify-btn-bg-hover: rgba(200, 200, 200, .3); - @alertify-bg: rgba(0, 0, 0, .3); + @alertify-bg: rgba(0, 0, 0, .4); @alertify-fg: @colortheme_old-fore; @alertify-input-bg: @colortheme_old-base; @@ -21,7 +21,6 @@ @alertify_padding-base: 12px; @alertify_box-shadow: 0 2px 5px 0 rgba(0,0,0,.2); - @alertify_border-radius: 1px; // Logs to show that something has happened // These show only once @@ -38,7 +37,6 @@ font-size: large; box-shadow: @alertify_box-shadow; - border-radius: @alertify_border-radius; &, &.default { // FIXME background: rgba(0, 0, 0, .8); @@ -64,6 +62,10 @@ height: 100%; z-index: 99999; + h1, h2, h3 { + margin-top: 0; + } + &.hide { opacity: 0; pointer-events: none; @@ -89,7 +91,6 @@ & > div { background-color: @alertify-dialog-bg; - border-radius: 5px; &.half { width: 50%; @media (max-width: @browser_media-medium-screen) { @@ -106,10 +107,10 @@ > * { width: 30%; - width: 500px; + min-width: 500px; max-width: 95%; margin: 0 auto; - text-align: center; + text-align: left; padding: @alertify_padding-base; background: #fff; // FIXME @@ -120,14 +121,12 @@ padding: @alertify_padding-base; margin-bottom: @alertify_padding-base; margin: 0; - text-align: left; } input:not(.form-control){ background-color: @alertify-input-bg; color: @alertify-input-fg; border: 0px; - border-radius: 5px; margin-bottom: 15px; width: 100%; @@ -161,10 +160,10 @@ font-size: 14px; text-decoration: none; cursor: pointer; + border-radius: 0; color: @alertify-btn-fg; - border: 1px solid @alertify-base; - border-radius: 5px; + border: 1px solid transparent; &.safe, &.danger { color: @colortheme_old-base; diff --git a/customize.dist/src/less2/pages/page-register.less b/customize.dist/src/less2/pages/page-register.less index fc54a3073..06a5207c6 100644 --- a/customize.dist/src/less2/pages/page-register.less +++ b/customize.dist/src/less2/pages/page-register.less @@ -23,3 +23,10 @@ } } } + +.alertify { + // workaround for alertify making empty p + p:empty { + display: none; + } +} From 865ba0731cc504abc0779b485373544f68818c68 Mon Sep 17 00:00:00 2001 From: Pierre Bondoerffer Date: Fri, 4 Aug 2017 16:13:27 +0200 Subject: [PATCH 11/14] better colors? not sure yet... --- customize.dist/src/less2/include/alertify.less | 8 ++++---- customize.dist/src/less2/include/colortheme.less | 3 +++ 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/customize.dist/src/less2/include/alertify.less b/customize.dist/src/less2/include/alertify.less index dcd9cf6d0..d667aa1cf 100644 --- a/customize.dist/src/less2/include/alertify.less +++ b/customize.dist/src/less2/include/alertify.less @@ -171,16 +171,16 @@ font-weight: bold; } &.danger { - background-color: @colortheme_cp-red; + background-color: @colortheme_alertify-red; &:hover, &:active { - background-color: lighten(@colortheme_cp-red, 5%); + background-color: lighten(@colortheme_alertify-red, 5%); } } &.safe { - background-color: @colortheme_cp-green; + background-color: @colortheme_alertify-green; &:hover, &:active { - background-color: lighten(@colortheme_cp-green, 10%); + background-color: lighten(@colortheme_alertify-green, 10%); } } diff --git a/customize.dist/src/less2/include/colortheme.less b/customize.dist/src/less2/include/colortheme.less index 268a26922..7f0ede24c 100644 --- a/customize.dist/src/less2/include/colortheme.less +++ b/customize.dist/src/less2/include/colortheme.less @@ -11,6 +11,9 @@ @colortheme_cp-red: #FA5858; // remove red @colortheme_cp-green: #46E981; +@colortheme_alertify-red: #E55236; +@colortheme_alertify-green: #77C825; + @colortheme_pad-bg: #1c4fa0; @colortheme_pad-color: #fff; From d3fb6313b6dbf785f5850604728fc3ea32fffd0a Mon Sep 17 00:00:00 2001 From: Pierre Bondoerffer Date: Fri, 4 Aug 2017 16:22:43 +0200 Subject: [PATCH 12/14] color logo on topbar --- customize.dist/CryptPad-blue-logo.svg | 1 + customize.dist/CryptPad-white-logo.svg | 2 +- customize.dist/src/less2/include/infopages.less | 12 +++++++++--- customize.dist/src/less2/pages/page-index.less | 4 +--- 4 files changed, 12 insertions(+), 7 deletions(-) create mode 100644 customize.dist/CryptPad-blue-logo.svg diff --git a/customize.dist/CryptPad-blue-logo.svg b/customize.dist/CryptPad-blue-logo.svg new file mode 100644 index 000000000..b44ebb1e3 --- /dev/null +++ b/customize.dist/CryptPad-blue-logo.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/customize.dist/CryptPad-white-logo.svg b/customize.dist/CryptPad-white-logo.svg index 120bd9014..a3f99c797 100644 --- a/customize.dist/CryptPad-white-logo.svg +++ b/customize.dist/CryptPad-white-logo.svg @@ -1 +1 @@ -CryptPad white logo \ No newline at end of file +CryptPad white logo \ No newline at end of file diff --git a/customize.dist/src/less2/include/infopages.less b/customize.dist/src/less2/include/infopages.less index 73b68b40a..35d2e19d4 100644 --- a/customize.dist/src/less2/include/infopages.less +++ b/customize.dist/src/less2/include/infopages.less @@ -113,6 +113,15 @@ // Apply this to the top bar div .infopages_topbar () { + .navbar-brand { + display: block; + background-image: url(/customize/CryptPad-blue-logo.svg); + background-repeat: no-repeat; + background-size: contain; + height: 50px; + width: 250px; + } + .cp-topbar { background: #fff; z-index: 9001; @@ -151,9 +160,6 @@ } .cp-logo { - img { - height: @infopages_infobar-height / 2; - } margin-right: 0.5em; } } diff --git a/customize.dist/src/less2/pages/page-index.less b/customize.dist/src/less2/pages/page-index.less index 962a174f1..f033ccf23 100644 --- a/customize.dist/src/less2/pages/page-index.less +++ b/customize.dist/src/less2/pages/page-index.less @@ -68,9 +68,7 @@ margin-top: 0; } .navbar-brand { - background: url(/customize/CryptPad-white-logo.svg) no-repeat; - width: 250px; - height: 50px; + background-image: url(/customize/CryptPad-white-logo.svg); } a { color: #fff; From 8a56adfe53c3a570c935392c604a2406f1e97756 Mon Sep 17 00:00:00 2001 From: Pierre Bondoerffer Date: Fri, 4 Aug 2017 16:25:39 +0200 Subject: [PATCH 13/14] make logos same size, compress --- customize.dist/CryptPad-blue-logo.svg | 2 +- customize.dist/CryptPad-white-logo.svg | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/customize.dist/CryptPad-blue-logo.svg b/customize.dist/CryptPad-blue-logo.svg index b44ebb1e3..9422dca34 100644 --- a/customize.dist/CryptPad-blue-logo.svg +++ b/customize.dist/CryptPad-blue-logo.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/customize.dist/CryptPad-white-logo.svg b/customize.dist/CryptPad-white-logo.svg index a3f99c797..b3b8e04e9 100644 --- a/customize.dist/CryptPad-white-logo.svg +++ b/customize.dist/CryptPad-white-logo.svg @@ -1 +1 @@ -CryptPad white logo \ No newline at end of file + \ No newline at end of file From a16d4be3c4cc8cf09b73183bdcff3b5e80455d7f Mon Sep 17 00:00:00 2001 From: Pierre Bondoerffer Date: Fri, 4 Aug 2017 16:48:01 +0200 Subject: [PATCH 14/14] show logged in user --- customize.dist/pages.js | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) diff --git a/customize.dist/pages.js b/customize.dist/pages.js index 7c1548119..ecb100fcd 100644 --- a/customize.dist/pages.js +++ b/customize.dist/pages.js @@ -77,6 +77,21 @@ define([ }; var infopageTopbar = function () { + var rightLinks; + var username = window.localStorage.getItem('User_name'); + if (username === null) { + rightLinks = [ + h('a.nav-item.nav-link.cp-login-btn', { href: '/login'}, Msg.login_login), + h('a.nav-item.nav-link.cp-register-btn', { href: '/register'}, Msg.login_register) + ]; + } else { + rightLinks = h('a.nav-item.nav-link.cp-user-btn', { href: '/drive' }, [ + h('i.fa.fa-user-circle'), + " ", + username + ]); + } + return h('nav.navbar.navbar-toggleable-md', h('button.navbar-toggler.navbar-toggler-right', {'type':'button'}, {'data-toggle':'collapse'}, {'data-target':'#menuCollapse'}, {'aria-controls': 'menuCollapse'}, {'aria-expanded':'false'}, {'aria-label':'Toggle navigation'}, [h('i.fa.fa-bars ') @@ -87,9 +102,7 @@ define([ h('a.nav-item.nav-link', { href: 'https://blog.cryptpad.fr/'}, Msg.blog), h('a.nav-item.nav-link', { href: '/contact.html'}, Msg.contact), h('a.nav-item.nav-link', { href: '/about.html'}, Msg.about), - h('a.nav-item.nav-link.cp-login-btn', { href: '/login'}, Msg.login_login), - h('a.nav-item.nav-link.cp-register-btn', { href: '/register'}, Msg.login_register) - ]) + ].concat(rightLinks)) ); };