vbatts/quay
Archived
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge branch 'master' of https://bitbucket.org/yackob03/quay

Browse source
This commit is contained in:
root 2013-12-18 23:32:58 +00:00
commit 19f9a566e5
2 changed files with 12 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
static/js/app.js
View file

@ -89,7 +89,7 @@ function getMarkedDown(string) {
} }
// Start the application code itself. // Start the application code itself.
quayApp = angular.module('quay', ['ngRoute', 'chieffancypants.loadingBar', 'restangular', 'angularMoment', 'angulartics', 'angulartics.google.analytics', 'angulartics.mixpanel', '$strap.directives', 'ngCookies'], function($provide, cfpLoadingBarProvider) { quayApp = angular.module('quay', ['ngRoute', 'chieffancypants.loadingBar', 'restangular', 'angularMoment', 'angulartics', /*'angulartics.google.analytics',*/ 'angulartics.mixpanel', '$strap.directives', 'ngCookies'], function($provide, cfpLoadingBarProvider) {
cfpLoadingBarProvider.includeSpinner = false; cfpLoadingBarProvider.includeSpinner = false;
$provide.factory('CookieService', ['$cookies', '$cookieStore', function($cookies, $cookieStore) { $provide.factory('CookieService', ['$cookies', '$cookieStore', function($cookies, $cookieStore) {
@ -287,12 +287,14 @@ quayApp = angular.module('quay', ['ngRoute', 'chieffancypants.loadingBar', 'rest
return; return;
} }
planService.isBusinessPlan(planId, function(bus) { planService.getPlan(planId, function(plan) {
if (bus) { planService.isBusinessPlan(planId, function(bus) {
document.location = '/organizations/new/?plan=' + planId; if (bus) {
} else { document.location = '/organizations/new/?plan=' + planId;
document.location = '/user?plan=' + planId; } else {
} document.location = '/user?plan=' + planId;
}
});
}); });
}); });
}; };

3
templates/base.html
View file

@ -78,6 +78,7 @@ b._i.push([a,e,d])};b.__SV=1.2}})(document,window.mixpanel||[]);
mixpanel.init(isProd ? "50ff2b2569faa3a51c8f5724922ffb7e" : "38014a0f27e7bdc3ff8cc7cc29c869f9", { track_pageview : false, debug: !isProd });</script><!-- end Mixpanel --> mixpanel.init(isProd ? "50ff2b2569faa3a51c8f5724922ffb7e" : "38014a0f27e7bdc3ff8cc7cc29c869f9", { track_pageview : false, debug: !isProd });</script><!-- end Mixpanel -->
<!-- start analytics --><script> <!-- start analytics --><script>
/*
var isProd = document.location.hostname === 'quay.io'; var isProd = document.location.hostname === 'quay.io';
(function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){ (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
@ -86,7 +87,7 @@ var isProd = document.location.hostname === 'quay.io';
})(window,document,'script','//www.google-analytics.com/analytics.js','ga'); })(window,document,'script','//www.google-analytics.com/analytics.js','ga');
ga('create', isProd ? 'UA-34988886-5' : 'UA-34988886-4', 'quay.io'); ga('create', isProd ? 'UA-34988886-5' : 'UA-34988886-4', 'quay.io');
*/
</script> </script>
</head> </head>
<body> <body>