build(release): merge branch develop (release 1.7.5)

.github/workflows/release.yml

@@ -1,22 +1,19 @@
-name: "tagged-release"
+name: "release-notes"
 
 on:
   push:
     tags:
       - "*"
 
 jobs:
-  tagged-release:
-    name: "Tagged Release"
+  release-notes:
+    name: "Regex Filtered Release Notes"
     runs-on: "ubuntu-latest"
-
     steps:
-
-      - name: "Build & test"
-        run: |
-          echo "done!"
-      - uses: "marvinpinto/[email protected]"
+      - uses: "marcantondahmen/release-notes-action@master"
         with:
           repo_token: "${{ secrets.GITHUB_TOKEN }}"
           prerelease: false
-          draft: true
+          draft: false
+          filter: "^(feat|fix)"
+          strict: true

automad/blocks/pagelist.php

@@ -70,6 +70,7 @@ public static function render($data, $Automad) {
 		$defaults = array(
 			'type' => '',
 			'matchUrl' => '',
+			'excludeHidden' => true,
 			'filter' => '',
 			'template' => '',
 			'excludeCurrent' => true,

automad/core/sitemap.php

@@ -37,6 +37,7 @@
 
 namespace Automad\Core;
 
+use Automad\GUI\User as User;
 
 defined('AUTOMAD') or die('Direct access not permitted!');
 
@@ -60,13 +61,17 @@ class Sitemap {
 
 	public function __construct($collection) {
 
-		$sitemap = AM_BASE_DIR . '/sitemap.xml';
-
-		// If the base dir is writable without having a sitemap.xml or if sitemap.xml exists and is writable itself.
-		if ((is_writable(AM_BASE_DIR) && !file_exists($sitemap)) || is_writable($sitemap)) {
-			$this->generate($collection, $sitemap);
-		} else {
-			Debug::log('Permissions denied!');
+		if (!User::get()) {
+
+			$sitemap = AM_BASE_DIR . '/sitemap.xml';
+
+			// If the base dir is writable without having a sitemap.xml or if sitemap.xml exists and is writable itself.
+			if ((is_writable(AM_BASE_DIR) && !file_exists($sitemap)) || is_writable($sitemap)) {
+				$this->generate($collection, $sitemap);
+			} else {
+				Debug::log('Permissions denied!');
+			}
+
 		}
 
 	}

automad/gui/js/editorjs/blocks/pagelist.js

@@ -43,6 +43,7 @@ class AutomadBlockPagelist {
 	static get sanitize() {
 		return {
 			type: false,
+			excludeHidden: false,
 			matchUrl: false,
 			filter: false,
 			template: false,
@@ -70,6 +71,7 @@ class AutomadBlockPagelist {
 
 		this.data = {
 			type: data.type || '',
+			excludeHidden: data.excludeHidden !== undefined ? data.excludeHidden : true,
 			matchUrl: data.matchUrl || '',
 			filter: data.filter || '',
 			template: data.template || '',
@@ -105,6 +107,21 @@ class AutomadBlockPagelist {
 					${create.label(t('pagelist_url_regex')).outerHTML}
 					${create.editable(['cdx-input', 'am-block-match-url'], 'work|blog', this.data.matchUrl).outerHTML}
 				</li>
+				<li class="uk-width-medium-1-1">
+					<div class="uk-form-row uk-margin-small-top">
+						<label
+						class="${this.data.excludeHidden == true ? 'uk-active' : ''} am-toggle-switch uk-text-truncate uk-button uk-text-left uk-width-1-1"
+						data-am-toggle
+						>
+							${t('pagelist_exclude_hidden')}
+							<input 
+							type="checkbox" 
+							class="am-block-exclude-hidden"
+							${this.data.excludeHidden == true ? 'checked' : ''}
+							>
+						</label>
+					</div>
+				</li>
 				<li class="uk-width-medium-1-3">
 					${create.label(t('pagelist_type')).outerHTML}
 					${create.select(['cdx-input', 'am-block-type'], ['all', 'children', 'related', 'siblings'], this.data.type).outerHTML}
@@ -136,6 +153,7 @@ class AutomadBlockPagelist {
 
 		this.inputs = {
 			type: this.wrapper.querySelector('.am-block-type'),
+			excludeHidden: this.wrapper.querySelector('.am-block-exclude-hidden'),
 			matchUrl: this.wrapper.querySelector('.am-block-match-url'),
 			filter: this.wrapper.querySelector('.am-block-filter'),
 			template: this.wrapper.querySelector('.am-block-template'),
@@ -160,6 +178,7 @@ class AutomadBlockPagelist {
 
 		return Object.assign(this.data, {
 			type: this.inputs.type.value,
+			excludeHidden: this.inputs.excludeHidden.checked,
 			matchUrl: stripNbsp(this.inputs.matchUrl.innerHTML),
 			filter: stripNbsp(this.inputs.filter.innerHTML),
 			template: stripNbsp(this.inputs.template.innerHTML),

automad/gui/js/editorjs/image_selection.js

@@ -66,7 +66,7 @@ class AutomadEditorImageSelection {
 
 			fields.appendChild(item);
 
-			Automad.selectImage.dialog(false, true, (value) => {
+			Automad.selectImage.dialog(false, false, (value) => {
 				input.value = value;
 				input.dispatchEvent(new Event('keydown', { bubbles: true }));
 			});

automad/gui/lang/bosnian.txt

@@ -490,6 +490,10 @@ editor_pagelist_default: Zadani predložak
 
 -
 
+editor_pagelist_exclude_hidden: Isključite skrivene stranice
+
+-
+
 editor_pagelist_url_regex: URL regularni izraz
 
 -

automad/gui/lang/bulgarian.txt

@@ -490,6 +490,10 @@ editor_pagelist_default: Шаблон по подразбиране
 
 -
 
+editor_pagelist_exclude_hidden: Изключете скритите страници
+
+-
+
 editor_pagelist_url_regex: Филтър за регулярни изрази на URL
 
 -

automad/gui/lang/czech.txt

@@ -490,6 +490,10 @@ editor_pagelist_default: Výchozí šablona
 
 -
 
+editor_pagelist_exclude_hidden: Vyloučit skryté stránky
+
+-
+
 editor_pagelist_url_regex: Filtr regulárních výrazů URL
 
 -

automad/gui/lang/danish.txt

@@ -490,6 +490,10 @@ editor_pagelist_default: Standardskabelon
 
 -
 
+editor_pagelist_exclude_hidden: Ekskluder skjulte sider
+
+-
+
 editor_pagelist_url_regex: URL Regex-filter
 
 -

automad/gui/lang/dutch.txt

@@ -490,6 +490,10 @@ editor_pagelist_default: Standaardsjabloon
 
 -
 
+editor_pagelist_exclude_hidden: Verborgen pagina's uitsluiten
+
+-
+
 editor_pagelist_url_regex: URL Regex-filter
 
 -

automad/gui/lang/english.txt

@@ -530,6 +530,10 @@ editor_pagelist_default: Default Template
 
 -
 
+editor_pagelist_exclude_hidden: Exclude Hidden Pages
+
+-
+
 editor_pagelist_url_regex: URL Regex Filter
 
 -

automad/gui/lang/estonian.txt

@@ -490,6 +490,10 @@ editor_pagelist_default: Vaikemall
 
 -
 
+editor_pagelist_exclude_hidden: Välista peidetud leheküljed
+
+-
+
 editor_pagelist_url_regex: URL-i regex-filter
 
 -

automad/gui/lang/finnish.txt

@@ -490,6 +490,10 @@ editor_pagelist_default: Oletusmalli
 
 -
 
+editor_pagelist_exclude_hidden: Sulje piilotetut sivut
+
+-
+
 editor_pagelist_url_regex: URL Regex -suodatin
 
 -

automad/gui/lang/french.txt

@@ -490,6 +490,10 @@ editor_pagelist_default: Modèle par défaut
 
 -
 
+editor_pagelist_exclude_hidden: Exclure les pages cachées
+
+-
+
 editor_pagelist_url_regex: Filtre d'URL Regex
 
 -

automad/gui/lang/german.txt

@@ -490,6 +490,10 @@ editor_pagelist_default: Standardvorlage
 
 -
 
+editor_pagelist_exclude_hidden: Verborgene Seiten ausschließen
+
+-
+
 editor_pagelist_url_regex: URL Regex Filter
 
 -

automad/gui/lang/greek.txt

@@ -490,6 +490,10 @@ editor_pagelist_default: Προεπιλεγμένο πρότυπο
 
 -
 
+editor_pagelist_exclude_hidden: Αποκλείστε κρυμμένες σελίδες
+
+-
+
 editor_pagelist_url_regex: Φίλτρο Regex URL
 
 -

automad/gui/lang/icelandic.txt

@@ -490,6 +490,10 @@ editor_pagelist_default: Sjálfgefið sniðmát
 
 -
 
+editor_pagelist_exclude_hidden: Útiloka falinn síður
+
+-
+
 editor_pagelist_url_regex: Vefslóð Regex sía
 
 -

automad/gui/lang/irish.txt

@@ -490,6 +490,10 @@ editor_pagelist_default: Teimpléad Réamhshocraithe
 
 -
 
+editor_pagelist_exclude_hidden: Eisiamh na leathanaigh i bhfolach
+
+-
+
 editor_pagelist_url_regex: Scagaire URL Regex
 
 -

automad/gui/lang/italian.txt

@@ -490,6 +490,10 @@ editor_pagelist_default: Modello predefinito
 
 -
 
+editor_pagelist_exclude_hidden: Escludere pagine nascoste
+
+-
+
 editor_pagelist_url_regex: Filtro URL Regex
 
 -

automad/gui/lang/latvian.txt

@@ -490,6 +490,10 @@ editor_pagelist_default: Noklusējuma veidne
 
 -
 
+editor_pagelist_exclude_hidden: Izslēgt slēptās lapas
+
+-
+
 editor_pagelist_url_regex: URL regex filtrs
 
 -

automad/gui/lang/lithuanian.txt

@@ -490,6 +490,10 @@ editor_pagelist_default: Numatytasis šablonas
 
 -
 
+editor_pagelist_exclude_hidden: Išskirti paslėptus puslapius
+
+-
+
 editor_pagelist_url_regex: URL reguliavimo filtras
 
 -

automad/gui/lang/norwegian.txt

@@ -490,6 +490,10 @@ editor_pagelist_default: Standard mal
 
 -
 
+editor_pagelist_exclude_hidden: Utelukke skjulte sider
+
+-
+
 editor_pagelist_url_regex: URL Regex-filter
 
 -

automad/gui/lang/polish.txt

@@ -490,6 +490,10 @@ editor_pagelist_default: Domyślny szablon
 
 -
 
+editor_pagelist_exclude_hidden: Wyklucz ukryte strony
+
+-
+
 editor_pagelist_url_regex: URL Regex Filter
 
 -

automad/gui/lang/portuguese.txt

@@ -490,6 +490,10 @@ editor_pagelist_default: Modelo Padrão
 
 -
 
+editor_pagelist_exclude_hidden: Excluir páginas escondidas
+
+-
+
 editor_pagelist_url_regex: Filtro Regex de URL
 
 -

automad/gui/lang/romanian.txt

@@ -490,6 +490,10 @@ editor_pagelist_default: Șablon implicit
 
 -
 
+editor_pagelist_exclude_hidden: Excludeți paginile ascunse
+
+-
+
 editor_pagelist_url_regex: Filtru Regex URL
 
 -

automad/gui/lang/russian.txt

@@ -490,6 +490,10 @@ editor_pagelist_default: Шаблон по умолчанию
 
 -
 
+editor_pagelist_exclude_hidden: Исключить скрытые страницы
+
+-
+
 editor_pagelist_url_regex: Фильтр регулярных выражений URL
 
 -