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

services/web/app/views/layout.jade

@@ -34,6 +34,28 @@ html(itemscope, itemtype='http://schema.org/Product')
 		script(src="//ajax.googleapis.com/ajax/libs/jquery/1.11.1/jquery.min.js")
 		script(src="//ajax.googleapis.com/ajax/libs/angularjs/1.3.0-beta.14/angular.min.js")
 		
+		script.
+			window.sharelatex = {
+				siteUrl: '#{settings.siteUrl}',
+				jsPath:  '#{jsPath}'
+			};
+
+		- if (typeof(settings.algolia) != "undefined")
+			script.
+				window.sharelatex.algolia = {
+					app_id:'#{settings.algolia.app_id}',
+					api_key:'#{settings.algolia.read_only_api_key}',
+					indexes:!{JSON.stringify(settings.algolia.indexes)}
+				}
+
+		- if (typeof(settings.apis) != "undefined" && typeof(settings.apis.templates_api) != "undefined")
+			script.
+				window.sharelatex.templates = {
+					user_id : '!{settings.apis.templates_api.user_id}',
+					cdnDomain : '!{settings.apis.templates_api.cdnDomain}',
+					indexName : '!{settings.apis.templates_api.indexName}'
+				}
+				
 	body
 		- if(typeof(suppressNavbar) == "undefined")
 			include layout/navbar
@@ -73,25 +95,5 @@ html(itemscope, itemtype='http://schema.org/Product')
 					category: "questions"
 				};
 
-		script.
-			window.sharelatex = {
-				siteUrl: '#{settings.siteUrl}',
-				jsPath:  '#{jsPath}'
-			};
-
-		- if (typeof(settings.algolia) != "undefined")
-			script.
-				window.sharelatex.algolia = {
-					app_id:'#{settings.algolia.app_id}',
-					api_key:'#{settings.algolia.read_only_api_key}',
-					indexes:!{JSON.stringify(settings.algolia.indexes)}
-				}
-
-		- if (typeof(settings.apis) != "undefined" && typeof(settings.apis.templates_api) != "undefined")
-			script.
-				window.sharelatex.templates = {
-					user_id : '!{settings.apis.templates_api.user_id}',
-					cdnDomain : '!{settings.apis.templates_api.cdnDomain}',
-					indexName : '!{settings.apis.templates_api.indexName}'
-				}
+	
 

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

@@ -37,7 +37,7 @@ block content
 			.row
 				-each tag in tags
 					-if(tag.totalNumberOfTemplates > 0)
-						.page-header.col-md-12
+						.template-section-header.col-md-12
 							h2 
 								a(href=tag.tagPagePath) #{tag.name}
 						.row

services/web/public/coffee/main/templates.coffee

@@ -17,8 +17,6 @@ define [
 
 
 	App.factory "algolia", ->
-		console.log window.sharelatex.algolia?.app_id, window.sharelatex.algolia?.api_key
-
 		if window?.sharelatex?.algolia?.app_id?
 			client = new AlgoliaSearch(window.sharelatex.algolia?.app_id, window.sharelatex.algolia?.api_key)
 			index = client.initIndex(window.sharelatex.algolia?.indexes?.templates)

services/web/public/stylesheets/app/templates.less

@@ -29,6 +29,10 @@
 
 }
 
+.template-section-header:extend(.page-header) {
+	margin-top: 0px;
+}
+
 .social_buttons {
 	padding-top: 20px;
 }