From e2041dcbeaafb4a14aeae84f2f3b74f46dbbd51d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marko=20Mili=C4=87?= Date: Mon, 29 Aug 2022 16:06:11 +0200 Subject: [PATCH] feature/Registration page and check boxes WIP 1 --- .../code/model/dataAccess/AuthUser.scala | 61 +++++++++++++------ 1 file changed, 42 insertions(+), 19 deletions(-) diff --git a/obp-api/src/main/scala/code/model/dataAccess/AuthUser.scala b/obp-api/src/main/scala/code/model/dataAccess/AuthUser.scala index 90cb3617f..91ea9d6bb 100644 --- a/obp-api/src/main/scala/code/model/dataAccess/AuthUser.scala +++ b/obp-api/src/main/scala/code/model/dataAccess/AuthUser.scala @@ -666,17 +666,18 @@ import net.liftweb.util.Helpers._ def agreeTermsDiv = { - val agreeTermsHtml = getWebUiPropsValue("webui_agree_terms_html", "") - if(agreeTermsHtml.isEmpty){ - val url = getWebUiPropsValue("webui_agree_terms_url", "") - if (url.isEmpty) { - s"" - } else { - scala.xml.Unparsed(s"""
""") - } - } else{ - scala.xml.Unparsed(s"""$agreeTermsHtml""") - } + val agreeTermsHtml = """
+ |
+ |
+ | Terms and Conditions + |
+ |
+ | + | + |
+ | """.stripMargin + + scala.xml.Unparsed(agreeTermsHtml) } def legalNoticeDiv = { @@ -689,13 +690,34 @@ import net.liftweb.util.Helpers._ } def agreePrivacyPolicy = { - val url = getWebUiPropsValue("webui_agree_privacy_policy_url", "") - val text = getWebUiPropsValue("webui_agree_privacy_policy_html_text", s"""
""") - if (url.isEmpty) { - s"" - } else { - scala.xml.Unparsed(s"""$text""") - } + val agreePrivacyPolicy = """
+ |
+ |
+ | Privacy Policy + |
+ |
+ | + | + |
+ |
""".stripMargin + + scala.xml.Unparsed(agreePrivacyPolicy) + } + def enableDisableSignUpButton = { + val javaScriptCode = """""".stripMargin + + scala.xml.Unparsed(javaScriptCode) } def signupFormTitle = getWebUiPropsValue("webui_signup_form_title_text", S.?("sign.up")) @@ -710,8 +732,9 @@ import net.liftweb.util.Helpers._ {agreeTermsDiv} {agreePrivacyPolicy}
- +
+ {enableDisableSignUpButton} }