Use consistent page statuses

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';
 
     /**

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;

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']
@@ -23,19 +24,24 @@ page.cacheable: Im Cache speichern
 page.content: Inhalt
 page.files: Dateien
 page.image: Bild
-page.listed: Im Menü sichtbar
+page.listed: Aufgelistet
+page.listed.description: Aufgelistete Seiten sind im Menü sichtbar
 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.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

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']
@@ -23,19 +24,24 @@ page.cacheable: Cacheable
 page.content: Content
 page.files: Files
 page.image: Image
-page.listed: Visible in the menu
+page.listed: Listed
+page.listed.description: Listed pages are visible in the menu
 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.routable.description: Routable pages are accessible from their address
+page.slug: Slug
 page.status.notPublished: Not published
-page.status.notRoutable: Not routable
 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

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']
@@ -23,19 +24,24 @@ page.cacheable: En caché
 page.content: Contenido
 page.files: Archivos
 page.image: Imagen
-page.listed: Visible en el menú
+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
+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.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

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']
@@ -23,19 +24,24 @@ 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.listed.description: Les pages répertoriées sont visibles dans le menu
 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.routable.description: Les pages routables sont accessibles depuis leur adresse
+page.slug: Slug
 page.status.notPublished: Brouillon
-page.status.notRoutable: Inaccessible
 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

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']
@@ -23,19 +24,24 @@ page.cacheable: Abilita cache
 page.content: Contenuto
 page.files: File
 page.image: Immagine
-page.listed: Visibile nel menu
+page.listed: Elencata
+page.listed.description: Le pagine elencate sono visibili nel menu
 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.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

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']
@@ -23,19 +24,24 @@ page.cacheable: Cache
 page.content: Conteúdo
 page.files: Ficheiros
 page.image: Imagem
-page.listed: Visível no menu
+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
+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.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

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: ['Воскресенье', 'Понедельник', 'Вторник', 'Среда', 'Четверг', 'Пятница', 'Суббота']
@@ -23,19 +24,24 @@ page.cacheable: Кешируемый
 page.content: Содержание
 page.files: Файлы
 page.image: Изображение
-page.listed: Видимо в меню
+page.listed: Указана
+page.listed.description: Перечисленные страницы видны в меню
 page.noImage: Нет изображения
 page.none: (Нет)
 page.noTags: Нет тегов
+page.notListed: Не указана
+page.notRoutable: Не маршрутизируемый
 page.options: Параметры
 page.page: Страница
 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: Шаблон

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;
 }

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;
     }
 }
 

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;
 }