Merge pull request canonical#14673 from britneywwc/remove-k8s-thank-you

templates/kubernetes/charmed-k8s.html

@@ -354,7 +354,7 @@ <h2>
        data-form-location="/shared/forms/interactive/kubernetes"
        data-form-id="3230"
        data-lp-id="6274"
-       data-return-url="https://ubuntu.com/kubernetes/thank-you?product=kubernetes-features"
+       data-return-url="/kubernetes/charmed-k8s#contact-form-success"
        data-lp-url="https://pages.ubuntu.com/things-contact-us.html"></div>
 
 {% endblock content %}

templates/kubernetes/compare.html

@@ -510,13 +510,13 @@ <h2>Need help with K8s?</h2>
     </div>
   </section>
 
-  <!-- Set default Marketo information for contact form below-->
-  <div class="u-hide"
-       id="contact-form-container"
-       data-form-location="/shared/forms/interactive/kubernetes"
-       data-form-id="3230"
-       data-lp-id="6274"
-       data-return-url="/kubernetes/compare#success"
-       data-lp-url="https://pages.ubuntu.com/things-contact-us.html"></div>
+      <!-- Set default Marketo information for contact form below-->
+      <div class="u-hide"
+           id="contact-form-container"
+           data-form-location="/shared/forms/interactive/kubernetes"
+           data-form-id="3230"
+           data-lp-id="6274"
+           data-return-url="/kubernetes/compare#contact-form-success"
+           data-lp-url="https://pages.ubuntu.com/things-contact-us.html"></div>
 
 {% endblock content %}

templates/kubernetes/contact-us.html

@@ -10,79 +10,79 @@
   intro_text="Fill in your details below and a member of our sales team will be in touch.",
   formid="3230",
   lpId="6274",
-  returnURL="/kubernetes/thank-you" %}
+  returnURL="/kubernetes#contact-form-success" %}
   {% include "shared/_default-contact-us-form.html" %}
 {% endwith %}
   {% elif product == 'kubernetes-managed' %}
 {% with h1="Contact us about Managed Kubernetes",
   intro_text="Fill in your details below and a member of our sales team will be in touch.",
   formid="3230",
   lpId="6274",
-  returnURL="/kubernetes/thank-you?product=kubernetes-managed" %}
+  returnURL="/kubernetes#contact-form-success" %}
   {% include "shared/_default-contact-us-form.html" %}
 {% endwith %}
   {% elif product == 'kubernetes-kubeadm' %}
 {% with h1="Contact us about kubeadm",
   intro_text="Fill in your details below and a member of our sales team will be in touch.",
   formid="3230",
   lpId="6274",
-  returnURL="/kubernetes/thank-you?product=kubernetes-kubeadm" %}
+  returnURL="/kubernetes#contact-form-success" %}
   {% include "shared/_default-contact-us-form.html" %}
 {% endwith %}
   {% elif product == 'multicloud' %}
 {% with h1="Contact us about multicloud",
   intro_text="Fill in your details below and a member of our sales team will be in touch.",
   formid="3230",
   lpId="6274",
-  returnURL="/kubernetes/thank-you?product=multicloud" %}
+  returnURL="/kubernetes#contact-form-success" %}
   {% include "shared/_default-contact-us-form.html" %}
 {% endwith %}
   {% elif product == 'kubernetes-install' %}
 {% with h1="Contact us about Kubernetes",
   intro_text="Fill in your details below and a member of our sales team will be in touch.",
   formid="3230",
   lpId="6274",
-  returnURL="/kubernetes/thank-you?product=kubernetes-install" %}
+  returnURL="/kubernetes#contact-form-success" %}
   {% include "shared/_default-contact-us-form.html" %}
 {% endwith %}
   {% elif product == 'kubernetes-features' %}
 {% with h1="Contact us about Kubernetes",
   intro_text="Fill in your details below and a member of our sales team will be in touch.",
   formid="3230",
   lpId="6274",
-  returnURL="/kubernetes/thank-you?product=kubernetes-features" %}
+  returnURL="/kubernetes#contact-form-success" %}
   {% include "shared/_default-contact-us-form.html" %}
 {% endwith %}
   {% elif product == 'kubernetes-consulting' %}
 {% with h1="Contact us about Kubernetes consulting",
   intro_text="Fill in your details below and a member of our sales team will be in touch.",
   formid="3230",
   lpId="6274",
-  returnURL="/kubernetes/thank-you?product=kubernetes-consulting" %}
+  returnURL="/kubernetes#contact-form-success" %}
   {% include "shared/_default-contact-us-form.html" %}
 {% endwith %}
   {% elif product == 'kubernetes-add-on' %}
 {% with h1="Contact us about Kubernetes with AI/ML",
   intro_text="Fill in your details below and a member of our sales team will be in touch.",
   formid="3230",
   lpId="6274",
-  returnURL="/kubernetes/thank-you?product=kubernetes-add-on" %}
+  returnURL="/kubernetes#contact-form-success" %}
   {% include "shared/_default-contact-us-form.html" %}
 {% endwith %}
   {% elif product == 'kubernetes-support' %}
 {% with h1="Contact us about Kubernetes support",
   intro_text="Fill in your details below and a member of our sales team will be in touch.",
   formid="3230",
   lpId="6274",
-  returnURL="/kubernetes/thank-you?product=kubernetes-support" %}
+  returnURL="/kubernetes#contact-form-success" %}
   {% include "shared/_default-contact-us-form.html" %}
 {% endwith %}
   {% else %}
 {% with h1="Contact us about Kubernetes",
   intro_text="Fill in your details below and a member of our sales team will be in touch.",
   formid="3230",
   lpId="6274",
-  returnURL="/kubernetes/thank-you" %}
+  returnURL="/kubernetes#contact-form-success" %}
   {% include "shared/_default-contact-us-form.html" %}
 {% endwith %}
   {% endif %}

templates/kubernetes/index.html

@@ -159,14 +159,14 @@ <h3 class="u-no-padding--top">
           <ul class="p-list--divided">
             <li class="p-list__item is-ticked">Easy to use with built-in capabilities: networking, local storage, DNS, metrics server, gateway and ingress </li>
             <li class="p-list__item is-ticked">Zero ops from Day 0 to Day 2 - add and manage nodes in small Kubernetes clusters with minimal effort</li>
-            <li class="p-list__item is-ticked">Automated cluster operations for easier large scale maintenance with <a href="http://juju.is">Juju</a></li>
+            <li class="p-list__item is-ticked">Automated cluster operations for easier large scale maintenance with <a href="https://juju.is">Juju</a></li>
             <li class="p-list__item is-ticked">12 year Long Term Support commitment  that lets you decide when it is time to upgrade your infrastructure</li>
             <li class="p-list__item is-ticked">The same Kubernetes that scales from your laptop to the cloud and the data centre</li>
             <li class="p-list__item is-ticked">CNCF conformant</li>
           </ul>
           <hr />
           <p>
-            <a class="p-button" href="http://documentation.ubuntu.com/canonical-kubernetes">Try Canonical Kubernetes today</a>
+            <a class="p-button" href="https://documentation.ubuntu.com/canonical-kubernetes">Try Canonical Kubernetes today</a>
             <a href="">Read the announcement&nbsp;&rsaquo;</a>
           </p>
         </div>
@@ -654,7 +654,12 @@ <h2>Get your K8s questions answered today</h2>
 </section>
 
 <!-- Set default Marketo information for contact form below-->
-<div class="u-hide" id="contact-form-container" data-form-location="/shared/forms/interactive/kubernetes" data-form-id="3230" data-lp-id="6274" data-return-url="https://ubuntu.com/kubernetes/thank-you?product=kubernetes-features" data-lp-url="https://pages.ubuntu.com/things-contact-us.html">
-</div>
+<div class="u-hide" 
+     id="contact-form-container" 
+     data-form-location="/shared/forms/interactive/kubernetes" 
+     data-form-id="3230" 
+     data-lp-id="6274" 
+     data-return-url="/kubernetes#contact-form-success" 
+     data-lp-url="https://pages.ubuntu.com/things-contact-us.html"></div>
 
 {% endblock content %}

templates/kubernetes/managed.html

@@ -455,7 +455,7 @@ <h3 class="p-heading--5">App&ndash;store included</h3>
        data-form-location="/shared/forms/interactive/managed-kubernetes"
        data-form-id="3897"
        data-lp-id=""
-       data-return-url="https://ubuntu.com/kubernetes/thank-you?product=kubernetes-managed"
+       data-return-url="/kubernetes/managed#contact-form-success"
        data-lp-url="https://pages.ubuntu.com/things-contact-us.html"></div>
 
 {% endblock content %}

templates/kubernetes/resources.html

@@ -823,7 +823,7 @@ <h1>
        data-form-location="/shared/forms/interactive/kubernetes"
        data-form-id="3897"
        data-lp-id=""
-       data-return-url="https://ubuntu.com/kubernetes/thank-you?product=kubernetes-resources"
+       data-return-url="/kubernetes/resources#contact-form-success"
        data-lp-url="https://pages.ubuntu.com/things-contact-us.html"></div>
 
 {% endblock %}

templates/kubernetes/what-is-kubernetes.html

@@ -888,12 +888,12 @@ <h4 class="p-card__title">
     <div class="row">
       <div class="col-6">
         <h2 class="p-section--shallow">Try our newest Canonical Kubernetes distribution</h2>
-        <p><a href="http://documentation.ubuntu.com/canonical-kubernetes">Try Canonical Kubernetes today&nbsp;&rsaquo;</a></p>
+        <p><a href="https://documentation.ubuntu.com/canonical-kubernetes">Try Canonical Kubernetes today&nbsp;&rsaquo;</a></p>
         <p><a href="/kubernetes">Read the announcement&nbsp;&rsaquo;</a></p>
       </div>
       <div class="col-6 ">
         <p>Canonical Kubernetes is our newest K8s distribution, currently in beta. When it reaches general availability, it will come with 12 years of Long Term Support (LTS) and built-in features like networking, local storage, dns or ingress.</p>
-        <p>For small scale clusters It can be deployed with a single command and join new nodes with two more. It can also be combined with <a href="http://juju.is">Juju</a> to provide maintenance automation for large scale clusters.</p>
+        <p>For small scale clusters It can be deployed with a single command and join new nodes with two more. It can also be combined with <a href="https://juju.is">Juju</a> to provide maintenance automation for large scale clusters.</p>
       </div>
     </div>
   </section>
@@ -929,7 +929,7 @@ <h2 class="p-heading--3">Get your K8s questions answered today</h2>
        data-form-location="/shared/forms/interactive/kubernetes"
        data-form-id="3230"
        data-lp-id="6274"
-       data-return-url="https://ubuntu.com/kubernetes/thank-you"
+       data-return-url="/kubernetes/what-is-kubernetes#contact-form-success"
        data-lp-url="https://pages.ubuntu.com/things-contact-us.html"></div>
 
 {% endblock content %}

templates/shared/_default-contact-us-form.html

@@ -486,7 +486,7 @@ <h1>{{ h1 }}</h1>
               </li>
               {# End of honey pots #}
               <li class="p-list__item">
-                <button type="submit" class="p-button--positive js-submit-button" disabled>Submit</button>
+                <button type="submit" class="p-button--positive js-submit-button">Submit</button>
               </li>
             </ul>
             <div class="u-off-screen">