From e628a9138a7d1be9ceb1a5ea80eb369e121cbb8d Mon Sep 17 00:00:00 2001
From: Ronak Patel <ronak.patel@e.email>
Date: Tue, 21 Jun 2022 18:22:53 +0530
Subject: [PATCH 1/5] patch to add different favicon for each pages

---
 patches/018-login-favicon.patch | 11 +++++++++++
 1 file changed, 11 insertions(+)
 create mode 100644 patches/018-login-favicon.patch

diff --git a/patches/018-login-favicon.patch b/patches/018-login-favicon.patch
new file mode 100644
index 00000000..850b3c7d
--- /dev/null
+++ b/patches/018-login-favicon.patch
@@ -0,0 +1,11 @@
+--- ./core/templates/layout.user-new.php	2022-06-21 18:13:58.237856036 +0530
++++ ./core/templates/layout.user.php	2022-06-21 18:14:04.866259382 +0530
+@@ -18,7 +18,7 @@
+ 		<meta name="apple-mobile-web-app-title" content="<?php p((!empty($_['application']) && $_['appid'] != 'files')? $_['application']:$theme->getTitle()); ?>">
+ 		<meta name="mobile-web-app-capable" content="yes">
+ 		<meta name="theme-color" content="<?php p($theme->getColorPrimary()); ?>">
+-		<link rel="icon" href="<?php print_unescaped(image_path($_['appid'], 'favicon.ico')); /* IE11+ supports png */ ?>">
++		<link rel="icon" href="<?php print_unescaped(image_path($_['appid'], 'app.svg')); /* IE11+ supports png */ ?>">
+ 		<link rel="apple-touch-icon" href="<?php print_unescaped(image_path($_['appid'], 'favicon-touch.png')); ?>">
+ 		<link rel="apple-touch-icon-precomposed" href="<?php print_unescaped(image_path($_['appid'], 'favicon-touch.png')); ?>">
+ 		<link rel="mask-icon" sizes="any" href="<?php print_unescaped(image_path($_['appid'], 'favicon-mask.svg')); ?>" color="<?php p($theme->getColorPrimary()); ?>">
-- 
GitLab


From a1db05fd9cd61b8c2651b6b295ba9df721e9ded9 Mon Sep 17 00:00:00 2001
From: Ronak Patel <ronak.patel@e.email>
Date: Tue, 21 Jun 2022 18:26:16 +0530
Subject: [PATCH 2/5] Dockerfile change

---
 Dockerfile | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Dockerfile b/Dockerfile
index aae9a1de..ca8c6ee6 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -127,6 +127,7 @@ RUN patch -u ${BASE_DIR}/lib/private/legacy/OC_Helper.php -i ${TMP_PATCH_DIR}/01
 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 patch -u ${BASE_DIR}/lib/private/Authentication/Listeners/UserDeletedFilesCleanupListener.php -i ${TMP_PATCH_DIR}/017-storage-wrapper.patch
+RUN patch -u ${BASE_DIR}/core/templates/layout.user.php -i ${TMP_PATCH_DIR}/018-login-favicon.patch
 RUN rm -rf ${TMP_PATCH_DIR}
 
 # autocomplete leak tweak apps frontend with sed, disable group suggestion
-- 
GitLab


From a29b4576fb20a7de968dbf02f5e217ea3e9af7d9 Mon Sep 17 00:00:00 2001
From: Ronak Patel <ronak.patel@e.email>
Date: Tue, 21 Jun 2022 19:47:06 +0530
Subject: [PATCH 3/5] Docker bump version

---
 Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index ca8c6ee6..cf5c86ac 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -17,7 +17,7 @@ ARG ECLOUD_LAUNCHER_JOB_ID="318040"
 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,17/' ${BASE_DIR}/version.php
+RUN sed -i 's/22,2,8,1/22,2,8,18/' ${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
-- 
GitLab


From 4a96c31f78bfc4db885f25cdb2f87f3eb0608268 Mon Sep 17 00:00:00 2001
From: Ronak Patel <ronak.patel@e.email>
Date: Wed, 22 Jun 2022 00:15:35 +0530
Subject: [PATCH 4/5] color icons

---
 Dockerfile                      | 2 +-
 patches/018-login-favicon.patch | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index cf5c86ac..1df8398c 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -17,7 +17,7 @@ ARG ECLOUD_LAUNCHER_JOB_ID="318040"
 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,18/' ${BASE_DIR}/version.php
+RUN sed -i 's/22,2,8,1/22,2,8,19/' ${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
diff --git a/patches/018-login-favicon.patch b/patches/018-login-favicon.patch
index 850b3c7d..e50c7c7a 100644
--- a/patches/018-login-favicon.patch
+++ b/patches/018-login-favicon.patch
@@ -1,11 +1,11 @@
 --- ./core/templates/layout.user-new.php	2022-06-21 18:13:58.237856036 +0530
-+++ ./core/templates/layout.user.php	2022-06-21 18:14:04.866259382 +0530
++++ ./core/templates/layout.user.php	2022-06-22 00:09:19.494028933 +0530
 @@ -18,7 +18,7 @@
  		<meta name="apple-mobile-web-app-title" content="<?php p((!empty($_['application']) && $_['appid'] != 'files')? $_['application']:$theme->getTitle()); ?>">
  		<meta name="mobile-web-app-capable" content="yes">
  		<meta name="theme-color" content="<?php p($theme->getColorPrimary()); ?>">
 -		<link rel="icon" href="<?php print_unescaped(image_path($_['appid'], 'favicon.ico')); /* IE11+ supports png */ ?>">
-+		<link rel="icon" href="<?php print_unescaped(image_path($_['appid'], 'app.svg')); /* IE11+ supports png */ ?>">
++		<link rel="icon" href="<?php print_unescaped(image_path($_['appid'], 'app-color.svg')); /* IE11+ supports png */ ?>">
  		<link rel="apple-touch-icon" href="<?php print_unescaped(image_path($_['appid'], 'favicon-touch.png')); ?>">
  		<link rel="apple-touch-icon-precomposed" href="<?php print_unescaped(image_path($_['appid'], 'favicon-touch.png')); ?>">
  		<link rel="mask-icon" sizes="any" href="<?php print_unescaped(image_path($_['appid'], 'favicon-mask.svg')); ?>" color="<?php p($theme->getColorPrimary()); ?>">
-- 
GitLab


From 7c58339ae53563fb7502e501d51364672a5d83b0 Mon Sep 17 00:00:00 2001
From: Ronak Patel <ronak.patel@e.email>
Date: Wed, 22 Jun 2022 16:51:31 +0530
Subject: [PATCH 5/5] ico added

---
 Dockerfile                      | 2 +-
 patches/018-login-favicon.patch | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 1df8398c..67742499 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -17,7 +17,7 @@ ARG ECLOUD_LAUNCHER_JOB_ID="318040"
 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,19/' ${BASE_DIR}/version.php
+RUN sed -i 's/22,2,8,1/22,2,8,20/' ${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
diff --git a/patches/018-login-favicon.patch b/patches/018-login-favicon.patch
index e50c7c7a..d31ae588 100644
--- a/patches/018-login-favicon.patch
+++ b/patches/018-login-favicon.patch
@@ -5,7 +5,7 @@
  		<meta name="mobile-web-app-capable" content="yes">
  		<meta name="theme-color" content="<?php p($theme->getColorPrimary()); ?>">
 -		<link rel="icon" href="<?php print_unescaped(image_path($_['appid'], 'favicon.ico')); /* IE11+ supports png */ ?>">
-+		<link rel="icon" href="<?php print_unescaped(image_path($_['appid'], 'app-color.svg')); /* IE11+ supports png */ ?>">
++		<link rel="icon" href="<?php print_unescaped(image_path($_['appid'], 'favicon-color.ico')); /* IE11+ supports png */ ?>">
  		<link rel="apple-touch-icon" href="<?php print_unescaped(image_path($_['appid'], 'favicon-touch.png')); ?>">
  		<link rel="apple-touch-icon-precomposed" href="<?php print_unescaped(image_path($_['appid'], 'favicon-touch.png')); ?>">
  		<link rel="mask-icon" sizes="any" href="<?php print_unescaped(image_path($_['appid'], 'favicon-mask.svg')); ?>" color="<?php p($theme->getColorPrimary()); ?>">
-- 
GitLab