Merge branch 'rs-mkto-forms' into 'master'

Replace all Wufoo forms with Marketo forms Ongoing work for #422 cc @AshleyS See merge request !1080

Merge branch 'rs-mkto-forms' into 'master'
2b60ca89 · Ashley Smith · c5c4edb9 · 488ade55 · 2b60ca89 · 2b60ca89
Commit 2b60ca89 authored 9 years ago by Ashley Smith
--- a/source/consultancy/index.html
+++ b/source/consultancy/index.html
@@ -25,32 +25,10 @@ extra_js:
  <div class="container" id="consultancy-form">
    <div class="row">
      <div class="col-sm-9 col-md-9">
-        <div class="product-plan">
-          <ul class="plans list-unstyled">
-            <li>
-              <div class="action">
-                <div id="wufoo-rrsr4md1q53dik">
-                  Please fill out this <a href="https://gitlab.wufoo.com/forms/rrsr4md1q53dik">online form</a>.
-                </div>
-                <script type="text/javascript">var rrsr4md1q53dik;(function(d, t) {
-  var s = d.createElement(t), options = {
-  'userName':'gitlab',
-  'formHash':'rrsr4md1q53dik',
-  'autoResize':true,
-  'height':'2093',
-  'async':true,
-  'host':'wufoo.com',
-  'header':'show',
-  'ssl':true};
-  s.src = ('https:' == d.location.protocol ? 'https://' : 'http://') + 'wufoo.com/scripts/embed/form.js';
-  s.onload = s.onreadystatechange = function() {
-  var rs = this.readyState; if (rs) if (rs != 'complete') if (rs != 'loaded') return;
-  try { rrsr4md1q53dik = new WufooForm();rrsr4md1q53dik.initialize(options);rrsr4md1q53dik.display(); } catch (e) {}};
-  var scr = d.getElementsByTagName(t)[0], par = scr.parentNode; par.insertBefore(s, scr);
-  })(document, 'script');</script>
-              </div>
-            </li>
-          </ul>
+        <div class="centered-form">
+          <script src="//app-ab13.marketo.com/js/forms2/js/forms2.min.js"></script>
+          <form id="mktoForm_1061"></form>
+          <script>MktoForms2.loadForm("//app-ab13.marketo.com", "194-VVC-221", 1061);</script>
        </div>
      </div>
    </div>

--- a/source/contact/index.html
+++ b/source/contact/index.html
@@ -42,20 +42,15 @@ suppress_header: true
      <div class="col-sm-4 col-md-4">
        <img src="/images/icons/news.png" id="newsletter">
        <h2>Newsletter</h2>
-        <!-- Begin MailChimp Signup Form -->
-        <div id="mc_embed_signup" class="newsletter-form">
-          <form action="https://gitlab.us5.list-manage.com/subscribe/post?u=498dccd07cf3e9482bee33ba4&amp;id=98a9a4992c" method="post" id="mc-embedded-subscribe-form" name="mc-embedded-subscribe-form" class="validate" target="_blank" novalidate="">
-            <div class="mc-field-group">
-              <input type="email" value="" name="EMAIL" class="required email form-control" id="mce-EMAIL" placeholder="Your email address">
-            </div>
-            <div id="mce-responses" class="clear">
-              <div class="response" id="mce-error-response" style="display:none"></div>
-              <div class="response" id="mce-success-response" style="display:none"></div>
-            </div>  <div class="clear"><input type="submit" value="Subscribe" name="subscribe" id="mc-embedded-subscribe" class="btn btn-primary form-control"></div>
-          </form>
-        </div>
-        <!--End mc_embed_signup-->
-        <p>If you subscribe, you will receive all blog posts via email, including all security and release announcements.</p>
+
+        <script src="//app-ab13.marketo.com/js/forms2/js/forms2.min.js"></script>
+        <form id="mktoForm_1073"></form>
+        <script>MktoForms2.loadForm("//app-ab13.marketo.com", "194-VVC-221", 1073);</script>
+
+        <p class="newsletter-afterword">
+          If you subscribe, you will receive all blog posts via email, including
+          all security and release announcements.
+        </p>
      </div>
  
      <div class="col-sm-4 col-md-4">

--- a/source/development/index.html
+++ b/source/development/index.html
@@ -14,32 +14,16 @@ extra_css:
          <li> If you are missing some functionality in GitLab you can sponsor the development of it.</li>
          <li> After you send in the form below we will check if the feature is acceptable to include in GitLab. If so we will first email back with a minimum cost estimate. This is to make sure the expectations of the work that is involved are realistic.</li>
          <li>If the minimum estimate matches your expectations we will work on a detailed estimate. If you accept the detailed estimate we will give you an estimated release date and start the work.</li>
-          <li>A GitLab flow workshop help your organization develop a good git workflow in 2 hours</li>
          <li>We will inform you when the feature is ready and <a href="https://gitlab.com/gitlab-org/gitlab-ce/blob/a88225b7689ab87b49908db23e1bebf1c7ea09d3/CHANGELOG#L8">note your sponsorship in the Changelog</a> (unless you ask us not to, no problem). From then on your feature is a part of GitLab and will probably be maintained without any additional cost to you.</li>
        </ul>
      </div>
    </div>
  </div>
-</div>
-<div class="action">
-  <div id="wufoo-scvcb721qd692i">
-    Please fill out our <a href="https://gitlab.wufoo.com/forms/scvcb721qd692i">online form</a>.
-  </div>
-    <script type="text/javascript">var scvcb721qd692i;(function(d, t) {
-    var s = d.createElement(t), options = {
-    'userName':'gitlab',
-    'formHash':'scvcb721qd692i',
-    'autoResize':true,
-    'height':'2207',
-    'async':true,
-    'host':'wufoo.com',
-    'header':'show',
-    'ssl':true};
-    s.src = ('https:' == d.location.protocol ? 'https://' : 'http://') + 'wufoo.com/scripts/embed/form.js';
-    s.onload = s.onreadystatechange = function() {
-    var rs = this.readyState; if (rs) if (rs != 'complete') if (rs != 'loaded') return;
-    try { scvcb721qd692i = new WufooForm();scvcb721qd692i.initialize(options);scvcb721qd692i.display(); } catch (e) {}};
-    var scr = d.getElementsByTagName(t)[0], par = scr.parentNode; par.insertBefore(s, scr);
-    })(document, 'script');</script>
+
+  <div class="centered-form development-form">
+    <script src="//app-ab13.marketo.com/js/forms2/js/forms2.min.js"></script>
+    <form id="mktoForm_1063"></form>
+    <script>MktoForms2.loadForm("//app-ab13.marketo.com", "194-VVC-221", 1063);</script>
  </div>
+
 </div>
--- a/source/downloads/index.html
+++ b/source/downloads/index.html
@@ -100,6 +100,15 @@ platforms:
  
    <div class="col-md-3 hidden-sm hidden-xs">
      <img src="/images/downloads/logo.svg" class="img-responsive pack-fox">
+
+      <p class="newsletter-preamble">
+        Sign up for our monthly newsletter to stay up-to-date with new features
+        and product releases.
+      </p>
+
+      <script src="//app-ab13.marketo.com/js/forms2/js/forms2.min.js"></script>
+      <form id="mktoForm_1070"></form>
+      <script>MktoForms2.loadForm("//app-ab13.marketo.com", "194-VVC-221", 1070);</script>
    </div>
  
    <div class="col-md-9">

--- a/source/stylesheets/consultancy.css
+++ b/source/stylesheets/consultancy.css
@@ -39,10 +39,18 @@
 }
  
 #consultancy-form {
-  background-color: #fff;
-  min-height: 2200px;
+  background-color: #272120;
 }
  
 .wrapper {
  background-color: #272120;
 }
+
+.centered-form {
+  margin: 2em auto;
+  width: 500px;
+}
+
+.mktoLabel {
+  color: #fff;
+}
--- a/source/stylesheets/contact.css
+++ b/source/stylesheets/contact.css
@@ -50,3 +50,49 @@ p {
  height: 25px !important;
  padding-top: 5px !important;
 }
+
+.newsletter-afterword {
+  margin-top: 12px;
+}
+
+/* Override some Marketo form styles */
+.mktoAsterix, .mktoLabel {
+  display: none !important;
+}
+
+.mktoForm {
+  margin: 0 auto;
+  width: 220px;
+}
+
+.mktoFormCol {
+  margin-bottom: 0 !important;
+}
+
+.mktoFieldWrap {
+  float: none !important;
+}
+
+.mktoButtonWrap {
+  margin: 0 !important;
+}
+
+.mktoGutter, .mktoOffset {
+  width: 0 !important;
+}
+
+.mktoField, .mktoButton {
+  width: 220px !important;
+}
+
+.mktoButton {
+  background-color: #887AB6 !important;
+  background-image: none !important;
+  border: none !important;
+  color: #FFF !important;
+}
+
+.mktoButton:hover {
+  background-color: #6654A1 !important;
+  color: #FFF !important;
+}
--- a/source/stylesheets/development.css
+++ b/source/stylesheets/development.css
@@ -39,23 +39,27 @@ body {
  text-transform: uppercase;
 }
  
-.training-form {
-  color: white !important;
-  margin-top: 25px;
+.development-content a {
+  color: rgb(147, 190, 255);
 }
  
-.action {
-  margin: 3% 15% 0 15%;
+.development-content a:hover {
+  color: rgb(255, 201, 30);
+}
+
+.centered-form {
+  margin: 2em auto;
+  width: 500px;
 }
  
 @media (max-width: 1066px) {
-      .development-content {
-        margin: 0;
-        width: 100%;
-      }
-
-     .development-content li {
-      font-size: 13px;
-      background-size: cover;
-    }
+  .development-content {
+    margin: 0;
+    width: 100%;
+  }
+
+  .development-content li {
+    font-size: 13px;
+    background-size: cover;
+  }
 }
--- a/source/stylesheets/downloads.css
+++ b/source/stylesheets/downloads.css
@@ -7,6 +7,10 @@ body {
  margin-bottom: 70px;
 }
  
+.pack-fox {
+  margin: 0 auto;
+}
+
 .btn-default {
  background-color: #7769A0;
  border-color: #7769A0;
@@ -85,3 +89,29 @@ pre {
 .tab-step a {
  color: #FFB800;
 }
+
+.newsletter-preamble {
+  margin: 20px 5px;
+}
+
+/* Override some Marketo form styles */
+.mktoAsterix {
+  display: none !important;
+}
+
+.mktoFieldDescriptor {
+  margin-bottom: 0 !important;
+}
+
+.mktoForm,
+.mktoFormCol,
+.mktoFieldWrap,
+.mktoField,
+.mktoButtonRow,
+.mktoButton {
+  width: 100% !important;
+}
+
+.mktoOffset, .mktoGutter {
+  width: 0 !important;
+}
--- a/source/stylesheets/sales.css
+++ b/source/stylesheets/sales.css
@@ -8,7 +8,7 @@ body {
 }
  
 .centered-form {
-  margin: 0 auto;
+  margin: 2em auto;
  width: 500px;
 }
  
@@ -40,10 +40,6 @@ body {
  margin: 3% 15% -12% 15%;
 }
  
-.centered-form {
-  margin: 2em auto;
-}
-
 .contact-intro {
  margin-bottom: 2em;
 }
--- a/source/stylesheets/training.css
+++ b/source/stylesheets/training.css
@@ -61,3 +61,8 @@ body {
 .center {
  text-align: center;
 }
+
+.centered-form {
+  margin: 2em auto;
+  width: 500px;
+}
--- a/source/training/index.html
+++ b/source/training/index.html
@@ -43,25 +43,10 @@ extra_css:
      </div>
    </div>
  </div>
-  <div class="container training-form">
-    <div id="wufoo-wnwsmb80wogkgf">
-    Fill out my <a href="https://gitlab.wufoo.com/forms/wnwsmb80wogkgf">online form</a>.
-    </div>
-    <script type="text/javascript">var wnwsmb80wogkgf;(function(d, t) {
-    var s = d.createElement(t), options = {
-    'userName':'gitlab',
-    'formHash':'wnwsmb80wogkgf',
-    'autoResize':true,
-    'height':'751',
-    'async':true,
-    'host':'wufoo.com',
-    'header':'show',
-    'ssl':true};
-    s.src = ('https:' == d.location.protocol ? 'https://' : 'http://') + 'wufoo.com/scripts/embed/form.js';
-    s.onload = s.onreadystatechange = function() {
-    var rs = this.readyState; if (rs) if (rs != 'complete') if (rs != 'loaded') return;
-    try { wnwsmb80wogkgf = new WufooForm();wnwsmb80wogkgf.initialize(options);wnwsmb80wogkgf.display(); } catch (e) {}};
-    var scr = d.getElementsByTagName(t)[0], par = scr.parentNode; par.insertBefore(s, scr);
-    })(document, 'script');</script>
+
+  <div class="centered-form training-form">
+    <script src="//app-ab13.marketo.com/js/forms2/js/forms2.min.js"></script>
+    <form id="mktoForm_1068"></form>
+    <script>MktoForms2.loadForm("//app-ab13.marketo.com", "194-VVC-221", 1068);</script>
  </div>
-</div>
\ No newline at end of file
+</div>