From fca6ddda3bfa7c81b46814ee9eee100d6169a870 Mon Sep 17 00:00:00 2001
From: wangjr <wangjr@pcl.ac.cn>
Date: Thu, 20 Jan 2022 12:49:33 +0800
Subject: [PATCH] =?UTF-8?q?=E5=85=B3=E9=94=AE=E5=AD=97=E4=B8=BA=E7=A9=BA?=
 =?UTF-8?q?=E4=B8=B2=E4=B8=8D=E6=98=BE=E7=A4=BA=EF=BC=8C=E5=88=A0=E9=99=A4?=
 =?UTF-8?q?=E6=97=A0=E7=94=A8=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 templates/org/home_courses.tmpl | 97 +++++++----------------------------------
 1 file changed, 15 insertions(+), 82 deletions(-)

diff --git a/templates/org/home_courses.tmpl b/templates/org/home_courses.tmpl
index 70ea9b421..e5ab51aa7 100644
--- a/templates/org/home_courses.tmpl
+++ b/templates/org/home_courses.tmpl
@@ -84,22 +84,6 @@
 <div class="organization profile">
 	{{/* overflow: auto is the clearfix - this avoids the image going beyond
 	the container where it is supposed to stay inside. */}}
-	<!-- <div class="organization-info">
-		<div class="ui center aligned container " style="overflow: auto">
-			<img class="ui circular image" id="org-avatar" src="{{.Org.SizedRelAvatarLink 140}}"/>
-			<div id="org-info">
-				<div class="ui header">
-					{{.Org.DisplayName}}
-					{{if .IsOrganizationOwner}}<a class="middle text grey" href="{{.OrgLink}}/settings">{{svg "octicon-gear" 16}}</a>{{end}}
-				</div>
-				{{if .Org.Description}}<p class="text grey desc">{{.Org.Description}}</p>{{end}}
-				<div class="meta">
-					{{if .Org.Location}}<div class="item">{{svg "octicon-location" 16}} <span>{{.Org.Location}}</span></div>{{end}}
-					{{if .Org.Website}}<div class="item">{{svg "octicon-link" 16}} <a target="_blank" rel="noopener noreferrer" href="{{.Org.Website}}">{{.Org.Website}}</a></div>{{end}}
-				</div>
-			</div>
-		</div>
-	</div> -->
 
 	<div class="organization-info organization-info_1000">
 		<div class="ui center aligned container " style="overflow: auto">
@@ -107,7 +91,6 @@
 			<div class="content"  style="text-align: left;margin-left:100px" >
 				<div class="ui header" >
 					{{.Org.DisplayName}}
-					<!-- {{if .IsOrganizationOwner}}<a class="middle text grey" href="{{.OrgLink}}/settings">{{svg "octicon-gear" 16}}</a>{{end}} -->
 				</div>
 				<div class="description" >
 					{{if .Org.Description}}<p class="text grey desc">{{.Org.Description}}</p>{{end}}
@@ -120,23 +103,7 @@
 			</div>
 		</div>		
 	</div>
-		{{template "org/navber_course" .}}
-
-
-		<!-- <div class="ui  container " style="overflow: auto">
-			<img class="ui left  image" id="org-avatar" src="{{.Org.SizedRelAvatarLink 140}}"/>
-			<p id="org-info">
-				<div class="ui header">
-					{{.Org.DisplayName}}
-					{{if .IsOrganizationOwner}}<a class="middle text grey" href="{{.OrgLink}}/settings">{{svg "octicon-gear" 16}}</a>{{end}}
-				</div>
-				{{if .Org.Description}}<p class="text grey desc">{{.Org.Description}}</p>{{end}}
-				<div class="meta">
-					{{if .Org.Location}}<div class="item">{{svg "octicon-location" 16}} <span>{{.Org.Location}}</span></div>{{end}}
-					{{if .Org.Website}}<div class="item">{{svg "octicon-link" 16}} <a target="_blank" rel="noopener noreferrer" href="{{.Org.Website}}">{{.Org.Website}}</a></div>{{end}}
-				</div>
-			</p>
-		</div> -->
+	{{template "org/navber_course" .}}
 
 	<div class="ui container">
 
@@ -148,11 +115,13 @@
 					<div class="ui ten wide tablet eleven wide computer column" id='tag'>
 	
 						<a class="{{if eq $.Keyword "" }} tag_bg {{end}} tag_key ui small tag_lable topic omit"  href="{{$.Link}}?"  >全部关键字</span></a>
+
                         {{range .CoursesKeywords}}
-                            <!-- <a class="ui small lable tag_lable topic" >{{.}}</a> -->
-							<a  class="{{if eq $.Keyword . }} tag_bg {{end}} tag_key ui small tag_lable topic omit" href="{{$.Link}}?q={{.}}" >
-								 {{.}}
-							</a>
+							{{if ne . ""}}
+								<a  class="{{if eq $.Keyword . }} tag_bg {{end}} tag_key ui small tag_lable topic omit" href="{{$.Link}}?q={{.}}" >
+									{{.}}
+								</a>
+							{{end}}
                         {{end}}
 					</div>
 				
@@ -174,11 +143,6 @@
 			<div class="ui sixteen wide computer column">
 				<div class="ui mobile reversed stackable grid">
 					<div class="ui ten wide tablet eleven wide computer column">
-						<!-- {{if .CanCreateOrgRepo}}
-							<div class="text right">
-								<a class="ui green button" href="{{AppSubUrl}}/repo/create?org={{.Org.ID}}">{{.i18n.Tr "new_repo"}}</a>
-							</div>
-						{{end}} -->
 						{{template "org/course_list" .}}
 						{{template "base/paginate" .}}
 					</div>
@@ -190,9 +154,6 @@
 							<div class="ui right">
 								<a class="text grey"  id="model" onclick="showcreate()">{{svg "octicon-gear" 16}}</a>
 							</div>
-							<!-- {{if .IsOrganizationMember}} -->
-								
-							<!-- {{end}} -->
 						</h4>
                
 						<div class="ui attached table segment course items noborder">
@@ -209,9 +170,9 @@
                                                 <a href="{{.Link}}"><strong class="team-name">{{.Alias}}</strong></a>
                                                 <p class="text grey">
 												    {{if ne .CreatorID 0}}
-                                                    贡献者：{{.Creator.Name}}
+                                                    	贡献者：{{.Creator.Name}}
 													{{else}}
-													贡献者：{{.Owner.Name}}
+														贡献者：{{.Owner.Name}}
 													{{end}}
                                                 </p>
                                             </div>
@@ -229,9 +190,6 @@
 							<div class="ui right">
 								<a class="text grey" href="{{.OrgLink}}/members">{{.MembersTotal}} {{svg "octicon-chevron-right" 16}}</a>
 							</div>
-							<!-- {{if .IsOrganizationMember}} -->
-								
-							<!-- {{end}} -->
 						</h4>
 						<div class="ui attached segment members noborder">
 							{{$isMember := .IsOrganizationMember}}
@@ -311,30 +269,6 @@
 
 {{template "base/footer" .}}
 <script>
-	// var div = document.getElementsByClassName("ui ten wide tablet eleven wide computer column").getElementsByTagName("a");
-	// function changeBgcolor(){
-
-	// 	document.getElementsByClassName("ui small lable tag_lable topic tag_bg").className= "ui small lable tag_lable topic";
-	// 	// this.classList.add("tag_bg")
-	// }
-
-	// window.onload = function (){
-	// // function changeBgcolor (obj){
-	// 	// document.getElementsByTagName("search_selectPro").value=''
-	// 	// obj.getElementsByTagName('span').className = "ui small tag_lable topic omit tag_bg";
-	// 	var atag =document.getElementById("tag").getElementsByTagName("a");
-
-	// 	var i = 0;
-	// 	for (i = 0; i < atag.length; i++){
-	// 			atag[i].onclick = function ()
-	// 			{
-	// 				for (i = 0; i < atag.length; i++)
-	// 					atag[i].getElementsByTagName('span')[0].className = "ui small tag_lable topic omit";
-	// 					this.getElementsByTagName('span')[0].className = "ui small tag_lable topic omit tag_bg";
-	// 			};
-	// 	}
-	// };
-
     var data;
     var filterData=[];
     var num=0;
@@ -390,7 +324,7 @@
     function saveSeletedPro(typeTag){
         var saveData=[];
         $('input[name="select_pro_name"]:checked').each(function(){
-            console.log('值',this.dataset.repoid)
+            // console.log('值',this.dataset.repoid)
 
             saveData.push(parseInt(this.dataset.repoid));
         })
@@ -398,8 +332,7 @@
             alert("最多可选9个，保存失败")
             return
         }
-        // saveData = getSelecteDataID();
-        // console.log("数据：",saveData)
+
         $.ajax({
          type:"POST",
          url:"/org/{{.Org.Name}}/org_tag/repo_submit?tagId="+typeTag,
@@ -409,7 +342,7 @@
          data:JSON.stringify({'repoList':saveData
                }),        
            success:function(res){
-             console.log('保存成功');
+            //  console.log('保存成功');
              location.reload()  
 
           }
@@ -437,15 +370,15 @@
                 filterData.push(data[i])
             }
         }
-        console.log("选中的值:",selectedData)
-        console.log("筛选包括选中的值:",filterData)
+        // console.log("选中的值:",selectedData)
+        // console.log("筛选包括选中的值:",filterData)
         var showData=[];
         for(i=0;i<selectedData.length;i++){
             filterData =filterData.filter((item)=>{
                 return item.RepoID!=selectedData[i].RepoID
             });
         }
-        console.log("筛选后不包括选中的值:",filterData)
+        // console.log("筛选后不包括选中的值:",filterData)
         $("#org_list").empty()
         if(searchValue!=""){
             if (filterData.length!=0){