Add sidebar back as a separate tab. Fix tag and category routes

src/Model/BlogCategory.php

@@ -64,7 +64,7 @@ class BlogCategory extends DataObject implements CategorisationObject
      */
     protected function getListUrlSegment()
     {
-        return 'categories';
+        return 'category';
     }
 
     /**
@@ -74,5 +74,4 @@ class BlogCategory extends DataObject implements CategorisationObject
     {
         return _t('BlogCategory.Duplicate', 'A blog category already exists with that name.');
     }
-
 }

src/Model/BlogObject.php

@@ -211,7 +211,7 @@ trait BlogObject
             );
 
         if ($this->ID) {
-            $duplicates->exclude('ID', $this->ID);
+            $duplicates = $duplicates->exclude('ID', $this->ID);
         }
 
         return $duplicates;

src/Model/BlogPost.php

@@ -272,11 +272,6 @@ class BlogPost extends Page
                 );
             }
 
-            /**
-             * @todo Fix the sidebar styles for SS4 + Bootstrap
-             */
-            return;
-
             // Get categories and tags
             $parent = $this->Parent();
             $categories = $parent instanceof Blog
@@ -286,7 +281,11 @@ class BlogPost extends Page
                 ? $parent->Tags()
                 : BlogTag::get();
 
-            $options = BlogAdminSidebar::create(
+            // @todo: Reimplement the sidebar
+            // $options = BlogAdminSidebar::create(
+            $fields->addFieldsToTab(
+                'Root.PostOptions',
+                [
                     $publishDate,
                     $urlSegment,
                     TagField::create(
@@ -307,11 +306,11 @@ class BlogPost extends Page
                         ->setShouldLazyLoad(true),
                     $authorField,
                     $authorNames
-            )->setTitle('Post Options');
+                ]
-
+            );
-            $options->setName('blog-admin-sidebar');
+            // )->setTitle('Post Options');
-
+            // $options->setName('blog-admin-sidebar');
-            $fields->insertBefore($options, 'Root');
+            // $fields->insertBefore($options, 'Root');
         });
 
         $fields = parent::getCMSFields();

src/Model/BlogTag.php

@@ -64,7 +64,7 @@ class BlogTag extends DataObject implements CategorisationObject
      */
     protected function getListUrlSegment()
     {
-        return 'tags';
+        return 'tag';
     }
 
     /**