From dcbc3650519aa77d4cfeef920bc76d31d27dda14 Mon Sep 17 00:00:00 2001 From: Ronak Patel Date: Sun, 22 May 2022 13:44:53 +0530 Subject: [PATCH 01/16] login screen patch added --- Dockerfile | 1 + patches/016-login-screen.patch | 38 ++++++++++++++++++++++++++++++++++ 2 files changed, 39 insertions(+) create mode 100644 patches/016-login-screen.patch diff --git a/Dockerfile b/Dockerfile index ec4268ec..83736e6b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -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.user.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 diff --git a/patches/016-login-screen.patch b/patches/016-login-screen.patch new file mode 100644 index 00000000..f2f98921 --- /dev/null +++ b/patches/016-login-screen.patch @@ -0,0 +1,38 @@ +--- /home/spearline/Desktop/ecloud/ecloud_dev_example/volumes/nextcloud/html/core/templates/layout.guest.php 2022-05-22 12:20:57.636986939 +0530 ++++ /home/spearline/Desktop/ecloud/ecloud_dev_example/volumes/nextcloud/html/core/templates/layout.guest-new.php 2022-05-22 12:00:04.056663525 +0530 +@@ -28,7 +28,26 @@ + $initialState) { ?> + + +-
++
++ +
+ +
+@@ -42,6 +61,7 @@ + + +
++ +
+ + -- GitLab From e0c2c5096b297d81695f20c69bf8c8deafeb6ccd Mon Sep 17 00:00:00 2001 From: Ronak Patel Date: Sun, 22 May 2022 13:48:43 +0530 Subject: [PATCH 02/16] login screen patch added #1 --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 83736e6b..ccab3de1 100644 --- a/Dockerfile +++ b/Dockerfile @@ -117,7 +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.user.php -i ${TMP_PATCH_DIR}/016-login-screen.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 -- GitLab From 87b165e7b87d7db6c5a12670c099743884fe9f28 Mon Sep 17 00:00:00 2001 From: Ronak Patel Date: Mon, 23 May 2022 11:03:03 +0530 Subject: [PATCH 03/16] footer change --- patches/016-login-screen.patch | 23 ++++++++++++++++++++--- 1 file changed, 20 insertions(+), 3 deletions(-) diff --git a/patches/016-login-screen.patch b/patches/016-login-screen.patch index f2f98921..684d14d7 100644 --- a/patches/016-login-screen.patch +++ b/patches/016-login-screen.patch @@ -1,5 +1,5 @@ ---- /home/spearline/Desktop/ecloud/ecloud_dev_example/volumes/nextcloud/html/core/templates/layout.guest.php 2022-05-22 12:20:57.636986939 +0530 -+++ /home/spearline/Desktop/ecloud/ecloud_dev_example/volumes/nextcloud/html/core/templates/layout.guest-new.php 2022-05-22 12:00:04.056663525 +0530 +--- /home/spearline/Desktop/ecloud/ecloud_dev_example/volumes/nextcloud/html/core/templates/layout.guest.php 2022-05-23 11:01:02.009981450 +0530 ++++ /home/spearline/Desktop/ecloud/ecloud_dev_example/volumes/nextcloud/html/core/templates/layout.guest-new.php 2022-05-23 11:00:51.170803402 +0530 @@ -28,7 +28,26 @@ $initialState) { ?> @@ -28,7 +28,7 @@
-@@ -42,6 +61,7 @@ +@@ -42,18 +61,19 @@
@@ -36,3 +36,20 @@
+
+ +
++ + + +- + + -- GitLab From 46e3bac27d519739569f5fa6c6872d44e108eaaf Mon Sep 17 00:00:00 2001 From: Ronak Patel Date: Mon, 23 May 2022 15:37:16 +0530 Subject: [PATCH 04/16] replaced button with anchor --- patches/016-login-screen.patch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/patches/016-login-screen.patch b/patches/016-login-screen.patch index 684d14d7..f6e02b6a 100644 --- a/patches/016-login-screen.patch +++ b/patches/016-login-screen.patch @@ -21,7 +21,7 @@ + + + + + -- GitLab From 145b32cead64960fb09d598a2ed3b107f536ebec Mon Sep 17 00:00:00 2001 From: Ronak Patel Date: Mon, 23 May 2022 18:13:39 +0530 Subject: [PATCH 05/16] added condition for warning messages --- patches/016-login-screen.patch | 51 +++++++++++++++++++--------------- 1 file changed, 29 insertions(+), 22 deletions(-) diff --git a/patches/016-login-screen.patch b/patches/016-login-screen.patch index f6e02b6a..1918852d 100644 --- a/patches/016-login-screen.patch +++ b/patches/016-login-screen.patch @@ -1,41 +1,48 @@ ---- /home/spearline/Desktop/ecloud/ecloud_dev_example/volumes/nextcloud/html/core/templates/layout.guest.php 2022-05-23 11:01:02.009981450 +0530 -+++ /home/spearline/Desktop/ecloud/ecloud_dev_example/volumes/nextcloud/html/core/templates/layout.guest-new.php 2022-05-23 11:00:51.170803402 +0530 -@@ -28,7 +28,26 @@ +--- /home/murena/Desktop/ecloud/ecloud_dev_example/volumes/nextcloud/html/core/templates/layout.guest.php 2022-05-23 18:11:48.179757539 +0530 ++++ /home/murena/Desktop/ecloud/ecloud_dev_example/volumes/nextcloud/html/core/templates/layout.guest-new.php 2022-05-23 18:10:19.561537037 +0530 +@@ -28,8 +28,29 @@ $initialState) { ?> -
+-
+
-+