Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ac8ab324 authored by Arnau Vàzquez's avatar Arnau Vàzquez
Browse files

Merge branch 'dev/login-jquery-alter' into 'main' 

removed jQuery and added custom JS file

See merge request !99
parents 200189a3 f6333983

patches/016-login-screen.patch

+10 −23
Original line number Diff line number Diff line 
--- /home/ronak/Desktop/ecloud-local/ecloud_dev_example/volumes/nextcloud/html/core/templates/layout.guest.php	2022-05-25 13:04:50.156968531 +0530

+++ /home/ronak/Desktop/ecloud-local/ecloud_dev_example/volumes/nextcloud/html/core/templates/layout.guest-new.php	2022-05-25 13:12:08.473125206 +0530

@@ -22,14 +22,50 @@

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

 		<?php emit_css_loading_tags($_); ?>

+		<?php array_push($_['jsfiles'] , '/themes/eCloud/core/js/login.js') ?>

 		<?php emit_script_loading_tags($_); ?>

 		<?php print_unescaped($_['headers']); ?>

+		<script src="https://ajax.googleapis.com/ajax/libs/jquery/1.11.1/jquery.min.js" type="text/javascript" nonce="<?= \OC::$server->getContentSecurityPolicyNonceManager()->getNonce()  ?>"></script>

+		<script nonce="<?= \OC::$server->getContentSecurityPolicyNonceManager()->getNonce()  ?>">

+			$(document).on('click','#lost-password', function(){

+				$('.banner-right-align').hide(500);

+				$('.v-align').addClass('warning-messsage');

+				$(".v-align").fadeOut('fast').delay(300).fadeIn('500');

+				$('.fp-label').fadeIn(); $('.sign-label').fadeOut('fast');

+			});

+			$(document).on('click','.lost-password-container a', function(){

+				$('.banner-right-align').show(500);

+				$('.v-align').removeClass('warning-messsage');

+				$(".v-align").fadeOut('fast').delay(300).fadeIn('500');

+				$('.fp-label').fadeOut('fast'); $('.sign-label').fadeIn();

+			});

+		</script>

 		</head>

 	<body id="<?php p($_['bodyid']);?>">

 		<?php include 'layout.noscript.warning.php'; ?>

@@ -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 }?>
@@ -44,7 +31,7 @@ 
+							</ol>

+						</div>

+						<div  class="banner-content-create-button">

+							<a href="https://murena.io/signup/" ><?php p($l->t('Create My Account')); ?></a>

+							<a href="/signup" ><?php p($l->t('Create My Account')); ?></a>

+						</div>

+					</div>

+				</div>
@@ -53,7 +40,7 @@ 
 				<?php if ($_['bodyid'] === 'body-login'): ?>

 					<header role="banner">

 						<div id="header">

@@ -42,18 +78,22 @@

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

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

 								<?php endif; ?>

 							</div>