diff --git a/static/css/pages/plans.css b/static/css/pages/plans.css index 1927349c6..32e5257c0 100644 --- a/static/css/pages/plans.css +++ b/static/css/pages/plans.css @@ -133,6 +133,10 @@ border-bottom: 1px dashed #495b6a; } +.plans-panel .plan-box .qe-plan-description { + margin-bottom: 20px; +} + .plans-panel .plan-box .plan-description { margin-top: 20px; padding-top: 20px; @@ -148,9 +152,14 @@ color: white; } +.plans-panel .plan-box.gray .plan-header b { + color: black; +} + .plans-panel .plan-box .plan-header .plan-box-price { float: right; - width: 60px; + width: 75px; + text-align: right; font-size: 18px; position: relative; } @@ -175,6 +184,16 @@ list-style: square; } +.plans-panel .plan-box.gray { + background-color: #f5f5f5; + text-align: center; + color: black; +} + +.plans-panel .plan-box.gray .qe-plan-description { + margin-bottom: 10px; +} + .plans-panel .plan-features { margin: 0px; margin-top: 10px; @@ -184,10 +203,19 @@ padding: 0px; } +.plans-panel .plan-features li { + text-align: left; + margin-bottom: 10px; +} + .plans-panel .plan-features i.fa { margin-right: 10px; } +.plans-panel .plan-features li.disabled { + color: #aaa; +} + .plans-panel .faq-features { margin-top: 15px; border-top: 1px solid #ddd; @@ -295,3 +323,25 @@ .plans-panel .faq-col p+b { margin-top: 20px; } + +.plans-panel .faq-sub-col { + padding: 40px; + padding-bottom: 0px; +} + +.plans-panel .faq-sub-col ul { + padding: 0px; + list-style: square; +} + +.plans-panel .faq-sub-col img { + width: 100%; + max-height: 70px; + margin-bottom: 20px; +} + +.plans-panel .faq-sub-col b { + margin-bottom: 20px; + text-align: center; + display: block; +} \ No newline at end of file diff --git a/static/img/qe-legos.svg b/static/img/qe-legos.svg new file mode 100644 index 000000000..6d2bc0b9a --- /dev/null +++ b/static/img/qe-legos.svg @@ -0,0 +1,59 @@ + + \ No newline at end of file diff --git a/static/img/tectonic-bycoreos-color.svg b/static/img/tectonic-bycoreos-color.svg new file mode 100644 index 000000000..bc41bcbe6 --- /dev/null +++ b/static/img/tectonic-bycoreos-color.svg @@ -0,0 +1,84 @@ + + + + diff --git a/static/js/pages/plans.js b/static/js/pages/plans.js index 1c05bbadf..5bc0d12ed 100644 --- a/static/js/pages/plans.js +++ b/static/js/pages/plans.js @@ -13,11 +13,22 @@ // Monitor any user changes and place the current user into the scope. UserService.updateUserIn($scope); + $('.plan-tabs a[data-toggle="tab"]').on('shown.bs.tab', function (e) { + $scope.$apply(function() { + $location.search({'tab': e.target.getAttribute('data-target').substr(1)}); + }); + }); + $scope.signedIn = function() { $('#signinModal').modal('hide'); PlanService.handleNotedPlan(); }; + $scope.qeStartTrial = function(plan) { + // TODO(jschorr): Implement. + alert('Not yet implemented!') + }; + $scope.buyNow = function(plan) { PlanService.notePlan(plan); if ($scope.user && !$scope.user.anonymous) { @@ -42,6 +53,10 @@ if ($scope && $routeParams['trial-plan']) { $scope.buyNow($routeParams['trial-plan']); } + + if ($scope && $routeParams['tab'] == 'enterprise') { + $('#enterpriseTab').tab('show') + } }, /* include the personal plan */ true); } })(); \ No newline at end of file diff --git a/static/partials/plans.html b/static/partials/plans.html index 444490266..80439f9bb 100644 --- a/static/partials/plans.html +++ b/static/partials/plans.html @@ -50,7 +50,7 @@
Build your containers in response to git pushes: GitHub, BitBucket, Gitlab and others
-Build your containers in response to git pushes: GitHub, BitBucket, Gitlab and others
+Your first 30 days are free on Quay.io. Test it out and start building containers!
-Your first 30 days are free on Quay.io. Test it out and start building containers!
+Provide a public download page for your container. The best part, they're free!
-Provide a public download page for your container. The best part, they're free!
+Create credentials designed for deploying software automatically.
-Create credentials designed for deploying software automatically.
+Teams can collectively have access to manage specific repositories on your account.
-Teams can collectively have access to manage specific repositories on your account.
+Transit between Quay.io and your servers is secured automatically.
-Transit between Quay.io and your servers is secured automatically.
+Auditing is essential for everything in your CI pipeline. Actions via API and UI are tracked.
-Auditing is essential for everything in your CI pipeline. Actions via API and UI are tracked.
+Download past invoices for your billing team or purchasing departement.
-Download past invoices for your billing team or purchasing departement.
+Integrate to your existing identity infrastructure: LDAP, Keystone, Tectonic Identity and more
+Store your container images on Amazon S3, OpenStack SWift, Google Cloud Storage, or directly to disk.
+Build your containers in response to git pushes: GitHub, BitBucket, Gitlab and others
+Your first 30 days are free on Quay.io. Test it out and start building containers!
+Provide a public download page for your container. The best part, they're free!
+Create credentials designed for deploying software automatically.
+Teams can collectively have access to manage specific repositories on your account.
+Transit between Quay.io and your servers is secured automatically.
+Auditing is essential for everything in your CI pipeline. Actions via API and UI are tracked.
+Download past invoices for your billing team or purchasing departement.
+Quay Enterprise is delivered as a set of containers that is self-managed, or run it as an application on top of a Tectonic cluster. Quay Enterprise is included for free with all Tectonic clusters.
+ +Running as a single container excels for the Basic plan. Quickly get started during your trial.
+ +For production setups, Tectonic provides a level of consistency between your regions, allows Quay to share the same identity infrastructure powering Tectonic, provides easy scaling of your builders, and seamless recovery from a machine failure.
+ +Quay Enterprise is closely related to Quay.io, but runs on your own hardware or in your cloud environment. Running the application yourself is more secure and is more performant when running on the same cluster as your containerized applications.
+ +When running behind your firewall, Quay Enterprise can connect to private Git repositories, LDAP insfrastructure, and more.
+ +Yes, the first 30 days of usage are free, and then your license will be automatically converted to the standard rate. We’ll send you an email before that happens as a reminder.
+ + What types of payment do you accept? + +Quay Enterprise is billed monthly through your Tectonic account. Major credit cards are accepted and invoices are available by request.
+ + Can I pay annually? + +Yes, you can annually. During the purchase process, you can choose between using a credit card or paying via an invoice.
+ + Can I change my plan? + +Yes, you can change or cancel your license at any time via your Tectonic account.
+