Merge branch 'master' into node-6.9

services/web/app/coffee/Features/Project/ProjectController.coffee

@@ -225,7 +225,7 @@ module.exports = ProjectController =
 				if !user_id?
 					return cb()
 				timeout = setTimeout cb, 500
-				AnalyticsManager.getLastOccurance user_id, "shown-track-changes-onboarding", (error, event) ->
+				AnalyticsManager.getLastOccurance user_id, "shown-track-changes-onboarding-2", (error, event) ->
 					clearTimeout timeout
 					if error?
 						return cb(null, false)

services/web/app/views/project/editor/feature-onboarding.pug

@@ -1,10 +1,10 @@
-div(ng-controller="FeatureOnboardingController")
-	.feat-onboard(
+.feat-onboard(
+	ng-controller="FeatureOnboardingController"
 	ng-class="('feat-onboard-step' + onboarding.innerStep)"
-		ng-if="!state.loading && showCollabFeaturesOnboarding"
+	ng-if="!state.loading && ui.showCollabFeaturesOnboarding"
 	ng-cloak
 	stop-propagation="click"
-	)
+)
 	a.feat-onboard-dismiss(
 		href
 		ng-click="dismiss();"

services/web/app/views/project/editor/review-panel.pug

@@ -417,7 +417,7 @@ script(type="text/ng-template", id="trackChangesUpgradeModalTemplate")
 		.row.text-center(ng-controller="FreeTrialModalController")
 			a.btn.btn-success(
 				href
-				ng-click="startFreeTrial('track-changes')"
+				ng-click="startFreeTrial('real-time-track-changes')"
 				ng-show="project.owner._id == user.id"
 			) Try it for free
 			p(ng-show="project.owner._id != user.id"): strong Please ask the project owner to upgrade to use track changes

services/web/app/views/project/list.pug

@@ -50,6 +50,7 @@ block content
 								p.announcement-date {{ announcement.date | date:"longDate" }}
 								a.announcement-link(
 									ng-href="{{ announcement.url }}"
+									ng-click="logAnnouncementClick()",
 									target="_blank"
 								) Read more
 						div.text-center(

services/web/public/coffee/ide.coffee

@@ -73,6 +73,10 @@ define [
 		}
 		$scope.user = window.user
 		
+		$scope.$watch "project.features.trackChangesVisible", (visible) ->
+			return if !visible?
+			$scope.ui.showCollabFeaturesOnboarding = window.showTrackChangesOnboarding and visible
+
 		$scope.shouldABTestPlans = false
 		if $scope.user.signUpDate >= '2016-10-27'
 			$scope.shouldABTestPlans = true

services/web/public/coffee/ide/FeatureOnboardingController.coffee

@@ -6,13 +6,9 @@ define [
 			innerStep: 1
 			nSteps: 4
 
-		$scope.$watch "project.features.trackChangesVisible", (visible) ->
-			return if !visible?
-			$scope.showCollabFeaturesOnboarding = window.showTrackChangesOnboarding and visible
-
 		$scope.dismiss = () ->
-			event_tracking.sendMB "shown-track-changes-onboarding"
-			$scope.$applyAsync(() -> $scope.showCollabFeaturesOnboarding = false)
+			event_tracking.sendMB "shown-track-changes-onboarding-2"
+			$scope.$applyAsync(() -> $scope.ui.showCollabFeaturesOnboarding = false)
 
 		$scope.gotoPrevStep = () ->
 			if $scope.onboarding.innerStep > 1 

services/web/public/coffee/main/announcements.coffee

@@ -15,6 +15,9 @@ define [
 		markAnnouncementsAsRead = ->
 			event_tracking.sendMB "announcement-alert-dismissed", { blogPostId: $scope.announcements[0].id }
 
+		$scope.logAnnouncementClick = ->
+			event_tracking.sendMB "announcement-read-more-clicked", { blogPostId: $scope.announcements[0].id }
+
 		refreshAnnouncements()
 
 		$scope.toggleAnnouncementsUI = ->