Merge branch 'sliding-nav' of github.com:canonical/ubuntu.com into sl…

…iding-nav
canonical · Jul 28, 2023 · 1db0161 · 1db0161
2 parents 436dc27 + 1381861
commit 1db0161
Show file tree

Hide file tree

Showing 2 changed files with 37 additions and 43 deletions.
diff --git a/meganav.yaml b/meganav.yaml
@@ -85,7 +85,7 @@ products:
               description: Ubuntu hardware you can trust
               url: /certified
       section_footer:
-        copy: Not sure where to start, need some guidance or just ready to learn more? We're here to help you.
+        copy: We're here to help with any questions and more information.
         cta_title: Contact us
         cta_url: /contact-us
 
@@ -121,11 +121,11 @@ products:
               url: /tutorials/upgrading-ubuntu-desktop
             - title: Ubuntu documentation
               url: https://help.ubuntu.com/
-            - title: Desktop Install
+            - title: Desktop install
               url: /tutorials/install-ubuntu-desktop
             - title: Server install
               url: /server/docs/installation
-            - title: Server Guide
+            - title: Server guide
               url: /server/docs
             - title: Ubuntu on public clouds
               url: /cloud/public-cloud
@@ -150,7 +150,7 @@ products:
               description: Open source storage
               url: /ceph
             - title: Anbox Cloud
-              description: Virtual Android on demand
+              description: Virtualised Android on demand
               url: https://anbox-cloud.io/
             - title: Open Source MANO
               description: Network Functions Virtualisation
@@ -254,7 +254,7 @@ products:
             - title: Ubuntu Pro for GCP
               description: Google Cloud support
               url: /gcp/pro
-            - title: Certifications & Hardening
+            - title: Certifications and hardening
               description: CIS, DISA-STIG, FIPS compliance
               url: /security/certifications
 
@@ -265,8 +265,6 @@ products:
               url: /pricing/pro
             - title: Open infrastructure consulting
               url: /pricing/consulting
-            - title: Private cloud pricing calculator
-              url: /openstack/pricing-calculator
             - title: Certified hardware
               url: /certified
             - title: CVE reports
@@ -327,7 +325,7 @@ products:
               url: https://juju.is/tutorials
             - title: Juju blog
               url: https://juju.is/blog
-            - title: Charmhub Discourse
+            - title: Charmhub forum
               url: https://discourse.charmhub.io/
             - title: About JAAS
               url: https://jaas.ai/jaas
@@ -428,7 +426,7 @@ products:
               url: /robotics/ros-esm
             - title: IoT Professional Services
               description: Bring IoT devices to market
-              url: /core/smartstart
+              url: /core/services
 
       secondary_links:
         - title: Links
@@ -445,7 +443,7 @@ products:
               url: /engage/embedded-linux-make-or-buy
             - title: Try Ubuntu Core on Raspberry Pi
               url: /download/raspberry-pi-core
-            - title: Industry 4.0
+            - title: Industry 4.0 webinar
               url: /engage/bridge-the-IT-OT-gap-Industry4
 
 use_case:
@@ -566,7 +564,7 @@ support:
             - title: Read the blogs
               description: Blogs from Canonical
               url: /blog
-            - title: Engage pages
+            - title: Case studies, whitepapers & webinars
               description: Resource hub
               url: /engage
             - title: Tutorials
@@ -593,7 +591,7 @@ support:
               url: /engage?resource=case+study
             - title: Whitepapers
               url: /engage?resource=whitepaper
-            - title: Become an Ubuntu certified engineer
+            - title: Become an Ubuntu-certified engineer
               url: /credentials
             - title: Videos
               url: https://www.youtube.com/c/UbuntuOS
@@ -629,7 +627,7 @@ community:
       secondary_links:
         - title: Links
           links:
-            - title: Update Ubuntu
+            - title: Upgrade Ubuntu
               url: /tutorials/upgrading-ubuntu-desktop
             - title: Official Ubuntu documentation
               url: https://help.ubuntu.com/
@@ -664,7 +662,7 @@ community:
               url: https://ubuntuforums.org/forumdisplay.php?f=327
             - title: "Forum: Ubuntu, Linux and OS Chat"
               url: https://ubuntuforums.org/forumdisplay.php?f=434
-            - title: Discourse Community category
+            - title: Ubuntu Community on Discourse
               url: https://discourse.ubuntu.com/c/community/78
 
     - title: Contribute to Ubuntu
@@ -689,36 +687,32 @@ community:
             - title: Art and design
               description: Contribute your artwork
               url: https://ubuntu.com/community/contribute/art-design
-            - title: Local community teams
-              description: Join a community team
-              url: http://loco.ubuntu.com/teams/
             - title: Donate
               description: Donate to the Ubuntu project
               url: /download/desktop/thank-you
             - title: Local community teams
               description: Join a community team
               url: http://loco.ubuntu.com/teams/
 
-
     - title: Mission and governance
       primary_links:
         - title: Mission and governance
           links:
             - title: Our mission
               description: What we stand for
               url: /community/mission
-            - title: Community council
-              description: Governing body for the project
-              url: https://discourse.ubuntu.com/t/what-is-the-ubuntu-community-council/706
             - title: Ubuntu code of conduct
               description: Expectations of participants
               url: /community/code-of-conduct
             - title: Diversity policy
-              description: Our stance on Diversity
+              description: Our stance on diversity
               url: /community/diversity
-            - title: Project governace
+            - title: Project governance
               description: How the project is governed
               url: /community/governance
+            - title: Community Council
+              description: Governing body for the project
+              url: https://discourse.ubuntu.com/t/what-is-the-ubuntu-community-council/706
             - title: Teams
               description: The teams in the project
               url: /community/governance/teams
@@ -729,28 +723,28 @@ community:
       secondary_links:
         - title: Links
           links:
-            - title: Community Council Agenda
+            - title: Community Council agenda
               url: https://discourse.ubuntu.com/t/community-council-meeting-agendas-schedule/708
             - title: Ubuntu Technical Board
               url: https://wiki.ubuntu.com/TechnicalBoard
-            - title: Technical Board Agenda
+            - title: Technical Board agenda
               url: https://wiki.ubuntu.com/TechnicalBoardAgenda
 
     - title: Keep up to date
       primary_links:
         - title: Keep up to date
           links:
             - title: Read the blogs
-              description: Canonical's blogs
+              description: Ubuntu blogs
               url: /blog
             - title: Weekly Newsletter
-              description: Sign up to our newsletter
+              description: Sign up for our newsletter
               url: https://wiki.ubuntu.com/UbuntuWeeklyNewsletter
             - title: Mailing lists
               description: All the public mailing lists
               url: https://lists.ubuntu.com/
             - title: Ubuntu Planet
-              description: Aggregated member blogs
+              description: Blogs by Ubuntu members
               url: http://planet.ubuntu.com/
             - title: Teams
               description: The teams in the project
@@ -777,7 +771,7 @@ get_ubuntu:
         - title: Products
           links:
             - title: Ubuntu Desktop
-              description: Free, reliable simple desktop OS
+              description: Free and reliable desktop OS
               url: /download/desktop
               secondary_cta_title: Download 22.04 LTS
               secondary_cta_url: /download/desktop/thank-you?version=22.04.1&architecture=amd64
@@ -792,17 +786,17 @@ get_ubuntu:
           links:
             - title: Upgrade Ubuntu Desktop
               url: /tutorials/upgrading-ubuntu-desktop
-            - title: Desktop guide 22.04
+            - title: 22.04 desktop guide
               url: https://help.ubuntu.com/lts/ubuntu-help/index.html
-            - title: Desktop guide 20.04
+            - title: 20.04 desktop guide
               url: https://help.ubuntu.com/20.04/ubuntu-help/index.html
-            - title: Install tutorial
+            - title: Installation tutorial
               url: /tutorials/install-ubuntu-desktop
-            - title: Try before installation
+            - title: Try before installing
               url: /tutorials/try-ubuntu-before-you-install
             - title: Case studies, whitepapers & webinars
               url: /engage
-            - title: All tutorials
+            - title: All Ubuntu tutorials
               url: /tutorials
     - title: Server
       primary_links:
@@ -866,7 +860,7 @@ get_ubuntu:
               url: /tutorials/install-ubuntu-desktop
             - title: Server installation tutorial
               url: /tutorials/how-to-install-ubuntu-on-your-raspberry-pi
-            - title: Core install instructions
+            - title: Core installation tutorial
               url: /download/raspberry-pi-core
             - title: Introduction video
               url: /engage/raspberry-pi-livestream
@@ -929,12 +923,12 @@ get_ubuntu:
             - title: Cloud packages
               description: Deploy and operate cloud software
               url: https://charmhub.io/
-            - title: AI and Machine Learning
+            - title: AI and machine learning
               description: Develop AI models
               url: /ai
-            - title: Certified Ubuntu Engineer
+            - title: Ubuntu certification for engineers
               description: Professional endorsement
-              url: /cube
+              url: /credentials
       secondary_links:
         - title: Tutorials and docs
           links:
@@ -955,7 +949,7 @@ get_ubuntu:
             - title: MAAS - fast server provisioning
               url: https://maas.io/
       section_footer:
-        cta_title: Develop Ubuntu
+        cta_title: Develop on Ubuntu
         cta_url: /desktop/developers
     - title: Windows & macOS
       primary_links:
@@ -970,7 +964,7 @@ get_ubuntu:
       secondary_links:
         - title: Tutorials and docs
           links:
-            - title: Install tutorial for Windows 11
+            - title: Install Ubuntu on WSL for Windows 11
               url: /tutorials/install-ubuntu-on-wsl2-on-windows-11-with-gui-support
-            - title: Install tutorial for Windows 10
+            - title: Install Ubuntu on WSL for Windows 10
               url: /tutorials/install-ubuntu-on-wsl2-on-windows-10
diff --git a/templates/templates/_navigation.html b/templates/templates/_navigation.html
@@ -34,7 +34,7 @@
           <button class="p-navigation__link" href="#products-content" aria-controls="#products-content" tabindex="0" onfocus="fetchDropdown('/templates/meganav/products', 'products');">Products</button>
         </li>
         <li class="p-navigation__item--dropdown-toggle" role="menuitem" id="use-case" data-id="use-case" onmouseover="fetchDropdown('/templates/meganav/use-case', 'use-case'); this.onmouseover = null;">
-          <button class="p-navigation__link" href="#use-case-content" aria-controls="#use-case-content" tabindex="0" onfocus="fetchDropdown('/templates/meganav/use-case', 'use-case');">Use case</button>
+          <button class="p-navigation__link" href="#use-case-content" aria-controls="#use-case-content" tabindex="0" onfocus="fetchDropdown('/templates/meganav/use-case', 'use-case');">Use cases</button>
         </li>
         <li class="p-navigation__item--dropdown-toggle" role="menuitem" id="support" data-id="support" onmouseover="fetchDropdown('/templates/meganav/support', 'support'); this.onmouseover = null;">
           <button class="p-navigation__link" href="#support-content" aria-controls="#support-content" tabindex="0" onfocus="fetchDropdown('/templates/meganav/support', 'support');">Support</button>
@@ -131,4 +131,4 @@
   </div>
 </div>
 {% endif %}
-{% endif %}
+{% endif %}