From 7c3057946bea7a4cb8d5345949abca535726f401 Mon Sep 17 00:00:00 2001
From: Kijin Sung <kijin@kijinsung.com>
Date: Wed, 25 Nov 2020 00:17:50 +0900
Subject: [PATCH] Add official Rhymix logo to install screen

---
 common/img/logo.svg                      |  1 +
 modules/install/tpl/css/install.css      | 16 ++--------------
 modules/install/tpl/footer.html          |  5 ++---
 modules/install/tpl/header.html          |  2 +-
 modules/install/tpl/license_text.en.html |  4 ++--
 modules/install/tpl/license_text.ko.html |  4 ++--
 6 files changed, 10 insertions(+), 22 deletions(-)
 create mode 100644 common/img/logo.svg

diff --git a/common/img/logo.svg b/common/img/logo.svg
new file mode 100644
index 000000000..1c820da4a
--- /dev/null
+++ b/common/img/logo.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 2000 468"><defs><style>.a{fill:none;}.b{fill:#e03e48;}.c{clip-path:url(#a);}.d{fill:#34373a;}</style><clipPath id="a"><rect class="a" width="2000" height="468"/></clipPath></defs><polygon class="b" points="1896.17 231.65 1723.75 1.87 1598.44 1.97 1770.87 231.74 1666.13 371.98 1793.31 371.89 1896.17 231.65"/><g class="c"><path class="d" d="M0,.42H223q55.74,0,81,25.21t25.22,81v47.78q0,44.07-14.6,68.48t-46.45,32.38L334.45,372H230.93L169.88,260.54H95.56V372H0ZM241.6,106.59q0-31.86-31.85-31.85H103.57V186.22H209.75q31.84,0,31.85-31.85Z"/><path class="d" d="M468.9,96q51.48-10.6,90.25-10.62H583q36.09,0,57.86,21.77T662.66,165V372h-92.9V175.6A18.13,18.13,0,0,0,551.18,157H532.6a295.19,295.19,0,0,0-36.89,2.13q-16.72,2.11-26.81,3.18V372H376V.42h92.9Z"/><path class="d" d="M784.76,467.58q-28.14,0-69-5.31v-69h47.77q20.18,0,26.28-11.15t-2.39-31.32L678.59,90.66H776.8l66.36,180.5L898.9,90.66h98.21l-106.18,292q-15.4,41.94-39.81,63.44t-66.36,21.5"/><path class="d" d="M1210,85.35q43,0,66.35,31.86a176.74,176.74,0,0,1,52.83-24.16q28.38-7.68,50.69-7.7h5.31q36.09,0,57.87,21.77T1464.77,165V372h-92.9V180.91a18.15,18.15,0,0,0-18.58-18.58h-2.65q-23.9,0-61.06,10.62V372h-92.9V180.91a18.13,18.13,0,0,0-18.57-18.58h-2.66q-23.88,0-61,10.62V372h-92.9V90.66h82.28l5.31,26.55a190.15,190.15,0,0,1,51.23-24.16q26.28-7.68,44.33-7.7Z"/><polygon class="d" points="1628.88 101.28 1628.88 372.02 1535.98 372.02 1535.98 172.95 1496.16 172.95 1496.16 101.28 1628.88 101.28"/><polygon class="d" points="1872.82 91.7 2000 91.52 1911.56 209.99 1847.44 126.33 1872.82 91.7"/><polygon class="d" points="1911.31 253.06 2000 372.02 1874.83 372.02 1849.11 336.98 1911.31 253.06"/></g></svg>
\ No newline at end of file
diff --git a/modules/install/tpl/css/install.css b/modules/install/tpl/css/install.css
index 8739cc3f0..0fb8f2c7b 100644
--- a/modules/install/tpl/css/install.css
+++ b/modules/install/tpl/css/install.css
@@ -34,25 +34,13 @@ img, form, fieldset { border: 0; margin:0; padding: 0; }
 	margin: 0;
 }
 .x #header h1 {
-	font: bold 54px/100% Cambria, Georgia, serif;
 	color: #444;
 	text-align: center;
 	text-shadow: 2px 2px 3px rgba(128, 128, 128, 0.4);
 	margin: 0 0 24px 0;
 }
-.x #header h1 span.green {
-	color: #55a72f;
-}
-.x #header h1 span.brown {
-	color: #905a29;
-}
-.x #header h1 span.red {
-	color: #ef5350;
-}
-.x #header h1 span.colon {
-	color: #888888;
-	position: relative;
-	top: -4px;
+.x #header img {
+	width: 180px;
 }
 .x #header h2 {
 	font: normal 16px/110% Arial, sans-serif;
diff --git a/modules/install/tpl/footer.html b/modules/install/tpl/footer.html
index e8fa93043..616b8799e 100644
--- a/modules/install/tpl/footer.html
+++ b/modules/install/tpl/footer.html
@@ -6,9 +6,8 @@
 		</li>
 	</ul>
 	<div id="footer">
-		Rhymix is a fork of the <a href="https://xe1.xpressengine.com" target="_blank">XpressEngine</a> CMS<br />
-		with additional patches by members of the <a href="https://xetown.com" target="_blank">XETOWN</a> community.<br />
-		Please see our <a href="https://github.com/rhymix/rhymix" target="_blank">GitHub repository</a> for a full timeline of patches and their authors.
+		Rhymix is based on the XpressEngine CMS owned by XEHub,<br />
+		but it has been an independent project since 2015.
 	</div>
 
 </div>
diff --git a/modules/install/tpl/header.html b/modules/install/tpl/header.html
index 26ca1dde9..3eca82454 100644
--- a/modules/install/tpl/header.html
+++ b/modules/install/tpl/header.html
@@ -3,6 +3,6 @@
 
 <div class="x"|cond="$lang_type == 'ko'" class="x enfont"|cond="$lang_type != 'ko'">
 	<div id="header">
-		<h1><span class="green">rhymi</span><span class="red">x</span></h1>
+		<h1><img src="../../../common/img/logo.svg" alt="Rhymix" /></h1>
 		<h2>Version <strong>{__XE_VERSION__}</strong> Installation</h2>
 	</div>
diff --git a/modules/install/tpl/license_text.en.html b/modules/install/tpl/license_text.en.html
index 6dd233ba0..cea59fb5e 100644
--- a/modules/install/tpl/license_text.en.html
+++ b/modules/install/tpl/license_text.en.html
@@ -1,6 +1,6 @@
 <p>
 	Copyright &copy; Rhymix Developers and Contributors<br />
-	Copyright &copy; <a href="http://www.navercorp.com" target="_blank">NAVER</a>
+	Copyright &copy; <a href="https://navercorp.com/" target="_blank">NAVER</a> &amp; <a href="https://www.xehub.io/" target="_blank">XEHub</a>
 </p>
 
 <p>
@@ -10,7 +10,7 @@
 </p>
 
 <ul>
-	<li>Official website: <a href="https://www.rhymix.org" target="_blank">https://www.rhymix.org</a></li>
+	<li>Official website: <a href="https://rhymix.org" target="_blank">https://rhymix.org</a></li>
 	<li>Source code repository: <a href="https://github.com/rhymix/rhymix" target="_blank">https://github.com/rhymix/rhymix</a></li>
 </ul>
 
diff --git a/modules/install/tpl/license_text.ko.html b/modules/install/tpl/license_text.ko.html
index a734e70bf..f41eb4de0 100644
--- a/modules/install/tpl/license_text.ko.html
+++ b/modules/install/tpl/license_text.ko.html
@@ -1,6 +1,6 @@
 <p>
 	Copyright &copy; Rhymix Developers and Contributors<br />
-	Copyright &copy; <a href="http://www.navercorp.com" target="_blank">NAVER</a>
+	Copyright &copy; <a href="https://navercorp.com/" target="_blank">NAVER</a> &amp; <a href="https://www.xehub.io/" target="_blank">XEHub</a>
 </p>
 
 <p>
@@ -10,7 +10,7 @@
 </p>
 
 <ul>
-	<li>공식 사이트: <a href="https://www.rhymix.org" target="_blank">https://www.rhymix.org</a></li>
+	<li>공식 사이트: <a href="https://rhymix.org" target="_blank">https://rhymix.org</a></li>
 	<li>소스 코드 저장소: <a href="https://github.com/rhymix/rhymix" target="_blank">https://github.com/rhymix/rhymix</a></li>
 </ul>