From c79af4bed727cc7ce9d12dff8aea698a63e0b4c4 Mon Sep 17 00:00:00 2001
From: wangjr <wangjr@pcl.ac.cn>
Date: Fri, 7 Jan 2022 14:40:28 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=9B=BE=E6=A0=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 options/locale/locale_en-US.ini          |  4 ++--
 templates/base/footer_content.tmpl       |  9 +++++----
 templates/base/footer_content_fluid.tmpl |  8 ++++----
 templates/base/head.tmpl                 |  1 +
 templates/base/head_fluid.tmpl           |  1 +
 templates/base/head_pro.tmpl             |  3 ++-
 web_src/less/openi.less                  | 15 ++++++++++++---
 7 files changed, 27 insertions(+), 14 deletions(-)

diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini
index beb968449..d07e048bf 100644
--- a/options/locale/locale_en-US.ini
+++ b/options/locale/locale_en-US.ini
@@ -2697,5 +2697,5 @@ foot.member_news = Member news
 foot.industry_advisory = Industry Advisory
 foot.help = help
 foot.copyright= Copyright: New Generation Artificial Intelligence Open Source Open Platform (OpenI)
-Platform_Tutorial=Platform Tutorial
-foot.advice_feedback=advice feedback
+Platform_Tutorial = Tutorial
+foot.advice_feedback = Feedback
diff --git a/templates/base/footer_content.tmpl b/templates/base/footer_content.tmpl
index 9a708fc2c..85f8eb576 100755
--- a/templates/base/footer_content.tmpl
+++ b/templates/base/footer_content.tmpl
@@ -26,12 +26,13 @@
 								{{end}}
 							</div>
 						</div>
-						<a href="https://git.openi.org.cn/zeizei/OpenI_Learning" class="ui item" target="_blank">{{.i18n.Tr "custom.Platform_Tutorial"}}</a>
-						{{if .EnableSwagger}}<a href="/api/swagger" class="ui item">API</a>{{end}}
+
+						<a href="https://git.openi.org.cn/zeizei/OpenI_Learning" class=" item a_margin" target="_blank"><i class="ri-creative-commons-by-line footer_icon" ></i><p class="footer_icon">{{.i18n.Tr "custom.Platform_Tutorial"}}</p> </a>
+						{{if .EnableSwagger}}<a href="/api/swagger" class=" item a_margin"><i class="ri-exchange-line footer_icon" > </i><p class="footer_icon">API</p> </a>{{end}}
 						{{if .IsSigned}}
-							<a href="https://git.openi.org.cn/zeizei/OpenI_Learning/issues/new" class="ui item" target="_blank">{{.i18n.Tr "custom.foot.advice_feedback"}}</a>
+							<a href="https://git.openi.org.cn/zeizei/OpenI_Learning/issues/new" class=" item a_margin" target="_blank"><i class="ri-mail-send-line footer_icon"></i><p class="footer_icon">{{.i18n.Tr "custom.foot.advice_feedback"}}</p></a>
 						{{else}}
-							<a href="{{AppSubUrl}}/user/login" class="ui item">{{.i18n.Tr "custom.foot.advice_feedback"}}</a>
+							<a href="{{AppSubUrl}}/user/login" class=" item a_margin" ><i class="ri-mail-send-line"  ></i><p class="footer_icon footer_icon">{{.i18n.Tr "custom.foot.advice_feedback"}}</p></a>
 						{{end}}
 
 						{{template "custom/extra_links_footer" .}}
diff --git a/templates/base/footer_content_fluid.tmpl b/templates/base/footer_content_fluid.tmpl
index 8d9f2ba40..8c734c1b2 100644
--- a/templates/base/footer_content_fluid.tmpl
+++ b/templates/base/footer_content_fluid.tmpl
@@ -26,12 +26,12 @@
 								{{end}}
 							</div>
 						</div>
-						<a href="https://git.openi.org.cn/zeizei/OpenI_Learning" class="ui item" target="_blank">{{.i18n.Tr "custom.Platform_Tutorial"}}</a>
-						{{if .EnableSwagger}}<a href="/api/swagger" class="ui item">API</a>{{end}}
+						<a href="https://git.openi.org.cn/zeizei/OpenI_Learning" class=" item a_margin" target="_blank"><i class="ri-creative-commons-by-line footer_icon" ></i><p class="footer_icon">{{.i18n.Tr "custom.Platform_Tutorial"}}</p> </a>
+						{{if .EnableSwagger}}<a href="/api/swagger" class=" item a_margin"><i class="ri-exchange-line footer_icon" > </i><p class="footer_icon">API</p> </a>{{end}}
 						{{if .IsSigned}}
-							<a href="https://git.openi.org.cn/zeizei/OpenI_Learning/issues/new" class="ui item" target="_blank">{{.i18n.Tr "custom.foot.advice_feedback"}}</a>
+							<a href="https://git.openi.org.cn/zeizei/OpenI_Learning/issues/new" class=" item a_margin" target="_blank"><i class="ri-mail-send-line footer_icon"></i><p class="footer_icon">{{.i18n.Tr "custom.foot.advice_feedback"}}</p></a>
 						{{else}}
-							<a href="{{AppSubUrl}}/user/login" class="ui item">{{.i18n.Tr "custom.foot.advice_feedback"}}</a>
+							<a href="{{AppSubUrl}}/user/login" class=" item a_margin" ><i class="ri-mail-send-line"  ></i><p class="footer_icon footer_icon">{{.i18n.Tr "custom.foot.advice_feedback"}}</p></a>
 						{{end}}
 						{{template "custom/extra_links_footer" .}}
 					</div>
diff --git a/templates/base/head.tmpl b/templates/base/head.tmpl
index 8f360a637..93002b1e3 100755
--- a/templates/base/head.tmpl
+++ b/templates/base/head.tmpl
@@ -174,6 +174,7 @@
 {{else if ne DefaultTheme "gitea"}}
 	<link rel="stylesheet" href="{{StaticUrlPrefix}}/css/theme-{{DefaultTheme}}.css?v={{MD5 AppVer}}">
 {{end}}
+<link rel="stylesheet" href="/RemixIcon_Fonts_v2.5.0/fonts/remixicon.css">
 {{template "custom/header" .}}
 
 <script>
diff --git a/templates/base/head_fluid.tmpl b/templates/base/head_fluid.tmpl
index 15c247c9d..c54ca0fed 100644
--- a/templates/base/head_fluid.tmpl
+++ b/templates/base/head_fluid.tmpl
@@ -174,6 +174,7 @@
 {{else if ne DefaultTheme "gitea"}}
 	<link rel="stylesheet" href="{{StaticUrlPrefix}}/css/theme-{{DefaultTheme}}.css?v={{MD5 AppVer}}">
 {{end}}
+<link rel="stylesheet" href="/RemixIcon_Fonts_v2.5.0/fonts/remixicon.css">
 {{template "custom/header" .}}
 
 <script>
diff --git a/templates/base/head_pro.tmpl b/templates/base/head_pro.tmpl
index fdb03493f..8f7f41ddc 100644
--- a/templates/base/head_pro.tmpl
+++ b/templates/base/head_pro.tmpl
@@ -174,6 +174,7 @@
 {{else if ne DefaultTheme "gitea"}}
 	<link rel="stylesheet" href="{{StaticUrlPrefix}}/css/theme-{{DefaultTheme}}.css?v={{MD5 AppVer}}">
 {{end}}
+<link rel="stylesheet" href="/RemixIcon_Fonts_v2.5.0/fonts/remixicon.css">
 {{template "custom/header" .}}
 
 <script>
@@ -232,7 +233,7 @@ var _hmt = _hmt || [];
 		}else{
 			isNewNotice=false;
 		}
-		if (JSON.parse("{{.notice.Visible}}")){
+		if ("{{.notice.Visible}}"){
 			if(isNewNotice){
 				document.getElementById("notic_content").style.display='block'
 			}else{
diff --git a/web_src/less/openi.less b/web_src/less/openi.less
index 304242ea3..dd107e8f0 100644
--- a/web_src/less/openi.less
+++ b/web_src/less/openi.less
@@ -597,10 +597,19 @@ display: block;
 	background: #E5F4F4
 }
 .x_icon{
-	float: right;
+	float: right!important;
 	margin-right: 15px !important;
 }
 .a_width{
-	width: 50%;
-	display:inline-block
+	width: 50% !important;
+	display:inline-block !important;
+}
+
+.footer_icon{
+	display: inline-block !important;
+	vertical-align: middle !important;
+	margin-right:0.8em !important;
+}
+.a_margin{
+	margin: 0px !important;
 }
\ No newline at end of file

From 3ac158c6445ceab91e152faa67b72b6b9ea4c424 Mon Sep 17 00:00:00 2001
From: wangjr <wangjr@pcl.ac.cn>
Date: Fri, 7 Jan 2022 14:46:17 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E5=A2=9E=E5=8A=A0Visible=E5=8F=AF=E8=A7=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 templates/base/head_pro.tmpl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/templates/base/head_pro.tmpl b/templates/base/head_pro.tmpl
index 8f7f41ddc..10d86f809 100644
--- a/templates/base/head_pro.tmpl
+++ b/templates/base/head_pro.tmpl
@@ -233,7 +233,7 @@ var _hmt = _hmt || [];
 		}else{
 			isNewNotice=false;
 		}
-		if ("{{.notice.Visible}}"){
+		if (JSON.parse("{{.notice.Visible}}")){
 			if(isNewNotice){
 				document.getElementById("notic_content").style.display='block'
 			}else{