tonyair/silverstripe-cms
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-cms synced 2024-10-22 08:05:56 +02:00
Code Issues Projects Releases Wiki Activity

Merge pull request #1481 from frankmullenger/4917-renaming

Browse Source 
MINOR: Removing camel cased 'Html' references.
This commit is contained in:
Daniel Hensby 2016-05-07 11:11:16 +01:00
commit bc06d72e5f
4 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
code/controllers/CMSMain.php
View File

@ -1254,8 +1254,8 @@ class CMSMain extends LeftAndMain implements CurrentPageIdentifier, PermissionPr
$pages = null; $pages = null;
} }
$content = new HtmlEditorField('Content'); $content = new HTMLEditorField('Content');
$download = new HtmlEditorField('Download'); $download = new HTMLEditorField('Download');
foreach($newPageSet as $i => $page) { foreach($newPageSet as $i => $page) {
$page->HasBrokenLink = 0; $page->HasBrokenLink = 0;

2
code/model/SiteTree.php
View File

@ -1815,7 +1815,7 @@ class SiteTree extends DataObject implements PermissionProvider,i18nEntityProvid
new TextField("Title", $this->fieldLabel('Title')), new TextField("Title", $this->fieldLabel('Title')),
$urlsegment, $urlsegment,
new TextField("MenuTitle", $this->fieldLabel('MenuTitle')), new TextField("MenuTitle", $this->fieldLabel('MenuTitle')),
$htmlField = new HtmlEditorField("Content", _t('SiteTree.HTMLEDITORTITLE', "Content", 'HTML editor title')), $htmlField = new HTMLEditorField("Content", _t('SiteTree.HTMLEDITORTITLE', "Content", 'HTML editor title')),
ToggleCompositeField::create('Metadata', _t('SiteTree.MetadataToggle', 'Metadata'), ToggleCompositeField::create('Metadata', _t('SiteTree.MetadataToggle', 'Metadata'),
array( array(
$metaFieldDesc = new TextareaField("MetaDescription", $this->fieldLabel('MetaDescription')), $metaFieldDesc = new TextareaField("MetaDescription", $this->fieldLabel('MetaDescription')),

18
tests/model/SiteTreeHTMLEditorFieldTest.php
View File

@ -1,12 +1,12 @@
<?php <?php
class SiteTreeHtmlEditorFieldTest extends FunctionalTest { class SiteTreeHTMLEditorFieldTest extends FunctionalTest {
protected static $fixture_file = 'SiteTreeHtmlEditorFieldTest.yml'; protected static $fixture_file = 'SiteTreeHTMLEditorFieldTest.yml';
protected static $use_draft_site = true; protected static $use_draft_site = true;
public function setUp() { public function setUp() {
parent::setUp(); parent::setUp();
AssetStoreTest_SpyStore::activate('SiteTreeHtmlEditorFieldTest'); AssetStoreTest_SpyStore::activate('SiteTreeHTMLEditorFieldTest');
$this->logInWithPermission('ADMIN'); $this->logInWithPermission('ADMIN');
// Write file contents // Write file contents
@ -25,7 +25,7 @@ class SiteTreeHtmlEditorFieldTest extends FunctionalTest {
public function testLinkTracking() { public function testLinkTracking() {
$sitetree = $this->objFromFixture('SiteTree', 'home'); $sitetree = $this->objFromFixture('SiteTree', 'home');
$editor = new HtmlEditorField('Content'); $editor = new HTMLEditorField('Content');
$aboutID = $this->idFromFixture('SiteTree', 'about'); $aboutID = $this->idFromFixture('SiteTree', 'about');
$contactID = $this->idFromFixture('SiteTree', 'contact'); $contactID = $this->idFromFixture('SiteTree', 'contact');
@ -64,7 +64,7 @@ class SiteTreeHtmlEditorFieldTest extends FunctionalTest {
public function testFileLinkTracking() { public function testFileLinkTracking() {
$sitetree = $this->objFromFixture('SiteTree', 'home'); $sitetree = $this->objFromFixture('SiteTree', 'home');
$editor = new HtmlEditorField('Content'); $editor = new HTMLEditorField('Content');
$fileID = $this->idFromFixture('File', 'example_file'); $fileID = $this->idFromFixture('File', 'example_file');
$editor->setValue(sprintf( $editor->setValue(sprintf(
@ -98,7 +98,7 @@ class SiteTreeHtmlEditorFieldTest extends FunctionalTest {
public function testImageInsertion() { public function testImageInsertion() {
$sitetree = new SiteTree(); $sitetree = new SiteTree();
$editor = new HtmlEditorField('Content'); $editor = new HTMLEditorField('Content');
$editor->setValue('<img src="assets/example.jpg" />'); $editor->setValue('<img src="assets/example.jpg" />');
$editor->saveInto($sitetree); $editor->saveInto($sitetree);
@ -121,7 +121,7 @@ class SiteTreeHtmlEditorFieldTest extends FunctionalTest {
public function testImageTracking() { public function testImageTracking() {
$sitetree = $this->objFromFixture('SiteTree', 'home'); $sitetree = $this->objFromFixture('SiteTree', 'home');
$editor = new HtmlEditorField('Content'); $editor = new HTMLEditorField('Content');
$file = $this->objFromFixture('Image', 'example_image'); $file = $this->objFromFixture('Image', 'example_image');
$editor->setValue(sprintf('[image src="%s" id="%d"]', $file->getURL(), $file->ID)); $editor->setValue(sprintf('[image src="%s" id="%d"]', $file->getURL(), $file->ID));
@ -144,7 +144,7 @@ class SiteTreeHtmlEditorFieldTest extends FunctionalTest {
public function testBrokenSiteTreeLinkTracking() { public function testBrokenSiteTreeLinkTracking() {
$sitetree = new SiteTree(); $sitetree = new SiteTree();
$editor = new HtmlEditorField('Content'); $editor = new HTMLEditorField('Content');
$this->assertFalse((bool) $sitetree->HasBrokenLink); $this->assertFalse((bool) $sitetree->HasBrokenLink);
@ -167,7 +167,7 @@ class SiteTreeHtmlEditorFieldTest extends FunctionalTest {
public function testBrokenFileLinkTracking() { public function testBrokenFileLinkTracking() {
$sitetree = new SiteTree(); $sitetree = new SiteTree();
$editor = new HtmlEditorField('Content'); $editor = new HTMLEditorField('Content');
$this->assertFalse((bool) $sitetree->HasBrokenFile); $this->assertFalse((bool) $sitetree->HasBrokenFile);

0
tests/model/SiteTreeHtmlEditorFieldTest.yml → tests/model/SiteTreeHTMLEditorFieldTest.yml
View File