Merge branch 'dev/footer-issue-res' into 'main'

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,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

--- ./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.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')); ?>">

 		<?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">

 				<?php if ($_['bodyid'] === 'body-login'): ?>

 					<header role="banner">

 						<div id="header">

@@ -42,18 +64,22 @@

@@ -42,18 +64,28 @@

 									<img src="<?php p($theme->getLogo()); ?>"/>

 								<?php endif; ?>

 							</div>

 				<?php endif; ?>

 				<main>

 					<?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>

+					<?php } ?>

 				</main>

+				<footer role="contentinfo" class="<?= (!array_key_exists("alt_login",$_)) ? 'pos-fixed':'' ?>">

 			</div>

+			<footer role="contentinfo" class="<?= (!array_key_exists("alt_login",$_)) ? 'forgotpass-footer':'' ?>">

+					<p class="info">

+						<?php print_unescaped($theme->getLongFooter()); ?>

+					</p>

+			</footer>

 		</div>

 		</div>

-		<footer role="contentinfo">

-			<p class="info">

-				<?php print_unescaped($theme->getLongFooter()); ?>