Merge pull request #14584 from britneywwc/copy-download-server

feat: Apply copy update on /server/download/thank-you

templates/download/server/thank-you.html

@@ -32,42 +32,30 @@ <h1>Thank you for downloading Ubuntu Server {{ version }}{{ " LTS" if lts }}</h1
         </p>
       </div>
       <div class="col">
-        {% with returnUrl="/download/server", ga_event_title="Ubuntu Server download" %}
-          {% include 'shared/_download-newsletter.html' %}
-        {% endwith %}
-      </div>
-    </div>
-  </section>
-
-  {% include 'download/shared/_server_weekly_news.html' %}
-
-  <section class="p-section">
-    <hr class="p-rule is-fixed-width" />
-    <div class="row--50-50">
-      <div class="col">
+        {% include 'download/shared/_server_weekly_news.html' %}
         <h2>Ubuntu CLI cheatsheet</h2>
         <div class="p-section--shallow">
           <p>
-            Learn how to use the command line efficiently and get started with DevOps &mdash; from basic file management to LXD virtualisation and Ubuntu Pro.
+            Learn how to use the command line efficiently and get started with DevOps &mdash; from basic file management to LXD virtualization and Ubuntu Pro.
           </p>
         </div>
-        <a class="p-button--positive"
-           href="https://assets.ubuntu.com/v1/3bd0daaf-Ubuntu%20Server%20CLI%20cheat%20sheet%202024%20v6.pdf">Download the CLI cheat sheet</a>
-      </div>
-      <div class="col">
-        <div class="p-section--shallow p-image-wrapper">
-          {{ image(url="https://assets.ubuntu.com/v1/639c1f12-server-cli-cheatsheet.png",
-                    alt="CLI cheat sheet",
-                    width="1200",
-                    height="849",
-                    hi_def=True,
-                    loading="auto") | safe
-          }}
-        </div>
+        <button class="p-button--positive"
+           onclick="toggleModal()">Download the CLI cheat sheet</button>
+           <div class="p-section--shallow p-image-wrapper">
+            {{ image(url="https://assets.ubuntu.com/v1/639c1f12-server-cli-cheatsheet.png",
+                      alt="CLI cheat sheet",
+                      width="1200",
+                      height="849",
+                      hi_def=True,
+                      loading="auto") | safe
+            }}
+          </div>
       </div>
     </div>
   </section>
 
+  {% include 'shared/_download-ubuntu-thank-you-pro-section.html' %}
+
   <section class="p-section">
     <hr class="p-rule is-fixed-width" />
     <div class="row">
@@ -94,15 +82,13 @@ <h3 class="p-heading--5">
             <h3 class="p-heading--5">
               <a href="https://discourse.ubuntu.com/">Community Discourse</a>
             </h3>
-            <p>Discuss with Ubuntu developers and make your voice heard.</p>
+            <p>Join the Ubuntu developers community and make your voice heard.</p>
           </div>
         </div>
       </div>
     </div>
   </section>
 
-  {% include 'shared/_download-ubuntu-thank-you-pro-section.html' %}
-
   <section class="p-section">
     <div class="p-section--shallow u-fixed-width">
       <hr class="p-rule" />
@@ -128,7 +114,7 @@ <h3>
             <p>Build a bare metal cloud with super fast server provisioning.</p>
             <hr class="p-rule" />
             <p>
-              <a href="https://maas.io/">Learn more about MAAS&nbsp;&rsaquo;</a>
+              <a href="https://maas.io/">Learn about MAAS&nbsp;&rsaquo;</a>
             </p>
           </div>
         </div>
@@ -152,7 +138,7 @@ <h3>
             <p>Fast, dense, and secure container and VM management at any scale.</p>
             <hr class="p-rule" />
             <p>
-              <a href="https://canonical.com/lxd">Learn more about LXD&nbsp;&rsaquo;</a>
+              <a href="https://canonical.com/lxd">Learn about LXD&nbsp;&rsaquo;</a>
             </p>
           </div>
         </div>
@@ -176,7 +162,7 @@ <h3>
             <p>Design and deploy entire workloads in just a few clicks.</p>
             <hr class="p-rule" />
             <p>
-              <a href="https://juju.is/">Learn more about Juju&nbsp;&rsaquo;</a>
+              <a href="https://juju.is/">Learn about Juju&nbsp;&rsaquo;</a>
             </p>
           </div>
         </div>
@@ -200,7 +186,7 @@ <h3>
             <p>Spin up Ubuntu VMs on Windows, Mac and Linux.</p>
             <hr class="p-rule" />
             <p>
-              <a href="https://multipass.run/">Learn more about Multipass&nbsp;&rsaquo;</a>
+              <a href="https://multipass.run/">Learn about Multipass&nbsp;&rsaquo;</a>
             </p>
           </div>
         </div>

templates/download/shared/_server_weekly_news.html

@@ -1,4 +1,4 @@
-<div id="download-cheatsheet modal" class="p-modal u-hide">
+<div id="download-cheatsheet-modal" class="p-modal u-hide">
   <div class="p-modal__dialog"
        role="dialog"
        aria-labelledby="modal-title"
@@ -64,7 +64,7 @@ <h2 class="p-modal__title" id="modal-title">Get Ubuntu Server pro tips</h2>
                    aria-labelledby="canonicalUpdatesOptIn"
                    name="canonicalUpdatesOptIn"
                    type="checkbox" />
-            <span class="p-checkbox__label" id="canonicalUpdatesOptIn">I would like to receive news from Canonical by email.</span>
+            <span class="p-checkbox__label" id="canonicalUpdatesOptIn">I would like to receive news from Ubuntu newsletter and occasional updates from Canonical by email.</span>
           </label>
 
           <p>
@@ -139,7 +139,7 @@ <h2 class="p-modal__title" id="modal-title">Get Ubuntu Server pro tips</h2>
     @param {HTMLElement} event modal Modal dialog to show or hide.
   */
   function toggleModal(event) {
-    var targetControls = document.getElementById("download-cheatsheet");
+    var targetControls = document.getElementById("download-cheatsheet-modal");
     if (targetControls && targetControls.classList.contains('p-modal')) {
       targetControls.classList.toggle('u-hide');
     }