salted-herring / silverstripe-block

code/Extensions/BlockinPage.php

Spacing +5 added lines, -5 removed lines

@@ -1,14 +1,14 @@ 
 <?php
 class BlockinPage extends Extension {
-	protected static $belongs_many_many = array (
+	protected static $belongs_many_many = array(
 		'Blocks'			=>	'Block'
 	);
 	
-	public function updateCMSFields( FieldList $fields ) {
+	public function updateCMSFields(FieldList $fields) {
 		$ancestry = ClassInfo::ancestry($this->owner->ClassName);
 		if (!in_array('RedirectorPage', $ancestry) && !in_array('VirtualPage', $ancestry)) {
 			$blocks = $this->owner->Blocks();
-			$blocks_grid = $this->gridBuilder('Blocks', $blocks, '', true,'GridFieldConfig_RelationEditor');
+			$blocks_grid = $this->gridBuilder('Blocks', $blocks, '', true, 'GridFieldConfig_RelationEditor');
 			$docked_grid = $this->gridBuilder('DockedBlocks', $this->dockedBlocks(), '');
 			
 			$fields->addFieldToTab('Root.MyBlocks', $blocks_grid);
@@ -27,7 +27,7 @@ 
 		$grid = new GridField($name, $label, $source);
 		$config = $gridHeaderType::create();
 		$config->removeComponentsByType('GridFieldAddNewButton');
-		if ( $canAdd ) {
+		if ($canAdd) {
 			$config->addComponents(
 				$multiClass = new GridFieldAddNewMultiClass(),
 				$sortable = new GridFieldOrderableRows('SortOrder')
@@ -51,7 +51,7 @@ 
 				$IDs[] = $BlockID;
 			}
 		}
-		$blocks = Block::get()->filter('ID', $IDs)->sort('SortOrder','ASC');
+		$blocks = Block::get()->filter('ID', $IDs)->sort('SortOrder', 'ASC');
 		return $blocks;
 	}
 }
\ No newline at end of file

Indentation +44 added lines, -44 removed lines

@@ -1,57 +1,57 @@
 <?php
 
 class BlockinPage extends Extension {
-	protected static $belongs_many_many = array (
-		'Blocks'			=>	'Block'
-	);
+    protected static $belongs_many_many = array (
+        'Blocks'			=>	'Block'
+    );
 	
-	public function updateCMSFields( FieldList $fields ) {
-		$ancestry = ClassInfo::ancestry($this->owner->ClassName);
-		if (!in_array('RedirectorPage', $ancestry) && !in_array('VirtualPage', $ancestry)) {
-			$blocks = $this->owner->Blocks();
-			$blocks_grid = $this->gridBuilder('Blocks', $blocks, '', true,'GridFieldConfig_RelationEditor');
-			$docked_grid = $this->gridBuilder('DockedBlocks', $this->dockedBlocks(), '');
+    public function updateCMSFields( FieldList $fields ) {
+        $ancestry = ClassInfo::ancestry($this->owner->ClassName);
+        if (!in_array('RedirectorPage', $ancestry) && !in_array('VirtualPage', $ancestry)) {
+            $blocks = $this->owner->Blocks();
+            $blocks_grid = $this->gridBuilder('Blocks', $blocks, '', true,'GridFieldConfig_RelationEditor');
+            $docked_grid = $this->gridBuilder('DockedBlocks', $this->dockedBlocks(), '');
 			
-			$fields->addFieldToTab('Root.MyBlocks', $blocks_grid);
-			$fields->addFieldToTab('Root.DockedBlocks', $docked_grid);
-		}
-	}
+            $fields->addFieldToTab('Root.MyBlocks', $blocks_grid);
+            $fields->addFieldToTab('Root.DockedBlocks', $docked_grid);
+        }
+    }
 	
-	private function gridBuilder($name, $source, $label = '', $canAdd = false, $gridHeaderType = 'GridFieldConfig_RecordEditor') {
-		/*
+    private function gridBuilder($name, $source, $label = '', $canAdd = false, $gridHeaderType = 'GridFieldConfig_RecordEditor') {
+        /*
 		GridFieldConfig_Base
 		GridFieldConfig_RecordViewer
 		GridFieldConfig_RecordEditor
 		GridFieldConfig_RelationEditor
 		*/
-		if ($label == '') { $label = $name; }
-		$grid = new GridField($name, $label, $source);
-		$config = $gridHeaderType::create();
-		$config->removeComponentsByType('GridFieldAddNewButton');
-		if ( $canAdd ) {
-			$config->addComponents(
-				$multiClass = new MultiClassSelector(),
-				$sortable = new GridFieldOrderableRows('SortOrder')
-			);
-			$subBlocks = BlocksAdmin::getAvaiableTypes();
-			$multiClass->setClasses($subBlocks);
-		}
-		$grid->setConfig($config);
-		return $grid;
-	}
+        if ($label == '') { $label = $name; }
+        $grid = new GridField($name, $label, $source);
+        $config = $gridHeaderType::create();
+        $config->removeComponentsByType('GridFieldAddNewButton');
+        if ( $canAdd ) {
+            $config->addComponents(
+                $multiClass = new MultiClassSelector(),
+                $sortable = new GridFieldOrderableRows('SortOrder')
+            );
+            $subBlocks = BlocksAdmin::getAvaiableTypes();
+            $multiClass->setClasses($subBlocks);
+        }
+        $grid->setConfig($config);
+        return $grid;
+    }
 		
-	private function dockedBlocks() {
-		$blocks = Block::get();
-		$IDs = array();
-		$ClassName = $this->owner->ClassName;
-		$Classes = $blocks->map('ID', 'shownInClass');
-		foreach ($Classes as $BlockID => $Class) {
-			$listedClasses = explode(',', $Class);
-			if (in_array($ClassName, $listedClasses)) {
-				$IDs[] = $BlockID;
-			}
-		}
-		$blocks = Block::get()->filter('ID', $IDs)->sort('SortOrder','ASC');
-		return $blocks;
-	}
+    private function dockedBlocks() {
+        $blocks = Block::get();
+        $IDs = array();
+        $ClassName = $this->owner->ClassName;
+        $Classes = $blocks->map('ID', 'shownInClass');
+        foreach ($Classes as $BlockID => $Class) {
+            $listedClasses = explode(',', $Class);
+            if (in_array($ClassName, $listedClasses)) {
+                $IDs[] = $BlockID;
+            }
+        }
+        $blocks = Block::get()->filter('ID', $IDs)->sort('SortOrder','ASC');
+        return $blocks;
+    }
 }
\ No newline at end of file

code/BlocksAdmin.php

Indentation +41 added lines, -41 removed lines

@@ -5,52 +5,52 @@
  * Left-hand-side tab : Admin Blocks
  * */
 class BlocksAdmin extends ModelAdmin {
-	private static $managed_models = array('Block');
-	private static $url_segment = 'blocks';
-	private static $menu_title = 'Blocks';
-	private static $menu_priority = 10;
-	private static $menu_icon = 'silverstripe-block/images/icon-block.png';
+    private static $managed_models = array('Block');
+    private static $url_segment = 'blocks';
+    private static $menu_title = 'Blocks';
+    private static $menu_priority = 10;
+    private static $menu_icon = 'silverstripe-block/images/icon-block.png';
 		
-	public function getEditForm($id = null, $fields = null) {
-		$form = parent::getEditForm($id, $fields);
+    public function getEditForm($id = null, $fields = null) {
+        $form = parent::getEditForm($id, $fields);
 		
-		$grid = $form->Fields()->fieldByName($this->sanitiseClassName($this->modelClass));
+        $grid = $form->Fields()->fieldByName($this->sanitiseClassName($this->modelClass));
 		
 		
-		$grid->getConfig()
-			->removeComponentsByType('GridFieldPaginator')
-			->removeComponentsByType('GridFieldAddNewButton')
-			->removeComponentsByType('GridFieldPrintButton')
-			->removeComponentsByType('GridFieldExportButton')
-			->addComponents(
-				new GridFieldPaginatorWithShowAll(30),
-				$multiClass = new MultiClassSelector(),
-				$sortable = new GridFieldOrderableRows('SortOrder')
-			);
+        $grid->getConfig()
+            ->removeComponentsByType('GridFieldPaginator')
+            ->removeComponentsByType('GridFieldAddNewButton')
+            ->removeComponentsByType('GridFieldPrintButton')
+            ->removeComponentsByType('GridFieldExportButton')
+            ->addComponents(
+                new GridFieldPaginatorWithShowAll(30),
+                $multiClass = new MultiClassSelector(),
+                $sortable = new GridFieldOrderableRows('SortOrder')
+            );
 			
-		$subBlocks = self::getAvaiableTypes();
-		$multiClass->setClasses($subBlocks);
-		$grid->setTitle('All Blcoks');
-		return $form;
-	}
+        $subBlocks = self::getAvaiableTypes();
+        $multiClass->setClasses($subBlocks);
+        $grid->setTitle('All Blcoks');
+        return $form;
+    }
 	
-	public static function getAvaiableTypes() {
-		$subBlocks = ClassInfo::subclassesFor('Block');
-		if (is_null($subBlocks)) {
-			$subBlocks = array('Block');
-		}else{
-			$disabledTypes = Config::inst()->get('Block','DisabledBlocks');
-			Debugger::inspect($disabledTypes);
-			if (!empty($disabledTypes)) {
-				foreach ($disabledTypes as $disabledType) {
-					unset($subBlocks[$disabledType]);
-				}
-			}
-			foreach ($subBlocks as $key => &$value) {
-				$value = empty($key::$singular_name) ? ucwords(trim(strtolower(preg_replace('/_?([A-Z])/', ' $1', $value)))) : $key::$singular_name;
-			}
-		}
+    public static function getAvaiableTypes() {
+        $subBlocks = ClassInfo::subclassesFor('Block');
+        if (is_null($subBlocks)) {
+            $subBlocks = array('Block');
+        }else{
+            $disabledTypes = Config::inst()->get('Block','DisabledBlocks');
+            Debugger::inspect($disabledTypes);
+            if (!empty($disabledTypes)) {
+                foreach ($disabledTypes as $disabledType) {
+                    unset($subBlocks[$disabledType]);
+                }
+            }
+            foreach ($subBlocks as $key => &$value) {
+                $value = empty($key::$singular_name) ? ucwords(trim(strtolower(preg_replace('/_?([A-Z])/', ' $1', $value)))) : $key::$singular_name;
+            }
+        }
 		
-		return $subBlocks;
-	}
+        return $subBlocks;
+    }
 }

Spacing +2 added lines, -2 removed lines

@@ -38,8 +38,8 @@
 		$subBlocks = ClassInfo::subclassesFor('Block');
 		if (is_null($subBlocks)) {
 			$subBlocks = array('Block');
-		}else{
-			$disabledTypes = Config::inst()->get('Block','DisabledBlocks');
+		} else {
+			$disabledTypes = Config::inst()->get('Block', 'DisabledBlocks');
 			Debugger::inspect($disabledTypes);
 			if (!empty($disabledTypes)) {
 				foreach ($disabledTypes as $disabledType) {

Braces +1 added lines, -1 removed lines

@@ -38,7 +38,7 @@
 		$subBlocks = ClassInfo::subclassesFor('Block');
 		if (is_null($subBlocks)) {
 			$subBlocks = array('Block');
-		}else{
+		} else{
 			$disabledTypes = Config::inst()->get('Block','DisabledBlocks');
 			Debugger::inspect($disabledTypes);
 			if (!empty($disabledTypes)) {