From 1e7164837b92153f5b1ba653a6b26836ffb6f284 Mon Sep 17 00:00:00 2001 From: kahoona77 Date: Mon, 23 Sep 2024 09:28:43 +0200 Subject: [PATCH 1/3] Bugfix/213 login and logout pages have to be language marked for accessibility (#216) * #213 add th:lang construct to all .html in cas - this will apply a session cookie - determines browser language and sets it to that language * #213 add own lang config and interceptor - de to de, en to en, everything else to en in lang tag - does not quuite work yet * #213 add lang-attribute from locale to html-tag of layout.html * #213 add changelog and release-notes * #213 add lang-attribute from locale to html-tag of layout.html * update cas to v7.0.8 --------- Co-authored-by: Georg Goering --- CHANGELOG.md | 3 +++ app/gradle.properties | 2 +- .../main/resources/templates/fragments/loginProviders.html | 2 +- app/src/main/resources/templates/fragments/loginform.html | 2 +- app/src/main/resources/templates/fragments/pmlinks.html | 2 +- app/src/main/resources/templates/fragments/pwdupdateform.html | 2 +- app/src/main/resources/templates/fragments/submitbutton.html | 2 +- app/src/main/resources/templates/layout.html | 2 +- docs/gui/release_notes_de.md | 4 ++++ docs/gui/release_notes_en.md | 4 ++++ 10 files changed, 18 insertions(+), 7 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index ad6d9361..1ea4bdca 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,9 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). ## [Unreleased] +### Added +- Add "lang"-attribute to HTML-Pages [#213] +- update CAS to 7.0.8 ## [v7.0.5.1-8] - 2024-09-18 ### Changed diff --git a/app/gradle.properties b/app/gradle.properties index a8d64850..a20e87cb 100644 --- a/app/gradle.properties +++ b/app/gradle.properties @@ -1,5 +1,5 @@ # CAS server version -cas.version=7.0.5.1 +cas.version=7.0.8 ############################### # Spring versions ############################### diff --git a/app/src/main/resources/templates/fragments/loginProviders.html b/app/src/main/resources/templates/fragments/loginProviders.html index de11196f..84dad90f 100644 --- a/app/src/main/resources/templates/fragments/loginProviders.html +++ b/app/src/main/resources/templates/fragments/loginProviders.html @@ -1,5 +1,5 @@ - + diff --git a/app/src/main/resources/templates/fragments/loginform.html b/app/src/main/resources/templates/fragments/loginform.html index c7cb99e8..98121e12 100644 --- a/app/src/main/resources/templates/fragments/loginform.html +++ b/app/src/main/resources/templates/fragments/loginform.html @@ -1,5 +1,5 @@ - + diff --git a/app/src/main/resources/templates/fragments/pmlinks.html b/app/src/main/resources/templates/fragments/pmlinks.html index 2db55d08..a918e9bc 100644 --- a/app/src/main/resources/templates/fragments/pmlinks.html +++ b/app/src/main/resources/templates/fragments/pmlinks.html @@ -1,5 +1,5 @@ - + diff --git a/app/src/main/resources/templates/fragments/pwdupdateform.html b/app/src/main/resources/templates/fragments/pwdupdateform.html index 050e6f19..c7de0b00 100644 --- a/app/src/main/resources/templates/fragments/pwdupdateform.html +++ b/app/src/main/resources/templates/fragments/pwdupdateform.html @@ -1,5 +1,5 @@ - + diff --git a/app/src/main/resources/templates/fragments/submitbutton.html b/app/src/main/resources/templates/fragments/submitbutton.html index 88d9038d..59118095 100644 --- a/app/src/main/resources/templates/fragments/submitbutton.html +++ b/app/src/main/resources/templates/fragments/submitbutton.html @@ -1,5 +1,5 @@ - + diff --git a/app/src/main/resources/templates/layout.html b/app/src/main/resources/templates/layout.html index 2aa6d008..ada9d0e8 100644 --- a/app/src/main/resources/templates/layout.html +++ b/app/src/main/resources/templates/layout.html @@ -1,5 +1,5 @@ - + diff --git a/docs/gui/release_notes_de.md b/docs/gui/release_notes_de.md index 01cad813..44655a6a 100644 --- a/docs/gui/release_notes_de.md +++ b/docs/gui/release_notes_de.md @@ -4,6 +4,10 @@ Im Folgenden finden Sie die Release Notes für das CAS-Dogu. Technische Details zu einem Release finden Sie im zugehörigen [Changelog](https://docs.cloudogu.com/de/docs/dogus/cas/CHANGELOG/). +## Release 7.0.8-1 +Das Dogu bietet nun die CAS-Version 7.0.8 an. Die Release Notes von CAS finden Sie [in den CAS-Github-Releases](https://github.com/apereo/cas/releases/tag/v7.0.8). +- Die CAS-HTML-Seiten enthalten nun ein "lang"-Attribut um die Barrierefreiheit zu erhöhen. + ## Release 7.0.5.1-8 - Die Cloudogu-eigenen Quellen werden von der MIT-Lizenz auf die AGPL-3.0-only relizensiert. diff --git a/docs/gui/release_notes_en.md b/docs/gui/release_notes_en.md index b357ee91..1b356d75 100644 --- a/docs/gui/release_notes_en.md +++ b/docs/gui/release_notes_en.md @@ -4,6 +4,10 @@ Below you will find the release notes for CAS-Dogu. Technical details on a release can be found in the corresponding [Changelog](https://docs.cloudogu.com/de/docs/dogus/cas/CHANGELOG/). +## Release 7.0.8-1 +- The Dogu now offers the CAS version 7.0.8. The release notes of CAS can be found [in the CAS Github releases](https://github.com/apereo/cas/releases/tag/v7.0.8). +- The CAS HTML pages now contain a “lang” attribute to increase accessibility. + ## Release 7.0.5.1-8 - Relicense own code to AGPL-3.0-only. From 080867712b600a669e67f05c1d9a37fdda378e96 Mon Sep 17 00:00:00 2001 From: Nico Franzeck Date: Mon, 23 Sep 2024 09:30:13 +0200 Subject: [PATCH 2/3] Bump version --- Dockerfile | 2 +- dogu.json | 2 +- package.json | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index 241adff6..8c0ea710 100644 --- a/Dockerfile +++ b/Dockerfile @@ -44,7 +44,7 @@ RUN apk update && apk add wget && wget -O "apache-tomcat-${TOMCAT_VERSION}.tar. FROM registry.cloudogu.com/official/java:21.0.4-1 LABEL NAME="official/cas" \ - VERSION="7.0.5.1-8" \ + VERSION="7.0.8-1" \ maintainer="hello@cloudogu.com" ARG TOMCAT_VERSION diff --git a/dogu.json b/dogu.json index 9952e4a7..519b68b7 100644 --- a/dogu.json +++ b/dogu.json @@ -1,6 +1,6 @@ { "Name": "official/cas", - "Version": "7.0.5.1-8", + "Version": "7.0.8-1", "DisplayName": "Central Authentication Service", "Description": "The Central Authentication Service (CAS) is a single sign-on protocol for the web.", "Url": "https://apereo.github.io/cas", diff --git a/package.json b/package.json index 5dc08c31..8162a6ac 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "ces-style-generator", - "version": "7.0.5.1-8", + "version": "7.0.8-1", "description": "Npm project to use ces-theme to generate styling", "main": "index.js", "directories": { From aae6f6cbe9d51135a2dfa6a49665c31a6202c38a Mon Sep 17 00:00:00 2001 From: Nico Franzeck Date: Mon, 23 Sep 2024 09:30:23 +0200 Subject: [PATCH 3/3] Update changelog --- CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 1ea4bdca..87cd1a8f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,8 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). ## [Unreleased] + +## [v7.0.8-1] - 2024-09-23 ### Added - Add "lang"-attribute to HTML-Pages [#213] - update CAS to 7.0.8