Merge branch '3.10.0' of github.com:threefoldfoundation/www_threefold_io into 3.10.0

.github/workflows/action.yml

@@ -1,17 +0,0 @@
-# On every push this script is executed
-on: push
-name: Build and deploy GH Pages
-jobs:
-  build:
-    runs-on: ubuntu-latest
-    if: github.ref == 'refs/heads/development'
-    steps:
-      - name: checkout
-        uses: actions/checkout@v2
-      - name: build_and_deploy
-        uses: shalzz/zola-deploy-action@v0.14.1
-        env:
-          # Target branch
-          PAGES_BRANCH: gh-pages
-          # Provide personal access token
-          TOKEN: ${{ secrets.TOKEN }}

.github/workflows/tf_update.yml

@@ -1,26 +0,0 @@
-name: Threefold_io
-on: 
-  push:
-    branch: [ development ]
-
-jobs:
-  job_one:
-    name: Deploy
-    runs-on: ubuntu-latest
-    steps:
-    - name: pushing latest change on www2.threefold.io
-      uses: appleboy/ssh-action@master
-      with:
-        host: www2.threefold.io
-        username: root
-        key: ${{ secrets.TF_SECRET }}
-        port: 22
-        script: |
-          cd /opt/www_threefold_io/
-          git log -1
-          git restore config.toml
-          git restore static/css/index.css
-          git pull
-          sed -i "s/https:\/\/threefoldfoundation.github.io\/www_threefold_io/https:\/\/www2.threefold.io/g" config.toml
-          ./build.sh
-          

.github/workflows/update_www3.yml

@@ -12,13 +12,13 @@ jobs:
       uses: appleboy/ssh-action@master
       with:
         host: www3.threefold.io
-        username: root
+        username: webuser
         key: ${{ secrets.TF_SECRET }}
-        port: 22
+        port: 34022
         script: |
-          cd /opt/www3/www_threefold_io/
+          cd websites/www3/www_threefold_io/
           git log -1
           git restore .
           git pull
           sed -i "s/https:\/\/www.threefold.io/https:\/\/www3.threefold.io/g" config.toml
-          ./build.sh
+          bash build.sh

config.toml

@@ -1,6 +1,6 @@
 # The URL the site will be built for
 base_url = "https://www3.threefold.io"
-# Change this to your own URL! Please note this variable **must** be uncommented.
+# Change this to your own URL! Please note this variable **must** be uncommented .
 
 title = "ThreeFold"
 description="Our global digital backbone"

content/build/index.md

@@ -1,5 +1,5 @@
 ---
-title: "Buildnew"
+title: "Build"
 template: "page.html"
 insert_anchor_links: "left"
 ---

content/expand/index.md

@@ -1,5 +1,5 @@
 ---
-title: "Farmnew"
+title: "Expand"
 template: "page.html"
 insert_anchor_links: "left"
 ---

templates/partials/header.html

@@ -33,8 +33,8 @@
                 {% set header_label = header_arr[0] %}
                 {% if '<a' in header_label %}
                     {% set link_label = header_label | striptags %}
-                    {% set link_path = header_label | split(pat="%22") | safe%}
+                    {% set link_path = header_label | split(pat="%22")
-                    {% set current = get_url(path=link_path[1]) ~ "/" %}
+                    {% set current = get_url(path=link_path[1]) ~ "/" %} | safe%}
                     {% if header_label is containing("http") %}
                         {% if header_label is not containing("threefold") %}
                         <a href="{{link_path[1]}}" target="_blank" class="text-lg leading-6 font-medium text-gray-900 hover:text-gray-500 focus:outline-none focus:text-gray-900 transition ease-in-out duration-150 mt-0">
@@ -42,16 +42,15 @@
                         </a>
                         {% endif %}
 
-                    {% elif current == current_url %}
+                        {% elif current == current_url %}
                     <a href="{{ get_url(path=link_path[1])}}" class="text-lg leading-6 font-medium active hover:text-gray-500 focus:outline-none focus:text-gray-900 transition ease-in-out duration-150 mt-0">
                       {{ link_label }}
                     </a>
 
                     {% else %}
                     <a href="{{ get_url(path=link_path[1])}}" class="text-lg leading-6 font-medium text-gray-900 hover:text-gray-500 focus:outline-none focus:text-gray-900 transition ease-in-out duration-150 mt-0">
-                      {{ link_label }}
+                      {{link_label}}
                     </a>
-   
                     {% endif %}
                 {% else %}
                     <div class="relative">