From 68aa1d8aee562b7bc756f6ff13be723ad9b6c183 Mon Sep 17 00:00:00 2001
From: Avinash Gusain <avinashg@e.email>
Date: Fri, 9 Sep 2022 19:44:19 +0530
Subject: [PATCH 1/5] new design fixes

---
 patches/016-login-screen.patch | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/patches/016-login-screen.patch b/patches/016-login-screen.patch
index ac4992ed..47ac2c93 100644
--- a/patches/016-login-screen.patch
+++ b/patches/016-login-screen.patch
@@ -1,5 +1,5 @@
---- ./core/templates/layout.guest-new.php	2022-06-09 13:47:41.255340395 +0530
-+++ ./core/templates/layout.guest.php	2022-06-16 17:34:38.429775039 +0530
+--- ./core/templates/layout.guest.php	2022-09-09 16:29:13.663723400 +0530
++++ ./core/templates/layout.guest-new.php	2022-09-09 19:43:07.413723400 +0530
 @@ -20,6 +20,7 @@
  		<link rel="mask-icon" sizes="any" href="<?php print_unescaped(image_path('', 'favicon-mask.svg')); ?>" color="<?php p($theme->getColorPrimary()); ?>">
  		<link rel="manifest" href="<?php print_unescaped(image_path('', 'manifest.json')); ?>">
@@ -7,14 +7,14 @@
 +		<?php array_push($_['jsfiles'] , '/themes/eCloud/core/js/login.js') ?>
  		<?php emit_script_loading_tags($_); ?>
  		<?php print_unescaped($_['headers']); ?>
- 		</head>
+ 	</head>
 @@ -28,8 +29,29 @@
  		<?php foreach ($_['initialStates'] as $app => $initialState) { ?>
  			<input type="hidden" id="initial-state-<?php p($app); ?>" value="<?php p(base64_encode($initialState)); ?>">
  		<?php }?>
 -		<div class="wrapper">
 -			<div class="v-align">
-+		<div class="wrapper <?= (array_key_exists("alt_login",$_)) ? 'alt_login':'not_alt_login' ?>" > 
++		<div class="wrapper <?= (array_key_exists("alt_login",$_)) ? 'alt_login':'not_alt_login' ?>" >
 +			<?php if (array_key_exists("alt_login",$_)) { ?>
 +				<div class="banner-right-align">
 +					<div class="lines">
@@ -55,8 +55,8 @@
  					<?php print_unescaped($_['content']); ?>
 +					<?php if (array_key_exists("alt_login",$_)) { ?>
 +					<div class="have-an-account">
-+						<div><?php p($l->t('Don\'t have an account yet?')); ?></div>
-+						<div><a href="/signup"><?php p($l->t('Create an account')); ?></a></div>
++						<div class="createaccdesk"><?php p($l->t('Don\'t have an account yet?')); ?> <a href="/signup"><?php p($l->t('Create an account')); ?></a></div>
++						<div class="createaccmob"><p><?php p($l->t('Don\'t have an account yet?')); ?></p> <p> <a href="/signup"><?php p($l->t('Create an account')); ?></a></p></div>
 +					</div>
 +					<?php } ?>
  				</main>
@@ -77,7 +77,8 @@
 -				<?php print_unescaped($theme->getLongFooter()); ?>
 -			</p>
 -		</footer>
-+		
++
  	</body>
- </html>
+-</html>
 \ No newline at end of file
++</html>
-- 
GitLab


From 59355c45374d5f6ea520b2d40d5737bcd6a6cefe Mon Sep 17 00:00:00 2001
From: Akhil <akhil.potukuchi@gmail.com>
Date: Mon, 12 Sep 2022 14:00:42 +0530
Subject: [PATCH 2/5] Add sed to built login js to show reset pwd page

---
 Dockerfile | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/Dockerfile b/Dockerfile
index 7fe695e4..00f3b72e 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -129,6 +129,9 @@ RUN patch -u ${BASE_DIR}/core/templates/layout.guest.php -i ${TMP_PATCH_DIR}/016
 RUN patch -u ${BASE_DIR}/core/Command/User/Setting.php -i ${TMP_PATCH_DIR}/018-occ-user-setting.patch
 RUN rm -rf ${TMP_PATCH_DIR}
 
+# show reset pwd page with a query param
+RUN cd ${BASE_DIR}/core/js/dist && sed -i 's/resetPassword:!1/resetPassword:!1||Z.showResetPassword==="1"/' login.js
+
 # autocomplete leak tweak apps frontend with sed, disable group suggestion
 
 RUN cd ${BASE_DIR}/custom_apps/contacts && sed -i 's/"GROUP","INDIVIDUAL"/"INDIVIDUAL"/g' js/contacts-main.js
-- 
GitLab


From 765f85559918778c26574f703a4b01c94955404b Mon Sep 17 00:00:00 2001
From: Avinash Gusain <avinashg@e.email>
Date: Mon, 12 Sep 2022 14:06:40 +0530
Subject: [PATCH 3/5] new design fixes

---
 patches/016-login-screen.patch | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/patches/016-login-screen.patch b/patches/016-login-screen.patch
index 47ac2c93..5f976e85 100644
--- a/patches/016-login-screen.patch
+++ b/patches/016-login-screen.patch
@@ -1,5 +1,5 @@
---- ./core/templates/layout.guest.php	2022-09-09 16:29:13.663723400 +0530
-+++ ./core/templates/layout.guest-new.php	2022-09-09 19:43:07.413723400 +0530
+--- ./core/templates/layout.guest.php	2022-09-12 14:02:51.444884600 +0530
++++ ./core/templates/layout.guest-new.php	2022-09-12 14:03:12.924884600 +0530
 @@ -20,6 +20,7 @@
  		<link rel="mask-icon" sizes="any" href="<?php print_unescaped(image_path('', 'favicon-mask.svg')); ?>" color="<?php p($theme->getColorPrimary()); ?>">
  		<link rel="manifest" href="<?php print_unescaped(image_path('', 'manifest.json')); ?>">
-- 
GitLab


From 63227a2c0c5608a0bbe177324e51bb892e1655f0 Mon Sep 17 00:00:00 2001
From: Avinash Gusain <avinashg@e.email>
Date: Mon, 12 Sep 2022 14:17:29 +0530
Subject: [PATCH 4/5] new design fixes

---
 patches/016-login-screen.patch | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/patches/016-login-screen.patch b/patches/016-login-screen.patch
index 5f976e85..178fdf26 100644
--- a/patches/016-login-screen.patch
+++ b/patches/016-login-screen.patch
@@ -1,4 +1,4 @@
---- ./core/templates/layout.guest.php	2022-09-12 14:02:51.444884600 +0530
+--- ./core/templates/layout.guest.php	2022-09-12 14:16:28.724884600 +0530
 +++ ./core/templates/layout.guest-new.php	2022-09-12 14:03:12.924884600 +0530
 @@ -20,6 +20,7 @@
  		<link rel="mask-icon" sizes="any" href="<?php print_unescaped(image_path('', 'favicon-mask.svg')); ?>" color="<?php p($theme->getColorPrimary()); ?>">
@@ -79,6 +79,4 @@
 -		</footer>
 +
  	</body>
--</html>
-\ No newline at end of file
-+</html>
+ </html>
-- 
GitLab


From 38f538e1b050bb45f87524b8c17c3f5c5120f957 Mon Sep 17 00:00:00 2001
From: Akhil <akhil.potukuchi@gmail.com>
Date: Mon, 12 Sep 2022 17:20:28 +0530
Subject: [PATCH 5/5] Z-> re

---
 Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index 00f3b72e..e321a777 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -130,7 +130,7 @@ RUN patch -u ${BASE_DIR}/core/Command/User/Setting.php -i ${TMP_PATCH_DIR}/018-o
 RUN rm -rf ${TMP_PATCH_DIR}
 
 # show reset pwd page with a query param
-RUN cd ${BASE_DIR}/core/js/dist && sed -i 's/resetPassword:!1/resetPassword:!1||Z.showResetPassword==="1"/' login.js
+RUN cd ${BASE_DIR}/core/js/dist && sed -i 's/resetPassword:!1/resetPassword:!1||re.showResetPassword==="1"/' login.js
 
 # autocomplete leak tweak apps frontend with sed, disable group suggestion
 
-- 
GitLab