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

Commit 30829564 authored by Ronak Patel's avatar Ronak Patel
Browse files

conflict

parents 593bb486 6db2294d

Dockerfile

+9 −7
Original line number Diff line number Diff line 
FROM nextcloud:22.2.8-fpm AS nextcloud

ARG BASE_DIR="/usr/src/nextcloud"

ARG TMP_PATCH_DIR="/tmp/build_patches"

ARG THEME_VERSION="22.1.0"

ARG THEME_VERSION="22.1.1"

ARG THEME_HELPER_VERSION="1.3.1"

ARG NEWS_VERSION="18.0.1"

ARG QUOTA_WARN_VERSION="1.14.0"

ARG NOTES_VERSION="4.3.1"

ARG CONTACTS_VERSION="4.1.1"

ARG CALENDAR_JOB_ID="321100"

ARG CONTACTS_JOB_ID="323110"

ARG CALENDAR_JOB_ID="324817"

ARG USER_BACKEND_RAW_SQL_VERSION="1.1.1"

ARG EMAIL_RECOVERY_JOB_ID="313915"

ARG RAINLOOP_VERSION="7.2.5"
@@ -40,10 +40,12 @@ RUN curl -fsSL -o notes.tar.gz \ 
    tar -xf notes.tar.gz -C ${BASE_DIR}/custom_apps/ && \

    rm notes.tar.gz;



RUN curl -fsSL -o contacts.tar.gz \

    "https://github.com/nextcloud-releases/contacts/releases/download/v${CONTACTS_VERSION}/contacts-v${CONTACTS_VERSION}.tar.gz" && \

    tar -xf contacts.tar.gz -C ${BASE_DIR}/custom_apps/ && \

    rm contacts.tar.gz;

# custom Contact

RUN curl -fsSL -o contacts.zip \

    "https://gitlab.e.foundation/e/infra/ecloud/nextcloud-apps/contacts/-/jobs/${CONTACTS_JOB_ID}/artifacts/download" && \

    unzip contacts.zip && \

    mv dist/contacts ${BASE_DIR}/custom_apps/ && \

    rm contacts.zip;



# custom Calendar 3.2.4

RUN curl -fsSL -o calendar.zip \

custom_entrypoint.sh

+0 −17
Original line number Diff line number Diff line
@@ -37,22 +37,5 @@ else 
    echo "Skipping rsync step as version not updated!"

fi



if [ "$(id -u)" = 0 ]; then

    su -p www-data -s /bin/sh -c "php $DST_DIR/occ app:disable apporder"

    su -p www-data -s /bin/sh -c "php $DST_DIR/occ app:enable murena_launcher"

    su -p www-data -s /bin/sh -c "php $DST_DIR/occ app:enable ecloud-theme-helper"

    su -p www-data -s /bin/sh -c "php $DST_DIR/occ app:disable ecloud_drop_account"

    su -p www-data -s /bin/sh -c "php $DST_DIR/occ app:enable ecloud-accounts"

    su -p www-data -s /bin/sh -c "php $DST_DIR/occ config:system:set integrity.check.disabled --value='true' --type=boolean"

    su -p www-data -s /bin/sh -c "php $DST_DIR/occ config:system:set theme --value='eCloud'"

else

    sh -c "php $DST_DIR/occ app:disable apporder"

    sh -c "php $DST_DIR/occ app:enable ecloud-launcher"

    sh -c "php $DST_DIR/occ app:enable ecloud-theme-helper"

    sh -c "php $DST_DIR/occ app:disable ecloud_drop_account"

    sh -c "php $DST_DIR/occ app:enable ecloud-accounts"

    sh -c "php $DST_DIR/occ config:system:set integrity.check.disabled --value='true' --type=boolean"

    sh -c "php $DST_DIR/occ config:system:set theme --value='eCloud'"

fi



/entrypoint.sh "$@"

patches/016-login-screen.patch

+10 −5
Original line number Diff line number Diff line 
--- ./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

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

@@ -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,18 +64,23 @@

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

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

 								<?php endif; ?>

 							</div>
@@ -53,10 +53,15 @@ 
 				<?php endif; ?>

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

+					<?php if (array_key_exists("alt_login",$_)) { ?>

+					<div class="have-an-account">

+						<div><?php p($l->t('Dont have an account yet?')); ?></div>

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

+					</div>

+					<?php } ?>

 				</main>

 			</div>

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

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

+					<p class="info">

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

+					</p>