fix(solutions-telco): BE->AE spelling, new form to get in touch

WD-17656
canonical · Jan 7, 2025 · 042d2ba · 042d2ba
1 parent bfcdecf
commit 042d2ba
Show file tree

Hide file tree

Showing 7 changed files with 111 additions and 230 deletions.
diff --git a/static/files/forms-data.json b/static/files/forms-data.json
@@ -334,6 +334,78 @@
           ]
         }
       ]
+    },
+    "/solutions/telco": {
+      "templatePath": "/solutions/telco/index.html",
+      "childrenPaths": ["/solutions/telco/5g-core", "/solutions/telco/5g-edge", "/solutions/telco/open-ran"],
+      "isModal": true,
+      "modalId": "solutions-telco-modal",
+      "formData": {
+        "title": "Contact Canonical",
+        "introText": "Fill in this form and a member of our team will be in touch shortly.",
+        "formId": "6062",
+        "returnUrl": "/solutions/telco#contact-form-success",
+        "product": ""
+      },
+      "fieldsets": [
+        {
+          "title": "Tell us more about your use case",
+          "id": "comments",
+          "isRequired": false,
+          "fields": [
+            {
+              "type": "long-text",
+              "id": "comments",
+              "placeholder": "Anything you'd like to communicate about your needs or interests?"
+            }
+          ]
+        },
+        {
+          "title": "How should we get in touch?",
+          "id": "about-you",
+          "noCommentsFromLead": true,
+          "fields": [
+            {
+              "type": "text",
+              "id": "firstName",
+              "label": "First name",
+              "isRequired": true
+            },
+            {
+              "type": "text",
+              "id": "lastName",
+              "label": "Last name",
+              "isRequired": true
+            },
+            {
+              "type": "email",
+              "id": "email",
+              "label": "Email",
+              "isRequired": true
+            },
+            {
+              "type": "country",
+              "id": "country",
+              "label": "Country"
+            },
+            {
+              "type": "tel",
+              "id": "phone",
+              "label": "Phone number"
+            },
+            {
+              "type": "text",
+              "id": "company",
+              "label": "Company"
+            },
+            {
+              "type": "text",
+              "id": "title",
+              "label": "Job title"
+            }
+          ]
+        }
+      ]
     }
   }
 }
diff --git a/templates/solutions/telco/5g-core.html b/templates/solutions/telco/5g-core.html
@@ -35,7 +35,7 @@ <h1>
           <hr class="p-rule--muted" />
           <a href="/contact-us"
              class="p-button--positive"
-             aria-controls="telco-5g-core-modal">Contact us</a>
+             aria-controls="solutions-telco-modal">Contact us</a>
         </div>
       </div>
       <div class="p-image-container--cinematic is-highlighted">
@@ -564,17 +564,14 @@ <h2>
         <p>
           <a href="/contact-us"
              class="p-button--positive"
-             aria-controls="telco-5g-core-modal">Contact us</a>
+             aria-controls="solutions-telco-modal">Contact us</a>
         </p>
       </div>
     </div>
   </div>
 
   <script defer src="{{ versioned_static('js/modals.js') }}"></script>
 
-  {% with %}
-    {% set returnURL = "https://canonical.com/solutions/telco/5g-core#success" %}
-    {% include "solutions/telco/_form-telco-5g.html" %}
-  {% endwith %}
+  {% include "/shared/forms/form-template.html" %}
 
 {% endblock %}
diff --git a/templates/solutions/telco/5g-edge.html b/templates/solutions/telco/5g-edge.html
@@ -35,7 +35,9 @@ <h1>
             </p>
           </div>
           <div class="p-cta-block u-no-padding--bottom">
-            <a href="#get-in-touch" class="p-button--positive">Contact us</a>
+            <a href="/contact-us"
+               class="p-button--positive"
+               aria-controls="solutions-telco-modal">Contact us</a>
           </div>
         </div>
       </div>
@@ -708,18 +710,16 @@ <h2>
       </div>
       <div class="u-fixed-width">
         <p>
-          <a href="#get-in-touch"
-             class="p-button--positive">Contact us</a>
+          <a href="/contact-us"
+             class="p-button--positive"
+             aria-controls="solutions-telco-modal">Contact us</a>
         </p>
       </div>
     </div>
   </div>
 
   <script defer src="{{ versioned_static('js/modals.js') }}"></script>
 
-  {% with %}
-    {% set returnURL = "https://canonical.com/solutions/telco/5g-edge#success" %}
-    {% include "solutions/telco/_form-telco-5g.html" %}
-  {% endwith %}
+  {% include "/shared/forms/form-template.html" %}
 
 {% endblock %}
diff --git a/templates/solutions/telco/_form-telco-5g.html b/templates/solutions/telco/_form-telco-5g.html