Merge pull request 'development to master' (#13) from development into master

Reviewed-on: ourworld_web/www_mycelium#13

config.toml

@@ -1,5 +1,5 @@
 # The URL the site will be built for
-base_url = "https://www2.mycelium.threefold.io/"
+base_url = "https://www.mycelium.threefold.io/"
 # Change this to your own URL! Please note this variable **must** be uncommented .
 
 title = "Mycelium"

content/_index.md

@@ -111,7 +111,7 @@ True digital sovereignty for open-source builders. The ThreeFold Grid provides l
 
 |||
 
-<button>[The Manual](https://threefold.info/mycelium/docs/)</button>
+<button>[The Manual](https://manual.grid.tf/)</button>
 
 |||
 

content/footer/_index.md

@@ -14,7 +14,7 @@ extra:
 
 <br>
 
-###### [Manual](https://threefold.info/mycelium/docs/)
+###### [Manual](https://manual.grid.tf/)
 
 ###### [Dashboard](https://dashboard.grid.tf/)
 

content/header/index.md

@@ -8,6 +8,6 @@ extra:
 ---
 
 - [About]("/about")
-- [Docs]("https://threefold.info/mycelium/docs/")
+- [Docs]("https://manual.threefold.io/documentation/system_administrators/mycelium/mycelium_app.html")
 
 

templates/partials/download/download1.html

@@ -7,7 +7,7 @@
           Get Mycelium for Android, Windows, macOS, and iOS to securely connect, store, and interact with the decentralized network—seamlessly and efficiently.
         </p>
         <p class="text-left mt-4 max-w-3xl text-pretty lg:text-lg text-md font-light text-black fade-in">
-          Not sure how it works? <a href="https://threefold.info/mycelium/docs/" class="font-semibold" target="_blanks"><u>Read the manual.</u></a>
+          Not sure how it works? <a href="https://manual.threefold.io/documentation/system_administrators/mycelium/mycelium_app.html" class="font-semibold" target="_blanks"><u>Read the manual.</u></a>
         </p>
       </div>
     </div>

templates/partials/footer.html

@@ -9,7 +9,7 @@
             <div class="max-w-7xl mx-auto py-12 px-4 sm:px-6">
                 <div class="grid max-w-xl grid-cols-1 gap-x-8 gap-y-16 lg:max-w-none lg:grid-cols-2">
                     <div class="grid-cols-4 space-y-8 lg:max-w-sm xl:max-w-sm lg:mr-8 lg:mb-8 xl:col-span-1">
-                        <img class="w-36 h-auto" src="{{ get_url(path=logoPath)}}" alt="MYCELIUM Logo" />
+                        <img class="w-36 h-auto" src="{{ get_url(path=logoPath)}}" alt="ThreeFold Logo" />
                         <p class="text-gray-200 text-base font-light leading-6">
                             {{section.description}}
                         </p>

templates/partials/head.html

@@ -47,34 +47,34 @@
       cookieconsent.run({ "notice_banner_type": "headline", "consent_type": "express", "palette": "light", "language": "en", "page_load_consent_levels": ["strictly-necessary"], "notice_banner_reject_button_hide": false, "preferences_center_close_button_hide": false, "website_name": "https://www.mycelium.threefold.io/", "website_privacy_policy_url": "https://library.threefold.me/info/legal/#/legal__privacypolicy" });
     });
     </script>
+    <!-- Google Tag Manager -->
+    <script>(function (w, d, s, l, i) {
+      w[l] = w[l] || []; w[l].push({
+        'gtm.start':
+          new Date().getTime(), event: 'gtm.js'
+      }); var f = d.getElementsByTagName(s)[0],
+        j = d.createElement(s), dl = l != 'dataLayer' ? '&l=' + l : ''; j.async = true; j.src =
+          'https://www.googletagmanager.com/gtm.js?id=' + i + dl; f.parentNode.insertBefore(j, f);
+    })(window, document, 'script', 'dataLayer', 'GTM-N7PNMFH');
+    </script>
+    <!-- End Google Tag Manager -->
+    <!-- Global site tag (gtag.js) - Google Analytics -->
+    <script async src="https://www.googletagmanager.com/gtag/js?id=UA-100065546-1"></script>
+    <script>
+    window.dataLayer = window.dataLayer || [];
+    function gtag() { dataLayer.push(arguments); }
+    gtag('js', new Date());
 
+    gtag('config', 'UA-100065546-1');
+    </script>
     <!-- Matomo Tag Manager -->
     <script>
     var _mtm = window._mtm = window._mtm || [];
-      _mtm.push({'mtm.startTime': (new Date().getTime()), 'event': 'mtm.Start'});
+    _mtm.push({ 'mtm.startTime': (new Date().getTime()), 'event': 'mtm.Start' });
-      (function() {
+    var d = document, g = d.createElement('script'), s = d.getElementsByTagName('script')[0];
-        var d=document, g=d.createElement('script'), s=d.getElementsByTagName('script')[0];
+    g.async = true; g.src = 'https://analytics.threefold.io/js/container_KIcuIdn4.js'; s.parentNode.insertBefore(g, s);
-        g.async=true; g.src='https://analytics.threefold.io/js/container_ZoAh0rSv.js'; s.parentNode.insertBefore(g,s);
-      })();
     </script>
-<!-- End Matomo Tag Manager -->
+    <!-- End Matomo Tag Manager -->
-
-
-   <!-- Matomo -->
-    <script>
-      var _paq = window._paq = window._paq || [];
-      /* tracker methods like "setCustomDimension" should be called before "trackPageView" */
-      _paq.push(['trackPageView']);
-      _paq.push(['enableLinkTracking']);
-      (function() {
-        var u="//analytics.threefold.io/";
-        _paq.push(['setTrackerUrl', u+'matomo.php']);
-        _paq.push(['setSiteId', '22']);
-        var d=document, g=d.createElement('script'), s=d.getElementsByTagName('script')[0];
-        g.async=true; g.src=u+'matomo.js'; s.parentNode.insertBefore(g,s);
-      })();
-    </script>
-<!-- End Matomo Code -->
     <!-- Crisp -->
     <script type="text/plain" cookie-consent="tracking">
     window.$crisp = [];
@@ -87,6 +87,18 @@
         d.getElementsByTagName("head")[0].appendChild(s);
     })();
     </script>
+    <!-- Crisp without cookies -->
+    <!-- <script type="text/javascript" cookie-consent="tracking">
+    window.$crisp = [];
+    window.CRISP_WEBSITE_ID = "1a5a5241-91cb-4a41-8323-5ba5ec574da0";
+    (function () {
+      d = document;
+      s = d.createElement("script");
+      s.src = "https://client.crisp.chat/l.js";
+      s.async = 1;
+      d.getElementsByTagName("head")[0].appendChild(s);
+    })();
+  </script> -->
     <!-- end of Crisp-->
     <!-- Required meta tags -->
     <meta charset="utf-8">

templates/partials/header.html

@@ -61,7 +61,7 @@
                 {% endif %}  
             {% endif %}
             {% endfor %}
-                <a href="https://threefold.info/mycelium/docs/" 
+                <a href="https://manual.threefold.io/documentation/system_administrators/mycelium/overview.html" 
                 class="text-lg py-3 leading-6 font-light text-pretty tracking-wide text-black focus:outline-none focus:text-gray-200 transition ease-in-out duration-150" target="_blank">
                 Docs
                 </a>
@@ -199,7 +199,7 @@
                           </p>
                           {% include "partials/socialLinks.html" %}
                       </div> #}
-                      <a href="https://threefold.info/mycelium/docs/" 
+                      <a href="https://manual.threefold.io/documentation/system_administrators/mycelium/overview.html" 
                       class="text-lg px-8 py-3 leading-6 font-normal text-black hover:text-gray-600 focus:outline-none focus:text-gray-50 transition ease-in-out duration-150" target="_blank">
                       Docs
                       </a>

templates/partials/hero/myhero7.html

@@ -6,7 +6,7 @@
         <p class="mt-6 text-lg lg:text-xl text-pretty font-light text-gray-300">Join the Mycelium network and be a part of the decentralized movement.</p>
         <div class="mt-10 flex items-center justify-center gap-x-6 lg:justify-start">
           <a href="/download" class="rounded-2xl bg-white px-3.5 py-2.5 text-sm font-semibold text-gray-900 shadow-xs hover:bg-gray-100 focus-visible:outline-2 focus-visible:outline-offset-2 focus-visible:outline-white">Download Now</a>
-          <a href="https://threefold.info/mycelium/docs/" class="text-sm/6 font-semibold text-white hover:text-gray-100">Read Manual <span aria-hidden="true">→</span></a>
+          <a href="https://manual.threefold.io/documentation/system_administrators/mycelium/overview.html" target="_blank" class="text-sm/6 font-semibold text-white hover:text-gray-100">Read Manual <span aria-hidden="true">→</span></a>
         </div>
       </div>
       <div class="relative mt-16 h-80 lg:mt-8">