Merge remote-tracking branch 'origin/master' into translation-staging

code/controllers/CMSMain.php

@@ -203,7 +203,9 @@ class CMSMain extends LeftAndMain implements CurrentPageIdentifier, PermissionPr
 	}
 
 	function LinkPageAdd() {
-		return singleton("CMSPageAddController")->Link();
+		$link = singleton("CMSPageAddController")->Link();
+		$this->extend('updateLinkPageAdd', $link);
+		return $link;
 	}
 	
 	/**
@@ -466,9 +468,15 @@ class CMSMain extends LeftAndMain implements CurrentPageIdentifier, PermissionPr
 			$addAction = $instance->i18n_singular_name();
 			
 			// Get description
-			$description = _t($class . 'DESCRIPTION');
+			$description = _t($class . '.DESCRIPTION');
-			if(!$description) $description = $instance->uninherited('description');
+
-			if($class == 'Page' && !$description) $description = singleton('SiteTree')->uninherited('description');
+			if(!$description) {
+				$description = $instance->uninherited('description');
+			}
+			
+			if($class == 'Page' && !$description) {
+				$description = singleton('SiteTree')->uninherited('description');
+			}
 			
 			$result->push(new ArrayData(array(
 				'ClassName' => $class,
@@ -480,6 +488,7 @@ class CMSMain extends LeftAndMain implements CurrentPageIdentifier, PermissionPr
 		}
 		
 		$result = $result->sort('AddAction');
+		
 		return $result;
 	}
 

code/model/ErrorPage.php

@@ -88,6 +88,7 @@ class ErrorPage extends Page {
 	
 				// Ensure a static error page is created from latest error page content
 				$response = Director::test(Director::makeRelative($pageNotFoundErrorPage->Link()));
+				$written = null;
 				if($fh = fopen($pageNotFoundErrorPagePath, 'w')) {
 					$written = fwrite($fh, $response->getBody());
 					fclose($fh);
@@ -115,6 +116,7 @@ class ErrorPage extends Page {
 	
 				// Ensure a static error page is created from latest error page content
 				$response = Director::test(Director::makeRelative($serverErrorPage->Link()));
+				$written = null;
 				if($fh = fopen($serverErrorPagePath, 'w')) {
 					$written = fwrite($fh, $response->getBody());
 					fclose($fh);

code/model/SiteConfig.php

@@ -205,10 +205,12 @@ class SiteConfig extends DataObject implements PermissionProvider {
 		$siteConfig->Tagline = _t('SiteConfig.TAGLINEDEFAULT',"your tagline here");
 
 		if(class_exists('Translatable') && $siteConfig->hasExtension('Translatable')){
-			$defaultConfig = DataObject::get_one('SiteConfig');
+			Translatable::disable_locale_filter();
+			$defaultConfig = SiteConfig::get()->first();
+			Translatable::enable_locale_filter();			
+			
 			if($defaultConfig){					
-				$siteConfig->Title = $defaultConfig->Title;
+				return $defaultConfig->createTranslation($locale);
-				$siteConfig->Tagline = $defaultConfig->Tagline;
 			}			
 			
 			// TODO Copy view/edit group settings

css/screen.css

@@ -15,7 +15,7 @@
 
 .cms-content-tools #cms-content-treeview .cms-content-toolbar { border-bottom: none; box-shadow: none; margin-bottom: 8px; }
 .cms-content-tools #cms-content-treeview .cms-tree-view-modes, .cms-content-tools #cms-content-treeview .cms-content-batchactions { display: none; }
-.cms-content-tools #cms-content-treeview .cms-tree-expand-trigger { display: inline-block; margin: 0 0 2px 0; position: absolute; top: 8px; right: 4px; }
+.cms-content-tools #cms-content-treeview .cms-tree-expand-trigger { display: inline-block; margin: 0 0 2px 0; }
 .cms-content-tools #cms-content-treeview .cms-tree-expand-trigger span.ui-button-text { padding-right: 8px; }
 .cms-content-tools #cms-content-treeview .cms-tree .badge, .cms-content-tools #cms-content-treeview .cms-tree a > .jstree-icon { display: none; }
 .cms-content-tools #cms-content-treeview .cms-tree a:hover > .text > .badge, .cms-content-tools #cms-content-treeview .cms-tree .jstree-clicked > .text > .badge { display: inline-block; }

javascript/SiteTreeURLSegmentField.js

@@ -11,9 +11,13 @@
 			 * Constructor: onmatch
 			 */
 			onmatch : function() {
+				// Only initialize the field if it contains an editable field.
+				// This ensures we don't get bogus previews on readonly fields.
+				if(this.find(':text').length) {
 					this._addActions(); // add elements and actions for editing
 					this.edit(); // toggle
 					this._autoInputWidth(); // set width of input field
+				}
 				
 				this._super();
 			},

scss/_CMSMain.scss

@@ -68,9 +68,6 @@
 		.cms-tree-expand-trigger {
 			display: inline-block;
 			margin:0 0 2px 0;
-			position:absolute;
-			top:8px;
-			right:4px;
 			span.ui-button-text{
 					padding-right:8px;
 			}