diff --git a/code/model/RedirectorPage.php b/code/model/RedirectorPage.php index 6378bee0..2c55fbc2 100644 --- a/code/model/RedirectorPage.php +++ b/code/model/RedirectorPage.php @@ -121,8 +121,6 @@ class RedirectorPage extends Page { // Remove all metadata fields, does not apply for redirector pages $fields->removeByName('MetaTagsHeader'); - $fields->removeByName('MetaTitle'); - $fields->removeByName('MetaKeywords'); $fields->removeByName('MetaDescription'); $fields->removeByName('ExtraMeta'); diff --git a/code/model/SiteTree.php b/code/model/SiteTree.php index 38608d7c..261fdcfc 100644 --- a/code/model/SiteTree.php +++ b/code/model/SiteTree.php @@ -76,9 +76,7 @@ class SiteTree extends DataObject implements PermissionProvider,i18nEntityProvid "Title" => "Varchar(255)", "MenuTitle" => "Varchar(100)", "Content" => "HTMLText", - "MetaTitle" => "Varchar(255)", "MetaDescription" => "Text", - "MetaKeywords" => "Varchar(255)", "ExtraMeta" => "HTMLText", "ShowInMenus" => "Boolean", "ShowInSearch" => "Boolean", @@ -1268,18 +1266,13 @@ class SiteTree extends DataObject implements PermissionProvider,i18nEntityProvid public function MetaTags($includeTitle = true) { $tags = ""; if($includeTitle === true || $includeTitle == 'true') { - $tags .= "" . Convert::raw2xml(($this->MetaTitle) - ? $this->MetaTitle - : $this->Title) . "\n"; + $tags .= "" . $this->Title . "\n"; } $tags .= "\n"; $charset = ContentNegotiator::get_encoding(); $tags .= "\n"; - if($this->MetaKeywords) { - $tags .= "MetaKeywords) . "\" />\n"; - } if($this->MetaDescription) { $tags .= "MetaDescription) . "\" />\n"; } @@ -1852,11 +1845,6 @@ class SiteTree extends DataObject implements PermissionProvider,i18nEntityProvid $htmlField = new HtmlEditorField("Content", _t('SiteTree.HTMLEDITORTITLE', "Content", 'HTML editor title')), ToggleCompositeField::create('Metadata', _t('SiteTree.MetadataToggle', 'Metadata'), array( - $metaIntroField = new CompositeField( - $metaIntro = new LabelField("MetaIntro", $Title = "Metadata helps describe and categorise your site. By filling out the fields below it will help improve your site's ranking on search engines.") - ), - $metaFieldTitle = new TextField("MetaTitle", $this->fieldLabel('MetaTitle')), - $metaFieldKeyword = new TextareaField("MetaKeywords", $this->fieldLabel('MetaKeywords'), 1), $metaFieldDesc = new TextareaField("MetaDescription", $this->fieldLabel('MetaDescription')), $metaFieldExtra = new TextareaField("ExtraMeta",$this->fieldLabel('ExtraMeta')) ) @@ -1870,17 +1858,23 @@ class SiteTree extends DataObject implements PermissionProvider,i18nEntityProvid ); $htmlField->addExtraClass('stacked'); - $metaIntroField->addExtraClass('field'); - $metaIntro->addExtraClass('help'); // Help text for MetaData on page content editor - $metaFieldTitle->setRightTitle(_t('SiteTree.METATITLEHELP', "Add the title of your page here")) - ->addExtraClass('help'); - $metaFieldKeyword->setRightTitle(_t('SiteTree.METAKEYWORDHELP', "Add any keywords that are relevant to the page here. Separate keywords and phrases with a comma: keyword, keywords, keyword phrase")) - ->addExtraClass('help'); - $metaFieldDesc->setRightTitle(_t('SiteTree.METADESCHELP', "Add a description of your page here. Make sure you think about your keywords when writing your description")) - ->addExtraClass('help'); - $metaFieldExtra->setRightTitle(_t('SiteTree.METAEXTRAHELP', "When adding custom meta tags they must be wrapped in an html tag. For example <meta name=\"customName\" content=\"your custom content here\" />")) - ->addExtraClass('help'); + $metaFieldDesc + ->setRightTitle( + _t( + 'SiteTree.METADESCHELP', + "Search engines use this content for displaying search results (although it will not influence their ranking)." + ) + ) + ->addExtraClass('help'); + $metaFieldExtra + ->setRightTitle( + _t( + 'SiteTree.METAEXTRAHELP', + "HTML tags for additional meta information. For example <meta name=\"customName\" content=\"your custom content here\" />" + ) + ) + ->addExtraClass('help'); // Conditional dependent pages tab if($dependentPagesCount) $tabDependent->setTitle(_t('SiteTree.TABDEPENDENT', "Dependent pages") . " ($dependentPagesCount)"); @@ -2036,10 +2030,7 @@ class SiteTree extends DataObject implements PermissionProvider,i18nEntityProvid $labels = parent::fieldLabels($includerelations); $labels['Title'] = _t('SiteTree.PAGETITLE', "Page name"); $labels['MenuTitle'] = _t('SiteTree.MENUTITLE', "Navigation label"); - $labels['MetaIntro'] = _t('SiteTree.METAINTRO', "Metadata helps describe and categorise your site. By filling out the fields below it will help improve your site's ranking on search engines."); - $labels['MetaTitle'] = _t('SiteTree.METATITLE', "Meta Title"); $labels['MetaDescription'] = _t('SiteTree.METADESC', "Meta Description"); - $labels['MetaKeywords'] = _t('SiteTree.METAKEYWORDS', "Meta Keywords"); $labels['ExtraMeta'] = _t('SiteTree.METAEXTRA', "Custom Meta Tags"); $labels['ClassName'] = _t('SiteTree.PAGETYPE', "Page type", 'Classname of a page object'); $labels['ParentType'] = _t('SiteTree.PARENTTYPE', "Page location"); diff --git a/code/staticpublisher/CachedPHPPage.tmpl b/code/staticpublisher/CachedPHPPage.tmpl deleted file mode 100644 index 2fe875b6..00000000 --- a/code/staticpublisher/CachedPHPPage.tmpl +++ /dev/null @@ -1,28 +0,0 @@ - 0) { - header("Cache-Control: max-age=" . MAX_AGE); - header("Pragma:"); -} else { - header("Cache-Control: no-cache, max-age=0, must-revalidate"); -} - -header("Expires: " . gmdate('D, d M Y H:i:s', time() + MAX_AGE) . ' GMT'); -header("Last-modified: " . gmdate('D, d M Y H:i:s', strtotime(LAST_MODIFIED)) . ' GMT'); - -if(isset($_SERVER['HTTP_IF_MODIFIED_SINCE'])) { - if(strtotime($_SERVER['HTTP_IF_MODIFIED_SINCE']) >= strtotime(LAST_MODIFIED)) { - header("Last-modified: " . gmdate('D, d M Y H:i:s', strtotime(LAST_MODIFIED)) . ' GMT', true, 304); - exit; - } -} - -?> -**CONTENT** diff --git a/code/staticpublisher/CachedPHPRedirection.tmpl b/code/staticpublisher/CachedPHPRedirection.tmpl deleted file mode 100644 index 755fcddd..00000000 --- a/code/staticpublisher/CachedPHPRedirection.tmpl +++ /dev/null @@ -1,20 +0,0 @@ - 0) { - header("Cache-Control: max-age=" . MAX_AGE); - header("Pragma:"); -} else { - header("Cache-Control: no-cache, max-age=0, must-revalidate"); -} - -header("Expires: " . gmdate('D, d M Y H:i:s', time() + MAX_AGE) . ' GMT'); -header("Location: " . DESTINATION, true, 301); - -?> diff --git a/code/staticpublisher/htaccess_example_rsyncmultiservers b/code/staticpublisher/htaccess_example_rsyncmultiservers deleted file mode 100644 index b7aefcfe..00000000 --- a/code/staticpublisher/htaccess_example_rsyncmultiservers +++ /dev/null @@ -1,39 +0,0 @@ -### SILVERSTRIPE START ### -RewriteEngine On - -## CONFIG FOR DEV ENVIRONMENTS - -# Cached content - **sitedir** subdirectory -RewriteCond %{REQUEST_METHOD} ^GET$ -RewriteCond %{QUERY_STRING} ^$ -RewriteCond %{REQUEST_URI} ^/**sitedir**/(.*)$ -RewriteCond %{REQUEST_URI} /**sitedir**/(.*[^/])/?$ -RewriteCond %{DOCUMENT_ROOT}/**sitedir**/cache/%1.html -f -RewriteCond %{REQUEST_FILENAME} !-f -RewriteRule .* /**sitedir**/cache/%1.html [L] - -# Cached content - homepage -RewriteCond %{REQUEST_METHOD} ^GET$ -RewriteCond %{QUERY_STRING} ^$ -RewriteCond %{REQUEST_URI} ^/**sitedir**/?$ -RewriteCond /**sitedir**/cache/index.html -f -RewriteCond %{REQUEST_FILENAME} !-f -RewriteRule .* /**sitedir**/cache/index.html [L] - -## CONFIG FOR TEST/LIVE ENVIRONMENTS - -# Cached content - live webserver -RewriteCond %{REQUEST_METHOD} ^GET$ -RewriteCond %{QUERY_STRING} ^$ -RewriteCond %{REQUEST_URI} /(.*[^/])/?$ -RewriteCond %{DOCUMENT_ROOT}/cache/%1.html -f -RewriteCond %{REQUEST_FILENAME} !-f -RewriteRule .* /cache/%1.html [L] - -# Cached content - homepage -RewriteCond %{REQUEST_METHOD} ^GET$ -RewriteCond %{QUERY_STRING} ^$ -RewriteCond %{REQUEST_URI} ^/?$ -RewriteCond %{DOCUMENT_ROOT}/cache/index.html -f -RewriteCond %{REQUEST_FILENAME} !-f -RewriteRule .* /cache/index.html [L] \ No newline at end of file diff --git a/code/staticpublisher/htaccess_example_rsyncsingleserver b/code/staticpublisher/htaccess_example_rsyncsingleserver deleted file mode 100644 index 8a22bd22..00000000 --- a/code/staticpublisher/htaccess_example_rsyncsingleserver +++ /dev/null @@ -1,48 +0,0 @@ -### SILVERSTRIPE START ### -RewriteEngine On - -## CONFIG FOR DEV ENVIRONMENTS - -# Cached content - **sitedir** subdirectory -RewriteCond %{REQUEST_METHOD} ^GET$ -RewriteCond %{QUERY_STRING} ^$ -RewriteCond %{REQUEST_URI} ^/**sitedir**/(.*)$ -RewriteCond %{REQUEST_URI} /**sitedir**/(.*[^/])/?$ -RewriteCond %{DOCUMENT_ROOT}/**sitedir**/cache/%1.html -f -RewriteCond %{REQUEST_FILENAME} !-f -RewriteRule .* /**sitedir**/cache/%1.html [L] - -# Cached content - homepage -RewriteCond %{REQUEST_METHOD} ^GET$ -RewriteCond %{QUERY_STRING} ^$ -RewriteCond %{REQUEST_URI} ^/**sitedir**/?$ -RewriteCond /**sitedir**/cache/index.html -f -RewriteCond %{REQUEST_FILENAME} !-f -RewriteRule .* /**sitedir**/cache/index.html [L] - -## CONFIG FOR TEST/LIVE ENVIRONMENTS - -# Cached content - live webserver -RewriteCond %{REQUEST_METHOD} ^GET$ -RewriteCond %{QUERY_STRING} ^$ -RewriteCond %{REQUEST_URI} /(.*[^/])/?$ -RewriteCond %{DOCUMENT_ROOT}/cache/%1.html -f -RewriteCond %{REQUEST_FILENAME} !-f -RewriteRule .* /cache/%1.html [L] - -# Cached content - homepage -RewriteCond %{REQUEST_METHOD} ^GET$ -RewriteCond %{QUERY_STRING} ^$ -RewriteCond %{REQUEST_URI} ^/?$ -RewriteCond %{DOCUMENT_ROOT}/cache/index.html -f -RewriteCond %{REQUEST_FILENAME} !-f -RewriteRule .* /cache/index.html [L] - -## DYNAMIC CONFIG - -# Dynamic content -RewriteCond %{REQUEST_URI} !(\.gif)|(\.jpg)|(\.png)|(\.css)|(\.js)|(\.php)$ -RewriteCond %{REQUEST_URI} ^(.*)$ -RewriteCond %{REQUEST_FILENAME} !-f -RewriteRule .* framework/main.php?url=%1&%{QUERY_STRING} [L] -### SILVERSTRIPE END ### diff --git a/code/staticpublisher/htaccess_example_rsyncwithphp b/code/staticpublisher/htaccess_example_rsyncwithphp deleted file mode 100644 index 2cc4943e..00000000 --- a/code/staticpublisher/htaccess_example_rsyncwithphp +++ /dev/null @@ -1,39 +0,0 @@ -### SILVERSTRIPE START ### -RewriteEngine On - -## CONFIG FOR DEV ENVIRONMENTS - -# Cached content - **sitedir** subdirectory -RewriteCond %{REQUEST_METHOD} ^GET$ -RewriteCond %{QUERY_STRING} ^$ -RewriteCond %{REQUEST_URI} ^/**sitedir**/(.*)$ -RewriteCond %{REQUEST_URI} /**sitedir**/(.*[^/])/?$ -RewriteCond %{DOCUMENT_ROOT}/**sitedir**/cache/%1.php -f -RewriteCond %{REQUEST_FILENAME} !-f -RewriteRule .* /**sitedir**/cache/%1.php [L] - -# Cached content - homepage -RewriteCond %{REQUEST_METHOD} ^GET$ -RewriteCond %{QUERY_STRING} ^$ -RewriteCond %{REQUEST_URI} ^/**sitedir**/?$ -RewriteCond /**sitedir**/cache/index.php -f -RewriteCond %{REQUEST_FILENAME} !-f -RewriteRule .* /**sitedir**/cache/index.php [L] - -## CONFIG FOR TEST/LIVE ENVIRONMENTS - -# Cached content - live webserver -RewriteCond %{REQUEST_METHOD} ^GET$ -RewriteCond %{QUERY_STRING} ^$ -RewriteCond %{REQUEST_URI} /(.*[^/])/?$ -RewriteCond %{DOCUMENT_ROOT}/cache/%1.php -f -RewriteCond %{REQUEST_FILENAME} !-f -RewriteRule .* /cache/%1.php [L] - -# Cached content - homepage -RewriteCond %{REQUEST_METHOD} ^GET$ -RewriteCond %{QUERY_STRING} ^$ -RewriteCond %{REQUEST_URI} ^/?$ -RewriteCond %{DOCUMENT_ROOT}/cache/index.php -f -RewriteCond %{REQUEST_FILENAME} !-f -RewriteRule .* /cache/index.php [L] \ No newline at end of file diff --git a/tests/controller/CMSSiteTreeFilterTest.php b/tests/controller/CMSSiteTreeFilterTest.php index 110349e0..2e3c79bc 100644 --- a/tests/controller/CMSSiteTreeFilterTest.php +++ b/tests/controller/CMSSiteTreeFilterTest.php @@ -51,9 +51,9 @@ class CMSSiteTreeFilterTest extends SapphireTest { $unchangedPage->doPublish(); $changedPage = $this->objFromFixture('Page', 'page2'); - $changedPage->MetaTitle = 'Original'; + $changedPage->Title = 'Original'; $changedPage->publish('Stage', 'Live'); - $changedPage->MetaTitle = 'Changed'; + $changedPage->Title = 'Changed'; $changedPage->write(); $f = new CMSSiteTreeFilter_ChangedPages(); diff --git a/tests/model/SiteTreeTest.php b/tests/model/SiteTreeTest.php index 5f007040..70855809 100644 --- a/tests/model/SiteTreeTest.php +++ b/tests/model/SiteTreeTest.php @@ -136,17 +136,17 @@ class SiteTreeTest extends SapphireTest { $this->logInWithPermission('ADMIN'); $obj = $this->objFromFixture('Page', 'about'); - $obj->MetaTitle = "asdfasdf"; + $obj->Title = "asdfasdf"; $obj->write(); $this->assertTrue($obj->doPublish()); - $this->assertEquals('asdfasdf', DB::query("SELECT \"MetaTitle\" FROM \"SiteTree_Live\" WHERE \"ID\" = '$obj->ID'")->value()); + $this->assertEquals('asdfasdf', DB::query("SELECT \"Title\" FROM \"SiteTree_Live\" WHERE \"ID\" = '$obj->ID'")->value()); - $obj->MetaTitle = null; + $obj->Title = null; $obj->write(); $this->assertTrue($obj->doPublish()); - $this->assertNull(DB::query("SELECT \"MetaTitle\" FROM \"SiteTree_Live\" WHERE \"ID\" = '$obj->ID'")->value()); + $this->assertNull(DB::query("SELECT \"Title\" FROM \"SiteTree_Live\" WHERE \"ID\" = '$obj->ID'")->value()); }