From 77f5fa11eb3776b72c1ac94470eb747b31cb5230 Mon Sep 17 00:00:00 2001 From: Giuseppe Criscione <18699708+giuscris@users.noreply.github.com> Date: Sat, 19 Oct 2024 19:47:29 +0200 Subject: [PATCH 1/5] Remove routability from page status --- formwork/src/Pages/Page.php | 5 ----- formwork/src/Pages/Traits/PageStatus.php | 5 ++--- panel/views/partials/pages/status.php | 2 -- 3 files changed, 2 insertions(+), 10 deletions(-) diff --git a/formwork/src/Pages/Page.php b/formwork/src/Pages/Page.php index 64e4dcd32..8e730d0f2 100644 --- a/formwork/src/Pages/Page.php +++ b/formwork/src/Pages/Page.php @@ -50,11 +50,6 @@ class Page extends Model implements Stringable */ public const PAGE_STATUS_NOT_PUBLISHED = 'notPublished'; - /** - * Page `not routable` status - */ - public const PAGE_STATUS_NOT_ROUTABLE = 'notRoutable'; - protected const MODEL_IDENTIFIER = 'page'; /** diff --git a/formwork/src/Pages/Traits/PageStatus.php b/formwork/src/Pages/Traits/PageStatus.php index e218d5bf3..fd9f59856 100644 --- a/formwork/src/Pages/Traits/PageStatus.php +++ b/formwork/src/Pages/Traits/PageStatus.php @@ -50,9 +50,8 @@ public function status(): string } $this->status = match (true) { - $published => Page::PAGE_STATUS_PUBLISHED, - !$this->routable() => Page::PAGE_STATUS_NOT_ROUTABLE, - !$published => Page::PAGE_STATUS_NOT_PUBLISHED + $published => Page::PAGE_STATUS_PUBLISHED, + !$published => Page::PAGE_STATUS_NOT_PUBLISHED }; return $this->status; diff --git a/panel/views/partials/pages/status.php b/panel/views/partials/pages/status.php index a0fcfd3df..fb2234ae4 100644 --- a/panel/views/partials/pages/status.php +++ b/panel/views/partials/pages/status.php @@ -2,6 +2,4 @@ icon('circle-small-fill') ?> status() === 'notPublished') : ?> icon('circle-small-fill') ?> -status() === 'notRoutable') : ?> - icon('circle-small-fill') ?> \ No newline at end of file From 1729a29f4c502f09d2ed862bf2beecbbc1b9f871 Mon Sep 17 00:00:00 2001 From: Giuseppe Criscione <18699708+giuscris@users.noreply.github.com> Date: Sat, 19 Oct 2024 23:12:47 +0200 Subject: [PATCH 2/5] Add badges variants --- panel/src/scss/components/_badges.scss | 46 ++++++++++++++++---------- 1 file changed, 29 insertions(+), 17 deletions(-) diff --git a/panel/src/scss/components/_badges.scss b/panel/src/scss/components/_badges.scss index 803a5a9ea..c23f2266d 100644 --- a/panel/src/scss/components/_badges.scss +++ b/panel/src/scss/components/_badges.scss @@ -3,36 +3,48 @@ min-width: 1.375em; padding: 0.25rem 0.5rem; border-radius: 2em; - margin-left: 0.25rem; background-color: var(--color-base-600); + color: var(--color-base-100); font-size: 0.75em; font-weight: 600; line-height: 1.125; text-align: center; + vertical-align: 0.125em; + white-space: nowrap; } -.button .badge { - padding: 0.125rem 0.375rem; - font-size: 0.75rem; - line-height: 1; +.badge .icon { + min-width: auto; + min-height: auto; +} + +.badge-blue { + background-color: var(--color-accent-800); + color: var(--color-accent-300); } -.button-accent .badge { - background-color: var(--color-accent-900); - color: var(--color-accent-500); +.badge-green { + background-color: var(--color-success-800); + color: var(--color-success-300); } -.button-success .badge { - background-color: var(--color-success-900); - color: var(--color-success-500); +.badge-amber { + background-color: var(--color-warning-700); + color: var(--color-warning-300); } -.button-warning .badge { - background-color: var(--color-warning-900); - color: var(--color-warning-500); +.badge-red { + background-color: var(--color-danger-700); + color: var(--color-danger-300); } -.button-danger .badge { - background-color: var(--color-danger-900); - color: var(--color-danger-500); +.badge-purple { + background-color: var(--color-purple-800); + color: var(--color-purple-300); +} + +.button .badge { + margin: -0.375rem 0; + font-size: 0.75rem; + vertical-align: 0.0625rem; } From 18ea1894b70d0ea6a67fc05d33fba78a677b8b18 Mon Sep 17 00:00:00 2001 From: Giuseppe Criscione <18699708+giuscris@users.noreply.github.com> Date: Sat, 19 Oct 2024 23:13:43 +0200 Subject: [PATCH 3/5] Fix icons positioning --- panel/src/scss/components/_buttons.scss | 2 ++ panel/src/scss/components/_icon.scss | 2 +- panel/src/scss/components/_tooltip.scss | 4 ++-- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/panel/src/scss/components/_buttons.scss b/panel/src/scss/components/_buttons.scss index a84da3dde..8f7ab6026 100644 --- a/panel/src/scss/components/_buttons.scss +++ b/panel/src/scss/components/_buttons.scss @@ -40,6 +40,7 @@ & .icon { display: inline-block; margin-right: 0.25rem; + vertical-align: text-top; } } @@ -132,6 +133,7 @@ .button-link { & .icon { margin-right: 0; + vertical-align: -0.125rem; } } diff --git a/panel/src/scss/components/_icon.scss b/panel/src/scss/components/_icon.scss index 3614f023e..2a70cd0a1 100644 --- a/panel/src/scss/components/_icon.scss +++ b/panel/src/scss/components/_icon.scss @@ -4,5 +4,5 @@ min-width: 16px; height: 1em; min-height: 16px; - vertical-align: -0.125rem; + vertical-align: -0.125em; } diff --git a/panel/src/scss/components/_tooltip.scss b/panel/src/scss/components/_tooltip.scss index c6f6c4905..e012b1742 100644 --- a/panel/src/scss/components/_tooltip.scss +++ b/panel/src/scss/components/_tooltip.scss @@ -13,6 +13,6 @@ } .tooltip .icon { - transform: scale(0.75); - vertical-align: -0.25rem; + min-width: auto; + min-height: auto; } From 561fb898534d5064bd13cbb7258cd0a024f3ef7d Mon Sep 17 00:00:00 2001 From: Giuseppe Criscione <18699708+giuscris@users.noreply.github.com> Date: Sat, 19 Oct 2024 23:28:51 +0200 Subject: [PATCH 4/5] Add page info card --- formwork/translations/de.yaml | 5 ++- formwork/translations/en.yaml | 6 ++-- formwork/translations/es.yaml | 5 ++- formwork/translations/fr.yaml | 6 ++-- formwork/translations/it.yaml | 5 ++- formwork/translations/pt.yaml | 5 ++- formwork/translations/ru.yaml | 5 ++- panel/assets/icons/svg/eye-slash.svg | 1 + panel/src/scss/components/_pages.scss | 40 +++++++++++++++++++++--- panel/views/pages/editor.php | 17 +++++++--- panel/views/pages/tree.php | 45 ++++++++++++++++----------- panel/views/partials/pages/info.php | 16 ++++++++++ 12 files changed, 119 insertions(+), 37 deletions(-) create mode 100644 panel/assets/icons/svg/eye-slash.svg create mode 100644 panel/views/partials/pages/info.php diff --git a/formwork/translations/de.yaml b/formwork/translations/de.yaml index 6461c5dda..76102ffe5 100644 --- a/formwork/translations/de.yaml +++ b/formwork/translations/de.yaml @@ -23,16 +23,19 @@ page.cacheable: Im Cache speichern page.content: Inhalt page.files: Dateien page.image: Bild -page.listed: Im Menü sichtbar +page.listed: Aufgelistet page.noImage: Kein Bild page.none: (Keine) page.noTags: Keine Tags +page.notListed: Nicht aufgelistet +page.notRoutable: Nicht routbar page.options: Optionen page.page: Seite page.parent: Übergeordnete Seite page.postsPerPage: Beiträge pro Seite page.publishDate: Veröffentlichungsdatum page.routable: Routbar +page.slug: Slug page.status.notPublished: Nicht veröffentlicht page.status.notRoutable: Nicht routbar page.status.published: Veröffentlicht diff --git a/formwork/translations/en.yaml b/formwork/translations/en.yaml index e3fd7a4a8..f0eb75338 100644 --- a/formwork/translations/en.yaml +++ b/formwork/translations/en.yaml @@ -23,18 +23,20 @@ page.cacheable: Cacheable page.content: Content page.files: Files page.image: Image -page.listed: Visible in the menu +page.listed: Listed page.noImage: No image page.none: (None) page.noTags: No tags +page.notListed: Not listed +page.notRoutable: Not routable page.options: Options page.page: Page page.parent: Parent page page.postsPerPage: Posts per page page.publishDate: Publish date page.routable: Routable +page.slug: Slug page.status.notPublished: Not published -page.status.notRoutable: Not routable page.status.published: Published page.summary: Summary page.tags: Tags diff --git a/formwork/translations/es.yaml b/formwork/translations/es.yaml index 358d8f4b2..d15d3b335 100644 --- a/formwork/translations/es.yaml +++ b/formwork/translations/es.yaml @@ -23,16 +23,19 @@ page.cacheable: En caché page.content: Contenido page.files: Archivos page.image: Imagen -page.listed: Visible en el menú +page.listed: Listada page.noImage: Sin imagen page.none: (Ninguno) page.noTags: Sin etiquetas +page.notListed: No listada +page.notRoutable: No enrutable page.options: Opciones page.page: Página page.parent: Página principal page.postsPerPage: Publicaciones por página page.publishDate: Fecha de publicación page.routable: Enrutable +page.slug: Slug page.status.notPublished: No publicado page.status.notRoutable: No enrutable page.status.published: Publicado diff --git a/formwork/translations/fr.yaml b/formwork/translations/fr.yaml index 7b6a414a8..bd034e17e 100644 --- a/formwork/translations/fr.yaml +++ b/formwork/translations/fr.yaml @@ -23,18 +23,20 @@ page.cacheable: Activer le cache page.content: Contenu page.files: Fichiers page.image: Image d’accroche -page.listed: Visible dans le menu +page.listed: Répertoriée page.noImage: Aucune image page.none: (Aucun) page.noTags: Aucun tag +page.notListed: Non répertoriée +page.notRoutable: Inaccessible page.options: Options page.page: Page page.parent: Parent page.postsPerPage: Articles par page page.publishDate: Date de publication page.routable: Accessible +page.slug: Slug page.status.notPublished: Brouillon -page.status.notRoutable: Inaccessible page.status.published: Publié page.summary: Résumé page.tags: Tags diff --git a/formwork/translations/it.yaml b/formwork/translations/it.yaml index 981de172a..0f0d2418e 100644 --- a/formwork/translations/it.yaml +++ b/formwork/translations/it.yaml @@ -23,16 +23,19 @@ page.cacheable: Abilita cache page.content: Contenuto page.files: File page.image: Immagine -page.listed: Visibile nel menu +page.listed: Elencata page.noImage: Nessuna immagine page.none: (Nessuna) page.noTags: Nessun tag +page.notListed: Non elencata +page.notRoutable: Non raggiungibile page.options: Opzioni page.page: Pagina page.parent: Pagina superiore page.postsPerPage: Post per pagina page.publishDate: Data di pubblicazione page.routable: Raggiungibile +page.slug: Slug page.status.notPublished: Non pubblicato page.status.notRoutable: Non raggiungibile page.status.published: Pubblicato diff --git a/formwork/translations/pt.yaml b/formwork/translations/pt.yaml index a10dd7644..ead360c8f 100644 --- a/formwork/translations/pt.yaml +++ b/formwork/translations/pt.yaml @@ -23,16 +23,19 @@ page.cacheable: Cache page.content: Conteúdo page.files: Ficheiros page.image: Imagem -page.listed: Visível no menu +page.listed: Listada page.noImage: Sem imagem page.none: (Nenhum) page.noTags: Sem tags +page.notListed: Não listada +page.notRoutable: Não roteável page.options: Opções page.page: Página page.parent: Página parente page.postsPerPage: Items por página page.publishDate: Data de publicação page.routable: Roteável +page.slug: Slug page.status.notPublished: Não publicado page.status.notRoutable: Não roteável page.status.published: Publicado diff --git a/formwork/translations/ru.yaml b/formwork/translations/ru.yaml index 0f7f34bb3..66f38d99b 100644 --- a/formwork/translations/ru.yaml +++ b/formwork/translations/ru.yaml @@ -23,16 +23,19 @@ page.cacheable: Кешируемый page.content: Содержание page.files: Файлы page.image: Изображение -page.listed: Видимо в меню +page.listed: Указана page.noImage: Нет изображения page.none: (Нет) page.noTags: Нет тегов +page.notListed: Не указана +page.notRoutable: Не маршрутизируемый page.options: Параметры page.page: Страница page.parent: Родитель страницы page.postsPerPage: Сообщения на странице page.publishDate: Дата публикации page.routable: Маршрутизируемый +page.slug: Slug page.status.notPublished: Не Опубликовано page.status.notRoutable: Не маршрутизируемый page.status.published: Опубликованный diff --git a/panel/assets/icons/svg/eye-slash.svg b/panel/assets/icons/svg/eye-slash.svg new file mode 100644 index 000000000..7be9b643f --- /dev/null +++ b/panel/assets/icons/svg/eye-slash.svg @@ -0,0 +1 @@ + diff --git a/panel/src/scss/components/_pages.scss b/panel/src/scss/components/_pages.scss index 855c635a6..22e091277 100644 --- a/panel/src/scss/components/_pages.scss +++ b/panel/src/scss/components/_pages.scss @@ -56,13 +56,45 @@ white-space: nowrap; } -.page-actions .button-link { +.page-info { + position: absolute; + z-index: 8; + display: none; + padding: 0.5rem; + border: 1px solid var(--color-base-500); + border-radius: $border-radius; + margin: 0.25rem 0 1rem; + background-color: var(--color-base-900); + box-shadow: $box-shadow-md; +} + +.page-icon > .icon { + vertical-align: -0.25rem; +} + +.page-icon:hover .page-info { + display: block; +} + +.is-dragging .page-icon:hover .page-info { + display: none; +} + +.page-info-row { + padding: 0.5rem 0.25rem; + border-bottom: 1px solid var(--color-base-600); + font-size: $font-size-sm; +} + +.page-info-badges { + padding: 0.5rem 0.25rem; font-size: $font-size-md; + white-space: nowrap; } -.page-info { - padding: 0 0.25rem; - margin-bottom: 0.75rem; +.page-languages { + font-size: $font-size-md; + white-space: nowrap; } .page-slug-change { diff --git a/panel/views/pages/editor.php b/panel/views/pages/editor.php index 21d8c0846..47e22540d 100644 --- a/panel/views/pages/editor.php +++ b/panel/views/pages/editor.php @@ -3,7 +3,14 @@ attr(['hidden' => true, 'aria-hidden' => 'true', 'data-command' => 'save', 'formaction' => $history?->isJustCreated() ? '?publish=false' : null]) ?>>
-
icon($page->icon()) ?> escape($page->title()) ?>
+
+
+ icon($page->icon()) ?> +
+
+ escape($page->title()) ?> +
+
insert('_pages/status', ['page' => $page]) ?>
isIndexPage() && !$page->isErrorPage()) : ?> @@ -23,16 +30,16 @@ href="uri('/pages/' . trim($previousPage->route(), '/') . '/edit/') ?>" title="translate('panel.pages.previous') ?>" aria-label="translate('panel.pages.previous') ?>">icon('chevron-left') ?> href="uri('/pages/' . trim($nextPage->route(), '/') . '/edit/') ?>" title="translate('panel.pages.next') ?>" aria-label="translate('panel.pages.next') ?>">icon('chevron-right') ?> published() && $page->routable()) : ?>href="uri(includeLanguage: $currentLanguage ?: true) ?>" target="formwork-view-page-uid() ?>" title="translate('panel.pages.viewPage') ?>" aria-label="translate('panel.pages.viewPage') ?>">icon('arrow-right-up-box') ?> - + user()->permissions()->has('pages.delete')) : ?> languages()->available()->isEmpty()) : ?>
- +
@@ -65,4 +72,4 @@ ) ?>
- \ No newline at end of file + diff --git a/panel/views/pages/tree.php b/panel/views/pages/tree.php index 046503654..800fc9abd 100644 --- a/panel/views/pages/tree.php +++ b/panel/views/pages/tree.php @@ -20,30 +20,37 @@ ]) ?>" data-route="route() ?>">
-
-
-
- orderable()) : ?> - icon('grabber') ?> +
+
+ orderable()) : ?> + icon('grabber') ?> + +
+ +
+ hasChildren()) : ?> +
- -
- hasChildren()) : ?> - - + +
+ icon($page->icon()) ?> + insert('_pages/info', ['page' => $page]) ?> +
+
+
+
+ escape($page->title()) ?>
- -
icon($page->icon()) ?>
-
-
escape($page->title()) ?>
- languages()->available() as $language) : ?> - code() ?> - - +
diff --git a/panel/views/partials/pages/info.php b/panel/views/partials/pages/info.php new file mode 100644 index 000000000..71908070f --- /dev/null +++ b/panel/views/partials/pages/info.php @@ -0,0 +1,16 @@ +
+
translate('page.template') ?>: template()->title() ?>
+
translate('page.slug') ?>: slug() ?>
+
+ routable()): ?> + icon('circle-small-fill') ?> translate('page.routable') ?> + + icon('circle-small') ?> translate('page.notRoutable') ?> + + listed()): ?> + icon('eye') ?> translate('page.listed') ?> + + icon('eye-slash') ?> translate('page.notListed') ?> + +
+
\ No newline at end of file From 3ba5343b0018fc3b6d79b0a89385120c42210606 Mon Sep 17 00:00:00 2001 From: Giuseppe Criscione <18699708+giuscris@users.noreply.github.com> Date: Sat, 19 Oct 2024 23:30:07 +0200 Subject: [PATCH 5/5] Add field descriptions --- formwork/translations/de.yaml | 5 ++++- formwork/translations/en.yaml | 4 ++++ formwork/translations/es.yaml | 5 ++++- formwork/translations/fr.yaml | 4 ++++ formwork/translations/it.yaml | 5 ++++- formwork/translations/pt.yaml | 5 ++++- formwork/translations/ru.yaml | 5 ++++- panel/translations/de.yaml | 1 - panel/translations/en.yaml | 1 - panel/translations/es.yaml | 1 - panel/translations/fr.yaml | 1 - panel/translations/it.yaml | 1 - panel/translations/pt.yaml | 1 - panel/translations/ru.yaml | 1 - site/schemes/pages/page.yaml | 7 +++++-- 15 files changed, 33 insertions(+), 14 deletions(-) diff --git a/formwork/translations/de.yaml b/formwork/translations/de.yaml index 76102ffe5..b98706e70 100644 --- a/formwork/translations/de.yaml +++ b/formwork/translations/de.yaml @@ -10,6 +10,7 @@ date.duration.years: ['Jahr', 'Jahre'] date.months.long: ['Januar', 'Februar', 'März', 'April', 'Mai', 'Juni', 'Juli', 'August', 'September', 'Oktober', 'November', 'Dezember'] date.months.short: ['Jan', 'Feb', 'Mär', 'Apr', 'Mai', 'Jun', 'Jul', 'Aug', 'Sep', 'Okt', 'Nov', 'Dez'] date.never: nie +date.noDate: Kein Datum date.now: jetzt date.today: Heute date.weekdays.long: ['Sonntag', 'Montag', 'Dienstag', 'Mittwoch', 'Donnerstag', 'Freitag', 'Samstag'] @@ -24,6 +25,7 @@ page.content: Inhalt page.files: Dateien page.image: Bild page.listed: Aufgelistet +page.listed.description: Aufgelistete Seiten sind im Menü sichtbar page.noImage: Kein Bild page.none: (Keine) page.noTags: Keine Tags @@ -35,10 +37,11 @@ page.parent: Übergeordnete Seite page.postsPerPage: Beiträge pro Seite page.publishDate: Veröffentlichungsdatum page.routable: Routbar +page.routable.description: Routbare Seiten sind über ihre Adresse zugänglich page.slug: Slug page.status.notPublished: Nicht veröffentlicht -page.status.notRoutable: Nicht routbar page.status.published: Veröffentlicht +page.status.published.description: Veröffentliche Seiten sind auf der Website sichtbar und über ihre Adresse zugänglich page.summary: Zusammenfassung page.tags: Tags page.template: Vorlage diff --git a/formwork/translations/en.yaml b/formwork/translations/en.yaml index f0eb75338..d84b6fd67 100644 --- a/formwork/translations/en.yaml +++ b/formwork/translations/en.yaml @@ -10,6 +10,7 @@ date.duration.years: ['year', 'years'] date.months.long: ['January', 'February', 'March', 'April', 'May', 'June', 'July', 'August', 'September', 'October', 'November', 'December'] date.months.short: ['Jan', 'Feb', 'Mar', 'Apr', 'May', 'Jun', 'Jul', 'Aug', 'Sep', 'Oct', 'Nov', 'Dec'] date.never: never +date.noDate: No date date.now: now date.today: Today date.weekdays.long: ['Sunday', 'Monday', 'Tuesday', 'Wednesday', 'Thursday', 'Friday', 'Saturday'] @@ -24,6 +25,7 @@ page.content: Content page.files: Files page.image: Image page.listed: Listed +page.listed.description: Listed pages are visible in the menu page.noImage: No image page.none: (None) page.noTags: No tags @@ -35,9 +37,11 @@ page.parent: Parent page page.postsPerPage: Posts per page page.publishDate: Publish date page.routable: Routable +page.routable.description: Routable pages are accessible from their address page.slug: Slug page.status.notPublished: Not published page.status.published: Published +page.status.published.description: Published pages are visible in the site and accessible from their address page.summary: Summary page.tags: Tags page.template: Template diff --git a/formwork/translations/es.yaml b/formwork/translations/es.yaml index d15d3b335..13fce660a 100644 --- a/formwork/translations/es.yaml +++ b/formwork/translations/es.yaml @@ -10,6 +10,7 @@ date.duration.years: ['año', 'años'] date.months.long: ['Enero', 'Febrero', 'Marzo', 'Abril', 'Mayo', 'Junio', 'Julio', 'Agosto', 'Septiembre', 'Octubre', 'Noviembre', 'Diciembre'] date.months.short: ['Ene', 'Feb', 'Mar', 'Abr', 'May', 'Jun', 'Jul', 'Ago', 'Sep', 'Oct', 'Nov', 'Dic'] date.never: nunca +date.noDate: Sin fecha date.now: ahora date.today: Hoy date.weekdays.long: ['Domingo', 'Lunes', 'Martes', 'Miércoles', 'Jueves', 'Viernes', 'Sábado'] @@ -24,6 +25,7 @@ page.content: Contenido page.files: Archivos page.image: Imagen page.listed: Listada +page.listed.description: Las páginas listadas son visibles en el menú page.noImage: Sin imagen page.none: (Ninguno) page.noTags: Sin etiquetas @@ -35,10 +37,11 @@ page.parent: Página principal page.postsPerPage: Publicaciones por página page.publishDate: Fecha de publicación page.routable: Enrutable +page.routable.description: Las páginas enrutables son accesibles desde su dirección page.slug: Slug page.status.notPublished: No publicado -page.status.notRoutable: No enrutable page.status.published: Publicado +page.status.published.description: Las páginas publicadas son visibles en el sitio y accesibles desde su dirección page.summary: Resumen page.tags: Etiquetas page.template: Plantilla diff --git a/formwork/translations/fr.yaml b/formwork/translations/fr.yaml index bd034e17e..8157e273c 100644 --- a/formwork/translations/fr.yaml +++ b/formwork/translations/fr.yaml @@ -10,6 +10,7 @@ date.duration.years: ['an', 'ans'] date.months.long: ['Janvier', 'Février', 'Mars', 'Avril', 'Mai', 'Juin', 'Juillet', 'Août', 'Septembre', 'Octobre', 'Novembre', 'Décembre'] date.months.short: ['Jan', 'Fév', 'Mar', 'Avr', 'Mai', 'Jun', 'Juil', 'Aou', 'Sep', 'Oct', 'Nov', 'Déc'] date.never: jamais +date.noDate: Aucune date date.now: maintenant date.today: Aujourd’hui date.weekdays.long: ['Dimanche', 'Lundi', 'Mardi', 'Mercredi', 'Jeudi', 'Vendredi', 'Samedi'] @@ -24,6 +25,7 @@ page.content: Contenu page.files: Fichiers page.image: Image d’accroche page.listed: Répertoriée +page.listed.description: Les pages répertoriées sont visibles dans le menu page.noImage: Aucune image page.none: (Aucun) page.noTags: Aucun tag @@ -35,9 +37,11 @@ page.parent: Parent page.postsPerPage: Articles par page page.publishDate: Date de publication page.routable: Accessible +page.routable.description: Les pages routables sont accessibles depuis leur adresse page.slug: Slug page.status.notPublished: Brouillon page.status.published: Publié +page.status.published.description: Les pages publiées sont visibles sur le site et accessibles depuis leur adresse page.summary: Résumé page.tags: Tags page.template: Modèle diff --git a/formwork/translations/it.yaml b/formwork/translations/it.yaml index 0f0d2418e..08fbe999e 100644 --- a/formwork/translations/it.yaml +++ b/formwork/translations/it.yaml @@ -10,6 +10,7 @@ date.duration.years: ['anno', 'anni'] date.months.long: ['Gennaio', 'Febbraio', 'Marzo', 'Aprile', 'Maggio', 'Giugno', 'Luglio', 'Agosto', 'Settembre', 'Ottobre', 'Novembre', 'Dicembre'] date.months.short: ['Gen', 'Feb', 'Mar', 'Apr', 'Mag', 'Giu', 'Lug', 'Ago', 'Set', 'Ott', 'Nov', 'Dic'] date.never: mai +date.noDate: Nessuna data date.now: adesso date.today: Oggi date.weekdays.long: ['Domenica', 'Lunedì', 'Martedì', 'Mercoledì', 'Giovedì', 'Venerdì', 'Sabato'] @@ -24,6 +25,7 @@ page.content: Contenuto page.files: File page.image: Immagine page.listed: Elencata +page.listed.description: Le pagine elencate sono visibili nel menu page.noImage: Nessuna immagine page.none: (Nessuna) page.noTags: Nessun tag @@ -35,10 +37,11 @@ page.parent: Pagina superiore page.postsPerPage: Post per pagina page.publishDate: Data di pubblicazione page.routable: Raggiungibile +page.routable.description: Le pagine raggiungibili sono accessibili dal loro indirizzo page.slug: Slug page.status.notPublished: Non pubblicato -page.status.notRoutable: Non raggiungibile page.status.published: Pubblicato +page.status.published.description: Le pagine pubblicate sono visibili sul sito e accessibili dal loro indirizzo page.summary: Riassunto page.tags: Tag page.template: Template diff --git a/formwork/translations/pt.yaml b/formwork/translations/pt.yaml index ead360c8f..93f937165 100644 --- a/formwork/translations/pt.yaml +++ b/formwork/translations/pt.yaml @@ -10,6 +10,7 @@ date.duration.years: ['ano', 'anos'] date.months.long: ['Janeiro', 'Fevereiro', 'Março', 'Abril', 'Maio', 'Junho', 'Julho', 'Agosto', 'Setembro', 'Outubro', 'Novembro', 'Dezembro'] date.months.short: ['Jan', 'Fev', 'Mar', 'Abr', 'Mai', 'Jun', 'Jul', 'Ago', 'Set', 'Out', 'Nov', 'Dez'] date.never: nunca +date.noDate: Sem data date.now: agora date.today: Hoje date.weekdays.long: ['Domingo', 'Segunda', 'Terça', 'Quarta', 'Quinta', 'Sexta', 'Sábado'] @@ -24,6 +25,7 @@ page.content: Conteúdo page.files: Ficheiros page.image: Imagem page.listed: Listada +page.listed.description: As páginas listadas são visíveis no menu page.noImage: Sem imagem page.none: (Nenhum) page.noTags: Sem tags @@ -35,10 +37,11 @@ page.parent: Página parente page.postsPerPage: Items por página page.publishDate: Data de publicação page.routable: Roteável +page.routable.description: As páginas roteáveis são acessíveis a partir do seu endereço page.slug: Slug page.status.notPublished: Não publicado -page.status.notRoutable: Não roteável page.status.published: Publicado +page.status.published.description: As páginas publicadas são visíveis no site e acessíveis a partir do seu endereço page.summary: Resumo page.tags: Tags page.template: Template diff --git a/formwork/translations/ru.yaml b/formwork/translations/ru.yaml index 66f38d99b..2ffbeef80 100644 --- a/formwork/translations/ru.yaml +++ b/formwork/translations/ru.yaml @@ -10,6 +10,7 @@ date.duration.years: ['год', 'г'] date.months.long: ['Январь', 'Февраль', 'Март', 'Апрель', 'Май', 'Июнь', 'Июль', 'Август', 'Сентябрь', 'Октября', 'Ноябрь', 'Декабрь'] date.months.short: ['Янв', 'Фев', 'Мар', 'Апр', 'Май', 'Июн', 'Июл', 'Авг', 'Сен', 'Окт', 'Ноя', 'Дек'] date.never: никогда +date.noDate: Без даты date.now: теперь date.today: Сегодня date.weekdays.long: ['Воскресенье', 'Понедельник', 'Вторник', 'Среда', 'Четверг', 'Пятница', 'Суббота'] @@ -24,6 +25,7 @@ page.content: Содержание page.files: Файлы page.image: Изображение page.listed: Указана +page.listed.description: Перечисленные страницы видны в меню page.noImage: Нет изображения page.none: (Нет) page.noTags: Нет тегов @@ -35,10 +37,11 @@ page.parent: Родитель страницы page.postsPerPage: Сообщения на странице page.publishDate: Дата публикации page.routable: Маршрутизируемый +page.routable.description: Маршрутизируемые страницы доступны по их адресу page.slug: Slug page.status.notPublished: Не Опубликовано -page.status.notRoutable: Не маршрутизируемый page.status.published: Опубликованный +page.status.published.description: Опубликованные страницы видны на сайте и доступны по их адресу page.summary: Сводка page.tags: Теги page.template: Шаблон diff --git a/panel/translations/de.yaml b/panel/translations/de.yaml index f8c7f7224..327a4c221 100644 --- a/panel/translations/de.yaml +++ b/panel/translations/de.yaml @@ -256,7 +256,6 @@ panel.pages.page.fileDeleted: Datei gelöscht panel.pages.page.fileRenamed: Datei umbenannt panel.pages.page.lastModified: Zuletzt geändert panel.pages.page.moved: Seite verschoben! -panel.pages.page.noDate: Kein Datum panel.pages.page.notFound: Seite nicht gefunden panel.pages.page.status: Status panel.pages.pages: Seiten diff --git a/panel/translations/en.yaml b/panel/translations/en.yaml index a1b5e2e9e..e241e57ba 100644 --- a/panel/translations/en.yaml +++ b/panel/translations/en.yaml @@ -256,7 +256,6 @@ panel.pages.page.fileDeleted: File deleted panel.pages.page.fileRenamed: File renamed panel.pages.page.lastModified: Last modified panel.pages.page.moved: Page moved! -panel.pages.page.noDate: No date panel.pages.page.notFound: Page not found panel.pages.page.status: Status panel.pages.pages: Pages diff --git a/panel/translations/es.yaml b/panel/translations/es.yaml index ab87333a3..13170b79f 100644 --- a/panel/translations/es.yaml +++ b/panel/translations/es.yaml @@ -256,7 +256,6 @@ panel.pages.page.fileDeleted: Archivo eliminado panel.pages.page.fileRenamed: Archivo renombrado panel.pages.page.lastModified: Última modificación panel.pages.page.moved: ¡Página movida! -panel.pages.page.noDate: Sin fecha panel.pages.page.notFound: Página no encontrada panel.pages.page.status: Estado panel.pages.pages: Páginas diff --git a/panel/translations/fr.yaml b/panel/translations/fr.yaml index cbca51e9d..9261ffb1f 100644 --- a/panel/translations/fr.yaml +++ b/panel/translations/fr.yaml @@ -256,7 +256,6 @@ panel.pages.page.fileDeleted: Fichier supprimé panel.pages.page.fileRenamed: Fichier renommé panel.pages.page.lastModified: Dernière modification panel.pages.page.moved: Page déplacée ! -panel.pages.page.noDate: Aucune date panel.pages.page.notFound: Page non trouvée panel.pages.page.status: Statut panel.pages.pages: Pages diff --git a/panel/translations/it.yaml b/panel/translations/it.yaml index 7a84c92ee..23bc9becf 100644 --- a/panel/translations/it.yaml +++ b/panel/translations/it.yaml @@ -256,7 +256,6 @@ panel.pages.page.fileDeleted: File eliminato panel.pages.page.fileRenamed: File rinominato panel.pages.page.lastModified: Ultime modifiche panel.pages.page.moved: Pagina spostata! -panel.pages.page.noDate: Nessuna data panel.pages.page.notFound: Pagina non trovata panel.pages.page.status: Stato panel.pages.pages: Pagine diff --git a/panel/translations/pt.yaml b/panel/translations/pt.yaml index 6ffa84381..e5af4b8ae 100644 --- a/panel/translations/pt.yaml +++ b/panel/translations/pt.yaml @@ -256,7 +256,6 @@ panel.pages.page.fileDeleted: Ficheiro removido panel.pages.page.fileRenamed: Arquivo renomeado panel.pages.page.lastModified: Última modificação panel.pages.page.moved: Página movida! -panel.pages.page.noDate: Sem data panel.pages.page.notFound: Página não encontrada panel.pages.page.status: Estado panel.pages.pages: Páginas diff --git a/panel/translations/ru.yaml b/panel/translations/ru.yaml index abc32316b..a8c2870a0 100644 --- a/panel/translations/ru.yaml +++ b/panel/translations/ru.yaml @@ -256,7 +256,6 @@ panel.pages.page.fileDeleted: Файл удален panel.pages.page.fileRenamed: Файл переименован panel.pages.page.lastModified: Последнее изменение panel.pages.page.moved: Страница переехала! -panel.pages.page.noDate: Без даты panel.pages.page.notFound: Страница не найдена panel.pages.page.status: Статус panel.pages.pages: Страницы diff --git a/site/schemes/pages/page.yaml b/site/schemes/pages/page.yaml index 780337bca..a39991cb7 100644 --- a/site/schemes/pages/page.yaml +++ b/site/schemes/pages/page.yaml @@ -44,28 +44,31 @@ fields: published: type: checkbox label: '{{page.status.published}}' + description: '{{page.status.published.description}}' default: true publishDate: type: date label: '{{page.publishDate}}' - placeholder: '{{panel.pages.page.noDate}}' + placeholder: '{{date.noDate}}' default: null unpublishDate: type: date label: '{{page.unpublishDate}}' - placeholder: '{{panel.pages.page.noDate}}' + placeholder: '{{date.noDate}}' default: null routable: type: checkbox label: '{{page.routable}}' + description: '{{page.routable.description}}' default: true listed: type: checkbox label: '{{page.listed}}' + description: '{{page.listed.description}}' default: true cacheable: