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

services/web/app/coffee/infrastructure/ExpressLocals.coffee

@@ -131,6 +131,7 @@ module.exports = (app)->
 
 	app.use (req, res, next) ->
 		res.locals.nav = Settings.nav
+		res.locals.templates = Settings.templates
 		next()
 		
 	app.use (req, res, next) ->

services/web/app/views/project/list/side-bar.jade

@@ -21,22 +21,12 @@
 				href,
 				ng-click="openUploadProjectModal()"
 			) #{translate("upload_project")}
-		li.divider
-		li.dropdown-header #{translate("templates")}
-		li
-			a.menu-indent(href="/templates/cv") #{translate("cv_or_resume")}
-		li
-			a.menu-indent(href="/templates/cover-letters") #{translate("cover_letter")}
-		li
-			a.menu-indent(href="/templates/journals") #{translate("journal_article")}
-		li
-			a.menu-indent(href="/templates/presentations") #{translate("presentation")}
-		li
-			a.menu-indent(href="/templates/thesis") #{translate("thesis")}
-		li
-			a.menu-indent(href="/templates/bibliographies") #{translate("bibliographies")}
-		li
-			a.menu-indent(href="/templates") #{translate("view_all")} »
+		if (templates)
+			li.divider
+			li.dropdown-header #{translate("templates")}
+			each item in templates
+				li
+					a.menu-indent(href=item.url) #{translate(item.name)}
 
 .row-spaced(ng-if="projects.length > 0", ng-cloak)
 	ul.list-unstyled.folders-menu(

services/web/config/settings.defaults.coffee

@@ -279,6 +279,29 @@ module.exports =
 			}]
 		}]
 	
+#	templates: [{
+#		name : "cv_or_resume",
+#		url : "/templates/cv"
+#	}, {
+#		name : "cover_letter",
+#		url : "/templates/cover-letters"
+#	}, {
+#		name : "journal_article",
+#		url : "/templates/journals"
+#	}, {
+#		name : "presentation",
+#		url : "/templates/presentations"
+#	}, {
+#		name : "thesis",
+#		url : "/templates/thesis"
+#	}, {
+#		name : "bibliographies",
+#		url : "/templates/bibliographies"
+#	}, {
+#		name : "view_all",
+#		url : "/templates"
+#	}]
+
 
 	redirects:
 		"/templates/index": "/templates/"