@@ -41,7 +41,7 @@ discard block |
||
| 41 | 41 | public function VisibleTo() { |
| 42 | 42 | if (strlen(trim($this->MemberVisibility)) > 0) { |
| 43 | 43 | $lists = 'Group: ' . str_replace(',','<br />Group: ', $this->MemberVisibility); |
| 44 | - }else{ |
|
| 44 | + } else{ |
|
| 45 | 45 | $lists = '<em><All></em>'; |
| 46 | 46 | } |
| 47 | 47 | |
@@ -56,13 +56,13 @@ discard block |
||
| 56 | 56 | if ($this->showBlockbyClass) { |
| 57 | 57 | if (strlen(trim($this->shownInClass)) > 0) { |
| 58 | 58 | $lists = 'Type: ' . str_replace(',','<br />Type: ', $this->shownInClass); |
| 59 | - }else{ |
|
| 59 | + } else{ |
|
| 60 | 60 | $lists = '<em><not assigned></em>'; |
| 61 | 61 | } |
| 62 | - }else{ |
|
| 62 | + } else{ |
|
| 63 | 63 | if ($this->Pages()->count() > 0) { |
| 64 | 64 | $lists = 'Page: ' . implode('<br />Page: ', $this->Pages()->column('Title')); |
| 65 | - }else{ |
|
| 65 | + } else{ |
|
| 66 | 66 | $lists = '<em><not assigned></em>'; |
| 67 | 67 | } |
| 68 | 68 | } |
@@ -1,7 +1,5 @@ |
||
| 1 | 1 | <?php |
| 2 | 2 | |
| 3 | -use SaltedHerring\Debugger as Debugger; |
|
| 4 | - |
|
| 5 | 3 | class Block extends DataObject { |
| 6 | 4 | protected static $db = array ( |
| 7 | 5 | 'SortOrder' => 'Int', |
@@ -3,248 +3,248 @@ |
||
| 3 | 3 | use SaltedHerring\Debugger as Debugger; |
| 4 | 4 | |
| 5 | 5 | class Block extends DataObject { |
| 6 | - protected static $db = array ( |
|
| 7 | - 'SortOrder' => 'Int', |
|
| 8 | - 'Title' => 'Varchar(64)', |
|
| 9 | - 'TitleWrapper' => 'Enum("h2,h3,h4,h5,h6")', |
|
| 10 | - 'hideTitle' => 'Boolean', |
|
| 11 | - 'showBlockbyClass' => 'Boolean', |
|
| 12 | - 'Description' => 'Varchar(128)', |
|
| 13 | - 'MemberVisibility' => 'Varchar(255)', |
|
| 14 | - 'shownInClass' => 'Text', |
|
| 15 | - 'addMarginTop' => 'Boolean', |
|
| 16 | - 'addMarginBottom' => 'Boolean' |
|
| 17 | - ); |
|
| 18 | - |
|
| 19 | - protected static $many_many = array ( |
|
| 20 | - 'Pages' => 'Page' |
|
| 21 | - ); |
|
| 22 | - |
|
| 23 | - protected static $default_sort = array( |
|
| 24 | - 'SortOrder' => 'ASC', |
|
| 25 | - 'ID' => 'DESC' |
|
| 26 | - ); |
|
| 27 | - |
|
| 28 | - protected static $create_table_options = array( |
|
| 29 | - 'MySQLDatabase' => 'ENGINE=MyISAM' |
|
| 6 | + protected static $db = array ( |
|
| 7 | + 'SortOrder' => 'Int', |
|
| 8 | + 'Title' => 'Varchar(64)', |
|
| 9 | + 'TitleWrapper' => 'Enum("h2,h3,h4,h5,h6")', |
|
| 10 | + 'hideTitle' => 'Boolean', |
|
| 11 | + 'showBlockbyClass' => 'Boolean', |
|
| 12 | + 'Description' => 'Varchar(128)', |
|
| 13 | + 'MemberVisibility' => 'Varchar(255)', |
|
| 14 | + 'shownInClass' => 'Text', |
|
| 15 | + 'addMarginTop' => 'Boolean', |
|
| 16 | + 'addMarginBottom' => 'Boolean' |
|
| 30 | 17 | ); |
| 31 | 18 | |
| 32 | - protected static $extensions = array ( |
|
| 33 | - 'StandardPermissions' |
|
| 34 | - ); |
|
| 35 | - |
|
| 36 | - protected static $summary_fields = array( |
|
| 37 | - 'BlockType', |
|
| 38 | - 'Title', |
|
| 39 | - 'Description', |
|
| 40 | - 'shownOn', |
|
| 41 | - 'VisibleTo', |
|
| 42 | - 'Published' |
|
| 43 | - ); |
|
| 44 | - |
|
| 45 | - protected static $field_labels = array( |
|
| 46 | - 'BlockType' => 'Block type', |
|
| 47 | - 'shownOn' => 'is shown on', |
|
| 48 | - 'VisibleTo' => 'Visible to' |
|
| 49 | - ); |
|
| 50 | - |
|
| 51 | - public function VisibleTo() { |
|
| 52 | - if (strlen(trim($this->MemberVisibility)) > 0) { |
|
| 53 | - $lists = 'Group: ' . str_replace(',','<br />Group: ', $this->MemberVisibility); |
|
| 54 | - }else{ |
|
| 55 | - $lists = '<em><All></em>'; |
|
| 56 | - } |
|
| 57 | - |
|
| 58 | - return new LiteralField('VisibleTo',$lists); |
|
| 59 | - } |
|
| 60 | - |
|
| 61 | - public function BlockType() { |
|
| 62 | - return $this->singular_name(); |
|
| 63 | - } |
|
| 64 | - |
|
| 65 | - public function shownOn() { |
|
| 66 | - if ($this->showBlockbyClass) { |
|
| 67 | - if (strlen(trim($this->shownInClass)) > 0) { |
|
| 68 | - $lists = 'Type: ' . str_replace(',','<br />Type: ', $this->shownInClass); |
|
| 69 | - }else{ |
|
| 70 | - $lists = '<em><not assigned></em>'; |
|
| 71 | - } |
|
| 72 | - }else{ |
|
| 73 | - if ($this->Pages()->count() > 0) { |
|
| 74 | - $lists = 'Page: ' . implode('<br />Page: ', $this->Pages()->column('Title')); |
|
| 75 | - }else{ |
|
| 76 | - $lists = '<em><not assigned></em>'; |
|
| 77 | - } |
|
| 78 | - } |
|
| 79 | - return new LiteralField('shownOn',$lists); |
|
| 80 | - } |
|
| 81 | - |
|
| 82 | - public function getCMSFields() { |
|
| 83 | - $fields = parent::getCMSFields(); |
|
| 84 | - $fields->removeFieldFromTab('Root', 'Pages'); |
|
| 85 | - $fields->removeFieldsFromTab('Root.Main', array( |
|
| 86 | - 'SortOrder', |
|
| 87 | - 'showBlockbyClass', |
|
| 88 | - 'shownInClass', |
|
| 89 | - 'MemberVisibility' |
|
| 90 | - )); |
|
| 91 | - |
|
| 92 | - $fields->addFieldToTab('Root.Main', LiteralField::create('Status', 'Status: ' . $this->Published()), 'Title'); |
|
| 93 | - |
|
| 94 | - $memberGroups = Group::get(); |
|
| 95 | - $sourcemap = $memberGroups->map('Code', 'Title'); |
|
| 96 | - $source = array( |
|
| 97 | - 'anonymous' => 'Anonymous visitors' |
|
| 98 | - ); |
|
| 99 | - foreach ($sourcemap as $mapping => $key) { |
|
| 100 | - $source[$mapping] = $key; |
|
| 101 | - } |
|
| 102 | - |
|
| 103 | - $memberVisibility = new CheckboxSetField( |
|
| 104 | - $name = "MemberVisibility", |
|
| 105 | - $title = "Show block for specific groups", |
|
| 106 | - $source |
|
| 107 | - ); |
|
| 108 | - |
|
| 109 | - $memberVisibility->setDescription('Show this block only for the selected group(s). If you select no groups, the block will be visible to all members.'); |
|
| 110 | - |
|
| 111 | - $availabelClasses = $this->availableClasses(); |
|
| 112 | - $inClass = new CheckboxSetField( |
|
| 113 | - $name = "shownInClass", |
|
| 114 | - $title = "Show block for specific content types", |
|
| 115 | - $availabelClasses |
|
| 116 | - ); |
|
| 117 | - |
|
| 118 | - $filterSelector = OptionsetField::create( |
|
| 119 | - 'showBlockbyClass', |
|
| 120 | - 'Choose filter set', |
|
| 121 | - array( |
|
| 122 | - '0' => 'by page', |
|
| 123 | - '1' => 'by page/data type' |
|
| 124 | - ) |
|
| 125 | - )->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>'); |
|
| 126 | - |
|
| 127 | - $availablePages = Page::get()->exclude('ClassName', array( |
|
| 128 | - 'ErrorPage', |
|
| 129 | - 'RedirectorPage', |
|
| 130 | - 'VirtualPage' |
|
| 131 | - )); |
|
| 132 | - $pageSelector = new CheckboxSetField( |
|
| 133 | - $name = "Pages", |
|
| 134 | - $title = "Show on Page(s)", |
|
| 135 | - $availablePages->map('ID','Title') |
|
| 136 | - ); |
|
| 137 | - |
|
| 138 | - |
|
| 139 | - if ($this->canConfigPageAndType(Member::currentUser())) { |
|
| 140 | - $fields->addFieldsToTab('Root.VisibilitySettings', array( |
|
| 141 | - $filterSelector, |
|
| 142 | - $pageSelector, |
|
| 143 | - $inClass |
|
| 144 | - )); |
|
| 145 | - } |
|
| 146 | - |
|
| 147 | - if ($this->canConfigMemberVisibility(Member::currentUser())) { |
|
| 148 | - $fields->addFieldToTab('Root.VisibilitySettings', $memberVisibility); |
|
| 149 | - } |
|
| 150 | - |
|
| 151 | - if (!$fields->fieldByName('Options')) { |
|
| 152 | - $fields->insertBefore($right = RightSidebar::create('Options'), 'Root'); |
|
| 153 | - } |
|
| 154 | - |
|
| 155 | - $fields->addFieldsToTab('Options', array( |
|
| 156 | - CheckboxField::create('addMarginTop', 'add "margin-top" class to block wrapper'), |
|
| 157 | - CheckboxField::create('addMarginBottom', 'add "margin-bottom" class to block wrapper') |
|
| 158 | - )); |
|
| 159 | - |
|
| 160 | - return $fields; |
|
| 161 | - } |
|
| 19 | + protected static $many_many = array ( |
|
| 20 | + 'Pages' => 'Page' |
|
| 21 | + ); |
|
| 162 | 22 | |
| 163 | - public function doPublish() { |
|
| 164 | - $this->writeToStage('Live'); |
|
| 165 | - } |
|
| 166 | - |
|
| 167 | - public function onBeforeWrite() { |
|
| 168 | - parent::onBeforeWrite(); |
|
| 169 | - if (empty($this->byPass)) { |
|
| 170 | - $this->readmode = Versioned::get_reading_mode(); |
|
| 171 | - Versioned::set_reading_mode('Stage.Stage'); |
|
| 172 | - } |
|
| 173 | - } |
|
| 174 | - |
|
| 175 | - public function onAfterWrite() { |
|
| 176 | - parent::onAfterWrite(); |
|
| 177 | - if (isset($this->readmode)) { |
|
| 178 | - Versioned::set_reading_mode('Stage.' . $this->readmode); |
|
| 179 | - } |
|
| 180 | - } |
|
| 181 | - |
|
| 182 | - public function availableClasses() { |
|
| 183 | - $Classes = array_diff( |
|
| 184 | - ClassInfo::subclassesFor('Page'), |
|
| 185 | - ClassInfo::subclassesFor('RedirectorPage'), |
|
| 186 | - ClassInfo::subclassesFor('VirtualPage') |
|
| 187 | - ); |
|
| 188 | - return $Classes; |
|
| 189 | - } |
|
| 190 | - |
|
| 191 | - public function forTemplate() { |
|
| 192 | - if ($this->canDisplayMemberCheck()) { |
|
| 193 | - return $this->renderWith(array($this->getClassName(), 'BaseBlock')); |
|
| 194 | - } |
|
| 195 | - |
|
| 196 | - return false; |
|
| 197 | - } |
|
| 198 | - |
|
| 199 | - public function canDisplayMemberCheck() { |
|
| 200 | - $rawVisibility = $this->MemberVisibility; |
|
| 201 | - |
|
| 202 | - if (empty($rawVisibility)) { |
|
| 203 | - return true; |
|
| 204 | - } |
|
| 205 | - |
|
| 206 | - $visibility = explode(',', $rawVisibility); |
|
| 207 | - $member = Member::currentUser(); |
|
| 208 | - |
|
| 209 | - if (!$member && in_array('anonymous', $visibility)) { |
|
| 210 | - return true; |
|
| 211 | - } |
|
| 212 | - |
|
| 213 | - if ($member) { |
|
| 214 | - $memberGroups = $member->Groups()->column('Code'); |
|
| 215 | - foreach ($memberGroups as $memberGroup) { |
|
| 216 | - if (in_array($memberGroup, $visibility)) { |
|
| 217 | - return true; |
|
| 218 | - } |
|
| 219 | - } |
|
| 220 | - } |
|
| 221 | - |
|
| 222 | - return false; |
|
| 223 | - } |
|
| 224 | - |
|
| 225 | - public function frontendEditable() { |
|
| 226 | - $member = Member::currentUser(); |
|
| 227 | - return $this->canEdit($member); |
|
| 228 | - } |
|
| 229 | - |
|
| 230 | - public function Type2Class() { |
|
| 231 | - return strtolower(str_replace(' ', '-', $this->singular_name())); |
|
| 232 | - } |
|
| 233 | - |
|
| 234 | - /*public function doPublish() { |
|
| 23 | + protected static $default_sort = array( |
|
| 24 | + 'SortOrder' => 'ASC', |
|
| 25 | + 'ID' => 'DESC' |
|
| 26 | + ); |
|
| 27 | + |
|
| 28 | + protected static $create_table_options = array( |
|
| 29 | + 'MySQLDatabase' => 'ENGINE=MyISAM' |
|
| 30 | + ); |
|
| 31 | + |
|
| 32 | + protected static $extensions = array ( |
|
| 33 | + 'StandardPermissions' |
|
| 34 | + ); |
|
| 35 | + |
|
| 36 | + protected static $summary_fields = array( |
|
| 37 | + 'BlockType', |
|
| 38 | + 'Title', |
|
| 39 | + 'Description', |
|
| 40 | + 'shownOn', |
|
| 41 | + 'VisibleTo', |
|
| 42 | + 'Published' |
|
| 43 | + ); |
|
| 44 | + |
|
| 45 | + protected static $field_labels = array( |
|
| 46 | + 'BlockType' => 'Block type', |
|
| 47 | + 'shownOn' => 'is shown on', |
|
| 48 | + 'VisibleTo' => 'Visible to' |
|
| 49 | + ); |
|
| 50 | + |
|
| 51 | + public function VisibleTo() { |
|
| 52 | + if (strlen(trim($this->MemberVisibility)) > 0) { |
|
| 53 | + $lists = 'Group: ' . str_replace(',','<br />Group: ', $this->MemberVisibility); |
|
| 54 | + }else{ |
|
| 55 | + $lists = '<em><All></em>'; |
|
| 56 | + } |
|
| 57 | + |
|
| 58 | + return new LiteralField('VisibleTo',$lists); |
|
| 59 | + } |
|
| 60 | + |
|
| 61 | + public function BlockType() { |
|
| 62 | + return $this->singular_name(); |
|
| 63 | + } |
|
| 64 | + |
|
| 65 | + public function shownOn() { |
|
| 66 | + if ($this->showBlockbyClass) { |
|
| 67 | + if (strlen(trim($this->shownInClass)) > 0) { |
|
| 68 | + $lists = 'Type: ' . str_replace(',','<br />Type: ', $this->shownInClass); |
|
| 69 | + }else{ |
|
| 70 | + $lists = '<em><not assigned></em>'; |
|
| 71 | + } |
|
| 72 | + }else{ |
|
| 73 | + if ($this->Pages()->count() > 0) { |
|
| 74 | + $lists = 'Page: ' . implode('<br />Page: ', $this->Pages()->column('Title')); |
|
| 75 | + }else{ |
|
| 76 | + $lists = '<em><not assigned></em>'; |
|
| 77 | + } |
|
| 78 | + } |
|
| 79 | + return new LiteralField('shownOn',$lists); |
|
| 80 | + } |
|
| 81 | + |
|
| 82 | + public function getCMSFields() { |
|
| 83 | + $fields = parent::getCMSFields(); |
|
| 84 | + $fields->removeFieldFromTab('Root', 'Pages'); |
|
| 85 | + $fields->removeFieldsFromTab('Root.Main', array( |
|
| 86 | + 'SortOrder', |
|
| 87 | + 'showBlockbyClass', |
|
| 88 | + 'shownInClass', |
|
| 89 | + 'MemberVisibility' |
|
| 90 | + )); |
|
| 91 | + |
|
| 92 | + $fields->addFieldToTab('Root.Main', LiteralField::create('Status', 'Status: ' . $this->Published()), 'Title'); |
|
| 93 | + |
|
| 94 | + $memberGroups = Group::get(); |
|
| 95 | + $sourcemap = $memberGroups->map('Code', 'Title'); |
|
| 96 | + $source = array( |
|
| 97 | + 'anonymous' => 'Anonymous visitors' |
|
| 98 | + ); |
|
| 99 | + foreach ($sourcemap as $mapping => $key) { |
|
| 100 | + $source[$mapping] = $key; |
|
| 101 | + } |
|
| 102 | + |
|
| 103 | + $memberVisibility = new CheckboxSetField( |
|
| 104 | + $name = "MemberVisibility", |
|
| 105 | + $title = "Show block for specific groups", |
|
| 106 | + $source |
|
| 107 | + ); |
|
| 108 | + |
|
| 109 | + $memberVisibility->setDescription('Show this block only for the selected group(s). If you select no groups, the block will be visible to all members.'); |
|
| 110 | + |
|
| 111 | + $availabelClasses = $this->availableClasses(); |
|
| 112 | + $inClass = new CheckboxSetField( |
|
| 113 | + $name = "shownInClass", |
|
| 114 | + $title = "Show block for specific content types", |
|
| 115 | + $availabelClasses |
|
| 116 | + ); |
|
| 117 | + |
|
| 118 | + $filterSelector = OptionsetField::create( |
|
| 119 | + 'showBlockbyClass', |
|
| 120 | + 'Choose filter set', |
|
| 121 | + array( |
|
| 122 | + '0' => 'by page', |
|
| 123 | + '1' => 'by page/data type' |
|
| 124 | + ) |
|
| 125 | + )->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>'); |
|
| 126 | + |
|
| 127 | + $availablePages = Page::get()->exclude('ClassName', array( |
|
| 128 | + 'ErrorPage', |
|
| 129 | + 'RedirectorPage', |
|
| 130 | + 'VirtualPage' |
|
| 131 | + )); |
|
| 132 | + $pageSelector = new CheckboxSetField( |
|
| 133 | + $name = "Pages", |
|
| 134 | + $title = "Show on Page(s)", |
|
| 135 | + $availablePages->map('ID','Title') |
|
| 136 | + ); |
|
| 137 | + |
|
| 138 | + |
|
| 139 | + if ($this->canConfigPageAndType(Member::currentUser())) { |
|
| 140 | + $fields->addFieldsToTab('Root.VisibilitySettings', array( |
|
| 141 | + $filterSelector, |
|
| 142 | + $pageSelector, |
|
| 143 | + $inClass |
|
| 144 | + )); |
|
| 145 | + } |
|
| 146 | + |
|
| 147 | + if ($this->canConfigMemberVisibility(Member::currentUser())) { |
|
| 148 | + $fields->addFieldToTab('Root.VisibilitySettings', $memberVisibility); |
|
| 149 | + } |
|
| 150 | + |
|
| 151 | + if (!$fields->fieldByName('Options')) { |
|
| 152 | + $fields->insertBefore($right = RightSidebar::create('Options'), 'Root'); |
|
| 153 | + } |
|
| 154 | + |
|
| 155 | + $fields->addFieldsToTab('Options', array( |
|
| 156 | + CheckboxField::create('addMarginTop', 'add "margin-top" class to block wrapper'), |
|
| 157 | + CheckboxField::create('addMarginBottom', 'add "margin-bottom" class to block wrapper') |
|
| 158 | + )); |
|
| 159 | + |
|
| 160 | + return $fields; |
|
| 161 | + } |
|
| 162 | + |
|
| 163 | + public function doPublish() { |
|
| 164 | + $this->writeToStage('Live'); |
|
| 165 | + } |
|
| 166 | + |
|
| 167 | + public function onBeforeWrite() { |
|
| 168 | + parent::onBeforeWrite(); |
|
| 169 | + if (empty($this->byPass)) { |
|
| 170 | + $this->readmode = Versioned::get_reading_mode(); |
|
| 171 | + Versioned::set_reading_mode('Stage.Stage'); |
|
| 172 | + } |
|
| 173 | + } |
|
| 174 | + |
|
| 175 | + public function onAfterWrite() { |
|
| 176 | + parent::onAfterWrite(); |
|
| 177 | + if (isset($this->readmode)) { |
|
| 178 | + Versioned::set_reading_mode('Stage.' . $this->readmode); |
|
| 179 | + } |
|
| 180 | + } |
|
| 181 | + |
|
| 182 | + public function availableClasses() { |
|
| 183 | + $Classes = array_diff( |
|
| 184 | + ClassInfo::subclassesFor('Page'), |
|
| 185 | + ClassInfo::subclassesFor('RedirectorPage'), |
|
| 186 | + ClassInfo::subclassesFor('VirtualPage') |
|
| 187 | + ); |
|
| 188 | + return $Classes; |
|
| 189 | + } |
|
| 190 | + |
|
| 191 | + public function forTemplate() { |
|
| 192 | + if ($this->canDisplayMemberCheck()) { |
|
| 193 | + return $this->renderWith(array($this->getClassName(), 'BaseBlock')); |
|
| 194 | + } |
|
| 195 | + |
|
| 196 | + return false; |
|
| 197 | + } |
|
| 198 | + |
|
| 199 | + public function canDisplayMemberCheck() { |
|
| 200 | + $rawVisibility = $this->MemberVisibility; |
|
| 201 | + |
|
| 202 | + if (empty($rawVisibility)) { |
|
| 203 | + return true; |
|
| 204 | + } |
|
| 205 | + |
|
| 206 | + $visibility = explode(',', $rawVisibility); |
|
| 207 | + $member = Member::currentUser(); |
|
| 208 | + |
|
| 209 | + if (!$member && in_array('anonymous', $visibility)) { |
|
| 210 | + return true; |
|
| 211 | + } |
|
| 212 | + |
|
| 213 | + if ($member) { |
|
| 214 | + $memberGroups = $member->Groups()->column('Code'); |
|
| 215 | + foreach ($memberGroups as $memberGroup) { |
|
| 216 | + if (in_array($memberGroup, $visibility)) { |
|
| 217 | + return true; |
|
| 218 | + } |
|
| 219 | + } |
|
| 220 | + } |
|
| 221 | + |
|
| 222 | + return false; |
|
| 223 | + } |
|
| 224 | + |
|
| 225 | + public function frontendEditable() { |
|
| 226 | + $member = Member::currentUser(); |
|
| 227 | + return $this->canEdit($member); |
|
| 228 | + } |
|
| 229 | + |
|
| 230 | + public function Type2Class() { |
|
| 231 | + return strtolower(str_replace(' ', '-', $this->singular_name())); |
|
| 232 | + } |
|
| 233 | + |
|
| 234 | + /*public function doPublish() { |
|
| 235 | 235 | $this->writeToStage('Live'); |
| 236 | 236 | }*/ |
| 237 | 237 | |
| 238 | - public function Published() { |
|
| 239 | - return $this->isPublished() ? 'Yes' : 'No'; |
|
| 240 | - } |
|
| 238 | + public function Published() { |
|
| 239 | + return $this->isPublished() ? 'Yes' : 'No'; |
|
| 240 | + } |
|
| 241 | 241 | |
| 242 | - public function isPublished() { |
|
| 243 | - if (!empty(Versioned::get_by_stage('Block', 'Live')->byID($this->ID))) { |
|
| 244 | - return true; |
|
| 245 | - } |
|
| 242 | + public function isPublished() { |
|
| 243 | + if (!empty(Versioned::get_by_stage('Block', 'Live')->byID($this->ID))) { |
|
| 244 | + return true; |
|
| 245 | + } |
|
| 246 | 246 | |
| 247 | - return false; |
|
| 248 | - } |
|
| 247 | + return false; |
|
| 248 | + } |
|
| 249 | 249 | |
| 250 | 250 | } |
| 251 | 251 | \ No newline at end of file |
@@ -3,7 +3,7 @@ discard block |
||
| 3 | 3 | use SaltedHerring\Debugger as Debugger; |
| 4 | 4 | |
| 5 | 5 | class Block extends DataObject { |
| 6 | - protected static $db = array ( |
|
| 6 | + protected static $db = array( |
|
| 7 | 7 | 'SortOrder' => 'Int', |
| 8 | 8 | 'Title' => 'Varchar(64)', |
| 9 | 9 | 'TitleWrapper' => 'Enum("h2,h3,h4,h5,h6")', |
@@ -16,7 +16,7 @@ discard block |
||
| 16 | 16 | 'addMarginBottom' => 'Boolean' |
| 17 | 17 | ); |
| 18 | 18 | |
| 19 | - protected static $many_many = array ( |
|
| 19 | + protected static $many_many = array( |
|
| 20 | 20 | 'Pages' => 'Page' |
| 21 | 21 | ); |
| 22 | 22 | |
@@ -29,7 +29,7 @@ discard block |
||
| 29 | 29 | 'MySQLDatabase' => 'ENGINE=MyISAM' |
| 30 | 30 | ); |
| 31 | 31 | |
| 32 | - protected static $extensions = array ( |
|
| 32 | + protected static $extensions = array( |
|
| 33 | 33 | 'StandardPermissions' |
| 34 | 34 | ); |
| 35 | 35 | |
@@ -50,12 +50,12 @@ discard block |
||
| 50 | 50 | |
| 51 | 51 | public function VisibleTo() { |
| 52 | 52 | if (strlen(trim($this->MemberVisibility)) > 0) { |
| 53 | - $lists = 'Group: ' . str_replace(',','<br />Group: ', $this->MemberVisibility); |
|
| 54 | - }else{ |
|
| 53 | + $lists = 'Group: '.str_replace(',', '<br />Group: ', $this->MemberVisibility); |
|
| 54 | + } else { |
|
| 55 | 55 | $lists = '<em><All></em>'; |
| 56 | 56 | } |
| 57 | 57 | |
| 58 | - return new LiteralField('VisibleTo',$lists); |
|
| 58 | + return new LiteralField('VisibleTo', $lists); |
|
| 59 | 59 | } |
| 60 | 60 | |
| 61 | 61 | public function BlockType() { |
@@ -65,18 +65,18 @@ discard block |
||
| 65 | 65 | public function shownOn() { |
| 66 | 66 | if ($this->showBlockbyClass) { |
| 67 | 67 | if (strlen(trim($this->shownInClass)) > 0) { |
| 68 | - $lists = 'Type: ' . str_replace(',','<br />Type: ', $this->shownInClass); |
|
| 69 | - }else{ |
|
| 68 | + $lists = 'Type: '.str_replace(',', '<br />Type: ', $this->shownInClass); |
|
| 69 | + } else { |
|
| 70 | 70 | $lists = '<em><not assigned></em>'; |
| 71 | 71 | } |
| 72 | - }else{ |
|
| 72 | + } else { |
|
| 73 | 73 | if ($this->Pages()->count() > 0) { |
| 74 | - $lists = 'Page: ' . implode('<br />Page: ', $this->Pages()->column('Title')); |
|
| 75 | - }else{ |
|
| 74 | + $lists = 'Page: '.implode('<br />Page: ', $this->Pages()->column('Title')); |
|
| 75 | + } else { |
|
| 76 | 76 | $lists = '<em><not assigned></em>'; |
| 77 | 77 | } |
| 78 | 78 | } |
| 79 | - return new LiteralField('shownOn',$lists); |
|
| 79 | + return new LiteralField('shownOn', $lists); |
|
| 80 | 80 | } |
| 81 | 81 | |
| 82 | 82 | public function getCMSFields() { |
@@ -89,7 +89,7 @@ discard block |
||
| 89 | 89 | 'MemberVisibility' |
| 90 | 90 | )); |
| 91 | 91 | |
| 92 | - $fields->addFieldToTab('Root.Main', LiteralField::create('Status', 'Status: ' . $this->Published()), 'Title'); |
|
| 92 | + $fields->addFieldToTab('Root.Main', LiteralField::create('Status', 'Status: '.$this->Published()), 'Title'); |
|
| 93 | 93 | |
| 94 | 94 | $memberGroups = Group::get(); |
| 95 | 95 | $sourcemap = $memberGroups->map('Code', 'Title'); |
@@ -132,7 +132,7 @@ discard block |
||
| 132 | 132 | $pageSelector = new CheckboxSetField( |
| 133 | 133 | $name = "Pages", |
| 134 | 134 | $title = "Show on Page(s)", |
| 135 | - $availablePages->map('ID','Title') |
|
| 135 | + $availablePages->map('ID', 'Title') |
|
| 136 | 136 | ); |
| 137 | 137 | |
| 138 | 138 | |
@@ -175,7 +175,7 @@ discard block |
||
| 175 | 175 | public function onAfterWrite() { |
| 176 | 176 | parent::onAfterWrite(); |
| 177 | 177 | if (isset($this->readmode)) { |
| 178 | - Versioned::set_reading_mode('Stage.' . $this->readmode); |
|
| 178 | + Versioned::set_reading_mode('Stage.'.$this->readmode); |
|
| 179 | 179 | } |
| 180 | 180 | } |
| 181 | 181 | |
@@ -1,7 +1,5 @@ |
||
| 1 | 1 | <?php |
| 2 | 2 | |
| 3 | -use SaltedHerring\Debugger as Debugger; |
|
| 4 | - |
|
| 5 | 3 | class VersionedForm extends GridFieldDetailForm { |
| 6 | 4 | |
| 7 | 5 | } |
@@ -7,47 +7,47 @@ |
||
| 7 | 7 | } |
| 8 | 8 | |
| 9 | 9 | class VersionedForm_ItemRequest extends GridFieldDetailForm_ItemRequest { |
| 10 | - private static $allowed_actions = array( |
|
| 11 | - 'edit', |
|
| 12 | - 'view', |
|
| 13 | - 'ItemEditForm', |
|
| 14 | - 'doPublish', |
|
| 15 | - 'doUnpublish' |
|
| 16 | - ); |
|
| 10 | + private static $allowed_actions = array( |
|
| 11 | + 'edit', |
|
| 12 | + 'view', |
|
| 13 | + 'ItemEditForm', |
|
| 14 | + 'doPublish', |
|
| 15 | + 'doUnpublish' |
|
| 16 | + ); |
|
| 17 | 17 | |
| 18 | - public function ItemEditForm() { |
|
| 19 | - $form = parent::ItemEditForm(); |
|
| 20 | - if ($form instanceof Form) { |
|
| 21 | - $actions = $form->Actions(); |
|
| 22 | - $record = $this->record; |
|
| 23 | - $actions->insertBefore('action_doDelete', $btnPublish = FormAction::create('doPublish','Save & Publish')); |
|
| 24 | - $btnPublish->addExtraClass('ss-ui-action-constructive'); |
|
| 25 | - if (!empty($record->ID)) { |
|
| 26 | - if ($record->isPublished()) { |
|
| 27 | - $actions->removeByName('action_doDelete'); |
|
| 28 | - $actions->push(FormAction::create('doUnpublish', 'Unpublish')->addExtraClass('ss-ui-action-destructive')); |
|
| 29 | - } |
|
| 30 | - } |
|
| 18 | + public function ItemEditForm() { |
|
| 19 | + $form = parent::ItemEditForm(); |
|
| 20 | + if ($form instanceof Form) { |
|
| 21 | + $actions = $form->Actions(); |
|
| 22 | + $record = $this->record; |
|
| 23 | + $actions->insertBefore('action_doDelete', $btnPublish = FormAction::create('doPublish','Save & Publish')); |
|
| 24 | + $btnPublish->addExtraClass('ss-ui-action-constructive'); |
|
| 25 | + if (!empty($record->ID)) { |
|
| 26 | + if ($record->isPublished()) { |
|
| 27 | + $actions->removeByName('action_doDelete'); |
|
| 28 | + $actions->push(FormAction::create('doUnpublish', 'Unpublish')->addExtraClass('ss-ui-action-destructive')); |
|
| 29 | + } |
|
| 30 | + } |
|
| 31 | 31 | |
| 32 | - $form->setActions($actions); |
|
| 33 | - } |
|
| 34 | - return $form; |
|
| 35 | - } |
|
| 32 | + $form->setActions($actions); |
|
| 33 | + } |
|
| 34 | + return $form; |
|
| 35 | + } |
|
| 36 | 36 | |
| 37 | - public function doUnpublish($data, $form) { |
|
| 38 | - $this->record->deleteFromStage('Live'); |
|
| 39 | - $controller = Controller::curr(); |
|
| 40 | - $form->sessionMessage('Block unpublished', 'good', false); |
|
| 41 | - return $this->edit($controller->getRequest()); |
|
| 42 | - } |
|
| 37 | + public function doUnpublish($data, $form) { |
|
| 38 | + $this->record->deleteFromStage('Live'); |
|
| 39 | + $controller = Controller::curr(); |
|
| 40 | + $form->sessionMessage('Block unpublished', 'good', false); |
|
| 41 | + return $this->edit($controller->getRequest()); |
|
| 42 | + } |
|
| 43 | 43 | |
| 44 | - public function doPublish($data, $form) { |
|
| 45 | - $form->saveInto($this->record); |
|
| 46 | - $this->record->write(); |
|
| 47 | - $this->record->byPass = true; |
|
| 48 | - $this->record->doPublish(); |
|
| 49 | - $form->sessionMessage('Block published', 'good', false); |
|
| 50 | - $controller = Controller::curr(); |
|
| 51 | - return $this->edit($controller->getRequest()); |
|
| 52 | - } |
|
| 44 | + public function doPublish($data, $form) { |
|
| 45 | + $form->saveInto($this->record); |
|
| 46 | + $this->record->write(); |
|
| 47 | + $this->record->byPass = true; |
|
| 48 | + $this->record->doPublish(); |
|
| 49 | + $form->sessionMessage('Block published', 'good', false); |
|
| 50 | + $controller = Controller::curr(); |
|
| 51 | + return $this->edit($controller->getRequest()); |
|
| 52 | + } |
|
| 53 | 53 | } |
| 54 | 54 | \ No newline at end of file |
@@ -20,7 +20,7 @@ |
||
| 20 | 20 | if ($form instanceof Form) { |
| 21 | 21 | $actions = $form->Actions(); |
| 22 | 22 | $record = $this->record; |
| 23 | - $actions->insertBefore('action_doDelete', $btnPublish = FormAction::create('doPublish','Save & Publish')); |
|
| 23 | + $actions->insertBefore('action_doDelete', $btnPublish = FormAction::create('doPublish', 'Save & Publish')); |
|
| 24 | 24 | $btnPublish->addExtraClass('ss-ui-action-constructive'); |
| 25 | 25 | if (!empty($record->ID)) { |
| 26 | 26 | if ($record->isPublished()) { |
@@ -1,4 +1,4 @@ |
||
| 1 | -<?php use SaltedHerring\Debugger as Debugger; |
|
| 1 | +<?php |
|
| 2 | 2 | /** |
| 3 | 3 | * @file BlocksAdmin.php |
| 4 | 4 | * |
@@ -5,60 +5,60 @@ |
||
| 5 | 5 | * Left-hand-side tab : Admin Blocks |
| 6 | 6 | * */ |
| 7 | 7 | class BlocksAdmin extends ModelAdmin { |
| 8 | - private static $managed_models = array('Block'); |
|
| 9 | - private static $url_segment = 'blocks'; |
|
| 10 | - private static $menu_title = 'Blocks'; |
|
| 11 | - private static $menu_priority = 10; |
|
| 12 | - private static $menu_icon = 'silverstripe-block/images/icon-block.png'; |
|
| 8 | + private static $managed_models = array('Block'); |
|
| 9 | + private static $url_segment = 'blocks'; |
|
| 10 | + private static $menu_title = 'Blocks'; |
|
| 11 | + private static $menu_priority = 10; |
|
| 12 | + private static $menu_icon = 'silverstripe-block/images/icon-block.png'; |
|
| 13 | 13 | |
| 14 | - public function getEditForm($id = null, $fields = null) { |
|
| 15 | - $form = parent::getEditForm($id, $fields); |
|
| 14 | + public function getEditForm($id = null, $fields = null) { |
|
| 15 | + $form = parent::getEditForm($id, $fields); |
|
| 16 | 16 | |
| 17 | - $grid = $form->Fields()->fieldByName($this->sanitiseClassName($this->modelClass)); |
|
| 17 | + $grid = $form->Fields()->fieldByName($this->sanitiseClassName($this->modelClass)); |
|
| 18 | 18 | |
| 19 | - $grid->getConfig() |
|
| 20 | - ->removeComponentsByType('GridFieldPaginator') |
|
| 21 | - ->removeComponentsByType('GridFieldAddNewButton') |
|
| 22 | - ->removeComponentsByType('GridFieldPrintButton') |
|
| 23 | - ->removeComponentsByType('GridFieldExportButton') |
|
| 24 | - ->removeComponentsByType('GridFieldDetailForm') |
|
| 25 | - ->addComponents( |
|
| 26 | - new VersionedForm(), |
|
| 27 | - new GridFieldPaginatorWithShowAll(30), |
|
| 28 | - $multiClass = new MultiClassSelector(), |
|
| 29 | - $sortable = new GridFieldOrderableRows('SortOrder') |
|
| 30 | - ); |
|
| 19 | + $grid->getConfig() |
|
| 20 | + ->removeComponentsByType('GridFieldPaginator') |
|
| 21 | + ->removeComponentsByType('GridFieldAddNewButton') |
|
| 22 | + ->removeComponentsByType('GridFieldPrintButton') |
|
| 23 | + ->removeComponentsByType('GridFieldExportButton') |
|
| 24 | + ->removeComponentsByType('GridFieldDetailForm') |
|
| 25 | + ->addComponents( |
|
| 26 | + new VersionedForm(), |
|
| 27 | + new GridFieldPaginatorWithShowAll(30), |
|
| 28 | + $multiClass = new MultiClassSelector(), |
|
| 29 | + $sortable = new GridFieldOrderableRows('SortOrder') |
|
| 30 | + ); |
|
| 31 | 31 | |
| 32 | - $subBlocks = self::getAvaiableTypes(); |
|
| 33 | - $multiClass->setClasses($subBlocks); |
|
| 34 | - $grid->setTitle('All Blcoks'); |
|
| 35 | - return $form; |
|
| 36 | - } |
|
| 32 | + $subBlocks = self::getAvaiableTypes(); |
|
| 33 | + $multiClass->setClasses($subBlocks); |
|
| 34 | + $grid->setTitle('All Blcoks'); |
|
| 35 | + return $form; |
|
| 36 | + } |
|
| 37 | 37 | |
| 38 | - public function getList() { |
|
| 39 | - $list = Versioned::get_by_stage('Block', 'Stage'); |
|
| 38 | + public function getList() { |
|
| 39 | + $list = Versioned::get_by_stage('Block', 'Stage'); |
|
| 40 | 40 | |
| 41 | - return $list; |
|
| 41 | + return $list; |
|
| 42 | 42 | } |
| 43 | 43 | |
| 44 | - public static function getAvaiableTypes() { |
|
| 45 | - $subBlocks = ClassInfo::subclassesFor('Block'); |
|
| 46 | - if (is_null($subBlocks)) { |
|
| 47 | - $subBlocks = array('Block'); |
|
| 48 | - }else{ |
|
| 49 | - $disabledTypes = Config::inst()->get('Block','DisabledBlocks'); |
|
| 50 | - if (!empty($disabledTypes)) { |
|
| 51 | - foreach ($disabledTypes as $disabledType) { |
|
| 52 | - unset($subBlocks[$disabledType]); |
|
| 53 | - } |
|
| 54 | - } |
|
| 55 | - foreach ($subBlocks as $key => &$value) { |
|
| 56 | - $value = empty($key::$singular_name) ? ucwords(trim(strtolower(preg_replace('/_?([A-Z])/', ' $1', $value)))) : $key::$singular_name; |
|
| 57 | - } |
|
| 58 | - } |
|
| 44 | + public static function getAvaiableTypes() { |
|
| 45 | + $subBlocks = ClassInfo::subclassesFor('Block'); |
|
| 46 | + if (is_null($subBlocks)) { |
|
| 47 | + $subBlocks = array('Block'); |
|
| 48 | + }else{ |
|
| 49 | + $disabledTypes = Config::inst()->get('Block','DisabledBlocks'); |
|
| 50 | + if (!empty($disabledTypes)) { |
|
| 51 | + foreach ($disabledTypes as $disabledType) { |
|
| 52 | + unset($subBlocks[$disabledType]); |
|
| 53 | + } |
|
| 54 | + } |
|
| 55 | + foreach ($subBlocks as $key => &$value) { |
|
| 56 | + $value = empty($key::$singular_name) ? ucwords(trim(strtolower(preg_replace('/_?([A-Z])/', ' $1', $value)))) : $key::$singular_name; |
|
| 57 | + } |
|
| 58 | + } |
|
| 59 | 59 | |
| 60 | - return $subBlocks; |
|
| 61 | - } |
|
| 60 | + return $subBlocks; |
|
| 61 | + } |
|
| 62 | 62 | |
| 63 | 63 | |
| 64 | 64 | } |