Completed
Pull Request — 2.2 (#187)
by
unknown
09:33 queued 02:02
created
src/Extensions/CwpCommentingExtension.php 1 patch
Indentation   +14 added lines, -14 removed lines patch added patch discarded remove patch
@@ -14,20 +14,20 @@
 block discarded – undo
14 14
  */
15 15
 class CwpCommentingExtension extends Extension
16 16
 {
17
-    public function alterCommentForm(Form $form)
18
-    {
19
-        $fields = $form->Fields();
17
+	public function alterCommentForm(Form $form)
18
+	{
19
+		$fields = $form->Fields();
20 20
 
21
-        if ($emailField = $fields->dataFieldByName('Email')) {
22
-            $emailField
23
-                ->setTitle(_t(__CLASS__ . '.EMAIL_TITLE', 'Email'))
24
-                ->setDescription(_t(__CLASS__ . '.WILL_NOT_BE_PUBLISHED', 'Will not be published.'));
25
-        }
21
+		if ($emailField = $fields->dataFieldByName('Email')) {
22
+			$emailField
23
+				->setTitle(_t(__CLASS__ . '.EMAIL_TITLE', 'Email'))
24
+				->setDescription(_t(__CLASS__ . '.WILL_NOT_BE_PUBLISHED', 'Will not be published.'));
25
+		}
26 26
 
27
-        if ($urlField = $fields->dataFieldByName('URL')) {
28
-            $urlField
29
-                ->setTitle(_t(__CLASS__ . '.WEBSITE_TITLE', 'Your website (optional)'))
30
-                ->setAttribute('placeholder', 'http://');
31
-        }
32
-    }
27
+		if ($urlField = $fields->dataFieldByName('URL')) {
28
+			$urlField
29
+				->setTitle(_t(__CLASS__ . '.WEBSITE_TITLE', 'Your website (optional)'))
30
+				->setAttribute('placeholder', 'http://');
31
+		}
32
+	}
33 33
 }
Please login to merge, or discard this patch.
src/Model/RelatedPageLink.php 1 patch
Indentation   +23 added lines, -23 removed lines patch added patch discarded remove patch
@@ -8,30 +8,30 @@
 block discarded – undo
8 8
 
9 9
 class RelatedPageLink extends DataObject
10 10
 {
11
-    private static $table_name = 'BasePage_RelatedPages';
11
+	private static $table_name = 'BasePage_RelatedPages';
12 12
 
13
-    private static $extensions = [
14
-        Versioned::class,
15
-    ];
13
+	private static $extensions = [
14
+		Versioned::class,
15
+	];
16 16
 
17
-    private static $db = [
18
-        'SortOrder' => 'Int',
19
-    ];
17
+	private static $db = [
18
+		'SortOrder' => 'Int',
19
+	];
20 20
 
21
-    /**
22
-     * For backwards compatibility these must match a traditional 'many_many' definition.
23
-     * This was BasePage.RelatedPages => BasePage
24
-     * ManyMany relations are normally joined by ${DefiningClass}ID && ${RelatedClass}ID
25
-     * excepting in the case where ${DefiningClass} === ${RelatedClass}
26
-     * Then the 'related class' column changes from ${RelatedClass}ID to "ChildID".
27
-     *
28
-     * {@see SilverStripe\ORM\DataObjectSchema->parseManyManyComponent()}
29
-     *
30
-     * @var array
31
-     * @config
32
-     */
33
-    private static $has_one = [
34
-        'BasePage' => BasePage::class,
35
-        'Child' => BasePage::class,
36
-    ];
21
+	/**
22
+	 * For backwards compatibility these must match a traditional 'many_many' definition.
23
+	 * This was BasePage.RelatedPages => BasePage
24
+	 * ManyMany relations are normally joined by ${DefiningClass}ID && ${RelatedClass}ID
25
+	 * excepting in the case where ${DefiningClass} === ${RelatedClass}
26
+	 * Then the 'related class' column changes from ${RelatedClass}ID to "ChildID".
27
+	 *
28
+	 * {@see SilverStripe\ORM\DataObjectSchema->parseManyManyComponent()}
29
+	 *
30
+	 * @var array
31
+	 * @config
32
+	 */
33
+	private static $has_one = [
34
+		'BasePage' => BasePage::class,
35
+		'Child' => BasePage::class,
36
+	];
37 37
 }
Please login to merge, or discard this patch.
src/Extensions/CustomSiteConfig.php 1 patch
Indentation   +49 added lines, -49 removed lines patch added patch discarded remove patch
@@ -12,58 +12,58 @@
 block discarded – undo
12 12
  */
13 13
 class CustomSiteConfig extends DataExtension
14 14
 {
15
-    private static $db = array(
16
-        'GACode' => 'Varchar(16)',
17
-        'FacebookURL' => 'Varchar(256)', // multitude of ways to link to Facebook accounts, best to leave it open.
18
-        'TwitterUsername' => 'Varchar(16)', // max length of Twitter username 15
19
-    );
15
+	private static $db = array(
16
+		'GACode' => 'Varchar(16)',
17
+		'FacebookURL' => 'Varchar(256)', // multitude of ways to link to Facebook accounts, best to leave it open.
18
+		'TwitterUsername' => 'Varchar(16)', // max length of Twitter username 15
19
+	);
20 20
 
21
-    public function updateCMSFields(FieldList $fields)
22
-    {
23
-        $fields->addFieldToTab(
24
-            'Root.Main',
25
-            $gaCode = TextField::create(
26
-                'GACode',
27
-                _t(__CLASS__ . '.GaField', 'Google Analytics account')
28
-            )
29
-        );
21
+	public function updateCMSFields(FieldList $fields)
22
+	{
23
+		$fields->addFieldToTab(
24
+			'Root.Main',
25
+			$gaCode = TextField::create(
26
+				'GACode',
27
+				_t(__CLASS__ . '.GaField', 'Google Analytics account')
28
+			)
29
+		);
30 30
 
31
-        $gaCode->setDescription(
32
-            DBField::create_field('HTMLFragment', _t(
33
-                __CLASS__ . '.GaFieldDesc',
34
-                'Account number to be used all across the site (in the format <strong>UA-XXXXX-X</strong>)'
35
-            ))
36
-        );
31
+		$gaCode->setDescription(
32
+			DBField::create_field('HTMLFragment', _t(
33
+				__CLASS__ . '.GaFieldDesc',
34
+				'Account number to be used all across the site (in the format <strong>UA-XXXXX-X</strong>)'
35
+			))
36
+		);
37 37
 
38
-        $fields->findOrMakeTab('Root.SocialMedia', _t(__CLASS__ . '.SocialMediaTab', 'Social Media'));
38
+		$fields->findOrMakeTab('Root.SocialMedia', _t(__CLASS__ . '.SocialMediaTab', 'Social Media'));
39 39
 
40
-        $fields->addFieldToTab(
41
-            'Root.SocialMedia',
42
-            $facebookURL = TextField::create(
43
-                'FacebookURL',
44
-                _t(__CLASS__ . '.FbField', 'Facebook UID or username')
45
-            )
46
-        );
47
-        $facebookURL->setDescription(
48
-            DBField::create_field('HTMLFragment', _t(
49
-                __CLASS__ . '.FbFieldDesc',
50
-                'Facebook link (everything after the "http://facebook.com/", eg http://facebook.com/'
51
-                . '<strong>username</strong> or http://facebook.com/<strong>pages/108510539573</strong>)'
52
-            ))
53
-        );
40
+		$fields->addFieldToTab(
41
+			'Root.SocialMedia',
42
+			$facebookURL = TextField::create(
43
+				'FacebookURL',
44
+				_t(__CLASS__ . '.FbField', 'Facebook UID or username')
45
+			)
46
+		);
47
+		$facebookURL->setDescription(
48
+			DBField::create_field('HTMLFragment', _t(
49
+				__CLASS__ . '.FbFieldDesc',
50
+				'Facebook link (everything after the "http://facebook.com/", eg http://facebook.com/'
51
+				. '<strong>username</strong> or http://facebook.com/<strong>pages/108510539573</strong>)'
52
+			))
53
+		);
54 54
 
55
-        $fields->addFieldToTab(
56
-            'Root.SocialMedia',
57
-            $twitterUsername = TextField::create(
58
-                'TwitterUsername',
59
-                _t(__CLASS__ . '.TwitterField', 'Twitter username')
60
-            )
61
-        );
62
-        $twitterUsername->setDescription(
63
-            DBField::create_field('HTMLFragment', _t(
64
-                __CLASS__ . '.TwitterFieldDesc',
65
-                'Twitter username (eg, http://twitter.com/<strong>username</strong>)'
66
-            ))
67
-        );
68
-    }
55
+		$fields->addFieldToTab(
56
+			'Root.SocialMedia',
57
+			$twitterUsername = TextField::create(
58
+				'TwitterUsername',
59
+				_t(__CLASS__ . '.TwitterField', 'Twitter username')
60
+			)
61
+		);
62
+		$twitterUsername->setDescription(
63
+			DBField::create_field('HTMLFragment', _t(
64
+				__CLASS__ . '.TwitterFieldDesc',
65
+				'Twitter username (eg, http://twitter.com/<strong>username</strong>)'
66
+			))
67
+		);
68
+	}
69 69
 }
Please login to merge, or discard this patch.
src/PageTypes/BasePage.php 1 patch
Indentation   +143 added lines, -143 removed lines patch added patch discarded remove patch
@@ -31,147 +31,147 @@
 block discarded – undo
31 31
 
32 32
 class BasePage extends SiteTree
33 33
 {
34
-    private static $icon = 'cwp/cwp:images/icons/sitetree_images/page.png';
35
-
36
-    /**
37
-     * Hide this page type from the CMS. hide_ancestor is slightly misnamed, should really be just "hide"
38
-     *
39
-     * {@inheritDoc}
40
-     */
41
-    private static $hide_ancestor = BasePage::class;
42
-
43
-    private static $api_access = [
44
-        'view' => [
45
-            'Locale', 'URLSegment', 'Title', 'MenuTitle', 'Content', 'MetaDescription',
46
-            'ExtraMenu', 'Sort', 'Version', 'ParentID', 'ID'
47
-        ],
48
-        'edit' => [
49
-            'Locale', 'URLSegment', 'Title', 'MenuTitle', 'Content', 'MetaDescription',
50
-            'ExtraMenu', 'Sort', 'Version', 'ParentID', 'ID'
51
-        ],
52
-    ];
53
-
54
-    private static $table_name = 'BasePage';
55
-
56
-    /**
57
-     * @config
58
-     * @var string
59
-     */
60
-    private static $related_pages_title = 'Related pages';
61
-
62
-    private static $many_many = [
63
-        'Terms' => TaxonomyTerm::class,
64
-        'RelatedPagesThrough' => [
65
-            'through' => RelatedPageLink::class,
66
-            'from' => 'BasePage',
67
-            'to' => 'Child',
68
-        ]
69
-    ];
70
-
71
-    private static $owns = [
72
-        'RelatedPagesThrough',
73
-    ];
74
-
75
-    private static $belongs_many_many = [
76
-        'SimilarPages' => BasePage::class
77
-    ];
78
-
79
-    /**
80
-     * @var array
81
-     * @config
82
-     */
83
-    private static $many_many_extraFields = [
84
-        'RelatedPages' => [
85
-            'SortOrder' => 'Int',
86
-        ],
87
-    ];
88
-
89
-    private static $plural_name = 'Base Pages';
90
-
91
-    /**
92
-     * Get the footer holder.
93
-     */
94
-    public function getFooter()
95
-    {
96
-        return FooterHolder::get_one(FooterHolder::class);
97
-    }
98
-
99
-    /**
100
-     * @deprecated 2.2.0:3.0.0 Please use RelatedPagesThrough() instead
101
-     */
102
-    public function RelatedPages()
103
-    {
104
-        return $this->getManyManyComponents('RelatedPagesThrough');
105
-    }
106
-
107
-    public function RelatedPagesTitle()
108
-    {
109
-        return $this->config()->get('related_pages_title');
110
-    }
111
-
112
-    public function getCMSFields()
113
-    {
114
-        $this->beforeUpdateCMSFields(function (FieldList $fields) {
115
-            // Related Pages
116
-            $components = GridFieldConfig_RelationEditor::create();
117
-            $components->removeComponentsByType(GridFieldAddNewButton::class);
118
-            $components->removeComponentsByType(GridFieldEditButton::class);
119
-            $components->removeComponentsByType(GridFieldFilterHeader::class);
120
-            $components->addComponent(new GridFieldOrderableRows('SortOrder'));
121
-
122
-            /** @var GridFieldDataColumns $dataColumns */
123
-            $dataColumns = $components->getComponentByType(GridFieldDataColumns::class);
124
-            $dataColumns->setDisplayFields([
125
-                'Title' => _t(__CLASS__ . '.ColumnTitle', 'Title'),
126
-                'ClassName' => _t(__CLASS__ . '.ColumnPageType', 'Page Type')
127
-            ]);
128
-
129
-            $fields->findOrMakeTab(
130
-                'Root.RelatedPages',
131
-                _t(__CLASS__ . '.RelatedPages', 'Related pages')
132
-            );
133
-            $fields->addFieldToTab(
134
-                'Root.RelatedPages',
135
-                GridField::create(
136
-                    'RelatedPages',
137
-                    _t(__CLASS__ . '.RelatedPages', 'Related pages'),
138
-                    $this->RelatedPagesThrough(),
139
-                    $components
140
-                )
141
-            );
142
-
143
-            // Taxonomies - Unless they have their own 'Tags' field (such as in Blog, etc)
144
-            $hasMany = $this->hasMany();
145
-            $manyMany = $this->manyMany();
146
-            if (!isset($hasMany['Tags']) && !isset($manyMany['Tags'])) {
147
-                $fields->findOrMakeTab('Root.Tags', _t(__CLASS__ . '.TagsTabTitle', 'Tags'));
148
-                $fields->addFieldToTab(
149
-                    'Root.Tags',
150
-                    TreeMultiselectField::create(
151
-                        'Terms',
152
-                        _t(__CLASS__ . '.Terms', 'Terms'),
153
-                        TaxonomyTerm::class
154
-                    )->setDescription(_t(__CLASS__ . '.TermsDescription', 'Click to search for additional terms'))
155
-                );
156
-            }
157
-        });
158
-        return parent::getCMSFields();
159
-    }
160
-
161
-    /**
162
-     * Returns the native language name for the selected locale/language, empty string if Fluent is not available
163
-     *
164
-     * @return string
165
-     */
166
-    public function getSelectedLanguage()
167
-    {
168
-        if (!class_exists(Locale::class) || !$this->hasMethod('Locales')) {
169
-            return '';
170
-        }
171
-
172
-        /** @var ArrayData $information */
173
-        $information = $this->LocaleInformation(FluentState::singleton()->getLocale());
174
-
175
-        return $information->LanguageNative;
176
-    }
34
+	private static $icon = 'cwp/cwp:images/icons/sitetree_images/page.png';
35
+
36
+	/**
37
+	 * Hide this page type from the CMS. hide_ancestor is slightly misnamed, should really be just "hide"
38
+	 *
39
+	 * {@inheritDoc}
40
+	 */
41
+	private static $hide_ancestor = BasePage::class;
42
+
43
+	private static $api_access = [
44
+		'view' => [
45
+			'Locale', 'URLSegment', 'Title', 'MenuTitle', 'Content', 'MetaDescription',
46
+			'ExtraMenu', 'Sort', 'Version', 'ParentID', 'ID'
47
+		],
48
+		'edit' => [
49
+			'Locale', 'URLSegment', 'Title', 'MenuTitle', 'Content', 'MetaDescription',
50
+			'ExtraMenu', 'Sort', 'Version', 'ParentID', 'ID'
51
+		],
52
+	];
53
+
54
+	private static $table_name = 'BasePage';
55
+
56
+	/**
57
+	 * @config
58
+	 * @var string
59
+	 */
60
+	private static $related_pages_title = 'Related pages';
61
+
62
+	private static $many_many = [
63
+		'Terms' => TaxonomyTerm::class,
64
+		'RelatedPagesThrough' => [
65
+			'through' => RelatedPageLink::class,
66
+			'from' => 'BasePage',
67
+			'to' => 'Child',
68
+		]
69
+	];
70
+
71
+	private static $owns = [
72
+		'RelatedPagesThrough',
73
+	];
74
+
75
+	private static $belongs_many_many = [
76
+		'SimilarPages' => BasePage::class
77
+	];
78
+
79
+	/**
80
+	 * @var array
81
+	 * @config
82
+	 */
83
+	private static $many_many_extraFields = [
84
+		'RelatedPages' => [
85
+			'SortOrder' => 'Int',
86
+		],
87
+	];
88
+
89
+	private static $plural_name = 'Base Pages';
90
+
91
+	/**
92
+	 * Get the footer holder.
93
+	 */
94
+	public function getFooter()
95
+	{
96
+		return FooterHolder::get_one(FooterHolder::class);
97
+	}
98
+
99
+	/**
100
+	 * @deprecated 2.2.0:3.0.0 Please use RelatedPagesThrough() instead
101
+	 */
102
+	public function RelatedPages()
103
+	{
104
+		return $this->getManyManyComponents('RelatedPagesThrough');
105
+	}
106
+
107
+	public function RelatedPagesTitle()
108
+	{
109
+		return $this->config()->get('related_pages_title');
110
+	}
111
+
112
+	public function getCMSFields()
113
+	{
114
+		$this->beforeUpdateCMSFields(function (FieldList $fields) {
115
+			// Related Pages
116
+			$components = GridFieldConfig_RelationEditor::create();
117
+			$components->removeComponentsByType(GridFieldAddNewButton::class);
118
+			$components->removeComponentsByType(GridFieldEditButton::class);
119
+			$components->removeComponentsByType(GridFieldFilterHeader::class);
120
+			$components->addComponent(new GridFieldOrderableRows('SortOrder'));
121
+
122
+			/** @var GridFieldDataColumns $dataColumns */
123
+			$dataColumns = $components->getComponentByType(GridFieldDataColumns::class);
124
+			$dataColumns->setDisplayFields([
125
+				'Title' => _t(__CLASS__ . '.ColumnTitle', 'Title'),
126
+				'ClassName' => _t(__CLASS__ . '.ColumnPageType', 'Page Type')
127
+			]);
128
+
129
+			$fields->findOrMakeTab(
130
+				'Root.RelatedPages',
131
+				_t(__CLASS__ . '.RelatedPages', 'Related pages')
132
+			);
133
+			$fields->addFieldToTab(
134
+				'Root.RelatedPages',
135
+				GridField::create(
136
+					'RelatedPages',
137
+					_t(__CLASS__ . '.RelatedPages', 'Related pages'),
138
+					$this->RelatedPagesThrough(),
139
+					$components
140
+				)
141
+			);
142
+
143
+			// Taxonomies - Unless they have their own 'Tags' field (such as in Blog, etc)
144
+			$hasMany = $this->hasMany();
145
+			$manyMany = $this->manyMany();
146
+			if (!isset($hasMany['Tags']) && !isset($manyMany['Tags'])) {
147
+				$fields->findOrMakeTab('Root.Tags', _t(__CLASS__ . '.TagsTabTitle', 'Tags'));
148
+				$fields->addFieldToTab(
149
+					'Root.Tags',
150
+					TreeMultiselectField::create(
151
+						'Terms',
152
+						_t(__CLASS__ . '.Terms', 'Terms'),
153
+						TaxonomyTerm::class
154
+					)->setDescription(_t(__CLASS__ . '.TermsDescription', 'Click to search for additional terms'))
155
+				);
156
+			}
157
+		});
158
+		return parent::getCMSFields();
159
+	}
160
+
161
+	/**
162
+	 * Returns the native language name for the selected locale/language, empty string if Fluent is not available
163
+	 *
164
+	 * @return string
165
+	 */
166
+	public function getSelectedLanguage()
167
+	{
168
+		if (!class_exists(Locale::class) || !$this->hasMethod('Locales')) {
169
+			return '';
170
+		}
171
+
172
+		/** @var ArrayData $information */
173
+		$information = $this->LocaleInformation(FluentState::singleton()->getLocale());
174
+
175
+		return $information->LanguageNative;
176
+	}
177 177
 }
Please login to merge, or discard this patch.