Merge pull request #92 from SpiritLevel/favicons

MINOR: move favicons to themes/docs/favicons/ folder

.htaccess

@@ -12,12 +12,17 @@
 <IfModule mod_rewrite.c>
 	RewriteEngine On
 
+	# Redirect requests for $AbsoluteBaseURL/favicon.ico to $AbsoluteBaseURL/$ThemeDir/favicons/favicon.ico
+	RewriteCond %{REQUEST_URI} !^/favicon\.ico [NC]
+	RewriteCond %{REQUEST_URI} favicon\.ico [NC]
+	RewriteRule (.*) http://docs.silverstripe.org/themes/docs/favicons/favicon.ico [R=301,L]
+
 	# Legacy rewrite from sapphire/ to framework/ namespace
 	RewriteCond %{REQUEST_FILENAME} !-f
 	RewriteCond %{REQUEST_URI} !^framework/main\.php
 	RewriteRule ^sapphire/?(.*) http://doc.silverstripe.org/framework/$1 [R=301,L]
 	
-	#Rewrite framework to the new base url
+	# Rewrite framework to the new base url
 	RewriteCond %{REQUEST_URI} ^/?framework/en/
 	RewriteRule ^framework/en/(.*)$ /en/$1 [R=301,NC,QSA,L]
 

themes/docs/templates/Includes/DocumentationHead.ss

@@ -3,28 +3,28 @@
 	<meta charset="utf-8" />
 	<title><% if Title %>$Title &#8211; <% end_if %>SilverStripe Documentation</title>
 
-	<link rel="apple-touch-icon" sizes="57x57" href="/apple-touch-icon-57x57.png">
-	<link rel="apple-touch-icon" sizes="60x60" href="/apple-touch-icon-60x60.png">
-	<link rel="apple-touch-icon" sizes="72x72" href="/apple-touch-icon-72x72.png">
-	<link rel="apple-touch-icon" sizes="76x76" href="/apple-touch-icon-76x76.png">
-	<link rel="apple-touch-icon" sizes="114x114" href="/apple-touch-icon-114x114.png">
-	<link rel="apple-touch-icon" sizes="120x120" href="/apple-touch-icon-120x120.png">
-	<link rel="apple-touch-icon" sizes="144x144" href="/apple-touch-icon-144x144.png">
-	<link rel="apple-touch-icon" sizes="152x152" href="/apple-touch-icon-152x152.png">
-	<link rel="apple-touch-icon" sizes="180x180" href="/apple-touch-icon-180x180.png">
-	<link rel="icon" type="image/png" href="/favicon-32x32.png" sizes="32x32">
-	<link rel="icon" type="image/png" href="/favicon-194x194.png" sizes="194x194">
-	<link rel="icon" type="image/png" href="/favicon-96x96.png" sizes="96x96">
-	<link rel="icon" type="image/png" href="/android-chrome-192x192.png" sizes="192x192">
-	<link rel="icon" type="image/png" href="/favicon-16x16.png" sizes="16x16">
-	<link rel="manifest" href="/manifest.json"> <%-- Controls which icon to use for Android Chrome --%>
-	<link rel="mask-icon" href="/safari-pinned-tab.svg" color="#5bbad5">
+	<link rel="apple-touch-icon" sizes="57x57" href="$ThemeDir/favicons/apple-touch-icon-57x57.png">
+	<link rel="apple-touch-icon" sizes="60x60" href="$ThemeDir/favicons/apple-touch-icon-60x60.png">
+	<link rel="apple-touch-icon" sizes="72x72" href="$ThemeDir/favicons/apple-touch-icon-72x72.png">
+	<link rel="apple-touch-icon" sizes="76x76" href="$ThemeDir/favicons/apple-touch-icon-76x76.png">
+	<link rel="apple-touch-icon" sizes="114x114" href="$ThemeDir/favicons/apple-touch-icon-114x114.png">
+	<link rel="apple-touch-icon" sizes="120x120" href="$ThemeDir/favicons/apple-touch-icon-120x120.png">
+	<link rel="apple-touch-icon" sizes="144x144" href="$ThemeDir/favicons/apple-touch-icon-144x144.png">
+	<link rel="apple-touch-icon" sizes="152x152" href="$ThemeDir/favicons/apple-touch-icon-152x152.png">
+	<link rel="apple-touch-icon" sizes="180x180" href="$ThemeDir/favicons/apple-touch-icon-180x180.png">
+	<link rel="icon" type="image/png" href="$ThemeDir/favicons/favicon-32x32.png" sizes="32x32">
+	<link rel="icon" type="image/png" href="$ThemeDir/favicons/favicon-194x194.png" sizes="194x194">
+	<link rel="icon" type="image/png" href="$ThemeDir/favicons/favicon-96x96.png" sizes="96x96">
+	<link rel="icon" type="image/png" href="$ThemeDir/favicons/android-chrome-192x192.png" sizes="192x192">
+	<link rel="icon" type="image/png" href="$ThemeDir/favicons/favicon-16x16.png" sizes="16x16">
+	<link rel="manifest" href="$ThemeDir/favicons/manifest.json"> <%-- Controls which icon to use for Android Chrome --%>
+	<link rel="mask-icon" href="$ThemeDir/favicons/safari-pinned-tab.svg" color="#5bbad5">
 	<meta name="msapplication-TileColor" content="#005b94">
-	<meta name="msapplication-TileImage" content="/mstile-144x144.png">
+	<meta name="msapplication-TileImage" content="$ThemeDir/favicons/mstile-144x144.png">
 	<meta name="theme-color" content="#1b354c">
 
-	<link rel="stylesheet" href="themes/docs/css/ionicons.min.css" />
-	<link rel="stylesheet" href="themes/docs/css/styles.css" />
+	<link rel="stylesheet" href="$ThemeDir/css/ionicons.min.css" />
+	<link rel="stylesheet" href="$ThemeDir/css/styles.css" />
 	<script type="text/javascript" src="//use.typekit.net/emt4dhq.js"></script>
 	<script type="text/javascript">try{Typekit.load();}catch(e){}</script>
 	<script>window.GLOBAL_NAV_SECONDARY_ID = 1560;</script>