diff --git a/app/ui/home.js b/app/ui/home.js index cfa38564..6431aeab 100644 --- a/app/ui/home.js +++ b/app/ui/home.js @@ -1,4 +1,5 @@ const html = require('choo/html'); +const raw = require('choo/html/raw'); const { list } = require('../utils'); const archiveTile = require('./archiveTile'); const modal = require('./modal'); @@ -16,7 +17,19 @@ module.exports = function(state, emit) { } else { left = archiveTile.empty(state, emit); } + + if (archives.length > 0 && state.WEB_UI.DOWNLOAD_LIST_NOTICE_HTML) { + archives.push(html` +

+ ${raw(state.WEB_UI.DOWNLOAD_LIST_NOTICE_HTML)} +

+ `); + } + archives.reverse(); + const right = archives.length === 0 ? intro(state) diff --git a/app/ui/intro.js b/app/ui/intro.js index c9181837..dc1a1627 100644 --- a/app/ui/intro.js +++ b/app/ui/intro.js @@ -1,6 +1,17 @@ const html = require('choo/html'); +const raw = require('choo/html/raw'); module.exports = function intro(state) { + const notice = state.WEB_UI.MAIN_NOTICE_HTML + ? html` +

+ ${raw(state.WEB_UI.MAIN_NOTICE_HTML)} +

+ ` + : ''; + return html` ${state.translate('introDescription')}

+ ${notice}
`; diff --git a/server/clientConstants.js b/server/clientConstants.js index 4786bcff..dc77ac0e 100644 --- a/server/clientConstants.js +++ b/server/clientConstants.js @@ -15,7 +15,9 @@ module.exports = { FOOTER_SOURCE_URL: config.footer_source_url, CUSTOM_FOOTER_TEXT: config.custom_footer_text, CUSTOM_FOOTER_URL: config.custom_footer_url, + MAIN_NOTICE_HTML: config.main_notice_html, UPLOAD_AREA_WARNING_HTML: config.upload_area_warning_html, + DOWNLOAD_LIST_NOTICE_HTML: config.download_list_notice_html, DOWNLOAD_WARNING_HTML: config.download_warning_html, COLORS: { PRIMARY: config.ui_color_primary, diff --git a/server/config.js b/server/config.js index ffab7bd3..fdf42886 100644 --- a/server/config.js +++ b/server/config.js @@ -264,11 +264,21 @@ const conf = convict({ default: '', env: 'CUSTOM_FOOTER_URL' }, + main_notice_html: { + format: String, + default: '', + env: 'SEND_MAIN_NOTICE_HTML' + }, upload_area_warning_html: { format: String, default: '', env: 'SEND_UPLOAD_AREA_WARNING_HTML' }, + download_list_notice_html: { + format: String, + default: '', + env: 'SEND_DOWNLOAD_LIST_NOTICE_HTML' + }, download_warning_html: { format: String, default: '',