Merge remote-tracking branch 'origin/3.1'

.htaccess

@@ -20,16 +20,14 @@
 ErrorDocument 404 /assets/error-404.html
 ErrorDocument 500 /assets/error-500.html
 
-<IfModule mod_alias.c>
-	RedirectMatch 403 /silverstripe-cache(/|$)
-	RedirectMatch 403 /vendor(/|$)
-	RedirectMatch 403 /composer\.(json|lock)
-</IfModule>
-
 <IfModule mod_rewrite.c>
 	SetEnv HTTP_MOD_REWRITE On
 	RewriteEngine On	
 
+	RewriteRule ^vendor(/|$) - [F,L,NC]
+	RewriteRule silverstripe-cache(/|$) - [F,L,NC]
+	RewriteRule composer\.(json|lock) - [F,L,NC]
+
 	RewriteCond %{REQUEST_URI} ^(.*)$
 	RewriteCond %{REQUEST_FILENAME} !-f
 	RewriteCond %{REQUEST_URI} !\.php$

assets/.htaccess

@@ -23,7 +23,7 @@
 # does not support regular expression case insensitive matches using PCRE style.
 #
 Deny from all
-<FilesMatch "\.(?i:html|htm|xhtml|js|css|bmp|png|gif|jpg|jpeg|ico|pcx|tif|tiff|au|mid|midi|mpa|mp3|ogg|m4a|ra|wma|wav|cda|avi|mpg|mpeg|asf|wmv|m4v|mov|mkv|mp4|ogv|webm|swf|flv|ram|rm|doc|docx|txt|rtf|xls|xlsx|pages|ppt|pptx|pps|csv|cab|arj|tar|zip|zipx|sit|sitx|gz|tgz|bz2|ace|arc|pkg|dmg|hqx|jar|xml|pdf)$">
+<FilesMatch "\.(?i:html|htm|xhtml|js|css|bmp|png|gif|jpg|jpeg|ico|pcx|tif|tiff|au|mid|midi|mpa|mp3|ogg|m4a|ra|wma|wav|cda|avi|mpg|mpeg|asf|wmv|m4v|mov|mkv|mp4|ogv|webm|swf|flv|ram|rm|doc|docx|txt|rtf|xls|xlsx|pages|ppt|pptx|pps|csv|cab|arj|tar|zip|zipx|sit|sitx|gz|tgz|bz2|ace|arc|pkg|dmg|hqx|jar|xml|pdf|gpx|kml)$">
 	Allow from all
 </FilesMatch>
 

assets/web.config

@@ -92,6 +92,8 @@ directory.
 					<add fileExtension=".jar" allowed="true" />
 					<add fileExtension=".xml" allowed="true" />
 					<add fileExtension=".pdf" allowed="true" />
+					<add fileExtension=".gpx" allowed="true" />
+					<add fileExtension=".kml" allowed="true" />
 				</fileExtensions>
 			</requestFiltering>
 		</security>

behat.yml

@@ -3,8 +3,6 @@ default:
     tags: "~@todo"
   formatter:
     name: pretty
-    parameters:
-      snippets: false
 
   extensions:
 

mysite/_config/config.yml

@@ -1,6 +1,8 @@
 ---
 Name: mysite
-After: 'framework/*','cms/*'
+After:
+  - 'framework/*'
+  - 'cms/*'
 ---
 # YAML configuration for SilverStripe
 # See http://doc.silverstripe.org/framework/en/topics/configuration

mysite/code/Page.php

@@ -30,14 +30,8 @@ class Page_Controller extends ContentController {
 
 	public function init() {
 		parent::init();
-
+		// You can include any CSS or JS required by your project here.
-		// Note: you should use SS template require tags inside your templates 
+		// See: http://doc.silverstripe.org/framework/en/reference/requirements
-		// instead of putting Requirements calls here.  However these are 
-		// included so that our older themes still work
-		Requirements::themedCSS('reset');
-		Requirements::themedCSS('layout'); 
-		Requirements::themedCSS('typography'); 
-		Requirements::themedCSS('form'); 
 	}
 
 }

themes/tutorial/css/editor.css

@@ -1,14 +0,0 @@
-/**
- * This support file is used to style the WYSIWYG editor in the CMS
- */
-
-@import "typography.css";
-
-body.mceContentBody {
-	min-height: 200px;
-	font-size: 62.5%;
-}
-body.mceContentBody a.broken {
-	background-color: #FF7B71;
-	border: 1px red solid;
-}

themes/tutorial/css/form.css

@@ -1,64 +0,0 @@
-/* GENERIC FORM STYLING */
-#Content form {
-	width:378px;
-}
-	#Content form fieldset {
-		border:0;
-		padding:12px;
-	}
-		#Content .message {
-			color:red;
-			background:#ddd;
-			border:1px solid #ccc;
-			padding:5px;
-			margin:5px;
-		}
-		#Content span.message {
-			width: 300px;
-		}
-		#Content form div {
-			margin-top:10px;
-			width:100%;
-		}
-		#Content form label {
-			font-size:1.1em;
-			color:#333;
-		}
-			#Content form label.left {
-				float:left;
-				width:12em;
-			}
-			#Content form label.FormHeading {
-				font-size:1.3em;
-				color:#ff7200;
-				font-weight:bold;
-			}
-		#Content form input.text,
-		#Content form textarea,
-		#Content form select {
-			width:200px;
-			color:#000;
-			background:#f8f8f8;
-			border:1px solid #aaa;
-			padding:3px;
-		}
-		
-		#Content form input.numeric {
-			width:20px;
-			background:#f0f0f0;
-			border:1px solid #aaa;
-			padding:3px;
-			color:#000;
-			margin-right:4px;
-		}
-		#Content form input.year {
-			width:35px;
-		}
-		#Content form p.Actions {
-			text-align:right;
-			padding:0 22px 15px 0;
-		}
-			#Content form p.Actions input {
-				padding:2px;
-			}
-

themes/tutorial/css/layout.css

@@ -1,435 +0,0 @@
-/* Global Resetting */
-html{	
-	width: 100%;
-	height: 100%;
-	background:url(../images/body_bg.gif) repeat;
-}
-body {
-	width: 100%;
-	height: 100%;
-	font-size: 62.5%;
-	/* reset font-sizes to 1em == 10px */
-}
-* {
-	font-size: 1em;
-	/* reset font-sizes to 1em == 10px */
-	padding: 0;
-	margin: 0;
-	font-family:Verdana,Helvetica,sans-serif;
-	list-style:none;
-}
-a img{
-	border:0;
-}
-.clear{
-	clear:both;
-}
-
-/* Layout CSS */
-#Main {
-	margin:20px auto;
-	width:900px;
-}
-#Header {
-	background:url(../images/blueback.gif) bottom left repeat-x;
-	border-left:1px solid #ccc;
-	border-right:1px solid #ccc;
-	clear:left;
-}
-	#Header h1 {
-		color:#fff;
-		font-size:1.5em;
-		line-height:4.5em;
-		padding-left:20px;
-	}
-		#Menu1 {
-			padding:10px 50px 0;
-		}
-			#Menu1 li {
-				float:left;
-				margin-left:2px;
-				background:url(../images/menu1_right.gif) no-repeat right top;
-			}
-				#Menu1 li.current,
-				#Menu1 li.section {
-					background:url(../images/menu1_right_on.gif) no-repeat right top;
-				}
-				#Menu1 li a {
-					display:block;
-					color:#fff;
-					font-weight:bold;
-					font-size:1.1em;
-					text-decoration:none;
-					padding:5px 15px;
-					background:url(../images/menu1_left.gif) no-repeat left top;
-				}
-					#Menu1 li a:hover {
-						color:#d2ebff;
-					}
-					#Menu1 li.current a,
-					#Menu1 li.section a {
-						background:url(../images/menu1_left_on.gif) no-repeat left top;
-						color:#d2ebff;
-					}
-
-#ContentContainer {
-	background:#f5f5f5 url(../images/ss_watermark.gif) bottom left no-repeat;
-	padding-top:20px;
-	padding-bottom:20px;
-	overflow: auto;
-}
-
-#Banner {
-	text-align: center;
-}
-
-#Menu2 {
-	margin-left: 20px;
-	width: 17em;
-	float:left;
-	background:#f0f0f0;
-	border:1px solid #ddd;
-	padding:10px 10px 10px 10px;
-}
-	#Menu2 li {
-		padding-left:15px;
-		background:url(../images/menu2_arrow.gif) no-repeat left center;
-	}
-	#Menu2 a {
-		color:#333;
-		font-weight:bold;
-		font-size:1.1em;
-		line-height:1.6em;
-		text-decoration:none;
-	}
-	#Menu2 a:hover {
-		text-decoration:underline;
-	}
-	#Menu2 li.current a,
-	#Menu2 li.section a {
-		color:#0083C8;
-	}
-
-#Content {
-	float: left;
-	margin: 0px 20px;
-	width:70%;
-}
-
-div.breadcrumbs {
-	margin-bottom:10px;
-	font-size:1em;
-	color:#666;
-}
-div.breadcrumbs a {
-	text-decoration:none;
-}
-
-#Footer {
-	background:#015581;
-	clear:both;
-	text-align:right;
-	padding-right:20px;
-	border:1px solid #ccc;
-	border-top:0;
-}
-	#Footer span {
-		color:#ccc;
-		font-size:1.1em;
-		line-height:2em;
-		font-weight:bold;
-		padding-left:20px;
-		background:url(../images/ss_logo.gif) no-repeat;
-	}
-	#Footer a {
-		color:#fff;
-	}
-		#Footer a:hover {
-			text-decoration:none;
-		}
-
-
-/* The rest of this file is for the second tutorial */
-#NewsList,
-#StaffList {
-	background:#f0f0f0;
-	border:1px dotted #ccc;
-	padding:10px;
-}
-
-#NewsList li,
-#StaffList li {
-	margin: 0;
-	list-style-type: none;
-}
-	#NewsList li.newsDateTitle span {
-		color:#666;
-		line-height:2em;
-	}
-	#NewsList li.newsDateTitle a {
-		font-size:1.3em;
-		font-weight:bold;
-		color:#0083C8;
-		text-decoration:none;
-		padding-left:20px;
-		background:url(../images/treeicons/news-file.gif) no-repeat left center;
-	}
-		#NewsList li.newsDateTitle a:hover {
-			border-bottom:1px dotted #0083C8;
-		}
-		
-	#NewsList li.newsSummary {
-		margin-bottom:20px;
-	}
-		#NewsList li.newsSummary span {
-			font-size:1.1em;
-			line-height:1.5em;
-			color:#333;
-		}
-		#NewsList li.newsSummary a.readMoreLink {
-			color:#0083C8;
-			text-decoration:none;
-		}
-			#NewsList li.newsSummary a.readMoreLink:hover {
-				border-bottom:1px dotted #0083C8;
-			}
-
-div.newsDetails {
-	margin-bottom:10px;
-}
-
-div.newsDetails p {
-	color:#666;
-	margin:0;
-	font-size:1em;
-}
-
-div.pageComments {
-	background:#f0f0f0;
-	border:1px dotted #ccc;
-	padding:10px;
-}
-
-#StaffList .staffname { 
-	clear: both;
-	padding-left: 60px;
-	height: 1.2em;
-}
-
-#StaffList .staffphoto {
-	float: left;
-	margin-left: 3px;
-	margin-top: -1.2em;
-}     
-#StaffList .staffphoto img {
-	border:1px solid #AAA;
-}
-
-#StaffList .staffdescription {
-	margin-left: 60px;
-	margin-bottom:30px;
-}
-
-#StaffPhoto {
-	float: left;
-	margin-right: 10px;
-}
-
-#StaffPhoto img {
-	border:1px solid #AAA;
-}
-
-#PageComments {
-	list-style:none;
-	background:#e9e9e9;
-	border:1px solid #ccc;
-	border-bottom:0;
-	padding:0;
-	margin:0;
-}
-	#PageComments li {
-		list-style:none;
-		padding:5px;
-		margin:0;
-		font-size:1em;
-		border-bottom:1px dotted #bbb;
-	}
-		#PageComments li p span {
-			font-style:italic;
-		}
-		#PageComments a.deletelink {
-			font-weight:bold;
-		}
-
-			
-#PageNumbers {
-	font-weight:bold;
-	color:#333;
-	font-size:1.1em;
-	text-align:center;
-	padding:5px;
-	border:1px solid #ddd;
-	background:#e9e9e9;
-}
-#PageNumbers * {
-	padding:0 5px;
-	line-height:1.5em;
-}
-#PageNumbers a {
-	color:#0083C8;
-	text-decoration:none;
-}
-	#PageNumbers a:hover {
-		text-decoration:underline;
-	}
-
-#BrowserPoll {
-	width: 200px;
-	float: right;
-	margin-right: 20px;
-	margin-top: 20px;
-}
-#BrowserPoll h2 {
-	color:#0083C8;
-	font-size:1.2em;
-}
-#BrowserPoll ul {
-	margin: 0;	
-}
-#BrowserPoll li {
-	list-style-type: none;
-	margin: 0;
-}
-#BrowserPoll .browser {
-	color:#333;
-	line-height:1.5em;
-	font-size:1.1em;
-}
-#BrowserPoll .bar {
-	background-color: #015581;
-}
-#BrowserPoll form {
-	width:100%;
-}
-	#BrowserPoll form fieldset{
-		border:0;
-	}
-		#BrowserPoll .message {
-			color:red;
-			background:#ddd;
-			border:1px solid #ccc;
-			padding:5px;
-			margin:5px;
-		}
-		#BrowserPoll span.message {
-			width: 100%;
-		}
-		#BrowserPoll form div {
-			margin-top:10px;
-			width:100%;
-		}
-		#BrowserPoll form label {
-			font-size:1.1em;
-			color:#333;
-		}
-			#BrowserPoll form label.left {
-				float:left;
-			}
-			#BrowserPoll form label.FormHeading {
-				font-size:1.3em;
-				color:#ff7200;
-				font-weight:bold;
-			}
-		#BrowserPoll form input.text,
-		#BrowserPoll form textarea,
-		#BrowserPoll form select {
-			width:100%;
-			color:#000;
-			background:#f8f8f8;
-			border:1px solid #aaa;
-			padding:3px;
-		}
-		
-		#BrowserPoll form input.numeric {
-			width:20px;
-			background:#f0f0f0;
-			border:1px solid #aaa;
-			padding:3px;
-			color:#000;
-			margin-right:4px;
-		}
-		#BrowserPoll form input.year {
-			width:35px;
-		}
-		#BrowserPoll form p.Actions {
-			text-align:right;
-			padding:0 22px 15px 0;
-		}
-			#BrowserPoll form p.Actions input {
-				padding:2px;
-			}
-		#BrowserPoll form ul.optionset {
-			padding-top: 15px;
-			padding-left: 15px;
-		}
-			#BrowserPoll form ul.optionset li {
-				list-style-type: none;
-			}
-
-#Header form {
-	float:right;
-	width:160px;
-	margin:25px 25px 0px 25px;
-}
-	#Header form * {
-		display:inline !important;
-	}
-	#Header form div {
-	}
-	#Header form input.text {
-		width:110px;
-		color:#000;
-		background:#f0f0f0;
-		border:1px solid #aaa;
-		padding:3px;
-	}
-	#Header form input.action {
-		font-weight:bold;
-	}
-
-.searchResults h2 {
-	font-size:2.2em;
-	font-weight:normal;
-	color:#0083C8;
-	margin-bottom:15px;
-}
-.searchResults p.searchQuery {
-	color:#333;
-	margin-bottom:10px;
-}
-
-.searchResults ul#SearchResults li {
-	margin-bottom:20px;
-}
-	ul#SearchResults p {
-		font-size:1.1em;
-		font-weight:normal;
-		line-height:2em;
-		color:#333;
-	}
-	ul#SearchResults a.searchResultHeader {
-		font-size:1.3em;
-		font-weight:bold;
-		color:#0083C8;
-		text-decoration:none;
-		margin:20px 0 8px 0;
-		padding-left:20px;
-		background:url(../images/treeicons/search-file.gif) no-repeat left center;
-	}
-		ul#SearchResults a {
-			text-decoration:none;
-			color:#0083C8;
-		}
-		ul#SearchResults a:hover {
-		border-bottom:1px dotted #0083C8;
-		}

themes/tutorial/css/typography.css

@@ -1,113 +0,0 @@
-/**
- * This typography file is included in the WYSIWYG editor
- */
-.typography * {
-	font-family:Verdana,Arial,sans-serif;
-	font-size:1em;
-}
-.typography blockquote {
-	margin-left:20px;
-}
-.typography hr {
-	padding:5px;
-}
-.typography p,
-.typography ul li,
-.typography ol li,
-.typography a {
-	color:#333;
-	line-height:1.5em;
-	font-size:1.1em;
-}
-.typography p {
-	margin-bottom:20px;
-}
-
-
-/** CMS LIST STYLES **/
-.typography ul,
-.typography ol {
-	margin-left:10px;
-	margin-bottom:20px;
-}
-	.typography ul li,
-	.typography ol li {
-		margin:4px 10px;
-		line-height:1.4em;
-	}
-		.typography ul li {
-		 list-style-type:disc;
-		}
-		.typography ol li {
-			list-style-type:decimal;
-    }
-
-/* HEADER STYLES */
-
-.typography h1,
-.typography h2,
-.typography h3,
-.typography h4 {
-	margin-bottom:14px;
-	color:#0083C8;
-}
-.typography h1,
-.typography h4 {
-	font-weight:bold;
-}
-.typography h2,
-.typography h3 {
-	font-weight:normal;
-}
-	.typography h1 {
-		font-size:2.2em;
-	}
-	.typography h2 {
-		font-size:2.2em;
-	}
-	.typography h3 {
-		font-size:1.6em;
-	}
-	.typography h4 {
-		font-size:1.4em;
-	}
-
-/* LINK STYLES */
-.typography a {
-	color:#0083C8;
-  font-size:1em;
-  text-decoration:none;
-}
-	.typography a:hover {
-		text-decoration:underline;
-	}
-	
-	
-.typography table {
-	font-size:1.1em;
-}
-	.typography table tr td {
-		padding:3px 5px;
-	}
-
-	
-/* WYSIWYG EDITOR ALIGNMENT CLASSES */
-.typography .left {
-	text-align:left;
-}
-.typography .center {
-	text-align:center;
-}
-.typography .right {
-	text-align:right;
-}
-.typography img.right {
-	float:right;
-}
-.typography img.left {
-	float:left;
-}
-
-.typography p.MsoNormal, .typography p.MsoBodyText {
-	margin: 0;
-}

themes/tutorial/templates/Page.ss

@@ -1,28 +0,0 @@
-<!doctype html>
-<html lang="en">
-	<head>
-		<% base_tag %>
-		<meta charset="utf-8">
-		<title></title>
-		<link rel="stylesheet" type="text/css" href="tutorial/css/layout.css" />
-		<link rel="stylesheet" type="text/css" href="tutorial/css/typography.css" />
-		<link rel="stylesheet" type="text/css" href="tutorial/css/form.css" />
-	</head>
-	<body>
-		<div id="Main">
-			<div id="Header">
-				<h1>&nbsp;</h1>
-			</div>
-			<div id="ContentContainer">
-				<div id="Content" class="typography">
-					$Content
-					$Form
-				</div>
-			</div>
-			<div id="Footer">
-				<span>Visit <a href="http://www.silverstripe.com" title="Visit www.silverstripe.com">www.silverstripe.com</a> to download the CMS</span>
-			</div>
-		</div>
-		$SilverStripeNavigator
-	</body>
-</html>