gnunet-svn
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[www] branch stable updated (29cc702 -> 3cd2407)


From: gnunet
Subject: [www] branch stable updated (29cc702 -> 3cd2407)
Date: Mon, 16 Nov 2020 08:23:21 +0100

This is an automated email from the git hooks/post-receive script.

martin-schanzenbach pushed a change to branch stable
in repository www.

    from 29cc702  Fix missing space in required packages
     add 050ef70  update roadmap and add to nav
     add 1d94b6e  Merge branch 'master' of ssh://gnunet.org/www into master
     add 269af3f  update roadmap
     add 3cd2407  revert news change; prettify

No new revisions were added by this update.

Summary of changes:
 common/navigation.j2.inc |  4 +---
 template/index.html.j2   | 41 +++++++++++++++++++++-------------
 template/roadmap.html.j2 | 58 +++++++++++++++++++++++++++---------------------
 3 files changed, 60 insertions(+), 43 deletions(-)

diff --git a/common/navigation.j2.inc b/common/navigation.j2.inc
index 16c602d..4d4827b 100644
--- a/common/navigation.j2.inc
+++ b/common/navigation.j2.inc
@@ -60,9 +60,7 @@
         <ul class="dropdown-menu" aria-labelledby="navbarMain">
           <li><a class="dropdown-item" href="{{ 
url_localized('architecture.html') }}">{{ _("System Architecture") }}</a></li>
 
-<!-- TODO fill with content
-
-          <li><a class="dropdown-item" href="{{ url_localized('roadmap.html') 
}}">{{ _("Roadmap") }}</a></li>-->
+          <li><a class="dropdown-item" href="{{ url_localized('roadmap.html') 
}}">{{ _("Roadmap") }}</a></li>
           <li><a class="dropdown-item" href="https://bugs.gnunet.org"; 
target="_blank">{{ _("Bug Tracker") }}</a></li>
           <li><a class="dropdown-item" href="https://git.gnunet.org"; 
target="_blank">{{ _("Source Code") }}</a></li>
           <li><a class="dropdown-item" target="_blank" 
href="https://docs.gnunet.org/doxygen/";>{{ _("Source Code Documentation") 
}}</a></li>
diff --git a/template/index.html.j2 b/template/index.html.j2
index fb0ac82..6bc85b2 100644
--- a/template/index.html.j2
+++ b/template/index.html.j2
@@ -2,18 +2,42 @@
 {% block body_content %}
 <!-- Jumbotron -->
 <div>
-  <div class="container text-center">
+  <div class="container">
     <div class="row">
       <div class="container text-center">
         <h1>{{ _("The Internet of tomorrow needs GNUnet today") }}</h1>
       </div>
     </div>
 
-    <div>
+    <div class="container text-center">
       <img src="{{ url_static('images/gnunet-logo-dark-text.png') }}"  
alt="GNUnet" />
     </div>
   </div>
 </div>
+
+<div class="container-fluid">
+  <div class="container">
+      <div class="row">
+      <div class="col-lg-2 homepageicon">
+        <span class="fa fa-bullhorn"></span>
+      </div>
+      <div class="col-lg-6">
+      <section>
+        <h2>{{ _("Latest news") }}</h2>
+        <p>
+        {% for item in newsdata[:3] %}
+        <a class="link" href="news/{{ item['page'] }}" title="{{ 
item['date']}}">{{ item['date'] }}: {{ item['title'] }}</a><br/>
+        {% endfor %}
+        <br/>
+        <a class="link" href="{{ url_localized('news/index.html')}}">{{ 
_("Older news entries") }}</a>
+        </p>
+        </section>
+      </div>
+    </div>
+  </div>
+</div>
+
+
 <div class="container-fluid greybox">
   <div class="container">
     <div class="row">
@@ -253,19 +277,6 @@
     </div>
   </div>
 
-  <div class="row mt-5">
-  </div>
-  <div class="container">
-    <div class="col-8">
-      <h2><a href="{{ url_localized('news/index.html')}}">{{ _("News") 
}}</a></h2>
-    </div>
-    {% for item in newsdata[:3] %}
-    <div class="col-8">
-      <a href="news/{{ item['page'] }}" title="{{ item['date']}}">{{ 
item['date'] }}: {{ item['title'] }}</a>
-    </div>
-   {% endfor %}
-  </div>
-
 </div>
 <hr style="padding: 2em;"/>
 <div class="container-fluid">
diff --git a/template/roadmap.html.j2 b/template/roadmap.html.j2
index 51cc6fc..31f95e4 100644
--- a/template/roadmap.html.j2
+++ b/template/roadmap.html.j2
@@ -4,25 +4,24 @@
   <div class="row">
     <div class="container text-center">
       <h1>{{ _("Roadmap") }}</h1>
-      <section>
-        <p>
-         This is our roadmap.
-        </p>
-      </section>
     </div>
+    <p>
+      This is our roadmap. We distinguish between short, medium and long term 
goals.
+      The roadmap is subject to change and its primary purpose it to indicate 
the current work in progress and future work as well as the path to a stable 
release. Goals which are currently actively development are marked in 
<b>bold</b>.
+    </p>
     <ul class="timeline">
       <li>
         <section class="item-preview">
           <header>
             <h3>Short term</h3>
             <p class="item-date">
-            0.13.x
+            &lt;0.15
             </p>
             <p class="item-abstract">
-            <ul>
-              <li>Setup and use names and numbers registration (GANA) for 
GNUnet
-              subsystems.</li>
-              <li>GNU Name System technical specification.</li>
+            <ul class="fa-ul">
+              <li><span class="fa-li"><i class="far 
fa-check-square"></i></span><a href="https://gana.gnunet.org";>Setup and use 
names and numbers registration (GANA) for GNUnet
+              subsystems.</a></li>
+              <li><span class="fa-li"><i class="far 
fa-check-square"></i></span><a href="https://lsd.gnunet.org/lsd0001/";>GNU Name 
System technical specification.</a></li>
              </ul>
             </p>
           </header>
@@ -34,17 +33,26 @@
           <header>
             <h3>Medium term</h3>
             <p class="item-date">
-            0.14 and beyond
+            &ge;0.15
             </p>
             <p class="item-abstract">
-            <ul>
-              <li>TNG: Transport rewrite complete including basic service, 
communicators and NAT.</li>
-              <li>CORE/CADET performance and correctness improvements.</li>
-              <li>DHT improvements including signed paths and stability 
improvements.</li>
-              <li>SET improvements to code quality and correctness.</li>
-              <li>CONVERSATION improvements to performance, latency hiding and 
usability.</li>
-              <li>Stable and usable documentation.</li>
-              <li>GNUnet packages available and up-to-date in 
distributions.</li>
+            <ul class="fa-ul">
+              <li><span class="fa-li"><i class="far 
fa-square"></i></span><b>TNG</b>: Transport rewrite. [<a 
href="https://bugs.gnunet.org/view_all_bug_page.php?filter=5fb21ae8dd583";>Open 
issues</a>]
+                <ul class="fa-ul">
+                  <li><span class="fa-li"><i class="far 
fa-square"></i></span><b>TNG service</b></li>
+                  <li><span class="fa-li"><i class="far 
fa-square"></i></span><b>TCP communicator</b></li>
+                  <li><span class="fa-li"><i class="far 
fa-square"></i></span><b>UDP communicator</b></li>
+                  <li><span class="fa-li"><i class="far 
fa-square"></i></span><b>UNIX Domain Socket communicator</b></li>
+                  <li><span class="fa-li"><i class="far 
fa-square"></i></span>NAT</li>
+                </ul>
+              </li>
+              <li><span class="fa-li"><i class="far 
fa-square"></i></span>CORE/CADET: Performance and correctness improvements.</li>
+              <li><span class="fa-li"><i class="far fa-square"></i></span>DHT: 
Improvements including signed paths and stability improvements. Technical 
specification.</li>
+              <li><span class="fa-li"><i class="far fa-square"></i></span>SET 
improvements to code quality and correctness.</li>
+              <li><span class="fa-li"><i class="far 
fa-square"></i></span>CONVERSATION improvements to performance, latency hiding 
and usability.</li>
+              <li><span class="fa-li"><i class="far 
fa-square"></i></span>RECLAIM: Technical specification.</li>
+              <li><span class="fa-li"><i class="far 
fa-square"></i></span><b>Stable and usable documentation.</b></li>
+              <li><span class="fa-li"><i class="far 
fa-square"></i></span><b>GNUnet packages available and up-to-date in 
distributions.</b></li>
              </ul>
             </p>
           </header>
@@ -59,12 +67,12 @@
             1.x
             </p>
             <p class="item-abstract">
-            <ul>
-              <li>Stable release.</li>
-              <li>Onion routing with RPS</li>
-              <li>Mix network, pEp integration on top of mix network</li>
-              <li>Collaborative filtering / news distribution</li>
-              <li>Improved FS design, proper integration with GNS</li>
+            <ul class="fa-ul">
+              <li><span class="fa-li"><i class="far 
fa-square"></i></span>Stable release.</li>
+              <li><span class="fa-li"><i class="far 
fa-square"></i></span>Onion routing with RPS</li>
+              <li><span class="fa-li"><i class="far fa-square"></i></span>Mix 
network, pEp integration on top of mix network</li>
+              <li><span class="fa-li"><i class="far 
fa-square"></i></span>Collaborative filtering / news distribution</li>
+              <li><span class="fa-li"><i class="far 
fa-square"></i></span>Improved FS design, proper integration with GNS</li>
              </ul>
             </p>
           </header>

-- 
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.



reply via email to

[Prev in Thread] Current Thread [Next in Thread]