Rename download-content to get-ubuntu-content

canonical · Jun 7, 2023 · 9334bab · 9334bab
1 parent a5e6bee
commit 9334bab
Show file tree

Hide file tree

Showing 5 changed files with 2 additions and 24 deletions.
diff --git a/static/js/src/navigation.js b/static/js/src/navigation.js
@@ -203,7 +203,7 @@ addGANavEvents("#canonical-login", "www.ubuntu.com-nav-0-login");
 addGANavEvents("#enterprise-content", "www.ubuntu.com-nav-1-enterprise");
 addGANavEvents("#developer-content", "www.ubuntu.com-nav-1-developer");
 addGANavEvents("#community-content", "www.ubuntu.com-nav-1-community");
-addGANavEvents("#download-content", "www.ubuntu.com-nav-1-download");
+addGANavEvents("#get-ubuntun-content", "www.ubuntu.com-nav-1-get-ubuntu");
 addGANavEvents(".p-navigation--secondary", "www.ubuntu.com-nav-2");
 addGANavEvents(".p-contextual-footer", "www.ubuntu.com-footer-contextual");
 addGANavEvents(".p-footer__nav", "www.ubuntu.com-nav-footer-0");
@@ -420,21 +420,3 @@ if (accountContainer) {
       );
     });
 }
-
-// TEMP FIX - PETE F 15.05.23
-// UPDATES 'UBUNTU ADVANTAGE' TO 'UBUNTU PRO' IN THE MEGANAV UNTIL
-// WE MERGE THE NEW MEGANAV
-function replaceUbuntuAdvantage() {
-  const globalNav = document.querySelector("#canonical-global-nav");
-  const targetElementsArray = globalNav.querySelectorAll(
-    "[href='https://ubuntu.com/support']"
-  );
-  targetElementsArray.forEach(function (element) {
-    if (element.children.length) {
-      element.querySelector("h4").innerText = "Ubuntu Pro ›";
-    } else {
-      element.innerText = "Ubuntu Pro";
-    }
-  });
-}
-replaceUbuntuAdvantage();
diff --git a/static/js/src/tabbed-content.js b/static/js/src/tabbed-content.js
@@ -105,7 +105,6 @@
       @param {Array} tabs an array of tabs within a container
     */
   const setActiveTab = (tab, tabs) => {
-    console.log('tab', tab);
     tabs.forEach((tabElement) => {
       var tabContent = document.querySelectorAll(
         "#" + tabElement.getAttribute("aria-controls")

diff --git a/templates/download/amd-xilinx/index.html b/templates/download/amd-xilinx/index.html
@@ -58,5 +58,4 @@ <h1>Install Ubuntu on <br class="u-hide--small"> AMD-Xilinx</h1>
 <!-- Set default Marketo information for contact form below-->
 <div class="u-hide" id="contact-form-container" data-form-location="/shared/forms/interactive/internet-of-things" data-form-id="4126" data-lp-id="" data-return-url="https://ubuntu.com/pricing/thank-you" data-lp-url="https://pages.ubuntu.com/things-contact-us.html"></div>
 
-
 {% endblock content %}
diff --git a/templates/templates/_navigation.html b/templates/templates/_navigation.html
@@ -76,7 +76,7 @@
   <div class="u-hide dropdown-content-desktop" id="use-case-content"></div>
   <div class="u-hide dropdown-content-desktop" id="support-content"></div>
   <div class="u-hide dropdown-content-desktop" id="community-content"></div>
-  <div class="u-hide dropdown-content-desktop" id="download-content"></div>
+  <div class="u-hide dropdown-content-desktop" id="get-ubuntu-content"></div>
 </div>
 {% if not(hide_subnav == True) %}
 {% if breadcrumbs and breadcrumbs.children or breadcrumbs.grandchildren %}
@@ -196,7 +196,6 @@
     const triggerEl = event.target;
     const container = document.getElementById(id);
     const mobileContainer = document.getElementById(id+"-mobile");
-
     if (container.innerHTML === "") {
       const req = new XMLHttpRequest();
       req.open('GET', url);

diff --git a/webapp/context.py b/webapp/context.py
@@ -47,7 +47,6 @@ def get_meganav(section):
     """
     Set "meganav_section" as global template variable
     """
-
     sections = {}
     meganav_sections = copy.deepcopy(meganav)
Original file line number	Diff line number	Diff line change
Expand Up		@@ -58,5 +58,4 @@ <h1>Install Ubuntu on <br class="u-hide--small"> AMD-Xilinx</h1>
		<!-- Set default Marketo information for contact form below-->
		<div class="u-hide" id="contact-form-container" data-form-location="/shared/forms/interactive/internet-of-things" data-form-id="4126" data-lp-id="" data-return-url="https://ubuntu.com/pricing/thank-you" data-lp-url="https://pages.ubuntu.com/things-contact-us.html"></div>


		{% endblock content %}
-Original file line number
+Diff line change
@@ Expand Up / @@ -47,7 +47,6 @@ def get_meganav(section): @@
         """
         Set "meganav_section" as global template variable
         """
         sections = {}
         meganav_sections = copy.deepcopy(meganav)
@@ Expand Down @@