salted-herring / silverstripe-block

code/Extensions/BlockinPage.php

Indentation +49 added lines, -49 removed lines

@@ -1,62 +1,62 @@
 <?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
-			->removeComponentsByType('GridFieldPaginator')
-			->removeComponentsByType('GridFieldDetailForm')
-			->addComponents(
-				new VersionedForm(),
-				new GridFieldPaginatorWithShowAll(30),
-				$multiClass = new MultiClassSelector(),
-				$sortable = new OrderableBlocks('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
+            ->removeComponentsByType('GridFieldPaginator')
+            ->removeComponentsByType('GridFieldDetailForm')
+            ->addComponents(
+                new VersionedForm(),
+                new GridFieldPaginatorWithShowAll(30),
+                $multiClass = new MultiClassSelector(),
+                $sortable = new OrderableBlocks('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/OrderableBlocks.php

Indentation +23 added lines, -23 removed lines

@@ -1,29 +1,29 @@
 <?php
 
 class OrderableBlocks extends GridFieldOrderableRows {
-	protected function reorderItems($list, array $values, array $order) {
-		$pool = array_values($values);
-		sort($pool);
+    protected function reorderItems($list, array $values, array $order) {
+        $pool = array_values($values);
+        sort($pool);
 
-		foreach(array_values($order) as $pos => $id) {
-			if($values[$id] != $pool[$pos]) {
-				DB::query(sprintf(
-					'UPDATE "%s" SET "%s" = %d WHERE %s',
-					$this->getSortTable($list),
-					$this->getSortField(),
-					$pool[$pos],
-					$this->getSortTableClauseForIds($list, $id)
-				));
-				DB::query(sprintf(
-					'UPDATE "%s_Live" SET "%s" = %d WHERE %s',
-					$this->getSortTable($list),
-					$this->getSortField(),
-					$pool[$pos],
-					$this->getSortTableClauseForIds($list, $id)
-				));
-			}
-		}
+        foreach(array_values($order) as $pos => $id) {
+            if($values[$id] != $pool[$pos]) {
+                DB::query(sprintf(
+                    'UPDATE "%s" SET "%s" = %d WHERE %s',
+                    $this->getSortTable($list),
+                    $this->getSortField(),
+                    $pool[$pos],
+                    $this->getSortTableClauseForIds($list, $id)
+                ));
+                DB::query(sprintf(
+                    'UPDATE "%s_Live" SET "%s" = %d WHERE %s',
+                    $this->getSortTable($list),
+                    $this->getSortField(),
+                    $pool[$pos],
+                    $this->getSortTableClauseForIds($list, $id)
+                ));
+            }
+        }
 
-		$this->extend('onAfterReorderItems', $list);
-	}
+        $this->extend('onAfterReorderItems', $list);
+    }
 }
\ No newline at end of file

Spacing +2 added lines, -2 removed lines

@@ -5,8 +5,8 @@
 		$pool = array_values($values);
 		sort($pool);
 
-		foreach(array_values($order) as $pos => $id) {
-			if($values[$id] != $pool[$pos]) {
+		foreach (array_values($order) as $pos => $id) {
+			if ($values[$id] != $pool[$pos]) {
 				DB::query(sprintf(
 					'UPDATE "%s" SET "%s" = %d WHERE %s',
 					$this->getSortTable($list),

code/Block.php

Indentation +201 added lines, -201 removed lines

@@ -1,183 +1,183 @@ 
 <?php
 class Block extends DataObject {
-	protected static $db = array (
-		'SortOrder'			=>	'Int',
-		'Title'				=>	'Varchar(64)',
-		'TitleWrapper'		=>	'Enum("h2,h3,h4,h5,h6")',
-		'hideTitle'			=>	'Boolean',
-		'showBlockbyClass'	=>	'Boolean',
-		'Description'		=>	'Varchar(128)',
-		'MemberVisibility'	=>	'Varchar(255)',
-		'shownInClass'		=>	'Text',
-		'addMarginTop'		=>	'Boolean',
-		'addMarginBottom'	=>	'Boolean',
-		'addPaddingTop'		=>	'Boolean',
-		'addPaddingBottom'	=>	'Boolean'
-	);
+    protected static $db = array (
+        'SortOrder'			=>	'Int',
+        'Title'				=>	'Varchar(64)',
+        'TitleWrapper'		=>	'Enum("h2,h3,h4,h5,h6")',
+        'hideTitle'			=>	'Boolean',
+        'showBlockbyClass'	=>	'Boolean',
+        'Description'		=>	'Varchar(128)',
+        'MemberVisibility'	=>	'Varchar(255)',
+        'shownInClass'		=>	'Text',
+        'addMarginTop'		=>	'Boolean',
+        'addMarginBottom'	=>	'Boolean',
+        'addPaddingTop'		=>	'Boolean',
+        'addPaddingBottom'	=>	'Boolean'
+    );
 	
-	protected static $many_many = array (
-		'Pages'				=>	'Page'
-	);
+    protected static $many_many = array (
+        'Pages'				=>	'Page'
+    );
 	
-	protected static $default_sort = array(
-		'SortOrder'			=>	'ASC',
-		'ID'					=>	'DESC'
-	);
+    protected static $default_sort = array(
+        'SortOrder'			=>	'ASC',
+        'ID'					=>	'DESC'
+    );
 		
-	protected static $create_table_options = array(
-		'MySQLDatabase'		=> 'ENGINE=MyISAM'
+    protected static $create_table_options = array(
+        'MySQLDatabase'		=> 'ENGINE=MyISAM'
     );
 	
-	protected static $extensions = array (
-		'StandardPermissions'
-	);
+    protected static $extensions = array (
+        'StandardPermissions'
+    );
 	
-	protected static $summary_fields = array(
-		'BlockType',
-		'Title', 
-		'Description',
-		'shownOn',
-		'VisibleTo',
-		'Published'
-	);
+    protected static $summary_fields = array(
+        'BlockType',
+        'Title', 
+        'Description',
+        'shownOn',
+        'VisibleTo',
+        'Published'
+    );
 	
-	protected static $field_labels = array(
-		'BlockType'			=>	'Block type',
-		'shownOn'			=>	'is shown on',
-		'VisibleTo'			=>	'Visible to'
-	);
+    protected static $field_labels = array(
+        'BlockType'			=>	'Block type',
+        'shownOn'			=>	'is shown on',
+        'VisibleTo'			=>	'Visible to'
+    );
 	
-	public function VisibleTo() {
-		if (strlen(trim($this->MemberVisibility)) > 0) {
-			$lists = 'Group: ' . str_replace(',','<br />Group: ', $this->MemberVisibility);
-		}else{
-			$lists = '<em>&lt;All&gt;</em>';
-		}
+    public function VisibleTo() {
+        if (strlen(trim($this->MemberVisibility)) > 0) {
+            $lists = 'Group: ' . str_replace(',','<br />Group: ', $this->MemberVisibility);
+        }else{
+            $lists = '<em>&lt;All&gt;</em>';
+        }
 		
-		return new LiteralField('VisibleTo',$lists);
-	}
+        return new LiteralField('VisibleTo',$lists);
+    }
 	
-	public function BlockType() {
-		return $this->singular_name();
-	}
+    public function BlockType() {
+        return $this->singular_name();
+    }
 	
-	public function shownOn() {
-		if ($this->showBlockbyClass) {
-			if (strlen(trim($this->shownInClass)) > 0) {
-				$lists = 'Type: ' . str_replace(',','<br />Type: ', $this->shownInClass);
-			}else{
-				$lists = '<em>&lt;not assigned&gt;</em>';
-			}
-		}else{
-			if ($this->Pages()->count() > 0) {
-				$lists = 'Page: ' . implode('<br />Page: ', $this->Pages()->column('Title'));
-			}else{
-				$lists = '<em>&lt;not assigned&gt;</em>';
-			}
-		}
-		return new LiteralField('shownOn',$lists);
-	}
+    public function shownOn() {
+        if ($this->showBlockbyClass) {
+            if (strlen(trim($this->shownInClass)) > 0) {
+                $lists = 'Type: ' . str_replace(',','<br />Type: ', $this->shownInClass);
+            }else{
+                $lists = '<em>&lt;not assigned&gt;</em>';
+            }
+        }else{
+            if ($this->Pages()->count() > 0) {
+                $lists = 'Page: ' . implode('<br />Page: ', $this->Pages()->column('Title'));
+            }else{
+                $lists = '<em>&lt;not assigned&gt;</em>';
+            }
+        }
+        return new LiteralField('shownOn',$lists);
+    }
 	
-	public function getCMSFields() {
-		$fields = parent::getCMSFields();
-		$fields->removeFieldFromTab('Root', 'Pages');
-		$fields->removeFieldsFromTab('Root.Main', array(
-			'SortOrder',
-			'showBlockbyClass',
-			'shownInClass',
-			'MemberVisibility'
-		));
+    public function getCMSFields() {
+        $fields = parent::getCMSFields();
+        $fields->removeFieldFromTab('Root', 'Pages');
+        $fields->removeFieldsFromTab('Root.Main', array(
+            'SortOrder',
+            'showBlockbyClass',
+            'shownInClass',
+            'MemberVisibility'
+        ));
 		
-		$fields->addFieldToTab('Root.Main', LiteralField::create('Status', 'Published: ' . $this->Published()), 'Title');
+        $fields->addFieldToTab('Root.Main', LiteralField::create('Status', 'Published: ' . $this->Published()), 'Title');
 		
-		$memberGroups = Group::get();
-		$sourcemap = $memberGroups->map('Code', 'Title');
-		$source = array(
-			'anonymous'		=>	'Anonymous visitors'
-		);
-		foreach ($sourcemap as $mapping => $key) {
-			$source[$mapping] = $key;
-		}
+        $memberGroups = Group::get();
+        $sourcemap = $memberGroups->map('Code', 'Title');
+        $source = array(
+            'anonymous'		=>	'Anonymous visitors'
+        );
+        foreach ($sourcemap as $mapping => $key) {
+            $source[$mapping] = $key;
+        }
 		
-		$memberVisibility = new CheckboxSetField(
-			$name = "MemberVisibility",
-			$title = "Show block for specific groups",
-			$source
-		);
+        $memberVisibility = new CheckboxSetField(
+            $name = "MemberVisibility",
+            $title = "Show block for specific groups",
+            $source
+        );
 		
-		$memberVisibility->setDescription('Show this block only for the selected group(s). If you select no groups, the block will be visible to all members.');
+        $memberVisibility->setDescription('Show this block only for the selected group(s). If you select no groups, the block will be visible to all members.');
 		
-		$availabelClasses = $this->availableClasses();
-		$inClass = new CheckboxSetField(
-			$name = "shownInClass",
-			$title = "Show block for specific content types",
-			$availabelClasses
-		);
+        $availabelClasses = $this->availableClasses();
+        $inClass = new CheckboxSetField(
+            $name = "shownInClass",
+            $title = "Show block for specific content types",
+            $availabelClasses
+        );
 		
-		$filterSelector = OptionsetField::create(
-			'showBlockbyClass',
-			'Choose filter set',
-			array(
-				'0'			=>	'by page',
-				'1'			=>	'by page/data type'
-			)
-		)->setDescription('<p><br /><strong>by page</strong>: block will be displayed in the selected page(s)<br /><strong>by page/data type</strong>: block will be displayed on the pages created with the particular page/data type. e.g. is <strong>"InternalPage"</strong> is picked, the block will be displayed, and will ONLY be displayed on all <strong>Internal Pages</strong></p>');
+        $filterSelector = OptionsetField::create(
+            'showBlockbyClass',
+            'Choose filter set',
+            array(
+                '0'			=>	'by page',
+                '1'			=>	'by page/data type'
+            )
+        )->setDescription('<p><br /><strong>by page</strong>: block will be displayed in the selected page(s)<br /><strong>by page/data type</strong>: block will be displayed on the pages created with the particular page/data type. e.g. is <strong>"InternalPage"</strong> is picked, the block will be displayed, and will ONLY be displayed on all <strong>Internal Pages</strong></p>');
 		
-		$availablePages = Page::get()->exclude('ClassName', array(
-			'ErrorPage',
-			'RedirectorPage',
-			'VirtualPage'
-		));
-		$pageSelector = new CheckboxSetField(
-			$name = "Pages",
-			$title = "Show on Page(s)",
-			$availablePages->map('ID','Title')
-		);
+        $availablePages = Page::get()->exclude('ClassName', array(
+            'ErrorPage',
+            'RedirectorPage',
+            'VirtualPage'
+        ));
+        $pageSelector = new CheckboxSetField(
+            $name = "Pages",
+            $title = "Show on Page(s)",
+            $availablePages->map('ID','Title')
+        );
 		
 		
-		if ($this->canConfigPageAndType(Member::currentUser())) {
-			$fields->addFieldsToTab('Root.VisibilitySettings', array(
-				$filterSelector,
-				$pageSelector,
-				$inClass
-			));
-		}
+        if ($this->canConfigPageAndType(Member::currentUser())) {
+            $fields->addFieldsToTab('Root.VisibilitySettings', array(
+                $filterSelector,
+                $pageSelector,
+                $inClass
+            ));
+        }
 		
-		if ($this->canConfigMemberVisibility(Member::currentUser())) {
-			$fields->addFieldToTab('Root.VisibilitySettings', $memberVisibility);
-		}
+        if ($this->canConfigMemberVisibility(Member::currentUser())) {
+            $fields->addFieldToTab('Root.VisibilitySettings', $memberVisibility);
+        }
 		
-		if (!$fields->fieldByName('Options')) {
-			$fields->insertBefore($right = RightSidebar::create('Options'), 'Root');
-	    }
+        if (!$fields->fieldByName('Options')) {
+            $fields->insertBefore($right = RightSidebar::create('Options'), 'Root');
+        }
 	
-	    $fields->addFieldsToTab('Options', array(
-			CheckboxField::create('addMarginTop', 'add "margin-top" class to block wrapper'),
-			CheckboxField::create('addMarginBottom', 'add "margin-bottom" class to block wrapper')
-	    ));
+        $fields->addFieldsToTab('Options', array(
+            CheckboxField::create('addMarginTop', 'add "margin-top" class to block wrapper'),
+            CheckboxField::create('addMarginBottom', 'add "margin-bottom" class to block wrapper')
+        ));
 
-		return $fields;
-	}
+        return $fields;
+    }
 	
-	public function doPublish() {
-		$this->writeToStage('Live');
-	}
+    public function doPublish() {
+        $this->writeToStage('Live');
+    }
 	
-	public function onBeforeWrite() {
-		parent::onBeforeWrite();
-		if (empty($this->byPass)) {
-			$this->readmode = Versioned::get_reading_mode();
-			Versioned::set_reading_mode('Stage.Stage');
-		}
-	}
+    public function onBeforeWrite() {
+        parent::onBeforeWrite();
+        if (empty($this->byPass)) {
+            $this->readmode = Versioned::get_reading_mode();
+            Versioned::set_reading_mode('Stage.Stage');
+        }
+    }
 	
-	public function onAfterWrite() {
-		parent::onAfterWrite();
-		if (isset($this->readmode)) {
-			Versioned::set_reading_mode('Stage.' . $this->readmode);
-		}
+    public function onAfterWrite() {
+        parent::onAfterWrite();
+        if (isset($this->readmode)) {
+            Versioned::set_reading_mode('Stage.' . $this->readmode);
+        }
 		
-		/*if ($this->isPublished()) {
+        /*if ($this->isPublished()) {
 			$live = Versioned::get_by_stage('Block', 'Live')->byID($this->ID);
 			$stage = Versioned::get_by_stage('Block', 'Stage')->byID($this->ID);
 			if ($live->SortOrder != $stage->SortOrder) {
@@ -186,74 +186,74 @@ 
 				$this->doPublish();
 			}
 		}*/
-	}
+    }
 	
-	public function availableClasses() {
-		$Classes = array_diff(
-			ClassInfo::subclassesFor('Page'),
-			ClassInfo::subclassesFor('RedirectorPage'),
-			ClassInfo::subclassesFor('VirtualPage')
-		);
-		return $Classes;
-	}
+    public function availableClasses() {
+        $Classes = array_diff(
+            ClassInfo::subclassesFor('Page'),
+            ClassInfo::subclassesFor('RedirectorPage'),
+            ClassInfo::subclassesFor('VirtualPage')
+        );
+        return $Classes;
+    }
 	
-	public function forTemplate() {
-		if ($this->canDisplayMemberCheck()) {
-			return $this->renderWith(array($this->getClassName(), 'BaseBlock'));
-		}
+    public function forTemplate() {
+        if ($this->canDisplayMemberCheck()) {
+            return $this->renderWith(array($this->getClassName(), 'BaseBlock'));
+        }
 		
-		return false;
-	}
+        return false;
+    }
 	
-	public function canDisplayMemberCheck() {
-		$rawVisibility = $this->MemberVisibility;
+    public function canDisplayMemberCheck() {
+        $rawVisibility = $this->MemberVisibility;
 		
-		if (empty($rawVisibility)) {
-			return true;
-		}
+        if (empty($rawVisibility)) {
+            return true;
+        }
 		
-		$visibility = explode(',', $rawVisibility);
-		$member = Member::currentUser();
+        $visibility = explode(',', $rawVisibility);
+        $member = Member::currentUser();
 		
-		if (!$member && in_array('anonymous', $visibility)) {
-			return true;
-		}
+        if (!$member && in_array('anonymous', $visibility)) {
+            return true;
+        }
 		
-		if ($member) {
-			$memberGroups = $member->Groups()->column('Code');
-			foreach ($memberGroups as $memberGroup) {
-				if (in_array($memberGroup, $visibility)) {
-					return true;
-				}
-			}
-		}
+        if ($member) {
+            $memberGroups = $member->Groups()->column('Code');
+            foreach ($memberGroups as $memberGroup) {
+                if (in_array($memberGroup, $visibility)) {
+                    return true;
+                }
+            }
+        }
 		
-		return false;
-	}
+        return false;
+    }
 	
-	public function frontendEditable() {
-		$member = Member::currentUser();
-		return $this->canEdit($member) && Config::inst()->get('Block', 'FrontendEditable');
-	}
+    public function frontendEditable() {
+        $member = Member::currentUser();
+        return $this->canEdit($member) && Config::inst()->get('Block', 'FrontendEditable');
+    }
 	
-	public function Type2Class() {
-		return strtolower(str_replace(' ', '-', $this->singular_name()));
-	}
+    public function Type2Class() {
+        return strtolower(str_replace(' ', '-', $this->singular_name()));
+    }
 	
-	/*public function doPublish() {
+    /*public function doPublish() {
 		$this->writeToStage('Live');
 	}*/
 	
-	public function Published() {
-		return $this->isPublished() ? 'Yes' : 'No';
-	}
+    public function Published() {
+        return $this->isPublished() ? 'Yes' : 'No';
+    }
 	
-	public function isPublished() {
-		if (!empty(Versioned::get_by_stage('Block', 'Live')->byID($this->ID))) {
-			return true;
-		}
+    public function isPublished() {
+        if (!empty(Versioned::get_by_stage('Block', 'Live')->byID($this->ID))) {
+            return true;
+        }
 		
-		return false;
-	}
+        return false;
+    }
 
 }
\ No newline at end of file