diff --git a/ansible/artifacts-upload.yml b/ansible/artifacts-upload.yml index 772ec2cca4..924a5b26d5 100644 --- a/ansible/artifacts-upload.yml +++ b/ansible/artifacts-upload.yml @@ -3,8 +3,13 @@ become: yes vars_files: - "{{inventory_dir}}/secrets.yml" - environment: - AZURE_STORAGE_ACCOUNT: "{{ sunbird_artifact_storage_account_name }}" - AZURE_STORAGE_SAS_TOKEN: "{{ sunbird_artifact_storage_account_sas }}" roles: - - artifacts-upload-azure + - role: artifacts-upload-gcp + vars: + service_account: "{{ gcp_artifcats_upload_service_account }}" + tags: gcp + - role: artifacts-upload-azure + environment: + AZURE_STORAGE_ACCOUNT: "{{ sunbird_artifact_storage_account_name }}" + AZURE_STORAGE_SAS_TOKEN: "{{ sunbird_artifact_storage_account_sas }}" + tags: azure \ No newline at end of file diff --git a/ansible/artifacts/sunbird/login/info.ftl b/ansible/artifacts/sunbird/login/info.ftl old mode 100755 new mode 100644 index fcd582c4d1..f8964e0afe --- a/ansible/artifacts/sunbird/login/info.ftl +++ b/ansible/artifacts/sunbird/login/info.ftl @@ -1,39 +1,111 @@ <#import "template.ftl" as layout> <@layout.registrationLayout displayMessage=false; section> - <#if section = "header"> - <#if messageHeader??> - <#-- ${messageHeader} --> - <#else> - <#-- ${message.summary} --> - + <#if section = "title"> + ${message.summary} <#elseif section = "form"> -
-
-
- - <#if skipLink??> - <#else> - <#if pageRedirectUri??> -

${kcSanitize(msg("backToApplication"))?no_esc}

- <#elseif actionUri??> -
Loading.. Please wait..
- - <#elseif client.baseUrl??> -

${kcSanitize(msg("backToApplication"))?no_esc}

- - -
+
+
+
+
+ +
+
+ +
+ hexagon image +
+ + <#--
+ Slides +
+ +
+ Slides +
--> +
+ Slides +
+ +
+
+
+ + + <#-- --> +
+
+ +
+
-
+
+ + diff --git a/ansible/artifacts/sunbird/login/login-page-expired.ftl b/ansible/artifacts/sunbird/login/login-page-expired.ftl index 9bed0120bb..6167ff012d 100644 --- a/ansible/artifacts/sunbird/login/login-page-expired.ftl +++ b/ansible/artifacts/sunbird/login/login-page-expired.ftl @@ -3,16 +3,19 @@ <#if section = "title"> ${msg("pageExpiredTitle")} <#elseif section = "form"> -
-
-
-

${msg("pageExpiredMsg1")}
- ${msg("doClickHere")}

-

- ${msg("pageExpiredMsg2")}
- ${msg("doClickHere")} -

-
+
+
+
+ <#--
--> +
+

+ ${msg("pageExpiredMsg1")} ${msg("doClickHere")}. + ${msg("pageExpiredMsg2")} ${msg("doClickHere")}. +

+
+ <#--
--> +
+
diff --git a/ansible/artifacts/sunbird/login/login-reset-password.ftl b/ansible/artifacts/sunbird/login/login-reset-password.ftl index 363abd818a..1af6b4786d 100644 --- a/ansible/artifacts/sunbird/login/login-reset-password.ftl +++ b/ansible/artifacts/sunbird/login/login-reset-password.ftl @@ -4,51 +4,124 @@ ${msg("emailForgotTitle")} <#elseif section = "form"> -
-
-
- -
${msg("emailForgotTitle")}
-
-
- ${msg("enterEmailPhonenumberToGetCode")} -
-
- <#if message?has_content> -
- ${message.summary} +
+
+
+
+ +
+
+ +
+ hexagon image +
+ + <#--
+ Slides +
+ +
+ Slides +
--> +
+ Slides +
+
- -
-
-
- - -
-
- +
+ + + <#-- --> +
+
+ +
+
<#elseif section = "info" > + diff --git a/ansible/artifacts/sunbird/login/login-update-password.ftl b/ansible/artifacts/sunbird/login/login-update-password.ftl index 269d5e10ca..e7a1350886 100644 --- a/ansible/artifacts/sunbird/login/login-update-password.ftl +++ b/ansible/artifacts/sunbird/login/login-update-password.ftl @@ -3,60 +3,78 @@ <#if section = "title"> ${msg("updatePasswordTitle")} <#elseif section = "form"> -
-
-
- -
${msg("newPasswordTitle")}
-
-
- <#if message?has_content> -
- ${message.summary} +
+
+
+
+
+
+ + <#--
${msg("newPasswordTitle")}
-->
- -
-
-
- - - -
- - - -
Passwords do not match
-
-
- -
- - +
+
+ + diff --git a/ansible/artifacts/sunbird/login/login.ftl b/ansible/artifacts/sunbird/login/login.ftl index 418ce44faf..53d97429ca 100644 --- a/ansible/artifacts/sunbird/login/login.ftl +++ b/ansible/artifacts/sunbird/login/login.ftl @@ -5,109 +5,342 @@ <#elseif section = "header"> <#elseif section = "form"> <#if realm.password> -
-
-
- -

${msg("loginDiksha")}

-

Login

-
-

${msg("mergeAccountMessage")}

-

${msg("migrateAccountMessage")}

-
- <#if message?has_content> -
- ${message.summary} +
+
+
+
+
+ Slides
- -
suceess
-
error
-
-
- - - <#if usernameEditDisabled??> - <#-- TODO: need to find alternative for prepopulating username --> - - <#else> - - +
+