[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[taler-www] branch master updated (d1d0c60 -> 0c8112b)
|
From: |
gnunet |
|
Subject: |
[taler-www] branch master updated (d1d0c60 -> 0c8112b) |
|
Date: |
Tue, 28 Nov 2023 11:49:31 +0100 |
This is an automated email from the git hooks/post-receive script.
andreas-habegger pushed a change to branch master
in repository www.
from d1d0c60 [consortium] clarify statement of codeblau
new 90af89e Added more placeholder list items
new 5e7f198 HF: Feedback HK 1
new d9f8eee HF: Feedback HK 2
new 0c8112b HF: Feedback HK partly 6
The 4 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
common/footer-eu.j2.inc | 6 +-
properties.d/deliverables_eu-project.yml | 20 +++++
static/styles.css | 9 ++-
template/consortium.html.j2 | 133 ++++++++++++++++---------------
4 files changed, 100 insertions(+), 68 deletions(-)
diff --git a/common/footer-eu.j2.inc b/common/footer-eu.j2.inc
index fa7cb21..dd3ec7c 100644
--- a/common/footer-eu.j2.inc
+++ b/common/footer-eu.j2.inc
@@ -13,8 +13,10 @@
</div>
<div class="dark-grey-text container container-fluid">
<p class="text-muted w-responsive mx-auto mt-4">
+ <small>
Funded by the European Union. Views and opinions expressed are
however those of the author(s) only and do not necessarily reflect those of the
European Union or
[name of the granting authority]. Neither the European Union nor
the granting authority can be held responsible for them.
+ </small>
</p>
</div>
</div>
@@ -37,8 +39,8 @@
<img src={{
url_static('images/logo-SBFI_EU_Frameworkprogramme_E_hoch.svg') }}
class="img-fluid" width="70%" alt="" loading="lazy">
</div>
<div class="container container-fluid">
- <p class="dark-grey-text text-muted w-responsive mx-auto mt-2">
- This work has received funding from the Swiss State Secretariat
for Education, Research and Innovation (SERI).
+ <p class="dark-grey-text text-muted w-responsive mx-auto mt-4">
+ <small>This work has received funding from the Swiss State
Secretariat for Education, Research and Innovation (SERI).</small>
<p>
</div>
</div>
diff --git a/properties.d/deliverables_eu-project.yml
b/properties.d/deliverables_eu-project.yml
index f24d7aa..de010b3 100644
--- a/properties.d/deliverables_eu-project.yml
+++ b/properties.d/deliverables_eu-project.yml
@@ -14,6 +14,26 @@ deliverables:
url_pdf:
workpackage: WP 3
comment: TBD
+ - title: List group item heading
+ page:
+ url_pdf:
+ workpackage: WP 5
+ comment: Placeholder
+ - title: List group item heading
+ page:
+ url_pdf:
+ workpackage: WP 5
+ comment: Placeholder
+ - title: List group item heading
+ page:
+ url_pdf:
+ workpackage: WP 5
+ comment: Placeholder
+ - title: List group item heading
+ page:
+ url_pdf:
+ workpackage: WP 5
+ comment: Placeholder
- title: List group item heading
page:
url_pdf:
diff --git a/static/styles.css b/static/styles.css
index f75a50b..0790dc7 100644
--- a/static/styles.css
+++ b/static/styles.css
@@ -308,7 +308,7 @@ ul.timeline>li:before {
}
.consortium .list-group {
- max-height: 345px;
+ max-height: 400px;
margin-bottom: 10px;
overflow: scroll;
-webkit-overflow-scrolling: touch;
@@ -329,9 +329,16 @@ ul.timeline>li:before {
}
.announce .carousel {
+ margin-bottom: 10px;
padding: 0 70px;
}
+.announce .testimonial {
+ max-height: 100px;
+ min-height: 100px;
+ overflow: scroll;
+}
+
.announce .carousel .carousel-item {
color: #999;
font-size: 14px;
diff --git a/template/consortium.html.j2 b/template/consortium.html.j2
index bdbe7bc..edd68b6 100644
--- a/template/consortium.html.j2
+++ b/template/consortium.html.j2
@@ -17,9 +17,49 @@
};
</script>
#}
-
+
<div class="container consortium dark-grey-text">
+
+ <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">
+ <p class="w-responsive mx-auto mb-3">
+ {% trans %}
+ The TALER project is an initiative of Horizon Europe (Pilots for the
Next Generation Internet)
+ with the aim of bringing GNU Taler to market across Europe.
+ <br>
+ 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.
+ {% endtrans %}
+ </p>
+
+ <div class="accordion" id="accordionObjectives">
+ {% for objective in conf['objectives'] %}
+ <div class="accordion-item">
+ <h2 class="accordion-header" id="heading_{{ loop.index }}">
+ <button class="accordion-button collapsed" type="button"
data-bs-toggle="collapse"
+ data-bs-target="#collapse_{{ loop.index }}"
aria-expanded="false"
+ aria-controls="collapse_{{ loop.index }}">
+ Objective {{ loop.index }}: {{ objective.title }}
+ </button>
+ </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">
+ {{ objective.text }}
+ </div>
+ </div>
+ </div>
+ {% endfor %}
+ </div>
+ </div>
+ <div class="col col-md-auto"></div>
+ </div>
+
+
<div class="row">
<div class="col-md-6 mb-6">
<h4 class="font-weight-bold pb-2 mb-4">{{ _("Events")}}</h4>
@@ -39,27 +79,28 @@
<div {% if loop.first %} class="carousel-item active" {% else %}
class="carousel-item" {% endif %}
data-bs-interval="5000">
- <h5 class="summary">{{ item['titel'] }}</h5>
+ <h5 class="summary">{{ item['titel'] }}</h5>
<div class="img-box"> <img src="{{ url(
item['url_img']|default('images/logo-2021.svg', true) ) }}"
alt="">
</div>
<p class="description testimonial">
{{ item['teaser'] }}
</p>
- <p class="fas fa-calendar-alt"> To be held on
+ <p class="fas fa-calendar-alt"> To be held on
<span class="dtstart">
<abbr class="value" title="{{ item['date'] }}"> {{
item['date'] }}</abbr>
</span>
</p>
{% if item['url_ext'] is defined and item['url_ext'] and
item['url_ext'] != "" %}
- <p class="fa fa-globe"> <a target="_blank" href="{{
item['url_ext'] }}"> About</a></p>
+ <p class="fa fa-globe"> <a target="_blank" href="{{
item['url_ext'] }}"> About</a></p>
{% endif %}
{% if item['location'] is defined and item['location'] and
item['location'] != "" %}
- <p class="fas fa-map-marker-alt"> Location: <span
class="location">{{ item['location'] }}</span></p>
+ <p class="fas fa-map-marker-alt"> Location: <span
class="location">{{ item['location'] }}</span></p>
{% endif %}
<p class="fa fa-user"> <b>{{ item['speaker'] }}</b></p>
{% if item['email'] is defined and item['email'] and
item['email'] != "" %}
- <p class="fas fa-envelope"> <a href="mailto:{{ item['email']
}}?subject={{ item['titel'] }}"><span class="dark-grey-text">
Contact</span></a></p>
+ <p class="fas fa-envelope"> <a href="mailto:{{ item['email']
}}?subject={{ item['titel'] }}"><span
+ class="dark-grey-text"> Contact</span></a></p>
{% endif %}
</div>
@@ -73,72 +114,34 @@
<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') %}
{% if item['url_pdf'] is defined and item['url_pdf'] and
item['url_pdf'] != "" %}
<a href="{{ url(item['url_pdf']) }}" class="list-group-item
list-group-item-action">
- {% set ns.symbol = 'images/pdf.svg' %}
- {% elif item['page'] is defined and item['page'] and item['page'] !=
"" %}
- <a href="{{ url(item['page']) }}" class="list-group-item
list-group-item-action">
- {% set ns.symbol = 'images/html.svg' %}
- {% else %}
- <a href="#" class="list-group-item list-group-item-action">
- {% endif %}
- <div class="d-flex w-100 justify-content-between">
- <h5 class="mb-1"><img border=0 alt="" width=24 height=24 src="{{
url_static(ns.symbol) }}"> {{ item['title'] }}</h5>
- <small>{{ item['workpackage'] }}</small>
- </div>
- {% if item['comment'] is defined and item['comment'] and
item['comment'] != "" %}
- <p class="mb-1">{{ item['comment'] }}</p>
- {% endif %}
- </a>
- {% endfor %}
+ {% set ns.symbol = 'images/pdf.svg' %}
+ {% elif item['page'] is defined and item['page'] and item['page']
!= "" %}
+ <a href="{{ url(item['page']) }}" class="list-group-item
list-group-item-action">
+ {% set ns.symbol = 'images/html.svg' %}
+ {% else %}
+ <a href="#" class="list-group-item list-group-item-action">
+ {% endif %}
+ <div class="d-flex w-100 justify-content-between">
+ <h5 class="mb-1"><img border=0 alt="" width=24 height=24
src="{{ url_static(ns.symbol) }}"> {{
+ item['title'] }}</h5>
+ <small>{{ item['workpackage'] }}</small>
+ </div>
+ {% if item['comment'] is defined and item['comment'] and
item['comment'] != "" %}
+ <p class="mb-1">{{ item['comment'] }}</p>
+ {% endif %}
+ </a>
+ {% endfor %}
</div>
{% endif %}
<div class="col cold-md-auto"></div>
</div>
-
- <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">
- <p class="text-muted w-responsive mx-auto mb-3">
- {% trans %}
- The TALER project is an initiative of Horizon Europe (Pilots for
the Next Generation Internet)
- with the aim of bringing GNU Taler to market across Europe.
- <br>
- 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.
- {% endtrans %}
- </p>
-
- <div class="accordion" id="accordionObjectives">
- {% for objective in conf['objectives'] %}
- <div class="accordion-item">
- <h2 class="accordion-header" id="heading_{{ loop.index }}">
- <button class="accordion-button collapsed" type="button"
data-bs-toggle="collapse"
- data-bs-target="#collapse_{{ loop.index }}"
aria-expanded="false"
- aria-controls="collapse_{{ loop.index }}">
- Objective {{ loop.index }}: {{ objective.title }}
- </button>
- </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">
- {{ objective.text }}
- </div>
- </div>
- </div>
- {% endfor %}
- </div>
- </div>
- <div class="col col-md-auto"></div>
- </div>
-
<div class="row">
<h4 class="font-weight-bold pb-2 mb-4">{{ _("Partners")}}</h4>
</div>
@@ -147,13 +150,13 @@
<div class="col col-md-auto"></div>
<div class="col-md-11">
- <p class="text-muted w-responsive mx-auto mb-3">
+ <p class="w-responsive mx-auto mb-3">
{% trans %}
The TALER consortium consists of 11 partners from 8 European
countries (the Netherlands,
Belgium, France, Germany, Greece, Hungary, Luxembourg and
Switzerland).
{% endtrans %}
</p>
- <p class="text-muted w-responsive mx-auto mb-3">
+ <p class="w-responsive mx-auto mb-3">
{% trans %}
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,
@@ -195,4 +198,4 @@
</div>
</main>
-{% endblock body_content %}
+{% endblock body_content %}
\ No newline at end of file
--
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.
- [taler-www] branch master updated (d1d0c60 -> 0c8112b),
gnunet <=