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

services/web/app/coffee/Features/Templates/TemplatesWebController.coffee

@@ -7,7 +7,7 @@ module.exports = TemplatesWebController =
 	renderTemplatesIndexPage: (req, res)->
 		logger.log "rendering index page of templates"
 		TemplatesWebController._getDataFromTemplatesApi "/user/#{req.params.user_id}", (err, data)->
-			if err?
+			if err? or !data?
 				logger.err err:err, "something went wrong in renderTemplatesIndexPage"
 				return res.send 500
 			data.title = "LaTeX Templates"
@@ -17,10 +17,10 @@ module.exports = TemplatesWebController =
 		{user_id, tag_name, template_name} = req.params
 		logger.log user_id:user_id, tag_name:tag_name, template_name:template_name, "rendering latex template page"
 		TemplatesWebController._getDataFromTemplatesApi "/user/#{user_id}/tag/#{tag_name}/template/#{template_name}", (err, data)->
-			if err?
+			if err? or !data?
 				logger.err err:err, user_id:user_id, tag_name:tag_name, template_name:template_name, "something went wrong in renerTemplateInTag"
 				return res.send 500
-			data.title = data.template.name
+			data.title = data?.template?.name
 			res.render "templates/template", data
 
 	tagOrCanonicalPage: (req, res)->

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

@@ -1,13 +1,14 @@
 extends ../layout
 
 block content
-
-	.page-header.template-page-header
+	.content.content-alt
 		.container
-			.row
+			.row.template-page-header(ng-controller="SearchController")
+				
 				.col-md-2
-					h1 Templates
-				.col-md-8(ng-controller="SearchController")
+					h2
+						a(href="/templates") Templates
+				.col-md-8
 					form.project-search.form-horizontal(role="form")
 						.form-group.has-feedback.has-feedback-left.col-md-12
 							input.form-control.col-md-12(type='text', ng-model='searchQueryText', ng-keyup='search()', placeholder="Search template library....")
@@ -17,41 +18,41 @@ block content
 								style="cursor: pointer;",
 								ng-show="searchQueryText.length > 0"
 							)
-					ul.unstyled
+				.col-md-12
+					ul.list-unstyled
 						li(ng-repeat='hit in hits')
 							.thumbnail.searchResult
-								.row-fluid
+								.row
 									a(ng-href='{{hit.url}}')
 										.col-md-3
-											img(ng-src='{{hit.image_url}}')
-										.col-md-9
-											h2(ng-bind-html='hit.name')
+											img(src="https://d1hk1zhcb5hn6i.cloudfront.net/52fb8c6f34a287a85245b493/v/0/pdf-converted-cache/style-thumbnail")
+											//img(ng-src='{{hit.image_url}}')
+										.col-md-7
+											h1(ng-bind-html='hit.name')
 											p(ng-bind-html='hit.description')
 
 
 
 
-
-	.container
-		-each tag in tags
-			-if(tag.totalNumberOfTemplates > 0)
-				.page-header.col-md-12
-					h2 
-						a(href=tag.tagPagePath) #{tag.name}
-				.col-md-12
-					.row-fluid
-						-each template in tag.exampleTemplates
-							.col-md-3.template-thumbnail
-								a(href=template.templatePagePath ? template.templatePagePath : template.canonicalUrl).thumbnail
-									//- img(src=template.thumbnailUrl)
-									img(src="https://d1hk1zhcb5hn6i.cloudfront.net/52fb8c1f33621a613683ecad/v/0/pdf-converted-cache/style-thumbnail")
-									div.caption
-										h3.txt-middle #{template.name}
-
-					-if(tag.totalNumberOfTemplates > 4)
-						.row-fluid
-							.col-md-6.offset3.more-templates
-								a(href=tag.tagPagePath) View all #{tag.totalNumberOfTemplates} #{tag.name} templates
+			.row
+				-each tag in tags
+					-if(tag.totalNumberOfTemplates > 0)
+						.page-header.col-md-12
+							h2 
+								a(href=tag.tagPagePath) #{tag.name}
+						.row
+							-each template in tag.exampleTemplates
+								.col-md-3.template-thumbnail
+									a(href=template.templatePagePath ? template.templatePagePath : template.canonicalUrl).thumbnail
+										//- img(src=template.thumbnailUrl)
+										img(src="https://d1hk1zhcb5hn6i.cloudfront.net/52fb8c6f34a287a85245b493/v/0/pdf-converted-cache/style-thumbnail")
+										div.caption
+											h3.txt-middle #{template.name}
+
+							-if(tag.totalNumberOfTemplates > 4)
+								.row-fluid
+									.col-md-6.offset3.more-templates
+										a(href=tag.tagPagePath) View all #{tag.totalNumberOfTemplates} #{tag.name} templates »
 
 
 

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

@@ -5,12 +5,16 @@ block content
 		.container
 			.row
 				.page-header
-					h2 
-						a(href=tag.tagPagePath) #{tag.name}
-
+					h2
+						a(href="/templates") Templates
+						|  ›
+						a(href=tag.tagPagePath)  #{tag.name}
+				.row
 					-each template in templates
 						a(href=template.templatePagePath || template.canonicalUrl) 
-							.span3
-								.template-thumbnail.thumbnail
-									img(src=template.thumbnailUrl)
-									h3.txt-middle #{template.name}
+							.col-md-3.template-thumbnail
+								a(href=template.templatePagePath ? template.templatePagePath : template.canonicalUrl).thumbnail
+									//- img(src=template.thumbnailUrl)
+									img(src="https://d1hk1zhcb5hn6i.cloudfront.net/52fb8c6f34a287a85245b493/v/0/pdf-converted-cache/style-thumbnail")
+									div.caption
+										h3 #{template.name}

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

@@ -5,53 +5,64 @@ block content
 		.container
 			.row
 				.page-header
-					h1 #{template.name} LaTeX Template
-					-if(tag)
-						a(href=tag.tagPagePath) ← Back to more #{tag.name} LaTeX templates
-				.container.txt-lefty
-					.row-fluid()
-						.span6
-							.entry
-								.row-fluid
-									.span12
-										a(href=template.pdfUrl)
-											img(src="#{template.previewUrl}")
+					h2
+						a(href="/templates") Templates
+						|  ›
+						a(href=tag.tagPagePath)  #{tag.name}
+						|  ›
+						|  #{template.name}
+				.row
+					.col-md-6
+						.entry
+							.row
+								.col-md-12
+									a(href=template.pdfUrl)
+										//img(src="#{template.previewUrl}")
+										img(src="https://d1hk1zhcb5hn6i.cloudfront.net/52fb89a333621a613683ec95/v/1/pdf-converted-cache/style-preview")
 
-						.span6()
+					.col-md-6
+						.template-details-section
 							h3 About
 							div !{template.description}
-
-							h3 Actions
-							span(ng-controller="openInSlController")
-								a.btn.btn-success.btn-large.open-in-sharelatex(href=template.open_in_sharelatex_url, ng-click='open()', ng-disabled="isDisabled", rel='nofollow') {{openInSlText}}
+							div(ng-controller="openInSlController")
+								a.btn.btn-primary.btn-large(href=template.open_in_sharelatex_url, ng-click='open()', ng-disabled="isDisabled", rel='nofollow') {{openInSlText}}
 								|  
-								a.btn.btn-large.download-zip(href=template.zipUrl, rel='nofollow', ng-click='downloadZip()') Download Zip
 
+								a.btn.btn-default(
+									href=template.zipUrl, 
+									rel='nofollow', 
+									ng-click='downloadZip()', 
+									data-toggle="tooltip", 
+									data-placement="bottom", 
+									title="", 
+									data-original-title="Download .zip File"
+								)
+
+									i.fa.fa-cloud-download
+						.template-details-section.social_buttons
+							.addthis_toolbox.addthis_default_style.addthis_32x32_style
+								a.addthis_button_facebook
+								a.addthis_button_twitter
+								a.addthis_button_google_plusone_share
+								a.addthis_button_compact
+							script(type='text/javascript', src='//s7.addthis.com/js/300/addthis_widget.js#pubid=ra-517c16586439faa7')
 
-							.social_buttons
-								.addthis_toolbox.addthis_default_style.addthis_32x32_style
-									a.addthis_button_facebook
-									a.addthis_button_twitter
-									a.addthis_button_google_plusone_share
-									a.addthis_button_compact
-								script(type='text/javascript', src='//s7.addthis.com/js/300/addthis_widget.js#pubid=ra-517c16586439faa7')
-							div
-								h3 Comment
-								#disqus_thread
-								script(type='text/javascript').
-									/* * * CONFIGURATION VARIABLES: EDIT BEFORE PASTING INTO YOUR WEBPAGE * * */
-									var disqus_shortname = 'sharelatextemplates'; // required: replace example with your forum shortname
-									/* * * DON'T EDIT BELOW THIS LINE * * */
-									(function() {
-									var dsq = document.createElement('script'); dsq.type = 'text/javascript'; dsq.async = true;
-									dsq.src = '//' + disqus_shortname + '.disqus.com/embed.js';
-									(document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq);
-									})();
-								noscript
-									| Please enable JavaScript to view the
-									a(href='http://disqus.com/?ref_noscript') comments powered by Disqus.
-								a.dsq-brlink(href='http://disqus.com')
-									| comments powered by
-									span.logo-disqus Disqus
+						h3 Comment
+						#disqus_thread
+						script(type='text/javascript').
+							/* * * CONFIGURATION VARIABLES: EDIT BEFORE PASTING INTO YOUR WEBPAGE * * */
+							var disqus_shortname = 'sharelatextemplates'; // required: replace example with your forum shortname
+							/* * * DON'T EDIT BELOW THIS LINE * * */
+							(function() {
+							var dsq = document.createElement('script'); dsq.type = 'text/javascript'; dsq.async = true;
+							dsq.src = '//' + disqus_shortname + '.disqus.com/embed.js';
+							(document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq);
+							})();
+						noscript
+							| Please enable JavaScript to view the
+							a(href='http://disqus.com/?ref_noscript') comments powered by Disqus.
+						a.dsq-brlink(href='http://disqus.com')
+							| comments powered by
+							span.logo-disqus Disqus
 
 

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

@@ -17,6 +17,8 @@ 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)
@@ -27,6 +29,7 @@ define [
 
 		$scope.clearSearchText = ->
 			$scope.searchQueryText = ""
+			updateHits []
 
 		$scope.safeApply = (fn)->
 			phase = $scope.$root.$$phase

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

@@ -1,11 +1,7 @@
 .template-page-header {
-	background: @gray-lightest;
-	border-top: 1px solid @gray-lightest;
-	margin: 0;
 	padding-top: unit(@line-height-base,rem);
-	h1 {
-		color: @gray-dark;
-		margin-top: 0;
+	h1, h2 {
+		margin-top: 6px;
 		margin-right: @line-height-base * 5;
 		line-height: 1;
 	}
@@ -22,12 +18,33 @@
 		padding:0px;
 		h3 {
 			color:@link-color;
+			margin: 10px 0px 10px 20px;
 		}
 	}
 
 	.caption {
-		background: @gray-lightest;
+		background: lighten(@gray-lightest, 3%);
 		border-top: 1px solid #ddd;
 	}
 
+}
+
+.social_buttons {
+	padding-top: 20px;
+}
+
+.sample-template {
+	-webkit-box-shadow: 0 2px 4px rgba(0,0,0,0.3);
+	box-shadow: 0 2px 4px rgba(0,0,0,0.3);
+}
+
+.template-details-section {
+	padding-bottom: 20px;
+}
+
+.searchResult {
+	img {
+		max-width: 100%;    
+		height: auto;
+	}
 }

services/web/public/stylesheets/style.less

@@ -18,7 +18,7 @@
 @import "components/card.less";
 //@import "components/code.less";
 @import "components/component-animations.less";
-//@import "components/glyphicons.less";
+@import "components/glyphicons.less";
 @import "components/dropdowns.less";
 @import "components/button-groups.less";
 @import "components/input-groups.less";