Merge branch 'canonical:main' into WD-7947-scheduled-exams-sometimes-…

…do-not-generate-a-take-exam-link

requirements.txt

@@ -1,6 +1,6 @@
 canonicalwebteam.flask-base==1.1.0
 canonicalwebteam.http==1.0.4
-canonicalwebteam.blog==6.4.2
+canonicalwebteam.blog==6.4.1
 canonicalwebteam.search==1.3.0
 canonicalwebteam.templatefinder==1.0.0
 canonicalwebteam.image-template==1.3.1
@@ -28,3 +28,4 @@ google-cloud-datastore==2.16.1
 django-openid-auth==0.17
 time-machine==2.9.0
 filelock==3.12.0
+bleach==6.0.0

static/js/src/certified-search-results.js

@@ -43,16 +43,16 @@ function retrieveSelectedFilters() {
   const path = window.location.pathname;
   const pathCategory = path.replace("/certified/", "");
 
-  let selectedCategories;
+  let selectedCategories = [];
   let selectedVendors = urlParams.getAll("vendor");
   let selectedReleases = urlParams.getAll("release");
 
   if (pathCategory !== "/certified") {
-    selectedCategories = urlParams.getAll("category").push(pathCategory);
+    selectedCategories = urlParams.getAll("category");
+    selectedCategories.push(pathCategory);
   } else {
     selectedCategories = urlParams.getAll("category");
   }
-
   return {
     category: selectedCategories,
     vendor: selectedVendors,

templates/ceph/install.html

@@ -33,7 +33,7 @@ <h1>Install Ceph on Ubuntu</h1>
   </div>
 </section>
 
-<seciton class="p-strip">
+<section class="p-strip">
   <div class="u-fixed-width js-tabbed-content">
     <div class="p-tabs">
       <div class="p-tabs__list" role="tablist" aria-label="Ceph installation instructions">
@@ -245,7 +245,7 @@ <h2>Large-scale deployment</h2>
       </div>
     </div>
   </div>
-</seciton>
+</section>
 
 <section class="p-strip--light is-deep">
   <div class="row u-equal-height">

templates/confidential-computing/index.html

@@ -59,7 +59,7 @@ <h2>Intel TDX is available on Ubuntu for both the host and guest</h2>
         </p>
         <div class="u-align--center u-vertically-center u-hide--small">
           {{ image (
-          url="https://assets.ubuntu.com/v1/48765e85-Intel%20%20TDX%20and%20Ubuntu%20Figure.png",
+          url="https://assets.ubuntu.com/v1/eb3679e5-Intel%20%20TDX%20and%20Ubuntu%20Figure.png",
           alt="Diagram showing that Ubuntu builds cater to both the host and guest sides, empowering users to launch a
           confidential TDX virtual machine seamlessly",
           width="410",

templates/internet-of-things/index.html

@@ -268,13 +268,35 @@ <h2>Our products</h2>
     <div class="col-6">
       <hr>
       <h3>Ubuntu</h3>
+      <div class="u-hide--small" style="margin-bottom: 1rem;">
+        {{ image (
+          url="https://assets.ubuntu.com/v1/0532297f-Developer.svg",
+          alt="",
+          width="200",
+          height="125",
+          hi_def=True,
+          loading="lazy",
+          ) | safe
+        }}
+      </div>
       <p><a href="/desktop">Ubuntu</a> is a solid foundation for all software development and the OS of choice for developers.</p>
       <p>Ubuntu Pro is a comprehensive subscription on top of Ubuntu that gives you confidence in your full open source stack. Benefit from 10 years of security maintenance with automated security patches at scale, access real time capabilities optimised for embedded devices, and ensure uptime and minimal time to remediation.</p>
       <a href="/pro" class="p-button">Learn more about Ubuntu Pro</a>
     </div>
     <div class="col-6">
       <hr>
       <h3>Ubuntu Core</h3>
+      <div class="u-hide--small" style="margin-bottom: 1rem;">
+        {{ image (
+          url="https://assets.ubuntu.com/v1/5da98122-Chip.svg",
+          alt="",
+          width="160",
+          height="125",
+          hi_def=True,
+          loading="lazy",
+          ) | safe
+        }}
+      </div>
       <p>Ubuntu Core is our open source operating system designed for IoT and edge, with the strong security model you've come to expect from Ubuntu. Core is used by IoT start-ups and large enterprises, with huge fleets of devices in the field today.</p>
       <p>Ubuntu Core uses the same kernel, libraries, and system software as classic Ubuntu, resulting in a smooth transition to production, and includes Ubuntu Pro as the standard.</p>
       <p><a href="/core" class="p-button">Learn more about Ubuntu Core</a></p>

templates/legal/data-privacy/partner-portal.md

@@ -3,12 +3,10 @@ wrapper_template: "legal/_base_legal_markdown.html"
 context:
   title: "Privacy notice – Partner Portal"
   description: This privacy notice tells you about the information we collect from you when you access the Canonical Partner Portal.
+  update_date: "Version - January 2024"
   copydoc: https://docs.google.com/document/d/1yuh7dL3jjkj21sKJCUhm_z00PKzH4vssY339wbp4U-s/edit
 ---
 
-<h4 class="p-muted-heading">Version - July 2023</h4>
-<hr style="margin-bottom: 2rem;" />
-
 # Privacy notice - Partner Portal
 
 This privacy notice tells you about the information we collect from you when you access the Canonical Partner Portal. In collecting this information, we are acting as a data controller and, by law, we are required to provide you with information about us, about why and how we use your data, and about the rights you have over your data. For more information, please see our [privacy policy](/legal/dataprivacy).
@@ -21,7 +19,7 @@ We are not required to have a data protection officer, so any enquiries about ou
 
 ## What personal data do we collect?
 
-When you access the Canonical Partner Portal, we ask you to submit your USERID and password. You will ask be asked for further information through the deal registration system, including name, address, contact telephone number, email address and information about the deal you are registering.
+When you access the Canonical Partner Portal, we ask you to submit your USERID and password. You will be asked for further information through the deal registration system, including name, address, contact telephone number, email address and information about the deal you are registering.
 
 ## Why do we collect this information?
 
@@ -42,7 +40,7 @@ We may:
 
 Your information is stored in our order processing system and may be processed outside of the European Economic Area. It is shared with the third parties set out below and as reasonably required for Canonical to process and store your data.
 
-The Canonical Partner Platform is hosted by a third party supplier, Gorilla Toolz, Inc. and the deal registration system (part of the Canonical Partner Platform) is hosted by a third party supplier, Vartopia LLC. In order for the Canonical Partner Platform to operate we share your information with these third party suppliers and they may share information about you with us.
+The Canonical Partner Platform is hosted by a third party supplier, Zift Solutions. In order for the Canonical Partner Platform to operate we share your information with this third party supplier and they may share information about you with us.
 
 ## Our legal basis to use your Personal information
 

templates/legal/partner-portal-terms.md

@@ -3,7 +3,7 @@ wrapper_template: "legal/_base_legal_markdown.html"
 context:
   title: "Partner Portal terms and conditions"
   description: "This privacy notice tells you about the information we collect from you when you submit your information to us via an enquiry or contact us form on our website."
-  update_date: "Version - February 2019"
+  update_date: "Version - January 2024"
   copydoc: https://docs.google.com/document/d/1CqJbwC3KpEJeJaCUVjAIN0y6ZLmoc7gVlFyc-BeFMYw/edit#
 ---
 
@@ -15,13 +15,13 @@ context:
 
 ## Copyright
 
-The website HTML, text, images audio, video, software or other content that is made available on Canonical's Partner Platform or otherwise hosted by Canonical are the property of someone - the author in the case of content produced elsewhere and reproduced here with permission of Canonical, the platform provider or content suppliers (e.g. Gorilla Toolz, Inc. and Vartopia, LLC.). Before you use this content in some way please take care to ensure that you have the relevant rights and permissions from the copyright holder.
+The website HTML, text, images audio, video, software or other content that is made available on Canonical's Partner Platform or otherwise hosted by Canonical are the property of someone - the author in the case of content produced elsewhere and reproduced here with permission of Canonical, the platform provider or content suppliers (e.g. Zift Solutions). Before you use this content in some way please take care to ensure that you have the relevant rights and permissions from the copyright holder.
 
 You are welcome to display on your computer, download and print pages from Canonical's Partner Platform for internal use only. You must retain copyright, trademark and other notices unaltered on any copies or printouts you make. Certain materials available on this site are "open source" materials subject to the GNU General Public Licence ("GPL") or other open-source licence and are so marked. Use of those materials is governed by the individual applicable licence.
 
 ## Trademarks
 
-Any trademarks, logos and service marks displayed on Canonical's Partner Platform are the property of their owners, whether Canonical or third parties. For example, the Gorilla Toolz logo is a registered trademark of Gorilla Toolz, Inc.
+Any trademarks, logos and service marks displayed on Canonical's Partner Platform are the property of their owners, whether Canonical or third parties. For example, the ZiftONE logo is a registered trademark of Zift Solutions.
 
 ## Privacy policy
 

templates/pricing/pro.html

@@ -51,7 +51,7 @@ <h2 class="u-no-margin--bottom">Ubuntu Pro pricing</h2>
             <td>$300</td>
           </tr>
           <tr>
-            <td>Server with unlimited VMs*<br><span class="u-text--muted">(machine/year)</span></td>
+            <td>Server with unlimited VMs<br><span class="u-text--muted">(machine/year)</span></td>
             <td>$500</td>
             <td>$1,775</td>
             <td>$3,400</td>
@@ -113,7 +113,7 @@ <h5>Security and compliance</h5>
             <td>yes</td>
           </tr>
           <tr>
-            <td>USG harderning with CIS and DISA-STIG profiles<br><span class="u-text--muted">(DISA-STIG tooling & automation for Ubuntu 20.04 LTS and 22.04 LTS)</span></td>
+            <td>USG hardening with CIS and DISA-STIG profiles<br><span class="u-text--muted">(DISA-STIG tooling & automation for Ubuntu 20.04 LTS and 22.04 LTS)</span></td>
             <td>yes</td>
             <td>yes</td>
             <td>yes</td>
@@ -220,8 +220,6 @@ <h5>Phone and ticket support</h5>
       <h5>Notes</h5>
     </div>
     <div class="col-10 col-medium-6">
-      <p>* Any of: KVM | Qemu | Boch, VMWare ESXi, LXD | LXC, Xen, Hyper-V (WSL, Multipass), VirtualBox, z/VM, Docker. All Nodes in the cluster have to be subscribed to the service in order to benefit from the unlimited VM support</p>
-      <hr class="u-no-margin--bottom">
       <p>N.B.: Weekday support is half the price of 24/7 support</p>
       <hr class="u-no-margin--bottom">
       <p>N.B.: Subscriptions are not just for enterprise customers. Anyone can get <a href="/pro">a personal subscription</a> for free on up to 5 machines</p>