From 0623956cd809648ad13ca672db75667421f56934 Mon Sep 17 00:00:00 2001
From: wangjr <wangjr@pcl.ac.cn>
Date: Mon, 24 Jan 2022 16:00:00 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9#1446,=E7=BB=84=E7=BB=87?=
 =?UTF-8?q?=E6=88=90=E5=91=98=E4=BF=AE=E6=94=B9=E7=BB=84=E7=BB=87=E6=88=90?=
 =?UTF-8?q?=E5=91=98=E4=B8=BA=E6=96=B0=E5=BB=BA=E7=BB=84=E7=BB=87=EF=BC=8C?=
 =?UTF-8?q?=E7=BB=84=E7=BB=87=E5=9B=A2=E9=98=9F=E4=B8=BA=E6=96=B0=E5=BB=BA?=
 =?UTF-8?q?=E5=9B=A2=E9=98=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 templates/org/header.tmpl                | 57 +++++++++++++++++++-----
 templates/org/header_course.tmpl         | 32 +++++++++++++
 templates/org/member/course_members.tmpl |  2 +
 templates/org/team/courseTeams.tmpl      |  2 +-
 templates/repo/createCourse.tmpl         |  2 +-
 5 files changed, 82 insertions(+), 13 deletions(-)
 create mode 100644 templates/org/header_course.tmpl

diff --git a/templates/org/header.tmpl b/templates/org/header.tmpl
index 01d15a4cd..13d0b0511 100644
--- a/templates/org/header.tmpl
+++ b/templates/org/header.tmpl
@@ -8,21 +8,56 @@
 					<img class="ui image" src="{{.SizedRelAvatarLink 100}}">
 					<span class="text thin grey"><a href="{{.HomeLink}}">{{.DisplayName}}</a></span>
 					{{end}}
-					
-				{{if .IsOrganizationOwner}}
-					<div class="ui right">
-						<a class="ui green button" href="{{.OrgLink}}/teams/new">{{svg "octicon-plus" 16}} {{.i18n.Tr "org.create_new_team"}}</a>
-					</div>
-				{{end}}
-				{{if .CanCreateOrgRepo}}
-					<div class="ui right">
-						<a class="ui green button" href="{{AppSubUrl}}/repo/create?org={{.Org.ID}}">{{svg "octicon-plus" 16}} {{.i18n.Tr "new_repo"}}</a>
-					</div>
-				{{end}}
+				{{if .IsCourse}}
+					{{if .CanCreateOrgRepo}}
+						<div class="ui right">
+							<a class="ui green button" onclick="jion_course_team()">{{svg "octicon-plus" 16}} {{.i18n.Tr "org.teams.join_teams"}}</a>
+						</div>
+					{{end}}
+				{{else}}
+					{{if .IsOrganizationOwner}}
+						<div class="ui right">
+							<a class="ui green button" href="{{.OrgLink}}/teams/new">{{svg "octicon-plus" 16}} {{.i18n.Tr "org.create_new_team"}}</a>
+						</div>
+					{{end}}
+					{{if .CanCreateOrgRepo}}
+						<div class="ui right">
+							<a class="ui green button" href="{{AppSubUrl}}/repo/create?org={{.Org.ID}}">{{svg "octicon-plus" 16}} {{.i18n.Tr "new_repo"}}</a>
+						</div>
+					{{end}}
+				{{end}}	
 				</div>
 			</div>
 		</div>
 	</div>
 </div>
 
+<script>
+
+	function jion_course_team(){
+		$.ajax({
+			type:"GET",
+			url:"/course/addOrg",
+			dataType:"json",
+			async:false,
+			success:function(json){
+				data = json;
+				if (data.code==0) {
+					$('.alert').html('{{.i18n.Tr "repo.computing.success"}}').removeClass('alert-danger').addClass('alert-success').show().delay(1500).fadeOut();
+				} else {
+					$('.alert').html(data.error_msg).removeClass('alert-success').addClass('alert-danger').show().delay(5000).fadeOut();
+				}
+				location.reload() 
+				// if(data.code==0){
+				// 	alert("Join  success")
+				// 	location.reload()  
+
+				// }else{
+				// 	alert("Join failure")
+				// } 
+			},
+		});
+	}
+
+</script>
 
diff --git a/templates/org/header_course.tmpl b/templates/org/header_course.tmpl
new file mode 100644
index 000000000..776d550b2
--- /dev/null
+++ b/templates/org/header_course.tmpl
@@ -0,0 +1,32 @@
+<div class="organization-header">
+	<div class="ui container">
+		<div class="ui vertically grid head">
+			<div class="column">
+				<div class="ui header">
+					{{with .Org}}
+					<img class="ui image" src="{{.SizedRelAvatarLink 100}}">
+					<span class="text thin grey"><a href="{{.HomeLink}}">{{.DisplayName}}</a></span>
+					{{end}}
+				{{if .IsCourse}}
+					{{if .CanCreateOrgRepo}}
+						<div class="ui right">
+							<a class="ui green button" href="{{.OrgLink}}/teams/new">{{svg "octicon-plus" 16}} {{.i18n.Tr "org.create_new_team"}}</a>
+						</div>
+					{{end}}
+				{{else}}
+					{{if .IsOrganizationOwner}}
+						<div class="ui right">
+							<a class="ui green button" href="{{.OrgLink}}/teams/new">{{svg "octicon-plus" 16}} {{.i18n.Tr "org.create_new_team"}}</a>
+						</div>
+					{{end}}
+					{{if .CanCreateOrgRepo}}
+						<div class="ui right">
+							<a class="ui green button" href="{{AppSubUrl}}/repo/create?org={{.Org.ID}}">{{svg "octicon-plus" 16}} {{.i18n.Tr "new_repo"}}</a>
+						</div>
+					{{end}}
+				{{end}}	
+				</div>
+			</div>
+		</div>
+	</div>
+</div>
\ No newline at end of file
diff --git a/templates/org/member/course_members.tmpl b/templates/org/member/course_members.tmpl
index 40f933e32..83018739f 100644
--- a/templates/org/member/course_members.tmpl
+++ b/templates/org/member/course_members.tmpl
@@ -45,6 +45,8 @@
 </style>
 
 {{template "base/head" .}}
+<!-- 提示框 -->
+<div class="alert"></div>
 <div class="organization members">
 	{{template "org/header" .}}
 	{{template "org/navber_course" .}}
diff --git a/templates/org/team/courseTeams.tmpl b/templates/org/team/courseTeams.tmpl
index 13557888c..d4c5acd62 100644
--- a/templates/org/team/courseTeams.tmpl
+++ b/templates/org/team/courseTeams.tmpl
@@ -6,7 +6,7 @@
 </style>
 {{template "base/head" .}}
 <div class="organization teams">
-	{{template "org/header" .}}
+	{{template "org/header_course" .}}
 	{{template "org/navber_course" .}}
 
 	<div class="ui container">
diff --git a/templates/repo/createCourse.tmpl b/templates/repo/createCourse.tmpl
index 5214c41c3..9247d8ece 100644
--- a/templates/repo/createCourse.tmpl
+++ b/templates/repo/createCourse.tmpl
@@ -65,7 +65,7 @@
 						<button class="ui green button" id="submit_reponame">
 							{{.i18n.Tr "new_course"}}
 						</button>
-						<a class="ui button" href="{{AppSubUrl}}/">{{.i18n.Tr "cancel"}}</a>
+						<a class="ui button" href="javascript:history.go(-1)">{{.i18n.Tr "cancel"}}</a>
 					</div>
 				</div>
 			</form>