diff --git a/meganav.yaml b/meganav.yaml index 6473fc4fe79..022936c5ba6 100644 --- a/meganav.yaml +++ b/meganav.yaml @@ -140,7 +140,7 @@ products: url: /server - title: Landscape description: Monitor and manage machines - url: https://landscape.canonical.com/ + url: /landscape - title: MAAS description: Bare metal provisioning url: https://maas.io/ @@ -255,6 +255,9 @@ products: - title: Certifications and hardening description: CIS, DISA-STIG, FIPS compliance url: /security/certifications + - title: Confidential computing + description: Protect your data in use + url: /confidential-computing secondary_links: - title: Quick links @@ -492,6 +495,9 @@ use_case: - title: Signage description: Smart displays and kiosks url: /internet-of-things/smart-displays + - title: Storage + description: Scalable software-defined storage + url: /ceph highlighted_secondary_links: - title: By industry @@ -677,9 +683,12 @@ community: - title: Report bugs description: Report bugs on Launchpad url: https://help.ubuntu.com/community/ReportingBugs - - title: Software development + - title: Ubuntu development + description: Help maintain Ubuntu OS + url: /community/contribute/ubuntu-development + - title: Application development description: Create and maintain software - url: /community/contribute/software-development + url: /community/contribute/application-development - title: Improve documentation description: Help write the docs url: https://wiki.ubuntu.com/DocumentationTeam/SystemDocumentation @@ -886,8 +895,6 @@ get_ubuntu: url: /download/iot/intel-iotg - title: Intel NUC url: /download/intel-nuc - - title: KVM - url: /download/kvm - title: Qualcomm Dragonboard 410c url: /download/qualcomm-dragonboard-410c - title: Intel IEI TANK 870 diff --git a/static/favicons/COF-favicon-48x48.png b/static/favicons/COF-favicon-48x48.png new file mode 100644 index 00000000000..b1faf2badd9 Binary files /dev/null and b/static/favicons/COF-favicon-48x48.png differ diff --git a/static/files/site.webmanifest b/static/files/site.webmanifest new file mode 100644 index 00000000000..76b3f5939e4 --- /dev/null +++ b/static/files/site.webmanifest @@ -0,0 +1,19 @@ +{ + "name": "Canonical Ubuntu", + "short_name": "", + "icons": [ + { + "src": "https://assets.ubuntu.com/v1/9c69b268-COF%20android-chrome-192x192.png", + "sizes": "192x192", + "type": "image/png" + }, + { + "src": "https://assets.ubuntu.com/v1/c55060fd-COF%20android-chrome-512x512.png", + "sizes": "512x512", + "type": "image/png" + } + ], + "theme_color": "#ffffff", + "background_color": "#ffffff", + "display": "standalone" +} \ No newline at end of file diff --git a/templates/desktop/developers.html b/templates/desktop/developers.html index 6ba185976f8..80873c0c0bd 100755 --- a/templates/desktop/developers.html +++ b/templates/desktop/developers.html @@ -47,19 +47,6 @@

Why choose Ubuntu Desktop?The developers' choice

-
- {{ - image ( - url="https://assets.ubuntu.com/v1/7f76ac3a-hp-laptop-studio-jammy.png", - alt="", - width="1659", - height="1246", - hi_def=True, - loading="lazy" - ) | safe - }} -
-
diff --git a/templates/kubernetes/charmed-k8s.html b/templates/kubernetes/charmed-k8s.html index c91b3afa6b4..2c2c930e6f1 100644 --- a/templates/kubernetes/charmed-k8s.html +++ b/templates/kubernetes/charmed-k8s.html @@ -119,7 +119,7 @@

Streamlined cluster lifecycle management with Charmed O

-

Learn more about the Charmed Operator Framework ›

+

Learn more about Juju, an orchestration engine for software operators ›

Need help to tackle the K8s complexity? Let us manage Kubernetes for you ›

diff --git a/templates/legal/ubuntu-pro-service-terms/index.md b/templates/legal/ubuntu-pro-service-terms/index.md index cd543ac864f..7c7189afce3 100644 --- a/templates/legal/ubuntu-pro-service-terms/index.md +++ b/templates/legal/ubuntu-pro-service-terms/index.md @@ -34,7 +34,7 @@ When used in this Agreement, the following terms mean: **Licensed IP**: Canonical’s Intellectual Property Rights in the Software and Services. -**Order**: If Customer is buying Services directly from Canonical: Customer's order for Services which incorporates this Agreement and identifies Customer's name, contact information, Services, fees. An Order may be in the form of a statement of work. If Customer is buying Services through Canonical's reseller: Customer's agreement to purchase the Services and pay applicable fees. +**Order**: If Customer is buying Services directly from Canonical: Customer's order for Services which incorporates this Agreement and identifies Customer's name, contact information, Services, and fees. An Order may be in the form of a statement of work. If Customer is buying Services through Canonical's reseller: Customer's agreement to purchase the Services and pay applicable fees. **Registration Process**: The process under which a Customer registers with Canonical to receive Services purchased through Canonical's reseller. diff --git a/templates/templates/base.html b/templates/templates/base.html index a37e1d8cf59..45d6930eeff 100644 --- a/templates/templates/base.html +++ b/templates/templates/base.html @@ -22,8 +22,12 @@ - - + + + + + + {% block head_extra %}{% endblock %}