Merge branch 'master' of https://github.com/sharelatex/web-sharelatex

services/web/app/views/layout.jade

@@ -3,11 +3,9 @@ html(itemscope, itemtype='http://schema.org/Product')
 	block vars
 
 	head
-
-		- if (typeof(priority_title) !== "undefined" && priority_title)
-			title= title + ' - '+ translate("online_latex_editor")
-		- else
-			title=  translate("online_latex_editor") +' ShareLaTeX - ' +translate(title)
+		-if (typeof(title) == "undefined")
+			title ShareLaTeX, the Online LaTeX Editor
+		-else
 			title= translate(title) + ' - ShareLaTeX, '+translate("online_latex_editor") 
 
 		link(rel="icon", href="/favicon.ico")
@@ -18,10 +16,14 @@ html(itemscope, itemtype='http://schema.org/Product')
 			each subdomainDetails in settings.i18n.subdomainLang
 				link(rel="alternate", href=subdomainDetails.url+currentUrl, hreflang=subdomainDetails.lngCode)
 
-		meta(itemprop="name" ,content="ShareLaTeX - Real Time Online LaTeX Collaborative Editor in Your Browser")
-		meta(itemprop="description", content="Online LaTeX editor for collaborative editing, great for Maths or Sciences. You don't need to install LaTeX so it's great for beginners too.")
+		meta(itemprop="name", content="ShareLaTeX, the Online LaTeX Editor")
+		
+		-if (typeof(meta) == "undefined")
+			meta(itemprop="description", content="An online LaTeX editor that's easy to use. No installation, real-time collaboration, version control, hundreds of LaTeX templates, and more.")
+		-else
+			meta(itemprop="description", content=meta)
+		
 		meta(itemprop="image", content="https://www.sharelatex.com/favicon.ico")
-		meta(name="description", content="Online LaTeX editor for collaborative editing, great for Maths or Sciences. You don't need to install LaTeX so it's great for beginners too.")
 
 		- if (typeof(gaToken) != "undefined")
 			script(type='text/javascript').

services/web/app/views/templates/template.jade

@@ -1,5 +1,9 @@
 extends ../layout
 
+block vars
+	- var meta = template.description
+	- title = title + " - LaTeX Template"
+
 block content
 	.content.content-alt
 		.container

services/web/config/settings.defaults.coffee

@@ -105,7 +105,7 @@ module.exports =
 
 	# Where your instance of ShareLaTeX can be found publically. Used in emails
 	# that are sent out, generated links, etc.
-	siteUrl : 'http://localhost:3000'
+	siteUrl : siteUrl = 'http://localhost:3000'
 
 	# cooke domain
 	# use full domain for cookies to only be accesabble from that domain,
@@ -144,7 +144,9 @@ module.exports =
 	# ------
 	# 
 	i18n:
-		defaultLng:"en-US"
+		subdomainLang:
+			www: {lngCode:"en", url: siteUrl}
+		defaultLng: "en"
 
 	# Spelling languages
 	# ------------------