diff --git a/customize.dist/pages.js b/customize.dist/pages.js index c39566d26..b615aac5c 100644 --- a/customize.dist/pages.js +++ b/customize.dist/pages.js @@ -62,7 +62,7 @@ define([ var imprintUrl = AppConfig.imprint && (typeof(AppConfig.imprint) === "boolean" ? '/imprint.html' : AppConfig.imprint); - Pages.versionString = "CryptPad v3.23.1 (XerusDaamsi's revenge)"; + Pages.versionString = "v3.23.1 (XerusDaamsi's revenge)"; Msg.docs_link = "Documentation"; // XXX breaks the about menu // XXX Remove FAQ from translations and remove FAQ page @@ -110,7 +110,7 @@ define([ ]), h('div.cp-version-footer', [ languageSelector(), - h('span', Pages.versionString) + h('span', "CryptPad " + Pages.versionString) ]) ]); }; diff --git a/customize.dist/src/less2/include/alertify.less b/customize.dist/src/less2/include/alertify.less index 344e590b5..f14c7e5f8 100644 --- a/customize.dist/src/less2/include/alertify.less +++ b/customize.dist/src/less2/include/alertify.less @@ -1,3 +1,4 @@ + @import (reference) "./colortheme-all.less"; @import (reference) "./browser.less"; @import (reference) "./variables.less"; @@ -168,6 +169,19 @@ &:last-child { margin-bottom: 0; } + .cp-info-menu-container { + .logo-block { + text-align: center; + h6 { + font-family: "IBM Plex Mono"; + font-size: 30px; + margin-top: 5px; + } + img { + max-width: 100px; + } + } + } } .cp-alertify-type-container { overflow: visible !important; diff --git a/www/common/common-ui-elements.js b/www/common/common-ui-elements.js index 818da63c9..a9d2cbce4 100644 --- a/www/common/common-ui-elements.js +++ b/www/common/common-ui-elements.js @@ -20,6 +20,7 @@ define([ ], function ($, Config, Util, Hash, Language, UI, Constants, Feedback, h, Clipboard, Messages, AppConfig, Pages, NThen, InviteInner, Visible) { var UIElements = {}; + var urlArgs = Config.requireConf.urlArgs; UIElements.getSvgLogo = function () { var svg = (function(){/* @@ -1532,10 +1533,20 @@ define([ var legalLine = template(Messages.info_imprintFlavour, Pages.imprintLink); var privacyLine = template(Messages.info_privacyFlavour, Pages.privacyLink); - var faqLine = template(Messages.help.generic.more, Pages.faqLink); + + // XXX existing key + Messages.help.generic.more = "Learn more about how CryptPad can work for you by reading our Documentation."; + + var faqLine = template(Messages.help.generic.more, Pages.docsLink); var content = h('div.cp-info-menu-container', [ - h('h6', Pages.versionString), + h('div.logo-block', [ + h('img', { + src: '/customize/CryptPad_logo.svg?' + urlArgs + }), + h('h6', "CryptPad"), + h('span', Pages.versionString) + ]), h('hr'), legalLine, privacyLine,