Merge branch 'main' into 3.x

config/filament-email-templates.php

@@ -12,7 +12,7 @@
     //Admin Panel Resource Navigation Options
     'navigation'=>[
         'sort'=>50,
-        'group'=>'Settings',
+        'group'=>'Content Management',
     ],
 
     //Email templates will be copied to resources/views/vendor/vb-email-templates/email
@@ -24,6 +24,9 @@
     //Default Logo
     'logo'                    => 'media/email-templates/logo.png',
 
+    //Browsed Logo
+    'browsed_logo'            => 'media/email-templates/logos',
+
     //Logo size in pixels -> 200 pixels high is plenty big enough.
     'logo_width'              => '500',
     'logo_height'             => '126',
@@ -81,6 +84,7 @@
         'user_verified'          => true,
         'login'                  => true,
         'password_reset_success' => true,
+        'locked_out'             => true,
     ],
 
 ];

database/factories/EmailTemplateFactory.php

@@ -33,6 +33,7 @@ public function definition() {
             'subject'    => $this->faker->sentence,
             'title'      => $this->faker->sentence,
             'content'    => $this->faker->text,
+            'logo'       => config('filament-email-templates.logo'),
             'created_at' => now(),
             'updated_at' => now(),
             'deleted_at' => null,

database/migrations/create_email_templates_table.php.stub

@@ -28,6 +28,7 @@ return new class extends Migration
                  $table->string('preheader', 191)->nullable()->comment('Only shows on some email clients below subject line');
                  $table->string('title', 50)->nullable()->comment('First line of email h1 string');
                  $table->text('content')->nullable();
+                 $table->string('logo', 191)->nullable();
                  $table->timestamps();
                  $table->softDeletes();
                  $table->unique(['key', 'language']);

database/seeders/EmailTemplateThemeSeeder.php

@@ -13,16 +13,20 @@ public function run() {
                 'name'       => 'Modern Bold',
                 'colours'=>[
                     'header_bg_color'    => '#1E88E5',
-                    'body_bg_color'      => '#f4f4f4',
                     'content_bg_color'   => '#FFFFFB',
+
+                    'body_bg_color'      => '#f4f4f4',
+                    'body_color'         => '#333333',
+
                     'footer_bg_color'    => '#34495E',
+                    'footer_color'       => '#FFFFFB',
 
                     'callout_bg_color'   => '#FFC107',
-                    'button_bg_color'    => '#FFC107',
-
-                    'body_color'         => '#333333',
                     'callout_color'      => '#212121',
+
+                    'button_bg_color'    => '#FFC107',
                     'button_color'       => '#2A2A11',
+
                     'anchor_color'       => '#1E88E5',
                 ],
                 'is_default'=>1,

resources/lang/ar/email-templates.php

@@ -29,9 +29,40 @@
         'title' => 'العنوان',
         'title-hint' => '(يعرض بحجم كبير في أعلى البريد الإلكتروني)',
         'content' => 'المحتوى',
+        'logo-type' => 'نوع الشعار',
+        'browse-another' => 'استعراض آخر',
+        'paste-url' => 'لصق الرابط',
+        'logo' => 'شعار',
+        'logo-hint' => '(استعراض الصورة)',
+        'logo-url' => 'رابط الشعار',
+        'logo-url-hint' => '(الصق رابط الصورة هنا)',
+
     ],
     'resource_name' => [
         'singular' => 'قالب البريد الإلكتروني',
         'plural' => 'قوالب البريد الإلكتروني',
     ],
+    'theme-form-fields-labels' => [
+        'template-preview' => 'معاينة القالب',
+        'theme-name' => 'الاسم',
+        'is-default' => 'الافتراضي',
+        'set-colors' => 'تعيين الألوان',
+        'header-bg' => 'خلفية الرأس',
+        'body-bg' => 'خلفية الجسم',
+        'content-bg' => 'خلفية المحتوى',
+        'footer-bg' => 'خلفية الذيل',
+        'callout-bg' => 'خلفية التنبيه',
+        'button-bg' => 'خلفية الزر',
+        'body-color' => 'لون الجسم',
+        'callout-color' => 'لون التنبيه',
+        'button-color' => 'لون الزر',
+        'anchor-color' => 'لون الرابط',
+        'title-hint' => '(يظهر بحجم كبير في أعلى البريد الإلكتروني)',
+        'content' => 'المحتوى',
+    ],
+    'theme_resource_name' => [
+        'singular' => 'قالب البريد الإلكتروني',
+        'plural' => 'أنماط قوالب البريد الإلكتروني',
+    ],
+
 ];

resources/lang/bn/email-templates.php

@@ -29,9 +29,40 @@
         'title' => 'Title',
         'title-hint' => '(Displays large at very top of email)',
         'content' => 'Content',
+        'logo-type' => 'লোগো প্রকার',
+        'browse-another' => 'অন্যান্য ব্রাউজ করুন',
+        'paste-url' => 'URL পেস্ট করুন',
+        'logo' => 'লোগো',
+        'logo-hint' => '(চিত্র ব্রাউজ করুন)',
+        'logo-url' => 'লোগো URL',
+        'logo-url-hint' => '(এখানে চিত্র URL পেস্ট করুন)',
+
     ],
     'resource_name' => [
         'singular' => 'Email Template',
         'plural' => 'Email Templates',
     ],
+    'theme-form-fields-labels' => [
+        'template-preview' => 'টেমপ্লেট প্রিভিউ',
+        'theme-name' => 'নাম',
+        'is-default' => 'ডিফল্ট',
+        'set-colors' => 'রঙ সেট করুন',
+        'header-bg' => 'হেডার পেশাদার',
+        'body-bg' => 'বডি পেশাদার',
+        'content-bg' => 'কন্টেন্ট পেশাদার',
+        'footer-bg' => 'ফুটার পেশাদার',
+        'callout-bg' => 'কলআউট পেশাদার',
+        'button-bg' => 'বোতাম পেশাদার',
+        'body-color' => 'বডি রং',
+        'callout-color' => 'কলআউট রং',
+        'button-color' => 'বোতাম রং',
+        'anchor-color' => 'আঙ্কার রং',
+        'title-hint' => '(ইমেলের সবচেয়ে উপরে বড় আকারে প্রদর্শিত হয়)',
+        'content' => 'কন্টেন্ট',
+    ],
+    'theme_resource_name' => [
+        'singular' => 'ইমেল টেমপ্লেট থিম',
+        'plural' => 'ইমেল টেমপ্লেট থিমস',
+    ],
+
 ];

resources/lang/bs/email-templates.php

@@ -29,9 +29,40 @@
         'title' => 'Naslov',
         'title-hint' => '(Prikazuje se veliko na vrhu e-pošte)',
         'content' => 'Sadržaj',
+        'logo-type' => 'Vrsta logotipa',
+        'browse-another' => 'Pregledajte drugo',
+        'paste-url' => 'Zalijepite URL',
+        'logo' => 'Logotip',
+        'logo-hint' => '(Pregledajte sliku)',
+        'logo-url' => 'URL logotipa',
+        'logo-url-hint' => '(Zalijepite URL slike ovdje)',
+
     ],
     'resource_name' => [
         'singular' => 'Predložak e-pošte',
         'plural' => 'Predlošci e-pošte',
     ],
+    'theme-form-fields-labels' => [
+        'template-preview' => 'Pregled šablona',
+        'theme-name' => 'Ime',
+        'is-default' => 'Zadano',
+        'set-colors' => 'Postavi boje',
+        'header-bg' => 'Pozadina zaglavlja',
+        'body-bg' => 'Pozadina tijela',
+        'content-bg' => 'Pozadina sadržaja',
+        'footer-bg' => 'Pozadina podnožja',
+        'callout-bg' => 'Pozadina poziva na radnju',
+        'button-bg' => 'Pozadina dugmeta',
+        'body-color' => 'Boja tijela',
+        'callout-color' => 'Boja poziva na radnju',
+        'button-color' => 'Boja dugmeta',
+        'anchor-color' => 'Boja sidra',
+        'title-hint' => '(Prikazuje se veliko na vrhu e-pošte)',
+        'content' => 'Sadržaj',
+    ],
+    'theme_resource_name' => [
+        'singular' => 'Tema e-pošte',
+        'plural' => 'Teme e-pošte',
+    ],
+
 ];

resources/lang/ca/email-templates.php

@@ -29,9 +29,41 @@
         'title' => 'Títol',
         'title-hint' => '(Es mostra gran a la part superior del correu electrònic)',
         'content' => 'Contingut',
+        'logo-type' => 'Tipus de logotip',
+        'browse-another' => 'Navegueu per un altre',
+        'paste-url' => 'Enganxeu l\'URL',
+        'logo' => 'Logotip',
+        'logo-hint' => '(Navegueu la imatge)',
+        'logo-url' => 'URL del logotip',
+        'logo-url-hint' => '(Enganxeu l\'URL de la imatge aquí)',
+
     ],
     'resource_name' => [
         'singular' => 'Plantilla de correu electrònic',
         'plural' => 'Plantilles de correu electrònic',
     ],
+    'theme-form-fields-labels' => [
+        'template-preview' => 'Previsualització del model',
+        'theme-name' => 'Nom',
+        'is-default' => 'Per defecte',
+        'set-colors' => 'Establir colors',
+        'header-bg' => 'Fons de la capçalera',
+        'body-bg' => 'Fons del cos',
+        'content-bg' => 'Fons del contingut',
+        'footer-bg' => 'Fons del peu de pàgina',
+        'callout-bg' => 'Fons de l\'avís',
+        'button-bg' => 'Fons del botó',
+        'body-color' => 'Color del cos',
+        'callout-color' => 'Color de l\'avís',
+        'button-color' => 'Color del botó',
+        'anchor-color' => 'Color de l\'àncora',
+        'title-hint' => '(Es mostra gran a la part superior del correu electrònic)',
+        'content' => 'Contingut',
+    ],
+
+    'theme_resource_name' => [
+        'singular' => 'Tema de plantilla de correu electrònic',
+        'plural' => 'Temas de plantilles de correu electrònic',
+    ],
+
 ];

resources/lang/cs/email-templates.php

@@ -29,9 +29,40 @@
         'title' => 'Titul',
         'title-hint' => '(Zobrazuje se velký na samém vrcholu e-mailu)',
         'content' => 'Obsah',
+        'logo-type' => 'Typ loga',
+        'browse-another' => 'Procházet jiný',
+        'paste-url' => 'Vložit URL',
+        'logo' => 'Logo',
+        'logo-hint' => '(Procházet obrázek)',
+        'logo-url' => 'URL loga',
+        'logo-url-hint' => '(Vložte sem URL obrázku)',
+
     ],
     'resource_name' => [
         'singular' => 'E-mailová šablona',
         'plural' => 'E-mailové šablony',
     ],
+    'theme-form-fields-labels' => [
+        'template-preview' => 'Náhled šablony',
+        'theme-name' => 'Název',
+        'is-default' => 'Výchozí',
+        'set-colors' => 'Nastavit barvy',
+        'header-bg' => 'Pozadí záhlaví',
+        'body-bg' => 'Pozadí těla',
+        'content-bg' => 'Pozadí obsahu',
+        'footer-bg' => 'Pozadí zápatí',
+        'callout-bg' => 'Pozadí výzvy',
+        'button-bg' => 'Pozadí tlačítka',
+        'body-color' => 'Barva těla',
+        'callout-color' => 'Barva výzvy',
+        'button-color' => 'Barva tlačítka',
+        'anchor-color' => 'Barva kotvy',
+        'title-hint' => '(Zobrazuje se velké nahoře v e-mailu)',
+        'content' => 'Obsah',
+    ],
+    'theme_resource_name' => [
+        'singular' => 'Téma e-mailové šablony',
+        'plural' => 'Témata e-mailových šablon',
+    ],
+
 ];

resources/lang/da/email-templates.php

@@ -29,9 +29,40 @@
         'title' => 'Titel',
         'title-hint' => '(Vises stort øverst i e-mailen)',
         'content' => 'Indhold',
+        'logo-type' => 'Logo Type',
+        'browse-another' => 'Gennemse en anden',
+        'paste-url' => 'Indsæt URL',
+        'logo' => 'Logo',
+        'logo-hint' => '(Gennemse billede)',
+        'logo-url' => 'Logo URL',
+        'logo-url-hint' => '(Indsæt billede URL her)',
+
     ],
     'resource_name' => [
         'singular' => 'E-mail-skabelon',
         'plural' => 'E-mail-skabeloner',
     ],
+    'theme-form-fields-labels' => [
+        'template-preview' => 'Skabelonvisning',
+        'theme-name' => 'Navn',
+        'is-default' => 'Standard',
+        'set-colors' => 'Indstil farver',
+        'header-bg' => 'Baggrund for header',
+        'body-bg' => 'Baggrund for krop',
+        'content-bg' => 'Baggrund for indhold',
+        'footer-bg' => 'Baggrund for fod',
+        'callout-bg' => 'Baggrund for opfordring',
+        'button-bg' => 'Baggrund for knap',
+        'body-color' => 'Kropfarve',
+        'callout-color' => 'Opfordringsfarve',
+        'button-color' => 'Knapfarve',
+        'anchor-color' => 'Ankerfarve',
+        'title-hint' => '(Vises stort øverst i e-mailen)',
+        'content' => 'Indhold',
+    ],
+    'theme_resource_name' => [
+        'singular' => 'E-mailskabelontema',
+        'plural' => 'E-mailskabelontemaer',
+    ],
+
 ];

resources/lang/de/email-templates.php

@@ -29,9 +29,40 @@
         'title' => 'Titel',
         'title-hint' => '(Wird ganz oben in der E-Mail groß angezeigt)',
         'content' => 'Inhalt',
+        'logo-type' => 'Logotyp-Typ',
+        'browse-another' => 'Andere durchsuchen',
+        'paste-url' => 'URL einfügen',
+        'logo' => 'Logotyp',
+        'logo-hint' => '(Bild durchsuchen)',
+        'logo-url' => 'Logotyp-URL',
+        'logo-url-hint' => '(Fügen Sie hier die Bild-URL ein)',
+
     ],
     'resource_name' => [
         'singular' => 'E-Mail-Vorlage',
         'plural' => 'E-Mail-Vorlagen',
     ],
+    'theme-form-fields-labels' => [
+        'template-preview' => 'Vorlage anzeigen',
+        'theme-name' => 'Name',
+        'is-default' => 'Standard',
+        'set-colors' => 'Farben festlegen',
+        'header-bg' => 'Kopfhintergrund',
+        'body-bg' => 'Körperhintergrund',
+        'content-bg' => 'Inhalts-hintergrund',
+        'footer-bg' => 'Fußzeile Hintergrund',
+        'callout-bg' => 'Aufruf-Hintergrund',
+        'button-bg' => 'Schaltfläche Hintergrund',
+        'body-color' => 'Körperfarbe',
+        'callout-color' => 'Aufruffarbe',
+        'button-color' => 'Schaltflächenfarbe',
+        'anchor-color' => 'Ankerfarbe',
+        'title-hint' => '(Wird oben in der E-Mail groß angezeigt)',
+        'content' => 'Inhalt',
+    ],
+    'theme_resource_name' => [
+        'singular' => 'E-Mail-Vorlagen-Thema',
+        'plural' => 'E-Mail-Vorlagen-Themen',
+    ],
+
 ];

resources/lang/el/email-templates.php

@@ -29,9 +29,40 @@
         'title' => 'Title',
         'title-hint' => '(Displays large at very top of email)',
         'content' => 'Content',
+        'logo-type' => 'Τύπος λογοτύπου',
+        'browse-another' => 'Περιηγηθείτε σε άλλο',
+        'paste-url' => 'Επικολλήστε το URL',
+        'logo' => 'Λογότυπο',
+        'logo-hint' => '(Περιηγηθείτε στην εικόνα)',
+        'logo-url' => 'URL λογοτύπου',
+        'logo-url-hint' => '(Επικολλήστε το URL της εικόνας εδώ)',
+
     ],
     'resource_name' => [
         'singular' => 'Email Template',
         'plural' => 'Email Templates',
     ],
+    'theme-form-fields-labels' => [
+        'template-preview' => 'Προεπισκόπηση προτύπου',
+        'theme-name' => 'Όνομα',
+        'is-default' => 'Προεπιλεγμένο',
+        'set-colors' => 'Ορισμός χρωμάτων',
+        'header-bg' => 'Φόντο κεφαλίδας',
+        'body-bg' => 'Φόντο σώματος',
+        'content-bg' => 'Φόντο περιεχομένου',
+        'footer-bg' => 'Φόντο υποσέλιδου',
+        'callout-bg' => 'Φόντο επισήμανσης',
+        'button-bg' => 'Φόντο κουμπιού',
+        'body-color' => 'Χρώμα σώματος',
+        'callout-color' => 'Χρώμα επισήμανσης',
+        'button-color' => 'Χρώμα κουμπιού',
+        'anchor-color' => 'Χρώμα αγκύρωσης',
+        'title-hint' => '(Εμφανίζεται μεγάλο στην κορυφή του email)',
+        'content' => 'Περιεχόμενο',
+    ],
+    'theme_resource_name' => [
+        'singular' => 'Θέμα προτύπου email',
+        'plural' => 'Θέματα προτύπων email',
+    ],
+
 ];