merge branch v2 (release 2.0.0-beta.31)

Author: marcantondahmen

.gitignore

@@ -1,5 +1,6 @@
 /automad/legacy
 /automad/src/client/blocks/legacy
+/automad/tests/main/config
 /lib/vendor
 /packages
 /pages

CHANGELOG.md

@@ -1,8 +1,20 @@
 # Changelog
 
-## [v2.0.0-beta.30](https://github.com/marcantondahmen/automad/commit/8b9df8deefd967bb51ae295f9d6f33c838cb0bfa)
+## [v2.0.0-beta.31](https://github.com/marcantondahmen/automad/commit/a7c4b9459ef02cff4ae0f6d4ca6e2349f438f1a8)
 
-Fri, 8 May 2026 12:27:19 +0200
+Sun, 10 May 2026 12:28:25 +0200
+
+### New Features
+
+- add option to disable in-page edit mode in page previews ([644c5aeab](https://github.com/marcantondahmen/automad/commit/644c5aeabfc56952f0a00c491453cbaae1f3a4c3))
+
+### Bugfixes
+
+- fix email template styling ([99736f93b](https://github.com/marcantondahmen/automad/commit/99736f93be5883ef8a788e27f4efc92167e438ad))
+
+## [v2.0.0-beta.30](https://github.com/marcantondahmen/automad/commit/49b7361b10dcfe671798b826933bcb8c76a7c6fd)
+
+Fri, 8 May 2026 12:29:17 +0200
 
 ### Bugfixes
 

automad/lang/english.json

@@ -266,8 +266,9 @@
 	"importFromUrl": "Import",
 	"importUrl": "Enter a file URL",
 	"importing": "Importing ...",
-	"inPageEdit": "In-Page edit mode",
-	"inPagePlaceholder": "Add content here",
+	"inPageEdit": "Open preview",
+	"inPageEditDisable": "Disable Editing",
+	"inPageEditEnable": "Enable Editing",
 	"indent": "Indent",
 	"inlineCode": "Inline code",
 	"insertCodeBlock": "Insert code block",

automad/src/client/admin/components/NavTree.ts

@@ -97,7 +97,7 @@ const renderLabelFunction: SortableTreeRenderLabelFunction = (
 			: App.system.i18n && data.parentUrl === '/'
 				? 'translate'
 				: data.private
-					? 'eye-slash-fill'
+					? 'ban-fill'
 					: 'file-earmark-text';
 
 	const titleBinding = active

automad/src/client/admin/components/PageSelectTree.ts

@@ -60,7 +60,7 @@ import { ModalComponent } from './Modal/Modal';
 const renderLabelFunction: SortableTreeRenderLabelFunction = (
 	data: SortableTreeKeyValue
 ): string => {
-	const icon = data.private ? 'eye-slash-fill' : 'folder2';
+	const icon = data.private ? 'ban-fill' : 'folder2';
 
 	return html`
 		<label class="${CSS.navItem}">

automad/src/client/admin/components/Pages/Page.ts

@@ -251,9 +251,13 @@ const renderMenu = (): string => {
 					</am-dropdown>
 				</am-switcher>
 				<am-filter placeholder="filterContent"></am-filter>
-				<am-private-indicator
-					class="${CSS.displaySmallNone}"
-				></am-private-indicator>
+				<a
+					href="${App.baseIndex}${getPageURL()}"
+					class="${CSS.displaySmallNone} ${CSS.menuItem} ${CSS.menuItemIcon}"
+					${Attr.tooltip}="${App.text('inPageEdit')}"
+				>
+					<i class="bi bi-eye"></i>
+				</a>
 				${renderDropdown()}
 			</div>
 		</section>

automad/src/client/admin/core/css.ts

@@ -284,6 +284,7 @@ export const enum CSS {
 
 	menu = 'am-c-menu',
 	menuItem = 'am-c-menu__item',
+	menuItemIcon = 'am-c-menu__item--icon',
 
 	modal = 'am-c-modal',
 	modalDialog = 'am-c-modal__dialog',
@@ -337,8 +338,6 @@ export const enum CSS {
 	platformSelectIcon = 'am-f-platform-select__icon',
 	platformSelectActiveIcon = 'am-f-platform-select__active-icon',
 
-	privacyIndicator = 'am-c-privacy-indicator',
-
 	root = 'am-c-root',
 	rootLoading = 'am-c-root--loading',
 	rootPending = 'am-c-root--pending',

automad/src/client/admin/index.ts

@@ -102,7 +102,6 @@ import('./components/Forms/TrashForm');
 import('./components/Home/RecentlyEditedPages');
 import('./components/Home/ServerInfo');
 
-import('./components/Indicators/Menu/PrivateIndicator');
 import('./components/Indicators/Navbar/DebugIndicator');
 import('./components/Indicators/Navbar/OutdatedPackagesIndicator');
 import('./components/Indicators/Navbar/SystemUpdateIndicator');

automad/src/client/admin/styles/components/index.less

@@ -56,7 +56,6 @@
 @import 'nav.less';
 @import 'navbar.less';
 @import 'notify.less';
-@import 'privacy-indicator.less';
 @import 'root.less';
 @import 'spinner.less';
 @import 'switcher.less';

automad/src/client/admin/styles/components/menu.less

@@ -43,7 +43,9 @@
 		gap: 0.6rem;
 		line-height: @am-menu-height;
 		color: @am-menu-item-clr;
-		transition: color 0.2s, box-shadow 0.2s;
+		transition:
+			color 0.2s,
+			box-shadow 0.2s;
 		cursor: pointer;
 		user-select: none;
 
@@ -54,5 +56,9 @@
 		&.am-active {
 			box-shadow: inset 0 -2px 0 0 hsl(var(--am-clr-text));
 		}
+
+		&--icon {
+			font-size: 1.2rem;
+		}
 	}
 }