Commit 8993ea82 authored by luigi1111's avatar luigi1111

Merge !1231

roadmap: change structure

See merge request !1231
parents 91d6e6a4 ae816cf6
Pipeline #412 passed with stage
in 5 minutes and 26 seconds
...@@ -255,6 +255,8 @@ ...@@ -255,6 +255,8 @@
- name: Second-layer solutions for speed and scalability - name: Second-layer solutions for speed and scalability
date: date:
status: upcoming status: upcoming
- year: future
accomplishments:
- name: Return addresses - name: Return addresses
date: date:
status: upcoming status: upcoming
...@@ -24,8 +24,9 @@ permalink: /resources/roadmap/index.html ...@@ -24,8 +24,9 @@ permalink: /resources/roadmap/index.html
<div class="tabPanel-widget"> <div class="tabPanel-widget">
<label for="tab-1" tabindex="0"></label> <label for="tab-1" tabindex="0"></label>
<input id="tab-1" type="radio" name="tabs" aria-hidden="true"> <input id="tab-1" type="radio" name="tabs" aria-hidden="true">
<h2>2014</h2> <h2>2014-2015</h2>
<div class="tabPanel-content"> <div class="tabPanel-content">
<h2>2014</h2>
{% for toplevel in site.data.lang[site.lang].roadmap %} {% for toplevel in site.data.lang[site.lang].roadmap %}
{% if toplevel.year == 2014 %} {% if toplevel.year == 2014 %}
{% for roadlist in toplevel.accomplishments %} {% for roadlist in toplevel.accomplishments %}
...@@ -40,13 +41,29 @@ permalink: /resources/roadmap/index.html ...@@ -40,13 +41,29 @@ permalink: /resources/roadmap/index.html
{%endfor%} {%endfor%}
{%endif%} {%endif%}
{%endfor%} {%endfor%}
<h2>2015</h2>
{% for toplevel in site.data.lang[site.lang].roadmap %}
{% if toplevel.year == 2015 %}
{% for roadlist in toplevel.accomplishments %}
<div class="row start-xs middle-xs">
<div class="col-xs-1">
<span class="{{roadlist.status}}"></span>
</div>
<div class="col-xs-11">
<p>{{roadlist.date}}: {{roadlist.name}}</p>
</div>
</div>
{%endfor%}
{%endif%}
{%endfor%}
</div> </div>
<label for="tab-2" tabindex="0"></label> <label for="tab-2" tabindex="0"></label>
<input id="tab-2" type="radio" name="tabs" aria-hidden="true"> <input id="tab-2" type="radio" name="tabs" aria-hidden="true">
<h2>2015</h2> <h2>2016</h2>
<div class="tabPanel-content"> <div class="tabPanel-content">
<h2>2016</h2>
{% for toplevel in site.data.lang[site.lang].roadmap %} {% for toplevel in site.data.lang[site.lang].roadmap %}
{% if toplevel.year == 2015 %} {% if toplevel.year == 2016 %}
{% for roadlist in toplevel.accomplishments %} {% for roadlist in toplevel.accomplishments %}
<div class="row start-xs middle-xs"> <div class="row start-xs middle-xs">
<div class="col-xs-1"> <div class="col-xs-1">
...@@ -62,17 +79,22 @@ permalink: /resources/roadmap/index.html ...@@ -62,17 +79,22 @@ permalink: /resources/roadmap/index.html
</div> </div>
<label for="tab-3" tabindex="0"></label> <label for="tab-3" tabindex="0"></label>
<input id="tab-3" type="radio" name="tabs" aria-hidden="true"> <input id="tab-3" type="radio" name="tabs" aria-hidden="true">
<h2>2016</h2> <h2>2017</h2>
<div class="tabPanel-content"> <div class="tabPanel-content">
<h2>2017</h2>
{% for toplevel in site.data.lang[site.lang].roadmap %} {% for toplevel in site.data.lang[site.lang].roadmap %}
{% if toplevel.year == 2016 %} {% if toplevel.year == 2017 %}
{% for roadlist in toplevel.accomplishments %} {% for roadlist in toplevel.accomplishments %}
<div class="row start-xs middle-xs"> <div class="row start-xs middle-xs">
<div class="col-xs-1"> <div class="col-xs-1">
<span class="{{roadlist.status}}"></span> <span class="{{roadlist.status}}"></span>
</div> </div>
<div class="col-xs-11"> <div class="col-xs-11">
<p>{{roadlist.date}}: {{roadlist.name}}</p> {% if roadlist.date %}
<p>{{roadlist.date}}: {{roadlist.name}}</p>
{%else%}
<p>{{roadlist.name}}</p>
{%endif%}
</div> </div>
</div> </div>
{%endfor%} {%endfor%}
...@@ -81,10 +103,11 @@ permalink: /resources/roadmap/index.html ...@@ -81,10 +103,11 @@ permalink: /resources/roadmap/index.html
</div> </div>
<label for="tab-4" tabindex="0"></label> <label for="tab-4" tabindex="0"></label>
<input id="tab-4" type="radio" name="tabs" aria-hidden="true"> <input id="tab-4" type="radio" name="tabs" aria-hidden="true">
<h2>2017</h2> <h2>2018</h2>
<div class="tabPanel-content"> <div class="tabPanel-content">
<h2>2018</h2>
{% for toplevel in site.data.lang[site.lang].roadmap %} {% for toplevel in site.data.lang[site.lang].roadmap %}
{% if toplevel.year == 2017 %} {% if toplevel.year == 2018 %}
{% for roadlist in toplevel.accomplishments %} {% for roadlist in toplevel.accomplishments %}
<div class="row start-xs middle-xs"> <div class="row start-xs middle-xs">
<div class="col-xs-1"> <div class="col-xs-1">
...@@ -104,10 +127,11 @@ permalink: /resources/roadmap/index.html ...@@ -104,10 +127,11 @@ permalink: /resources/roadmap/index.html
</div> </div>
<label for="tab-5" tabindex="0"></label> <label for="tab-5" tabindex="0"></label>
<input id="tab-5" type="radio" name="tabs" aria-hidden="true"> <input id="tab-5" type="radio" name="tabs" aria-hidden="true">
<h2>2018</h2> <h2>2019</h2>
<div class="tabPanel-content"> <div class="tabPanel-content">
<h2>2019</h2>
{% for toplevel in site.data.lang[site.lang].roadmap %} {% for toplevel in site.data.lang[site.lang].roadmap %}
{% if toplevel.year == 2018 %} {% if toplevel.year == 2019 %}
{% for roadlist in toplevel.accomplishments %} {% for roadlist in toplevel.accomplishments %}
<div class="row start-xs middle-xs"> <div class="row start-xs middle-xs">
<div class="col-xs-1"> <div class="col-xs-1">
...@@ -127,10 +151,11 @@ permalink: /resources/roadmap/index.html ...@@ -127,10 +151,11 @@ permalink: /resources/roadmap/index.html
</div> </div>
<label for="tab-6" tabindex="0"></label> <label for="tab-6" tabindex="0"></label>
<input id="tab-6" type="radio" name="tabs" aria-hidden="true" checked> <input id="tab-6" type="radio" name="tabs" aria-hidden="true" checked>
<h2>2019</h2> <h2>2020</h2>
<div class="tabPanel-content"> <div class="tabPanel-content">
<h2>2020</h2>
{% for toplevel in site.data.lang[site.lang].roadmap %} {% for toplevel in site.data.lang[site.lang].roadmap %}
{% if toplevel.year == 2019 %} {% if toplevel.year == 2020 %}
{% for roadlist in toplevel.accomplishments %} {% for roadlist in toplevel.accomplishments %}
<div class="row start-xs middle-xs"> <div class="row start-xs middle-xs">
<div class="col-xs-1"> <div class="col-xs-1">
...@@ -152,8 +177,9 @@ permalink: /resources/roadmap/index.html ...@@ -152,8 +177,9 @@ permalink: /resources/roadmap/index.html
<input id="tab-7" type="radio" name="tabs" aria-hidden="true"> <input id="tab-7" type="radio" name="tabs" aria-hidden="true">
<h2>{% t roadmap.future %}</h2> <h2>{% t roadmap.future %}</h2>
<div class="tabPanel-content"> <div class="tabPanel-content">
<h2>{% t roadmap.future %}</h2>
{% for toplevel in site.data.lang[site.lang].roadmap %} {% for toplevel in site.data.lang[site.lang].roadmap %}
{% if toplevel.year == 2020 %} {% if toplevel.year == "future" %}
{% for roadlist in toplevel.accomplishments %} {% for roadlist in toplevel.accomplishments %}
<div class="row start-xs middle-xs"> <div class="row start-xs middle-xs">
<div class="col-xs-1"> <div class="col-xs-1">
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment