diff --git a/webapp/web/images/iconAlert.png b/webapp/web/images/iconAlert.png index 27803e2fb..af1a2a228 100644 Binary files a/webapp/web/images/iconAlert.png and b/webapp/web/images/iconAlert.png differ diff --git a/webapp/web/images/iconConfirmation.png b/webapp/web/images/iconConfirmation.png new file mode 100644 index 000000000..a3993988a Binary files /dev/null and b/webapp/web/images/iconConfirmation.png differ diff --git a/webapp/web/templates/freemarker/body/login/forcedPasswordChange.ftl b/webapp/web/templates/freemarker/body/login/forcedPasswordChange.ftl index 16029de3c..85d4a7c4b 100644 --- a/webapp/web/templates/freemarker/body/login/forcedPasswordChange.ftl +++ b/webapp/web/templates/freemarker/body/login/forcedPasswordChange.ftl @@ -1,8 +1,7 @@ <#-- $This file is distributed under the terms of the license in /doc/license.txt$ --> -<#-- Crop the replacement main image for an Individual, to produce a thumbnail. --> +<#-- Log in template for accessing site admin --> -

Forced password change

${stylesheets.addFromTheme("/login.css")} @@ -10,7 +9,7 @@ ${stylesheets.addFromTheme("/login.css")}

Create Your New Password

<#if errorMessage??> -
+

${errorMessage}

@@ -20,7 +19,6 @@ ${stylesheets.addFromTheme("/login.css")} -
diff --git a/webapp/web/templates/freemarker/body/login/login.ftl b/webapp/web/templates/freemarker/body/login/login.ftl index 65dc398ee..19823b8b7 100644 --- a/webapp/web/templates/freemarker/body/login/login.ftl +++ b/webapp/web/templates/freemarker/body/login/login.ftl @@ -1,10 +1,11 @@ <#-- $This file is distributed under the terms of the license in /doc/license.txt$ --> -<#-- Crop the replacement main image for an Individual, to produce a thumbnail. --> +<#-- Log in template for accessing site admin --> ${stylesheets.addFromTheme("/login.css")}
+

Log in

<#if infoMessage??> @@ -12,7 +13,7 @@ ${stylesheets.addFromTheme("/login.css")} <#if errorMessage??> -
+

${errorMessage}

@@ -22,7 +23,6 @@ ${stylesheets.addFromTheme("/login.css")} -