Merge branch 'development' into development_sam

.github/workflows/tf_update.yml

@@ -18,6 +18,9 @@ jobs:
         script: |
           cd /opt/www_threefold_io/
           git log -1
+          git restore config.toml
           git restore static/css/index.css
           git pull
-          npm run build
+          sed -i "s/https:\/\/threefoldfoundation.github.io\/www_threefold_io/https:\/\/www2.threefold.io/g" config.toml
+          ./build.sh
+          

config.toml

@@ -39,7 +39,7 @@ render_emoji = false
 
 # Whether external links are to be opened in a new tab
 # If this is true, a `rel="noopener"` will always automatically be added for security reasons
-external_links_target_blank = true
+# external_links_target_blank = false
 
 # Whether to set rel="nofollow" for all external links
 external_links_no_follow = true

content/_index.md

@@ -114,7 +114,7 @@ We are truly proud to be trusted by some of the biggest names in the industry.
 
 ![Image](images/ourpartners.png#mx-auto)
 
-<button>[Check All Partners](/partners)</button>
+<button>[Check All Partners](partners)</button>
 
 {% end %}
 

content/careers/grid-development-manager/index.md

@@ -1,5 +1,6 @@
 ---
 title: "ThreeFold Grid Developer Lead"
+template: "jobPage.html"
 
 extra:
   button : Explore Other Developer Components

content/careers/grid-operations-manager/index.md

@@ -1,5 +1,6 @@
 ---
 title: ThreeFold Grid Operations Lead
+template: "jobPage.html"
 
 extra:
   button: "Apply"

content/careers/index.md

@@ -1,6 +1,5 @@
 ---
 title: "careers"
-page_template: "jobPage.html"
 ---
 
 
@@ -21,7 +20,7 @@ page_template: "jobPage.html"
      </div> -->
 
 
-{% row(bgPath="careers/team_joinus.jpg" style="center margin") %}
+{% row(bgPath="team_joinus.jpg" style="center margin") %}
 
 # **Join Our Team**
 
@@ -77,7 +76,7 @@ Check out our available positions below. Can't find your perfect fit and don't w
           <strong>Join Our Community</strong>
         </h2>
       </div>
-      <div class="back" style="background-image: url('careers/tf_people.jpg')"
+      <div class="back" style="background-image: url('tf_people.jpg')"
       ></div>
     </a>
 </div>

content/careers/master-architect-dt/index.md

@@ -1,5 +1,6 @@
 ---
 title: Master Technical Architect
+template: "jobPage.html"
 
 extra:
   button: "Apply"

content/careers/qa-engineer/index.md

@@ -1,5 +1,6 @@
 ---
 title: Quality Assurance Engineer
+template: "jobPage.html"
 
 extra:
   button: Apply

content/careers/senior-developer/index.md

@@ -1,5 +1,6 @@
 ---
 title: Senior Developer
+template: "jobPage.html"
 
 extra:
   button: "Apply"

content/developer/automation/index.md

@@ -1,5 +1,6 @@
 ---
 title: automation
+template: "resourcesPage.html"
 
 extra:
   imgPath: automation.png

content/developer/blockchain/index.md

@@ -1,5 +1,7 @@
 ---
 title: Blockchain
+template: "resourcesPage.html"
+
 extra:
   imgPath: blockchain.png
   button : Explore Other Developer Components

content/developer/index.md

@@ -1,7 +1,6 @@
 ---
 title: "Developer"
 template: "page.html"
-page_template: "resourcesPage.html"
 ---
 
 

content/developer/os/index.md

@@ -1,5 +1,6 @@
 ---
 title: operating system
+template: "resourcesPage.html"
 
 extra:
   imgPath: operating_system.png

content/developer/planetarynw/index.md

@@ -1,5 +1,6 @@
 ---
 title: planetary network
+template: "resourcesPage.html"
 
 extra:
   imgPath: planetary_network.jpg

content/developer/qsfs/index.md

@@ -1,5 +1,6 @@
 ---
 title: qsfs
+template: "resourcesPage.html"
 
 extra:
   imgPath: qsfs.png

content/developer/tooling/index.md

@@ -1,5 +1,6 @@
 ---
 title: tooling
+template: "resourcesPage.html"
 
 extra:
   imgPath: tooling.png

templates/_default/base.html

@@ -22,6 +22,19 @@
     // Insert Twitter Pixel ID and Standard Event data below
     twq('init', 'o745b');
     twq('track', 'PageView');
+
+
+    // makes all links outside of hostname open in new tab
+    // from: https://stackoverflow.com/a/4425214
+    var links = document.links;
+    console.log(links)
+    for (var i = 0, linksLength = links.length; i < linksLength; i++) {
+
+        if (links[i].hostname != window.location.hostname) {
+            links[i].target = '_blank';
+        }
+
+    }
   </script>
   <!-- End Twitter universal website tag code -->
 

templates/partials/header.html

@@ -35,9 +35,11 @@
                     {% set link_label = header_label | striptags %}
                     {% set link_path = header_label | split(pat="%22") | safe%}
                     {% if header_label is containing("http") %}
-                    <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">
+                        {% if header_label is not containing("threefold") %}
-                        {{link_label}}
+                        <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">
-                    </a>
+                            {{link_label}}
+                        </a>
+                        {% endif %}
                     {% 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}}
@@ -163,9 +165,11 @@
                                 {% set link_label = header_label | striptags %}
                                 {% set link_path = header_label | split(pat="%22") | safe%}
                                 {% if header_label is containing("http") %}
-                                <a href="{{link_path[1]}}" target="_blank" class="text-lg px-8 py-3 leading-6 font-normal text-gray-900 hover:text-gray-900 focus:outline-none focus:text-gray-900 transition ease-in-out duration-150">
+                                    {% if header_label is not containing("threefold") %}
-                                    {{link_label}}
+                                    <a href="{{link_path[1]}}" target="_blank" class="text-lg px-8 py-3 leading-6 font-normal text-gray-900 hover:text-gray-900 focus:outline-none focus:text-gray-900 transition ease-in-out duration-150">
-                                </a>
+                                        {{link_label}}
+                                    </a>
+                                    {% endif %}
                                 {% else %}
                                 <a href="{{ get_url(path=link_path[1])}}" class="text-lg px-8 py-3 leading-6 font-normal text-gray-900 hover:text-gray-900 focus:outline-none focus:text-gray-900 transition ease-in-out duration-150">
                                     {{link_label}}

templates/resourcesPage.html

@@ -12,8 +12,7 @@
       font-serif
       text-gray-900 text-center
     ">
-      <img class="mx-auto w-3/4" src={{"/" ~ page.extra.imgPath}} />
+      <img class="mx-auto w-3/4" src={{page.extra.imgPath}} />
-
       <div class="post-content-text text-xl text-center mx-auto my-5">{{ page.content | safe }}</div>
     </section>
 

templates/shortcodes/button.html

@@ -2,10 +2,14 @@
 | trim_end_matches(pat='"') %}
 
 {% if 'https' in url %}
-<button onclick="window.open('{{url}}', '_blank');"
+    {% if url is not containing("threefold") %}
-    class="leading-6 border-transparent flex flex-col border-2 w-full items-start rounded transition hover:first:text-gray-500 hover:border-stone-200 hover:bg-stone-100 p-2 text-left">
+        {% if url is not containing("localhost") %}
-    {{ body | trim_start_matches(pat="<p>") | safe}}
+        <button onclick="window.open('{{url}}', '_blank');"
-</button>
+            class="leading-6 border-transparent flex flex-col border-2 w-full items-start rounded transition hover:first:text-gray-500 hover:border-stone-200 hover:bg-stone-100 p-2 text-left">
+            {{ body | trim_start_matches(pat="<p>") | safe}}
+        </button>
+        {% endif %}
+    {% endif %}
 
 {% else %}
 <button onclick="window.location='{{get_url(path=url)}}'"

templates/shortcodes/cloud_header.html

@@ -8,12 +8,12 @@
                 class="text-5xl font-extrabold uppercase">Store</a>
         </div>
         <div class="mb-4">
-            {% if base is containing("www_threefold_io") %}
+            {% if 'www_threefold_io' in base  %}
             {% set path = base ~ '/' ~ 'images/cloud_header_seprated.png' %}
 
             <img class="mx-auto sm:w-1/2 lg:w-full" src="{{path}}" alt="TF Cloud" />
             {% else %}
-            <img class="mx-auto sm:w-1/2 lg:w-full" src="images/cloud_header_seprated.png" alt="TF Cloud" />
+            <img class="mx-auto sm:w-1/2 lg:w-full" src="/images/cloud_header_seprated.png" alt="TF Cloud" />
             {% endif %}
         </div>
         <div class="w-full mb-4 border-b border-gray-600">

templates/shortcodes/dev_resourses.html

@@ -1,3 +1,15 @@
+{% if '127.0.0.1:1111' in config.base_url %}
+{% set img_url = 'developer/' %}
+{% else %}
+{% set img_url = '' %}
+{% endif %}
+
+{% if 'www_threefold_io' in config.base_url %}
+{% set url = '/www_threefold_io' %}
+{% else %}
+{% set url = '' %}
+{% endif %}
+
 <div class="my-5 lg:my-40 lg:mx-40 mx-4">
     <div class="w-full text-center">
         <h2 class="lg:text-6xl uppercase font-normal leading-tight">
@@ -19,8 +31,8 @@
         duration-500
         bg-gray-100
       ">
-            <a href="/developer/os">
+            <a href={{ url ~ "/developer/os" }}>
-                <img src="developer/operating_system.png" />
+                <img src={{ img_url ~ 'operating_system.png' }} />
                 <div class="font-bold text-xl py-5 mx-4 text-black">
                     Operating System
                 </div>
@@ -36,8 +48,8 @@
         duration-500
         bg-gray-100
       ">
-            <a href="/developer/automation">
+            <a href={{ url ~ "/developer/automation" }}>
-                <img src="developer/automation.png" />
+                <img src={{ img_url ~ 'automation.png' }} />
                 <div class="font-bold text-xl py-5 mx-4 text-black">
                     Autonomous Components
                 </div>
@@ -53,8 +65,8 @@
         duration-500
         bg-gray-100
       ">
-            <a href="/developer/tooling">
+            <a href={{ url ~ "/developer/tooling" }}>
-                <img src="developer/tooling.png" />
+                <img src={{ img_url ~ 'tooling.png' }} />
                 <div class="font-bold text-xl py-5 mx-4 text-black">
                     Developer tooling
                 </div>
@@ -70,8 +82,8 @@
         duration-500
         bg-gray-100
       ">
-            <a href="/developer/qsfs">
+            <a href={{ url ~ "/developer/qsfs" }}>
-                <img src="developer/qsfs.png" />
+                <img src={{ img_url ~ 'qsfs.png' }} />
                 <div class="font-bold text-xl py-5 mx-4 text-black">
                     Quantum-Safe Storage
                 </div>
@@ -87,8 +99,8 @@
         duration-500
         bg-gray-100
       ">
-            <a href="/developer/blockchain">
+            <a href={{ url ~ "/developer/blockchain" }}>
-                <img src="developer/blockchain.png" />
+                <img src={{ img_url ~ 'blockchain.png' }} />
                 <div class="font-bold text-xl py-5 mx-4 text-black">
                     ThreeFold Blockchain
                 </div>
@@ -104,8 +116,8 @@
         duration-500
         bg-gray-100
       ">
-            <a href="/developer/planetarynw">
+            <a href={{ url ~ "/developer/planetarynw" }}>
-                <img src="developer/planetary_network.jpg" />
+                <img src={{ img_url ~ 'planetary_network.jpg' }} />
                 <div class="font-bold text-xl py-5 mx-4 text-black">
                     Planetary Network
                 </div>

templates/shortcodes/row.html

@@ -10,8 +10,10 @@ Parameters:
 -->
 
 <!-- This fixes link paths in prod -->
+
 {% if page %}
     {% if "](" in body %}
+
     {% set body_arr = body | split(pat="](") %}
     {% set body = body_arr[0] %}
         {% for i in body_arr %}
@@ -33,10 +35,12 @@ Parameters:
     
 {% endif %}
 
-<!-- This fixes image paths in local -->
+<!-- makes external links in row open in new tabs-->
-
+{% set body = body | markdown | replace(from='href="', to='target="_blank" href="') | safe %}
-
+{% set base_url = get_url(path="")%}
+{% set body = body | markdown | replace(from='target="_blank" href="' ~ base_url , to='href="' ~ base_url) | safe %}
 
+<!-- Splits body to columns -->
 {% set columns = body | safe | markdown | split(pat="|||") %}
 {% set row_class =  "relative pt-6 p-4 flex flex-col sm:grid sm:grid-cols-2 sm:gap-10 xl:flex xl:flex-row"%}
 
@@ -109,10 +113,12 @@ Parameters:
     {% set row_class = row_class ~ "w-screen -mx-8 sm:-mx-12 md:-mx-16 lg:-mx-20" %}
 {% endif %}
 
+{% set url = body | split(pat="href=") | slice(start=1) | first | split(pat=">") | first | trim_start_matches(pat='"') %}
+
 <div class="{{row_class}}" style="{{styles}}" id="{{row_id}}">
 
-    {% for column in columns%} 
+    {% for column in columns %} 
-
+    
         <!-- Hides empty columns if displayed vertically in small screen -->
         {% if column | as_str | length < 10 %} 
             <div class="hidden md:block flex-1 md:mb-0 md:mx-8 sm:flex-1">