').html(line)[0]; + var sub = link.cloneNode(true); + +/* This is a hack to make relative URLs point to the main domain + instead of the sandbox domain. It will break if the admins have specified + some less common URL formats for their customizable links, such as if they've + used a protocal-relative absolute URL. The URL API isn't quite safe to use + because of IE (thanks, Bill). */ + var href = sub.getAttribute('href'); + if (/^\//.test(href)) { sub.setAttribute('href', origin + href); } + var a = p.querySelector('a'); + if (!a) { return; } + sub.innerText = a.innerText; + p.replaceChild(sub, a); + return p; + }; + + var legalLine = template(Messages.info_imprintFlavour, Pages.imprintLink); + var privacyLine = template(Messages.info_privacyFlavour, Pages.privacyLink); + var faqLine = template(Messages.info_faqFlavour, Pages.faqLink); + + var content = h('div.cp-info-menu-container', [ h('h6', Pages.versionString), - // First point users to our FAQ + h('hr'), + legalLine, + privacyLine, faqLine, - // Link to the support ticket form in case their - // question isn't answered by the FAQ - //supportLine, ]); var buttons = [ @@ -2373,15 +2386,21 @@ define([ content: $userAdminContent.html() }); } - options.push({ - tag: 'a', - attributes: { - 'target': '_blank', - 'href': origin+'/index.html', - 'class': 'fa fa-home' - }, - content: h('span', Messages.homePage) - }); + + if (accountName && !AppConfig.disableProfile) { + options.push({ + tag: 'a', + attributes: {'class': 'cp-toolbar-menu-profile fa fa-user-circle'}, + content: h('span', Messages.profileButton), + action: function () { + if (padType) { + window.open(origin+'/profile/'); + } else { + window.parent.location = origin+'/profile/'; + } + }, + }); + } if (padType !== 'drive' || (!accountName && priv.newSharedFolder)) { options.push({ tag: 'a', @@ -2415,29 +2434,6 @@ define([ content: h('span', Messages.type.contacts) }); } - options.push({ tag: 'hr' }); - // Add the change display name button if not in read only mode - if (config.changeNameButtonCls && config.displayChangeName && !AppConfig.disableProfile) { - options.push({ - tag: 'a', - attributes: {'class': config.changeNameButtonCls + ' fa fa-user'}, - content: h('span', Messages.user_rename) - }); - } - if (accountName && !AppConfig.disableProfile) { - options.push({ - tag: 'a', - attributes: {'class': 'cp-toolbar-menu-profile fa fa-user-circle'}, - content: h('span', Messages.profileButton), - action: function () { - if (padType) { - window.open(origin+'/profile/'); - } else { - window.parent.location = origin+'/profile/'; - } - }, - }); - } if (padType !== 'settings') { options.push({ tag: 'a', @@ -2452,6 +2448,7 @@ define([ }, }); } + options.push({ tag: 'hr' }); // Add administration panel link if the user is an admin if (priv.edPublic && Array.isArray(Config.adminKeys) && Config.adminKeys.indexOf(priv.edPublic) !== -1) { @@ -2482,30 +2479,6 @@ define([ }, }); } - options.push({ tag: 'hr' }); - if (Config.allowSubscriptions) { - options.push({ - tag: 'a', - attributes: { - 'target': '_blank', - 'href': priv.plan ? priv.accounts.upgradeURL : origin+'/features.html', - 'class': 'fa fa-star-o' - }, - content: h('span', priv.plan ? Messages.settings_cat_subscription : Messages.pricing) - }); - } - if (!priv.plan && !Config.removeDonateButton) { - options.push({ - tag: 'a', - attributes: { - 'target': '_blank', - 'rel': 'noopener', - 'href': priv.accounts.donateURL, - 'class': 'fa fa-gift' - }, - content: h('span', Messages.crowdfunding_button2) - }); - } if (AppConfig.surveyURL) { options.push({ tag: 'a', @@ -2533,6 +2506,49 @@ define([ }, }); + options.push({ + tag: 'a', + attributes: { + 'target': '_blank', + 'href': origin+'/index.html', + 'class': 'fa fa-home' + }, + content: h('span', Messages.homePage) + }); + // Add the change display name button if not in read only mode + /* + if (config.changeNameButtonCls && config.displayChangeName && !AppConfig.disableProfile) { + options.push({ + tag: 'a', + attributes: {'class': config.changeNameButtonCls + ' fa fa-user'}, + content: h('span', Messages.user_rename) + }); + }*/ + options.push({ tag: 'hr' }); + if (Config.allowSubscriptions) { + options.push({ + tag: 'a', + attributes: { + 'target': '_blank', + 'href': priv.plan ? priv.accounts.upgradeURL : origin+'/features.html', + 'class': 'fa fa-star-o' + }, + content: h('span', priv.plan ? Messages.settings_cat_subscription : Messages.pricing) + }); + } + if (!priv.plan && !Config.removeDonateButton) { + options.push({ + tag: 'a', + attributes: { + 'target': '_blank', + 'rel': 'noopener', + 'href': priv.accounts.donateURL, + 'class': 'fa fa-gift' + }, + content: h('span', Messages.crowdfunding_button2) + }); + } + options.push({ tag: 'hr' }); // Add login or logout button depending on the current status if (priv.loggedIn) { diff --git a/www/common/notifications.js b/www/common/notifications.js index 94c2dcb15..fc72517fd 100644 --- a/www/common/notifications.js +++ b/www/common/notifications.js @@ -388,8 +388,6 @@ define([ }; handlers['SAFE_LINKS_DEFAULT'] = function (common, data) { - Messages.settings_safeLinkDefault = "SAFE LINKS ARE NOW DEFAULT"; // XXX - var content = data.content; content.getFormatText = function () { return Messages.settings_safeLinkDefault; diff --git a/www/common/translations/messages.json b/www/common/translations/messages.json index 637b05bef..4d47b3c7c 100644 --- a/www/common/translations/messages.json +++ b/www/common/translations/messages.json @@ -1377,5 +1377,7 @@ "code_editorTheme": "Editor theme", "toolbar_file": "File", "slide_backCol": "Background color", - "slide_textCol": "Text color" + "slide_textCol": "Text color", + "support_languagesPreamble": "This server's administrators speak the following languages:", + "settings_safeLinkDefault": "Safe Links are now turned on by default. Please use the Share menu to copy links rather than your browser's address bar." } diff --git a/www/support/inner.js b/www/support/inner.js index 3d907421d..d956914c6 100644 --- a/www/support/inner.js +++ b/www/support/inner.js @@ -149,7 +149,6 @@ define([ }) ); - Messages.support_languagesPreamble = "This server's administrators speak the following languages:"; // XXX var $div = $( h('div.cp-support-language', [ Messages.support_languagesPreamble,