Loading Dockerfile +2 −1 Original line number Diff line number Diff line Loading @@ -16,7 +16,7 @@ ARG EA_TAG="2.0.0-alpha.1" ARG ECLOUD_LAUNCHER_JOB_ID="308979" ARG GOOGLE_INTEGRATION_VERSION="1.0.6" RUN sed -i 's/22,2,8,1/22,2,8,2/' ${BASE_DIR}/version.php RUN sed -i 's/22,2,8,1/22,2,8,6/' ${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 Loading Loading @@ -117,6 +117,7 @@ RUN cd ${BASE_DIR} && patch -u ${BASE_DIR}/apps/dashboard/lib/Controller/Dashboa RUN patch -u ${BASE_DIR}/lib/private/Authentication/Token/PublicKeyTokenProvider.php -i ${TMP_PATCH_DIR}/013-revert-token-password-update.patch RUN patch -u ${BASE_DIR}/lib/private/legacy/OC_Helper.php -i ${TMP_PATCH_DIR}/014-add-mail-usage.patch RUN cd ${BASE_DIR} && patch -p0 < ${TMP_PATCH_DIR}/015-email-mail-template.patch RUN patch -u ${BASE_DIR}/core/templates/layout.guest.php -i ${TMP_PATCH_DIR}/016-login-screen.patch RUN rm -rf ${TMP_PATCH_DIR} # autocomplete leak tweak apps frontend with sed, disable group suggestion Loading patches/016-login-screen.patch 0 → 100644 +84 −0 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 @@ <?php emit_css_loading_tags($_); ?> <?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'; ?> <?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' ?>" > + <?php if (array_key_exists("alt_login",$_)) { ?> + <div class="banner-right-align"> + <div class="lines"> + </div> + <div class="banner-content"> + <div class="banner-content-get-free-murena"><p><?php p($l->t('Get your FREE Murena account now')); ?></p></div> + <div class="banner-content-why-murena"> + <ol> + <li><?php p($l->t('1GB storage for FREE to store and sync your pictures & videos.')); ?></li> + <li><?php p($l->t('Edit your documents online.')); ?></li> + <li><?php p($l->t('Your unique email address @murena.io')); ?></li> + <li><?php p($l->t('Sync calendar and contacts with the cloud')); ?></li> + <li><?php p($l->t('and many new features added regularly!')); ?></li> + </ol> + </div> + <div class="banner-content-create-button"> + <a href="<?=$_REQUEST['DOMAIN'] ?>/signup" ><?php p($l->t('Create My Account')); ?></a> + </div> + </div> + </div> + <?php } ?> + <div class="v-align <?= (!array_key_exists("alt_login",$_)) ? 'warning-messsage':'' ?>"> <?php if ($_['bodyid'] === 'body-login'): ?> <header role="banner"> <div id="header"> @@ -42,18 +78,22 @@ <img src="<?php p($theme->getLogo()); ?>"/> <?php endif; ?> </div> + <?php if (array_key_exists("alt_login",$_)) { ?> + <div class="sign-in-label sign-label"><?php p($l->t('Sign in to your account')); ?></div> + <div class="sign-in-label fp-label" style="display: none"><?php p($l->t('Forgot Password')); ?></div> + <?php } ?> </div> </header> <?php endif; ?> <main> <?php print_unescaped($_['content']); ?> </main> + <footer role="contentinfo" class="<?= (!array_key_exists("alt_login",$_)) ? 'pos-fixed':'' ?>"> + <p class="info"> + <?php print_unescaped($theme->getLongFooter()); ?> + </p> + </footer> </div> </div> - <footer role="contentinfo"> - <p class="info"> - <?php print_unescaped($theme->getLongFooter()); ?> - </p> - </footer> </body> </html> \ No newline at end of file Loading
Dockerfile +2 −1 Original line number Diff line number Diff line Loading @@ -16,7 +16,7 @@ ARG EA_TAG="2.0.0-alpha.1" ARG ECLOUD_LAUNCHER_JOB_ID="308979" ARG GOOGLE_INTEGRATION_VERSION="1.0.6" RUN sed -i 's/22,2,8,1/22,2,8,2/' ${BASE_DIR}/version.php RUN sed -i 's/22,2,8,1/22,2,8,6/' ${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 Loading Loading @@ -117,6 +117,7 @@ RUN cd ${BASE_DIR} && patch -u ${BASE_DIR}/apps/dashboard/lib/Controller/Dashboa RUN patch -u ${BASE_DIR}/lib/private/Authentication/Token/PublicKeyTokenProvider.php -i ${TMP_PATCH_DIR}/013-revert-token-password-update.patch RUN patch -u ${BASE_DIR}/lib/private/legacy/OC_Helper.php -i ${TMP_PATCH_DIR}/014-add-mail-usage.patch RUN cd ${BASE_DIR} && patch -p0 < ${TMP_PATCH_DIR}/015-email-mail-template.patch RUN patch -u ${BASE_DIR}/core/templates/layout.guest.php -i ${TMP_PATCH_DIR}/016-login-screen.patch RUN rm -rf ${TMP_PATCH_DIR} # autocomplete leak tweak apps frontend with sed, disable group suggestion Loading
patches/016-login-screen.patch 0 → 100644 +84 −0 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 @@ <?php emit_css_loading_tags($_); ?> <?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'; ?> <?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' ?>" > + <?php if (array_key_exists("alt_login",$_)) { ?> + <div class="banner-right-align"> + <div class="lines"> + </div> + <div class="banner-content"> + <div class="banner-content-get-free-murena"><p><?php p($l->t('Get your FREE Murena account now')); ?></p></div> + <div class="banner-content-why-murena"> + <ol> + <li><?php p($l->t('1GB storage for FREE to store and sync your pictures & videos.')); ?></li> + <li><?php p($l->t('Edit your documents online.')); ?></li> + <li><?php p($l->t('Your unique email address @murena.io')); ?></li> + <li><?php p($l->t('Sync calendar and contacts with the cloud')); ?></li> + <li><?php p($l->t('and many new features added regularly!')); ?></li> + </ol> + </div> + <div class="banner-content-create-button"> + <a href="<?=$_REQUEST['DOMAIN'] ?>/signup" ><?php p($l->t('Create My Account')); ?></a> + </div> + </div> + </div> + <?php } ?> + <div class="v-align <?= (!array_key_exists("alt_login",$_)) ? 'warning-messsage':'' ?>"> <?php if ($_['bodyid'] === 'body-login'): ?> <header role="banner"> <div id="header"> @@ -42,18 +78,22 @@ <img src="<?php p($theme->getLogo()); ?>"/> <?php endif; ?> </div> + <?php if (array_key_exists("alt_login",$_)) { ?> + <div class="sign-in-label sign-label"><?php p($l->t('Sign in to your account')); ?></div> + <div class="sign-in-label fp-label" style="display: none"><?php p($l->t('Forgot Password')); ?></div> + <?php } ?> </div> </header> <?php endif; ?> <main> <?php print_unescaped($_['content']); ?> </main> + <footer role="contentinfo" class="<?= (!array_key_exists("alt_login",$_)) ? 'pos-fixed':'' ?>"> + <p class="info"> + <?php print_unescaped($theme->getLongFooter()); ?> + </p> + </footer> </div> </div> - <footer role="contentinfo"> - <p class="info"> - <?php print_unescaped($theme->getLongFooter()); ?> - </p> - </footer> </body> </html> \ No newline at end of file