Merge remote-tracking branch 'origin/touchdown'

Conflicts:
	static/css/quay.css
	static/js/controllers.js
	test/data/test.db

static/js/controllers.js

@@ -29,12 +29,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);
 
@@ -51,6 +46,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) {
@@ -270,6 +274,7 @@ function RepoListCtrl($scope, $sanitize, Restangular, UserService, ApiService) {
 
 function LandingCtrl($scope, UserService, ApiService, Features, Config) {
   $scope.namespace = null;
+  $scope.currentScreenshot = 'repo-view';
 
   $scope.$watch('namespace', function(namespace) {
     loadMyRepos(namespace);
@@ -279,6 +284,10 @@ function LandingCtrl($scope, UserService, ApiService, Features, Config) {
     loadMyRepos($scope.namespace);
   });
 
+  $scope.changeScreenshot = function(screenshot) {
+    $scope.currentScreenshot = screenshot;
+  };
+
   $scope.canCreateRepo = function(namespace) {
     if (!$scope.user) { return false; }
 
@@ -311,6 +320,52 @@ function LandingCtrl($scope, UserService, ApiService, Features, Config) {
 
   $scope.chromify = function() {
     browserchrome.update();
+
+    var jcarousel = $('.jcarousel');
+
+    jcarousel
+      .on('jcarousel:reload jcarousel:create', function () {
+        var width = jcarousel.innerWidth();
+        jcarousel.jcarousel('items').css('width', width + 'px');
+      })
+      .jcarousel({
+        wrap: 'circular'
+      });
+
+    $('.jcarousel-control-prev')
+      .on('jcarouselcontrol:active', function() {
+        $(this).removeClass('inactive');
+      })
+      .on('jcarouselcontrol:inactive', function() {
+        $(this).addClass('inactive');
+      })
+      .jcarouselControl({
+        target: '-=1'
+      });
+
+    $('.jcarousel-control-next')
+      .on('jcarouselcontrol:active', function() {
+        $(this).removeClass('inactive');
+      })
+      .on('jcarouselcontrol:inactive', function() {
+        $(this).addClass('inactive');
+      })
+      .jcarouselControl({
+        target: '+=1'
+      });
+
+    $('.jcarousel-pagination')
+      .on('jcarouselpagination:active', 'a', function() {
+        $(this).addClass('active');
+      })
+      .on('jcarouselpagination:inactive', 'a', function() {
+        $(this).removeClass('active');
+      })
+      .jcarouselPagination({
+        'item': function(page, carouselItems) {
+          return '<a href="javascript:void(0)" class="jcarousel-page"></a>';
+        }
+      });
   };
 
   $scope.getEnterpriseLogo = function() {
@@ -2738,3 +2793,7 @@ function SuperUserAdminCtrl($scope, ApiService, Features, UserService) {
 
   loadSeatUsage();
 }
+
+function TourCtrl($scope, $location) {
+  $scope.kind = $location.path().substring('/tour/'.length);
+}