Merge pull request #2 from a2nt/v5

IMPR: Map Elements

README.md

@@ -1,4 +1,7 @@
 # silverstripe-elemental-basics
+
+[![Silverstripe Version](https://img.shields.io/badge/Silverstripe-5.1-005ae1.svg?labelColor=white&logoColor=ffffff&logo=data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHZpZXdCb3g9IjAgMCAxMDEuMDkxIDU4LjU1NSIgZmlsbD0iIzAwNWFlMSIgeG1sbnM6dj0iaHR0cHM6Ly92ZWN0YS5pby9uYW5vIj48cGF0aCBkPSJNNTAuMDE1IDUuODU4bC0yMS4yODMgMTQuOWE2LjUgNi41IDAgMCAwIDcuNDQ4IDEwLjY1NGwyMS4yODMtMTQuOWM4LjgxMy02LjE3IDIwLjk2LTQuMDI4IDI3LjEzIDQuNzg2czQuMDI4IDIwLjk2LTQuNzg1IDI3LjEzbC02LjY5MSA0LjY3NmM1LjU0MiA5LjQxOCAxOC4wNzggNS40NTUgMjMuNzczLTQuNjU0QTMyLjQ3IDMyLjQ3IDAgMCAwIDUwLjAxNSA1Ljg2MnptMS4wNTggNDYuODI3bDIxLjI4NC0xNC45YTYuNSA2LjUgMCAxIDAtNy40NDktMTAuNjUzTDQzLjYyMyA0Mi4wMjhjLTguODEzIDYuMTctMjAuOTU5IDQuMDI5LTI3LjEyOS00Ljc4NHMtNC4wMjktMjAuOTU5IDQuNzg0LTI3LjEyOWw2LjY5MS00LjY3NkMyMi40My0zLjk3NiA5Ljg5NC0uMDEzIDQuMTk4IDEwLjA5NmEzMi40NyAzMi40NyAwIDAgMCA0Ni44NzUgNDIuNTkyeiIvPjwvc3ZnPg==)](https://packagist.org/packages/goldfinch/google-maps)
+
 Some useful elemental blocks
 
 ## Usefull UNIX console utilities
@@ -20,4 +23,4 @@ https://github.com/ogham/exa
 
 ### git diff tool with bat code hightlighting (git show)
 
-https://github.com/dandavison/delta
+https://github.com/dandavison/delta

composer.json

@@ -13,15 +13,15 @@
     }],
     "minimum-stability": "dev",
     "require": {
-	"silverstripe/cms": "^4",
+        "silverstripe/cms": "^5",
         "dnadesign/silverstripe-elemental": "*",
         "dnadesign/silverstripe-elemental-list": "*",
-        "betterbrief/silverstripe-googlemapfield": "*",
         "symbiote/silverstripe-gridfieldextensions": "*",
         "dynamic/silverstripe-elemental-image": "*",
         "gorriecoe/silverstripe-linkfield": "*",
-        "a2nt/silverstripe-mapboxfield": "dev-master",
-	"lekoala/silverstripe-filepond": "*"
+        "lekoala/silverstripe-filepond": "*",
+        "symbiote/silverstripe-addressable": "*",
+        "a2nt/silverstripe-mapboxfield": "*"
     },
     "autoload": {
         "psr-4": {

src/Elements/AccordionElement.php

@@ -28,14 +28,14 @@ class AccordionElement extends ElementList
 
     private static $table_name = 'AccordionElement';
 
-	private static $db = [
-		'OpenFirst' => 'Boolean(0)',
-		'KeepOpenned' => 'Boolean(0)',
-	];
+    private static $db = [
+        'OpenFirst' => 'Boolean(0)',
+        'KeepOpenned' => 'Boolean(0)',
+    ];
 
-    public function getType()
+    public function getType(): string
     {
-        return self::$singular_name;
+        return _t(__CLASS__ . '.BlockType', self::$singular_name);
     }
 
     public function Accordion()
@@ -43,15 +43,15 @@ class AccordionElement extends ElementList
         return $this->Elements()->renderWith(static::class.'_AccordionArea');
     }
 
-	public function getCMSFields()
-	{
-		$fields = parent::getCMSFields();
+    public function getCMSFields()
+    {
+        $fields = parent::getCMSFields();
 
-		$fields->addFieldsToTab('Root.Main', [
-			CheckboxField::create('OpenFirst', 'Open first accordion element on page load'),
-			CheckboxField::create('KeepOpenned', 'Keep elements open'),
-		]);
+        $fields->addFieldsToTab('Root.Main', [
+            CheckboxField::create('OpenFirst', 'Open first accordion element on page load'),
+            CheckboxField::create('KeepOpenned', 'Keep elements open'),
+        ]);
 
-		return $fields;
-	}
+        return $fields;
+    }
 }

src/Elements/CustomSnippetElement.php

@@ -28,9 +28,9 @@ class CustomSnippetElement extends ElementContent
 
     private static $table_name = 'CustomSnippetElement';
 
-    public function getType()
+    public function getType(): string
     {
-        return self::$singular_name;
+        return _t(__CLASS__ . '.BlockType', self::$singular_name);
     }
 
     public function getCMSFields()

src/Elements/InstagramElement.php

@@ -45,9 +45,9 @@ class InstagramElement extends BaseElement
         'DisplayGallery' => true,
     ];
 
-    public function getType()
+    public function getType(): string
     {
-        return self::$singular_name;
+        return _t(__CLASS__ . '.BlockType', self::$singular_name);
     }
 
     /**
@@ -89,7 +89,7 @@ class InstagramElement extends BaseElement
         foreach ($attributes as $name => $value) {
             if ($value === true) {
                 $value = $name;
-            } else if (is_scalar($value)) {
+            } elseif (is_scalar($value)) {
                 $value = (string) $value;
             } else {
                 $value = json_encode($value);

src/Elements/MapElement.php

@@ -1,10 +1,4 @@
 <?php
-/**
- * Created by PhpStorm.
- * User: tony
- * Date: 6/30/18
- * Time: 11:54 PM
- */
 
 namespace A2nt\ElementalBasics\Elements;
 

src/Elements/SidebarElement.php

@@ -29,6 +29,6 @@ class SidebarElement extends BaseElement
 
     public function getType(): string
     {
-        return self::$singular_name;
+        return _t(__CLASS__ . '.BlockType', self::$singular_name);
     }
 }

src/Elements/TeamMembersElement.php

@@ -25,9 +25,9 @@ class TeamMembersElement extends BaseElement
 
     private static $description = 'Displays random Team Members';
 
-    public function getType()
+    public function getType(): string
     {
-        return self::$singular_name;
+        return _t(__CLASS__ . '.BlockType', self::$singular_name);
     }
 
     public function Members()

src/Extensions/BaseElementEx.php

@@ -31,12 +31,15 @@ class BaseElementEx extends DataExtension
         parent::updateCMSFields($fields);
 
         if ($obj->ID) {
-            $fields->insertBefore(LiteralField::create(
-                'AnchorName',
-                '<div class="field"><div class="form__field-holder">'
-                .'Element Anchor name: <b>#e'.$obj->ID.'</b>'
-                .'</div></div>'
-            ), 'Title');
+            $fields->insertBefore(
+                'Title',
+                LiteralField::create(
+                    'AnchorName',
+                    '<div class="field"><div class="form__field-holder">'
+                    .'Element Anchor name: <b>#e'.$obj->ID.'</b>'
+                    .'</div></div>'
+                )
+            );
         }
 
         $tab = $fields->findOrMakeTab('Root.Settings');
@@ -74,7 +77,7 @@ class BaseElementEx extends DataExtension
 
     public function updateCMSEditLink(&$link): void
     {
-        if(!method_exists($this->owner, 'inlineEditable')) {
+        if (!method_exists($this->owner, 'inlineEditable')) {
             return;
         }
 

src/Models/MapPin.php

@@ -1,10 +1,4 @@
 <?php
-/**
- * Created by PhpStorm.
- * User: tony
- * Date: 9/12/18
- * Time: 2:55 AM
- */
 
 namespace A2nt\ElementalBasics\Models;