Skip to content
Snippets Groups Projects
Commit 6083670e authored by Sid Sijbrandij's avatar Sid Sijbrandij
Browse files

Merge branch 'cs-products-page' into 'master' 

Replace the existing features table with one built from the comparisons.yml file.

See merge request !6171
parents 9dde9f3b b9833480
No related branches found
No related tags found
1 merge request!6171Replace the existing features table with one built from the comparisons.yml file.
Pipeline #
Expand all Hide whitespace changes
Inline Side-by-side
Rakefile
+ 0
− 1
View file @ 6083670e
@@ -144,7 +144,6 @@ PDFS = %w{
public/terms/print/gitlab_subscription_terms.pdf
public/terms/print/gitlab_subscription_terms_sig.pdf
public/high-availability/gitlab-ha.pdf
public/features/gitlab-features.pdf
public/pdfs/the-eleven-rules-of-gitlab-flow.pdf
}
 
data/comparisons.yml
+ 428
− 211
View file @ 6083670e
This diff is collapsed.
source/features/gitlab-features.html.haml deleted 100644 → 0
+ 0
− 5
View file @ 9dde9f3b
---
layout: print
title: GitLab Feature Comparison
---
= partial "includes/features/table"
source/includes/features/table.html.haml deleted 100644 → 0
+ 0
− 32
View file @ 9dde9f3b
- data.features.each do |feature_block|
.panel.panel-success
.panel-heading
%h2.panel-title
= feature_block.title
%table.table.compare-table
%colgroup
%col{:width => "51%"}
%col{:width => "14%"}
%col{:width => "17%"}
%col{:width => "18%"}
%thead
%tr
%th.blank-header
%th.ce-col.text-center Community Edition
%th.ee-col.text-center Enterprise Edition Starter
%th.eep-col.text-center Enterprise Edition Premium
%tbody.header.first
- feature_block.features.each do |feature|
%tr
%td
%a{href: feature.link}
= feature.description
%td.ce-col.text-center
- if (feature.in_ce) || feature.only_in_ce
%i.fa.fa-check
%td.ee-col.text-center
- if (feature.in_ce || feature.in_ee) || feature.only_in_ee
%i.fa.fa-check
%td.eep-col.text-center
- if (feature.in_ce || feature.in_ee || feature.in_eep) || feature.only_in_eep
%i.fa.fa-check
source/products/index.html.haml
+ 45
− 83
View file @ 6083670e
@@ -7,17 +7,11 @@ extra_css:
- faq.css
extra_js:
- faq.js
- bootstrap-tooltip.js
extra_font:
- "Roboto+Slab"
---
 
.page-container.pricing-container.text-center.animated
.container
%h1.page-headline
Flexible plans for individuals and businesses
%h4.subheader
All plans include Git repository management, code reviews, issue tracking, built-in GitLab CI for continuous integration and delivery, plus a 45 day money-back guarantee.
.pricing-options.text-center
.container
.row{ data: { equal: ".col-md-3" } }
@@ -38,30 +32,20 @@ extra_font:
unlimited
%br
users
= link_to "View More ", "#community-edition", class: "featured-item-expand"
%ul#community-edition.featured-item-list.list-unstyled
%li.item-description
Git repository hosting
%li.line-separator
%li.item-description
Code review
%li.line-separator
%li.item-description
Issue tracking
%li.line-separator
%li.item-description
= link_to "GitLab CI", "/features/gitlab-ci-cd/"
%li.line-separator
%li.item-description
= link_to "Time tracking", "https://about.gitlab.com/features/time-tracking/"
%li.line-separator
%li.item-description
= link_to "Cycle analytics", "/features/cycle-analytics/"
%li.line-separator
%li.item-description
= link_to "Learn more...", "#compare-options"
.edition-actions.align-button
= link_to "Install", "/installation/", class: "featured-item-button"
= link_to "View More ", "#community-edition", class: "featured-item-expand"
%ul#community-edition.featured-item-list.list-unstyled
- data.comparisons.features.each do |feature|
- if (feature.gitlab_ce == true && feature.feature_page == true)
%li.line-separator
%li.item-description
- if (feature.link != nil)
= link_to feature.title, feature.link
- if (feature.link == nil)
= feature.title
- if (feature.description != "" && feature.description != nil)
%i.fa.fa-info-circle.info-icon{"title" => feature.description, "data-toggle" => "tooltip", "data-placement" => "top"}
.col-md-4
.featured-item
.edition-name.edition-enterprise
@@ -78,31 +62,25 @@ extra_font:
per month
%h4.col-md-12.featured-item-headline-smaller
paid annually at $39
.edition-actions
= link_to "Buy Now", "https://customers.gitlab.com/subscriptions/new?plan_id=2c92a0fe58bdf4e00158d696fff06a41", class: "featured-item-button"
= link_to "Free Trial", "https://about.gitlab.com/free-trial/", class: "featured-item-link"
= link_to "View More ", "#enterprise-edition-starter", class: "featured-item-expand"
%ul#enterprise-edition-starter.featured-item-list.list-unstyled
%li.item-description.text-muted
Community plus...
%li.line-separator
%li.item-description
LDAP group sync
%li.line-separator
%li.item-description
Repository mirroring
%li.line-separator
%li.item-description
Merge request approvals
%li.line-separator
%li.item-description
Push rules
%li.line-separator
%li.item-description
Next business day support
%li.line-separator
%li.item-description
= link_to "Learn more...", "/gitlab-ee"
.edition-actions
= link_to "Buy Now", "https://customers.gitlab.com/subscriptions/new?plan_id=2c92a0fe58bdf4e00158d696fff06a41", class: "featured-item-button"
= link_to "Free Trial", "https://about.gitlab.com/free-trial/", class: "featured-item-link"
%strong
All features from Community Edition plus:
- data.comparisons.features.each do |feature|
- if (feature.gitlab_ce == false && feature.gitlab_ees == true)
%li.line-separator
%li.item-description
- if (feature.link != nil)
= link_to feature.title, feature.link
- if (feature.link == nil)
= feature.title
- if (feature.description != "" && feature.description != nil)
%i.fa.fa-info-circle.info-icon{"title" => feature.description, "data-toggle" => "tooltip", "data-placement" => "top"}
.col-md-4
.featured-item
.edition-name.edition-enterprise
@@ -119,48 +97,32 @@ extra_font:
per month
%h4.col-md-12.featured-item-headline-smaller
paid annually at $199
.edition-actions
= link_to "Buy Now", "https://customers.gitlab.com/subscriptions/new?plan_id=2c92a0fd58c4fff70158d6989f6f2a3d", class: "featured-item-button"
= link_to "Free Trial", "https://about.gitlab.com/free-trial/", class: "featured-item-link"
= link_to "View More ", "#enterprise-edition-premium", class: "featured-item-expand"
%ul#enterprise-edition-premium.featured-item-list.list-unstyled
%li.item-description.text-muted
Starter plus...
%li.line-separator
%li.item-description
= link_to "GitLab Geo", "/features/gitlab-geo/"
%li.line-separator
%li.item-description
= link_to "Support for High Availability", "/high-availability/"
%li.line-separator
%li.item-description
= link_to "4-hr support response time", "/features/premium-support/"
%li.line-separator
%li.item-description
= link_to "24/7 emergency support", "/features/premium-support/"
%li.line-separator
%li.item-description
= link_to "End user & admin training", "/features/premium-support/"
%li.line-separator
%li.item-description
= link_to "Learn more...", "/gitlab-ee"
.edition-actions
= link_to "Buy Now", "https://customers.gitlab.com/subscriptions/new?plan_id=2c92a0fd58c4fff70158d6989f6f2a3d", class: "featured-item-button"
= link_to "Contact Us", "https://about.gitlab.com/sales/", class: "featured-item-link"
%strong
All features from Enterprise Edition Starter plus:
- data.comparisons.features.each do |feature|
- if (feature.gitlab_ce == false && feature.gitlab_ees == false && feature.gitlab_eep == true)
%li.line-separator
%li.item-description
- if (feature.link != nil)
= link_to feature.title, feature.link
- if (feature.link == nil)
= feature.title
- if (feature.description != "" && feature.description != nil)
%i.fa.fa-info-circle.info-icon{"title" => feature.description, "data-toggle" => "tooltip", "data-placement" => "top"}
= link_to "Contact Us", "https://about.gitlab.com/sales/", class: "featured-item-button contact-us-button"
 
#compare-options.choose-gitlab.text-center.animated
.container
%h2.choose-gitlab-title
%a{name: "comparison"}
Choose the GitLab edition that is best for your team
.container
.compare
= partial "includes/features/table"
.content-container.animated
.container
%h2.faq-title.light.text-center
Subscription & Licensing FAQ
%h3.faq-subtitle.light.text-center
Still have questions?
= succeed "." do
= link_to "Contact Us", "/sales/"
.faq-holder.clearfix
- size = (data.pricing.questions.size / Float(2)).ceil
- data.pricing.questions.each_slice(size).to_a.each do |group|
source/stylesheets/compared.css.scss
+ 12
− 0
View file @ 6083670e
@@ -258,6 +258,18 @@ p {
}
}
}
&.products-page-comparison {
thead {
&.affix {
background-color: $body-bg;
}
tr th:not(:first-child) {
font-size: 14px;
}
}
}
}
 
.last-updated-section {
source/stylesheets/pricing.css.scss
+ 11
− 18
View file @ 6083670e
@@ -136,11 +136,6 @@
padding: 0;
border-color: $color-white-alt;
 
// Tablet & Mobile
@media (min-width: $screen-md-min) {
min-height: 735px;
}
.edition-name {
border-bottom: 1px solid $color-white-alt;
background-color: $color-white;
@@ -386,22 +381,12 @@
 
.edition-actions {
position: relative;
bottom: 0;
left: 0;
right: 0;
margin-top: 20px;
margin-bottom: 20px;
@media (min-width: $screen-md-min) {
position: absolute;
bottom: 20px;
}
height: 75px;
 
&.align-button {
bottom: 0;
@media (min-width: $screen-md-min) {
bottom: 51px;
}
}
 
.featured-item-button {
@@ -438,18 +423,26 @@
display: block;
}
 
.info-icon {
margin-left: 5px;
}
@media (min-width: $screen-md-min) {
min-height: 300px;
display: block;
}
}
 
.contact-us-button {
margin-top: 50px;
}
.choose-gitlab {
padding-top: 60px;
padding-bottom: 60px;
font-size: 16px;
background-color: $color-primary-alt;
color: $color-white;
margin-bottom: 40px;
}
 
.choose-gitlab-title {
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment