kimendisch/sbgg.jetzt
kimendisch/sbgg.jetzt
1
3
Fork 1
Code Issues 1 Pull Requests Projects Activity

🔀 merge pull request 'v1.3.1' (#125) from dev into main

Browse Source 
Reviewed-on: #125
This commit is contained in:
DrMaxNix 2024-07-30 22:53:35 +02:00
commit 07574ca875
9 changed files with 87 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
meta.php
View File

@ -1,6 +1,6 @@
<?php
// VERSION //
static::$version = "1.3.0";
static::$version = "1.3.1";
// DEPENDENCIES //

59
page/accordion.js
View File

@ -16,9 +16,16 @@ window.addEventListener("load", function(event){
// collect this view
let accordion_view = accordion_collect_view(one_accordion_root);
accordion_view_list.push(accordion_view);
// initialized this view
accordion_init(accordion_view);
}
// HANDLE STATE CHANGE BY URL //
accordion_open_from_url_hash();
// INITIALIZE VIEWS //
for(let one_accordion of accordion_view_list){
accordion_init(one_accordion);
}
});
@ -206,3 +213,49 @@ function accordion_state_set(item, state){
function accordion_body_resize(bodyContainer){
bodyContainer.style.maxHeight = bodyContainer.scrollHeight + "px";
}
/**
* HELPER: Maybe open a accordion item that is referenced in url.
*/
function accordion_open_from_url_hash(){
// FIND REFERENCED ITEM ELEMENT //
// get its id
let hash = window.location.hash;
if(hash.length < 2 || !hash.startsWith("#")) return;
let openId = hash.substring(1);
// find item element
let itemElement = document.getElementById(openId);
if(itemElement === null) return;
// maybe unwrap
if(itemElement.classList.contains("wrapper")) itemElement = itemElement.children[0] ?? null;
if(itemElement === null) return;
// SET TO OPEN //
// find item in list of accordion views
let foundAccordion = null;
let foundItem = null;
findLoop:
for(let one_accordion of accordion_view_list){
for(let one_item of one_accordion.item_list){
if(one_item.element === itemElement){
foundAccordion = one_accordion;
foundItem = one_item;
break findLoop;
}
}
}
if(foundAccordion === null || foundItem === null) return;
// close all items in this accordion
for(let one_item of foundAccordion.item_list){
accordion_state_set(one_item, false);
}
// set state to open
accordion_state_set(foundItem, true);
}

2
page/admin/login/index.php
View File

@ -53,7 +53,7 @@
<div class="description">
<span>This page needs cookies to function correctly.</span>
<span>Cookies are only used for required purposes.</span>
<span>You can read more about this in our <a href="<?= $dict->get("link_privacy_policy") ?>" target="_blank"><?= $dict->get("text_privacy_policy") ?> <i class="ti ti-external-link"></i></a>.</span>
<span>You can read more about this in our <a href="<?= $dict->get("link_privacy_policy") ?>"><?= $dict->get("text_privacy_policy") ?></a>.</span>
</div>
<div class="button-list">

18
page/footer_strings.php
View File

@ -7,23 +7,5 @@
"de" => "Quellcode",
"en" => "Source Code",
],
"text_imprint" => [
"de" => "Impressum",
"en" => "Imprint",
],
"link_imprint" => [
"de" => "/impressum",
"en" => "/imprint",
],
"text_privacy_policy" => [
"de" => "Datenschutz&shy;erklärung",
"en" => "Privacy Policy",
],
"link_privacy_policy" => [
"de" => "/datenschutz",
"en" => "/privacy",
],
]);
?>

4
page/start/countdown.js
View File

@ -31,8 +31,8 @@ async function countdown_redraw(){
let hours_raw = Math.floor((difference - (days_raw * 86400000)) / (3600000));
let hours = (hours_raw < 10 ? ("0" + hours_raw) : hours_raw);
// minutes
let minutes_raw = Math.floor((difference - (days_raw * 86400000) - (hours_raw * 3600000)) / (60000));
// minutes (NOTE: As this is the last unit, we use `ceil` here)
let minutes_raw = Math.ceil((difference - (days_raw * 86400000) - (hours_raw * 3600000)) / (60000));
let minutes = (minutes_raw < 10 ? ("0" + minutes_raw) : minutes_raw);

2
page/start/index.php
View File

@ -469,7 +469,7 @@
<span class="icon ti ti-mail"></span>
<span class="text"><?= $dict->get("about_button_mail") ?></span>
</a>
<a href="https://kimendisch.de" class="button">
<a href="https://kimendisch.de" target="_blank" class="button">
<span class="icon ti ti-home"></span>
<span class="text"><?= $dict->get("about_button_website") ?></span>
</a>

4
page/start/strings.php
View File

@ -627,12 +627,12 @@
"de" => [
"Deine Mail-Adresse wird ausschließlich zum Versenden des Newsletters verwendet und zu keinem Zeitpunkt an Dritte weitergegeben.",
"Du kannst Dich jederzeit über einen Link in den E-Mails wieder abmelden.",
"Mehr zum Thema Datenschutz erfährst Du in unserer <a href=\"/datenschutz\" target=\"_blank\">Datenschutzerklärung <i class=\"ti ti-external-link\"></i></a>.",
"Mehr zum Thema Datenschutz erfährst Du in unserer <a href=\"/datenschutz\" target=\"_blank\">Datenschutzerklärung</a>.",
],
"en" => [
"Your mail address is exclusively being used for the delivery of the newsletter and never being forwarded to third parties.",
"You can unsubscribe at any time via a link in the newsletter mails.",
"More about data privacy can be found in our <a href=\"/privacy\" target=\"_blank\">Privacy Policy <i class=\"ti ti-external-link\"></i></a>.",
"More about data privacy can be found in our <a href=\"/privacy\" target=\"_blank\">Privacy Policy</a>.",
],
],

20
page/strings.php
View File

@ -11,5 +11,25 @@
"de" => "Alle Infos zum Selbstbestimmungsgesetz an einem Ort",
"en" => "Everything about the German Self-Determination Law in one place",
],
"text_imprint" => [
"de" => "Impressum",
"en" => "Imprint",
],
"link_imprint" => [
"de" => "/impressum",
"en" => "/imprint",
],
"text_privacy_policy" => [
"de" => "Datenschutz&shy;erklärung",
"en" => "Privacy Policy",
],
"link_privacy_policy" => [
"de" => "/datenschutz",
"en" => "/privacy",
],
]);
?>

8
page/timeline/strings.php
View File

@ -277,19 +277,19 @@
"timeline_lesung_2_3_text" => [
"de" => [
"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.",
"Verglichen mit dem Regierungsentwurf enthält die <a href=\"https://web.archive.org/web/20240412195016/https://dserver.bundestag.de/btd/20/110/2011004.pdf\" class=\"link\">Beschlussempfehlung des Familienausschusses</a> nur kleine Änderungen; So müssen Kinder ab einem Alter von 5 Jahren im Fall einer Personenstandsänderung zustimmen und die Eltern von Minderjährigen müssen bestätigen, dass sie sich beraten haben lassen. Zudem wurde die Weitergabe von persönlichen Daten an Sicherheitsbehörden gestrichen.",
"Verglichen mit dem Regierungsentwurf enthält die <a href=\"https://web.archive.org/web/20240412195016/https://dserver.bundestag.de/btd/20/110/2011004.pdf\" target=\"_blank\" class=\"link\">Beschlussempfehlung des Familienausschusses <i class=\"ti ti-external-link\"></i></a> nur kleine Änderungen; So müssen Kinder ab einem Alter von 5 Jahren im Fall einer Personenstandsänderung zustimmen und die Eltern von Minderjährigen müssen bestätigen, dass sie sich beraten haben lassen. Zudem wurde die Weitergabe von persönlichen Daten an Sicherheitsbehörden gestrichen.",
"Die Redner*innen der Regierungsparteien (FDP, SPD, Bündnis 90/Die Grünen) betonten die Wichtigkeit dieses Gesetzesvorhabens für die Grundrechte und Menschenwürde. Dem Leid, das das TSG verursacht hat werde jetzt ein Ende gesetzt. Dies treffe auf breite Unterstützung durch frauenpolitische Organisationen und Kirchen.",
"Aus den Lagern der Parteien CDU/CSU, AfD und der Gruppe BSW wurden Befürchtungen laut, das Gesetz gefährde Kinder- und Jugendschutz und wäre anfällig für Missbrauch. Einige dieser Redner*innen sind der Ansicht, Trans* wäre Einbildung und ein 'Hype', welcher durch eine Lobby gestärkt würde. Trans*-Personen seien lediglich Menschen in Verkleidung und Perücke.",
"Die Gruppe Die Linke begrüßt das Gesetz, mahnt aber auch an, dass dies nur der Anfang sein könne; Beratungsmöglichkeiten müssen verbessert und Regelungen zur Finanzierung gesundheitlicher Maßnahmen geschaffen werden.",
"Die Beschlussempfehlung des Familienausschusses wurde mit 372 zu 251 Stimmen angenommen. Der <a href=\"https://web.archive.org/web/20240412195124/https://dserver.bundestag.de/btd/20/082/2008203.pdf\" class=\"link\">Antrag der AfD</a>, das TSG zu erhalten und sogar noch zu verschärfen, wurde vom Parlament zurückgewiesen.",
"Die Beschlussempfehlung des Familienausschusses wurde mit 372 zu 251 Stimmen angenommen. Der <a href=\"https://web.archive.org/web/20240412195124/https://dserver.bundestag.de/btd/20/082/2008203.pdf\" target=\"_blank\" class=\"link\">Antrag der AfD <i class=\"ti ti-external-link\"></i></a>, das TSG zu erhalten und sogar noch zu verschärfen, wurde vom Parlament zurückgewiesen.",
],
"en" => [
"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.",
"Compared to the government draft, the <a href=\"https://web.archive.org/web/20240412195016/https://dserver.bundestag.de/btd/20/110/2011004.pdf\" class=\"link\">recommendation of the family committee</a> contains only small changes; In the event of a change in civil status, children starting at the age of 5 must agree and the parents of minors must confirm that they have been advised. In addition, the transfer of personal information to security authorities has been removed.",
"Compared to the government draft, the <a href=\"https://web.archive.org/web/20240412195016/https://dserver.bundestag.de/btd/20/110/2011004.pdf\" target=\"_blank\" class=\"link\">recommendation of the family committee <i class=\"ti ti-external-link\"></i></a> contains only small changes; In the event of a change in civil status, children starting at the age of 5 must agree and the parents of minors must confirm that they have been advised. In addition, the transfer of personal information to security authorities has been removed.",
"The government parties' speakers (FDP, SPD, Bündnis 90/Die Grünen) emphasized the importance of this law for fundamental rights and human dignity. The suffering that the TSG has caused is now being put to an end. This meets broad support from women's policy organizations and churches.",
"From the camps of the parties CDU/CSU, AfD and the group BSW, fears were loud, the law would be a risk for child and youth protection and could be susceptible to abuse. Some of these speakers believe that trans* would be imagination and a 'hype' that would be strengthened by a lobby and trans* people were only people in disguise and wigs.",
"The group Die Linke welcomes the law, but also warns that this can only be the beginning; Advice options must be improved and regulations for financing health measures should be created.",
"The decision recommendation of the family committee was accepted with 372 to 251 votes. The <a href=\"https://web.archive.org/web/20240412195124/https://dserver.bundestag.de/btd/20/082/2008203.pdf\" class=\"link\">AfD's request</a> to maintain the TSG and even tighten its regulations was rejected by the parliament.",
"The decision recommendation of the family committee was accepted with 372 to 251 votes. The <a href=\"https://web.archive.org/web/20240412195124/https://dserver.bundestag.de/btd/20/082/2008203.pdf\" target=\"_blank\" class=\"link\">AfD's request <i class=\"ti ti-external-link\"></i></a> to maintain the TSG and even tighten its regulations was rejected by the parliament.",
],
],
"timeline_lesung_2_3_button" => [