@@ -58,7 +82,7 @@
{% set img_url = get_url(path='/' ~ page.relative_path | replace(from='_', to='-') | replace(from='index.md', to=page.extra.imgPath)) %}
-
diff --git a/templates/newsPage.html b/templates/newsPage.html
index e94a1d368..73dff2389 100644
--- a/templates/newsPage.html
+++ b/templates/newsPage.html
@@ -1,6 +1,36 @@
{% extends "_default/base.html" %}
{% block content %}
+{% set split = page.content | split(pat="threefold.io") %}
+{% if split | length < 2 %}
+ {% set content = page.content %}
+{% else %}
+ {% set content = "" %}
+ {% for part in split %}
+ {% if part is starting_with("/blog") %}
+ {% set split_part = part | split(pat='/">') %}
+ {% set link = split_part[0] %}
+ {% set link = link | replace(from="/blog/post", to="/blog") %}
+ {% set link = link | replace(from="_", to="-") %}
+ {% set rest_part = split_part | slice(start=1) | join(sep='/">') %}
+ {% set part = link ~ '/">' ~ rest_part %}
+ {% endif %}
+ {% if part is starting_with("/people") %}
+ {% set split_part = part | split(pat='/">') %}
+ {% set link = split_part[0] %}
+ {% set link = link | replace(from="_", to="-") %}
+ {% set rest_part = split_part | slice(start=1) | join(sep='/">') %}
+ {% set part = link ~ '/">' ~ rest_part %}
+ {% endif %}
+ {% if loop.first %}
+ {% set_global content = part %}
+ {% else %}
+ {% set_global content = content ~ "threefold.io" ~ part %}
+ {% endif %}
+ {% endfor %}
+{% endif %}
+
+
@@ -84,7 +114,7 @@
font-serif
text-gray-700
">
-
diff --git a/templates/shortcodes/grid_stats.html b/templates/shortcodes/grid_stats.html
index ec9c61f61..59c3fb95e 100644
--- a/templates/shortcodes/grid_stats.html
+++ b/templates/shortcodes/grid_stats.html
@@ -1,13 +1,12 @@
{% set styles = "background-image: url('images/grid_map.png');" %}
-{% set data = load_data(url="https://gridproxy.grid.tf/stats?status=up", required=false, format="json") %}
+{% set data = load_data(url="https://explorer.threefold.io/api/stats", required=false, format="json") %}
{% if data %}
-{% set capacity = data.totalHru + data.totalSru / (1024 * 1024 * 1024 * 1024 * 1024) %}
-{% set nodes = data.nodes %}
-{% set countries = data.countries %}
-{% set cores = data.totalCru %}
+ {% set capacity = data.hru + data.sru / 1000 %}
+ {% set nodes = data.onlinenodes %}
+ {% set countries = data.countries %}
+ {% set cores = data.cru %}
{% endif %}
-
{% if data %}
{{ page.content | safe }}
+ {{ content | safe }}
{{ page.content | safe }}
+ {{ content | safe }}
@@ -19,7 +18,7 @@
- {{ capacity | round(precision=2) }}PB
+ {{ capacity / 1000000 | round(precision=2) }}PB
capacity