From 306e32fc85f66eea80714cb9653a771150d82b86 Mon Sep 17 00:00:00 2001 From: Landry Breuil Date: Tue, 11 Jan 2022 15:03:29 +0100 Subject: [PATCH 1/5] add unmodified pmlinks.html taken from https://github.com/apereo/cas/blob/master/support/cas-server-support-thymeleaf/src/main/resources/templates/fragments/pmlinks.html --- .../georchestra/fragments/pmlinks.html | 47 +++++++++++++++++++ 1 file changed, 47 insertions(+) create mode 100644 src/main/resources/templates/georchestra/fragments/pmlinks.html diff --git a/src/main/resources/templates/georchestra/fragments/pmlinks.html b/src/main/resources/templates/georchestra/fragments/pmlinks.html new file mode 100644 index 0000000..6d05bac --- /dev/null +++ b/src/main/resources/templates/georchestra/fragments/pmlinks.html @@ -0,0 +1,47 @@ + + + + + + + + + Password Management Links Fragment + + + + + + + + From b53e90466da903e171cb4a56aee155acbde4292d Mon Sep 17 00:00:00 2001 From: Landry Breuil Date: Tue, 11 Jan 2022 15:04:48 +0100 Subject: [PATCH 2/5] use the right URL for 'forgot password' link --- src/main/resources/templates/georchestra/fragments/pmlinks.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/resources/templates/georchestra/fragments/pmlinks.html b/src/main/resources/templates/georchestra/fragments/pmlinks.html index 6d05bac..6a2ecdd 100644 --- a/src/main/resources/templates/georchestra/fragments/pmlinks.html +++ b/src/main/resources/templates/georchestra/fragments/pmlinks.html @@ -39,7 +39,7 @@

- Forgot your password? + Forgot your password?
From e53b79d8c457a04f8300544762de668d58707f71 Mon Sep 17 00:00:00 2001 From: Landry Breuil Date: Tue, 11 Jan 2022 15:33:00 +0100 Subject: [PATCH 3/5] add "create account" link --- .../templates/georchestra/fragments/pmlinks.html | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/src/main/resources/templates/georchestra/fragments/pmlinks.html b/src/main/resources/templates/georchestra/fragments/pmlinks.html index 6a2ecdd..4239265 100644 --- a/src/main/resources/templates/georchestra/fragments/pmlinks.html +++ b/src/main/resources/templates/georchestra/fragments/pmlinks.html @@ -36,11 +36,18 @@ onclick="document.getElementById('passwordManagementUserForm').submit();" />

-
+ + +

+

From dbd01abbde81a4b5fefae3dacbf80e0c63047ef0 Mon Sep 17 00:00:00 2001 From: Landry Breuil Date: Tue, 11 Jan 2022 17:15:16 +0100 Subject: [PATCH 4/5] put the two links on the same line a bit like it was previously in https://github.com/georchestra/georchestra/blob/master/cas-server-webapp/src/main/webapp/WEB-INF/view/jsp/default/ui/casLoginView.jsp#L64-L67 --- .../resources/templates/georchestra/fragments/pmlinks.html | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/src/main/resources/templates/georchestra/fragments/pmlinks.html b/src/main/resources/templates/georchestra/fragments/pmlinks.html index 4239265..70cec01 100644 --- a/src/main/resources/templates/georchestra/fragments/pmlinks.html +++ b/src/main/resources/templates/georchestra/fragments/pmlinks.html @@ -40,11 +40,7 @@
Forgot your password? - -

From f338ae8d126e080d4164144ba6dc1689c075008b Mon Sep 17 00:00:00 2001 From: Landry Breuil Date: Tue, 11 Jan 2022 17:18:06 +0100 Subject: [PATCH 5/5] better wording for register, and put that link first --- .../resources/templates/georchestra/fragments/pmlinks.html | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/main/resources/templates/georchestra/fragments/pmlinks.html b/src/main/resources/templates/georchestra/fragments/pmlinks.html index 70cec01..be96b2d 100644 --- a/src/main/resources/templates/georchestra/fragments/pmlinks.html +++ b/src/main/resources/templates/georchestra/fragments/pmlinks.html @@ -37,10 +37,9 @@