From 1ac260e625082766deeb56960d7a8f9ac44ab5ce Mon Sep 17 00:00:00 2001
From: wangjr <wangjr@pcl.ac.cn>
Date: Fri, 4 Mar 2022 18:04:22 +0800
Subject: [PATCH] =?UTF-8?q?fix-1250=20=E4=BF=AE=E6=94=B9=E6=A0=B7=E5=BC=8F?=
 =?UTF-8?q?,=E6=B2=A1=E6=9C=89=E6=A0=87=E7=AD=BE=E6=97=B6=E6=8A=98?=
 =?UTF-8?q?=E5=8F=A0=E6=8C=89=E9=92=AE=E4=B8=8D=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 templates/org/home.tmpl | 33 ++++++++++++++++++---------------
 web_src/less/openi.less | 13 +++++++++++--
 2 files changed, 29 insertions(+), 17 deletions(-)

diff --git a/templates/org/home.tmpl b/templates/org/home.tmpl
index 3ac59d079..2715cb649 100755
--- a/templates/org/home.tmpl
+++ b/templates/org/home.tmpl
@@ -1,3 +1,4 @@
+
 {{template "base/head" .}}
 <div class="organization profile">
 	{{/* overflow: auto is the clearfix - this avoids the image going beyond
@@ -26,7 +27,7 @@
 			
 			<div class="ui sixteen wide computer column">
 				<div class="ui mobile reversed stackable grid">
-					<div class="ui sixteen wide tablet sixteen wide computer column margin-top20 pad-botom maxheight"  id='key_tag'>
+					<div class="ui sixteen wide tablet sixteen wide computer column margin-bottom20 pad-botom maxheight"  id='key_tag'>
 						{{if .OrgTopics}}
 							<a class="{{if eq $.Keyword "" }} tag_bg {{end}} tag_key ui small tag_lable topic omit"  href="{{$.Link}}?" >{{$.i18n.Tr "org.all_org_topics"}}</span></a>
 						{{end}}
@@ -38,9 +39,12 @@
 								</a>
 							{{end}}
 						{{end}}
-					</div>
-					<div style="width: 100%;margin:5px 5px 10px;">
-						<a class="text-right" onclick="isUnfold()" id="icon_btn"><i class="ri-arrow-down-s-line" style="display:inline-block;vertical-align:top"></i>&nbsp{{.i18n.Tr "org.unfold"}}</a>
+						{{if .OrgTopics}}
+							<a  class=" tag_key ui small tag_lable topic omit icon_a" onclick="isUnfold()" id="icon_btn" >
+								<i class="ri-arrow-down-s-line" style="display:inline-block;vertical-align:top"></i>
+								&nbsp{{.i18n.Tr "org.unfold"}}	
+							</a>
+						{{end}}
 					</div>
 					
 				</div>
@@ -131,16 +135,15 @@
 
 <script>
 
-function isUnfold(){
-	var isContain= document.querySelector("#key_tag").classList.contains("maxheight");
-	if(isContain){
-		document.querySelector("#key_tag").classList.remove("maxheight");
-		document.getElementById("icon_btn").innerHTML="<i class=\"ri-arrow-up-s-line\" style=\"display:inline-block;vertical-align:top\"></i> &nbsp {{.i18n.Tr "org.fold"}}"
-	}else{
-		document.querySelector("#key_tag").classList.add("maxheight");
-		document.getElementById("icon_btn").innerHTML="<i class=\"ri-arrow-down-s-line\" style=\"display:inline-block;vertical-align:top\"></i> &nbsp {{.i18n.Tr "org.unfold"}}"
-
-
+	function isUnfold(){
+		var isContain= document.querySelector("#key_tag").classList.contains("maxheight");
+		if(isContain){
+			document.querySelector("#key_tag").classList.remove("maxheight");
+			document.getElementById("icon_btn").innerHTML="<i class=\"ri-arrow-up-s-line\" style=\"display:inline-block;vertical-align:top\"></i> &nbsp {{.i18n.Tr "org.fold"}}"
+		}else{
+			document.querySelector("#key_tag").classList.add("maxheight");
+			document.getElementById("icon_btn").innerHTML="<i class=\"ri-arrow-down-s-line\" style=\"display:inline-block;vertical-align:top\"></i> &nbsp {{.i18n.Tr "org.unfold"}}"
+		}
 	}
-}
+	
 </script>
\ No newline at end of file
diff --git a/web_src/less/openi.less b/web_src/less/openi.less
index ff43f94e6..1ff26dfad 100644
--- a/web_src/less/openi.less
+++ b/web_src/less/openi.less
@@ -759,8 +759,8 @@ display: block;
 	background-color: #0366D6 !important;
 	color:#FFFFFF !important;
 }
-.margin-top20{
-	margin-top: 20px;
+.margin-bottom20{
+	margin-bottom: 20px;
 }
 .maxheight{
 	max-height: 88px;
@@ -768,4 +768,13 @@ display: block;
 }
 .pad-botom{
 	padding-bottom:0px !important;
+}
+.icon_a{
+	position: absolute;
+	right: 0;
+	bottom: .2em;
+	background: #FFF;
+	border: none !important;
+	color: #0366d6 !important;
+	box-shadow: -15px 0px 10px #fff;
 }
\ No newline at end of file