' +
+ '
' +
+ '
' +
+ '' +
+ '' +
+ '
' +
+ '
' +
'
' +
'' +
'
' +
diff --git a/src/web/public/js/regions/type/image.js b/src/web/public/js/regions/type/image.js
index 1403744..e776a3e 100644
--- a/src/web/public/js/regions/type/image.js
+++ b/src/web/public/js/regions/type/image.js
@@ -32,8 +32,8 @@
var regionRatio = String(context.regionRatio || '1:1');
var uploadConfig = context.uploadConfig || {};
var uploadMaxLabel = String(uploadConfig.limitLabel || context.uploadMaxLabel || '100 MB');
- var uploadAccept = Array.isArray(uploadConfig.accept) ? uploadConfig.accept.join(', ') : String(uploadConfig.accept || 'image/png, image/jpeg, image/gif, image/webp');
- var uploadHelpText = String(uploadConfig.helpText || 'PNG, JPG, GIF, or WebP');
+ var uploadAccept = Array.isArray(uploadConfig.accept) ? uploadConfig.accept.join(', ') : String(uploadConfig.accept || 'image/png, image/jpeg, image/gif, image/webp, image/svg+xml');
+ var uploadHelpText = String(uploadConfig.helpText || 'PNG, JPG, GIF, WebP, or SVG');
return registry.renderEditorCardShell({
region: region,
headerActions: '
Image',
@@ -81,10 +81,10 @@
current: String(context.current || ''),
regionRatio: String(context.regionRatio || '1:1'),
uploadConfig: {
- accept: Array.isArray(defaultConfig.accept) ? defaultConfig.accept : ['image/png', 'image/jpeg', 'image/gif', 'image/webp'],
+ accept: Array.isArray(defaultConfig.accept) ? defaultConfig.accept : ['image/png', 'image/jpeg', 'image/gif', 'image/webp', 'image/svg+xml'],
limitBytes: defaultConfig.limitBytes,
limitLabel: defaultConfig.limitLabel || context.uploadMaxLabel || '100 MB',
- helpText: defaultConfig.helpText || 'PNG, JPG, GIF, or WebP'
+ helpText: defaultConfig.helpText || 'PNG, JPG, GIF, WebP, or SVG'
},
uploadMaxLabel: context.uploadMaxLabel || '100 MB'
};
@@ -107,11 +107,11 @@
}
var uploadConfig = context.uploadConfig || {};
- var accept = uploadConfig.accept || ['image/png', 'image/jpeg', 'image/gif', 'image/webp'];
+ var accept = uploadConfig.accept || ['image/png', 'image/jpeg', 'image/gif', 'image/webp', 'image/svg+xml'];
var limitBytes = Number(uploadConfig.limitBytes || 100 * 1024 * 1024);
if (!utils.fileMatchesAccept || !utils.fileMatchesAccept(context.file, accept)) {
- showUploadWarning('This image region accepts PNG, JPG, GIF, or WebP files.');
+ showUploadWarning('This image region accepts PNG, JPG, GIF, WebP, or SVG files.');
return false;
}
@@ -132,10 +132,10 @@
var defaultConfig = context && context.defaultConfig ? context.defaultConfig : {};
return {
- accept: ['image/png', 'image/jpeg', 'image/gif', 'image/webp'],
+ accept: ['image/png', 'image/jpeg', 'image/gif', 'image/webp', 'image/svg+xml'],
limitBytes: defaultConfig.limitBytes,
limitLabel: defaultConfig.limitLabel,
- helpText: 'PNG, JPG, GIF, or WebP'
+ helpText: 'PNG, JPG, GIF, WebP, or SVG'
};
},
renderPreview: renderPreview,
diff --git a/src/web/public/js/regions/type/rss.js b/src/web/public/js/regions/type/rss.js
index 4241846..05ec44d 100644
--- a/src/web/public/js/regions/type/rss.js
+++ b/src/web/public/js/regions/type/rss.js
@@ -222,6 +222,12 @@
'
' +
+ '
' +
+ '
' +
+ '' +
+ '' +
+ '
' +
+ '
' +
'
' +
'' +
'' +
diff --git a/src/web/public/js/slides/slide-form-editor.js b/src/web/public/js/slides/slide-form-editor.js
index a90711f..70f5ebe 100644
--- a/src/web/public/js/slides/slide-form-editor.js
+++ b/src/web/public/js/slides/slide-form-editor.js
@@ -8,6 +8,8 @@ export function createSlideFormEditorController(options) {
var fontStylesheetHref = String(settings.fontStylesheetHref || '').trim();
var defaultEditorFontFamily = 'Arial, Helvetica, sans-serif';
var editorInstances = new Map();
+ var editorHeights = new Map();
+ var editorSizeControlsBound = false;
var getRegionTypeModule = typeof settings.getRegionTypeModule === 'function' ? settings.getRegionTypeModule : function () {
return null;
};
@@ -15,9 +17,13 @@ export function createSlideFormEditorController(options) {
var imageUploadMaxBytes = Math.max(1, Number(settings.imageUploadMaxBytes || 2 * 1024 * 1024));
var imageUploadLimitLabel = String(settings.imageUploadLimitLabel || '').trim() || Math.max(1, Math.round(imageUploadMaxBytes / (1024 * 1024))) + ' MB';
var imageUploadContext = String(settings.imageUploadContext || 'wysiwyg').trim() || 'wysiwyg';
- var imageUploadAllowedExtensions = ['png', 'jpg', 'jpeg', 'gif', 'webp', 'bmp', 'avif', 'tif', 'tiff'];
- var imageUploadAllowedMimeTypes = ['image/png', 'image/jpeg', 'image/gif', 'image/webp', 'image/bmp', 'image/avif', 'image/tiff'];
+ var imageUploadAllowedExtensions = ['png', 'jpg', 'jpeg', 'gif', 'webp', 'svg'];
+ var imageUploadAllowedMimeTypes = ['image/png', 'image/jpeg', 'image/gif', 'image/webp', 'image/svg+xml'];
var imageUploadFileTypes = imageUploadAllowedExtensions.join(',');
+ var wysiwygEditorHeightStep = Math.max(1, Number(settings.wysiwygEditorHeightStep || 80));
+ var wysiwygEditorHeightMin = Math.max(1, Number(settings.wysiwygEditorHeightMin || 240));
+ var wysiwygEditorHeightMax = Math.max(wysiwygEditorHeightMin, Number(settings.wysiwygEditorHeightMax || 960));
+ var wysiwygEditorHeightDefault = Math.max(wysiwygEditorHeightMin, Number(settings.wysiwygEditorHeightDefault || 360));
var editorImageUploadPaths = new Set();
var committedEditorImageUploadPaths = new Set();
var pendingEditorImageUploadCleanupPaths = new Set();
@@ -64,6 +70,99 @@ export function createSlideFormEditorController(options) {
return '';
}
+ function normalizeEditorHeightValue(value) {
+ var numericValue = Number(value);
+ if (!Number.isFinite(numericValue) || numericValue <= 0) {
+ numericValue = wysiwygEditorHeightDefault;
+ }
+
+ return Math.min(wysiwygEditorHeightMax, Math.max(wysiwygEditorHeightMin, Math.round(numericValue)));
+ }
+
+ function getEditorHolder(regionId) {
+ if (!templateFields) {
+ return null;
+ }
+
+ return templateFields.querySelector('.editor-holder[data-region-id="' + regionId + '"]');
+ }
+
+ function getEditorHeight(regionId) {
+ var key = String(regionId || '');
+ var storedHeight = editorHeights.get(key);
+ if (storedHeight !== undefined && storedHeight !== null) {
+ return normalizeEditorHeightValue(storedHeight);
+ }
+
+ var holder = getEditorHolder(key);
+ var holderHeight = holder && holder.dataset ? holder.dataset.editorHeight : '';
+ var normalizedHeight = normalizeEditorHeightValue(holderHeight || wysiwygEditorHeightDefault);
+ editorHeights.set(key, normalizedHeight);
+ return normalizedHeight;
+ }
+
+ function applyEditorHeight(regionId, height, options) {
+ var key = String(regionId || '');
+ var normalizedHeight = normalizeEditorHeightValue(height);
+ var holder = getEditorHolder(key);
+ var editor = editorInstances.get(key);
+ var container = editor && typeof editor.getContainer === 'function' ? editor.getContainer() : null;
+ var shouldRequestPreview = !(options && options.silent);
+
+ editorHeights.set(key, normalizedHeight);
+
+ if (holder) {
+ holder.dataset.editorHeight = String(normalizedHeight);
+ holder.style.height = normalizedHeight + 'px';
+ holder.style.minHeight = normalizedHeight + 'px';
+ }
+
+ if (container) {
+ container.style.height = normalizedHeight + 'px';
+ container.style.minHeight = normalizedHeight + 'px';
+ }
+
+ if (editor && typeof editor.dispatch === 'function') {
+ editor.dispatch('ResizeEditor');
+ }
+
+ if (shouldRequestPreview) {
+ requestPreviewRender();
+ }
+ }
+
+ function adjustEditorHeight(regionId, delta) {
+ applyEditorHeight(regionId, getEditorHeight(regionId) + Number(delta || 0));
+ }
+
+ function bindEditorSizeControls() {
+ if (editorSizeControlsBound || !templateFields) {
+ return;
+ }
+
+ editorSizeControlsBound = true;
+ templateFields.addEventListener('click', function (event) {
+ var button = event.target && typeof event.target.closest === 'function' ? event.target.closest('[data-editor-size-action]') : null;
+ if (!button) {
+ return;
+ }
+
+ var action = String(button.getAttribute('data-editor-size-action') || '').trim();
+ if (action !== 'increase' && action !== 'decrease') {
+ return;
+ }
+
+ var card = typeof button.closest === 'function' ? button.closest('[data-region-id]') : null;
+ var regionId = card ? card.getAttribute('data-region-id') : '';
+ if (!regionId) {
+ return;
+ }
+
+ event.preventDefault();
+ adjustEditorHeight(regionId, action === 'increase' ? wysiwygEditorHeightStep : -wysiwygEditorHeightStep);
+ });
+ }
+
function getEditorHiddenInput(regionId) {
if (!templateFields) {
return null;
@@ -314,15 +413,15 @@ export function createSlideFormEditorController(options) {
}
if (mimeType && imageUploadAllowedMimeTypes.indexOf(mimeType) === -1) {
- return 'This editor accepts PNG, JPG, GIF, WebP, BMP, AVIF, or TIFF images.';
+ return 'This editor accepts PNG, JPG, GIF, WebP, or SVG images.';
}
if (!mimeType && extension && imageUploadAllowedExtensions.indexOf(extension) === -1) {
- return 'This editor accepts PNG, JPG, GIF, WebP, BMP, AVIF, or TIFF images.';
+ return 'This editor accepts PNG, JPG, GIF, WebP, or SVG images.';
}
if (!mimeType && !extension) {
- return 'This editor accepts PNG, JPG, GIF, WebP, BMP, AVIF, or TIFF images.';
+ return 'This editor accepts PNG, JPG, GIF, WebP, or SVG images.';
}
return '';
@@ -470,6 +569,8 @@ export function createSlideFormEditorController(options) {
source.id = 'slide-editor-region-' + regionId;
}
+ applyEditorHeight(regionId, getEditorHeight(regionId), { silent: true });
+
function registerInlineFormat(editor, formatName, styles) {
editor.formatter.register(formatName, {
inline: 'span',
@@ -515,6 +616,8 @@ export function createSlideFormEditorController(options) {
toolbar: 'undo redo | fontfamily fontsizeinput | forecolor backcolor bold italic underlineformats removeformat | align lineheight indent outdent bullist numlist table image chip | fullscreen',
toolbar_mode: 'sliding',
license_key: 'gpl',
+ height: getEditorHeight(regionId),
+ min_height: wysiwygEditorHeightMin,
table_default_attributes: {
border: '1',
cellpadding: '0',
@@ -601,6 +704,7 @@ export function createSlideFormEditorController(options) {
}
editorInstances.set(regionId, editor);
+ applyEditorHeight(regionId, getEditorHeight(regionId), { silent: true });
if (editor.targetElm) {
editor.targetElm.value = editor.getContent({ format: 'html' });
}
@@ -617,6 +721,7 @@ export function createSlideFormEditorController(options) {
return Promise.resolve([]);
}
+ bindEditorSizeControls();
watchThemeChanges();
var holders = Array.prototype.slice.call(templateFields.querySelectorAll('.editor-holder'));
diff --git a/src/web/public/js/slides/slide-image-cropper.js b/src/web/public/js/slides/slide-image-cropper.js
index 21cbed5..cd79f2b 100644
--- a/src/web/public/js/slides/slide-image-cropper.js
+++ b/src/web/public/js/slides/slide-image-cropper.js
@@ -14,6 +14,7 @@
var currentInput = null;
var currentFile = null;
var currentObjectUrl = '';
+ var cropperFrame = modal.querySelector('.slide-image-cropper-frame');
var flipX = 1;
var flipY = 1;
var currentAspectRatio = NaN;
@@ -40,6 +41,12 @@
status.textContent = String(message || '');
}
+ function setCropperLoading(loading) {
+ if (cropperFrame) {
+ cropperFrame.classList.toggle('is-loading', Boolean(loading));
+ }
+ }
+
function showModal() {
if (window.pulseModal && typeof window.pulseModal.show === 'function') {
window.pulseModal.show(modal);
@@ -79,6 +86,7 @@
function resetModalState() {
destroyCropper();
revokeObjectUrl();
+ setCropperLoading(false);
currentInput = null;
currentFile = null;
flipX = 1;
@@ -118,6 +126,75 @@
return width / height;
}
+ function isSvgFile(file) {
+ if (!file) {
+ return false;
+ }
+
+ return String(file.type || '').toLowerCase() === 'image/svg+xml' || /\.svg$/i.test(String(file.name || ''));
+ }
+
+ function isGifFile(file) {
+ if (!file) {
+ return false;
+ }
+
+ return String(file.type || '').toLowerCase() === 'image/gif' || /\.gif$/i.test(String(file.name || ''));
+ }
+
+ function isSpecialRasterizationFile(file) {
+ return isSvgFile(file) || isGifFile(file);
+ }
+
+ function getSpecialFileWarning(file) {
+ if (isGifFile(file)) {
+ return 'GIF selected. If you crop, rotate, or flip this image, it will be rasterized and the animation will be lost. Leave the full image selected to keep the original GIF.';
+ }
+
+ return 'SVG selected. If you crop, rotate, or flip this image, it will be rasterized. Leave the full image selected to keep the original SVG.';
+ }
+
+ function isOriginalSpecialSelection() {
+ if (!cropper || !currentFile || !isSpecialRasterizationFile(currentFile) || typeof cropper.getData !== 'function' || typeof cropper.getImageData !== 'function') {
+ return false;
+ }
+
+ var cropData = cropper.getData(true) || {};
+ var imageData = cropper.getImageData() || {};
+ var width = Number(imageData.naturalWidth || 0);
+ var height = Number(imageData.naturalHeight || 0);
+
+ if (!Number.isFinite(width) || !Number.isFinite(height) || width <= 0 || height <= 0) {
+ return false;
+ }
+
+ return Math.abs(Number(cropData.x || 0)) < 0.5 &&
+ Math.abs(Number(cropData.y || 0)) < 0.5 &&
+ Math.abs(Number(cropData.width || 0) - width) < 0.5 &&
+ Math.abs(Number(cropData.height || 0) - height) < 0.5 &&
+ Math.abs(Number(cropData.rotate || 0)) < 0.5 &&
+ Number(cropData.scaleX || 1) === 1 &&
+ Number(cropData.scaleY || 1) === 1;
+ }
+
+ function getRasterizedFileName(sourceName) {
+ var name = String(sourceName || '').trim();
+
+ if (!name) {
+ return 'slide-region-image.png';
+ }
+
+ if (/\.svg$/i.test(name)) {
+ return name.replace(/\.svg$/i, '.png');
+ }
+
+ if (/\.[a-z0-9]+$/i.test(name)) {
+ return name.replace(/\.[a-z0-9]+$/i, '.png');
+ }
+
+ return name + '.png';
+ }
+
function setActiveRatioButton(value) {
var targetValue = ratioLabelForValue(value);
modal.querySelectorAll('[data-slide-image-cropper-action="ratio"]').forEach(function (button) {
@@ -183,6 +260,8 @@
zoomOnTouch: true,
zoomOnWheel: true,
ready: function () {
+ setCropperLoading(false);
+
if (cropper && cropper.container) {
cropper.container.style.width = '100%';
cropper.container.style.height = '560px';
@@ -209,7 +288,10 @@
setButtonState(false);
setActiveRatioButton(currentAspectRatio === undefined ? 'free' : currentAspectRatio);
- setStatus('Use the toolbar to crop, rotate, or flip the image before applying it.');
+
+ if (isSpecialRasterizationFile(currentFile)) {
+ setStatus(getSpecialFileWarning(currentFile));
+ }
}
function openEditor(input, file) {
@@ -220,8 +302,9 @@
currentAspectRatio = 'free';
currentRegionAspectRatio = parseAspectRatio(input && input.dataset && input.dataset.slideImageCropperRegionRatio);
currentRegionAspectRatioLabel = String(input && input.dataset && input.dataset.slideImageCropperRegionRatioLabel || 'Region').trim() || 'Region';
+ setCropperLoading(true);
setButtonState(true);
- setStatus('Loading image editor...');
+ setStatus(isSpecialRasterizationFile(file) ? getSpecialFileWarning(file) : '');
modal.querySelectorAll('[data-slide-image-cropper-action="ratio"][data-slide-image-cropper-ratio="region"]').forEach(function (button) {
button.title = currentRegionAspectRatioLabel ? 'Region ratio ' + currentRegionAspectRatioLabel : 'Region ratio';
@@ -286,11 +369,62 @@
hideModal();
}
+ function finalizeCurrentSvgSelection() {
+ if (!currentFile) {
+ return;
+ }
+
+ if (isOriginalSpecialSelection()) {
+ finalizeCropFile(currentFile);
+ return;
+ }
+
+ setButtonState(true);
+ setStatus('Creating a rasterized image from the crop...');
+
+ var canvas = cropper && typeof cropper.getCroppedCanvas === 'function' ? cropper.getCroppedCanvas({
+ fillColor: 'transparent',
+ imageSmoothingEnabled: true,
+ imageSmoothingQuality: 'high'
+ }) : null;
+
+ if (!canvas) {
+ setStatus('Unable to create the cropped image.');
+ setButtonState(false);
+ return;
+ }
+
+ canvas.toBlob(function (blob) {
+ if (!blob) {
+ setStatus('Unable to create the cropped image.');
+ setButtonState(false);
+ return;
+ }
+
+ var finalFile = new File([blob], getRasterizedFileName(currentFile.name), {
+ lastModified: Date.now(),
+ type: blob.type || 'image/png'
+ });
+
+ finalizeCropFile(finalFile);
+ }, 'image/png');
+ }
+
function commitCrop() {
if (!currentInput || !currentFile) {
return;
}
+ if (isSpecialRasterizationFile(currentFile)) {
+ if (!cropper) {
+ finalizeCropFile(currentFile);
+ return;
+ }
+
+ finalizeCurrentSvgSelection();
+ return;
+ }
+
if (!cropper) {
finalizeCropFile(currentFile);
return;
@@ -381,7 +515,7 @@
return;
}
- if (!/^image\//i.test(file.type || '')) {
+ if (!/^image\//i.test(file.type || '') && !/\.svg$/i.test(String(file.name || ''))) {
input.value = '';
return;
}
diff --git a/src/web/routes/admin/content.js b/src/web/routes/admin/content.js
index b4407ff..f2ee112 100644
--- a/src/web/routes/admin/content.js
+++ b/src/web/routes/admin/content.js
@@ -110,14 +110,14 @@ module.exports = function registerContentRoutes(app, deps) {
const extension = path.extname(String(file && file.originalname || '')).toLowerCase();
const isWysiwyg = String(uploadContext || '').trim().toLowerCase() === 'wysiwyg';
- if (isWysiwyg && mimeType.indexOf('image/') !== 0 && ['.png', '.jpg', '.jpeg', '.gif', '.webp', '.bmp', '.avif', '.tif', '.tiff'].indexOf(extension) === -1) {
+ if (isWysiwyg && mimeType.indexOf('image/') !== 0 && ['.png', '.jpg', '.jpeg', '.gif', '.webp', '.svg'].indexOf(extension) === -1) {
return null;
}
if (mimeType.indexOf('video/') === 0 || ['.mp4', '.webm', '.ogg', '.ogv', '.mov', '.avi', '.mkv'].indexOf(extension) !== -1) {
return 'video';
}
- if (mimeType.indexOf('image/') === 0 || ['.png', '.jpg', '.jpeg', '.gif', '.webp', '.bmp', '.avif', '.tif', '.tiff'].indexOf(extension) !== -1) {
+ if (mimeType.indexOf('image/') === 0 || ['.png', '.jpg', '.jpeg', '.gif', '.webp', '.svg'].indexOf(extension) !== -1) {
return 'image';
}
return null;
diff --git a/src/web/routes/settings/fonts.js b/src/web/routes/settings/fonts.js
index 4abfc07..de9cc47 100644
--- a/src/web/routes/settings/fonts.js
+++ b/src/web/routes/settings/fonts.js
@@ -3,6 +3,10 @@
const fs = require('fs');
const { hasAnyPermission, PERMISSION_DENIED_MESSAGE } = require('#src/rbac');
const fontLibrary = require('#src/web/lib/media/font-library');
+const { buildPagination } = require('../../lib/pagination');
+const { createSearchMatcher, getSearchQuery, getSortDirectionQuery, getSortQuery, parsePageNumber, sortRows } = require('../../lib/list-query');
+
+const LIST_PAGE_SIZE = 25;
function normalizeFontFamilyName(value) {
return String(value || '').replace(/\s+/g, ' ').trim().toLowerCase();
@@ -43,6 +47,48 @@ async function isFontUsed(pool, family) {
return Number(rows && rows[0] && rows[0].match_count) > 0;
}
+async function buildFontsPageData(pool, uploadDir, req, common) {
+ const library = fontLibrary.loadFontLibrary(uploadDir);
+ const usedFamilies = await fetchUsedFontFamilies(pool, library.fonts);
+ const search = common && typeof common.getSearchQuery === 'function' ? common.getSearchQuery(req) : getSearchQuery(req);
+ const sort = common && typeof common.getSortQuery === 'function' ? common.getSortQuery(req) : getSortQuery(req);
+ const direction = common && typeof common.getSortDirectionQuery === 'function' ? common.getSortDirectionQuery(req) : getSortDirectionQuery(req);
+ const searchableFonts = sortRows(library.fonts.map(function (font) {
+ const family = normalizeFontFamilyName(font.family || font.name);
+ return Object.assign({}, font, {
+ inUse: usedFamilies.has(family)
+ });
+ }), function (font) {
+ if (sort === 'file') {
+ return String(font && font.fileName || '').trim();
+ }
+ if (sort === 'format') {
+ return String(font && font.format || '').trim();
+ }
+ if (sort === 'status') {
+ return font && font.enabled ? 'Enabled' : 'Disabled';
+ }
+
+ return String(font && font.family || font && font.name || '').trim();
+ }, direction).filter(createSearchMatcher(search, [
+ 'family',
+ 'name',
+ 'fileName',
+ 'format',
+ function (font) {
+ return font && font.enabled ? 'enabled' : 'disabled';
+ }
+ ]));
+ const pagination = buildPagination(searchableFonts.length, parsePageNumber(req && req.query && req.query.page), 'page', { search: search, sort: sort, direction: direction }, LIST_PAGE_SIZE, 'fonts', 'Font pages');
+ const startIndex = (pagination.currentPage - 1) * LIST_PAGE_SIZE;
+
+ return {
+ fonts: searchableFonts.slice(startIndex, startIndex + LIST_PAGE_SIZE),
+ pagination: pagination,
+ stylesheetHref: library.stylesheetHref
+ };
+}
+
function redirectToLogin(res, setAuthMessageCookie) {
if (typeof setAuthMessageCookie === 'function') {
setAuthMessageCookie(res, 'Please sign in to continue.');
@@ -71,6 +117,7 @@ function requireFontsAccess(setAuthMessageCookie) {
module.exports = function registerFontRoutes(app, deps) {
const pool = deps.pool;
+ const common = deps.common || {};
const pages = deps.pages;
const upload = deps.upload;
const uploadDir = deps.uploadDir;
@@ -85,18 +132,8 @@ module.exports = function registerFontRoutes(app, deps) {
app.get('/settings/fonts', requireFontsAccess(setAuthMessageCookie), async function (req, res, next) {
try {
- const library = fontLibrary.loadFontLibrary(uploadDir);
- const usedFamilies = await fetchUsedFontFamilies(pool, library.fonts);
- const fonts = library.fonts.map(function (font) {
- const family = normalizeFontFamilyName(font.family || font.name);
- return Object.assign({}, font, {
- inUse: usedFamilies.has(family)
- });
- });
- res.send(pages.renderFontsPage({
- fonts: fonts,
- stylesheetHref: library.stylesheetHref
- }, req.query.message ? String(req.query.message) : '', req.currentUser));
+ const data = await buildFontsPageData(pool, uploadDir, req, common);
+ res.send(pages.renderFontsPage(data, req.query.message ? String(req.query.message) : '', req.currentUser));
} catch (error) {
next(error);
}
@@ -132,19 +169,9 @@ module.exports = function registerFontRoutes(app, deps) {
}
if (error && /already exists/i.test(String(error.message || ''))) {
- const library = fontLibrary.loadFontLibrary(uploadDir);
- const usedFamilies = await fetchUsedFontFamilies(pool, library.fonts);
- const fonts = library.fonts.map(function (font) {
- const family = normalizeFontFamilyName(font.family || font.name);
- return Object.assign({}, font, {
- inUse: usedFamilies.has(family)
- });
- });
+ const data = await buildFontsPageData(pool, uploadDir, req, common);
- return res.status(400).send(pages.renderFontsPage({
- fonts: fonts,
- stylesheetHref: library.stylesheetHref
- }, String(error.message || 'Font already exists.'), req.currentUser));
+ return res.status(400).send(pages.renderFontsPage(data, String(error.message || 'Font already exists.'), req.currentUser));
}
next(error);
diff --git a/src/web/routes/settings/fonts/list.js b/src/web/routes/settings/fonts/list.js
index ddb2428..430f314 100644
--- a/src/web/routes/settings/fonts/list.js
+++ b/src/web/routes/settings/fonts/list.js
@@ -9,6 +9,7 @@ module.exports = function renderFontsPage(data, message, currentUser) {
message: message,
currentUser: currentUser || null,
fonts: data.fonts || [],
+ pagination: data.pagination || null,
stylesheetHref: data.stylesheetHref || ''
});
};
\ No newline at end of file
diff --git a/src/web/views/settings/fonts/list.hbs b/src/web/views/settings/fonts/list.hbs
index 1475bc9..8e5c920 100644
--- a/src/web/views/settings/fonts/list.hbs
+++ b/src/web/views/settings/fonts/list.hbs
@@ -5,82 +5,91 @@