🔀 merge pull request 'v1.2.0' (#81) from dev into main
Reviewed-on: #81
This commit is contained in:
commit
356094a404
2
meta.php
2
meta.php
|
|
@ -1,6 +1,6 @@
|
||||||
<?php
|
<?php
|
||||||
// VERSION //
|
// VERSION //
|
||||||
static::$version = "1.1.12";
|
static::$version = "1.2.0";
|
||||||
|
|
||||||
|
|
||||||
// DEPENDENCIES //
|
// DEPENDENCIES //
|
||||||
|
|
|
||||||
|
|
@ -322,45 +322,24 @@
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div id="lesung-2" class="item next">
|
<div id="lesung-2" class="item"></div>
|
||||||
<div class="connector">
|
<div id="lesung-3" class="item"></div>
|
||||||
<span class="waypoint ti ti-podium"></span>
|
<div id="lesung-2-3" class="item next">
|
||||||
</div>
|
|
||||||
<div class="box">
|
|
||||||
<?php
|
|
||||||
$timeline_date = $dict->get("timeline_lesung_2_date");
|
|
||||||
if($timeline_date !== null){
|
|
||||||
?>
|
|
||||||
<span class="extra"><i class="ti ti-calendar"></i><?= $timeline_date ?></span>
|
|
||||||
<?php } ?>
|
|
||||||
|
|
||||||
<span class="title"><button class="copylink ti ti-link"></button><?= $dict->get("timeline_lesung_2_title") ?></span>
|
|
||||||
|
|
||||||
<?php
|
|
||||||
$timeline_lesung_2_text = $dict->get("timeline_lesung_2_text");
|
|
||||||
foreach($timeline_lesung_2_text as $one_timeline_lesung_2_text_line){
|
|
||||||
echo("<span>" . $one_timeline_lesung_2_text_line . "</span>");
|
|
||||||
}
|
|
||||||
?>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div id="lesung-3" class="item">
|
|
||||||
<div class="connector">
|
<div class="connector">
|
||||||
<span class="waypoint ti ti-hand-stop"></span>
|
<span class="waypoint ti ti-hand-stop"></span>
|
||||||
</div>
|
</div>
|
||||||
<div class="box">
|
<div class="box">
|
||||||
<?php
|
<?php
|
||||||
$timeline_date = $dict->get("timeline_lesung_3_date");
|
$timeline_date = $dict->get("timeline_lesung_2_3_date");
|
||||||
if($timeline_date !== null){
|
if($timeline_date !== null){
|
||||||
?>
|
?>
|
||||||
<span class="extra"><i class="ti ti-calendar"></i><?= $timeline_date ?></span>
|
<span class="extra"><i class="ti ti-calendar"></i><?= $timeline_date ?></span>
|
||||||
<?php } ?>
|
<?php } ?>
|
||||||
|
|
||||||
<span class="title"><button class="copylink ti ti-link"></button><?= $dict->get("timeline_lesung_3_title") ?></span>
|
<span class="title"><button class="copylink ti ti-link"></button><?= $dict->get("timeline_lesung_2_3_title") ?></span>
|
||||||
|
|
||||||
<?php
|
<?php
|
||||||
$timeline_lesung_3_text = $dict->get("timeline_lesung_3_text");
|
$timeline_lesung_3_text = $dict->get("timeline_lesung_2_3_text");
|
||||||
foreach($timeline_lesung_3_text as $one_timeline_lesung_3_text_line){
|
foreach($timeline_lesung_3_text as $one_timeline_lesung_3_text_line){
|
||||||
echo("<span>" . $one_timeline_lesung_3_text_line . "</span>");
|
echo("<span>" . $one_timeline_lesung_3_text_line . "</span>");
|
||||||
}
|
}
|
||||||
|
|
@ -485,6 +464,27 @@
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
<div id="recommendations" class="section">
|
||||||
|
<div class="header">
|
||||||
|
<span class="icon ti ti-comet"></span>
|
||||||
|
<span class="text"><?= $dict->get("recommendations_title") ?></span>
|
||||||
|
<button class="copylink ti ti-link"></button>
|
||||||
|
</div>
|
||||||
|
<div class="content">
|
||||||
|
<div class="card-list">
|
||||||
|
<a href="https://pstg45b.de" class="card">
|
||||||
|
<img src="<?= File::file("../sbgg.jetzt-proprietary-assets/asset/pstg45bde.png") ?>" />
|
||||||
|
<div class="text">
|
||||||
|
<span class="title"><?= $dict->get("recommendations_pstg45bde_title") ?></span>
|
||||||
|
<span class="description"><?= $dict->get("recommendations_pstg45bde_description") ?></span>
|
||||||
|
</div>
|
||||||
|
</a>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<span class="note inline gray"><?= $dict->get("recommendations_note") ?></span>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
<div id="about" class="section">
|
<div id="about" class="section">
|
||||||
<div class="header">
|
<div class="header">
|
||||||
<span class="icon ti ti-heart"></span>
|
<span class="icon ti ti-heart"></span>
|
||||||
|
|
|
||||||
|
|
@ -603,6 +603,64 @@ a.box:hover {
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
/* SECTION: RECOMMENDATIONS */
|
||||||
|
.card-list {
|
||||||
|
display: flex;
|
||||||
|
flex-direction: row;
|
||||||
|
flex-wrap: wrap;
|
||||||
|
justify-content: space-evenly;
|
||||||
|
align-items: stretch;
|
||||||
|
gap: 1rem;
|
||||||
|
}
|
||||||
|
|
||||||
|
.card-list .card {
|
||||||
|
flex-basis: calc(50% - 0.5rem);
|
||||||
|
flex-grow: 1;
|
||||||
|
|
||||||
|
display: flex;
|
||||||
|
flex-direction: row;
|
||||||
|
flex-wrap: nowrap;
|
||||||
|
gap: 1rem;
|
||||||
|
|
||||||
|
max-width: 32rem;
|
||||||
|
padding: 1rem;
|
||||||
|
|
||||||
|
border-radius: 2rem;
|
||||||
|
background-color: var(--color-bg-light);
|
||||||
|
}
|
||||||
|
|
||||||
|
.card-list .card img {
|
||||||
|
align-self: center;
|
||||||
|
|
||||||
|
width: 4rem;
|
||||||
|
}
|
||||||
|
|
||||||
|
.card-list .card .text {
|
||||||
|
align-self: flex-start;
|
||||||
|
|
||||||
|
display: flex;
|
||||||
|
flex-direction: column;
|
||||||
|
flex-wrap: nowrap;
|
||||||
|
align-items: stretch;
|
||||||
|
gap: 0.5rem;
|
||||||
|
|
||||||
|
text-align: left;
|
||||||
|
}
|
||||||
|
.card-list .card .text .title {
|
||||||
|
color: var(--color-white);
|
||||||
|
font-weight: bold;
|
||||||
|
}
|
||||||
|
.card-list .card:hover .text .title {
|
||||||
|
text-decoration: underline;
|
||||||
|
}
|
||||||
|
.card-list .card .text .description {
|
||||||
|
color: var(--color-gray);
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
/* COPYLINKS */
|
/* COPYLINKS */
|
||||||
.copylink {
|
.copylink {
|
||||||
position: absolute;
|
position: absolute;
|
||||||
|
|
|
||||||
|
|
@ -278,50 +278,23 @@
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
"timeline_lesung_2_date" => [
|
"timeline_lesung_2_3_date" => [
|
||||||
"de" => null,
|
"de" => "12 Apr 2024, 13:10",
|
||||||
"en" => null
|
"en" => "12 Apr 2024, 13:10"
|
||||||
],
|
],
|
||||||
"timeline_lesung_2_title" => [
|
"timeline_lesung_2_3_title" => [
|
||||||
"de" => "2. Lesung",
|
"de" => "2. und 3. Lesung mit Schlussabstimmung",
|
||||||
"en" => "2nd Reading"
|
"en" => "2nd and 3rd Reading with Final Vote"
|
||||||
],
|
],
|
||||||
"timeline_lesung_2_text" => [
|
"timeline_lesung_2_3_text" => [
|
||||||
"de" => [
|
"de" => [
|
||||||
"Die zweite Lesung im Bundestag diskutiert die Ergebnisse der Ausschüsse. Einzelne Abgeordnete können Änderungen beantragen.",
|
"Wie auch hier, werden die Lesungen 2 und 3 oft zusammengelegt. Die zweite Lesung im Bundestag diskutiert die Ergebnisse der Ausschüsse. Einzelne Abgeordnete können Änderungen beantragen. Am Ende der dritten Lesung wird abschließend über das Gesetz abgestimmt."
|
||||||
"<span class=\"inline gray\">Hinweis: In der Tagesordnung des Deutschen Bundestags ist derzeit noch kein Termin für die zweite Lesung angesetzt. Nächste Sitzungswoche: ab 10 Apr 2024 (Stand: 02 Apr 2024)</span>"
|
|
||||||
],
|
],
|
||||||
"en" => [
|
"en" => [
|
||||||
"The second reading in the <i>Bundestag</i> (Parliament) discusses the results of the committees. Individual members of the Bundestag can request changes.",
|
"As seen here, reading 2 and 3 are often combined. The second reading in the <i>Bundestag</i> (Parliament) discusses the results of the committees. Individual members of the Bundestag can request changes. At the end of the third reading, a final vote is taken on the law."
|
||||||
"<span class=\"inline gray\">Note: The agenda of the <i>Bundestag</i> (Parliament) does currently not contain an appointment for the second reading. Next session week: from 10 Apr 2024 (As of 02 Apr 2024)</span>"
|
|
||||||
]
|
]
|
||||||
],
|
],
|
||||||
"timeline_lesung_2_button" => [
|
"timeline_lesung_2_3_button" => [
|
||||||
"de" => "",
|
|
||||||
"en" => ""
|
|
||||||
],
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
"timeline_lesung_3_date" => [
|
|
||||||
"de" => null,
|
|
||||||
"en" => null
|
|
||||||
],
|
|
||||||
"timeline_lesung_3_title" => [
|
|
||||||
"de" => "3. Lesung mit Schlussabstimmung",
|
|
||||||
"en" => "3rd Reading and Final Vote"
|
|
||||||
],
|
|
||||||
"timeline_lesung_3_text" => [
|
|
||||||
"de" => [
|
|
||||||
"Am Ende der dritten Lesung wird abschließend über das Gesetz abgestimmt."
|
|
||||||
],
|
|
||||||
"en" => [
|
|
||||||
"At the end of the third reading, a final vote is taken on the law."
|
|
||||||
]
|
|
||||||
],
|
|
||||||
"timeline_lesung_3_button" => [
|
|
||||||
"de" => "",
|
"de" => "",
|
||||||
"en" => ""
|
"en" => ""
|
||||||
],
|
],
|
||||||
|
|
@ -359,7 +332,7 @@
|
||||||
|
|
||||||
"news_title" => [
|
"news_title" => [
|
||||||
"de" => "Bleib auf dem Laufenden",
|
"de" => "Bleib auf dem Laufenden",
|
||||||
"en" => "Stay up to date"
|
"en" => "Stay up to Date"
|
||||||
],
|
],
|
||||||
|
|
||||||
"news_newsletter_title" => [
|
"news_newsletter_title" => [
|
||||||
|
|
@ -404,6 +377,28 @@
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
"recommendations_title" => [
|
||||||
|
"de" => "Das Könnte Dich auch Interessieren",
|
||||||
|
"en" => "You Might also Like This"
|
||||||
|
],
|
||||||
|
"recommendations_note" => [
|
||||||
|
"de" => "Bei obigen Empfehlungen handelt es sich um Projekte mit Bezug auf das Thema Trans*, bei denen ich entweder selbst mitwirke oder mit deren Betreiber*innen ich in engem Austausch stehe.",
|
||||||
|
"en" => "The recommendations above are projects related to the topic of trans*, in which I either participate myself or whose operators I am in close contact with."
|
||||||
|
],
|
||||||
|
|
||||||
|
"recommendations_pstg45bde_title" => [
|
||||||
|
"de" => "pstg45b.de",
|
||||||
|
"en" => "pstg45b.de"
|
||||||
|
],
|
||||||
|
"recommendations_pstg45bde_description" => [
|
||||||
|
"de" => "Informationsseite zum Personenstandsgesetz § 45b",
|
||||||
|
"en" => "Information page on the <i>Personenstandsgesetz</i> (civil status law) § 45b"
|
||||||
|
],
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
"about_title" => [
|
"about_title" => [
|
||||||
"de" => "Über diese Webseite",
|
"de" => "Über diese Webseite",
|
||||||
"en" => "About this Website"
|
"en" => "About this Website"
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue