From abfb86ccce7d1f1ccae2d54b3d3c636001195942 Mon Sep 17 00:00:00 2001 From: Joseph Schorr Date: Mon, 19 May 2014 12:53:30 -0400 Subject: [PATCH] Change button on the tour page to "Start free trial" and have it start the plan signup process --- static/directives/tour-content.html | 7 +------ static/js/controllers.js | 16 ++++++++++------ test/data/test.db | Bin 200704 -> 200704 bytes 3 files changed, 11 insertions(+), 12 deletions(-) diff --git a/static/directives/tour-content.html b/static/directives/tour-content.html index a88b61258..5f48ce64a 100644 --- a/static/directives/tour-content.html +++ b/static/directives/tour-content.html @@ -71,16 +71,11 @@
- + - - -
diff --git a/static/js/controllers.js b/static/js/controllers.js index e989e4843..a39bcf7d5 100644 --- a/static/js/controllers.js +++ b/static/js/controllers.js @@ -24,12 +24,7 @@ function SecurityCtrl($scope) { function ContactCtrl($scope) { } -function PlansCtrl($scope, $location, UserService, PlanService) { - // Load the list of plans. - PlanService.getPlans(function(plans) { - $scope.plans = plans; - }, /* include the personal plan */ true); - +function PlansCtrl($scope, $location, UserService, PlanService, $routeParams) { // Monitor any user changes and place the current user into the scope. UserService.updateUserIn($scope); @@ -46,6 +41,15 @@ function PlansCtrl($scope, $location, UserService, PlanService) { $('#signinModal').modal({}); } }; + + // Load the list of plans. + PlanService.getPlans(function(plans) { + $scope.plans = plans; + + if ($scope && $routeParams['trial-plan']) { + $scope.buyNow($routeParams['trial-plan']); + } + }, /* include the personal plan */ true); } function TutorialCtrl($scope, AngularTour, AngularTourSignals, UserService, Config) { diff --git a/test/data/test.db b/test/data/test.db index 3ea2e8dfa3f00e22b1b077f0e2a6d5fc9d862abe..a3597b09dee7795f6cc049c550603ce692f4cace 100644 GIT binary patch delta 740 zcma))OK1~O6o&7;|Fm?5$%Kkvp*0PmV0}!OnPl<;kq}VSMOR(9kUT~Z+E^^bMG1Bz zx(O&kW+l`Ibt5Dpn!%)?MRZ{oA{0eh6sCejYZl$Ou%I_71WGH&-Q9cs@Bhy^cWz#u zo0o47($bxwR8NVh?npJa@Q2}aO_xvNM0%Wxr;<5Mw=69ZQgaa_qJ}f3rl!qsTn$+n z%gAOeGo6dFS^J(BhXxCVriWF{RQ0%DHxj0iFw9^y8Z%<1{TMXM@VnNpZQ@`rV*;oM zi4a1uO|Xq${H28hJq!@VoqLzS#j9HXKm$X=|3)*%_0my+q0CDcaO~)RMLvRY(XN1w z)CZ`rC@H8AH1G@+M_Qo|U{@|up;r+gQjgvENYD8dI0WzU221U<*upoSZV?VPv4#&= z=H_>I%a&GYN>)(qw1+yXj=VaR1o?UlnI`q?DTEWhr4~B|Dfmn3LEQ;507vImv9E75ZQOO%$~3! z%d;`QU{LZ~Goo0-tOu6pHW;TjXK#k0jZ(u<-_zrg?t0^pn9twWm_rGy_TUqDqr-CIc#d$vTCp{k>ow20hDRFy|bsDmpS zN=O6@=Qu`yZ+zknk1*P))BIl-TvNJ5VwW|gZo8p{CN8{wS?chX1`A@U!#cwWYJNPq z0$sbKejy}wn3hkp^xwV