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

services/web/.gitignore

@@ -57,7 +57,7 @@ public/js/gui.js
 public/js/admin.js
 public/js/history/*
 public/stylesheets/mainStyle.css
-public/stylesheets/plans.css
+public/brand/plans.css
 public/minjs/
 
 public/js/main.js

services/web/Gruntfile.coffee

@@ -74,7 +74,7 @@ module.exports = (grunt) ->
 					"public/stylesheets/mainStyle.css": "public/stylesheets/mainStyle.less"
 			plans:
 				files:
-					"public/stylesheets/plans.css": "public/stylesheets/less/plans.less"
+					"public/brand/plans.css": "public/brand/plans.less"
 
 		requirejs:
 			compile:

services/web/README.md

@@ -0,0 +1,32 @@
+web-sharelatex
+==============
+
+web-sharelatex is the front-end web service of the open-source web-based collaborative LaTeX editor,
+ShareLaTeX. It serves all the HTML pages, CSS and javascript to the client. web-sharelatex also contains 
+a lot of logic around creating and editing projects, and account management.
+
+The rest of the ShareLaTeX stack, along with information about contributing can be found in the 
+[sharelatex/sharelatex](https://github.com/sharelatex/sharelatex) repository.
+
+License and Credits
+-------------------
+
+### Code
+
+All code is currently proprietary but will soon be licensed under a copyleft license.
+
+### Artwork
+
+#### Silk icon set 1.3
+
+We gratefully acknowledge [Mark James](http://www.famfamfam.com/lab/icons/silk/) for
+releasing his Silk icon set under the Creative Commons Attribution 2.5 license. Some
+of these icons are used within ShareLaTeX inside the `public/img/silk` directory
+
+#### IconShock icons
+
+We gratefully acknowledge [IconShock](http://www.iconshock.com) for use of the icons
+in the `public/img/iconshock` directory found via
+[findicons.com](http://findicons.com/icon/498089/height?id=526085#)
+
+

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

@@ -22,6 +22,7 @@ for path in [
     "#{jsPath}libs/pdf.js",
     "#{jsPath}libs/pdf.worker.js",
     "/stylesheets/mainStyle.css"
+    "/brand/plans.css"
 ]
 	filePath = Path.join __dirname, "../../../", "public#{path}"
 	content = fs.readFileSync filePath

services/web/app/templates/email/emailTemplate.html

@@ -336,7 +336,7 @@
                                             <td class="headerContent">
                                             
                                             	<!-- // Begin Module: Standard Header Image \\ -->
-                                            	<img src="https://www.sharelatex.com/img/logo/banner-plain.png" style="max-width:600px;" id="headerImage campaign-icon" mc:label="header_image" mc:edit="header_image" mc:allowdesigner mc:allowtext />
+                                            	<img src="https://www.sharelatex.com/brand/logo/banner-plain.png" style="max-width:600px;" id="headerImage campaign-icon" mc:label="header_image" mc:edit="header_image" mc:allowdesigner mc:allowtext />
                                             	<!-- // End Module: Standard Header Image \\ -->
                                             
                                             </td>

services/web/app/templates/email/shared_project_email_template.html

@@ -327,7 +327,7 @@
                                 	<table border="0" cellpadding="0" cellspacing="0" width="600" id="templateHeader">
                                         <tr>
                                             <td class="headerContent">
-                                            	<img src="<%=view_data.sharelatex_url%>/img/logo/banner-plain.png" style="max-width:600px;" id="headerImage" />
+                                            	<img src="<%=view_data.sharelatex_url%>/brand/logo/banner-plain.png" style="max-width:600px;" id="headerImage" />
                                             </td>
                                         </tr>
                                     </table>

services/web/app/views/general/sidebar.jade

@@ -20,5 +20,5 @@
 					a(href="/user/bonus").plain-link Recommend ShareLaTeX to your friends and we'll upgrade your account for free.
 				p
 					a(href="/user/bonus").btn.btn-success Get free stuff
-			img(src="/img/logo/lion-64.png").lion
+			img(src="/brand/logo/logo-64.png").lion
 

services/web/app/views/subscriptions/plans.jade

@@ -151,7 +151,7 @@ block content
 						.tab-pane.student-pricing
 
 			include ../general/small-footer
-			link(rel='stylesheet', href='/stylesheets/plans.css?fingerprint='+fingerprint('/stylesheets/mainStyle.css'))	
+			link(rel='stylesheet', href='/brand/plans.css?fingerprint='+fingerprint('/brand/mainStyle.css'))	
 
 			script
 				mixpanel.track("Page Viewed", { name: "plans" })

services/web/app/views/templates.jade

@@ -40,11 +40,11 @@
 				ul.dropdown-menu
 					li
 						a.js-new-file(href="#")
-							img(src="/img/doc.png")
+							img(src="/img/nide/doc.png")
 							| New File
 					li
 						a.js-new-folder(href="#")
-							img(src="/img/folder.png")
+							img(src="/img/nide/folder.png")
 							| New Folder
 					li
 						a.js-upload-file(href="#")
@@ -70,8 +70,8 @@
 	script(type="text/template")#folderTemplate
 		.entity-list-item(class="entity-{{ type }}", entity-type="{{ type }}", id="{{ id }}")
 			.toggle.js-toggle
-				img(src="/img/right-arrow.png").js-closed
-				img(src="/img/down-arrow.png").js-open
+				img(src="/img/nide/right-arrow.png").js-closed
+				img(src="/img/nide/down-arrow.png").js-open
 			.clickable.js-clickable
 				i(class="sprite-{{ type }}")
 				span.name {{ name }}
@@ -156,18 +156,6 @@
 	script(type="text/template")#loadingIndicatorTemplate
 		.loading
 
-	script(type="text/template")#settingsSideBarLinkTemplate
-		ul
-			li.root.project#settings(title='Show Project Settings')
-				img(src='/img/settings.png') 
-				span Settings
-
-	script(type="text/template")#usersSideBarLinkTemplate
-		ul
-			li.root.project#projectCollaberators(title='Show Project Collaborators')
-				img(src='/img/user.png') 
-				span Collaborators
-
 	script(type="text/template")#pdfSideBarLinkTemplate
 		ul
 			li.root.project#pdf(title='Show PDF', alt='pdf')
@@ -220,13 +208,13 @@
 			.pdfjs-list-view
 			.btn-group
 				button.btn.btn-info.js-fit-height
-					img(src="/img/fit-to-height.png")
+					img(src="/img/iconshock/fit-to-height.png")
 				button.btn.btn-info.js-fit-width
-					img(src="/img/fit-to-width.png")
+					img(src="/img/iconshock/fit-to-width.png")
 				button.btn.btn-info.js-zoom-out
-					img(src="/img/zoom-out.png")
+					img(src="/img/iconshock/zoom-out.png")
 				button.btn.btn-info.js-zoom-in
-					img(src="/img/zoom-in.png")
+					img(src="/img/iconshock/zoom-in.png")
 			.progress.progress-info
 				.bar
 				span Loading
@@ -329,12 +317,6 @@
 	script(type="text/template")#historyPanelTemplate
 		#revisionHistoryArea.fullEditorArea
 
-	script(type="text/template")#historySideBarLinkTemplate
-		ul
-			li.root.project#showHistory(title='Show project history', alt='history')
-				img(src='/img/clock.png') 
-				span History
-
 	script(type='text/template')#revisionAreaTemplate
 		#historyAreaWrapper
 			#historySideBar

services/web/public/app.build.js

@@ -1,41 +0,0 @@
-({
-	appDir: "js",
-	baseUrl: "./",
-	dir: "minjs",
-	inlineText:false,
-	preserveLicenseComments:false,
-
-	paths : {
-		"underscore": "libs/underscore",
-		"jquery": "libs/jquery"
-	},
-	shim: {
-		"libs/backbone": {
-			deps: ["libs/underscore"]
-		},
-		"libs/pdfListView/PdfListView": {
-			deps: ["libs/pdf"]
-		},
-		"libs/pdf": {
-			deps: ["libs/compatibility"]
-		}
-	},
-
-	skipDirOptimize: true,
-
-	modules: [
-		{
-			name: "main",
-			exclude: ["jquery"]
-		}, {
-			name: "ide",
-			exclude: ["jquery"]
-		}, {
-			name: "home",
-			exclude: ["jquery"]
-		}, {
-			name: "list",
-			exclude: ["jquery"]
-		}
-	]
-})

services/web/public/brand/plans.less

@@ -0,0 +1,276 @@
+.pricing-table {
+	font: 13px "PT Sans", "Helvetica Neue", Arial, sans-serif;
+	margin-bottom: 20px;
+	-webkit-border-radius: 5px;
+	   -moz-border-radius: 5px;
+	        border-radius: 5px;
+}
+
+.pricing-table ul {
+	margin: 0;
+	padding: 0;
+	list-style: none;
+}
+
+.pricing-header-row-1 {
+	text-align: center;
+	height: 40px;
+	padding: 3px 0 0;
+	-webkit-border-radius: 4px 4px 0 0;
+	   -moz-border-radius: 4px 4px 0 0;
+	        border-radius: 4px 4px 0 0;
+	-webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, .3);
+	   -moz-box-shadow: inset 0 1px 0 rgba(255, 255, 255, .3);
+	        box-shadow: inset 0 1px 0 rgba(255, 255, 255, .3);
+}
+
+.pricing-header-row-2 {
+	text-align: center;
+	height: 50px;
+	margin-top: -1px;
+	padding: 10px 0 0;
+	border-bottom: none;	
+	-webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, .3);
+	   -moz-box-shadow: inset 0 1px 0 rgba(255, 255, 255, .3);
+	        box-shadow: inset 0 1px 0 rgba(255, 255, 255, .3);
+}
+
+ul.big {
+	position: relative;
+	top: -10px;
+	.pricing-header-row-1 {
+		padding: 7px 0 7px;
+	}
+	.pricing-header-row-2 {
+		padding: 15px 0 5px;
+	}
+}
+
+.pricing-table {
+	h1.free {
+		font-size: 30px;
+	}
+}
+
+.pricing-row {
+	padding-top:20px;
+}
+
+.package-title h2 {
+	color: #f9f9f9;
+	margin: 0;
+	font-size: 24px;
+	line-height: 40px;
+	text-shadow: -1px -1px 0 rgba(0, 0, 0, .3), 1px 1px 0 rgba(255, 255, 255, .2);
+}
+
+.package-price h1 {
+	color: #f9f9f9;
+	margin: 0;
+	font-size: 44px;
+	line-height: 40px;
+	text-shadow: -1px -1px 0 rgba(0, 0, 0, .3), 1px 1px 0 rgba(255, 255, 255, .2);
+}
+
+.cents {
+	font-size: 16px;
+	position: relative;
+	top: -20px;
+}
+
+.pricing-content-row-odd {
+	font-size: 14px;
+	background-color: #f3f3f3;
+	padding: 10px 15px;
+	border-left: 1px solid #aaaaaa;
+	border-right: 1px solid #aaaaaa;
+}
+
+.pricing-content-row-even {
+	font-size: 14px;
+	background-color: #fcfcfc;
+	padding: 10px 15px;
+	border-left: 1px solid #aaaaaa;
+	border-right: 1px solid #aaaaaa;
+}
+
+.acc-inner {
+	display: block;
+	padding: 10px 15px;
+	border-left: 1px solid #aaaaaa;
+	border-right: 1px solid #aaaaaa;
+	-webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, .2), inset 0 -1px 1px rgba(0, 0, 0, .2);
+	   -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, .2), inset 0 -1px 1px rgba(0, 0, 0, .2);
+	        box-shadow: inset 0 1px 1px rgba(0, 0, 0, .2), inset 0 -1px 1px rgba(0, 0, 0, .2);
+}
+
+.pricing-footer {
+	text-align: center;
+	height: 50px;
+	padding: 10px 0 0;	
+	-webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, .3);
+	   -moz-box-shadow: inset 0 1px 0 rgba(255, 255, 255, .3);
+	        box-shadow: inset 0 1px 0 rgba(255, 255, 255, .3);
+	-webkit-border-radius: 0 0 4px 4px;
+	   -moz-border-radius: 0 0 4px 4px;
+	        border-radius: 0 0 4px 4px;
+}
+
+.animate, .animate .pricing-content-row-odd, .pricing-content-row-even, .acc-inner {
+	-webkit-transition: all .3s ease-in-out;
+	   -moz-transition: all .3s ease-in-out;
+	     -o-transition: all .3s ease-in-out;
+	    -ms-transition: all .3s ease-in-out;
+	        transition: all .3s ease-in-out;
+}
+
+.animate.change-bg ul:hover .pricing-footer {
+	-webkit-box-shadow: inset 0 0 0 rgba(255, 255, 255, 0);
+	   -moz-box-shadow: inset 0 0 0 rgba(255, 255, 255, 0);
+	        box-shadow: inset 0 0 0 rgba(255, 255, 255, 0);
+}
+
+.animate.go-up {
+	-webkit-transform: translate(0px, 0px);
+	   -moz-transform: translate(0px, 0px);
+	     -o-transform: translate(0px, 0px);
+	    -ms-transform: translate(0px, 0px);
+	        transform: translate(0px, 0px);
+}
+
+.animate.go-up:hover {
+	-webkit-transform: translate(0,-10px);
+	   -moz-transform: translate(0,-10px);
+	     -o-transform: translate(0,-10px);
+	    -ms-transform: translate(0,-10px);
+	        transform: translate(0,-10px);
+}
+
+.animate.add-shadow:hover {
+	-webkit-box-shadow: 0 0 15px rgba(0, 0, 255, .6);
+	   -moz-box-shadow: 0 0 15px rgba(0, 0, 255, .6);
+	        box-shadow: 0 0 15px rgba(0, 0, 255, .6);
+}
+
+.btn {
+	font: 13px "PT Sans", "Helvetica Neue", Arial, sans-serif;
+}
+
+.btn {
+	font-size: 18px;
+	line-height: 18px;
+	padding: 10px 20px;
+	text-shadow: none;
+	*zoom: 1;
+	-webkit-box-shadow: inset 0 0 1px rgba(255, 255, 255, .5), 0 0 1px rgba(0, 0, 0, .8);
+	   -moz-box-shadow: inset 0 0 1px rgba(255, 255, 255, .5), 0 0 1px rgba(0, 0, 0, .8);
+	        box-shadow: inset 0 0 1px rgba(255, 255, 255, .5), 0 0 1px rgba(0, 0, 0, .8);
+}
+
+.acc {
+	cursor: pointer;
+}
+
+.no-bold {
+	font-weight: normal;
+}
+
+/* STYLES
+   -----
+   1. BLack				6. Gray				11. Orange				16. Slategray
+   2. Blue				7. Green			12. Purple				17. Steelblue
+   3. Brown				8. Indigo			13. Red					18. Teal
+   4. Firebrick			9. Lime 			14. Silver				19. Violet
+   5. Gold				10. Olive			15. Skyblue				20. Yellow
+*/
+
+
+/* --- 17. Steelblue --- */
+.pricing-steelblue .pricing-header-row-1, .pricing-steelblue .pricing-header-row-2 {
+	background-color: #4581b3;
+	background-image: -moz-linear-gradient(top, #549dd9, #4581b3);
+	background-image: -ms-linear-gradient(top, #549dd9, #4581b3);
+	background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#549dd9), to(#4581b3));
+	background-image: -webkit-linear-gradient(top, #549dd9, #4581b3);
+	background-image: -o-linear-gradient(top, #549dd9, #4581b3);
+	background-image: linear-gradient(top, #549dd9, #4581b3);
+	background-repeat: repeat-x;
+	filter: progid:dximagetransform.microsoft.gradient(startcolorstr='#549dd9', endcolorstr='#4581b3', GradientType=0);
+	filter: progid:dximagetransform.microsoft.gradient(enabled=false);
+	border: 1px solid #2b4f6e;
+}
+
+.pricing-steelblue .pricing-header-row-2 {
+	border-bottom: none;
+}
+
+.pricing-steelblue .pricing-footer {
+	background-color: #4581b3;
+	background-image: -moz-linear-gradient(top, #4581b3, #325c80);
+	background-image: -ms-linear-gradient(top, #4581b3, #325c80);
+	background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#4581b3), to(#325c80));
+	background-image: -webkit-linear-gradient(top, #4581b3, #325c80);
+	background-image: -o-linear-gradient(top, #4581b3, #325c80);
+	background-image: linear-gradient(top, #4581b3, #325c80);
+	background-repeat: repeat-x;
+	filter: progid:dximagetransform.microsoft.gradient(startcolorstr='#4581b3', endcolorstr='#325c80', GradientType=0);
+	filter: progid:dximagetransform.microsoft.gradient(enabled=false);
+	border: 1px solid #2b4f6e;
+}
+
+.pricing-steelblue .animate.change-bg ul:hover .pricing-content-row-odd, .pricing-steelblue .animate.change-bg ul:hover .pricing-content-row-even{
+	color: #fff;
+	background: #4581b3;
+	border-left: 1px solid #2b4f6e;
+	border-right: 1px solid #2b4f6e;
+}
+
+.pricing-steelblue .animate.change-bg ul:hover .acc-inner {
+	color: #fff;
+	background: #4078a6;
+	border-left: 1px solid #2b4f6e;
+	border-right: 1px solid #2b4f6e;
+	-webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, .2), inset 0 -1px 2px rgba(0, 0, 0, .2), inset 0 -1px 0 rgba(255, 255, 255, .4);
+	   -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, .2), inset 0 -1px 2px rgba(0, 0, 0, .2), inset 0 -1px 0 rgba(255, 255, 255, .4);
+	        box-shadow: inset 0 1px 1px rgba(0, 0, 0, .2), inset 0 -1px 2px rgba(0, 0, 0, .2), inset 0 -1px 0 rgba(255, 255, 255, .4);
+}
+
+.pricing-steelblue .animate.change-bg ul:hover .pricing-footer {
+	border-top-color: #4581b3;
+	-webkit-box-shadow: inset 0 0 0 #4581b3;
+	   -moz-box-shadow: inset 0 0 0 #4581b3;
+	        box-shadow: inset 0 0 0 #4581b3;
+}
+
+.pricing-steelblue .btn-pricing {
+	color: #d3dce5;
+	background-color: #4581b3;
+	*background-color: #325c80;
+	background-image: -moz-linear-gradient(top, #4581b3, #325c80);
+	background-image: -ms-linear-gradient(top, #4581b3, #325c80);
+	background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#4581b3), to(#325c80));
+	background-image: -webkit-linear-gradient(top, #4581b3, #325c80);
+	background-image: -o-linear-gradient(top, #4581b3, #325c80);
+	background-image: linear-gradient(top, #4581b3, #325c80);
+	background-repeat: repeat-x;
+	filter: progid:dximagetransform.microsoft.gradient(startcolorstr='#4581b3', endcolorstr='#325c80', GradientType=0);
+	filter: progid:dximagetransform.microsoft.gradient(enabled=false);
+	border-color: #4581b3 #4581b3 #325c80;
+	border-color: rgba(0, 0, 0, .1) rgba(0, 0, 0, .1) rgba(0, 0, 0, .25);
+}
+
+.pricing-steelblue .btn-pricing:hover,
+.pricing-steelblue .btn-pricing:active,
+.pricing-steelblue .btn-pricing.active,
+.pricing-steelblue .btn-pricing.disabled,
+.pricing-steelblue .btn-pricing[disabled] {
+	color: #d3dce5;
+	background-color: #325c80;
+	*background-color: #325c80;
+}
+
+.pricing-steelblue .btn-pricing:active,
+.pricing-steelblue .btn-pricing.active {
+	color: #d3dce5;
+	background-color: #325c80 \9;
+}

services/web/public/coffee/history/HistoryManager.coffee

@@ -7,7 +7,6 @@ define [
 ], (VersionListView, VersionList, HistoryView, AccountManager) ->
 	HistoryManager = class
 		templates:
-			historyLink: $("#historySideBarLinkTemplate").html()
 			historyPanel: $("#historyPanelTemplate").html()
 		
 		constructor: (ide, options) ->

services/web/public/coffee/ide/MainAreaManager.coffee

@@ -1,10 +1,8 @@
 define () ->
 	class MainAreaManager
 		constructor: (@ide, @el) ->
-			@$folderArea = $('#folderArea')
 			@$iframe = $('#imageArea')
 			@$loading = $('#loading')
-			@$disconnect = $('#disconnect')
 			@$currentArea = $('#loading')
 			@areas = {}
 
@@ -29,9 +27,6 @@ define () ->
 			$('#imageArea iframe').attr 'src', src
 
 		change : (type, complete)->
-			if(@$currentArea == @$disconnect)
-				return
-
 			if @areas[type]?
 				@$currentArea.hide() if @$currentArea?
 				@areas[type].show 0, =>
@@ -42,12 +37,6 @@ define () ->
 			else
 				# Deprecated system
 				switch type
-					when 'folder'
-						if(@$folderArea.attr('id')!=@$currentArea.attr('id'))
-							@$currentArea.hide()
-							@$folderArea.show()
-							@$currentArea = @$folderArea
-						break
 					when 'iframe'
 						if(@$iframe.attr('id')!=@$currentArea.attr('id'))
 							@$iframe.show()
@@ -60,10 +49,4 @@ define () ->
 							@$loading.show()
 							@$currentArea = @$loading
 						break
-					when 'disconnect'
-						if(@$disconnect.attr('id')!=@$currentArea.attr('id'))
-							@$currentArea.hide()
-							@$disconnect.show()
-							@$currentArea = @$disconnect
-						break
 

services/web/public/coffee/project-members/ProjectMembersManager.coffee

@@ -10,7 +10,6 @@ define [
 
 	class ProjectMembersManager
 		templates:
-			usersLink: $("#usersSideBarLinkTemplate").html()
 			userPanel: $("#userPanelTemplate").html()
 
 		constructor: (@ide, options) ->
@@ -220,7 +219,7 @@ define [
 
 					url = "https://www.facebook.com/dialog/feed?link=#{encodeURIComponent(@url("fb"))}&" +
 						  "app_id=148710621956179&" +
-						  "picture=https://www.sharelatex.com/img/logo/lion-128.png&" +
+						  "picture=https://www.sharelatex.com/brand/logo/logo-128.png&" +
 						  "name=#{@ide.project.get("name")}&" +
 						  "caption=My LaTeX project (#{@ide.project.get("name")}) is available online on ShareLaTeX&" +
 						  "redirect_uri=http://www.sharelatex.com&" +

services/web/public/coffee/settings/SettingsManager.coffee

@@ -4,7 +4,6 @@ define [
 ], (Modal, DropboxSettingsManager) ->
 	class SettingsManager
 		templates:
-			settingsLink: $("#settingsSideBarLinkTemplate").html()
 			settingsPanel: $("#settingsPanelTemplate").html()
 
 		constructor: (@ide, options) ->

services/web/public/img/iconshock/README.txt

@@ -0,0 +1,3 @@
+Icons by IconShock (www.iconshock.com) via findicons.com (http://findicons.com/icon/498089/height?id=526085#)
+
+Licensed under the Creative Commons Attribution (by) license

services/web/public/img/silk/readme.txt

@@ -0,0 +1,22 @@
+Silk icon set 1.3
+
+_________________________________________
+Mark James
+http://www.famfamfam.com/lab/icons/silk/
+_________________________________________
+
+This work is licensed under a
+Creative Commons Attribution 2.5 License.
+[ http://creativecommons.org/licenses/by/2.5/ ]
+
+This means you may use it for any purpose,
+and make any changes you like.
+All I ask is that you include a link back
+to this page in your credits.
+
+Are you using this icon set? Send me an email
+(including a link or picture if available) to
+mjames@gmail.com
+
+Any other questions about this icon set please
+contact mjames@gmail.com