update image files and meta text, deprecating role descriptions on consortium page

author: Stefan Kügel <skuegel@web.de> 2023-12-18 08:03:47 +0100
committer: Stefan Kügel <skuegel@web.de> 2023-12-18 08:03:47 +0100
commit: 80fec5156b5a11b76b929ee7077407b6e60d58d1 (patch)
tree: a02ad72b8e2949716e646f87a5fd44f02a6730af
parent: 427225425c87dd22dee37a18311c85ea0812eb68 (diff)
download: www-80fec5156b5a11b76b929ee7077407b6e60d58d1.tar.gz
www-80fec5156b5a11b76b929ee7077407b6e60d58d1.tar.bz2
www-80fec5156b5a11b76b929ee7077407b6e60d58d1.zip
8 files changed, 209 insertions, 20 deletions
diff --git a/common/consortium.j2 b/common/consortium.j2
index 5c09eb9f..71918907 100644
--- a/common/consortium.j2
+++ b/common/consortium.j2
@@ -2,7 +2,7 @@
 <html lang="{{ lang }}">
   <head>
     <meta charset="UTF-8"/>
-    <title>{{ _("GNU Taler") }} Horizon Project</title>
+    <title>NGI Taler</title>
     <link rel="shortcut icon" href="/favicon.ico" />
     <link rel="icon" type="image/svg+xml" href="{{ url_static('images/favicon.svg') }}" sizes="any" />
     <link rel="icon" type="image/png" href="{{ url_static('images/android-chrome-192x192.png') }}" sizes="192x192" />
@@ -10,13 +10,13 @@
     <link rel="apple-touch-icon" sizes="180x180" href="{{ url_static('images/apple-touch-icon.png') }}" />
     <meta name="msapplication-TileColor" content="#ffffff" />
     <meta name="msapplication-TileImage" content="{{ url_static('images/mstile-150x150.png') }}" />
-    <meta property="og:title" content="NGI Taler funded by Horizon Europe and SBFI." />
+    <meta property="og:title" content="NGI Taler project funded by Horizon Europe and SBFI." />
     <meta property="og:type" content="website" />
     <meta property="og:url" content="{{ url_localized('consortium.html') }}" />
     <meta property="og:image" content="https://taler.net/favicon.ico" />
     <meta property="og:image" content="/favicon.ico" />
     <meta property="og:image" content="{{ url_static('images/favicon.png') }}" />
-    <meta name="description" content="The NGI Taler consortium, funded by Horizon Europe and SBFI, aims to bring GNU Taler to market across Europe." />
+    <meta name="description" content="The NGI Taler project, funded by Horizon Europe and SBFI, aims to bring GNU Taler to market across Europe." />
     {# <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/@_nu/html-validator" /> #}
     {# TODO Other header may be needed #}
     {% include "common/header.j2.inc" %}
diff --git a/common/footer-eu.j2.inc b/common/footer-eu.j2.inc
index 3eee4179..4e5d49bc 100644
--- a/common/footer-eu.j2.inc
+++ b/common/footer-eu.j2.inc
@@ -7,12 +7,11 @@
     </div>
     <div class="row justify-content-top">
       <div class="col-md-4 col-sm-12">
-      <h4>TALER Project</h4>
+      <h4>NGI TALER Overview</h4>
         <ul class="footer-list">
-          <li><strong>Coordinator:</strong> Eindhoven University of Technology (TUE)</li>
-          {# TODO Adapt the consortium e-mail address before publishing #}
+          <li><strong>Coordinator:</strong> Eindhoven University of Technology</li>
           <li><strong>E-Mail: </strong><a href="mailto:questions'AT'taler.net?subject=Mail from EU project Website">Contact us</a></li>
-          <li><strong>Programme Call:</strong> HORIZON-CL4-2023-HUMAN-01-CNECT</li>
+          <li><strong>Programme call:</strong> HORIZON-CL4-2023-HUMAN-01-CNECT</li>
           <li><strong>Type of action:</strong> HORIZON Innovation Actions</li>
           <li><strong>Project number:</strong> 101135475</li>
           <li><strong>EU contribution:</strong> € 4.508.355,40</li>
diff --git a/properties.d/events_eu-project.yml b/properties.d/events_eu-project.yml
index 4a229cc3..82983129 100644
--- a/properties.d/events_eu-project.yml
+++ b/properties.d/events_eu-project.yml
@@ -39,10 +39,10 @@ events:
     email: cg'AT'taler.net
   - date: 2023-12-01
     title: NGI TALER call
-    url_img: images/logo-NGITaler.png
+    url_img: images/logo-NGI_Taler.svg
     url_ext: https://nlnet.nl/taler
     url_html:
-    teaser: "The first call of NGI TALER will open up on December 1<sup>st</sup> 2023, with a deadline of February 1<sup>st</sup> 2024. More information about the initiative, the board and guidelines on the website of NLnet."
+    teaser: "The first call of NGI TALER is open since December 1<sup>st</sup> 2023, with a deadline of February 1<sup>st</sup> 2024. More information about the initiative, the board and guidelines on the website of NLnet."
     location:
     speaker: NLnet Foundation
     email:
diff --git a/properties.d/partners.yml b/properties.d/partners.yml
index 0baeb640..a009ff07 100644
--- a/properties.d/partners.yml
+++ b/properties.d/partners.yml
@@ -17,7 +17,7 @@ partners:
     and can therefore also manufacture needed hardware."
     statement: "BFH is excited to educate the next generation of developers about the future of digital payments."
   - id: TSYS
-    name: "Taler Systems SA"
+    name: "Taler Systems S.A."
     contact: "Dr. Florian Dold"
     logo: images/logo-TalerSystems.svg
     url: https://taler-systems.com
@@ -52,7 +52,7 @@ partners:
     forward to help deploy GNU Taler in the Eurozone and our role as auditor of
     the first large-scale instantiation of GNU Taler."
   - id: VV
-    name: "Visual Vest"
+    name: "VisualVest"
     contact: "-- TBD --"
     logo: images/logo-visualvest.svg
     url: https://www.visualvest.de
diff --git a/static/images/g0v-hackath59n.png b/static/images/g0v-hackath59n.png
index b4a7cd5e..9044cfb8 100644
--- a/static/images/g0v-hackath59n.png
+++ b/static/images/g0v-hackath59n.png
diff --git a/static/images/logo-NGITaler.png b/static/images/logo-NGITaler.png
index ea279128..86e1a830 100644
--- a/static/images/logo-NGITaler.png
+++ b/static/images/logo-NGITaler.png
diff --git a/static/images/logo-NGI_Taler.svg b/static/images/logo-NGI_Taler.svg
new file mode 100644
index 00000000..0ba9796a
--- /dev/null
+++ b/static/images/logo-NGI_Taler.svg
@@ -0,0 +1,189 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   version="1.1"
+   id="svg2"
+   xml:space="preserve"
+   width="1658.7679"
+   height="502.77802"
+   viewBox="0 0 1658.7679 502.77799"
+   sodipodi:docname="Logo-NGI_TALER_Tag_bluetext.svg"
+   inkscape:version="1.2.2 (b0a8486541, 2022-12-01)"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/"><sodipodi:namedview
+     id="namedview2856"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:showpageshadow="2"
+     inkscape:pageopacity="0.0"
+     inkscape:pagecheckerboard="0"
+     inkscape:deskcolor="#d1d1d1"
+     showgrid="false"
+     inkscape:zoom="0.31095132"
+     inkscape:cx="-638.36358"
+     inkscape:cy="493.64639"
+     inkscape:window-width="3440"
+     inkscape:window-height="1440"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="g10-4" /><metadata
+     id="metadata8"><rdf:RDF><cc:Work
+         rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" /></cc:Work></rdf:RDF></metadata><defs
+     id="defs6"><linearGradient
+       id="linearGradient4719"><stop
+         style="stop-color:#000000;stop-opacity:1;"
+         offset="0"
+         id="stop4715" /><stop
+         style="stop-color:#000000;stop-opacity:0;"
+         offset="1"
+         id="stop4717" /></linearGradient><linearGradient
+       x1="1.1699511"
+       y1="0.19092996"
+       x2="-0.2205788"
+       y2="-0.22601008"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-139.45511,-135.52185,-135.52185,139.45511,177.4727,131.75308)"
+       spreadMethod="pad"
+       id="linearGradient28"><stop
+         style="stop-color:#0042b3;stop-opacity:1;"
+         offset="0"
+         id="stop24" /><stop
+         style="stop-color:#2c2c2c;stop-opacity:1;"
+         offset="1"
+         id="stop26" /></linearGradient><clipPath
+       clipPathUnits="userSpaceOnUse"
+       id="clipPath38"><path
+         d="M 0,127.984 H 415.474 V 0 H 0 Z"
+         id="path36" /></clipPath><clipPath
+       clipPathUnits="userSpaceOnUse"
+       id="clipPath38-2"><path
+         d="M 0,127.984 H 415.474 V 0 H 0 Z"
+         id="path36-9" /></clipPath><clipPath
+       clipPathUnits="userSpaceOnUse"
+       id="clipPath38-6"><path
+         d="M 0,127.984 H 415.474 V 0 H 0 Z"
+         id="path36-1" /></clipPath><linearGradient
+       xlink:href="#linearGradient28"
+       id="linearGradient52078"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-139.45511,-135.52185,-135.52185,139.45511,177.4727,131.75308)"
+       x1="1.1699511"
+       y1="0.19092996"
+       x2="-0.2205788"
+       y2="-0.22601008"
+       spreadMethod="pad" /><linearGradient
+       xlink:href="#linearGradient4719"
+       id="linearGradient52080"
+       gradientUnits="userSpaceOnUse"
+       x1="14.177"
+       y1="63.9925"
+       x2="214.54475"
+       y2="63.9925" /><linearGradient
+       xlink:href="#linearGradient4719"
+       id="linearGradient52082"
+       gradientUnits="userSpaceOnUse"
+       x1="14.177"
+       y1="63.9925"
+       x2="214.54475"
+       y2="63.9925" /><linearGradient
+       xlink:href="#linearGradient4719"
+       id="linearGradient52084"
+       gradientUnits="userSpaceOnUse"
+       x1="14.177"
+       y1="63.9925"
+       x2="214.54475"
+       y2="63.9925" /><linearGradient
+       xlink:href="#linearGradient4719"
+       id="linearGradient52086"
+       gradientUnits="userSpaceOnUse"
+       x1="14.177"
+       y1="63.9925"
+       x2="214.54475"
+       y2="63.9925" /></defs><g
+     id="g10"
+     transform="matrix(1.3333333,0,0,-1.3333333,-20.163573,379.78895)">
+<g
+   id="g52076"
+   transform="translate(905.67599,-132.20466)"
+   inkscape:label="Container"><g
+     id="g10-4"
+     transform="matrix(3.3002013,0,0,3.3002013,-910.19016,15.816868)"><g
+   id="g12-7"
+   style="stroke:url(#linearGradient52086)"><g
+     id="g14-8"
+     style="stroke:url(#linearGradient52084)"><g
+       id="g20-4"
+       style="stroke:url(#linearGradient52082)"><g
+         id="g22-5"
+         style="stroke:url(#linearGradient52080)"><path
+           d="m 25.228,113.805 c -6.079,0 -11.051,-4.973 -11.051,-11.051 v 0 -77.523 c 0,-6.079 4.972,-11.051 11.051,-11.051 v 0 h 165.035 c 6.078,0 11.051,4.973 11.051,11.051 v 0 18.26 c 0,2.022 0.803,3.962 2.234,5.393 v 0 l 9.096,9.096 c 2.54,2.539 2.533,6.657 -0.013,9.188 v 0 l -9.067,9.017 c -1.44,1.431 -2.25,3.379 -2.25,5.409 v 0 21.16 c 0,6.078 -4.973,11.051 -11.051,11.051 v 0 z"
+           style="fill:url(#linearGradient52078);stroke:#000000;stroke-opacity:0"
+           id="path30-0" /></g></g></g></g><g
+   id="g32-3"
+   inkscape:label="NGI"><g
+     id="g34-6"
+     clip-path="url(#clipPath38-6)"><g
+       id="g40-1"
+       transform="translate(175.9982,95.8645)"><path
+         d="m 0,0 v 0 c 4.074,0 7.376,-3.302 7.376,-7.376 v -48.993 c 0,-4.074 -3.302,-7.376 -7.376,-7.376 -4.074,0 -7.376,3.302 -7.376,7.376 V -7.376 C -7.376,-3.302 -4.074,0 0,0"
+         style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none"
+         id="path42-0"
+         inkscape:label="I" /></g><g
+       id="g44-6"
+       transform="translate(152.1193,64.9934)"><path
+         d="M 0,0 H -0.506 C -0.57,0 -0.633,-0.008 -0.698,-0.01 -0.762,-0.008 -0.825,0 -0.89,0 h -7.283 c -3.929,0 -7.359,-2.965 -7.613,-6.885 -0.278,-4.296 3.124,-7.867 7.361,-7.867 0.776,0 1.343,-0.754 1.111,-1.494 -0.658,-2.088 -2.341,-3.751 -4.547,-4.333 -2.074,-0.547 -4.276,-0.821 -6.605,-0.821 -4.007,0 -7.574,0.865 -10.7,2.595 -3.127,1.73 -5.57,4.144 -7.331,7.24 -1.761,3.096 -2.641,6.617 -2.641,10.564 0,4.006 0.88,7.558 2.641,10.654 1.761,3.097 4.219,5.493 7.377,7.195 3.156,1.698 6.768,2.549 10.836,2.549 4.681,0 8.865,-1.269 12.55,-3.807 2.341,-1.612 5.524,-1.588 7.757,0.171 3.48,2.741 3.289,8.045 -0.315,10.452 -1.7,1.136 -3.538,2.112 -5.512,2.928 -4.553,1.881 -9.623,2.823 -15.208,2.823 -6.679,0 -12.69,-1.412 -18.03,-4.235 -5.344,-2.822 -9.517,-6.738 -12.522,-11.747 -3.005,-5.008 -4.508,-10.67 -4.508,-16.983 0,-6.315 1.503,-11.975 4.508,-16.984 3.005,-5.009 7.148,-8.924 12.43,-11.747 5.282,-2.824 11.231,-4.235 17.849,-4.235 4.613,0 9.197,0.699 13.751,2.095 0.045,0.014 0.091,0.028 0.136,0.042 7.104,2.202 11.884,8.86 11.884,16.297 v 9.047 C 6.486,-2.904 3.583,0 0,0"
+         style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none"
+         id="path46-3"
+         inkscape:label="G" /></g><g
+       id="g48-20"
+       transform="translate(90.5807,88.5798)"
+       inkscape:label="NGI"><path
+         d="m 0,0 v -49.176 c 0,-4.023 -3.262,-7.285 -7.286,-7.285 h -1.381 c -2.181,0 -4.247,0.977 -5.631,2.662 l -24.229,29.505 c -1.804,2.197 -5.368,0.921 -5.368,-1.922 v -22.96 c 0,-4.023 -3.261,-7.285 -7.285,-7.285 -4.023,0 -7.285,3.262 -7.285,7.285 V 0 c 0,4.024 3.262,7.285 7.285,7.285 h 1.468 c 2.184,0 4.253,-0.979 5.636,-2.669 l 24.135,-29.475 c 1.802,-2.202 5.37,-0.927 5.37,1.918 V 0 c 0,4.024 3.261,7.285 7.285,7.285 C -3.262,7.285 0,4.024 0,0"
+         style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none"
+         id="path50-6"
+         inkscape:label="N" /></g></g></g><g
+   aria-label="TALER"
+   transform="scale(1,-1)"
+   id="text56-1"
+   style="font-weight:600;font-size:32.9113px;font-family:Montserrat;-inkscape-font-specification:'Montserrat Semi-Bold';letter-spacing:5.29875px;fill:#0042b3;fill-opacity:0.69411767;stroke-width:1.03625"
+   inkscape:label="TALER"><path
+     d="m 247.79736,-52.473545 v -19.417667 h -7.63543 v -3.620244 h 19.54932 v 3.620244 h -7.63543 v 19.417667 z"
+     id="path2915"
+     inkscape:label="T"
+     style="fill:#0042b3;fill-opacity:0.69411767" /><path
+     d="m 263.82517,-52.473545 10.36706,-23.037911 h 4.21265 l 10.39997,23.037911 h -4.47594 l -8.91896,-20.767031 h 1.71139 l -8.88606,20.767031 z m 4.77214,-5.331631 1.15189,-3.356952 h 12.44048 l 1.15189,3.356952 z"
+     id="path2917"
+     inkscape:label="A"
+     style="fill:#0042b3;fill-opacity:0.69411767" /><path
+     d="m 297.03272,-52.473545 v -23.037911 h 4.27847 v 19.417668 h 12.04553 v 3.620243 z"
+     id="path2919"
+     inkscape:label="L"
+     style="fill:#0042b3;fill-opacity:0.69411767" /><path
+     d="m 325.99472,-65.934267 h 11.45314 v 3.521509 h -11.45314 z m 0.32912,9.87339 h 12.99996 v 3.587332 h -17.27843 v -23.037911 h 16.81767 v 3.587332 h -12.5392 z"
+     id="path2921"
+     inkscape:label="E"
+     style="fill:#0042b3;fill-opacity:0.69411767" /><path
+     d="m 349.3947,-52.473545 v -23.037911 h 9.47845 q 3.06075,0 5.2329,0.987339 2.20505,0.98734 3.38986,2.830372 1.18481,1.843033 1.18481,4.377203 0,2.53417 -1.18481,4.377203 -1.18481,1.810122 -3.38986,2.797461 -2.17215,0.954428 -5.2329,0.954428 h -7.10884 l 1.90885,-1.941767 v 8.655672 z m 15.07337,0 -5.8253,-8.35947 h 4.57467 l 5.85821,8.35947 z m -10.79491,-8.194914 -1.90885,-2.040501 h 6.91137 q 2.83037,0 4.24556,-1.217718 1.4481,-1.217718 1.4481,-3.389864 0,-2.205057 -1.4481,-3.389864 -1.41519,-1.184806 -4.24556,-1.184806 h -6.91137 l 1.90885,-2.106324 z"
+     id="path2923"
+     inkscape:label="R"
+     style="fill:#0042b3;fill-opacity:0.69411767" /></g>
+<text
+   transform="scale(1,-1)"
+   style="font-style:normal;font-variant:normal;font-weight:600;font-stretch:normal;font-size:32.9113px;line-height:1;font-family:Montserrat;-inkscape-font-specification:'Montserrat Semi-Bold';letter-spacing:5.29875px;writing-mode:lr-tb;fill:#a28887;fill-opacity:0.980392;fill-rule:nonzero;stroke:none;stroke-width:1.03625"
+   id="text1705"
+   x="240.03029"
+   y="-52.473545"><tspan
+     x="240.03029"
+     y="-52.473545"
+     id="tspan1703"
+     style="fill:#a28887;fill-opacity:0.980392;stroke-width:1.03625" /></text></g></g></g></svg>
diff --git a/template/consortium.html.j2 b/template/consortium.html.j2
index 4a414771..7beacde4 100644
--- a/template/consortium.html.j2
+++ b/template/consortium.html.j2
@@ -4,12 +4,12 @@
 
   <article>
     <div class="row">
-      <h4 class="font-weight-bold pb-2 mb-4">Project</h4>
+      <h4 class="font-weight-bold pb-2 mb-4">NGI TALER</h4>
       {# <div class="col col-md-auto"></div> #}
       <!-- project intro -->
       <div class="col-md-11 col-md-4 mb-4 px-md-4">
         <p class="w-responsive mx-auto mb-3">
-          The TALER project is funded under Horizon Europe (Pilots for the Next Generation Internet)
+          The NGI TALER project is funded under Horizon Europe (Pilots for the Next Generation Internet)
           with the aim of bringing GNU Taler to market across Europe.
         </p>
         <p class="w-responsive mx-auto mb-3">
@@ -146,13 +146,14 @@
       <!-- consortium intro -->
       <div class="col-md-11 col-md-4 mb-4 px-md-4">
         <p class="w-responsive mx-auto mb-3">
-          The TALER consortium consists of 11 partners from 8 European countries (the Netherlands, Belgium, France,
+          The NGI TALER consortium consists of 11 partners from 8 European countries (the Netherlands, Belgium, France,
           Germany, Greece, Hungary, Luxembourg and Switzerland).
         </p>
         <p class="w-responsive mx-auto mb-3">
-          The consortium is diverse in terms of types of institutions, including research (TUE) and
-          applied science universities (BFH), small for-profit (CBG, TSYS, VV) and non-profit (PS) companies,
-          cooperative banks (GLS, MAG), a foundation (NLnet) and grassroots movements (ESEN, HODI).
+          The consortium is diverse in terms of types of institutions, including research (Eindhoven University of Technology) and
+          applied science universities (Berner Fachhochschule BFH), 
+          small for-profit (Code Blau GmbH, Taler Systems S.A., VisualVest) and non-profit (petites singularités) companies,
+          cooperative banks (GLS Bank, MagNet Bank), a foundation (Stichting NLnet) and grassroots movements (E-Seniors Association, Homo Digitalis).
         </p>
       </div>
     </div>
@@ -171,13 +172,13 @@
           {# <div class="card-note grey-text text-muted mt-3">{{ partner.contact }}</div> #}
           <div class="card-body h-100">
             <h5 class="card-title font-weight-bold grey-text">{{ partner.name }} </h5>
-            <p class="card-text grey-text text-muted word-wrap"> {{ partner.role }} </p>
+            <!-- <p class="card-text grey-text text-muted word-wrap"> {{ partner.role }} </p> -->
           </div>
-          <div class="card-footer">
+          <!-- <div class="card-footer">
             <p><small class="text-body-secondary dark-grey-text text-muted word-wrap">
                 <i>{{ partner.statement }}</i>
               </small></p>
-          </div>
+          </div> -->
         </div>
       </div>
       {% endfor %}
author	Stefan Kügel <skuegel@web.de>	2023-12-18 08:03:47 +0100
committer	Stefan Kügel <skuegel@web.de>	2023-12-18 08:03:47 +0100
commit	80fec5156b5a11b76b929ee7077407b6e60d58d1 (patch)
tree	a02ad72b8e2949716e646f87a5fd44f02a6730af
parent	427225425c87dd22dee37a18311c85ea0812eb68 (diff)
download	www-80fec5156b5a11b76b929ee7077407b6e60d58d1.tar.gz www-80fec5156b5a11b76b929ee7077407b6e60d58d1.tar.bz2 www-80fec5156b5a11b76b929ee7077407b6e60d58d1.zip