cleaned up settings file and added refernces option in

settings.coffee

@@ -155,270 +155,146 @@ settings =
 	# dictionaries you have installed. These should be set for the `code` for
 	# each language.
 	languages: [{
-		"code":"en",
+		"code":"en", "name":"English (American)"
-		"name":"English (American)"
 		},{
-		"code":"en_GB",
+		"code":"en_GB", "name":"English (British)"
-		"name":"English (British)"
 		},{
-		"code":"af",
+		"code":"af", "name":"Africaans"
-		"name":"Africaans"
 		},{
-		"code":"am",
+		"code":"am", "name":"Amharic"
-		"name":"Amharic"
 		},{
-		"code":"ar",
+		"code":"ar", "name":"Arabic"
-		"name":"Arabic"
 		},{
-		"code":"hy",
+		"code":"hy", "name":"Armenian"
-		"name":"Armenian"
 		},{
-		"code":"gl",
+		"code":"gl", "name":"Galician"
-		"name":"Galician"
 		},{
-		"code":"eu",
+		"code":"eu", "name":"Basque"
-		"name":"Basque"
 		},{
-		"code":"bn",
+		"code":"bn", "name":"Bengali"
-		"name":"Bengali"
 		},{
-		"code":"br",
+		"code":"br", "name":"Breton"
-		"name":"Breton"
 		},{
-		"code":"bg",
+		"code":"bg", "name":"Bulgarian"
-		"name":"Bulgarian"
 		},{
-		"code":"ca",
+		"code":"ca", "name":"Catalan"
-		"name":"Catalan"
 		},{
-		"code":"hr",
+		"code":"hr", "name":"Croatian"
-		"name":"Croatian"
 		},{
-		"code":"cs",
+		"code":"cs", "name":"Czech"
-		"name":"Czech"
 		},{
-		"code":"da",
+		"code":"da", "name":"Danish"
-		"name":"Danish"
 		},{
-		"code":"nl",
+		"code":"nl", "name":"Dutch"
-		"name":"Dutch"
 		},{
-		"code":"eo",
+		"code":"eo", "name":"Esperanto"
-		"name":"Esperanto"
 		},{
-		"code":"et",
+		"code":"et", "name":"Estonian"
-		"name":"Estonian"
 		},{
-		"code":"fo",
+		"code":"fo", "name":"Faroese"
-		"name":"Faroese"
 		},{
-		"code":"fr",
+		"code":"fr", "name":"French"
-		"name":"French"
 		},{
-		"code":"de",
+		"code":"de", "name":"German"
-		"name":"German"
 		},{
-		"code":"el",
+		"code":"el", "name":"Greek"
-		"name":"Greek"
 		},{
-		"code":"gu",
+		"code":"gu", "name":"Gujarati"
-		"name":"Gujarati"
 		},{
-		"code":"he",
+		"code":"he", "name":"Hebrew"
-		"name":"Hebrew"
 		},{
-		"code":"hi",
+		"code":"hi", "name":"Hindi"
-		"name":"Hindi"
 		},{
-		"code":"hu",
+		"code":"hu", "name":"Hungarian"
-		"name":"Hungarian"
 		},{
-		"code":"is",
+		"code":"is", "name":"Icelandic"
-		"name":"Icelandic"
 		},{
-		"code":"id",
+		"code":"id", "name":"Indonesian"
-		"name":"Indonesian"
 		},{
-		"code":"ga",
+		"code":"ga", "name":"Irish"
-		"name":"Irish"
 		},{
-		"code":"it",
+		"code":"it", "name":"Italian"
-		"name":"Italian"
 		},{
-		"code":"kn",
+		"code":"kn", "name":"Kannada"
-		"name":"Kannada"
 		},{
-		"code":"kk",
+		"code":"kk", "name":"Kazakh"
-		"name":"Kazakh"
 		},{
-		"code":"ku",
+		"code":"ku", "name":"Kurdish"
-		"name":"Kurdish"
 		},{
-		"code":"lv",
+		"code":"lv", "name":"Latvian"
-		"name":"Latvian"
 		},{
-		"code":"lt",
+		"code":"lt", "name":"Lithuanian"
-		"name":"Lithuanian"
 		},{
-		"code":"ml",
+		"code":"ml", "name":"Malayalam"
-		"name":"Malayalam"
 		},{
-		"code":"mr",
+		"code":"mr", "name":"Marathi"
-		"name":"Marathi"
 		},{
-		"code":"nr",
+		"code":"nr", "name":"Ndebele"
-		"name":"Ndebele"
 		},{
-		"code":"ns",
+		"code":"ns", "name":"Northern Sotho"
-		"name":"Northern Sotho"
 		},{
-		"code":"no",
+		"code":"no", "name":"Norwegian"
-		"name":"Norwegian"
 		},{
-		"code":"or",
+		"code":"or", "name":"Oriya"
-		"name":"Oriya"
 		},{
-		"code":"fa",
+		"code":"fa", "name":"Persian"
-		"name":"Persian"
 		},{
-		"code":"pl",
+		"code":"pl", "name":"Polish"
-		"name":"Polish"
 		},{
-		"code":"pt_BR",
+		"code":"pt_BR", "name":"Portuguese (Brazilian)"
-		"name":"Portuguese (Brazilian)"
 		},{
-		"code":"pt_PT",
+		"code":"pt_PT", "name":"Portuguese (European)"
-		"name":"Portuguese (European)"
 		},{
-		"code":"pa",
+		"code":"pa", "name":"Punjabi"
-		"name":"Punjabi"
 		},{
-		"code":"ro",
+		"code":"ro", "name":"Romanian"
-		"name":"Romanian"
 		},{
-		"code":"ru",
+		"code":"ru", "name":"Russian"
-		"name":"Russian"
 		},{
-		"code":"sk",
+		"code":"sk", "name":"Slovak"
-		"name":"Slovak"
 		},{
-		"code":"sl",
+		"code":"sl", "name":"Slovenian"
-		"name":"Slovenian"
 		},{
-		"code":"st",
+		"code":"st", "name":"Southern Sotho"
-		"name":"Southern Sotho"
 		},{
-		"code":"es",
+		"code":"es", "name":"Spanish"
-		"name":"Spanish"
 		},{
-		"code":"ss",
+		"code":"ss", "name":"Swazi"
-		"name":"Swazi"
 		},{
-		"code":"sv",
+		"code":"sv", "name":"Swedish"
-		"name":"Swedish"
 		},{
-		"code":"tl",
+		"code":"tl", "name":"Tagalog"
-		"name":"Tagalog"
 		},{
-		"code":"ta",
+		"code":"ta", "name":"Tamil"
-		"name":"Tamil"
 		},{
-		"code":"te",
+		"code":"te", "name":"Telugu"
-		"name":"Telugu"
 		},{
-		"code":"ts",
+		"code":"ts", "name":"Tsonga"
-		"name":"Tsonga"
 		},{
-		"code":"tn",
+		"code":"tn", "name":"Tswana"
-		"name":"Tswana"
 		},{
-		"code":"uk",
+		"code":"uk", "name":"Ukrainian"
-		"name":"Ukrainian"
 		},{
-		"code":"hsb",
+		"code":"hsb", "name":"Upper Sorbian"
-		"name":"Upper Sorbian"
 		},{
-		"code":"uz",
+		"code":"uz", "name":"Uzbek"
-		"name":"Uzbek"
 		},{
-		"code":"cy",
+		"code":"cy", "name":"Welsh"
-		"name":"Welsh"
 		},{
-		"code":"xh",
+		"code":"xh", "name":"Xhosa"
-		"name":"Xhosa"
 		},{
-		"code":"zu",
+		"code":"zu", "name":"Zulu"
-		"name":"Zulu"
 		}
 	]
 
-	# Service locations
-	# -----------------
-
-	# ShareLaTeX is comprised of many small services, which each expose
-	# an HTTP API running on a different port. Generally you
-	# can leave these as they are unless you have some other services
-	# running which conflict, or want to run the web process on port 80.
-	# internal:
-	# 	web:
-	# 		port: webPort = 3000
-	# 		host: "localhost"
-	# 	documentupdater:
-	# 		port: docUpdaterPort = 3003
-	# 		host: "localhost"
-	# 	filestore:
-	# 		port: filestorePort = 3009
-	# 		host: "localhost"
-	# 	chat:
-	# 		port: chatPort = 3010
-	# 		host: "localhost"
-	# 	tags:
-	# 		port: tagsPort = 3012
-	# 		host: "localhost"
-	# 	clsi:
-	# 		port: clsiPort = 3013
-	# 		host: "localhost"
-	# 	trackchanges:
-	# 		port: trackchangesPort = 3015
-	# 		host: "localhost"
-	# 	docstore:
-	# 		port: docstorePort = 3016
-	# 		host: "localhost"
-	# 	spelling:
-	# 		port: spellingPort = 3005
-	# 		host: "localhost"
-	# 	templates:
-	# 		port: templatesPort = 3007
-	# 		host: "localhost"
-
-	# If you change the above config, or run some services on remote servers,
-	# you need to tell the other services where to find them:
 	apis:
 		web:
 			url: "http://localhost:3000"
 			user: httpAuthUser
 			pass: httpAuthPass
-	references:undefined
+	references:{}
 	notifications:undefined
 
-	# 	documentupdater:
-	# 		url : "http://localhost:#{docUpdaterPort}"
-	# 	clsi:
-	# 		url: "http://localhost:#{clsiPort}"
-	# 	filestore:
-	# 		url: "http://localhost:#{filestorePort}"
-	# 	trackchanges:
-	# 		url: "http://localhost:#{trackchangesPort}"
-	# 	docstore:
-	# 		url: "http://localhost:#{docstorePort}"
-	# 	tags:
-	# 		url: "http://localhost:#{tagsPort}"
-	# 	spelling:
-	# 		url: "http://localhost:#{spellingPort}"
-	# 	chat:
-	# 		url: "http://localhost:#{chatPort}"
-	#	templates:
-	#		url: "http://localhost:#{templatesPort}"
 
 
 #### OPTIONAL CONFIGERABLE SETTINGS
@@ -440,7 +316,10 @@ if process.env["SHARELATEX_HEADER_IMAGE_URL"]?
 	settings.nav.custom_logo = process.env["SHARELATEX_HEADER_IMAGE_URL"]
 	
 if process.env["SHARELATEX_HEADER"]?
-	settings.nav.header = process.env["SHARELATEX_HEADER"]
+	settings.nav.header = process.env["SHARELATEX_HEADER_NAV_LINKS"]
+
+# if process.env["SHARELATEX_PROXY_LEARN"]?
+# 	settings.nav.header.push({text: "help", class: "subdued", dropdown: [{text: "documentation", url: "/learn"}] })
 
 
 # Sending Email
@@ -500,7 +379,9 @@ if process.env["SHARELATEX_PASSWORD_VALIDATION_PATTERN"] or process.env["SHARELA
 # ShareLaTeX Server Pro
 #######################
 
-
+if parse(process.env["SHARELATEX_IS_SERVER_PRO"]) == true
+	settings.apis.references =
+		 url: "http://localhost:3040"
 
 
 # LDAP - SERVER PRO ONLY
@@ -566,6 +447,8 @@ if process.env["SHARELATEX_TEMPLATES_USER_ID"]
 		mountPointUrl: "/templates"
 		user_id: process.env["SHARELATEX_TEMPLATES_USER_ID"]
 		
+	settings.templateLinks = parse(process.env["SHARELATEX_NEW_PROJECT_TEMPLATE_LINKS"])
+
 
 # /Learn
 # -------
@@ -573,6 +456,12 @@ if process.env["SHARELATEX_PROXY_LEARN"]?
 	settings.proxyLearn = parse(process.env["SHARELATEX_PROXY_LEARN"])
 
 
+# /References
+# -----------
+if process.env["SHARELATEX_ELASTICSEARCH_URL"]?
+	settings.references.elasticsearch =
+			host: process.env["SHARELATEX_ELASTICSEARCH_URL"]
+	
 
 # With lots of incoming and outgoing HTTP connections to different services,
 # sometimes long running, it is a good idea to increase the default number
@@ -583,3 +472,4 @@ https = require('https')
 https.globalAgent.maxSockets = 300
 
 module.exports = settings
+