From 2b9b17b7513d20df64801c3fe30cb24bd1fdbf3d Mon Sep 17 00:00:00 2001
From: Ronak Patel <ronak.patel@e.email>
Date: Tue, 14 Jun 2022 12:22:35 +0530
Subject: [PATCH 01/11] footer moved at bottom

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

diff --git a/patches/016-login-screen.patch b/patches/016-login-screen.patch
index c90119f3..263d26e0 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-09 13:37:22.563505705 +0530
+--- /home/ronak/Desktop/ecloud-local/ecloud_dev_example/volumes/nextcloud/html/core/templates/layout.guest-new.php	2022-06-09 13:47:41.255340395 +0530
++++ /home/ronak/Desktop/ecloud-local/ecloud_dev_example/volumes/nextcloud/html/core/templates/layout.guest.php	2022-06-14 10:34:50.541301085 +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')); ?>">
@@ -14,7 +14,7 @@
  		<?php }?>
 -		<div class="wrapper">
 -			<div class="v-align">
-+		<div class="wrapper <?= (array_key_exists("alt_login",$_)) ? 'alt_login':'not_alt_login' ?>" > 
++		<div class="pos-relative 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">
@@ -31,7 +31,7 @@
 +							</ol>
 +						</div>
 +						<div  class="banner-content-create-button">
-+							<a href="/signup" ><?php p($l->t('Create My Account')); ?></a>
++							<a href="<?=$_REQUEST['DOMAIN'] ?>/signup" ><?php p($l->t('Create My Account')); ?></a>
 +						</div>
 +					</div>
 +				</div>
@@ -40,7 +40,7 @@
  				<?php if ($_['bodyid'] === 'body-login'): ?>
  					<header role="banner">
  						<div id="header">
-@@ -42,18 +64,22 @@
+@@ -42,6 +64,10 @@
  									<img src="<?php p($theme->getLogo()); ?>"/>
  								<?php endif; ?>
  							</div>
@@ -51,15 +51,15 @@
  						</div>
  					</header>
  				<?php endif; ?>
- 				<main>
+@@ -49,11 +75,11 @@
  					<?php print_unescaped($_['content']); ?>
  				</main>
-+				<footer role="contentinfo" class="<?= (!array_key_exists("alt_login",$_)) ? 'pos-fixed':'' ?>">
+ 			</div>
++			<footer role="contentinfo" class="<?= (!array_key_exists("alt_login",$_)) ? 'pos-fixed':'' ?>">
 +					<p class="info">
 +						<?php print_unescaped($theme->getLongFooter()); ?>
 +					</p>
-+				</footer>
- 			</div>
++			</footer>
  		</div>
 -		<footer role="contentinfo">
 -			<p class="info">
-- 
GitLab


From 3c3c583db1299377fd600e0c67339365ed1e9fc3 Mon Sep 17 00:00:00 2001
From: Ronak Patel <ronak.patel@e.email>
Date: Tue, 14 Jun 2022 12:23:32 +0530
Subject: [PATCH 02/11] footer moved at bottom #2

---
 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 263d26e0..6528e8e5 100644
--- a/patches/016-login-screen.patch
+++ b/patches/016-login-screen.patch
@@ -1,5 +1,5 @@
 --- /home/ronak/Desktop/ecloud-local/ecloud_dev_example/volumes/nextcloud/html/core/templates/layout.guest-new.php	2022-06-09 13:47:41.255340395 +0530
-+++ /home/ronak/Desktop/ecloud-local/ecloud_dev_example/volumes/nextcloud/html/core/templates/layout.guest.php	2022-06-14 10:34:50.541301085 +0530
++++ /home/ronak/Desktop/ecloud-local/ecloud_dev_example/volumes/nextcloud/html/core/templates/layout.guest.php	2022-06-14 12:23:20.206331380 +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')); ?>">
@@ -31,7 +31,7 @@
 +							</ol>
 +						</div>
 +						<div  class="banner-content-create-button">
-+							<a href="<?=$_REQUEST['DOMAIN'] ?>/signup" ><?php p($l->t('Create My Account')); ?></a>
++							<a href="/signup" ><?php p($l->t('Create My Account')); ?></a>
 +						</div>
 +					</div>
 +				</div>
-- 
GitLab


From d02af81844e2566ff53abb22357a02e8709cd7fa Mon Sep 17 00:00:00 2001
From: Ronak Patel <ronak.patel@e.email>
Date: Tue, 14 Jun 2022 12:24:21 +0530
Subject: [PATCH 03/11] footer moved at bottom #3

---
 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 6528e8e5..2f5583c5 100644
--- a/patches/016-login-screen.patch
+++ b/patches/016-login-screen.patch
@@ -1,5 +1,5 @@
---- /home/ronak/Desktop/ecloud-local/ecloud_dev_example/volumes/nextcloud/html/core/templates/layout.guest-new.php	2022-06-09 13:47:41.255340395 +0530
-+++ /home/ronak/Desktop/ecloud-local/ecloud_dev_example/volumes/nextcloud/html/core/templates/layout.guest.php	2022-06-14 12:23:20.206331380 +0530
+--- ./core/templates/layout.guest-new.php	2022-06-09 13:47:41.255340395 +0530
++++ ./core/templates/layout.guest.php	2022-06-14 12:23:20.206331380 +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 23a9f65827aea483a0d21aefc7c271bc4c370066 Mon Sep 17 00:00:00 2001
From: Ronak Patel <ronak.patel@e.email>
Date: Tue, 14 Jun 2022 12:45:01 +0530
Subject: [PATCH 04/11] patch

---
 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 2f5583c5..8aafb239 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-14 12:23:20.206331380 +0530
+--- ./core/templates/layout.guest-new.php   2022-06-09 13:47:41.255340395 +0530
++++ ./core/templates/layout.guest.php   2022-06-09 13:37:22.563505705 +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 d563b9d9150bb84cff80138270d228d8ca8d3d5d Mon Sep 17 00:00:00 2001
From: Ronak Patel <ronak.patel@e.email>
Date: Tue, 14 Jun 2022 12:54:21 +0530
Subject: [PATCH 05/11] patch

---
 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 8aafb239..6528e8e5 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-09 13:37:22.563505705 +0530
+--- /home/ronak/Desktop/ecloud-local/ecloud_dev_example/volumes/nextcloud/html/core/templates/layout.guest-new.php	2022-06-09 13:47:41.255340395 +0530
++++ /home/ronak/Desktop/ecloud-local/ecloud_dev_example/volumes/nextcloud/html/core/templates/layout.guest.php	2022-06-14 12:23:20.206331380 +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 e369e57217a04ffc07eb4361e8ee6318e5cd4850 Mon Sep 17 00:00:00 2001
From: Ronak Patel <ronak.patel@e.email>
Date: Tue, 14 Jun 2022 13:48:42 +0530
Subject: [PATCH 06/11] bump version nc

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

diff --git a/Dockerfile b/Dockerfile
index a4406054..f20c439c 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -17,7 +17,7 @@ ARG ECLOUD_LAUNCHER_JOB_ID="318040"
 ARG GOOGLE_INTEGRATION_VERSION="1.0.6"
 ARG LDAP_WRITE_SUPPORT_VERSION="1.4.0"
 
-RUN sed -i 's/22,2,8,1/22,2,8,12/' ${BASE_DIR}/version.php
+RUN sed -i 's/22,2,8,1/22,2,8,13/' ${BASE_DIR}/version.php
 COPY custom_entrypoint.sh /
 RUN chmod +x /custom_entrypoint.sh
 RUN mkdir -p /var/www/skeleton/Documents && mkdir -p /var/www/skeleton/Images
-- 
GitLab


From a4aede541c4900b3aa1d6979de078ae0865749d4 Mon Sep 17 00:00:00 2001
From: Ronak Patel <ronak.patel@e.email>
Date: Tue, 14 Jun 2022 14:10:01 +0530
Subject: [PATCH 07/11] patch

---
 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 6528e8e5..8aafb239 100644
--- a/patches/016-login-screen.patch
+++ b/patches/016-login-screen.patch
@@ -1,5 +1,5 @@
---- /home/ronak/Desktop/ecloud-local/ecloud_dev_example/volumes/nextcloud/html/core/templates/layout.guest-new.php	2022-06-09 13:47:41.255340395 +0530
-+++ /home/ronak/Desktop/ecloud-local/ecloud_dev_example/volumes/nextcloud/html/core/templates/layout.guest.php	2022-06-14 12:23:20.206331380 +0530
+--- ./core/templates/layout.guest-new.php   2022-06-09 13:47:41.255340395 +0530
++++ ./core/templates/layout.guest.php   2022-06-09 13:37:22.563505705 +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 3930235005a2a9cee4def098f7a1005d3c032019 Mon Sep 17 00:00:00 2001
From: Ronak Patel <ronak.patel@e.email>
Date: Tue, 14 Jun 2022 14:15:33 +0530
Subject: [PATCH 08/11] bumped to 14

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

diff --git a/Dockerfile b/Dockerfile
index f20c439c..a9d362c8 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -17,7 +17,7 @@ ARG ECLOUD_LAUNCHER_JOB_ID="318040"
 ARG GOOGLE_INTEGRATION_VERSION="1.0.6"
 ARG LDAP_WRITE_SUPPORT_VERSION="1.4.0"
 
-RUN sed -i 's/22,2,8,1/22,2,8,13/' ${BASE_DIR}/version.php
+RUN sed -i 's/22,2,8,1/22,2,8,14/' ${BASE_DIR}/version.php
 COPY custom_entrypoint.sh /
 RUN chmod +x /custom_entrypoint.sh
 RUN mkdir -p /var/www/skeleton/Documents && mkdir -p /var/www/skeleton/Images
-- 
GitLab


From 593bb486d9bac7ad16dd507742ec3dd80fd0b681 Mon Sep 17 00:00:00 2001
From: Ronak Patel <ronak.patel@e.email>
Date: Tue, 14 Jun 2022 17:02:46 +0530
Subject: [PATCH 09/11] added dont have an account option

---
 Dockerfile                     | 2 +-
 patches/016-login-screen.patch | 9 +++++----
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index a9d362c8..f56f862d 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -17,7 +17,7 @@ ARG ECLOUD_LAUNCHER_JOB_ID="318040"
 ARG GOOGLE_INTEGRATION_VERSION="1.0.6"
 ARG LDAP_WRITE_SUPPORT_VERSION="1.4.0"
 
-RUN sed -i 's/22,2,8,1/22,2,8,14/' ${BASE_DIR}/version.php
+RUN sed -i 's/22,2,8,1/22,2,8,15/' ${BASE_DIR}/version.php
 COPY custom_entrypoint.sh /
 RUN chmod +x /custom_entrypoint.sh
 RUN mkdir -p /var/www/skeleton/Documents && mkdir -p /var/www/skeleton/Images
diff --git a/patches/016-login-screen.patch b/patches/016-login-screen.patch
index 8aafb239..e5066ab7 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-09 13:37:22.563505705 +0530
+--- ./core/templates/layout.guest-new.php	2022-06-09 13:47:41.255340395 +0530
++++ ./core/templates/layout.guest.php	2022-06-14 16:57:50.161395749 +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')); ?>">
@@ -40,7 +40,7 @@
  				<?php if ($_['bodyid'] === 'body-login'): ?>
  					<header role="banner">
  						<div id="header">
-@@ -42,6 +64,10 @@
+@@ -42,18 +64,23 @@
  									<img src="<?php p($theme->getLogo()); ?>"/>
  								<?php endif; ?>
  							</div>
@@ -51,8 +51,9 @@
  						</div>
  					</header>
  				<?php endif; ?>
-@@ -49,11 +75,11 @@
+ 				<main>
  					<?php print_unescaped($_['content']); ?>
++					<div class="have-an-account"><?php p($l->t('Dont have an account yet?')); ?> <a href="/signup"><?php p($l->t('Create an account')); ?></a></div>
  				</main>
  			</div>
 +			<footer role="contentinfo" class="<?= (!array_key_exists("alt_login",$_)) ? 'pos-fixed':'' ?>">
-- 
GitLab


From 53acb9d38c79e944cff2bd9740e8c8d766bd82b8 Mon Sep 17 00:00:00 2001
From: Ronak Patel <ronak.patel@e.email>
Date: Tue, 14 Jun 2022 18:46:00 +0530
Subject: [PATCH 10/11] added single quote

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

diff --git a/patches/016-login-screen.patch b/patches/016-login-screen.patch
index fdf7c5c3..2d3efc31 100644
--- a/patches/016-login-screen.patch
+++ b/patches/016-login-screen.patch
@@ -1,5 +1,5 @@
---- /home/ronak/Desktop/ecloud-local/ecloud_dev_example/volumes/nextcloud/html/core/templates/layout.guest-new.php	2022-06-09 13:47:41.255340395 +0530
-+++ /home/ronak/Desktop/ecloud-local/ecloud_dev_example/volumes/nextcloud/html/core/templates/layout.guest.php	2022-06-14 17:55:44.524585088 +0530
+--- ./core/templates/layout.guest-new.php	2022-06-09 13:47:41.255340395 +0530
++++ ./core/templates/layout.guest.php	2022-06-14 18:42:40.637220247 +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')); ?>">
@@ -55,7 +55,7 @@
  					<?php print_unescaped($_['content']); ?>
 +					<?php if (array_key_exists("alt_login",$_)) { ?>
 +					<div class="have-an-account">
-+						<div><?php p($l->t('Dont have an account yet?')); ?></div>
++						<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>
 +					<?php } ?>
-- 
GitLab


From 3d037519fd1e432e57fff3d8efed5308658d8dc4 Mon Sep 17 00:00:00 2001
From: Ronak Patel <ronak.patel@e.email>
Date: Tue, 14 Jun 2022 18:48:08 +0530
Subject: [PATCH 11/11] bumped version

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

diff --git a/Dockerfile b/Dockerfile
index 471a4afa..cc646bd0 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -17,7 +17,7 @@ ARG ECLOUD_LAUNCHER_JOB_ID="318040"
 ARG GOOGLE_INTEGRATION_VERSION="1.0.6"
 ARG LDAP_WRITE_SUPPORT_VERSION="1.4.0"
 
-RUN sed -i 's/22,2,8,1/22,2,8,15/' ${BASE_DIR}/version.php
+RUN sed -i 's/22,2,8,1/22,2,8,16/' ${BASE_DIR}/version.php
 COPY custom_entrypoint.sh /
 RUN chmod +x /custom_entrypoint.sh
 RUN mkdir -p /var/www/skeleton/Documents && mkdir -p /var/www/skeleton/Images
-- 
GitLab