Feature/notice

_config/cms.yml

@@ -3,4 +3,4 @@ Name: seo cms config
 ---
 SilverStripe\Admin\LeftAndMain:
   extra_requirements_css:
-    - plasticstudio/silverstripe-seo:assets/css/seo.css
+    - plasticstudio/silverstripe-seo:assets/css/seo.css

_config/extensions.yml

@@ -16,3 +16,6 @@ SilverStripe\Blog\Model\Blog:
 SilverStripe\Blog\Model\BlogPost:
   extensions:
     - PlasticStudio\SEO\Model\Extension\SeoBlogPostExtension
+SilverStripe\CMS\Model\RedirectorPage:
+  extensions:
+    - PlasticStudio\SEO\Model\Extension\SeoRedirectorPageExtension

_config/preview.yml

@@ -4,4 +4,4 @@ Name: seo meta preview config
 ---
 PlasticStudio\SEO\Forms\MetaPreviewField:
   meta_title: 'Your Meta Title Here - What Your Page is About'
-  meta_description: 'This is a preview of your Meta description and how it will look in the Search Engine Results Page. Always try to keep it short and make it fit into the space provided.'
+  meta_description: 'The meta description is empty. Create a concise summary that is unique, descriptive, and relevant to the page. Incorporate the target keywords to encourage users to click through to your site.'

assets/css/preview-field.css

@@ -0,0 +1,52 @@
+
+.seo-serp-preview {
+    height: inherit;
+    margin: 0;
+    border: 1px solid #ced5e1;
+    border-radius: 4px;
+    padding: 20px;
+}
+
+.seo-serp-url {
+    display: flex;
+    padding: 0;
+    padding-bottom: 0;
+    overflow: hidden;
+    align-items: center;
+}
+
+.seo-serp-url__favicon {
+    background-color: #f1f3f4;
+    border: 1px solid #dadce0;
+    border-radius: 50%;
+    display: inline-flex;
+    justify-content: center;
+    align-items: center;
+    height: 26px;
+    width: 26px;
+    margin-right: 12px;
+    flex-shrink: 0;
+    vertical-align: middle;
+}
+
+.seo-serp-url__title {
+    color: #202124;
+    font-size: 14px;
+    display: block;
+    line-height: 20px;
+    white-space: nowrap;
+    margin-bottom: 2px;
+}
+
+.seo-serp-title {
+    font-family: Arial, sans-serif;
+    font-size: 20px;
+    font-weight: 400;
+    color: #1a0dab;
+    margin: 12px 0 10px;
+}
+
+.seo-serp-description {
+    font-family: Arial, sans-serif;
+    font-size: 14px;
+}

assets/scss/seo.scss

@@ -31,10 +31,10 @@
     border: 1px solid #b3b3b3;
     padding: 7px 7px;
     line-height: 16px;
-    margin: 0 0 20px 0;
+    margin: 20px;
     outline: none;
     background-image: none;
-    padding: 30px 0;
+    padding: 30px 20px;
     width: 694px;
 
     @include radius(0px);

composer.json

@@ -22,22 +22,23 @@
             "homepage": "https://github.com/Andrew-Mc-Cormack"
         },
         {
-            "name": "Jeremy Cole",
-            "email": "jeremy@psdigital.co.nz"
+            "name": "PS/digital",
+            "email": "technical@psdigital.co.nz"
         }
     ],
     "support": {
         "issues": "http://github.com/plasticstudio/silverstripe-seo/issues"
     },
     "require": {
         "php": ">=5.6",
-        "silverstripe/cms": "^4.0",
-        "silverstripe/framework": "^4.0"
+        "silverstripe/cms": "^4 || ^5", 
+        "silverstripe/framework": "^4 || ^5",
+        "silverstripe/vendor-plugin": "^1 || ^2"
     },
     "autoload": {
         "psr-4": {
-            "CyberDuck\\SEO\\": "src/",
-            "CyberDuck\\SEO\\Tests\\": "tests/"
+            "PlasticStudio\\SEO\\": "src/",
+            "PlasticStudio\\SEO\\Tests\\": "tests/"
         }
     },
     "extra": {

docs/schema/README.md

@@ -1,20 +1,81 @@
 # Schema
 
-This module allows you to add schema.org JSON to your webpage and auto generates schema for Blog Posts
+This module allows you to add schema.org JSON to your webpage and auto generates schema for Blog Posts, Local Business, Organisation, Breadcrumbs
 
-## Displaying Schema on Your Page
+Google schema references: https://developers.google.com/search/docs/advanced/structured-data/article
 
-Add a PageSchema template variable to your page (preferably before the closing body tag)
+## Manual schemas
 
-```html
-    $PageSchema
-</body>
+Every page apart from Blog Posts have a Settings -> Schema tab with a textarea field where you can add custom schema to that page.
+
+## Displaying dynamic schema on Your Page
+
+### Installation / set up
+
+1. Add a yml to specify which schema to include where
+2. In Site Settings -> SEO tab, complete site name, address, phone and lat/lng details
+3. Add $ApplySchema template variable to your page (preferably before the closing body tag)
+
+#### Example YAML
+
+```
+# Google SEO schema settings
+
+Page:
+  default_image: "public/path_to_logo_file.png"
+  active_schema:
+    - 'PlasticStudio\SEO\Schema\Builder\Breadcrumbs'
+
+Skeletor\Pages\HomePage:
+  active_schema:
+    - 'PlasticStudio\SEO\Schema\Builder\LocalBusiness'
+
+Skeletor\Pages\NewsArticle:
+  active_schema:
+    - 'PlasticStudio\SEO\Schema\Builder\NewsArticle'
+```
+
+## Custom schema example
+
+1. Create new schema type in app/src/Schema/Types
+2. Extend PlasticStudio\SEO\Schema\Type\SchemaType
+3. Write a construct method with required fields from Google Schema
+4. Create a new builder module in app/src/Schema/Builder
+5. Extend PlasticStudio\SEO\Schema\Builder\SchemaBuilder
+6. Write a getSchema method to pull specific data for schema type
+7. In yaml, specify your custom schema builder
+
+eg: https://gist.github.com/ebakernz/1dbcb7cd229ebccf2e861dbb47729991
+
+```
+Skeletor\Artena\Models\CustomDataObjectOrPage:
+  active_schema:
+    - 'Skeletor\Schema\Builder\CustomBuilder'
 ```
 
-## Auto Generated BlogPost Schema
+## BlogPost Schema
 
-The below snippet is auto generated form your BlogPost data and some site config
-settings
+NewsArticle schema is set up for Blog module's Blog Posts.
+
+If you're using a custom post page, you'll need to write a custom schema, OR use the same field names (see fields pulled from blog post below).
+
+In your CMS Site Settings -> SEO tab, add your organisation name and image to populate the data:
+
+- publisher.name
+- publisher.logo.url
+- publisher.logo.width
+- publisher.logo.height
+
+The following data is pulled from the actual BlogPost:
+
+- headline - Title
+- datePublished - PublishDate
+- dateModified - LastEdited
+- description - Summary
+- author.name - First Author FirstName and Surname
+- image - FeaturedImage.URL
+
+The below snippet is auto generated form your BlogPost data and some site config settings.
 
 ```javascript
 <script type="application/ld+json">
@@ -49,23 +110,3 @@ settings
 }
 </script>
 ```
-
-In your CMS settings add your organisation name and image to populate the data:
-
-  - publisher.name
-  - publisher.logo.url
-  - publisher.logo.width
-  - publisher.logo.height
-
-The following data is pulled from the actual BlogPost:
-
-  - headline - Title
-  - datePublished - PublishDate
-  - dateModified - LastEdited
-  - description - Summary
-  - author.name - First Author FirstName and Surname
-  - image - FeaturedImage.URL
-
-## Manually Adding Schema
-
-Every page apart from Blog Posts have a Schema tab with a textarea field where you can add custom schema to that page.

src/Admin/SEOAdmin.php

@@ -1,65 +1,65 @@
 <?php
 
-namespace PlasticStudio\SEO\Admin;
+// namespace PlasticStudio\SEO\Admin;
 
-use Page;
-use Exception;
-use PlasticStudio\SEO\Model\Extension\SeoExtension;
-use PlasticStudio\SEO\Model\Extension\SeoPageExtension;
-use SilverStripe\Admin\ModelAdmin;
+// use Page;
+// use Exception;
+// use PlasticStudio\SEO\Model\Extension\SeoExtension;
+// use PlasticStudio\SEO\Model\Extension\SeoPageExtension;
+// use SilverStripe\Admin\ModelAdmin;
 
-class SEOAdmin extends ModelAdmin
-{
-    public function getEditForm($id = null, $fields = null)
-    {
-        $form = parent::getEditForm($id, $fields);
+// class SEOAdmin extends ModelAdmin
+// {
+//     public function getEditForm($id = null, $fields = null)
+//     {
+//         $form = parent::getEditForm($id, $fields);
 
-        $list = $this->getList()->sort('Priority', 'DESC');
+//         $list = $this->getList()->sort('Priority', 'DESC');
 
-        $grid = $form->Fields()->fieldByName($this->sanitiseClassName($this->modelClass));
-        $grid->setList($list);
-        $grid->setModelClass($this->ClassName);
+//         $grid = $form->Fields()->fieldByName($this->sanitiseClassName($this->modelClass));
+//         $grid->setList($list);
+//         $grid->setModelClass($this->ClassName);
 
-        $singleton = singleton($this->modelClass);
-        if ($singleton instanceof Page || is_subclass_of($singleton, Page::class)) {
-            if (!$singleton->hasExtension(SeoPageExtension::class)) {
-                throw new Exception(sprintf('%s must have the SeoPageExtension applied to work in SEO Admin', $this->modelClass));
-            }
-        } else {
-            if (!$singleton->hasExtension(SeoExtension::class)) {
-                throw new Exception(sprintf('%s must have the SeoExtension applied to work in SEO Admin', $this->modelClass));
-            }
-        }
-        $this->extend('updateEditForm', $form);
+//         $singleton = singleton($this->modelClass);
+//         if ($singleton instanceof Page || is_subclass_of($singleton, Page::class)) {
+//             if (!$singleton->hasExtension(SeoPageExtension::class)) {
+//                 throw new Exception(sprintf('%s must have the SeoPageExtension applied to work in SEO Admin', $this->modelClass));
+//             }
+//         } else {
+//             if (!$singleton->hasExtension(SeoExtension::class)) {
+//                 throw new Exception(sprintf('%s must have the SeoExtension applied to work in SEO Admin', $this->modelClass));
+//             }
+//         }
+//         $this->extend('updateEditForm', $form);
 
-        return $form;
-    }
+//         return $form;
+//     }
 
-    public function getExportFields()
-    {
-        $fields = [
-            'Created'             => 'Created',
-            'ID'                  => 'ID',
-            'ClassName'           => 'Class Name',
-            'Title'               => 'Title',
-            'URLSegment'          => 'URL Segment',
-            'MetaTitle'           => 'Meta Title',
-            'MetaDescription'     => 'Meta Description',
-            'Canonical'           => 'Canonical',
-            'Robots'              => 'Robots',
-            'Priority'            => 'Priority',
-            'ChangeFrequency'     => 'Change Frequency',
-            'SitemapHide'         => 'Sitemap Hide',
-            'HideSocial'          => 'Hide Social',
-            'OGtype'              => 'OG Type',
-            'OGlocale'            => 'OG Locale',
-            'TwitterCard'         => 'Twitter Card',
-            'SocialImage.URL'     => 'Social Image',
-            'HeadTags.Count'      => 'Head Tags',
-            'SitemapImages.Count' => 'Sitemap Images'
-        ];
-        $this->extend('updateExportFields', $fields);
+//     public function getExportFields()
+//     {
+//         $fields = [
+//             'Created'             => 'Created',
+//             'ID'                  => 'ID',
+//             'ClassName'           => 'Class Name',
+//             'Title'               => 'Title',
+//             'URLSegment'          => 'URL Segment',
+//             'MetaTitle'           => 'Meta Title',
+//             'MetaDescription'     => 'Meta Description',
+//             'Canonical'           => 'Canonical',
+//             'Robots'              => 'Robots',
+//             'Priority'            => 'Priority',
+//             'ChangeFrequency'     => 'Change Frequency',
+//             'SitemapHide'         => 'Sitemap Hide',
+//             'HideSocial'          => 'Hide Social',
+//             'OGtype'              => 'OG Type',
+//             'OGlocale'            => 'OG Locale',
+//             'TwitterCard'         => 'Twitter Card',
+//             'SocialImage.URL'     => 'Social Image',
+//             'HeadTags.Count'      => 'Head Tags',
+//             'SitemapImages.Count' => 'Sitemap Images'
+//         ];
+//         $this->extend('updateExportFields', $fields);
 
-        return $fields;
-    }
-}
+//         return $fields;
+//     }
+// }