diff options
| author | Andreas HABEGGER <andreas.habegger@bfh.ch> | 2023-11-30 23:25:31 +0100 |
|---|---|---|
| committer | Andreas HABEGGER <andreas.habegger@bfh.ch> | 2023-11-30 23:25:31 +0100 |
| commit | c87a3365fa14b72fea9d1a2db4a287ec999a5502 (patch) | |
| tree | 079848e58f3db3d48d019e08c515e65a8eea4431 | |
| parent | 7f451c02d448c58e4bca7b074fc89eccb5d07b98 (diff) | |
| download | www-c87a3365fa14b72fea9d1a2db4a287ec999a5502.tar.gz www-c87a3365fa14b72fea9d1a2db4a287ec999a5502.tar.bz2 www-c87a3365fa14b72fea9d1a2db4a287ec999a5502.zip | |
UC: Semantic clean-up -- feedback 9, 10, 12 from hk; WIP
| -rw-r--r-- | common/consortium.j2 | 25 | ||||
| -rw-r--r-- | common/header.j2.inc | 6 | ||||
| -rw-r--r-- | properties.d/events_eu-project.yml | 18 | ||||
| -rw-r--r-- | properties.d/partners.yml | 18 | ||||
| -rw-r--r-- | template/consortium.html.j2 | 137 |
5 files changed, 90 insertions, 114 deletions
diff --git a/common/consortium.j2 b/common/consortium.j2 index 3387828a..4c6c5686 100644 --- a/common/consortium.j2 +++ b/common/consortium.j2 @@ -1,24 +1,23 @@ <!DOCTYPE html> <html lang="{{ lang }}"> <head> - {# TODO Fix meta data based on EU TALER Consortium requirements #} <meta charset="UTF-8"/> - <title>{{ _("GNU 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"> - <link rel="icon" type="image/png" href="{{ url_static('images/android-chrome-512x512.png') }}" sizes="512x512"> - <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="GNU Taler - Taxable Anonymous Libre Electronic Reserves" /> + <title>{{ _("GNU Taler") }} Horizon Project</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" /> + <link rel="icon" type="image/png" href="{{ url_static('images/android-chrome-512x512.png') }}" sizes="512x512" /> + <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="The EUROTALER funded by Horizon Europe and SBFI." /> <meta property="og:type" content="website" /> - <meta property="og:url" content="{{ url_localized('index.html') }}" /> + <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') }}" /> - {# TODO Fix description #} - <meta name="description" content="{{ _('A payment system that makes privacy-friendly online transactions fast and easy.') }}" /> + <meta name="description" content="{{ _('The EUROTALER consortium, funded by Horizon Europe and SBFI, aims to bring the 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" %} {% block head_content %}{% endblock %} diff --git a/common/header.j2.inc b/common/header.j2.inc index 00ed5fd4..f8d797e9 100644 --- a/common/header.j2.inc +++ b/common/header.j2.inc @@ -54,12 +54,12 @@ <!-- Custom styles for this template --> <link href="{{ url_static('styles.css') }}" rel="stylesheet"> - <script src="{{ url_dist('bootstrap/bootstrap.bundle.min.js') }}"></script> + <script defer src="{{ url_dist('bootstrap/bootstrap.bundle.min.js') }}"></script> <!-- HTML5 shim and Respond.js for IE8 support of HTML5 elements and media queries --> <!--[if lt IE 9]> - <script src="https://oss.maxcdn.com/html5shiv/3.7.2/html5shiv.min.js"></script> - <script src="https://oss.maxcdn.com/respond/1.4.2/respond.min.js"></script> + <script defer src="https://oss.maxcdn.com/html5shiv/3.7.2/html5shiv.min.js"></script> + <script defer src="https://oss.maxcdn.com/respond/1.4.2/respond.min.js"></script> <![endif]--> <link rel="alternate" type="application/rss+xml" title="Taler.net rss" href="{{ url_localized('rss.xml') }}"> diff --git a/properties.d/events_eu-project.yml b/properties.d/events_eu-project.yml index bd8cd4e1..d0a46b81 100644 --- a/properties.d/events_eu-project.yml +++ b/properties.d/events_eu-project.yml @@ -10,15 +10,6 @@ # email: events: - - date: 2024-06-01 - title: Carving a way out of surveillance capitalism - url_img: images/9-competition.svg - url_ext: https://www.tedxgeneva.net/ - url_html: - teaser: TEDx Geneva talk with a contribution by Marie Walrafen - location: IFRC, Chem. des Crêts 17, 1209 Geneva, Switzerland - speaker: Marie Walrafen - email: mw'AT'taler.net - date: 2023-12-08 title: Introduction to GNU Taler (lecture) url_img: images/TalerDiagram.svg @@ -37,3 +28,12 @@ events: location: Freedom of the Internet Meetup, 網路自由小聚, Taipei City, Taiwan speaker: Christian Grothoff email: cg'AT'taler.net + - date: 2024-06-01 + title: Carving a way out of surveillance capitalism + url_img: images/9-competition.svg + url_ext: https://www.tedxgeneva.net/ + url_html: + teaser: TEDx Geneva talk with a contribution by Marie Walrafen + location: IFRC, Chem. des Crêts 17, 1209 Geneva, Switzerland + speaker: Marie Walrafen + email: mw'AT'taler.net diff --git a/properties.d/partners.yml b/properties.d/partners.yml index 03e23cd6..0baeb640 100644 --- a/properties.d/partners.yml +++ b/properties.d/partners.yml @@ -3,7 +3,7 @@ partners: name: "Eindhoven University of Technology" contact: "" logo: images/logo-tue.svg - url: "https://www.tue.nl/" + url: https://www.tue.nl role: "The team of Eindhoven University of Technology consists of Kathrin Hövelmanns, Andreas Hülsing, Tanja Lange, and Heloise Vieira. They coordinate the consortium and their work focuses on research and applications of cryptology." statement: "" @@ -20,7 +20,7 @@ partners: name: "Taler Systems SA" contact: "Dr. Florian Dold" logo: images/logo-TalerSystems.svg - url: https://taler-systems.com/ + url: https://taler-systems.com role: "Taler Systems SA will sustain the development of the core GNU Taler technology and assist all partners with their respective integration efforts." statement: "This consortium offers the perfect opportunity to widely deploy GNU Taler @@ -37,7 +37,7 @@ partners: name: "MagNet Bank" contact: "-- TBD --" logo: images/logo-MagNetBank.svg - url: https://www.magnetbank.hu/ + url: https://www.magnetbank.hu role: "-- TBD --" statement: "-- TBD --" - id: CBG @@ -55,14 +55,14 @@ partners: name: "Visual Vest" contact: "-- TBD --" logo: images/logo-visualvest.svg - url: https://www.visualvest.de/ - role: "" - statement: "" + url: https://www.visualvest.de + role: "-- TBD --" + statement: "-- TBD --" - id: HODI name: "Homo Digitalis" contact: "Eleftherios Chelioudakis" logo: images/logo-HomoDigitalis.svg - url: https://www.homodigitalis.gr/ + url: https://www.homodigitalis.gr role: "Homo Digitalis is a Greek Civil Society Organization that focuses on the protection and promotion of human rights in the digital age, member of the EDRi network." statement: "Homo Digitalis, as a digital rights CSO, is extremely excited to participate in this project, working shoulder to shoulder with an amazing group of stakeholders @@ -86,13 +86,13 @@ partners: name: "E-Seniors Association" contact: "-- TBD --" logo: images/logo-esen.svg - url: 'https://www.eseniors.eu/' + url: https://www.eseniors.eu role: "ESEN fights e-exclusion by offering ICT training to seniors (people aged 55 and over) to bridge the digital gap between generations and foster seniors’ social participation." statement: "ESEN’s main focus is on representing end-users and ensuring that technical solutions meet the needs of end-users, especially senior citizens." - id: NLnet name: "Stichting NLnet" contact: "-- TBD --" logo: images/logo-nlnet.svg - url: https://nlnet.nl/ + url: https://nlnet.nl role: "-- TBD --" statement: "-- TBD --" diff --git a/template/consortium.html.j2 b/template/consortium.html.j2 index d2330d06..084acb13 100644 --- a/template/consortium.html.j2 +++ b/template/consortium.html.j2 @@ -1,41 +1,21 @@ {% extends "common/consortium.j2" %} {% block body_content %} -<main id="maincontent"> - - {# - <script> - window.onload = function () { - var span = document.createElement('span'); - - span.className = 'fas'; - span.style.display = 'none'; - document.body.insertBefore(span, document.body.firstChild); - - alert(window.getComputedStyle(span, null).getPropertyValue('font-family')); - - document.body.removeChild(span); - }; - </script> - #} - - <div class="container consortium dark-grey-text"> - +<main id="maincontent" class="container consortium dark-grey-text"> + <article> <div class="row"> <h4 class="font-weight-bold pb-2 mb-4">{{ _("Project")}}</h4> - <div class="col col-md-auto"></div> - - <div class="col-md-11 col-md-4 mb-4"> + {# <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) with the aim of bringing GNU Taler to market across Europe. - <br> + </p> + <p class="w-responsive mx-auto mb-3"> To make GNU Taler accessible to European citizens, we need a commercially viable use of the GNU Taler technology. We will achieve this through the four key project objectives. - </p> - <div class="accordion" id="accordionObjectives"> {% for objective in conf['objectives'] %} <div class="accordion-item"> @@ -48,21 +28,24 @@ </h2> <div id="collapse_{{ loop.index }}" class="accordion-collapse collapse" aria-labelledby="heading_{{ loop.index }}" data-bs-parent="#accordionObjectives"> - <div class="accordion-body text-muted w-responsive"> + <p class="accordion-body text-muted w-responsive"> {{ objective.text }} - </div> + </p> </div> </div> {% endfor %} </div> </div> - <div class="col col-md-auto"></div> </div> + </article> + + <article> <div class="row"> <div class="col-md-6 mb-6"> <h4 class="font-weight-bold pb-2 mb-4">{{ _("Events")}}</h4> + <!-- events carousel --> <div class="container announce"> <div id="AnnouncCarousel" class="carousel slide" data-bs-ride="carousel"> <!-- Carousel indicators --> @@ -110,12 +93,12 @@ </div> </div> - <div class="col-md-1 mb-1"></div> {# DEPRECATED DELIVERABLES + <!-- deliverables --> <div class="col-md-4 mb-4"> {% if conf['deliverables'] is defined and conf['deliverables'] and conf['deliverables'] != "" %} <h4 class="font-weight-bold pb-2 mb-4">{{ _("Deliverables")}}</h4> - <div class="list-group " > + <div class="list-group "> {% for item in conf['deliverables'] %} {% set ns = namespace(symbol='images/file-cancel.svg') %} @@ -140,64 +123,58 @@ {% endfor %} </div> {% endif %} - <div class="col cold-md-auto"></div> </div> #} + </div> + </article> - <div class="row"> - <h4 class="font-weight-bold pb-2 mb-4">{{ _("Partners")}}</h4> - </div> - - <div class="row mb-4"> - <div class="col col-md-auto"></div> - - <div class="col-md-11"> - <p class="w-responsive mx-auto mb-3"> - - The 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). - - </p> + <article> + <div class="row"> + <h4 class="font-weight-bold pb-2 mb-4">{{ _("Partners")}}</h4> + </div> - </div> - <div class="col col-md-auto"></div> + <div class="row mb-4"> + <!-- 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, + 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). + </p> </div> + </div> - <div class="row row-cols-1 row-cols-md-3 g-4 text-center"> - <!-- start --> - - {% for partner in conf['partners'] %} - - <div class="col"> - <div class="card border-0 h-100"> - <a href="{{ partner.url }}" target="_blank" rel="noopener noreferrer"> - <img src="{{ url(partner.logo) }}" height="180" class="card-header rounded-circle z-depth-3" - alt="{{ partner.id + ' avatar'}}"> - </a> - <!-- <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> - </div> - <div class="card-footer"> - <small class="text-body-secondary dark-grey-text text-muted word-wrap"><i> {{ partner.statement }} - </i></small> - </div> + <div class="row row-cols-1 row-cols-md-3 g-4 text-center"> + <!-- consortium board --> + + {% for partner in conf['partners'] %} + <div class="col"> + <div class="card border-0 h-100"> + <a href="{{ partner.url }}" target="_blank" rel="noopener noreferrer"> + <img src="{{ url(partner.logo) }}" height="180" class="card-header rounded-circle z-depth-3" + alt="{{ partner.id + ' avatar'}}"> + </a> + {# <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> + </div> + <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> - - {% endfor %} </div> + {% endfor %} + </div> + </article> - </div> </main> -{% endblock body_content %} +{% endblock body_content %}
\ No newline at end of file |